Index: include/crt/mingw32/intrin_x86.h
===================================================================
--- include/crt/mingw32/intrin_x86.h	(rÃ©vision 61927)
+++ include/crt/mingw32/intrin_x86.h	(copie de travail)
@@ -186,10 +186,12 @@
 	return __sync_val_compare_and_swap(Destination, Comperand, Exchange);
 }
 
+#ifndef __clang__
 __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand)
 {
 	return __sync_val_compare_and_swap(Destination, Comperand, Exchange);
 }
+#endif
 
 __INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand)
 {
@@ -224,10 +226,12 @@
 	return __sync_fetch_and_add(Addend, Value);
 }
 
+#ifndef __clang__
 __INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value)
 {
 	return __sync_fetch_and_add(Addend, Value);
 }
+#endif
 
 #if defined(_M_AMD64)
 __INTRIN_INLINE long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value)
@@ -302,6 +306,7 @@
 }
 #endif
 
+#ifndef __clang__
 __INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend)
 {
 	return __sync_sub_and_fetch(lpAddend, 1);
@@ -311,6 +316,7 @@
 {
 	return __sync_add_and_fetch(lpAddend, 1);
 }
+#endif
 
 __INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend)
 {
@@ -1032,7 +1038,7 @@
 	if(__builtin_constant_p(b))
 		__asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32));
 	else
-		__asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b));
+		__asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "m" (*a), [b] "r" (b));
 
 	return retval;
 }
@@ -1045,7 +1051,7 @@
 	if(__builtin_constant_p(b))
 		__asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 64))), [b] "Ir" (b % 64));
 	else
-		__asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b));
+		__asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "m" (*a), [b] "r" (b));
 
 	return retval;
 }
@@ -1058,7 +1064,7 @@
 	if(__builtin_constant_p(b))
 		__asm__("btc %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 32))), [retval] "=q" (retval) : [b] "Ir" (b % 32));
 	else
-		__asm__("btc %[b], %[a]; setb %b[retval]" : [a] "+mr" (*a), [retval] "=q" (retval) : [b] "r" (b));
+		__asm__("btc %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b));
 
 	return retval;
 }
@@ -1070,7 +1076,7 @@
 	if(__builtin_constant_p(b))
 		__asm__("btr %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 32))), [retval] "=q" (retval) : [b] "Ir" (b % 32));
 	else
-		__asm__("btr %[b], %[a]; setb %b[retval]" : [a] "+mr" (*a), [retval] "=q" (retval) : [b] "r" (b));
+		__asm__("btr %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b));
 
 	return retval;
 }
@@ -1082,7 +1088,7 @@
 	if(__builtin_constant_p(b))
 		__asm__("bts %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 32))), [retval] "=q" (retval) : [b] "Ir" (b % 32));
 	else
-		__asm__("bts %[b], %[a]; setb %b[retval]" : [a] "+mr" (*a), [retval] "=q" (retval) : [b] "r" (b));
+		__asm__("bts %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b));
 
 	return retval;
 }
Index: include/crt/_mingw.h
===================================================================
--- include/crt/_mingw.h	(rÃ©vision 61927)
+++ include/crt/_mingw.h	(copie de travail)
@@ -215,6 +215,15 @@
 #define _DECLSPEC_INTRIN_TYPE
 #endif
 
+/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
+#ifndef DECLSPEC_HOTPATCH
+#ifdef _MSC_VER
+#define DECLSPEC_HOTPATCH
+#else
+#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))
+#endif
+#endif /* DECLSPEC_HOTPATCH */
+
 #include "_mingw_mac.h"
 
 #endif /* !_INC_MINGW */
Index: include/ndk/vffuncs.h
===================================================================
--- include/ndk/vffuncs.h	(rÃ©vision 61927)
+++ include/ndk/vffuncs.h	(copie de travail)
@@ -38,7 +38,6 @@
 );
 
 VOID
-NTAPI
 VfFailDeviceNode(
     _In_ PDEVICE_OBJECT PhysicalDeviceObject,
     _In_ ULONG BugCheckMajorCode,
Index: include/ndk/setypes.h
===================================================================
--- include/ndk/setypes.h	(rÃ©vision 61927)
+++ include/ndk/setypes.h	(copie de travail)
@@ -127,7 +127,7 @@
 typedef struct _SEP_AUDIT_POLICY_OVERLAY
 {
     ULONGLONG PolicyBits:36;
-    UCHAR SetBit:1;
+    ULONGLONG SetBit:1;
 } SEP_AUDIT_POLICY_OVERLAY, *PSEP_AUDIT_POLICY_OVERLAY;
 
 typedef struct _SEP_AUDIT_POLICY
Index: include/host/pecoff.h
===================================================================
--- include/host/pecoff.h	(rÃ©vision 0)
+++ include/host/pecoff.h	(rÃ©vision 62573)
@@ -0,0 +1,250 @@
+#pragma once
+
+#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b
+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b
+
+#define IMAGE_DOS_MAGIC 0x5a4d
+#define IMAGE_PE_MAGIC 0x00004550
+#define IMAGE_SIZEOF_SHORT_NAME 8
+
+#define IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004
+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008
+#define IMAGE_FILE_DEBUG_STRIPPED   0x0200
+
+#define IMAGE_FILE_MACHINE_I386 0x14c
+#define IMAGE_FILE_MACHINE_AMD64 0x8664
+#define IMAGE_FILE_MACHINE_IA64 0x0200
+
+#define IMAGE_DIRECTORY_ENTRY_BASERELOC	5
+
+#define IMAGE_SCN_TYPE_NOLOAD     0x00000002
+#define IMAGE_SCN_TYPE_NO_PAD     0x00000008
+#define IMAGE_SCN_CNT_CODE        0x00000020
+#define IMAGE_SCN_CNT_INITIALIZED_DATA    0x00000040
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA  0x00000080
+#define IMAGE_SCN_LNK_OTHER       0x00000100
+#define IMAGE_SCN_LNK_INFO        0x00000200
+#define IMAGE_SCN_LNK_REMOVE      0x00000800
+#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000
+#define IMAGE_SCN_GPREL           0x00008000
+#define IMAGE_SCN_MEM_PURGEABLE   0x00020000
+#define IMAGE_SCN_MEM_LOCKED      0x00040000
+#define IMAGE_SCN_MEM_PRELOAD     0x00080000
+#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000
+#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
+#define IMAGE_SCN_MEM_NOT_CACHED  0x04000000
+#define IMAGE_SCN_MEM_NOT_PAGED   0x08000000
+#define IMAGE_SCN_MEM_SHARED      0x10000000
+#define IMAGE_SCN_MEM_EXECUTE     0x20000000
+#define IMAGE_SCN_MEM_READ        0x40000000
+#define IMAGE_SCN_MEM_WRITE       0x80000000
+
+#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
+
+#define IMAGE_REL_I386_ABSOLUTE 0x0001
+#define IMAGE_REL_I386_DIR32    0x0006
+
+#pragma pack(push,2)
+typedef struct _IMAGE_DOS_HEADER {
+  WORD e_magic;
+  WORD e_cblp;
+  WORD e_cp;
+  WORD e_crlc;
+  WORD e_cparhdr;
+  WORD e_minalloc;
+  WORD e_maxalloc;
+  WORD e_ss;
+  WORD e_sp;
+  WORD e_csum;
+  WORD e_ip;
+  WORD e_cs;
+  WORD e_lfarlc;
+  WORD e_ovno;
+  WORD e_res[4];
+  WORD e_oemid;
+  WORD e_oeminfo;
+  WORD e_res2[10];
+  LONG e_lfanew;
+} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
+#pragma pack(pop)
+
+#pragma pack(push,4)
+typedef struct _IMAGE_FILE_HEADER {
+	WORD Machine;
+	WORD NumberOfSections;
+	DWORD TimeDateStamp;
+	DWORD PointerToSymbolTable;
+	DWORD NumberOfSymbols;
+	WORD SizeOfOptionalHeader;
+	WORD Characteristics;
+} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
+#pragma pack(pop)
+
+typedef struct _IMAGE_DATA_DIRECTORY {
+  DWORD VirtualAddress;
+  DWORD Size;
+} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY;
+
+typedef struct _IMAGE_OPTIONAL_HEADER32 {
+	WORD Magic;
+	BYTE MajorLinkerVersion;
+	BYTE MinorLinkerVersion;
+	DWORD SizeOfCode;
+	DWORD SizeOfInitializedData;
+	DWORD SizeOfUninitializedData;
+	DWORD AddressOfEntryPoint;
+	DWORD BaseOfCode;
+	DWORD BaseOfData;
+	DWORD ImageBase;
+	DWORD SectionAlignment;
+	DWORD FileAlignment;
+	WORD MajorOperatingSystemVersion;
+	WORD MinorOperatingSystemVersion;
+	WORD MajorImageVersion;
+	WORD MinorImageVersion;
+	WORD MajorSubsystemVersion;
+	WORD MinorSubsystemVersion;
+	DWORD Win32VersionValue;
+	DWORD SizeOfImage;
+	DWORD SizeOfHeaders;
+	DWORD CheckSum;
+	WORD Subsystem;
+	WORD DllCharacteristics;
+	DWORD SizeOfStackReserve;
+	DWORD SizeOfStackCommit;
+	DWORD SizeOfHeapReserve;
+	DWORD SizeOfHeapCommit;
+	DWORD LoaderFlags;
+	DWORD NumberOfRvaAndSizes;
+	IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32;
+
+typedef struct _IMAGE_OPTIONAL_HEADER64 {
+	WORD Magic;
+	BYTE MajorLinkerVersion;
+	BYTE MinorLinkerVersion;
+	DWORD SizeOfCode;
+	DWORD SizeOfInitializedData;
+	DWORD SizeOfUninitializedData;
+	DWORD AddressOfEntryPoint;
+	DWORD BaseOfCode;
+	ULONGLONG ImageBase;
+	DWORD SectionAlignment;
+	DWORD FileAlignment;
+	WORD MajorOperatingSystemVersion;
+	WORD MinorOperatingSystemVersion;
+	WORD MajorImageVersion;
+	WORD MinorImageVersion;
+	WORD MajorSubsystemVersion;
+	WORD MinorSubsystemVersion;
+	DWORD Win32VersionValue;
+	DWORD SizeOfImage;
+	DWORD SizeOfHeaders;
+	DWORD CheckSum;
+	WORD Subsystem;
+	WORD DllCharacteristics;
+	ULONGLONG SizeOfStackReserve;
+	ULONGLONG SizeOfStackCommit;
+	ULONGLONG SizeOfHeapReserve;
+	ULONGLONG SizeOfHeapCommit;
+	DWORD LoaderFlags;
+	DWORD NumberOfRvaAndSizes;
+	IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64;
+
+#ifdef _TARGET_PE64
+typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER;
+typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER;
+#else
+typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER;
+typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER;
+#endif
+
+typedef struct _IMAGE_NT_HEADERS32
+{
+  DWORD Signature;
+  IMAGE_FILE_HEADER FileHeader;
+  IMAGE_OPTIONAL_HEADER32 OptionalHeader;
+} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32;
+
+typedef struct _IMAGE_NT_HEADERS64
+{
+  DWORD Signature;
+  IMAGE_FILE_HEADER FileHeader;
+  IMAGE_OPTIONAL_HEADER32 OptionalHeader;
+} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64;
+
+#ifdef _TARGET_PE64
+typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS;
+typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS;
+#else
+typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS;
+typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS;
+#endif
+
+typedef struct _IMAGE_SECTION_HEADER {
+  BYTE Name[IMAGE_SIZEOF_SHORT_NAME];
+  union {
+    DWORD PhysicalAddress;
+    DWORD VirtualSize;
+  } Misc;
+  DWORD VirtualAddress;
+  DWORD SizeOfRawData;
+  DWORD PointerToRawData;
+  DWORD PointerToRelocations;
+  DWORD PointerToLinenumbers;
+  WORD NumberOfRelocations;
+  WORD NumberOfLinenumbers;
+  DWORD Characteristics;
+} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER;
+
+#pragma pack(push,4)
+typedef struct _IMAGE_BASE_RELOCATION {
+	DWORD VirtualAddress;
+	DWORD SizeOfBlock;
+    WORD  TypeOffset[1];
+} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION;
+#pragma pack(pop)
+
+#ifndef UNALIGNED
+#define UNALIGNED
+#endif
+
+#pragma pack(push,2)
+typedef struct _IMAGE_RELOCATION {
+  union {
+    DWORD VirtualAddress;
+    DWORD RelocCount;
+  };
+  DWORD SymbolTableIndex;
+  WORD Type;
+} IMAGE_RELOCATION;
+typedef struct _IMAGE_RELOCATION UNALIGNED *PIMAGE_RELOCATION;
+#pragma pack(pop)
+
+#pragma pack(push,2)
+typedef struct _IMAGE_SYMBOL {
+  union {
+    BYTE ShortName[8];
+    struct {
+      DWORD Short;
+      DWORD Long;
+    } Name;
+    DWORD LongName[2];
+  } N;
+  DWORD Value;
+  SHORT SectionNumber;
+  WORD Type;
+  BYTE StorageClass;
+  BYTE NumberOfAuxSymbols;
+} IMAGE_SYMBOL;
+typedef struct _IMAGE_SYMBOL UNALIGNED *PIMAGE_SYMBOL;
+#pragma pack(pop)
+
+#define IMAGE_DOS_SIGNATURE 0x5A4D
+#define IMAGE_OS2_SIGNATURE 0x454E
+#define IMAGE_OS2_SIGNATURE_LE 0x454C
+#define IMAGE_VXD_SIGNATURE 0x454C
+#define IMAGE_NT_SIGNATURE 0x00004550
+
+#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((ULONG_PTR)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader))

Modification de propriÃ©tÃ©s sur include/host/pecoff.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: include/reactos/libs/pseh/pseh3.h
===================================================================
--- include/reactos/libs/pseh/pseh3.h	(rÃ©vision 61927)
+++ include/reactos/libs/pseh/pseh3.h	(copie de travail)
@@ -12,10 +12,35 @@
 
 #include "excpt.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* CLANG must safe non-volatiles, because it uses a return-twice algorithm */
+#if defined(__clang__) && !defined(_SEH3$_FRAME_ALL_NONVOLATILES)
+#define _SEH3$_FRAME_ALL_NONVOLATILES 1
+#endif
+
+enum
+{
+    _SEH3$_NESTED_HANDLER = 0,
+    _SEH3$_CPP_HANDLER = 1,
+    _SEH3$_CLANG_HANDLER = 2,
+#ifdef __clang__
+    _SEH3$_HANDLER_TYPE = _SEH3$_CLANG_HANDLER,
+#elif defined(__cplusplus)
+    _SEH3$_HANDLER_TYPE = _SEH3$_CPP_HANDLER,
+#else
+    _SEH3$_HANDLER_TYPE = _SEH3$_NESTED_HANDLER,
+#endif
+};
+
 typedef struct _SEH3$_SCOPE_TABLE
 {
     void *Target;
     void *Filter;
+    unsigned char TryLevel;
+    unsigned char HandlerType;
 } SEH3$_SCOPE_TABLE, *PSEH3$_SCOPE_TABLE;
 
 typedef struct _SEH3$_EXCEPTION_POINTERS
@@ -43,11 +68,18 @@
     unsigned long Esp;
     unsigned long Ebp;
 
+    char* AllocaFrame;
+#ifdef _SEH3$_FRAME_ALL_NONVOLATILES
+    unsigned long Ebx;
+    unsigned long Esi;
+    unsigned long Edi;
+#endif
 } SEH3$_REGISTRATION_FRAME ,*PSEH3$_REGISTRATION_FRAME;
 
 /* Prevent gcc from inlining functions that use SEH. */
 static inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH3$_PreventInlining() {}
 
+/* Unregister the root frame */
 extern inline __attribute__((always_inline,gnu_inline))
 void _SEH3$_UnregisterFrame(volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame)
 {
@@ -55,6 +87,7 @@
                   : : [NewHead] "ir" (RegistrationFrame->Next) : "memory");
 }
 
+/* Unregister a trylevel frame */
 extern inline __attribute__((always_inline,gnu_inline))
 void _SEH3$_UnregisterTryLevel(
     volatile SEH3$_REGISTRATION_FRAME *TrylevelFrame)
@@ -70,47 +103,176 @@
     _SEH3$_TryLevel = 0,
 };
 
+#ifndef __clang__
 /* These are global dummy definitions, that get overwritten in the local context of __finally / __except blocks */
 int __cdecl __attribute__((error ("Can only be used inside a __finally block."))) _abnormal_termination(void);
 unsigned long __cdecl __attribute__((error("Can only be used inside an exception filter or __except block."))) _exception_code(void);
 void * __cdecl __attribute__((error("Can only be used inside an exception filter."))) _exception_info(void);
+#endif
 
-/* Define the registers that get clobbered, when reaching the __except block.
-   We specify ebp on optimized builds without frame pointer, since it will be
-   used by GCC as a general purpose register then. */
-#if defined(__OPTIMIZE__) && defined(_ALLOW_OMIT_FRAME_POINTER)
-#define _SEH3$_CLOBBER_ON_EXCEPTION "ebp", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory"
+/* This attribute allows automatic cleanup of the registered frames */
+#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_Unregister)))
+
+/* CLANG specific definitions! */
+#ifdef __clang__
+
+/* CLANG thinks it is smart and optimizes the alloca away if it is 0 and with it the use of a frame register */
+#define _SEH3$_EnforceFramePointer() asm volatile ("#\n" : : "m"(*(char*)__builtin_alloca(4)) : "%esp", "memory")
+
+/* CLANG doesn't have asm goto! */
+#define _SEH3$_ASM_GOTO(_Label, ...)
+
+int
+__attribute__((regparm(3)))
+__attribute__((returns_twice))
+_SEH3$_RegisterFrameWithNonVolatiles(
+    volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame,
+    const SEH3$_SCOPE_TABLE* ScopeTable,
+    void* AllocaFrame);
+
+#define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \
+    do { \
+        int result = _SEH3$_RegisterFrameWithNonVolatiles(_TrylevelFrame, _DataTable, __builtin_alloca(0)); \
+        if (__builtin_expect(result != 0, 0)) \
+        { \
+            if (result == 1) goto _SEH3$_l_FilterOrFinally; \
+            if (result == 2) goto _SEH3$_l_HandlerTarget; \
+            goto _SEH3$_l_BeforeFilterOrFinally; \
+        } \
+    } while(0)
+
+int
+__attribute__((regparm(3)))
+__attribute__((returns_twice))
+_SEH3$_RegisterTryLevelWithNonVolatiles(
+    volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame,
+    const SEH3$_SCOPE_TABLE* ScopeTable,
+    void* AllocaFrame);
+
+#define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \
+    do { \
+        int result = _SEH3$_RegisterTryLevelWithNonVolatiles(_TrylevelFrame, _DataTable, __builtin_alloca(0)); \
+        if (__builtin_expect(result != 0, 0)) \
+        { \
+            if (result == 1) goto _SEH3$_l_FilterOrFinally; \
+            if (result == 2) goto _SEH3$_l_HandlerTarget; \
+            goto _SEH3$_l_BeforeFilterOrFinally; \
+        } \
+    } while(0)
+
+#define _SEH3$_SCARE_GCC()
+
+#else /* !__clang__ */
+
+/* This will make GCC use ebp, even if it was disabled by -fomit-frame-pointer */
+#define _SEH3$_EnforceFramePointer() asm volatile ("#\n" : : "m"(*(char*)__builtin_alloca(0)) : "%esp", "memory")
+
+#define _SEH3$_ASM_GOTO(_Label, ...) asm goto ("#\n" : : : "memory", ## __VA_ARGS__ : _Label)
+
+#ifdef __cplusplus
+#define _SEH3$_CALL_WRAPPER(_Function, _TrylevelFrame, _DataTable) \
+    asm goto ("leal %0, %%eax\n" \
+              "leal %1, %%edx\n" \
+              "call " #_Function "WithStackLayout\n" \
+              : \
+              : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)), "c"(__builtin_alloca(0)) \
+              : "eax", "edx", "memory" \
+              : _SEH3$_l_HandlerTarget, _SEH3$_l_FilterOrFinally)
+
 #else
-#define _SEH3$_CLOBBER_ON_EXCEPTION "ebx", "ecx", "edx", "esi", "edi", "flags", "memory"
+#define _SEH3$_CALL_WRAPPER(_Function, _TrylevelFrame, _DataTable) \
+    asm goto ("leal %0, %%eax\n" \
+              "leal %1, %%edx\n" \
+              "call " #_Function "\n" \
+              : \
+              : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)) \
+              : "eax", "edx", "ecx", "memory" \
+              : _SEH3$_l_HandlerTarget)
 #endif
 
-/* This attribute allows automatic cleanup of the registered frames */
-#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_AutoCleanup)))
+/* This is an asm wrapper around _SEH3$_RegisterFrame */
+#define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \
+     _SEH3$_CALL_WRAPPER(__SEH3$_RegisterFrame, _TrylevelFrame, _DataTable)
 
-#define _SEH3$_ASM_GOTO(_Asm, _Label, ...) asm goto (_Asm : : : "memory", ## __VA_ARGS__ : _Label)
+/* This is an asm wrapper around _SEH3$_RegisterTryLevel */
+#define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \
+     _SEH3$_CALL_WRAPPER(__SEH3$_RegisterTryLevel, _TrylevelFrame, _DataTable)
 
+/* This construct scares GCC so much, that it will stop moving code
+   around into places that are never executed. */
+#define _SEH3$_SCARE_GCC() \
+        void *plabel; \
+        _SEH3$_ASM_GOTO(_SEH3$_l_BeforeTry); \
+        _SEH3$_ASM_GOTO(_SEH3$_l_HandlerTarget); \
+        _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
+        asm volatile ("#" : "=a"(plabel) : "p"(&&_SEH3$_l_BeforeTry), "p"(&&_SEH3$_l_HandlerTarget), "p"(&&_SEH3$_l_OnException) \
+                      : "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" ); \
+        goto _SEH3$_l_OnException;
+
+#endif /* __clang__ */
+
+/* Neither CLANG nor C++ support nested functions */
+#if defined(__cplusplus) || defined(__clang__)
+
+/* Use the global unregister function */
+void
+__attribute__((regparm(1)))
+_SEH3$_Unregister(
+    volatile SEH3$_REGISTRATION_FRAME *Frame);
+
+/* These are only dummies here */
+#define _SEH3$_DECLARE_CLEANUP_FUNC(_Name)
+#define _SEH3$_DEFINE_CLEANUP_FUNC(_Name)
+#define _SEH3$_DECLARE_FILTER_FUNC(_Name)
+#define _SEH3$_DEFINE_DUMMY_FINALLY(_Name)
+
+/* The "nested" functions are a piece of code with a ret instruction at the end */
+#define _SEH3$_NESTED_FUNC_OPEN() \
+    { \
+        int _SEH3$_Result = 0; \
+
+/* On invocation, the AllocaFrame field is loaded with the return esp value */
+#define _SEH3$_NESTED_FUNC_RETURN() \
+        /* Restore esp and return to the caller */ \
+        asm volatile ("movl %[FixedEsp], %%esp\nret\n" \
+            : : "a"(_SEH3$_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "memory")
+
+#define _SEH3$_NESTED_FUNC_CLOSE() \
+        /* Return to the caller */ \
+        _SEH3$_NESTED_FUNC_RETURN(); \
+    }
+
+/* The filter function */
+#define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \
+    _SEH3$_NESTED_FUNC_OPEN() \
+    { \
+        /* Evaluate the filter expression */ \
+        _SEH3$_Result = (expression); \
+    } \
+    _SEH3$_NESTED_FUNC_CLOSE()
+
+#define _SEH3$_FINALLY_FUNC_OPEN(_Name) \
+    _SEH3$_NESTED_FUNC_OPEN() \
+        /* This construct makes sure that the finally function returns */ \
+        /* a proper value at the end */ \
+        for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(); 0;}))
+
+#define _SEH3$_FILTER(_Filter, _FilterExpression) (&&_SEH3$_l_FilterOrFinally)
+#define _SEH3$_FINALLY(_Finally) (&&_SEH3$_l_FilterOrFinally)
+
+#define _SEH3$_DECLARE_EXCEPT_INTRINSICS()
+
+/* Since we cannot use nested functions, we declare these globally as macros */
+#define _abnormal_termination() (_SEH3$_TrylevelFrame.ScopeTable != 0)
+#define _exception_code() (_SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode)
+#define _exception_info() (_SEH3$_TrylevelFrame.ExceptionPointers)
+
+#else /* __cplusplus || __clang__ */
+
 #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \
     inline __attribute__((always_inline, gnu_inline)) \
     unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; }
 
-/* This is an asm wrapper around _SEH3$_RegisterFrame */
-#define _SEH3$_RegisterFrame(_TrylevelFrame, _DataTable, _Target) \
-    asm goto ("leal %0, %%ecx\n" \
-              "call __SEH3$_RegisterFrame\n" \
-              : \
-              : "m" (*(_TrylevelFrame)), "a" (_DataTable) \
-              : "ecx", "edx", "memory" \
-              : _Target)
-
-/* This is an asm wrapper around _SEH3$_EnterTryLevel */
-#define _SEH3$_RegisterTryLevel(_TrylevelFrame, _DataTable, _Target) \
-    asm goto ("leal %0, %%ecx\n" \
-              "call __SEH3$_RegisterTryLevel\n" \
-              : \
-              : "m" (*(_TrylevelFrame)), "a" (_DataTable) \
-              : "ecx", "edx", "memory" \
-              : _Target)
-
 /* On GCC the filter function is a nested function with __fastcall calling
    convention. The eax register contains a base address the function uses
    to address the callers stack frame. __fastcall is chosen, because it gives
@@ -144,11 +306,17 @@
     _SEH3$_NESTED_FUNC_OPEN(_Name) \
         /* Declare the intrinsics for the finally function */ \
         inline __attribute__((always_inline, gnu_inline)) \
-        int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ScopeTable != 0); }
+        int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ScopeTable != 0); } \
+\
+        /* This construct makes sure that the finally function returns */ \
+        /* a proper value at the end */ \
+        for (; ; (void)({return 0; 0;}))
 
 #define _SEH3$_FILTER(_Filter, _FilterExpression) \
     (__builtin_constant_p(_FilterExpression) ? (void*)(unsigned long)(unsigned char)(unsigned long)(_FilterExpression) : _Filter)
 
+#define _SEH3$_FINALLY(_Finally) (_Finally)
+
 #define _SEH3$_DEFINE_DUMMY_FINALLY(_Name) \
     auto inline __attribute__((always_inline,gnu_inline)) int _Name(int Action) { (void)Action; return 0; }
 
@@ -167,18 +335,10 @@
         _SEH3$_FinallyFunction(1); \
     }
 
-/* This construct scares GCC so much, that it will stop moving code
-   around into places that are never executed. */
-#define _SEH3$_SCARE_GCC() \
-        void *plabel; \
-        _SEH3$_ASM_GOTO("#\n", _SEH3$_l_BeforeTry); \
-        _SEH3$_ASM_GOTO("#\n", _SEH3$_l_HandlerTarget); \
-        _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \
-        asm volatile ("#" : "=a"(plabel) : "p"(&&_SEH3$_l_BeforeTry), "p"(&&_SEH3$_l_HandlerTarget), "p"(&&_SEH3$_l_OnException) \
-                      : _SEH3$_CLOBBER_ON_EXCEPTION ); \
-        goto _SEH3$_l_OnException;
+#endif /* __cplusplus || __clang__ */
 
 
+
 #define _SEH3_TRY \
     _SEH3$_PreventInlining(); \
     /* Enter the outer scope */ \
@@ -190,6 +350,11 @@
         __label__ _SEH3$_l_EndTry; \
         __label__ _SEH3$_l_HandlerTarget; \
         __label__ _SEH3$_l_OnException; \
+        __label__ _SEH3$_l_BeforeFilterOrFinally; \
+        __label__ _SEH3$_l_FilterOrFinally; \
+        (void)&&_SEH3$_l_OnException; \
+        (void)&&_SEH3$_l_BeforeFilterOrFinally; \
+        (void)&&_SEH3$_l_FilterOrFinally; \
 \
         /* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \
         enum { \
@@ -198,7 +363,7 @@
         }; \
 \
         /* Forward declaration of the auto cleanup function */ \
-        _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \
+        _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_Unregister); \
 \
         /* Allocate a registration frame */ \
         volatile SEH3$_REGISTRATION_FRAME _SEH3$_AUTO_CLEANUP _SEH3$_TrylevelFrame; \
@@ -217,30 +382,36 @@
         goto _SEH3$_l_EndTry; \
 \
     _SEH3$_l_BeforeTry: (void)0; \
-        _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \
+        _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
 \
         /* Forward declaration of the filter function */ \
         _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \
 \
         /* Create a static data table that contains the jump target and filter function */ \
-        static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { &&_SEH3$_l_HandlerTarget, _SEH3$_FILTER(&_SEH3$_FilterFunction, (__VA_ARGS__)) }; \
+        static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { &&_SEH3$_l_HandlerTarget, _SEH3$_FILTER(&_SEH3$_FilterFunction, (__VA_ARGS__)), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \
 \
         /* Register the registration record. */ \
-        if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \
-        else _SEH3$_RegisterTryLevel(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \
+        if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
+        else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
 \
-        /* Emit the filter function */ \
-        _SEH3$_DEFINE_FILTER_FUNC(_SEH3$_FilterFunction, (__VA_ARGS__)) \
-\
         /* Define an empty inline finally function */ \
         _SEH3$_DEFINE_DUMMY_FINALLY(_SEH3$_FinallyFunction) \
 \
         /* Allow intrinsics for __except to be used */ \
-        _SEH3$_DECLARE_EXCEPT_INTRINSICS() \
+        _SEH3$_DECLARE_EXCEPT_INTRINSICS(); \
 \
         goto _SEH3$_l_DoTry; \
 \
+    _SEH3$_l_BeforeFilterOrFinally: (void)0; \
+        /* Make sure the filter function doesn't use esp */ \
+        _SEH3$_EnforceFramePointer(); \
+\
+    _SEH3$_l_FilterOrFinally: (void)0; \
+        /* Emit the filter function */ \
+        _SEH3$_DEFINE_FILTER_FUNC(_SEH3$_FilterFunction, (__VA_ARGS__)) \
+\
     _SEH3$_l_HandlerTarget: (void)0; \
+        _SEH3$_EnforceFramePointer(); \
 \
         if (1) \
         { \
@@ -259,26 +430,27 @@
         goto _SEH3$_l_EndTry; \
 \
     _SEH3$_l_BeforeTry: (void)0; \
-        _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \
+        _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
 \
         /* Forward declaration of the finally function */ \
         _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \
 \
         /* Create a static data table that contains the finally function */ \
-        static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, &_SEH3$_FinallyFunction }; \
+        static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, _SEH3$_FINALLY(&_SEH3$_FinallyFunction), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \
 \
         /* Register the registration record. */ \
-        if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \
-        else _SEH3$_RegisterTryLevel(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \
+        if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
+        else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
 \
         goto _SEH3$_l_DoTry; \
 \
     _SEH3$_l_HandlerTarget: (void)0; \
+        _SEH3$_EnforceFramePointer(); \
 \
-        _SEH3$_FINALLY_FUNC_OPEN(_SEH3$_FinallyFunction) \
-            /* This construct makes sure that the finally function returns */ \
-            /* a proper value at the end */ \
-            for (; ; (void)({return 0; 0;}))
+    _SEH3$_l_BeforeFilterOrFinally: (void)0; \
+        _SEH3$_EnforceFramePointer(); \
+    _SEH3$_l_FilterOrFinally: (void)0; \
+        _SEH3$_FINALLY_FUNC_OPEN(_SEH3$_FinallyFunction)
 
 
 #define _SEH3_END \
@@ -288,13 +460,13 @@
 \
     _SEH3$_l_OnException: (void)0; \
         /* Force GCC to create proper code pathes */ \
-        _SEH3$_SCARE_GCC() \
+        _SEH3$_SCARE_GCC(); \
 \
     _SEH3$_l_EndTry:(void)0; \
-        _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \
+        _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
 \
         /* Implementation of the auto cleanup function */ \
-        _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \
+        _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_Unregister); \
 \
     /* Close the outer scope */ \
     } while (0);
@@ -302,3 +474,8 @@
 #define _SEH3_LEAVE goto _SEH3$_l_AfterTry
 
 #define _SEH3_VOLATILE volatile
+
+
+#ifdef __cplusplus
+}; // extern "C"
+#endif
Index: include/reactos/stubs.h
===================================================================
--- include/reactos/stubs.h	(rÃ©vision 61927)
+++ include/reactos/stubs.h	(copie de travail)
@@ -1,4 +1,5 @@
 #include <stdarg.h>
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 
Index: include/reactos/undocuser.h
===================================================================
--- include/reactos/undocuser.h	(rÃ©vision 61927)
+++ include/reactos/undocuser.h	(copie de travail)
@@ -32,6 +32,7 @@
 #define WM_COPYGLOBALDATA   0x00000049
 #define WM_LOGONNOTIFY      0x0000004C
 #define WM_KEYF1            0x0000004D
+#define WM_KLUDGEMINRECT    0x0000008B
 #define WM_NCUAHDRAWCAPTION 0x000000AE
 #define WM_NCUAHDRAWFRAME   0x000000AF
 #define WM_SYSTIMER         0x00000118
Index: include/reactos/wine/test.h
===================================================================
--- include/reactos/wine/test.h	(rÃ©vision 61927)
+++ include/reactos/wine/test.h	(copie de travail)
@@ -254,10 +254,10 @@
     DWORD last_error;
 
     last_error=GetLastError();
-    data=TlsGetValue(tls_index);
+    data=(tls_data*)TlsGetValue(tls_index);
     if (!data)
     {
-        data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data));
+        data=(tls_data*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data));
         data->str_pos = data->strings;
         TlsSetValue(tls_index,data);
     }
Index: include/reactos/wine/config.h
===================================================================
--- include/reactos/wine/config.h	(rÃ©vision 61927)
+++ include/reactos/wine/config.h	(copie de travail)
@@ -1,7 +1,13 @@
 #define __WINE_CONFIG_H
 
 /* Define to a function attribute for Microsoft hotpatch assembly prefix. */
+#ifndef DECLSPEC_HOTPATCH
+#ifdef _MSC_VER
 #define DECLSPEC_HOTPATCH
+#else
+#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))
+#endif
+#endif /* DECLSPEC_HOTPATCH */
 
 /* Define to the file extension for executables. */
 #define EXEEXT ".exe"
Index: include/reactos/wine/commctrl.h
===================================================================
--- include/reactos/wine/commctrl.h	(rÃ©vision 61927)
+++ include/reactos/wine/commctrl.h	(copie de travail)
@@ -63,7 +63,6 @@
 typedef LVFINDINFOW *LPLVFINDINFOW;
 
 #define SB_SETBORDERS (WM_USER+5)
-#define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */
 
 /* these are undocumented and the names are guesses */
 typedef struct
Index: include/reactos/subsys/win/conmsg.h
===================================================================
--- include/reactos/subsys/win/conmsg.h	(rÃ©vision 61927)
+++ include/reactos/subsys/win/conmsg.h	(copie de travail)
@@ -197,9 +197,9 @@
 
 typedef struct
 {
-    ULONG  nMaxIds;
-    ULONG  nProcessIdsTotal;
-    PDWORD pProcessIds;
+    HANDLE ConsoleHandle;
+    ULONG  ProcessCount;
+    PDWORD ProcessIdsList;
 } CONSOLE_GETPROCESSLIST, *PCONSOLE_GETPROCESSLIST;
 
 typedef struct
@@ -262,8 +262,14 @@
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     HANDLE OutputHandle;
-    CONSOLE_SCREEN_BUFFER_INFO Info;
+    COORD  ScreenBufferSize;
+    COORD  CursorPosition;
+    COORD  ViewOrigin;
+    WORD   Attributes;
+    COORD  ViewSize;
+    COORD  MaximumViewSize;
 } CONSOLE_GETSCREENBUFFERINFO, *PCONSOLE_GETSCREENBUFFERINFO;
 
 typedef struct
@@ -274,6 +280,7 @@
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     HANDLE OutputHandle;
     BOOL   Show;
     INT    RefCount;
@@ -281,8 +288,9 @@
 
 typedef struct
 {
+    HANDLE  ConsoleHandle;
     HANDLE  OutputHandle;
-    HCURSOR hCursor;
+    HCURSOR CursorHandle;
 } CONSOLE_SETCURSOR, *PCONSOLE_SETCURSOR;
 
 typedef struct
@@ -305,15 +313,17 @@
 
 typedef struct
 {
-    // HANDLE OutputHandle;
-    DWORD  DisplayMode;
+    HANDLE ConsoleHandle;
+    DWORD  DisplayMode; // ModeFlags
 } CONSOLE_GETDISPLAYMODE, *PCONSOLE_GETDISPLAYMODE;
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     HANDLE OutputHandle;
-    DWORD  DisplayMode;
+    DWORD  DisplayMode; // ModeFlags
     COORD  NewSBDim;
+    HANDLE EventHandle;
 } CONSOLE_SETDISPLAYMODE, *PCONSOLE_SETDISPLAYMODE;
 
 /*
@@ -324,7 +334,9 @@
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     HANDLE OutputHandle;
+    DWORD  Flags;
     DWORD  State;
 } CONSOLE_GETSETHWSTATE, *PCONSOLE_GETSETHWSTATE;
 
@@ -351,6 +363,7 @@
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     HANDLE OutputHandle;
     SMALL_RECT Region;
 } CONSOLE_INVALIDATEDIBITS, *PCONSOLE_INVALIDATEDIBITS;
@@ -357,6 +370,7 @@
 
 typedef struct
 {
+    HANDLE   ConsoleHandle;
     HANDLE   OutputHandle;
     HPALETTE PaletteHandle;
     UINT     Usage;
@@ -501,11 +515,14 @@
 typedef struct
 {
     HANDLE ConsoleHandle;
+    HANDLE Handle;
 } CONSOLE_CLOSEHANDLE, *PCONSOLE_CLOSEHANDLE;
 
 typedef struct
 {
+    BOOL   IsValid;
     HANDLE ConsoleHandle;
+    HANDLE Handle;
 } CONSOLE_VERIFYHANDLE, *PCONSOLE_VERIFYHANDLE;
 
 typedef struct
@@ -543,15 +560,17 @@
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     HANDLE OutputHandle;
-    DWORD  dwCmdIdLow;
-    DWORD  dwCmdIdHigh;
-    HMENU  hMenu;
+    DWORD  CmdIdLow;
+    DWORD  CmdIdHigh;
+    HMENU  MenuHandle;
 } CONSOLE_MENUCONTROL, *PCONSOLE_MENUCONTROL;
 
 typedef struct
 {
-    BOOL Enable;
+    HANDLE ConsoleHandle;
+    BOOL   Enable;
 } CONSOLE_SETMENUCLOSE, *PCONSOLE_SETMENUCLOSE;
 
 typedef struct
@@ -564,12 +583,14 @@
 
 typedef struct
 {
-    HWND WindowHandle;
+    HANDLE ConsoleHandle;
+    HWND   WindowHandle;
 } CONSOLE_GETWINDOW, *PCONSOLE_GETWINDOW;
 
 typedef struct
 {
-    HICON WindowIcon;
+    HANDLE ConsoleHandle;
+    HICON  IconHandle;
 } CONSOLE_SETICON, *PCONSOLE_SETICON;
 
 
@@ -665,15 +686,25 @@
 
 typedef struct
 {
+    HANDLE ConsoleHandle;
     CONSOLE_SELECTION_INFO Info;
 } CONSOLE_GETSELECTIONINFO, *PCONSOLE_GETSELECTIONINFO;
 
 typedef struct
 {
-    BOOL InputCP;   // TRUE : Input Code Page ; FALSE : Output Code Page
-    UINT CodePage;
-} CONSOLE_GETSETINPUTOUTPUTCP, *PCONSOLE_GETSETINPUTOUTPUTCP;
+    HANDLE ConsoleHandle;
+    UINT   CodePage;
+    BOOL   OutputCP;    // TRUE : Output Code Page ; FALSE : Input Code Page
+} CONSOLE_GETINPUTOUTPUTCP, *PCONSOLE_GETINPUTOUTPUTCP;
 
+typedef struct
+{
+    HANDLE ConsoleHandle;
+    UINT   CodePage;
+    BOOL   OutputCP;    // TRUE : Output Code Page ; FALSE : Input Code Page
+    HANDLE EventHandle;
+} CONSOLE_SETINPUTOUTPUTCP, *PCONSOLE_SETINPUTOUTPUTCP;
+
 typedef struct _CONSOLE_API_MESSAGE
 {
     PORT_MESSAGE Header;
@@ -764,7 +795,8 @@
         CONSOLE_GETNUMINPUTEVENTS GetNumInputEventsRequest;
 
         /* Input and Output Code Pages */
-        CONSOLE_GETSETINPUTOUTPUTCP ConsoleCPRequest;
+        CONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest;
+        CONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest;
     } Data;
 } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE;
 
Index: include/psdk/shlobj.h
===================================================================
--- include/psdk/shlobj.h	(rÃ©vision 61927)
+++ include/psdk/shlobj.h	(copie de travail)
@@ -749,7 +749,7 @@
     STDMETHOD(RefreshObject) (THIS_ _In_ PITEMID_CHILD pidl, _Out_ UINT *puItem) PURE;
     STDMETHOD(SetRedraw) (THIS_ BOOL bRedraw) PURE;
     STDMETHOD(GetSelectedCount) (THIS_ _Out_ UINT *puSelected) PURE;
-    STDMETHOD(GetSelectedObjects) (THIS_ _Outptr_result_buffer_(*puItems) PCITEMID_CHILD **pppidl, _Out_ UINT *puItems) PURE;
+    STDMETHOD(GetSelectedObjects) (THIS_ _Outptr_result_buffer_(*puItems) PCUITEMID_CHILD **pppidl, _Out_ UINT *puItems) PURE;
     STDMETHOD(IsDropOnSource) (THIS_ _In_opt_ IDropTarget *pDropTarget) PURE;
     STDMETHOD(GetDragPoint) (THIS_ _Out_ POINT *ppt) PURE;
     STDMETHOD(GetDropPoint) (THIS_ _Out_ POINT *ppt) PURE;
Index: include/psdk/shlwapi_undoc.h
===================================================================
--- include/psdk/shlwapi_undoc.h	(rÃ©vision 61927)
+++ include/psdk/shlwapi_undoc.h	(copie de travail)
@@ -58,6 +58,7 @@
 HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site);
 HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId);
 HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID riid, LPVOID *lppOut);
+HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut);
 HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg);
 BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName);
 void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend);
Index: include/psdk/winternl.h
===================================================================
--- include/psdk/winternl.h	(rÃ©vision 61927)
+++ include/psdk/winternl.h	(copie de travail)
@@ -632,7 +632,7 @@
     FileFsMaximumInformation
 } FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
 
-typedef enum _KEY_INFORMATION_CLASS { 
+typedef enum _KEY_INFORMATION_CLASS {
   KeyBasicInformation           = 0,
   KeyNodeInformation            = 1,
   KeyFullInformation            = 2,
@@ -2244,7 +2244,7 @@
 DWORD     WINAPI RtlLengthSid(PSID);
 NTSTATUS  WINAPI RtlLocalTimeToSystemTime(const LARGE_INTEGER*,PLARGE_INTEGER);
 BOOLEAN   WINAPI RtlLockHeap(HANDLE);
-NTSTATUS  WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*);
+NTSTATUS  WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE*,const WCHAR*,RTL_ATOM*);
 
 NTSTATUS  WINAPI RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
 void      WINAPI RtlMapGenericMask(PACCESS_MASK,const GENERIC_MAPPING*);
Index: include/psdk/guiddef.h
===================================================================
--- include/psdk/guiddef.h	(rÃ©vision 61927)
+++ include/psdk/guiddef.h	(copie de travail)
@@ -32,13 +32,8 @@
 #endif
 
 #ifndef DECLSPEC_SELECTANY
-#ifdef __clang__
-/* FIXME: http://llvm.org/bugs/show_bug.cgi?id=13778 */
-#define DECLSPEC_SELECTANY __attribute__((weak))
-#else
 #define DECLSPEC_SELECTANY __declspec(selectany)
 #endif
-#endif
 
 #ifndef EXTERN_C
 #ifdef __cplusplus
Index: include/psdk/intsafe.h
===================================================================
--- include/psdk/intsafe.h	(rÃ©vision 61927)
+++ include/psdk/intsafe.h	(copie de travail)
@@ -328,7 +328,7 @@
 DEFINE_SAFE_CONVERT_UTOX(ULongToIntPtr, ULONG, INT_PTR)
 DEFINE_SAFE_CONVERT_UTOX(ULongToUIntPtr, ULONG, UINT_PTR)
 DEFINE_SAFE_CONVERT_UTOX(ULongToLongPtr, ULONG, LONG_PTR)
-DEFINE_SAFE_CONVERT_UTOX(ULongPtrToULong, ULONG_PTR, ULONGLONG)
+DEFINE_SAFE_CONVERT_UTOX(ULongPtrToULong, ULONG_PTR, ULONG)
 DEFINE_SAFE_CONVERT_UTOX(ULongLongToUInt, ULONGLONG, UINT)
 DEFINE_SAFE_CONVERT_UTOX(ULongLongToULong, ULONGLONG, ULONG)
 DEFINE_SAFE_CONVERT_UTOX(ULongLongToULongPtr, ULONGLONG, ULONG_PTR)
@@ -657,7 +657,7 @@
         M2 = M2Low + M2Hi * 0x100000000
 
        Then the multiplication looks like this:
-        M1 * M2 = (M1Low + M1Hi * 0x100000000) + (M2Low + M2Hi * 0x100000000)
+        M1 * M2 = (M1Low + M1Hi * 0x100000000) * (M2Low + M2Hi * 0x100000000)
                 = M1Low * M2Low
                   + M1Low * M2Hi * 0x100000000
                   + M2Low * M1Hi * 0x100000000
@@ -686,13 +686,13 @@
     }
     else
     {
-        *pOutput = LONGLONG_ERROR;
+        *pOutput = ULONGLONG_ERROR;
         return INTSAFE_E_ARITHMETIC_OVERFLOW;
     }
 
     if (Temp > ULONG_MAX)
     {
-        *pOutput = LONGLONG_ERROR;
+        *pOutput = ULONGLONG_ERROR;
         return INTSAFE_E_ARITHMETIC_OVERFLOW;
     }
 
Index: include/psdk/shellapi.h
===================================================================
--- include/psdk/shellapi.h	(rÃ©vision 61927)
+++ include/psdk/shellapi.h	(copie de travail)
@@ -476,7 +476,6 @@
   _In_opt_ HICON hIcon);
 
 int
-WINAPI
 ShellMessageBoxA(
   _In_opt_ HINSTANCE hAppInst,
   _In_opt_ HWND hWnd,
@@ -486,7 +485,6 @@
   ...);
 
 int
-WINAPI
 ShellMessageBoxW(
   _In_opt_ HINSTANCE hAppInst,
   _In_opt_ HWND hWnd,
Index: include/psdk/wincon.h
===================================================================
--- include/psdk/wincon.h	(rÃ©vision 61927)
+++ include/psdk/wincon.h	(copie de travail)
@@ -427,10 +427,10 @@
 #if (_WIN32_WINNT >= 0x0500)
 
 HWND WINAPI GetConsoleWindow(VOID);
-BOOL APIENTRY GetConsoleDisplayMode(_Out_ LPDWORD lpModeFlags);
+BOOL WINAPI GetConsoleDisplayMode(_Out_ LPDWORD lpModeFlags);
 
 BOOL
-APIENTRY
+WINAPI
 SetConsoleDisplayMode(
   _In_ HANDLE hConsoleOutput,
   _In_ DWORD dwFlags,
@@ -607,8 +607,16 @@
 BOOL WINAPI SetConsoleCursor(_In_ HANDLE, _In_ HCURSOR);
 /* Undocumented, see http://undoc.airesoft.co.uk/kernel32.dll/ShowConsoleCursor.php */
 INT WINAPI ShowConsoleCursor(_In_ HANDLE, _In_ BOOL);
+/* Undocumented */
+BOOL WINAPI SetConsoleIcon(_In_ HICON);
 /* Undocumented, see http://comments.gmane.org/gmane.comp.lang.harbour.devel/27844 */
 BOOL WINAPI SetConsolePalette(_In_ HANDLE, _In_ HPALETTE, _In_ UINT);
+/* Undocumented */
+BOOL WINAPI CloseConsoleHandle(_In_ HANDLE);
+// HANDLE WINAPI GetStdHandle(_In_ DWORD);
+// BOOL WINAPI SetStdHandle(_In_ DWORD, _In_ HANDLE);
+/* Undocumented */
+BOOL WINAPI VerifyConsoleIoHandle(_In_ HANDLE);
 
 BOOL
 WINAPI
Index: include/psdk/ntlsa.h
===================================================================
--- include/psdk/ntlsa.h	(rÃ©vision 61927)
+++ include/psdk/ntlsa.h	(copie de travail)
@@ -57,6 +57,20 @@
 #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON      0x00000400
 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800
 
+#ifdef _NTIFS_INCLUDED_ // HACK to avoid redefinition from ntsecapi.h
+typedef enum _POLICY_AUDIT_EVENT_TYPE
+{
+    AuditCategorySystem,
+    AuditCategoryLogon,
+    AuditCategoryObjectAccess,
+    AuditCategoryPrivilegeUse,
+    AuditCategoryDetailedTracking,
+    AuditCategoryPolicyChange,
+    AuditCategoryAccountManagement,
+    AuditCategoryDirectoryServiceAccess,
+    AuditCategoryAccountLogon
+} POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE;
+#endif
 
 #ifdef __cplusplus
 }
Index: include/psdk/strsafe.h
===================================================================
--- include/psdk/strsafe.h	(rÃ©vision 61927)
+++ include/psdk/strsafe.h	(copie de travail)
@@ -12,6 +12,11 @@
 #include <stdarg.h>
 #include <specstrings.h>
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-attributes"
+#endif
+
 #ifndef _SIZE_T_DEFINED
 #define _SIZE_T_DEFINED
 #undef size_t
@@ -2059,4 +2064,9 @@
 #undef _getws
 #define _getws _getws_instead_use_StringCbGetsW_or_StringCchGetsW;
 #endif
+
+#ifdef __clang__
+#pragma clang diagnostic pop
 #endif
+
+#endif /* _STRSAFE_H_INCLUDED_ */
Index: include/psdk/shlguid_undoc.h
===================================================================
--- include/psdk/shlguid_undoc.h	(rÃ©vision 61927)
+++ include/psdk/shlguid_undoc.h	(copie de travail)
@@ -105,6 +105,8 @@
 DEFINE_GUID(CLSID_ShellDrvDefExt,          0x5F5295E0, 0x429F, 0x1069, 0xA2, 0xE2, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_ShellNetDefExt,          0x86422020, 0x42A0, 0x1069, 0xA2, 0xE5, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 
+DEFINE_GUID(CLSID_ExeDropHandler, 		   0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
+
 #define CGID_IExplorerToolbar IID_IExplorerToolbar
 #define SID_IExplorerToolbar IID_IExplorerToolbar
 #define SID_ITargetFrame2 IID_ITargetFrame2
Index: include/psdk/commctrl.h
===================================================================
--- include/psdk/commctrl.h	(rÃ©vision 61927)
+++ include/psdk/commctrl.h	(copie de travail)
@@ -949,7 +949,6 @@
 #define TBSTYLE_CUSTOMERASE 0x2000
 #define TBSTYLE_REGISTERDROP 0x4000
 #define TBSTYLE_TRANSPARENT 0x8000
-#define TBSTYLE_EX_DRAWDDARROWS 0x1
 
 #define BTNS_BUTTON TBSTYLE_BUTTON
 #define BTNS_SEP TBSTYLE_SEP
@@ -962,9 +961,12 @@
 #define BTNS_SHOWTEXT 0x40
 #define BTNS_WHOLEDROPDOWN 0x80
 
-#define TBSTYLE_EX_MIXEDBUTTONS 0x8
-#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x10
-#define TBSTYLE_EX_DOUBLEBUFFER 0x80
+#define TBSTYLE_EX_DRAWDDARROWS         0x00000001
+#define TBSTYLE_EX_MULTICOLUMN          0x00000002
+#define TBSTYLE_EX_VERTICAL             0x00000004
+#define TBSTYLE_EX_MIXEDBUTTONS         0x00000008
+#define TBSTYLE_EX_HIDECLIPPEDBUTTONS   0x00000010 /* don't show partially obscured buttons */
+#define TBSTYLE_EX_DOUBLEBUFFER         0x00000080 /* Double Buffer the toolbar */
 
   typedef struct _NMTBCUSTOMDRAW {
     NMCUSTOMDRAW nmcd;
Index: configure.sh
===================================================================
--- configure.sh	(rÃ©vision 61927)
+++ configure.sh	(copie de travail)
@@ -59,6 +59,6 @@
 cd ../reactos
 rm -f CMakeCache.txt
 
-cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=1 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build commands \(ex: ninja, make, makex, etc...\).
Index: win32ss/CMakeLists.txt
===================================================================
--- win32ss/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/CMakeLists.txt	(copie de travail)
@@ -179,8 +179,7 @@
     gdi/ntgdi/xformobj.c
     gdi/eng/stubs.c
     gdi/eng/umpdstubs.c
-    win32k.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
+    pch.h)
 
 if(USE_DIBLIB)
     add_definitions(-D_USE_DIBLIB_)
@@ -218,8 +217,13 @@
 endif()
 
 add_asm_files(win32k_asm ${ASM_SOURCE})
-add_library(win32k SHARED ${SOURCE} ${win32k_asm})
 
+add_library(win32k SHARED
+    ${SOURCE}
+    ${win32k_asm}
+    win32k.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
+
 set_module_type(win32k kernelmodedriver)
 
 target_link_libraries(win32k
@@ -232,7 +236,7 @@
 endif()
 
 add_importlibs(win32k ntoskrnl hal ftfd)
-add_pch(win32k pch.h)
+add_pch(win32k pch.h SOURCE)
 add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
 
 set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
Index: win32ss/drivers/videoprt/videoprt.c
===================================================================
--- win32ss/drivers/videoprt/videoprt.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/videoprt.c	(copie de travail)
@@ -19,9 +19,15 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#include <stdio.h>
+#include <ndk/exfuncs.h>
+#include <ndk/rtlfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBAL VARIABLES ***********************************************************/
 
 ULONG CsrssInitialized = FALSE;
@@ -1473,4 +1479,3 @@
 
     return FALSE;
 }
-
Index: win32ss/drivers/videoprt/CMakeLists.txt
===================================================================
--- win32ss/drivers/videoprt/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/CMakeLists.txt	(copie de travail)
@@ -22,14 +22,17 @@
     stubs.c
     timer.c
     videoprt.c
+    videoprt.h)
+
+add_library(videoprt SHARED
+    ${SOURCE}
+    guid.c
     videoprt.rc
     ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def)
 
-add_library(videoprt SHARED ${SOURCE})
-
 set_module_type(videoprt kernelmodedriver)
 add_importlibs(videoprt ntoskrnl hal)
 
-add_pch(videoprt videoprt.h)
+add_pch(videoprt videoprt.h SOURCE)
 add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all)
 
Index: win32ss/drivers/videoprt/interrupt.c
===================================================================
--- win32ss/drivers/videoprt/interrupt.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/interrupt.c	(copie de travail)
@@ -21,6 +21,11 @@
 
 #include "videoprt.h"
 
+#include <ndk/halfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 BOOLEAN NTAPI
Index: win32ss/drivers/videoprt/dispatch.c
===================================================================
--- win32ss/drivers/videoprt/dispatch.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/dispatch.c	(copie de travail)
@@ -21,6 +21,12 @@
 
 #include "videoprt.h"
 
+#include <ndk/inbvfuncs.h>
+#include <ndk/psfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBAL VARIABLES ***********************************************************/
 
 PVIDEO_PORT_DEVICE_EXTENSION ResetDisplayParametersDeviceExtension = NULL;
Index: win32ss/drivers/videoprt/stubs.c
===================================================================
--- win32ss/drivers/videoprt/stubs.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/stubs.c	(copie de travail)
@@ -19,9 +19,11 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VP_STATUS
 NTAPI
 VideoPortFlushRegistry(
Index: win32ss/drivers/videoprt/videoprt.h
===================================================================
--- win32ss/drivers/videoprt/videoprt.h	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/videoprt.h	(copie de travail)
@@ -22,16 +22,7 @@
 #ifndef VIDEOPRT_H
 #define VIDEOPRT_H
 
-#include <stdio.h>
-
 #include <ntifs.h>
-#include <ndk/exfuncs.h>
-#include <ndk/halfuncs.h>
-#include <ndk/inbvfuncs.h>
-#include <ndk/kefuncs.h>
-#include <ndk/rtlfuncs.h>
-#include <ndk/obfuncs.h>
-#include <ndk/psfuncs.h>
 
 #define __BROKEN__
 #include <miniport.h>
@@ -39,11 +30,8 @@
 #include <ntagp.h>
 #include <dderror.h>
 #include <windef.h>
-#include <initguid.h>
 #include <wdmguid.h>
 
-#include <debug.h>
-
 #define TAG_VIDEO_PORT  'PDIV'
 #define TAG_VIDEO_PORT_BUFFER  '\0mpV'
 #define TAG_REQUEST_PACKET 'qRpV'
Index: win32ss/drivers/videoprt/dma.c
===================================================================
--- win32ss/drivers/videoprt/dma.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/dma.c	(copie de travail)
@@ -9,6 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <videoprt.h>
+
 #define NDEBUG
 #include <debug.h>
 
Index: win32ss/drivers/videoprt/agp.c
===================================================================
--- win32ss/drivers/videoprt/agp.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/agp.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS
@@ -566,4 +569,3 @@
 
    return STATUS_SUCCESS;
 }
-
Index: win32ss/drivers/videoprt/registry.c
===================================================================
--- win32ss/drivers/videoprt/registry.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/registry.c	(copie de travail)
@@ -21,6 +21,11 @@
 
 #include "videoprt.h"
 
+#include <ndk/obfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 IntCopyRegistryKey(
@@ -633,4 +638,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: win32ss/drivers/videoprt/timer.c
===================================================================
--- win32ss/drivers/videoprt/timer.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/timer.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 VOID NTAPI
Index: win32ss/drivers/videoprt/event.c
===================================================================
--- win32ss/drivers/videoprt/event.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/event.c	(copie de travail)
@@ -11,6 +11,9 @@
 #include "videoprt.h"
 #include "../../gdi/eng/engevent.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 /*
@@ -137,4 +140,3 @@
 }
 
 /* EOF */
-
Index: win32ss/drivers/videoprt/spinlock.c
===================================================================
--- win32ss/drivers/videoprt/spinlock.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/spinlock.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
  * @implemented
  */
Index: win32ss/drivers/videoprt/services.c
===================================================================
--- win32ss/drivers/videoprt/services.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/services.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VOID NTAPI
 IntInterfaceReference(PVOID Context)
 {
Index: win32ss/drivers/videoprt/child.c
===================================================================
--- win32ss/drivers/videoprt/child.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/child.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 BOOLEAN
Index: win32ss/drivers/videoprt/funclist.c
===================================================================
--- win32ss/drivers/videoprt/funclist.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/funclist.c	(copie de travail)
@@ -19,9 +19,11 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct _VIDEO_PORT_FUNCTION_TABLE {
     PVOID Address;
     PUCHAR Name;
Index: win32ss/drivers/videoprt/resource.c
===================================================================
--- win32ss/drivers/videoprt/resource.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/resource.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS NTAPI
Index: win32ss/drivers/videoprt/ddc.c
===================================================================
--- win32ss/drivers/videoprt/ddc.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/ddc.c	(copie de travail)
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 #define DDC_EEPROM_ADDRESS  0xA0
 
 /* PRIVATE FUNCTIONS **********************************************************/
@@ -222,4 +225,3 @@
    INFO_(VIDEOPRT, "VideoPortDDCMonitorHelper() - SUCCESS!\n");
    return TRUE;
 }
-
Index: win32ss/drivers/videoprt/int10.c
===================================================================
--- win32ss/drivers/videoprt/int10.c	(rÃ©vision 61927)
+++ win32ss/drivers/videoprt/int10.c	(copie de travail)
@@ -21,6 +21,11 @@
 
 #include "videoprt.h"
 
+#include <ndk/kefuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 #if defined(_M_IX86) || defined(_M_AMD64)
Index: win32ss/drivers/videoprt/guid.c
===================================================================
--- win32ss/drivers/videoprt/guid.c	(rÃ©vision 0)
+++ win32ss/drivers/videoprt/guid.c	(rÃ©vision 62573)
@@ -0,0 +1,6 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <wdmguid.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modification de propriÃ©tÃ©s sur win32ss/drivers/videoprt/guid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: win32ss/drivers/miniport/vbe/vbemp.c
===================================================================
--- win32ss/drivers/miniport/vbe/vbemp.c	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vbe/vbemp.c	(copie de travail)
@@ -29,6 +29,8 @@
 
 #include "vbemp.h"
 
+#include <devioctl.h>
+
 #undef LOWORD
 #undef HIWORD
 #define LOWORD(l)	((USHORT)((ULONG_PTR)(l)))
Index: win32ss/drivers/miniport/vbe/CMakeLists.txt
===================================================================
--- win32ss/drivers/miniport/vbe/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vbe/CMakeLists.txt	(copie de travail)
@@ -1,11 +1,12 @@
 
-add_library(vbemp SHARED
+list(APPEND SOURCE
     edid.c
     vbemp.c
-    vbemp.rc)
+    vbemp.h)
 
+add_library(vbemp SHARED ${SOURCE} vbemp.rc)
 set_module_type(vbemp kernelmodedriver)
 add_importlibs(vbemp videoprt)
-add_pch(vbemp vbemp.h)
+add_pch(vbemp vbemp.h SOURCE)
 target_link_libraries(vbemp libcntpr)
 add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all)
Index: win32ss/drivers/miniport/vbe/vbemp.h
===================================================================
--- win32ss/drivers/miniport/vbe/vbemp.h	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vbe/vbemp.h	(copie de travail)
@@ -18,14 +18,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef _VBEMP_PCH_
+#define _VBEMP_PCH_
+
 /* INCLUDES *******************************************************************/
 
-#include "ntdef.h"
-#include "dderror.h"
-#include "devioctl.h"
-#include "miniport.h"
-#include "ntddvdeo.h"
-#include "video.h"
+#include <ntdef.h>
+#include <dderror.h>
+#include <miniport.h>
+#include <video.h>
 
 #define TAG_VBE ' EBV'
 
@@ -302,3 +303,5 @@
    PVBE_DEVICE_EXTENSION DeviceExtension,
    PVIDEO_CLUT ColorLookUpTable,
    PSTATUS_BLOCK StatusBlock);
+
+#endif /* _VBEMP_PCH_ */
Index: win32ss/drivers/miniport/vga/vgavideo.h
===================================================================
--- win32ss/drivers/miniport/vga/vgavideo.h	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga/vgavideo.h	(copie de travail)
@@ -1,3 +1,4 @@
+#pragma once
 
 #define VGA_NORMAL 0
 #define VGA_AND    8
Index: win32ss/drivers/miniport/vga/vgamp.c
===================================================================
--- win32ss/drivers/miniport/vga/vgamp.c	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga/vgamp.c	(copie de travail)
@@ -7,6 +7,9 @@
 
 #include "vgamp.h"
 
+#include <dderror.h>
+#include <devioctl.h>
+
 //  -------------------------------------------------------  Public Interface
 
 //    DriverEntry
Index: win32ss/drivers/miniport/vga/CMakeLists.txt
===================================================================
--- win32ss/drivers/miniport/vga/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga/CMakeLists.txt	(copie de travail)
@@ -2,12 +2,12 @@
 list(APPEND SOURCE
     initvga.c
     vgamp.c
-    vgamp.rc)
+    vgamp.h)
 
-add_library(vgamp SHARED ${SOURCE})
+add_library(vgamp SHARED ${SOURCE} vgamp.rc)
 
 set_module_type(vgamp kernelmodedriver)
 add_importlibs(vgamp videoprt)
 
-add_pch(vgamp vgamp.h)
+add_pch(vgamp vgamp.h SOURCE)
 add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all)
Index: win32ss/drivers/miniport/vga/vgamp.h
===================================================================
--- win32ss/drivers/miniport/vga/vgamp.h	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga/vgamp.h	(copie de travail)
@@ -23,13 +23,9 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "ntdef.h"
-#include "dderror.h"
-#include "devioctl.h"
-#include "miniport.h"
-#include "ntddvdeo.h"
-#include "video.h"
-#include "vgavideo.h"
+#include <ntdef.h>
+#include <miniport.h>
+#include <video.h>
 
 #define UNIMPLEMENTED \
    VideoPortDebugPrint(Error, "WARNING:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__);
Index: win32ss/drivers/miniport/vga/initvga.c
===================================================================
--- win32ss/drivers/miniport/vga/initvga.c	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga/initvga.c	(copie de travail)
@@ -1,5 +1,7 @@
 #include "vgamp.h"
 
+#include "vgavideo.h"
+
 static VGA_REGISTERS Mode12Regs =
 {
    /* CRT Controller Registers */
Index: win32ss/drivers/miniport/vga_new/CMakeLists.txt
===================================================================
--- win32ss/drivers/miniport/vga_new/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga_new/CMakeLists.txt	(copie de travail)
@@ -4,7 +4,8 @@
     vgadata.c
     vga.c
     vbemodes.c
-    vbe.c)
+    vbe.c
+    vga.h)
 
 add_library(vga SHARED
     ${SOURCE}
@@ -21,6 +22,6 @@
 set_module_type(vga kernelmodedriver)
 add_importlibs(vga videoprt)
 
-add_pch(vga vga.h)
+add_pch(vga vga.h SOURCE)
 
 add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
Index: win32ss/drivers/miniport/vga_new/vga.c
===================================================================
--- win32ss/drivers/miniport/vga_new/vga.c	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga_new/vga.c	(copie de travail)
@@ -11,6 +11,8 @@
 
 #include "vga.h"
 
+#include <devioctl.h>
+
 //---------------------------------------------------------------------------
 //
 // Function declarations
Index: win32ss/drivers/miniport/vga_new/cmdcnst.h
===================================================================
--- win32ss/drivers/miniport/vga_new/cmdcnst.h	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga_new/cmdcnst.h	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS:     Copyright (c) 1992  Microsoft Corporation
  */
 
+#pragma once
  
 //--------------------------------------------------------------------------
 //   Definition of the set/clear mode command language.
Index: win32ss/drivers/miniport/vga_new/modeset.c
===================================================================
--- win32ss/drivers/miniport/vga_new/modeset.c	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga_new/modeset.c	(copie de travail)
@@ -896,4 +896,3 @@
     VgaInterpretCmdStream(HwDeviceExtension, DisableA000Color);
 
 }
-
Index: win32ss/drivers/miniport/vga_new/vbe.h
===================================================================
--- win32ss/drivers/miniport/vga_new/vbe.h	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga_new/vbe.h	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
+#pragma once
 
 #define LOWORD(l)	((USHORT)((ULONG_PTR)(l)))
 #define HIWORD(l)	((USHORT)(((ULONG_PTR)(l)>>16)&0xFFFF))
Index: win32ss/drivers/miniport/vga_new/vga.h
===================================================================
--- win32ss/drivers/miniport/vga_new/vga.h	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vga_new/vga.h	(copie de travail)
@@ -7,12 +7,14 @@
  *                  ReactOS Portable Systems Group
  */
 
-#include "ntdef.h"
-#include "dderror.h"
-#include "devioctl.h"
-#include "miniport.h"
-#include "ntddvdeo.h"
-#include "video.h"
+#ifndef _VGA_NEW_PCH_
+#define _VGA_NEW_PCH_
+
+#include <ntdef.h>
+#include <dderror.h>
+#include <miniport.h>
+#include <video.h>
+
 #include "cmdcnst.h"
 
 //
@@ -447,3 +449,5 @@
 #define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24))
 
 #include "vbe.h"
+
+#endif /* _VGA_NEW_PCH_ */
Index: win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
===================================================================
--- win32ss/drivers/miniport/vmx_svga/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/miniport/vmx_svga/CMakeLists.txt	(copie de travail)
@@ -5,5 +5,3 @@
 
 set_module_type(vmx_svga kernelmodedriver)
 add_importlibs(vmx_svga ntoskrnl videoprt)
-
-add_pch(vmx_svga precomp.h)
Index: win32ss/drivers/font/bmfd/CMakeLists.txt
===================================================================
--- win32ss/drivers/font/bmfd/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/font/bmfd/CMakeLists.txt	(copie de travail)
@@ -1,13 +1,15 @@
 
-add_library(bmfd SHARED
+list(APPEND SOURCE
     enable.c
     font.c
-    glyph.c)
+    glyph.c
+    bmfd.h)
 
-add_pch(bmfd bmfd.h)
+add_library(bmfd SHARED ${SOURCE})
 set_entrypoint(bmfd BmfdEnableDriver 12)
 set_subsystem(bmfd native)
 set_image_base(bmfd 0x00010000)
 target_link_libraries(bmfd libcntpr)
 add_importlibs(bmfd win32k)
+add_pch(bmfd bmfd.h SOURCE)
 add_dependencies(bmfd psdk bugcodes)
Index: win32ss/drivers/font/bmfd/bmfd.h
===================================================================
--- win32ss/drivers/font/bmfd/bmfd.h	(rÃ©vision 61927)
+++ win32ss/drivers/font/bmfd/bmfd.h	(copie de travail)
@@ -5,6 +5,9 @@
  * PROGRAMMER:      Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
+#ifndef _BMFD_PCH_
+#define _BMFD_PCH_
+
 #include <stdarg.h>
 #include <windef.h>
 #include <wingdi.h>
@@ -364,3 +367,4 @@
 BmfdDestroyFont(
     IN FONTOBJ *pfo);
 
+#endif /* _BMFD_PCH_ */
Index: win32ss/drivers/font/ftfd/ftfd.h
===================================================================
--- win32ss/drivers/font/ftfd/ftfd.h	(rÃ©vision 61927)
+++ win32ss/drivers/font/ftfd/ftfd.h	(copie de travail)
@@ -5,6 +5,9 @@
  * PROGRAMMER:      Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
+#ifndef _FTFD_PCH_
+#define _FTFD_PCH_
+
 #include <stdarg.h>
 #include <windef.h>
 #include <wingdi.h>
@@ -148,3 +151,4 @@
 	PVOID pv,
 	ULONG cjSize);
 
+#endif /* _FTFD_PCH_ */
Index: win32ss/drivers/font/ftfd/CMakeLists.txt
===================================================================
--- win32ss/drivers/font/ftfd/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/font/ftfd/CMakeLists.txt	(copie de travail)
@@ -3,11 +3,15 @@
 
 spec2def(ftfd.dll ftfd.spec ADD_IMPORTLIB)
 
-add_library(ftfd SHARED
+list(APPEND SOURCE
     enable.c
     font.c
     glyph.c
     rosglue.c
+    ftfd.h)
+
+add_library(ftfd SHARED
+    ${SOURCE}
     sprintf.c
     freetype.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def)
@@ -20,7 +24,7 @@
     freetype
     libcntpr)
 
-add_pch(ftfd ftfd.h)
+add_pch(ftfd ftfd.h SOURCE)
 add_importlibs(ftfd win32k)
 add_dependencies(ftfd psdk)
 add_cd_file(TARGET ftfd DESTINATION reactos/system32 FOR all)
Index: win32ss/drivers/displays/framebuf/dd.c
===================================================================
--- win32ss/drivers/displays/framebuf/dd.c	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf/dd.c	(copie de travail)
@@ -22,7 +22,6 @@
 
 #include "framebuf.h"
 
-
 DWORD CALLBACK
 DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd)
 {
@@ -113,4 +112,3 @@
 	pcsd->ddRVal = DD_OK;
     return DDHAL_DRIVER_HANDLED;
 }
-
Index: win32ss/drivers/displays/framebuf/CMakeLists.txt
===================================================================
--- win32ss/drivers/displays/framebuf/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf/CMakeLists.txt	(copie de travail)
@@ -1,16 +1,20 @@
 
 spec2def(framebuf.dll framebuf.spec)
 
-add_library(framebuf SHARED
+list(APPEND SOURCE
     enable.c
     palette.c
     pointer.c
     screen.c
     surface.c
+    framebuf.h)
+
+add_library(framebuf SHARED
+    ${SOURCE}
     framebuf.rc
     ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def)
 
-add_pch(framebuf framebuf.h)
+add_pch(framebuf framebuf.h SOURCE)
 set_entrypoint(framebuf DrvEnableDriver 12)
 set_subsystem(framebuf native)
 set_image_base(framebuf 0x00010000)
Index: win32ss/drivers/displays/framebuf/framebuf.h
===================================================================
--- win32ss/drivers/displays/framebuf/framebuf.h	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf/framebuf.h	(copie de travail)
@@ -18,9 +18,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef _FRAMEBUF_PCH_
+#define _FRAMEBUF_PCH_
+
 #include <stdarg.h>
 #include <windef.h>
-#include <guiddef.h>
 #include <wingdi.h>
 #include <winddi.h>
 #include <winioctl.h>
@@ -157,3 +159,5 @@
    IN PPALETTEENTRY ppalent,
    IN ULONG iStart,
    IN ULONG cColors);
+
+#endif /* _FRAMEBUF_PCH_ */
Index: win32ss/drivers/displays/framebuf/ddenable.c
===================================================================
--- win32ss/drivers/displays/framebuf/ddenable.c	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf/ddenable.c	(copie de travail)
@@ -257,4 +257,3 @@
 
 	return TRUE;
 }
-
Index: win32ss/drivers/displays/vga/vgaddi.h
===================================================================
--- win32ss/drivers/displays/vga/vgaddi.h	(rÃ©vision 61927)
+++ win32ss/drivers/displays/vga/vgaddi.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _VGADDI_PCH_
+#define _VGADDI_PCH_
+
 #define _WINBASE_
 #define _WINDOWS_H
 #include <stdarg.h>
@@ -281,3 +284,5 @@
 
 VOID FASTCALL
 vgaWriteScan(int x, int y, int w, void *b);
+
+#endif /* _VGADDI_PCH_ */
Index: win32ss/drivers/displays/vga/CMakeLists.txt
===================================================================
--- win32ss/drivers/displays/vga/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/displays/vga/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 spec2def(vgaddi.dll vgaddi.spec)
 
-add_library(vgaddi SHARED
+list(APPEND SOURCE
     main/enable.c
     objects/screen.c
     objects/pointer.c
@@ -12,6 +12,10 @@
     objects/offscreen.c
     objects/copybits.c
     vgavideo/vgavideo.c
+    vgaddi.h)
+
+add_library(vgaddi SHARED
+    ${SOURCE}
     vgaddi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def)
 
@@ -18,7 +22,7 @@
 set_entrypoint(vgaddi DrvEnableDriver 12)
 set_subsystem(vgaddi native)
 set_image_base(vgaddi 0x00010000)
-add_pch(vgaddi vgaddi.h)
+add_pch(vgaddi vgaddi.h SOURCE)
 add_importlibs(vgaddi win32k)
 target_link_libraries(vgaddi libcntpr)
 add_dependencies(vgaddi psdk bugcodes)
Index: win32ss/drivers/displays/framebuf_new/screen.c
===================================================================
--- win32ss/drivers/displays/framebuf_new/screen.c	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf_new/screen.c	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS:     Copyright (c) 1992-1995 Microsoft Corporation
  *                  ReactOS Portable Systems Group
  */
+
 #include "driver.h"
 
 #define SYSTM_LOGFONT {16,7,0,0,700,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,VARIABLE_PITCH | FF_DONTCARE,L"System"}
Index: win32ss/drivers/displays/framebuf_new/driver.h
===================================================================
--- win32ss/drivers/displays/framebuf_new/driver.h	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf_new/driver.h	(copie de travail)
@@ -6,16 +6,17 @@
  * PROGRAMMERS:     Copyright (c) 1992-1995 Microsoft Corporation
  *                  ReactOS Portable Systems Group
  */
- 
+
+#ifndef _FRAMEBUF_NEW_PCH_
+#define _FRAMEBUF_NEW_PCH_
+
 //#define DBG 1
-#include "stddef.h"
 #include <stdarg.h>
-#include <string.h>
-#include "windef.h"
-#include "wingdi.h"
-#include "winddi.h"
-#include "devioctl.h"
-#include "ntddvdeo.h"
+#include <windef.h>
+#include <wingdi.h>
+#include <winddi.h>
+#include <devioctl.h>
+#include <ntddvdeo.h>
 #include "debug.h"
 
 typedef struct  _PDEV
@@ -74,3 +75,5 @@
 #define ALLOC_TAG               'bfDD'        // Four byte tag (characters in
                                               // reverse order) used for memory
                                               // allocations
+
+#endif /* _FRAMEBUF_NEW_PCH_ */
Index: win32ss/drivers/displays/framebuf_new/CMakeLists.txt
===================================================================
--- win32ss/drivers/displays/framebuf_new/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/drivers/displays/framebuf_new/CMakeLists.txt	(copie de travail)
@@ -7,11 +7,12 @@
     palette.c
     pointer.c
     screen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def)
+    driver.h)
 
 add_library(framebuf_new SHARED
     ${SOURCE}
-    framebuf_new.rc)
+    framebuf_new.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def)
 
 set_entrypoint(framebuf_new DrvEnableDriver 12)
 set_subsystem(framebuf_new native)
@@ -18,5 +19,5 @@
 set_image_base(framebuf_new 0x00010000)
 target_link_libraries(framebuf_new libcntpr)
 add_importlibs(framebuf_new win32k)
-add_pch(framebuf_new driver.h)
+add_pch(framebuf_new driver.h SOURCE)
 add_dependencies(framebuf_new psdk bugcodes)
Index: win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.c
===================================================================
--- win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.c	(copie de travail)
@@ -197,7 +197,7 @@
     // TermInfo->FontSize = MAKELONG(16, 16); // font is 16x16
     // TermInfo->FontWeight = FW_NORMAL;
 
-    wcsncpy(TermInfo->FaceName, L"Fixedsys", LF_FACESIZE); // HACK: !!
+    wcsncpy(TermInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !!
     // TermInfo->FaceName[0] = L'\0';
     TermInfo->FontFamily = FF_DONTCARE;
     TermInfo->FontSize   = 0;
Index: win32ss/user/winsrv/consrv_new/handle.c
===================================================================
--- win32ss/user/winsrv/consrv_new/handle.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv_new/handle.c	(copie de travail)
@@ -438,8 +438,8 @@
          /*(Type != 0 && ObjectEntry->Type != Type)*/
          (Type != 0 && (ObjectEntry->Type & Type) == 0) )
     {
-        DPRINT1("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n",
-                Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0));
+        DPRINT("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n",
+               Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0));
 
         RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
         return STATUS_INVALID_HANDLE;
Index: win32ss/user/winsrv/usersrv.cmake
===================================================================
--- win32ss/user/winsrv/usersrv.cmake	(rÃ©vision 61927)
+++ win32ss/user/winsrv/usersrv.cmake	(copie de travail)
@@ -7,9 +7,11 @@
     usersrv/register.c
     usersrv/shutdown.c
     # usersrv/usersrv.rc
+    usersrv/usersrv.h
     )
 
 add_library(usersrv ${USERSRV_SOURCE})
+add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE)
 #add_object_library(usersrv ${USERSRV_SOURCE})
 
 set_module_type(usersrv module UNICODE)
Index: win32ss/user/winsrv/consrv.cmake
===================================================================
--- win32ss/user/winsrv/consrv.cmake	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv.cmake	(copie de travail)
@@ -29,6 +29,7 @@
     consrv/frontends/gui/text.c
     consrv/frontends/tui/tuiterm.c
     # consrv/consrv.rc
+    consrv/consrv.h
     )
 
 #
@@ -45,6 +46,7 @@
 endif()
 
 add_library(consrv ${CONSRV_SOURCE})
+add_pch(consrv consrv/consrv.h CONSRV_SOURCE)
 #add_object_library(consrv ${CONSRV_SOURCE})
 
 list(APPEND CONSRV_IMPORT_LIBS psapi)
Index: win32ss/user/winsrv/usersrv/harderror.c
===================================================================
--- win32ss/user/winsrv/usersrv/harderror.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/usersrv/harderror.c	(copie de travail)
@@ -11,11 +11,13 @@
 
 #include "usersrv.h"
 
+#include <ndk/mmfuncs.h>
+#include <pseh/pseh2.h>
+#include <strsafe.h>
+
 #define NDEBUG
 #include <debug.h>
 
-#include <strsafe.h>
-
 #define IDTRYAGAIN 10
 #define IDCONTINUE 11
 
Index: win32ss/user/winsrv/usersrv/shutdown.c
===================================================================
--- win32ss/user/winsrv/usersrv/shutdown.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/usersrv/shutdown.c	(copie de travail)
@@ -11,8 +11,15 @@
 /* INCLUDES *******************************************************************/
 
 #include "usersrv.h"
+
+#include <stdlib.h>
+#include <winreg.h>
+#include <winlogon.h>
+#include <commctrl.h>
 #include <sddl.h>
 
+#include "resource.h"
+
 #define NDEBUG
 #include <debug.h>
 
Index: win32ss/user/winsrv/usersrv/api.h
===================================================================
--- win32ss/user/winsrv/usersrv/api.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/usersrv/api.h	(copie de travail)
@@ -28,5 +28,3 @@
 CSR_API(SrvEndTask);
 CSR_API(SrvLogon);
 CSR_API(SrvRecordShutdownReason);
-
-/* EOF */
Index: win32ss/user/winsrv/usersrv/usersrv.h
===================================================================
--- win32ss/user/winsrv/usersrv/usersrv.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/usersrv/usersrv.h	(copie de travail)
@@ -9,23 +9,19 @@
 #ifndef __USERSRV_H__
 #define __USERSRV_H__
 
-#pragma once
-
 /* PSDK/NDK Headers */
 #include <stdarg.h>
-#include <stdlib.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <winreg.h>
 #include <winuser.h>
+
 #define NTOS_MODE_USER
-#include <ndk/iofuncs.h>
-#include <ndk/kefuncs.h>
-#include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
 #include <ndk/rtlfuncs.h>
@@ -33,12 +29,6 @@
 /* Public Win32K Headers */
 #include <ntuser.h>
 
-/* PSEH for SEH Support */
-#include <pseh/pseh2.h>
-
-/* External Winlogon Header */
-#include <winlogon.h>
-
 /* CSRSS Header */
 #include <csr/csrsrv.h>
 
@@ -45,17 +35,9 @@
 /* USER Headers */
 #include <win/winmsg.h>
 
-/* Public Win32 Headers */
-#include <commctrl.h>
-
-#include "resource.h"
-
-
 /* Globals */
 extern HINSTANCE UserServerDllInstance;
 extern HANDLE UserServerHeap;
 extern ULONG_PTR LogonProcessId;
 
-#endif // __USERSRV_H__
-
-/* EOF */
+#endif /* __USERSRV_H__ */
Index: win32ss/user/winsrv/usersrv/init.c
===================================================================
--- win32ss/user/winsrv/usersrv/init.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/usersrv/init.c	(copie de travail)
@@ -10,6 +10,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "usersrv.h"
+
 #include "api.h"
 
 #define NDEBUG
Index: win32ss/user/winsrv/consrv/condrv/coninput.c
===================================================================
--- win32ss/user/winsrv/consrv/condrv/coninput.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/condrv/coninput.c	(copie de travail)
@@ -9,16 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "lineinput.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole)     \
Index: win32ss/user/winsrv/consrv/condrv/conoutput.c
===================================================================
--- win32ss/user/winsrv/consrv/condrv/conoutput.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/condrv/conoutput.c	(copie de travail)
@@ -9,17 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS
Index: win32ss/user/winsrv/consrv/condrv/graphics.c
===================================================================
--- win32ss/user/winsrv/consrv/condrv/graphics.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/condrv/graphics.c	(copie de travail)
@@ -11,16 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 CONSOLE_IO_OBJECT_TYPE
@@ -93,7 +88,8 @@
     /* We do not use anything else than uncompressed bitmaps */
     if (GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression != BI_RGB)
     {
-        DPRINT1("biCompression == %d != BI_RGB, correct that!\n", GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression);
+        DPRINT1("biCompression == %d != BI_RGB, fix that!\n",
+                GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression);
         GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression = BI_RGB;
     }
 
Index: win32ss/user/winsrv/consrv/condrv/console.c
===================================================================
--- win32ss/user/winsrv/consrv/condrv/console.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/condrv/console.c	(copie de travail)
@@ -10,20 +10,10 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "procinit.h"
-#include "alias.h"
-#include "coninput.h"
-#include "conoutput.h"
-#include "lineinput.h"
-#include "include/settings.h"
+#include <consrv.h>
 
-#include "include/console.h"
-#include "console.h"
-#include "resource.h"
+#include <alias.h>
+#include <coninput.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -1017,12 +1007,12 @@
 NTSTATUS NTAPI
 ConDrvGetConsoleCP(IN PCONSOLE Console,
                    OUT PUINT CodePage,
-                   IN BOOLEAN InputCP)
+                   IN BOOLEAN OutputCP)
 {
     if (Console == NULL || CodePage == NULL)
         return STATUS_INVALID_PARAMETER;
 
-    *CodePage = (InputCP ? Console->CodePage : Console->OutputCodePage);
+    *CodePage = (OutputCP ? Console->OutputCodePage : Console->CodePage);
 
     return STATUS_SUCCESS;
 }
@@ -1030,15 +1020,15 @@
 NTSTATUS NTAPI
 ConDrvSetConsoleCP(IN PCONSOLE Console,
                    IN UINT CodePage,
-                   IN BOOLEAN InputCP)
+                   IN BOOLEAN OutputCP)
 {
     if (Console == NULL || !IsValidCodePage(CodePage))
         return STATUS_INVALID_PARAMETER;
 
-    if (InputCP)
+    if (OutputCP)
+        Console->OutputCodePage = CodePage;
+    else
         Console->CodePage = CodePage;
-    else
-        Console->OutputCodePage = CodePage;
 
     return STATUS_SUCCESS;
 }
Index: win32ss/user/winsrv/consrv/condrv/text.c
===================================================================
--- win32ss/user/winsrv/consrv/condrv/text.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/condrv/text.c	(copie de travail)
@@ -9,21 +9,15 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 #define TAB_WIDTH   8
 
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 CONSOLE_IO_OBJECT_TYPE
@@ -591,7 +585,79 @@
     return STATUS_SUCCESS;
 }
 
+NTSTATUS NTAPI
+ConDrvChangeScreenBufferAttributes(IN PCONSOLE Console,
+                                   IN PTEXTMODE_SCREEN_BUFFER Buffer,
+                                   IN USHORT NewScreenAttrib,
+                                   IN USHORT NewPopupAttrib)
+{
+    DWORD X, Y, Length;
+    PCHAR_INFO Ptr;
 
+    COORD  TopLeft = {0};
+    ULONG  NumCodesToWrite = Buffer->ScreenBufferSize.X * Buffer->ScreenBufferSize.Y;
+    USHORT OldScreenAttrib = Buffer->ScreenDefaultAttrib;
+
+    if (Console == NULL || Buffer == NULL)
+    {
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Validity check */
+    ASSERT(Console == Buffer->Header.Console);
+
+    X = TopLeft.X;
+    Y = (TopLeft.Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y;
+    Length = NumCodesToWrite;
+    // Ptr = ConioCoordToPointer(Buffer, X, Y); // Doesn't work
+    // Ptr = &Buffer->Buffer[X + Y * Buffer->ScreenBufferSize.X]; // May work
+
+    while (Length--)
+    {
+        // Ptr = ConioCoordToPointer(Buffer, X, Y); // Doesn't work either
+        Ptr = &Buffer->Buffer[X + Y * Buffer->ScreenBufferSize.X];
+
+        /*
+         * Change the current colors only if they are the old ones.
+         */
+
+        /* Foreground color */
+        if ((Ptr->Attributes & 0x0F) == (OldScreenAttrib & 0x0F))
+            Ptr->Attributes = (Ptr->Attributes & 0xFFF0) | (NewScreenAttrib & 0x0F);
+
+        /* Background color */
+        if ((Ptr->Attributes & 0xF0) == (OldScreenAttrib & 0xF0))
+            Ptr->Attributes = (Ptr->Attributes & 0xFF0F) | (NewScreenAttrib & 0xF0);
+
+        // ++Ptr;
+
+        if (++X == Buffer->ScreenBufferSize.X)
+        {
+            X = 0;
+
+            if (++Y == Buffer->ScreenBufferSize.Y)
+            {
+                Y = 0;
+            }
+        }
+    }
+
+    /* Save foreground and background colors for both screen and popup */
+    Buffer->ScreenDefaultAttrib = (NewScreenAttrib & 0x00FF);
+    Buffer->PopupDefaultAttrib  = (NewPopupAttrib  & 0x00FF);
+
+    /* Refresh the display if needed */
+    if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer)
+    {
+        SMALL_RECT UpdateRect;
+        ConioComputeUpdateRect(Buffer, &UpdateRect, &TopLeft, NumCodesToWrite);
+        TermDrawRegion(Console, &UpdateRect);
+    }
+
+    return STATUS_SUCCESS;
+}
+
+
 /* PUBLIC DRIVER APIS *********************************************************/
 
 NTSTATUS NTAPI
@@ -953,7 +1019,6 @@
     PWCHAR tmpString = NULL;
     DWORD X, Y, Length; // , Written = 0;
     ULONG CodeSize;
-    SMALL_RECT UpdateRect;
     PCHAR_INFO Ptr;
 
     if (Console == NULL || Buffer == NULL ||
@@ -1052,6 +1117,7 @@
 
     if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer)
     {
+        SMALL_RECT UpdateRect;
         ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite);
         TermDrawRegion(Console, &UpdateRect);
     }
@@ -1077,7 +1143,6 @@
 {
     DWORD X, Y, Length; // , Written = 0;
     PCHAR_INFO Ptr;
-    SMALL_RECT UpdateRect;
 
     if (Console == NULL || Buffer == NULL || Code == NULL ||
         WriteCoord == NULL /* || CodesWritten == NULL */)
@@ -1150,6 +1215,7 @@
 
     if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer)
     {
+        SMALL_RECT UpdateRect;
         ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite);
         TermDrawRegion(Console, &UpdateRect);
     }
@@ -1159,26 +1225,33 @@
 }
 
 NTSTATUS NTAPI
-ConDrvGetConsoleScreenBufferInfo(IN PCONSOLE Console,
-                                 IN PTEXTMODE_SCREEN_BUFFER Buffer,
-                                 OUT PCONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo)
+ConDrvGetConsoleScreenBufferInfo(IN  PCONSOLE Console,
+                                 IN  PTEXTMODE_SCREEN_BUFFER Buffer,
+                                 OUT PCOORD ScreenBufferSize,
+                                 OUT PCOORD CursorPosition,
+                                 OUT PCOORD ViewOrigin,
+                                 OUT PCOORD ViewSize,
+                                 OUT PCOORD MaximumViewSize,
+                                 OUT PWORD  Attributes)
 {
-    if (Console == NULL || Buffer == NULL || ScreenBufferInfo == NULL)
+    if (Console == NULL || Buffer == NULL || ScreenBufferSize == NULL ||
+        CursorPosition  == NULL || ViewOrigin == NULL || ViewSize == NULL ||
+        MaximumViewSize == NULL || Attributes == NULL)
+    {
         return STATUS_INVALID_PARAMETER;
+    }
 
     /* Validity check */
     ASSERT(Console == Buffer->Header.Console);
 
-    ScreenBufferInfo->dwSize              = Buffer->ScreenBufferSize;
-    ScreenBufferInfo->dwCursorPosition    = Buffer->CursorPosition;
-    ScreenBufferInfo->wAttributes         = Buffer->ScreenDefaultAttrib;
-    ScreenBufferInfo->srWindow.Left       = Buffer->ViewOrigin.X;
-    ScreenBufferInfo->srWindow.Top        = Buffer->ViewOrigin.Y;
-    ScreenBufferInfo->srWindow.Right      = Buffer->ViewOrigin.X + Buffer->ViewSize.X - 1;
-    ScreenBufferInfo->srWindow.Bottom     = Buffer->ViewOrigin.Y + Buffer->ViewSize.Y - 1;
+    *ScreenBufferSize = Buffer->ScreenBufferSize;
+    *CursorPosition   = Buffer->CursorPosition;
+    *ViewOrigin       = Buffer->ViewOrigin;
+    *ViewSize         = Buffer->ViewSize;
+    *Attributes       = Buffer->ScreenDefaultAttrib;
 
     // FIXME: Refine the computation
-    ScreenBufferInfo->dwMaximumWindowSize = Buffer->ScreenBufferSize;
+    *MaximumViewSize  = Buffer->ScreenBufferSize;
 
     return STATUS_SUCCESS;
 }
Index: win32ss/user/winsrv/consrv/condrv/dummyfrontend.c
===================================================================
--- win32ss/user/winsrv/consrv/condrv/dummyfrontend.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/condrv/dummyfrontend.c	(copie de travail)
@@ -9,10 +9,8 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
+#include <consrv.h>
 
-
 /* DUMMY FRONTEND INTERFACE ***************************************************/
 
 static NTSTATUS NTAPI
@@ -101,7 +99,7 @@
 
 static BOOL NTAPI
 DummyChangeIcon(IN OUT PFRONTEND This,
-                HICON hWindowIcon)
+                HICON IconHandle)
 {
     return TRUE;
 }
@@ -148,7 +146,7 @@
 
 static BOOL NTAPI
 DummySetMouseCursor(IN OUT PFRONTEND This,
-                    HCURSOR hCursor)
+                    HCURSOR CursorHandle)
 {
     return TRUE;
 }
@@ -155,8 +153,8 @@
 
 static HMENU NTAPI
 DummyMenuControl(IN OUT PFRONTEND This,
-                 UINT cmdIdLow,
-                 UINT cmdIdHigh)
+                 UINT CmdIdLow,
+                 UINT CmdIdHigh)
 {
     return NULL;
 }
Index: win32ss/user/winsrv/consrv/lineinput.h
===================================================================
--- win32ss/user/winsrv/consrv/lineinput.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/lineinput.h	(copie de travail)
@@ -10,5 +10,3 @@
 
 VOID FASTCALL HistoryDeleteBuffers(PCONSOLE Console);
 VOID FASTCALL LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/consrv.h
===================================================================
--- win32ss/user/winsrv/consrv/consrv.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/consrv.h	(copie de travail)
@@ -9,8 +9,6 @@
 #ifndef __CONSRV_H__
 #define __CONSRV_H__
 
-#pragma once
-
 /* PSDK/NDK Headers */
 #include <stdarg.h>
 #define WIN32_NO_STATUS
@@ -18,7 +16,6 @@
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
-#include <wingdi.h>
 #include <winnls.h>
 #include <winreg.h>
 #include <wincon.h>
@@ -25,11 +22,8 @@
 #include <winuser.h>
 #define NTOS_MODE_USER
 #include <ndk/exfuncs.h>
-#include <ndk/iofuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
-#include <ndk/psfuncs.h>
-#include <ndk/setypes.h>
 #include <ndk/rtlfuncs.h>
 
 /* Public Win32K Headers */
@@ -42,10 +36,8 @@
 #include <csr/csrsrv.h>
 
 /* CONSOLE Headers */
-#include <win/console.h>
 #include <win/conmsg.h>
 
-
 /* Heap Helpers */
 #include "heap.h"
 
@@ -74,6 +66,14 @@
     LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS.
 } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA;
 
-#endif // __CONSRV_H__
+#include "include/conio.h"
+#include "console.h"
+#include "conoutput.h"
+#include "handle.h"
+#include "lineinput.h"
+#include "frontends/gui/guisettings.h"
+#include "include/console.h"
+#include "include/settings.h"
+#include "include/term.h"
 
-/* EOF */
+#endif /* __CONSRV_H__ */
Index: win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
===================================================================
--- win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c	(copie de travail)
@@ -726,7 +726,7 @@
 
 static BOOL NTAPI
 TuiChangeIcon(IN OUT PFRONTEND This,
-              HICON hWindowIcon)
+              HICON IconHandle)
 {
     return TRUE;
 }
@@ -778,7 +778,7 @@
 
 static BOOL NTAPI
 TuiSetMouseCursor(IN OUT PFRONTEND This,
-                  HCURSOR hCursor)
+                  HCURSOR CursorHandle)
 {
     return TRUE;
 }
@@ -785,8 +785,8 @@
 
 static HMENU NTAPI
 TuiMenuControl(IN OUT PFRONTEND This,
-               UINT cmdIdLow,
-               UINT cmdIdHigh)
+               UINT CmdIdLow,
+               UINT CmdIdHigh)
 {
     return NULL;
 }
Index: win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/guisettings.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/guisettings.h	(copie de travail)
@@ -52,7 +52,7 @@
 
     HWND hWindow;               /* Handle to the console's window            */
     HDC  hMemDC;                /* Memory DC holding the console framebuffer */
-    HBITMAP hBitmap;            /* Console framebuffer                       */
+    HBITMAP  hBitmap;           /* Console framebuffer                       */
     HPALETTE hSysPalette;       /* Handle to the original system palette     */
 
     HICON hIcon;                /* Handle to the console's icon (big)   */
@@ -64,8 +64,8 @@
     BOOL IgnoreNextMouseSignal; /* Used in cases where we don't want to treat a mouse signal */
 
     BOOL IsCloseButtonEnabled;  /* TRUE if the Close button and the corresponding system menu item are enabled (default), FALSE otherwise */
-    UINT cmdIdLow ;             /* Lowest menu id of the user-reserved menu id range */
-    UINT cmdIdHigh;             /* Highest menu id of the user-reserved menu id range */
+    UINT CmdIdLow ;             /* Lowest menu id of the user-reserved menu id range */
+    UINT CmdIdHigh;             /* Highest menu id of the user-reserved menu id range */
 
 //  COLORREF Colors[16];
 
Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c	(copie de travail)
@@ -11,25 +11,18 @@
 
 /* INCLUDES *******************************************************************/
 
-#define COBJMACROS
+#include <consrv.h>
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/console.h"
-#include "include/settings.h"
-#include "conoutput.h"
-#include "guiterm.h"
-#include "guisettings.h"
-#include "resource.h"
-
 #include <windowsx.h>
-
-#include <shlwapi.h>
+#define COBJMACROS
 #include <shlobj.h>
 
 #define NDEBUG
 #include <debug.h>
 
+#include "guiterm.h"
+#include "resource.h"
+
 /* GUI Console Window Class name */
 #define GUI_CONSOLE_WINDOW_CLASS L"ConsoleWindowClass"
 
@@ -238,6 +231,7 @@
     er.EventType = MENU_EVENT;
     er.Event.MenuEvent.dwCommandId = CmdId;
 
+    DPRINT("Menu item ID: %d\n", CmdId);
     ConioProcessInputEvent(Console, &er);
 }
 
@@ -272,7 +266,7 @@
      * send to him a menu event and return directly. The user must handle those
      * reserved menu commands...
      */
-    if (GuiData->cmdIdLow <= (UINT)wParam && (UINT)wParam <= GuiData->cmdIdHigh)
+    if (GuiData->CmdIdLow <= (UINT)wParam && (UINT)wParam <= GuiData->CmdIdHigh)
     {
         GuiSendMenuEvent(Console, (UINT)wParam);
         goto Unlock_Quit;
@@ -1339,8 +1333,12 @@
         return 0;
 }
 
-VOID GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer);
-VOID GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer);
+VOID
+GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
+                          PGUI_CONSOLE_DATA GuiData);
+VOID
+GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
+                          PGUI_CONSOLE_DATA GuiData);
 
 static VOID
 GuiConsoleCopy(PGUI_CONSOLE_DATA GuiData)
@@ -1352,11 +1350,11 @@
 
         if (GetType(Buffer) == TEXTMODE_BUFFER)
         {
-            GuiCopyFromTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer);
+            GuiCopyFromTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer, GuiData);
         }
         else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */
         {
-            GuiCopyFromGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer);
+            GuiCopyFromGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer, GuiData);
         }
 
         CloseClipboard();
@@ -1367,8 +1365,12 @@
     }
 }
 
-VOID GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer);
-VOID GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer);
+VOID
+GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
+                         PGUI_CONSOLE_DATA GuiData);
+VOID
+GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
+                         PGUI_CONSOLE_DATA GuiData);
 
 static VOID
 GuiConsolePaste(PGUI_CONSOLE_DATA GuiData)
@@ -1379,11 +1381,11 @@
 
         if (GetType(Buffer) == TEXTMODE_BUFFER)
         {
-            GuiPasteToTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer);
+            GuiPasteToTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer, GuiData);
         }
         else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */
         {
-            GuiPasteToGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer);
+            GuiPasteToGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer, GuiData);
         }
 
         CloseClipboard();
@@ -1719,7 +1721,7 @@
         {
             PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer;
 
-            DPRINT1("WM_PALETTECHANGED called\n");
+            DPRINT("WM_PALETTECHANGED called\n");
 
             /*
              * Protects against infinite loops:
@@ -1736,12 +1738,12 @@
              */
             if ((HWND)wParam == hWnd) break;
 
-            DPRINT1("WM_PALETTECHANGED ok\n");
+            DPRINT("WM_PALETTECHANGED ok\n");
 
             // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER)
             if (ActiveBuffer->PaletteHandle)
             {
-                DPRINT1("WM_PALETTECHANGED changing palette\n");
+                DPRINT("WM_PALETTECHANGED changing palette\n");
 
                 /* Specify the use of the system palette for the framebuffer */
                 SetSystemPaletteUse(GuiData->hMemDC, ActiveBuffer->PaletteUsage);
@@ -1750,7 +1752,7 @@
                 RealizePalette(GuiData->hMemDC);
             }
 
-            DPRINT1("WM_PALETTECHANGED quit\n");
+            DPRINT("WM_PALETTECHANGED quit\n");
 
             break;
         }
@@ -1915,6 +1917,8 @@
                 EnableMenuItem(hMenu, ID_SYSTEM_EDIT_COPY , MF_BYCOMMAND |
                                ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) &&
                                 (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) ? MF_ENABLED : MF_GRAYED));
+                // FIXME: Following whether the active screen buffer is text-mode
+                // or graphics-mode, search for CF_UNICODETEXT or CF_BITMAP formats.
                 EnableMenuItem(hMenu, ID_SYSTEM_EDIT_PASTE, MF_BYCOMMAND |
                                (!(Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) &&
                                 IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED));
@@ -2469,7 +2473,7 @@
     GuiData->IsCloseButtonEnabled = TRUE;
 
     /* There is no user-reserved menu id range by default */
-    GuiData->cmdIdLow = GuiData->cmdIdHigh = 0;
+    GuiData->CmdIdLow = GuiData->CmdIdHigh = 0;
 
     /*
      * We need to wait until the GUI has been fully initialized
@@ -2754,7 +2758,7 @@
 
 static BOOL NTAPI
 GuiSetMouseCursor(IN OUT PFRONTEND This,
-                  HCURSOR hCursor);
+                  HCURSOR CursorHandle);
 
 static VOID NTAPI
 GuiRefreshInternalInfo(IN OUT PFRONTEND This)
@@ -2788,12 +2792,12 @@
 
 static BOOL NTAPI
 GuiChangeIcon(IN OUT PFRONTEND This,
-              HICON hWindowIcon)
+              HICON IconHandle)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
     HICON hIcon, hIconSm;
 
-    if (hWindowIcon == NULL)
+    if (IconHandle == NULL)
     {
         hIcon   = ghDefaultIcon;
         hIconSm = ghDefaultIconSm;
@@ -2800,8 +2804,8 @@
     }
     else
     {
-        hIcon   = CopyIcon(hWindowIcon);
-        hIconSm = CopyIcon(hWindowIcon);
+        hIcon   = CopyIcon(IconHandle);
+        hIconSm = CopyIcon(IconHandle);
     }
 
     if (hIcon == NULL)
@@ -2960,7 +2964,7 @@
 
 static BOOL NTAPI
 GuiSetMouseCursor(IN OUT PFRONTEND This,
-                  HCURSOR hCursor)
+                  HCURSOR CursorHandle)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
 
@@ -2968,7 +2972,7 @@
      * Set the cursor's handle. If the given handle is NULL,
      * then restore the default cursor.
      */
-    GuiData->hCursor = (hCursor ? hCursor : ghDefaultCursor);
+    GuiData->hCursor = (CursorHandle ? CursorHandle : ghDefaultCursor);
 
     /* Effectively modify the shape of the cursor (use special values for (w|l)Param) */
     PostMessageW(GuiData->hWindow, WM_SETCURSOR, -1, -1);
@@ -2978,13 +2982,13 @@
 
 static HMENU NTAPI
 GuiMenuControl(IN OUT PFRONTEND This,
-               UINT cmdIdLow,
-               UINT cmdIdHigh)
+               UINT CmdIdLow,
+               UINT CmdIdHigh)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
 
-    GuiData->cmdIdLow  = cmdIdLow ;
-    GuiData->cmdIdHigh = cmdIdHigh;
+    GuiData->CmdIdLow  = CmdIdLow ;
+    GuiData->CmdIdHigh = CmdIdHigh;
 
     return GetSystemMenu(GuiData->hWindow, FALSE);
 }
Index: win32ss/user/winsrv/consrv/frontends/gui/resource.h
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/resource.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/resource.h	(copie de travail)
@@ -7,14 +7,16 @@
 
 #pragma once
 
-#define ID_SYSTEM_EDIT_MARK      1001
-#define ID_SYSTEM_EDIT_COPY      1002
-#define ID_SYSTEM_EDIT_PASTE     1003
-#define ID_SYSTEM_EDIT_SELECTALL 1004
-#define ID_SYSTEM_EDIT_SCROLL    1005
-#define ID_SYSTEM_EDIT_FIND      1006
-#define ID_SYSTEM_DEFAULTS       1007
-#define ID_SYSTEM_PROPERTIES     1008
+// Console System Menu Item IDs.
+// Use IDs in the range 0xFFFx for not clashing with user-defined menu IDs.
+#define ID_SYSTEM_EDIT_MARK      0xFFF0
+#define ID_SYSTEM_EDIT_COPY      0xFFF1
+#define ID_SYSTEM_EDIT_PASTE     0xFFF2
+#define ID_SYSTEM_EDIT_SELECTALL 0xFFF3
+#define ID_SYSTEM_EDIT_SCROLL    0xFFF4
+#define ID_SYSTEM_EDIT_FIND      0xFFF5
+#define ID_SYSTEM_DEFAULTS       0xFFF6
+#define ID_SYSTEM_PROPERTIES     0xFFF7
 
 #define NCPOPUP_MENU 103
 
Index: win32ss/user/winsrv/consrv/frontends/gui/graphics.c
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/graphics.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/graphics.c	(copie de travail)
@@ -8,31 +8,108 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 VOID
-GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer)
+GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
+                          PGUI_CONSOLE_DATA GuiData)
 {
     /*
      * This function supposes that the system clipboard was opened.
      */
 
-    // PCONSOLE Console = Buffer->Header.Console;
+    PCONSOLE Console = Buffer->Header.Console;
 
-    UNIMPLEMENTED;
+    HDC hMemDC;
+    HBITMAP  hBitmapTarget, hBitmapOld;
+    HPALETTE hPalette, hPaletteOld;
+    ULONG selWidth, selHeight;
+
+    if (Buffer->BitMap == NULL) return;
+
+    selWidth  = Console->Selection.srSelection.Right - Console->Selection.srSelection.Left + 1;
+    selHeight = Console->Selection.srSelection.Bottom - Console->Selection.srSelection.Top + 1;
+    DPRINT1("Selection is (%d|%d) to (%d|%d)\n",
+           Console->Selection.srSelection.Left,
+           Console->Selection.srSelection.Top,
+           Console->Selection.srSelection.Right,
+           Console->Selection.srSelection.Bottom);
+
+    hMemDC = CreateCompatibleDC(GuiData->hMemDC);
+    if (hMemDC == NULL) return;
+
+    /* Allocate a bitmap to be given to the clipboard, so it will not be freed here */
+    hBitmapTarget = CreateCompatibleBitmap(GuiData->hMemDC, selWidth, selHeight);
+    if (hBitmapTarget == NULL)
+    {
+        DeleteDC(hMemDC);
+        return;
+    }
+
+    /* Select the new bitmap */
+    hBitmapOld = SelectObject(hMemDC, hBitmapTarget);
+
+    /* Change the palette in hMemDC if the current palette does exist */
+    if (Buffer->PaletteHandle == NULL)
+        hPalette = GuiData->hSysPalette;
+    else
+        hPalette = Buffer->PaletteHandle;
+
+    if (hPalette) hPaletteOld = SelectPalette(hMemDC, hPalette, FALSE);
+
+    /* Grab the mutex */
+    NtWaitForSingleObject(Buffer->Mutex, FALSE, NULL);
+
+    // The equivalent of a SetDIBitsToDevice call...
+    // It seems to be broken: it does not copy the tail of the bitmap.
+    // http://wiki.allegro.cc/index.php?title=StretchDIBits
+#if 0
+    StretchDIBits(hMemDC,
+                  0, 0,
+                  selWidth, selHeight,
+                  Console->Selection.srSelection.Left,
+                  Console->Selection.srSelection.Top,
+                  selWidth, selHeight,
+                  Buffer->BitMap,
+                  Buffer->BitMapInfo,
+                  Buffer->BitMapUsage,
+                  SRCCOPY);
+#else
+    SetDIBitsToDevice(hMemDC,
+                      /* Coordinates / size of the repainted rectangle, in the framebuffer's frame */
+                      0, 0,
+                      selWidth, selHeight,
+                      /* Coordinates / size of the corresponding image portion, in the graphics screen-buffer's frame */
+                      Console->Selection.srSelection.Left,
+                      Console->Selection.srSelection.Top,
+                      0,
+                      Buffer->ScreenBufferSize.Y, // == Buffer->BitMapInfo->bmiHeader.biHeight
+                      Buffer->BitMap,
+                      Buffer->BitMapInfo,
+                      Buffer->BitMapUsage);
+#endif
+
+    /* Release the mutex */
+    NtReleaseMutant(Buffer->Mutex, NULL);
+
+    /* Restore the palette and the old bitmap */
+    if (hPalette) SelectPalette(hMemDC, hPaletteOld, FALSE);
+    SelectObject(hMemDC, hBitmapOld);
+
+    EmptyClipboard();
+    SetClipboardData(CF_BITMAP, hBitmapTarget);
+
+    DeleteDC(hMemDC);
 }
 
 VOID
-GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer)
+GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
+                         PGUI_CONSOLE_DATA GuiData)
 {
     /*
      * This function supposes that the system clipboard was opened.
Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.h	(copie de travail)
@@ -24,5 +24,3 @@
                                  DWORD ProcessId,
                                  LPCWSTR IconPath,
                                  INT IconIndex);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c	(copie de travail)
@@ -8,16 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/console.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 BOOL
Index: win32ss/user/winsrv/consrv/frontends/gui/text.c
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/text.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/text.c	(copie de travail)
@@ -11,15 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 COLORREF RGBFromAttrib2(PCONSOLE Console, WORD Attribute)
@@ -34,7 +30,8 @@
 }
 
 VOID
-GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer)
+GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
+                          PGUI_CONSOLE_DATA GuiData)
 {
     /*
      * This function supposes that the system clipboard was opened.
@@ -76,12 +73,16 @@
     size += 1; /* Null-termination */
     size *= sizeof(WCHAR);
 
-    /* Allocate memory, it will be passed to the system and may not be freed here */
+    /* Allocate some memory area to be given to the clipboard, so it will not be freed here */
     hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, size);
     if (hData == NULL) return;
 
     data = GlobalLock(hData);
-    if (data == NULL) return;
+    if (data == NULL)
+    {
+        GlobalFree(hData);
+        return;
+    }
 
     DPRINT("Copying %dx%d selection\n", selWidth, selHeight);
     dstPos = data;
@@ -125,7 +126,8 @@
 }
 
 VOID
-GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer)
+GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
+                         PGUI_CONSOLE_DATA GuiData)
 {
     /*
      * This function supposes that the system clipboard was opened.
Index: win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/guisettings.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/guisettings.c	(copie de travail)
@@ -9,15 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
 VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData);
 VOID SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
 
@@ -198,7 +194,7 @@
     // TermInfo->FontSize = MAKELONG(16, 16); // font is 16x16
     // TermInfo->FontWeight = FW_NORMAL;
 
-    wcsncpy(TermInfo->FaceName, L"Fixedsys", LF_FACESIZE); // HACK: !!
+    wcsncpy(TermInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !!
     // TermInfo->FaceName[0] = L'\0';
     TermInfo->FontFamily = FF_DONTCARE;
     TermInfo->FontSize   = 0;
Index: win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
===================================================================
--- win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h	(copie de travail)
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "include/settings.h"
+#include <include/settings.h>
+
 #include "guisettings.h"
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/frontendctl.c
===================================================================
--- win32ss/user/winsrv/consrv/frontendctl.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/frontendctl.c	(copie de travail)
@@ -9,19 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "console.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
-/* PRIVATE FUNCTIONS **********************************************************/
-
-
 /* PUBLIC SERVER APIS *********************************************************/
 
 /**********************************************************************
@@ -231,7 +222,7 @@
 
     Console = Buff->Header.Console;
 
-    Success = TermSetMouseCursor(Console, SetCursorRequest->hCursor);
+    Success = TermSetMouseCursor(Console, SetCursorRequest->CursorHandle);
 
     ConSrvReleaseScreenBuffer(Buff, TRUE);
     return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL);
@@ -253,9 +244,9 @@
 
     Console = Buff->Header.Console;
 
-    MenuControlRequest->hMenu = TermMenuControl(Console,
-                                                MenuControlRequest->dwCmdIdLow,
-                                                MenuControlRequest->dwCmdIdHigh);
+    MenuControlRequest->MenuHandle = TermMenuControl(Console,
+                                                     MenuControlRequest->CmdIdLow,
+                                                     MenuControlRequest->CmdIdHigh);
 
     ConSrvReleaseScreenBuffer(Buff, TRUE);
     return STATUS_SUCCESS;
@@ -302,7 +293,7 @@
     Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
-    Status = (TermChangeIcon(Console, SetIconRequest->WindowIcon)
+    Status = (TermChangeIcon(Console, SetIconRequest->IconHandle)
                 ? STATUS_SUCCESS
                 : STATUS_UNSUCCESSFUL);
 
Index: win32ss/user/winsrv/consrv/heap.h
===================================================================
--- win32ss/user/winsrv/consrv/heap.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/heap.h	(copie de travail)
@@ -13,5 +13,3 @@
 
 #define ConsoleAllocHeap(Flags, Size)   RtlAllocateHeap(ConSrvHeap, Flags, Size)
 #define ConsoleFreeHeap(HeapBase)       RtlFreeHeap(ConSrvHeap, 0, HeapBase)
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/subsysreg.c
===================================================================
--- win32ss/user/winsrv/consrv/subsysreg.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/subsysreg.c	(copie de travail)
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* PUBLIC SERVER APIS *********************************************************/
 
 /*
Index: win32ss/user/winsrv/consrv/alias.c
===================================================================
--- win32ss/user/winsrv/consrv/alias.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/alias.c	(copie de travail)
@@ -10,13 +10,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* TYPES **********************************************************************/
 
 typedef struct _ALIAS_ENTRY
Index: win32ss/user/winsrv/consrv/handle.c
===================================================================
--- win32ss/user/winsrv/consrv/handle.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/handle.c	(copie de travail)
@@ -11,17 +11,12 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "include/console.h"
-#include "console.h"
-#include "conoutput.h"
 
+#include <win/console.h>
+
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 typedef struct _CONSOLE_IO_HANDLE
@@ -440,8 +435,8 @@
          /*(Type != 0 && ObjectEntry->Type != Type)*/
          (Type != 0 && (ObjectEntry->Type & Type) == 0) )
     {
-        DPRINT1("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n",
-                Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0));
+        DPRINT("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n",
+               Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0));
 
         RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
         return STATUS_INVALID_HANDLE;
@@ -841,7 +836,7 @@
         return Status;
     }
 
-    Status = ConSrvRemoveObject(ProcessData, CloseHandleRequest->ConsoleHandle);
+    Status = ConSrvRemoveObject(ProcessData, CloseHandleRequest->Handle);
 
     ConSrvReleaseConsole(Console, TRUE);
     return Status;
@@ -854,9 +849,11 @@
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
     PCONSOLE Console;
 
-    HANDLE ConsoleHandle = VerifyHandleRequest->ConsoleHandle;
-    ULONG Index = HandleToULong(ConsoleHandle) >> 2;
+    HANDLE IoHandle = VerifyHandleRequest->Handle;
+    ULONG Index = HandleToULong(IoHandle) >> 2;
 
+    VerifyHandleRequest->IsValid = FALSE;
+
     Status = ConSrvGetConsole(ProcessData, &Console, TRUE);
     if (!NT_SUCCESS(Status))
     {
@@ -869,18 +866,21 @@
     // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) ||
     //         (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) );
 
-    if (!IsConsoleHandle(ConsoleHandle)    ||
+    if (!IsConsoleHandle(IoHandle)            ||
         Index >= ProcessData->HandleTableSize ||
         ProcessData->HandleTable[Index].Object == NULL)
     {
         DPRINT("SrvVerifyConsoleIoHandle failed\n");
-        Status = STATUS_INVALID_HANDLE;
     }
+    else
+    {
+        VerifyHandleRequest->IsValid = TRUE;
+    }
 
     RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
 
     ConSrvReleaseConsole(Console, TRUE);
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 /* EOF */
Index: win32ss/user/winsrv/consrv/resource.h
===================================================================
--- win32ss/user/winsrv/consrv/resource.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/resource.h	(copie de travail)
@@ -8,5 +8,3 @@
 #pragma once
 
 #define IDS_CONSOLE_TITLE 500
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/procinit.h
===================================================================
--- win32ss/user/winsrv/consrv/procinit.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/procinit.h	(copie de travail)
@@ -20,5 +20,3 @@
                                        PHANDLE pOutputHandle,
                                        PHANDLE pErrorHandle);
 VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/alias.h
===================================================================
--- win32ss/user/winsrv/consrv/alias.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/alias.h	(copie de travail)
@@ -10,5 +10,3 @@
 #pragma once
 
 VOID IntDeleteAllAliases(PCONSOLE Console);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/coninput.c
===================================================================
--- win32ss/user/winsrv/consrv/coninput.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/coninput.c	(copie de travail)
@@ -10,15 +10,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "lineinput.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole)     \
Index: win32ss/user/winsrv/consrv/settings.c
===================================================================
--- win32ss/user/winsrv/consrv/settings.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/settings.c	(copie de travail)
@@ -10,9 +10,6 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "include/settings.h"
 
 #include <stdio.h> // for swprintf
 
@@ -19,7 +16,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 extern const COLORREF s_Colors[16];
@@ -440,7 +436,11 @@
     }
 }
 
-
+NTSTATUS NTAPI
+ConDrvChangeScreenBufferAttributes(IN PCONSOLE Console,
+                                   IN PTEXTMODE_SCREEN_BUFFER Buffer,
+                                   IN USHORT NewScreenAttrib,
+                                   IN USHORT NewPopupAttrib);
 /*
  * NOTE: This function explicitely references Console->ActiveBuffer.
  * It is possible that it should go into some frontend...
@@ -459,26 +459,10 @@
     Console->QuickEdit  = ConsoleInfo->QuickEdit;
     Console->InsertMode = ConsoleInfo->InsertMode;
 
-    /*
-     * Apply foreground and background colors for both screen and popup
-     * and copy the new palette.
-     */
-    if (GetType(ActiveBuffer) == TEXTMODE_BUFFER)
-    {
-        PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)ActiveBuffer;
-
-        Buffer->ScreenDefaultAttrib = ConsoleInfo->ScreenAttrib;
-        Buffer->PopupDefaultAttrib  = ConsoleInfo->PopupAttrib;
-    }
-    else // if (Console->ActiveBuffer->Header.Type == GRAPHICS_BUFFER)
-    {
-    }
-
+    /* Copy the new console palette */
     // FIXME: Possible buffer overflow if s_colors is bigger than pConInfo->Colors.
     memcpy(Console->Colors, ConsoleInfo->Colors, sizeof(s_Colors));
 
-    // TODO: Really update the screen attributes as FillConsoleOutputAttribute does.
-
     /* Apply cursor size */
     ActiveBuffer->CursorInfo.bVisible = (ConsoleInfo->CursorSize != 0);
     ActiveBuffer->CursorInfo.dwSize   = min(max(ConsoleInfo->CursorSize, 0), 100);
@@ -541,6 +525,12 @@
 
             if (SizeChanged) TermResizeTerminal(Console);
         }
+
+        /* Apply foreground and background colors for both screen and popup */
+        ConDrvChangeScreenBufferAttributes(Console,
+                                           Buffer,
+                                           ConsoleInfo->ScreenAttrib,
+                                           ConsoleInfo->PopupAttrib);
     }
     else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER)
     {
Index: win32ss/user/winsrv/consrv/conoutput.c
===================================================================
--- win32ss/user/winsrv/consrv/conoutput.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/conoutput.c	(copie de travail)
@@ -10,19 +10,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
-/* PRIVATE FUNCTIONS **********************************************************/
-
-
 /* PUBLIC SERVER APIS *********************************************************/
 
 NTSTATUS NTAPI
@@ -692,9 +683,14 @@
 }
 
 NTSTATUS NTAPI
-ConDrvGetConsoleScreenBufferInfo(IN PCONSOLE Console,
-                                 IN PTEXTMODE_SCREEN_BUFFER Buffer,
-                                 OUT PCONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo);
+ConDrvGetConsoleScreenBufferInfo(IN  PCONSOLE Console,
+                                 IN  PTEXTMODE_SCREEN_BUFFER Buffer,
+                                 OUT PCOORD ScreenBufferSize,
+                                 OUT PCOORD CursorPosition,
+                                 OUT PCOORD ViewOrigin,
+                                 OUT PCOORD ViewSize,
+                                 OUT PCOORD MaximumViewSize,
+                                 OUT PWORD  Attributes);
 CSR_API(SrvGetConsoleScreenBufferInfo)
 {
     NTSTATUS Status;
@@ -710,7 +706,12 @@
 
     Status = ConDrvGetConsoleScreenBufferInfo(Buffer->Header.Console,
                                               Buffer,
-                                              &ScreenBufferInfoRequest->Info);
+                                              &ScreenBufferInfoRequest->ScreenBufferSize,
+                                              &ScreenBufferInfoRequest->CursorPosition,
+                                              &ScreenBufferInfoRequest->ViewOrigin,
+                                              &ScreenBufferInfoRequest->ViewSize,
+                                              &ScreenBufferInfoRequest->MaximumViewSize,
+                                              &ScreenBufferInfoRequest->Attributes);
 
     ConSrvReleaseScreenBuffer(Buffer, TRUE);
     return Status;
Index: win32ss/user/winsrv/consrv/handle.h
===================================================================
--- win32ss/user/winsrv/consrv/handle.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/handle.h	(copie de travail)
@@ -30,5 +30,3 @@
                                   CONSOLE_IO_OBJECT_TYPE Type);
 VOID FASTCALL ConSrvReleaseObject(PCONSOLE_IO_OBJECT Object,
                                   BOOL IsConsoleLocked);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/include/conio.h
===================================================================
--- win32ss/user/winsrv/consrv/include/conio.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/include/conio.h	(copie de travail)
@@ -224,7 +224,7 @@
      */
     VOID (NTAPI *ChangeTitle)(IN OUT PFRONTEND This);
     BOOL (NTAPI *ChangeIcon)(IN OUT PFRONTEND This,
-                             HICON hWindowIcon);
+                             HICON IconHandle);
     HWND (NTAPI *GetConsoleWindowHandle)(IN OUT PFRONTEND This);
     VOID (NTAPI *GetLargestConsoleWindowSize)(IN OUT PFRONTEND This,
                                               PCOORD pSize);
@@ -237,10 +237,10 @@
     INT   (NTAPI *ShowMouseCursor)(IN OUT PFRONTEND This,
                                    BOOL Show);
     BOOL  (NTAPI *SetMouseCursor)(IN OUT PFRONTEND This,
-                                  HCURSOR hCursor);
+                                  HCURSOR CursorHandle);
     HMENU (NTAPI *MenuControl)(IN OUT PFRONTEND This,
-                               UINT cmdIdLow,
-                               UINT cmdIdHigh);
+                               UINT CmdIdLow,
+                               UINT CmdIdHigh);
     BOOL  (NTAPI *SetMenuClose)(IN OUT PFRONTEND This,
                                 BOOL Enable);
 
Index: win32ss/user/winsrv/consrv/include/term.h
===================================================================
--- win32ss/user/winsrv/consrv/include/term.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/include/term.h	(copie de travail)
@@ -32,8 +32,8 @@
 
 #define TermChangeTitle(Console) \
     (Console)->TermIFace.Vtbl->ChangeTitle(&(Console)->TermIFace)
-#define TermChangeIcon(Console, hWindowIcon) \
-    (Console)->TermIFace.Vtbl->ChangeIcon(&(Console)->TermIFace, (hWindowIcon))
+#define TermChangeIcon(Console, IconHandle) \
+    (Console)->TermIFace.Vtbl->ChangeIcon(&(Console)->TermIFace, (IconHandle))
 #define TermGetConsoleWindowHandle(Console) \
     (Console)->TermIFace.Vtbl->GetConsoleWindowHandle(&(Console)->TermIFace)
 #define TermGetLargestConsoleWindowSize(Console, pSize) \
@@ -46,8 +46,8 @@
     (Console)->TermIFace.Vtbl->SetDisplayMode(&(Console)->TermIFace, (NewMode))
 #define TermShowMouseCursor(Console, Show) \
     (Console)->TermIFace.Vtbl->ShowMouseCursor(&(Console)->TermIFace, (Show))
-#define TermSetMouseCursor(Console, hCursor) \
-    (Console)->TermIFace.Vtbl->SetMouseCursor(&(Console)->TermIFace, (hCursor))
+#define TermSetMouseCursor(Console, CursorHandle) \
+    (Console)->TermIFace.Vtbl->SetMouseCursor(&(Console)->TermIFace, (CursorHandle))
 #define TermMenuControl(Console, CmdIdLow, CmdIdHigh) \
     (Console)->TermIFace.Vtbl->MenuControl(&(Console)->TermIFace, (CmdIdLow), (CmdIdHigh))
 #define TermSetMenuClose(Console, Enable) \
Index: win32ss/user/winsrv/consrv/console.c
===================================================================
--- win32ss/user/winsrv/consrv/console.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/console.c	(copie de travail)
@@ -11,29 +11,18 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
+
+#include <ndk/psfuncs.h>
+
 #include "procinit.h"
-#include "alias.h"
-#include "coninput.h"
-#include "conoutput.h"
-#include "lineinput.h"
-#include "include/settings.h"
 
-#include "frontends/gui/guiterm.h"
 #ifdef TUITERM_COMPILE
 #include "frontends/tui/tuiterm.h"
 #endif
 
-#include "include/console.h"
-#include "console.h"
-#include "resource.h"
-
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 /***************/
@@ -554,22 +543,22 @@
 NTSTATUS NTAPI
 ConDrvGetConsoleCP(IN PCONSOLE Console,
                    OUT PUINT CodePage,
-                   IN BOOLEAN InputCP);
+                   IN BOOLEAN OutputCP);
 CSR_API(SrvGetConsoleCP)
 {
     NTSTATUS Status;
-    PCONSOLE_GETSETINPUTOUTPUTCP ConsoleCPRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleCPRequest;
+    PCONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetConsoleCPRequest;
     PCONSOLE Console;
 
     DPRINT("SrvGetConsoleCP, getting %s Code Page\n",
-            ConsoleCPRequest->InputCP ? "Input" : "Output");
+            GetConsoleCPRequest->OutputCP ? "Output" : "Input");
 
     Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     Status = ConDrvGetConsoleCP(Console,
-                                &ConsoleCPRequest->CodePage,
-                                ConsoleCPRequest->InputCP);
+                                &GetConsoleCPRequest->CodePage,
+                                GetConsoleCPRequest->OutputCP);
 
     ConSrvReleaseConsole(Console, TRUE);
     return Status;
@@ -578,22 +567,22 @@
 NTSTATUS NTAPI
 ConDrvSetConsoleCP(IN PCONSOLE Console,
                    IN UINT CodePage,
-                   IN BOOLEAN InputCP);
+                   IN BOOLEAN OutputCP);
 CSR_API(SrvSetConsoleCP)
 {
     NTSTATUS Status = STATUS_INVALID_PARAMETER;
-    PCONSOLE_GETSETINPUTOUTPUTCP ConsoleCPRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleCPRequest;
+    PCONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetConsoleCPRequest;
     PCONSOLE Console;
 
     DPRINT("SrvSetConsoleCP, setting %s Code Page\n",
-            ConsoleCPRequest->InputCP ? "Input" : "Output");
+            SetConsoleCPRequest->OutputCP ? "Output" : "Input");
 
     Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     Status = ConDrvSetConsoleCP(Console,
-                                ConsoleCPRequest->CodePage,
-                                ConsoleCPRequest->InputCP);
+                                SetConsoleCPRequest->CodePage,
+                                SetConsoleCPRequest->OutputCP);
 
     ConSrvReleaseConsole(Console, TRUE);
     return Status;
@@ -611,8 +600,8 @@
     PCONSOLE Console;
 
     if (!CsrValidateMessageBuffer(ApiMessage,
-                                  (PVOID)&GetProcessListRequest->pProcessIds,
-                                  GetProcessListRequest->nMaxIds,
+                                  (PVOID)&GetProcessListRequest->ProcessIdsList,
+                                  GetProcessListRequest->ProcessCount,
                                   sizeof(DWORD)))
     {
         return STATUS_INVALID_PARAMETER;
@@ -622,9 +611,9 @@
     if (!NT_SUCCESS(Status)) return Status;
 
     Status = ConDrvGetConsoleProcessList(Console,
-                                         GetProcessListRequest->pProcessIds,
-                                         GetProcessListRequest->nMaxIds,
-                                         &GetProcessListRequest->nProcessIdsTotal);
+                                         GetProcessListRequest->ProcessIdsList,
+                                         GetProcessListRequest->ProcessCount,
+                                         &GetProcessListRequest->ProcessCount);
 
     ConSrvReleaseConsole(Console, TRUE);
     return Status;
Index: win32ss/user/winsrv/consrv/init.c
===================================================================
--- win32ss/user/winsrv/consrv/init.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/init.c	(copie de travail)
@@ -9,11 +9,9 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
+
 #include "api.h"
 #include "procinit.h"
-#include "include/conio.h"
-#include "include/console.h"
-#include "console.h"
 
 #define NDEBUG
 #include <debug.h>
Index: win32ss/user/winsrv/consrv/coninput.h
===================================================================
--- win32ss/user/winsrv/consrv/coninput.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/coninput.h	(copie de travail)
@@ -19,5 +19,3 @@
                  IN WCHAR UnicodeChar,
                  IN ULONG ShiftState,
                  IN BYTE KeyStateCtrl);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/console.h
===================================================================
--- win32ss/user/winsrv/consrv/console.h	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/console.h	(copie de travail)
@@ -23,5 +23,3 @@
                                    BOOL LockConsole);
 VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console,
                                    BOOL WasConsoleLocked);
-
-/* EOF */
Index: win32ss/user/winsrv/consrv/lineinput.c
===================================================================
--- win32ss/user/winsrv/consrv/lineinput.c	(rÃ©vision 61927)
+++ win32ss/user/winsrv/consrv/lineinput.c	(copie de travail)
@@ -11,9 +11,6 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
 
 #define NDEBUG
 #include <debug.h>
Index: win32ss/user/ntuser/simplecall.c
===================================================================
--- win32ss/user/ntuser/simplecall.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/simplecall.c	(copie de travail)
@@ -7,6 +7,9 @@
  */
 
 #include <win32k.h>
+
+#include <winlogon.h>
+
 DBG_DEFAULT_CHANNEL(UserMisc);
 
 /* registered Logon process */
Index: win32ss/user/ntuser/kbdlayout.c
===================================================================
--- win32ss/user/ntuser/kbdlayout.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/kbdlayout.c	(copie de travail)
@@ -9,6 +9,9 @@
  */
 
 #include <win32k.h>
+
+#include <winnls.h>
+
 DBG_DEFAULT_CHANNEL(UserKbdLayout);
 
 PKL gspklBaseLayout = NULL;
Index: win32ss/user/ntuser/menu.c
===================================================================
--- win32ss/user/ntuser/menu.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/menu.c	(copie de travail)
@@ -271,7 +271,7 @@
    Menu->MenuInfo.dwMenuData = 0; /* Default */
    Menu->MenuInfo.Self = *Handle;
    Menu->MenuInfo.FocusedItem = NO_SELECTED_ITEM;
-   Menu->MenuInfo.Flags = (IsMenuBar ? 0 : MF_POPUP);
+   Menu->MenuInfo.Flags = (IsMenuBar ? 0 : MNF_POPUP);
    Menu->MenuInfo.Wnd = NULL;
    Menu->MenuInfo.WndOwner = NULL;
    Menu->MenuInfo.Height = 0;
@@ -454,7 +454,17 @@
       Menu->MenuInfo.dwStyle = lpmi->dwStyle;
    if(lpmi->fMask & MIM_APPLYTOSUBMENUS)
    {
-      /* FIXME */
+      int i;
+      PMENU_ITEM item = Menu->MenuItemList;
+      for ( i = Menu->MenuInfo.MenuItemCount; i; i--, item = item->Next)
+      {
+         if ( item->hSubMenu )
+         {
+            PMENU_OBJECT SubMenu;
+            if (!(SubMenu = UserGetMenuObject(item->hSubMenu))) continue;
+            IntSetMenuInfo( SubMenu, lpmi);
+         }
+      }
    }
    if (sizeof(MENUINFO) < lpmi->cbSize)
    {
@@ -529,7 +539,7 @@
          }
          else
          {
-            if(CurItem->fType & MF_POPUP)
+            if(CurItem->hSubMenu)
             {
                PMENU_OBJECT NewMenu = UserGetMenuObject(CurItem->hSubMenu);
                if(NewMenu)
@@ -654,7 +664,7 @@
 IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii)
 {
    PMENU_OBJECT SubMenuObject;
-   UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP);
+   UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR);
 
    if(!MenuItem || !MenuObject || !lpmii)
    {
@@ -741,18 +751,9 @@
          SubMenuObject = UserGetMenuObject(MenuItem->hSubMenu);
          if (SubMenuObject != NULL)
          {
-            SubMenuObject->MenuInfo.Flags |= MF_POPUP;
-            MenuItem->fType |= MF_POPUP;
+            SubMenuObject->MenuInfo.Flags |= MNF_POPUP;
          }
-         else
-         {
-            MenuItem->fType &= ~MF_POPUP;
-         }
       }
-      else
-      {
-         MenuItem->fType &= ~MF_POPUP;
-      }
    }
 
    if ((lpmii->fMask & MIIM_STRING) ||
@@ -784,7 +785,7 @@
       }
       else
       {
-         if (0 == (MenuObject->MenuInfo.Flags & MF_SYSMENU))
+         if (0 == (MenuObject->MenuInfo.Flags & MNF_SYSDESKMN))
          {
             MenuItem->fType |= MF_SEPARATOR;
          }
@@ -1469,7 +1470,7 @@
           return NO_SELECTED_ITEM;
        }
 
-       if (!(mi->fType & MF_POPUP)) continue;
+       if (!(mi->hSubMenu)) continue;
 
        if (mi->hSubMenu == hSubTarget)
        {
@@ -1733,6 +1734,50 @@
    END_CLEANUP;
 }
 
+BOOL FASTCALL
+IntGetMenuItemRect(
+   PWND pWnd,
+   PMENU_OBJECT Menu,
+   UINT uItem,
+   PRECTL Rect)
+{
+   LONG XMove, YMove;
+   PMENU_ITEM MenuItem;
+   int p = 0;
+
+   if (!pWnd)
+   {
+      HWND hWnd = Menu->MenuInfo.Wnd;
+      if (!(pWnd = UserGetWindowObject(hWnd))) return FALSE;
+   }
+                   
+   if ((p = IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, NULL, &MenuItem, NULL)) > -1)
+        *Rect = MenuItem->Rect;
+   else
+   {
+      ERR("Failed Item Lookup! %d\n", p);
+      return FALSE;
+   }
+
+   if (Menu->MenuInfo.Flags & MNF_POPUP)
+   {
+     XMove = pWnd->rcClient.left;
+     YMove = pWnd->rcClient.top;
+   }
+   else
+   {
+     XMove = pWnd->rcWindow.left;
+     YMove = pWnd->rcWindow.top;
+   }
+
+   Rect->left   += XMove;
+   Rect->top    += YMove;
+   Rect->right  += XMove;
+   Rect->bottom += YMove;
+
+   return TRUE;
+}
+
 /*
  * @implemented
  */
@@ -1743,220 +1788,127 @@
    LONG idItem,
    PMENUBARINFO pmbi)
 {
-   BOOL Res = TRUE;
-   PMENU_OBJECT MenuObject;
-   PMENU_ITEM mi;
-   PWND WindowObject;
+   PWND pWnd;
    HMENU hMenu;
-   POINT Offset;
-   RECTL Rect;
    MENUBARINFO kmbi;
+   BOOL Ret;
+   NTSTATUS Status = STATUS_SUCCESS;
+   PMENU_OBJECT Menu = NULL;
    DECLARE_RETURN(BOOL);
 
    TRACE("Enter NtUserGetMenuBarInfo\n");
    UserEnterShared();
 
-   if (!(WindowObject = UserGetWindowObject(hwnd)))
-     {
+   if (!(pWnd = UserGetWindowObject(hwnd)))
+   {
         EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
         RETURN(FALSE);
-     }
+   }
 
-   hMenu = (HMENU)(DWORD_PTR)WindowObject->IDMenu;
+   switch (idObject)
+   {
+    case OBJID_CLIENT:
+        if (!pWnd->pcls->fnid)
+            RETURN(FALSE);
+        if (pWnd->pcls->fnid != FNID_MENU)
+        {
+            WARN("called on invalid window: %d\n", pWnd->pcls->fnid);
+            EngSetLastError(ERROR_INVALID_MENU_HANDLE);
+            RETURN(FALSE);
+        }
+        // Windows does this! Wine checks for Atom and uses GetWindowLongPtrW.
+        hMenu = (HMENU)co_IntSendMessage(hwnd, MN_GETHMENU, 0, 0);
+        break;
+    case OBJID_MENU:
+        hMenu = UlongToHandle(pWnd->IDMenu);
+        break;
+    case OBJID_SYSMENU:
+        if (!(pWnd->style & WS_SYSMENU)) RETURN(FALSE);
+        Menu = IntGetSystemMenu(pWnd, FALSE, FALSE);
+        hMenu = Menu->MenuInfo.Self;
+        break;
+    default:
+        RETURN(FALSE);
+   }
 
-   if (!(MenuObject = UserGetMenuObject(hMenu)))
-     {
-       EngSetLastError(ERROR_INVALID_MENU_HANDLE);
-       RETURN(FALSE);
-     }
+   if (!hMenu)
+      RETURN(FALSE);
 
-   if (pmbi->cbSize != sizeof(MENUBARINFO))
-     {
+   _SEH2_TRY
+   {
+       kmbi.cbSize = pmbi->cbSize;
+   }
+   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+   {
+       kmbi.cbSize = 0;
+   }
+   _SEH2_END
+
+   if (kmbi.cbSize != sizeof(MENUBARINFO))
+   {
        EngSetLastError(ERROR_INVALID_PARAMETER);
        RETURN(FALSE);
-     }
+   }
 
-   kmbi.cbSize = sizeof(MENUBARINFO);
-   kmbi.fBarFocused = FALSE;
-   kmbi.fFocused = FALSE;
-   kmbi.hwndMenu = NULL;
+   if (!Menu) Menu = UserGetMenuObject(hMenu);
+   if (!Menu)
+       RETURN(FALSE);
 
-   switch (idObject)
+   if (idItem < 0 || idItem > Menu->MenuInfo.MenuItemCount)
+       RETURN(FALSE);
+
+   RECTL_vSetEmptyRect(&kmbi.rcBar);
+
+   if (idItem == 0)
    {
-      case OBJID_MENU:
-      {
-         PMENU_OBJECT SubMenuObject;
-         kmbi.hMenu = hMenu;
-         if (idItem) /* Non-Zero-Based. */
-           {
-              if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1)
-                   kmbi.rcBar = mi->Rect;
-              else
-                {
-                   Res = FALSE;
-                   break;
-                }
-           }
-         else
-           {
-              /* If items is zero we assume info for the menu itself. */
-              if (!(IntGetClientOrigin(WindowObject, &Offset)))
-                {
-                   Res = FALSE;
-                   break;
-                }
-              Rect.left = Offset.x;
-              Rect.right = Offset.x + MenuObject->MenuInfo.Width;
-              Rect.bottom = Offset.y;
-              Rect.top = Offset.y - MenuObject->MenuInfo.Height;
-              kmbi.rcBar = Rect;
-              TRACE("Rect top = %d bottom = %d left = %d right = %d \n",
-                       Rect.top, Rect.bottom, Rect.left, Rect.right);
-           }
-         if (idItem)
-           {
-              if (idItem-1 == MenuObject->MenuInfo.FocusedItem)
-                    kmbi.fFocused = TRUE;
-           }
-         if (MenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM)
-               kmbi.fBarFocused = TRUE;
+      Ret = IntGetMenuItemRect(pWnd, Menu, -1, &kmbi.rcBar);
+      kmbi.rcBar.right = kmbi.rcBar.left + Menu->MenuInfo.Width;
+      kmbi.rcBar.bottom = kmbi.rcBar.top + Menu->MenuInfo.Height;
+      ERR("idItem 0 %d\n",Ret);
+   }
+   else
+   {
+      Ret = IntGetMenuItemRect(pWnd, Menu, idItem-1, &kmbi.rcBar);
+      ERR("idItem X %d\n", Ret);
+   }
 
-         if (MenuObject->MenuItemList)
-         {
-         SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu);
-         if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd;
-         }
-         TRACE("OBJID_MENU, idItem = %d\n",idItem);
-         break;
-      }
-      case OBJID_CLIENT:
-      {
-         PMENU_OBJECT SubMenuObject, XSubMenuObject;
-         HMENU hMenuChk;
-         // Windows does this! Wine checks for Atom and uses GetWindowLongPtrW.
-         hMenuChk = (HMENU)co_IntSendMessage(hwnd, MN_GETHMENU, 0, 0);
+   kmbi.hMenu = hMenu;
+   kmbi.hwndMenu = NULL;
+   //kmbi.fBarFocused = top_popup_hmenu == hMenu;
+   if (idItem)
+   {
+       PMENU_OBJECT SubMenuObject;
+       kmbi.fFocused = Menu->MenuInfo.FocusedItem == idItem-1;
 
-         if (!(MenuObject = UserGetMenuObject(hMenuChk)))
-         {
-            ERR("Window does not have a Popup Menu!\n");
-            EngSetLastError(ERROR_INVALID_MENU_HANDLE);
-            RETURN(FALSE);
-         }
+       if ( kmbi.fFocused && Menu->MenuItemList->hSubMenu )
+       {
+          SubMenuObject = UserGetMenuObject(Menu->MenuItemList->hSubMenu); 
+          if (SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd;
+       }
+   }
+/*   else
+   {
+       kmbi.fFocused = kmbi.fBarFocused;
+   }
+*/
+   _SEH2_TRY
+   {
+      RtlCopyMemory(pmbi, &kmbi, sizeof(MENUBARINFO));
+   }
+   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+   {
+      Status = _SEH2_GetExceptionCode();
+   }
+   _SEH2_END
 
-         SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu);
-         if(SubMenuObject) kmbi.hMenu = SubMenuObject->MenuInfo.Self;
-         else
-           {
-              Res = FALSE;
-              ERR("OBJID_CLIENT, No SubMenu!\n");
-              break;
-           }
-         if (idItem)
-           {
-              if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1)
-                   kmbi.rcBar = mi->Rect;
-              else
-                {
-                   Res = FALSE;
-                   break;
-                }
-           }
-         else
-           {
-              PWND SubWinObj;
-              if (!(SubWinObj = UserGetWindowObject(SubMenuObject->MenuInfo.Wnd)))
-                {
-                   Res = FALSE;
-                   break;
-                }
-              if (!(IntGetClientOrigin(SubWinObj, &Offset)))
-                {
-                   Res = FALSE;
-                   break;
-                }
-              Rect.left = Offset.x;
-              Rect.right = Offset.x + SubMenuObject->MenuInfo.Width;
-              Rect.top = Offset.y;
-              Rect.bottom = Offset.y + SubMenuObject->MenuInfo.Height;
-              kmbi.rcBar = Rect;
-           }
-         if (idItem)
-           {
-              if (idItem-1 == SubMenuObject->MenuInfo.FocusedItem)
-                   kmbi.fFocused = TRUE;
-           }
-         if (SubMenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM)
-               kmbi.fBarFocused = TRUE;
-         XSubMenuObject = UserGetMenuObject(SubMenuObject->MenuItemList->hSubMenu);
-         if (XSubMenuObject) kmbi.hwndMenu = XSubMenuObject->MenuInfo.Wnd;
-         TRACE("OBJID_CLIENT, idItem = %d\n",idItem);
-         break;
-      }
-      case OBJID_SYSMENU:
-      {
-         PMENU_OBJECT SysMenuObject, SubMenuObject;
-         if(!(SysMenuObject = IntGetSystemMenu(WindowObject, FALSE, FALSE)))
-         {
-           Res = FALSE;
-           break;
-         }
-         kmbi.hMenu = SysMenuObject->MenuInfo.Self;
-         if (idItem)
-           {
-              if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1)
-                   kmbi.rcBar = mi->Rect;
-              else
-                {
-                   Res = FALSE;
-                   break;
-                }
-           }
-         else
-           {
-              PWND SysWinObj;
-              if (!(SysWinObj = UserGetWindowObject(SysMenuObject->MenuInfo.Wnd)))
-                {
-                   Res = FALSE;
-                   break;
-                }
-              if (!(IntGetClientOrigin(SysWinObj, &Offset)))
-                {
-                   Res = FALSE;
-                   break;
-                }
-              Rect.left = Offset.x;
-              Rect.right = Offset.x + SysMenuObject->MenuInfo.Width;
-              Rect.top = Offset.y;
-              Rect.bottom = Offset.y + SysMenuObject->MenuInfo.Height;
-              kmbi.rcBar = Rect;
-           }
-         if (idItem)
-           {
-              if (idItem-1 == SysMenuObject->MenuInfo.FocusedItem)
-                    kmbi.fFocused = TRUE;
-           }
-         if (SysMenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM)
-               kmbi.fBarFocused = TRUE;
-         SubMenuObject = UserGetMenuObject(SysMenuObject->MenuItemList->hSubMenu);
-         if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd;
-         TRACE("OBJID_SYSMENU, idItem = %d\n",idItem);
-         break;
-      }
-      default:
-         Res = FALSE;
-         ERR("Unknown idObject = %d, idItem = %d\n",idObject,idItem);
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(Status);
+      RETURN(FALSE);
    }
-   if (Res)
-     {
-        NTSTATUS Status = MmCopyToCaller(pmbi, &kmbi, sizeof(MENUBARINFO));
-        if (! NT_SUCCESS(Status))
-          {
-            SetLastNtError(Status);
-            RETURN(FALSE);
-          }
-     }
-   RETURN(Res);
 
+   RETURN(TRUE);
+
 CLEANUP:
    TRACE("Leave NtUserGetMenuBarInfo, ret=%i\n",_ret_);
    UserLeave();
@@ -2011,9 +1963,9 @@
    PWND ReferenceWnd;
    LONG XMove, YMove;
    RECTL Rect;
-   NTSTATUS Status;
    PMENU_OBJECT Menu;
    PMENU_ITEM MenuItem;
+   NTSTATUS Status = STATUS_SUCCESS;
    DECLARE_RETURN(BOOL);
 
    TRACE("Enter NtUserGetMenuItemRect\n");
@@ -2038,7 +1990,7 @@
 
    if (!(ReferenceWnd = UserGetWindowObject(hWnd))) RETURN( FALSE);
 
-   if(MenuItem->fType & MF_POPUP)
+   if (Menu->MenuInfo.Flags & MNF_POPUP)
    {
      XMove = ReferenceWnd->rcClient.left;
      YMove = ReferenceWnd->rcClient.top;
@@ -2054,13 +2006,22 @@
    Rect.right  += XMove;
    Rect.bottom += YMove;
 
-   Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT));
-   if (! NT_SUCCESS(Status))
+   _SEH2_TRY
    {
+      RtlCopyMemory(lprcItem, &Rect, sizeof(RECTL));
+   }
+   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+   {
+      Status = _SEH2_GetExceptionCode();
+   }
+   _SEH2_END
+
+   if (!NT_SUCCESS(Status))
+   {
       SetLastNtError(Status);
-      RETURN( FALSE);
+      RETURN(FALSE);
    }
-   RETURN( TRUE);
+   RETURN(TRUE);
 
 CLEANUP:
    TRACE("Leave NtUserGetMenuItemRect, ret=%i\n",_ret_);
Index: win32ss/user/ntuser/misc/registry.c
===================================================================
--- win32ss/user/ntuser/misc/registry.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/misc/registry.c	(copie de travail)
@@ -58,7 +58,7 @@
     ULONG cbInfoSize, cbDataSize;
 
     /* Check if the local buffer is sufficient */
-    cbInfoSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + *pcbValue;
+    cbInfoSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[*pcbValue]);
     if (cbInfoSize <= sizeof(ajBuffer))
     {
         pInfo = (PVOID)ajBuffer;
@@ -82,7 +82,7 @@
                              cbInfoSize,
                              &cbInfoSize);
 
-    cbDataSize = cbInfoSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data);
+    cbDataSize = pInfo->DataLength;
 
     /* Note: STATUS_BUFFER_OVERFLOW is not a success */
     if (NT_SUCCESS(Status))
Index: win32ss/user/ntuser/focus.c
===================================================================
--- win32ss/user/ntuser/focus.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/focus.c	(copie de travail)
@@ -120,7 +120,7 @@
                                (WPARAM)UserHMGetHandle(Window),
                                 0);
       }
-      //// Fixes bug 7089.
+      //// Fixes CORE-6434.
       if (!(Window->style & WS_CHILD))
       {
          PWND pwndTemp = co_GetDesktopWindow(Window)->spwndChild;
@@ -229,8 +229,6 @@
 
       co_IntMakeWindowActive(Window);
 
-      /* FIXME: IntIsWindow */
-
       co_IntSendMessageNoWait( UserHMGetHandle(Window),
                                WM_NCACTIVATE,
                               (WPARAM)(Window == (gpqForeground ? gpqForeground->spwndActive : NULL)),
@@ -298,28 +296,6 @@
    }
 }
 
-HWND FASTCALL
-IntFindChildWindowToOwner(PWND Root, PWND Owner)
-{
-   HWND Ret;
-   PWND Child, OwnerWnd;
-
-   for(Child = Root->spwndChild; Child; Child = Child->spwndNext)
-   {
-       OwnerWnd = Child->spwndOwner;
-      if(!OwnerWnd)
-         continue;
-
-      if(OwnerWnd == Owner)
-      {
-         Ret = Child->head.h;
-         return Ret;
-      }
-   }
-
-   return NULL;
-}
-
 VOID FASTCALL
 FindRemoveAsyncMsg(PWND Wnd, WPARAM wParam)
 {
@@ -546,13 +522,35 @@
    return Ret && fgRet;
 }
 
+/*
+  Revision 7888, activate modal dialog when clicking on a disabled window.
+*/
+HWND FASTCALL
+IntFindChildWindowToOwner(PWND Root, PWND Owner)
+{
+   HWND Ret;
+   PWND Child, OwnerWnd;
+
+   for(Child = Root->spwndChild; Child; Child = Child->spwndNext)
+   {
+       OwnerWnd = Child->spwndOwner;
+      if(!OwnerWnd)
+         continue;
+
+      if(OwnerWnd == Owner)
+      {
+         Ret = Child->head.h;
+         return Ret;
+      }
+   }
+   return NULL;
+}
+
 BOOL FASTCALL
 co_IntMouseActivateWindow(PWND Wnd)
 {
    HWND Top;
-   PWND TopWindow;
    USER_REFERENCE_ENTRY Ref;
-
    ASSERT_REFS_CO(Wnd);
 
    if (Wnd->style & WS_DISABLED)
@@ -562,6 +560,7 @@
       PWND DesktopWindow = UserGetDesktopWindow();
       if (DesktopWindow)
       {
+         ERR("Window Diabled\n");
          Top = IntFindChildWindowToOwner(DesktopWindow, Wnd);
          if ((TopWnd = ValidateHwndNoErr(Top)))
          {
@@ -574,15 +573,8 @@
       }
       return FALSE;
    }
-
-   TopWindow = UserGetAncestor(Wnd, GA_ROOT);
-   //if (TopWindow) {ERR("MAW 2 pWnd %p hWnd %p\n",TopWindow,TopWindow->head.h);}
-   if (!TopWindow) return FALSE;
-
-   /* TMN: Check return value from this function? */
-   UserRefObjectCo(TopWindow, &Ref);
-   co_IntSetForegroundAndFocusWindow(TopWindow, TRUE);
-   UserDerefObjectCo(TopWindow);
+   ERR("Mouse Active\n");
+   co_IntSetForegroundAndFocusWindow(Wnd, TRUE);
    return TRUE;
 }
 
@@ -731,20 +723,20 @@
    InAAPM = co_IntSendActivateMessages(WndPrev, Wnd, bMouse, Async);
 
    /* now change focus if necessary */
+   //// Fixes CORE-6452 allows setting focus on window.
    if (bFocus && !(ThreadQueue->QF_flags & QF_FOCUSNULLSINCEACTIVE))
    {
       /* Do not change focus if the window is no longer active */
-      if (ThreadQueue->spwndActive == Wnd)
+      if (pti->MessageQueue->spwndActive != IntGetNonChildAncestor(pti->MessageQueue->spwndFocus))
       {
-         if (!ThreadQueue->spwndFocus ||
-             !Wnd ||
-              UserGetAncestor(ThreadQueue->spwndFocus, GA_ROOT) != Wnd)
-         {
-            co_UserSetFocus(Wnd);
-         }
+         PWND pWndSend = pti->MessageQueue->spwndActive;
+         // Clear focus if the active window is minimized.
+         if (pWndSend && pti->MessageQueue->spwndActive->style & WS_MINIMIZE) pWndSend = NULL;
+         // Send focus messages and if so, set the focus.
+         IntSendFocusMessages( pti, pWndSend);
       }
    }
-
+   ////
    if (InAAPM)
    {
       pti->TIF_flags &= ~TIF_INACTIVATEAPPMSG;
@@ -815,12 +807,13 @@
       }
 
       /* Check if we can set the focus to this window */
-      for (pwndTop = Window; pwndTop != NULL; pwndTop = pwndTop->spwndParent)
+      //// Fixes wine win test_SetParent both "todo" line 3710 and 3720...
+      for (pwndTop = Window; pwndTop; pwndTop = pwndTop->spwndParent)
       {
          if (pwndTop->style & (WS_MINIMIZED|WS_DISABLED)) return 0;
          if ((pwndTop->style & (WS_POPUP|WS_CHILD)) != WS_CHILD) break;
       }
-
+      ////
       if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)Window->head.h, (LPARAM)hWndPrev))
       {
          ERR("SetFocus 1 WH_CBT Call Hook return!\n");
Index: win32ss/user/ntuser/object.c
===================================================================
--- win32ss/user/ntuser/object.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/object.c	(copie de travail)
@@ -554,6 +554,47 @@
    if (handle) return (PWND)UserGetObjectNoErr(gHandleTable, handle, type);
    return NULL;
 }
+
+PVOID FASTCALL ValidateHandle(HANDLE handle, HANDLE_TYPE type)
+{
+  PVOID pObj;
+  DWORD dwError = 0;
+  if (handle) 
+  {
+      pObj = UserGetObjectNoErr(gHandleTable, handle, type);
+      if (!pObj)
+      {
+          switch (type)
+          {  
+              case TYPE_WINDOW:
+                  dwError = ERROR_INVALID_WINDOW_HANDLE;
+                  break;
+              case TYPE_MENU:
+                  dwError = ERROR_INVALID_MENU_HANDLE;
+                  break;
+              case TYPE_CURSOR:
+                  dwError = ERROR_INVALID_CURSOR_HANDLE;
+                  break;
+              case TYPE_SETWINDOWPOS:
+                  dwError = ERROR_INVALID_DWP_HANDLE;
+                  break;
+              case TYPE_HOOK:
+                  dwError = ERROR_INVALID_HOOK_HANDLE;
+                  break;
+              case TYPE_ACCELTABLE:
+                  dwError = ERROR_INVALID_ACCEL_HANDLE;
+                  break;
+              default:
+                  dwError = ERROR_INVALID_HANDLE;
+                  break;
+          }
+          EngSetLastError(dwError);
+          return NULL;
+      }
+      return pObj;
+  }
+  return NULL;
+}
       
 /*
  * NtUserValidateHandleSecure
Index: win32ss/user/ntuser/object.h
===================================================================
--- win32ss/user/ntuser/object.h	(rÃ©vision 61927)
+++ win32ss/user/ntuser/object.h	(copie de travail)
@@ -19,6 +19,7 @@
 void DbgUserDumpHandleTable();
 VOID FASTCALL UserSetObjectOwner(PVOID obj, HANDLE_TYPE type, PVOID owner);
 HANDLE FASTCALL ValidateHandleNoErr(HANDLE handle, HANDLE_TYPE type);
+PVOID FASTCALL ValidateHandle(HANDLE handle, HANDLE_TYPE type);
 
 static __inline VOID
 UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry)
Index: win32ss/user/ntuser/message.c
===================================================================
--- win32ss/user/ntuser/message.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/message.c	(copie de travail)
@@ -7,6 +7,9 @@
  */
 
 #include <win32k.h>
+
+#include <dde.h>
+
 DBG_DEFAULT_CHANNEL(UserMsg);
 
 #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE)
Index: win32ss/user/ntuser/hook.c
===================================================================
--- win32ss/user/ntuser/hook.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/hook.c	(copie de travail)
@@ -35,7 +35,7 @@
 
    ppi = PsGetCurrentProcessWin32Process();
 
-   ERR("IntLoadHookModule. Client PID: %p\n", PsGetProcessId(ppi->peProcess));
+   TRACE("IntLoadHookModule. Client PID: %p\n", PsGetProcessId(ppi->peProcess));
 
     /* Check if this is the api hook */
     if(iHookID == WH_APIHOOK)
@@ -155,7 +155,7 @@
         return FALSE;
     }
 
-    ERR("UserRegisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess));
+    TRACE("UserRegisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess));
 
     /* Register the api hook */
     gpsi->dwSRVIFlags |= SRVINFO_APIHOOK;
Index: win32ss/user/ntuser/window.c
===================================================================
--- win32ss/user/ntuser/window.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/window.c	(copie de travail)
@@ -277,11 +277,8 @@
 PWND FASTCALL
 IntGetNonChildAncestor(PWND pWnd)
 {
-   if (pWnd)
-   {
-      while(pWnd && ((pWnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD))
-         pWnd = pWnd->spwndParent;
-   }
+   while(pWnd && (pWnd->style & (WS_CHILD | WS_POPUP)) == WS_CHILD)
+      pWnd = pWnd->spwndParent;
    return pWnd;
 }
 
@@ -934,7 +931,7 @@
          if(NewMenu)
          {
             Window->SystemMenu = NewMenu->MenuInfo.Self;
-            NewMenu->MenuInfo.Flags |= MF_SYSMENU;
+            NewMenu->MenuInfo.Flags |= MNF_SYSDESKMN;
             NewMenu->MenuInfo.Wnd = Window->head.h;
             ret = NewMenu;
             //IntReleaseMenuObject(NewMenu);
@@ -953,7 +950,7 @@
             UserDestroyMenu(hSysMenu);
             return NULL;
          }
-         SysMenu->MenuInfo.Flags |= MF_SYSMENU;
+         SysMenu->MenuInfo.Flags |= MNF_SYSDESKMN;
          SysMenu->MenuInfo.Wnd = Window->head.h;
          hNewMenu = co_IntLoadSysMenuTemplate();
          if(!hNewMenu)
@@ -973,13 +970,14 @@
          NewMenu = IntCloneMenu(Menu);
          if(NewMenu)
          {
-            NewMenu->MenuInfo.Flags |= MF_SYSMENU | MF_POPUP;
+            NewMenu->MenuInfo.Flags |= MNF_SYSDESKMN | MNF_POPUP;
+            NewMenu->MenuInfo.dwStyle = MNS_CHECKORBMP;
             IntReleaseMenuObject(NewMenu);
             UserSetMenuDefaultItem(NewMenu, SC_CLOSE, FALSE);
 
             ItemInfo.cbSize = sizeof(MENUITEMINFOW);
             ItemInfo.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_SUBMENU;
-            ItemInfo.fType = MF_POPUP;
+            ItemInfo.fType = 0;
             ItemInfo.fState = MFS_ENABLED;
             ItemInfo.dwTypeData = NULL;
             ItemInfo.cch = 0;
@@ -1429,7 +1427,7 @@
       OldMenu = IntGetMenuObject(Window->SystemMenu);
       if(OldMenu)
       {
-         OldMenu->MenuInfo.Flags &= ~ MF_SYSMENU;
+         OldMenu->MenuInfo.Flags &= ~ MNF_SYSDESKMN;
          IntReleaseMenuObject(OldMenu);
       }
    }
@@ -1438,7 +1436,7 @@
    {
       /* FIXME: Check window style, propably return FALSE? */
       Window->SystemMenu = Menu->MenuInfo.Self;
-      Menu->MenuInfo.Flags |= MF_SYSMENU;
+      Menu->MenuInfo.Flags |= MNF_SYSDESKMN;
    }
    else
       Window->SystemMenu = (HMENU)0;
@@ -2316,6 +2314,17 @@
                         ParentWindow->rcClient.top);
    }
 */
+   /* correct child window coordinates if mirroring on parent is enabled */
+   if (ParentWindow != NULL)
+   {
+      if ( ((Cs->style & WS_CHILD) == WS_CHILD) && 
+          ((ParentWindow->ExStyle & WS_EX_LAYOUTRTL) ==  WS_EX_LAYOUTRTL))
+      {
+          Window->rcWindow.right = ParentWindow->rcClient.right - (Window->rcWindow.left - ParentWindow->rcClient.left);
+          Window->rcWindow.left = Window->rcWindow.right - Size.cx;
+      }
+   }
+
    Window->rcClient = Window->rcWindow;
 
    /* Link the window */
@@ -2563,6 +2572,16 @@
 
     ASSERT(plstrWindowName);
 
+    if ( (dwStyle & (WS_POPUP|WS_CHILD)) != WS_CHILD) 
+    {
+        /* check hMenu is valid handle */
+        if (hMenu && !ValidateHandle(hMenu, TYPE_MENU))
+        {
+            /* error is set in ValidateHandle */
+            return NULL;
+        }
+    } 
+
     /* Copy the window name to kernel mode */
     Status = ProbeAndCaptureLargeString(&lstrWindowName, plstrWindowName);
     if (!NT_SUCCESS(Status))
@@ -3240,7 +3259,40 @@
    END_CLEANUP;
 }
 
+////
+//// ReactOS work around! Keep it the sames as in Combo.c and Controls.h
+////
+/* combo state struct */
+typedef struct
+{
+   HWND           self;
+   HWND           owner;
+   UINT           dwStyle;
+   HWND           hWndEdit;
+   HWND           hWndLBox;
+   UINT           wState;
+   HFONT          hFont;
+   RECT           textRect;
+   RECT           buttonRect;
+   RECT           droppedRect;
+   INT            droppedIndex;
+   INT            fixedOwnerDrawHeight;
+   INT            droppedWidth;   /* last two are not used unless set */
+   INT            editHeight;     /* explicitly */
+   LONG           UIState;
+} HEADCOMBO,*LPHEADCOMBO;
 
+// Window Extra data container.
+typedef struct _WND2CBOX
+{
+  WND;
+  LPHEADCOMBO pCBox;
+} WND2CBOX, *PWND2CBOX;
+
+#define CBF_BUTTONDOWN          0x0002
+////
+////
+////
 BOOL
 APIENTRY
 NtUserGetComboBoxInfo(
@@ -3248,6 +3300,9 @@
    PCOMBOBOXINFO pcbi)
 {
    PWND Wnd;
+   PPROCESSINFO ppi;
+   BOOL NotSameppi = FALSE;
+   BOOL Ret = TRUE;
    DECLARE_RETURN(BOOL);
 
    TRACE("Enter NtUserGetComboBoxInfo\n");
@@ -3273,16 +3328,86 @@
    }
    _SEH2_END;
 
+   if (pcbi->cbSize < sizeof(COMBOBOXINFO))
+   {
+      EngSetLastError(ERROR_INVALID_PARAMETER);
+      RETURN(FALSE);
+   }
+
    // Pass the user pointer, it was already probed.
-   RETURN( (BOOL) co_IntSendMessage( Wnd->head.h, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi));
+   if ((Wnd->pcls->atomClassName != gpsi->atomSysClass[ICLS_COMBOBOX]) && Wnd->fnid != FNID_COMBOBOX)
+   {
+      RETURN( (BOOL) co_IntSendMessage( Wnd->head.h, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi));
+   }
 
+   ppi = PsGetCurrentProcessWin32Process();
+   NotSameppi = ppi != Wnd->head.pti->ppi;
+   if (NotSameppi)
+   {
+      KeAttachProcess(&Wnd->head.pti->ppi->peProcess->Pcb);
+   }
+
+   _SEH2_TRY
+   {
+      LPHEADCOMBO lphc = ((PWND2CBOX)Wnd)->pCBox;
+      pcbi->rcItem = lphc->textRect;
+      pcbi->rcButton = lphc->buttonRect;
+      pcbi->stateButton = 0;
+      if (lphc->wState & CBF_BUTTONDOWN)
+         pcbi->stateButton |= STATE_SYSTEM_PRESSED;
+      if (RECTL_bIsEmptyRect(&lphc->buttonRect))
+         pcbi->stateButton |= STATE_SYSTEM_INVISIBLE;
+      pcbi->hwndCombo = lphc->self;
+      pcbi->hwndItem = lphc->hWndEdit;
+      pcbi->hwndList = lphc->hWndLBox;
+   }
+   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+   {
+      Ret = FALSE;
+      SetLastNtError(_SEH2_GetExceptionCode());
+   }
+   _SEH2_END;
+   
+   RETURN( Ret);
+
 CLEANUP:
+   if (NotSameppi) KeDetachProcess();
    TRACE("Leave NtUserGetComboBoxInfo, ret=%i\n",_ret_);
    UserLeave();
    END_CLEANUP;
 }
 
+////
+//// ReactOS work around! Keep it the sames as in Listbox.c
+////
+/* Listbox structure */
+typedef struct
+{
+    HWND        self;           /* Our own window handle */
+    HWND        owner;          /* Owner window to send notifications to */
+    UINT        style;          /* Window style */
+    INT         width;          /* Window width */
+    INT         height;         /* Window height */
+    VOID       *items;          /* Array of items */
+    INT         nb_items;       /* Number of items */
+    INT         top_item;       /* Top visible item */
+    INT         selected_item;  /* Selected item */
+    INT         focus_item;     /* Item that has the focus */
+    INT         anchor_item;    /* Anchor item for extended selection */
+    INT         item_height;    /* Default item height */
+    INT         page_size;      /* Items per listbox page */
+    INT         column_width;   /* Column width for multi-column listboxes */
+} LB_DESCR;
 
+// Window Extra data container.
+typedef struct _WND2LB
+{
+  WND;
+  LB_DESCR * pLBiv;
+} WND2LB, *PWND2LB;
+////
+////
+////
 DWORD
 APIENTRY
 NtUserGetListBoxInfo(
@@ -3289,6 +3414,9 @@
    HWND hWnd)
 {
    PWND Wnd;
+   PPROCESSINFO ppi;
+   BOOL NotSameppi = FALSE;
+   DWORD Ret = 0;
    DECLARE_RETURN(DWORD);
 
    TRACE("Enter NtUserGetListBoxInfo\n");
@@ -3299,9 +3427,39 @@
       RETURN( 0 );
    }
 
-   RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 ));
+   if ((Wnd->pcls->atomClassName != gpsi->atomSysClass[ICLS_LISTBOX]) && Wnd->fnid != FNID_LISTBOX)
+   {
+      RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 ));
+   }
 
+   // wine lisbox:test_GetListBoxInfo lb_getlistboxinfo = 0, should not send a message!
+   ppi = PsGetCurrentProcessWin32Process();
+   NotSameppi = ppi != Wnd->head.pti->ppi;
+   if (NotSameppi)
+   {
+      KeAttachProcess(&Wnd->head.pti->ppi->peProcess->Pcb);
+   }
+
+   _SEH2_TRY
+   {
+      LB_DESCR *descr = ((PWND2LB)Wnd)->pLBiv;
+      // See Controls ListBox.c:LB_GETLISTBOXINFO must match...
+      if (descr->style & LBS_MULTICOLUMN) //// ReactOS
+         Ret = descr->page_size * descr->column_width;
+      else
+         Ret = descr->page_size;
+   }
+   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+   {
+      Ret = 0;
+      SetLastNtError(_SEH2_GetExceptionCode());
+   }
+   _SEH2_END;
+   
+   RETURN( Ret);
+
 CLEANUP:
+   if (NotSameppi) KeDetachProcess();
    TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", _ret_);
    UserLeave();
    END_CLEANUP;
Index: win32ss/user/ntuser/winpos.c
===================================================================
--- win32ss/user/ntuser/winpos.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/winpos.c	(copie de travail)
@@ -120,8 +120,6 @@
        Delta.y -= ToWnd->rcClient.top;
     }
 
-    if (mirror_from) Delta.x = -Delta.x;
-
     for (i = 0; i != cPoints; i++)
     {
         lpPoints[i].x += Delta.x;
@@ -1383,7 +1381,7 @@
  *
  * FIXME: hide/show owned popups when owner visibility changes.
  *
- * ReactOS: See bug 6751 and 7228.
+ * ReactOS: See bug CORE-6129 and CORE-6554.
  *
  */
  ////
@@ -1452,7 +1450,7 @@
 
    if (hWndInsertAfter == HWND_BOTTOM)
    {
-      TRACE("Window is HWND_BOTTOM\n");
+      ERR("Window is HWND_BOTTOM\n");
       if (List) ExFreePoolWithTag(List, USERTAG_WINDOWLIST);
       goto done;
    }
@@ -1723,7 +1721,6 @@
    RECTL CopyRect;
    PWND Ancestor;
    BOOL bPointerInWindow;
-   //BOOL bNoTopMost;
 
    ASSERT_REFS_CO(Window);
 
@@ -1762,9 +1759,6 @@
 
    co_WinPosDoWinPosChanging(Window, &WinPos, &NewWindowRect, &NewClientRect);
 
-   // HWND_NOTOPMOST is redirected in WinPosFixupFlags.
-   //bNoTopMost = WndInsertAfter == HWND_NOTOPMOST;
-
    /* Does the window still exist? */
    if (!IntIsWindow(WinPos.hwnd))
    {
@@ -1825,70 +1819,6 @@
    if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow())
    {
       IntLinkHwnd(Window, WinPos.hwndInsertAfter);
-#if 0
-      //// Fix bug 6751 & 7228 see WinPosDoOwnedPopups wine Fixme.
-      PWND ParentWindow;
-      PWND Sibling;
-      PWND InsertAfterWindow;
-
-      if ((ParentWindow = Window->spwndParent)) // Must have a Parent window!
-      {
-         //ERR("SetWindowPos has parent window.\n");
-         if (WinPos.hwndInsertAfter == HWND_TOPMOST)
-         {
-            InsertAfterWindow = NULL;
-         }
-         else if ( WinPos.hwndInsertAfter == HWND_TOP )
-         {
-            InsertAfterWindow = NULL;
-
-            Sibling = ParentWindow->spwndChild;
-
-            while ( Sibling && Sibling->ExStyle & WS_EX_TOPMOST )
-            {
-               InsertAfterWindow = Sibling;
-               Sibling = Sibling->spwndNext;
-            }
-         }
-         else if (WinPos.hwndInsertAfter == HWND_BOTTOM)
-         {
-            if (ParentWindow->spwndChild)
-            {
-               InsertAfterWindow = ParentWindow->spwndChild;
-
-               if(InsertAfterWindow)
-               {
-                  while (InsertAfterWindow->spwndNext)
-                     InsertAfterWindow = InsertAfterWindow->spwndNext;
-               }
-            }
-            else
-               InsertAfterWindow = NULL;
-         }
-         else
-            InsertAfterWindow = IntGetWindowObject(WinPos.hwndInsertAfter);
-         /* Do nothing if hwndInsertAfter is HWND_BOTTOM and Window is already
-            the last window */
-         if (InsertAfterWindow != Window)
-         {
-            IntUnlinkWindow(Window);
-            IntLinkWindow(Window, InsertAfterWindow);
-         }
-
-         if ( ( WinPos.hwndInsertAfter == HWND_TOPMOST ||
-               ( Window->ExStyle & WS_EX_TOPMOST && Window->spwndPrev && Window->spwndPrev->ExStyle & WS_EX_TOPMOST ) ||
-               ( Window->spwndNext && Window->spwndNext->ExStyle & WS_EX_TOPMOST ) ) &&
-               !bNoTopMost )
-         {
-            Window->ExStyle |= WS_EX_TOPMOST;
-         }
-         else
-         {
-            Window->ExStyle &= ~ WS_EX_TOPMOST;
-         }
-      }
-      ////
-#endif
    }
 
    OldWindowRect = Window->rcWindow;
@@ -2510,7 +2440,8 @@
 co_WinPosSearchChildren(
    PWND ScopeWin,
    POINT *Point,
-   USHORT *HitTest
+   USHORT *HitTest,
+   BOOL Ignore
    )
 {
     PWND pwndChild;
@@ -2521,7 +2452,7 @@
         return NULL;
     }
 
-    if ((ScopeWin->style & WS_DISABLED))
+    if (!Ignore && (ScopeWin->style & WS_DISABLED))
     {
         return NULL;
     }
@@ -2545,7 +2476,7 @@
                     continue;
                 }
 
-                pwndChild = co_WinPosSearchChildren(pwndChild, Point, HitTest);
+                pwndChild = co_WinPosSearchChildren(pwndChild, Point, HitTest, Ignore);
 
                 if(pwndChild != NULL)
                 {
@@ -2576,7 +2507,7 @@
 }
 
 PWND FASTCALL
-co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest)
+co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest, BOOL Ignore)
 {
    PWND Window;
    POINT Point = *WinPoint;
@@ -2594,7 +2525,7 @@
    ASSERT_REFS_CO(ScopeWin);
    UserRefObjectCo(ScopeWin, &Ref);
 
-   Window = co_WinPosSearchChildren(ScopeWin, &Point, HitTest);
+   Window = co_WinPosSearchChildren(ScopeWin, &Point, HitTest, Ignore);
 
    UserDerefObjectCo(ScopeWin);
    if (Window)
@@ -3517,7 +3448,7 @@
       UserRefObjectCo(DesktopWindow, &Ref);
 
       //pti = PsGetCurrentThreadWin32Thread();
-      Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest);
+      Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest, FALSE);
 
       if (Window)
       {
Index: win32ss/user/ntuser/winpos.h
===================================================================
--- win32ss/user/ntuser/winpos.h	(rÃ©vision 61927)
+++ win32ss/user/ntuser/winpos.h	(copie de travail)
@@ -52,7 +52,7 @@
 BOOLEAN FASTCALL co_WinPosSetWindowPos(PWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags);
 BOOLEAN FASTCALL co_WinPosShowWindow(PWND Window, INT Cmd);
 void FASTCALL co_WinPosSendSizeMove(PWND Window);
-PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest);
+PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest, BOOL Ignore);
 VOID FASTCALL co_WinPosActivateOtherWindow(PWND);
 PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG);
 BOOL FASTCALL IntScreenToClient(PWND,LPPOINT);
Index: win32ss/user/ntuser/msgqueue.c
===================================================================
--- win32ss/user/ntuser/msgqueue.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/msgqueue.c	(copie de travail)
@@ -575,6 +575,7 @@
    {
        pti = pwnd->head.pti;
        MessageQueue = pti->MessageQueue;
+       // MessageQueue->ptiMouse = pti;
 
        if ( pti->TIF_flags & TIF_INCLEANUP || MessageQueue->QF_flags & QF_INDESTROY)
        {
@@ -1342,7 +1343,7 @@
     USHORT hittest;
     EVENTMSG event;
     MOUSEHOOKSTRUCT hook;
-    BOOL eatMsg;
+    BOOL eatMsg = FALSE;
 
     PWND pwndMsg, pwndDesktop;
     PUSER_MESSAGE_QUEUE MessageQueue;
@@ -1367,9 +1368,8 @@
         if (pwndMsg) UserReferenceObject(pwndMsg);
     }
     else
-    {   // Fix wine Msg test_HTTRANSPARENT. Start with a NULL window.
-        // http://www.winehq.org/pipermail/wine-patches/2012-August/116776.html
-        pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest);
+    {
+        pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest, TRUE);
     }
 
     TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest);
@@ -1392,10 +1392,6 @@
 
     msg->hwnd = UserHMGetHandle(pwndMsg);
 
-#if 0
-    if (!check_hwnd_filter( msg, hwnd_filter )) RETURN(FALSE);
-#endif
-
     pt = msg->pt;
     message = msg->message;
     /* Note: windows has no concept of a non-client wheel message */
@@ -1547,8 +1543,6 @@
         RETURN(TRUE);
     }
 
-    eatMsg = FALSE;
-
     if ((msg->message == WM_LBUTTONDOWN) ||
         (msg->message == WM_RBUTTONDOWN) ||
         (msg->message == WM_MBUTTONDOWN) ||
@@ -1565,10 +1559,7 @@
         if (pwndMsg != MessageQueue->spwndActive)
         {
             PWND pwndTop = pwndMsg;
-            while (pwndTop && ((pwndTop->style & (WS_POPUP|WS_CHILD)) == WS_CHILD))
-            {
-                pwndTop = pwndTop->spwndParent;
-            }
+            pwndTop = IntGetNonChildAncestor(pwndTop);
 
             if (pwndTop && pwndTop != pwndDesktop)
             {
@@ -1778,6 +1769,7 @@
         if (IsListEmpty(CurrentEntry)) break;
         if (!CurrentMessage) break;
         CurrentEntry = CurrentMessage->ListEntry.Flink;
+        if (!CurrentEntry) break; //// Fix CORE-6734 reported crash.
 /*
  MSDN:
  1: any window that belongs to the current thread, and any messages on the current thread's message queue whose hwnd value is NULL.
@@ -1809,8 +1801,7 @@
               break;
            }
         }
-        CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE,
-                                          ListEntry);
+        CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry);
     }
     while(CurrentEntry != ListHead);
 
Index: win32ss/user/ntuser/defwnd.c
===================================================================
--- win32ss/user/ntuser/defwnd.c	(rÃ©vision 61927)
+++ win32ss/user/ntuser/defwnd.c	(copie de travail)
@@ -7,6 +7,9 @@
  */
 
 #include <win32k.h>
+
+#include <windowsx.h>
+
 DBG_DEFAULT_CHANNEL(UserDefwnd);
 
 // Client Shutdown messages
Index: win32ss/user/user32/CMakeLists.txt
===================================================================
--- win32ss/user/user32/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/user/user32/CMakeLists.txt	(copie de travail)
@@ -58,8 +58,7 @@
     windows/text.c
     windows/window.c
     windows/winpos.c
-    user32.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/user32.def)
+    include/user32.h)
 
 if(USE_NEW_CURSORICON)
     list(APPEND SOURCE windows/cursoricon_new.c)
@@ -67,8 +66,12 @@
     list(APPEND SOURCE windows/cursoricon.c)
 endif()
 
-add_library(user32 SHARED ${SOURCE})
-set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE)
+add_library(user32 SHARED
+    ${SOURCE}
+    user32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/user32.def)
+
+set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE HOTPATCHABLE)
 target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB})
 
 if(MSVC)
@@ -78,5 +81,5 @@
 
 add_delay_importlibs(user32 imm32 usp10)
 add_importlibs(user32 gdi32 advapi32 kernel32 ntdll)
-add_pch(user32 include/user32.h)
+add_pch(user32 include/user32.h SOURCE)
 add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)
Index: win32ss/user/user32/controls/scrollbar.c
===================================================================
--- win32ss/user/user32/controls/scrollbar.c	(rÃ©vision 61927)
+++ win32ss/user/user32/controls/scrollbar.c	(copie de travail)
@@ -1438,7 +1438,10 @@
 /*
  * @implemented
  */
-BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags )
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
+EnableScrollBar( HWND hwnd, UINT nBar, UINT flags )
 {
    BOOL Hook, Ret = FALSE;
 
@@ -1499,7 +1502,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 GetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info)
 {
    BOOL Hook, Ret = FALSE;
@@ -1528,7 +1533,9 @@
 /*
  * @implemented
  */
-INT WINAPI
+INT
+WINAPI
+DECLSPEC_HOTPATCH
 GetScrollPos(HWND Wnd, INT Bar)
 {
   PWND pwnd;
@@ -1563,7 +1570,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 GetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos)
 {
   PWND pwnd;
@@ -1615,7 +1624,9 @@
 /*
  * @implemented
  */
-INT WINAPI
+INT
+WINAPI
+DECLSPEC_HOTPATCH
 SetScrollInfo(HWND Wnd, int SBType, LPCSCROLLINFO Info, BOOL bRedraw)
 {
    BOOL Hook;
@@ -1646,7 +1657,9 @@
 /*
  * @implemented
  */
-INT WINAPI
+INT
+WINAPI
+DECLSPEC_HOTPATCH
 SetScrollPos(HWND hWnd, INT nBar, INT nPos, BOOL bRedraw)
 {
   SCROLLINFO ScrollInfo;
@@ -1661,7 +1674,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 SetScrollRange(HWND hWnd, INT nBar, INT nMinPos, INT nMaxPos, BOOL bRedraw)
 {
   PWND pWnd;
Index: win32ss/user/user32/controls/listbox.c
===================================================================
--- win32ss/user/user32/controls/listbox.c	(rÃ©vision 61927)
+++ win32ss/user/user32/controls/listbox.c	(copie de travail)
@@ -3052,6 +3052,7 @@
         SEND_NOTIFICATION( descr, LBN_SETFOCUS );
         return 0;
     case WM_KILLFOCUS:
+        LISTBOX_HandleLButtonUp( descr ); /* Release capture if we have it */
         descr->in_focus = FALSE;
         descr->wheel_remain = 0;
         if ((descr->focus_item != -1) && descr->caret_on)
Index: win32ss/user/user32/include/ntwrapper.h
===================================================================
--- win32ss/user/user32/include/ntwrapper.h	(rÃ©vision 61927)
+++ win32ss/user/user32/include/ntwrapper.h	(copie de travail)
@@ -1,3 +1,5 @@
+#pragma once
+
 #if defined(__GNUC__)
 #define EXTINLINE extern inline __attribute__((always_inline)) 
 #elif defined(_MSC_VER)
Index: win32ss/user/user32/include/user32.h
===================================================================
--- win32ss/user/user32/include/user32.h	(rÃ©vision 61927)
+++ win32ss/user/user32/include/user32.h	(copie de travail)
@@ -6,12 +6,13 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _USER32_PCH_
+#define _USER32_PCH_
+
 /* INCLUDES ******************************************************************/
 
 /* C Headers */
-#include <assert.h>
 #include <stdio.h>
-#include <math.h>
 
 /* SDK/NDK Headers */
 #define _USER32_
@@ -22,7 +23,6 @@
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
-#include <wincon.h>
 #include <wingdi.h>
 #include <winreg.h>
 #include <winuser.h>
@@ -30,13 +30,9 @@
 #include <ddeml.h>
 #include <dde.h>
 #include <windowsx.h>
-#include <winnls32.h>
-#include <strsafe.h>
-#include <ndk/cmfuncs.h>
 #include <ndk/kefuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <ndk/umfuncs.h>
 
 /* CSRSS Header */
 #include <csr/csr.h>
@@ -61,3 +57,5 @@
 
 /* User macros */
 #include "user_x.h"
+
+#endif /* _USER32_PCH_ */
Index: win32ss/user/user32/include/user_x.h
===================================================================
--- win32ss/user/user32/include/user_x.h	(rÃ©vision 61927)
+++ win32ss/user/user32/include/user_x.h	(copie de travail)
@@ -1,3 +1,4 @@
+#pragma once
 
 static __inline PVOID
 SharedPtrToUser(PVOID Ptr)
Index: win32ss/user/user32/include/regcontrol.h
===================================================================
--- win32ss/user/user32/include/regcontrol.h	(rÃ©vision 61927)
+++ win32ss/user/user32/include/regcontrol.h	(copie de travail)
@@ -7,6 +7,7 @@
  * REVISION HISTORY: 2003/06/16 GvG Created
  * NOTES:
  */
+
 #pragma once
 
 /* Built-in class descriptor */
Index: win32ss/user/user32/windows/nonclient.c
===================================================================
--- win32ss/user/user32/windows/nonclient.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/nonclient.c	(copie de travail)
@@ -1233,7 +1233,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 AdjustWindowRectEx(LPRECT lpRect,
 		   DWORD dwStyle,
 		   BOOL bMenu,
@@ -1266,7 +1268,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 AdjustWindowRect(LPRECT lpRect,
 		 DWORD dwStyle,
 		 BOOL bMenu)
Index: win32ss/user/user32/windows/input.c
===================================================================
--- win32ss/user/user32/windows/input.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/input.c	(copie de travail)
@@ -29,6 +29,8 @@
 
 #include <user32.h>
 
+#include <strsafe.h>
+
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
@@ -112,7 +114,9 @@
 /*
  * @implemented
  */
-SHORT WINAPI
+SHORT
+WINAPI
+DECLSPEC_HOTPATCH
 GetAsyncKeyState(int vKey)
 {
     if (vKey < 0 || vKey > 256)
@@ -183,7 +187,9 @@
 /*
  * @implemented
  */
-SHORT WINAPI
+SHORT
+WINAPI
+DECLSPEC_HOTPATCH
 GetKeyState(int nVirtKey)
 {
     return (SHORT)NtUserGetKeyState((DWORD)nVirtKey);
Index: win32ss/user/user32/windows/menu.c
===================================================================
--- win32ss/user/user32/windows/menu.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/menu.c	(copie de travail)
@@ -36,6 +36,9 @@
 #define TPM_BUTTONDOWN		0x40000000		/* menu was clicked before tracking */
 #define TPM_POPUPMENU           0x20000000              /* menu is a popup menu */
 
+/*  top and bottom margins for popup menus */
+#define MENU_TOP_MARGIN 3
+#define MENU_BOTTOM_MARGIN 2
 
 #define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR)
 
@@ -46,10 +49,10 @@
 #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1))
 
 #define IS_SYSTEM_MENU(MenuInfo)  \
-	(0 == ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU))
+	(0 == ((MenuInfo)->Flags & MNF_POPUP) && 0 != ((MenuInfo)->Flags & MNF_SYSDESKMN))
 
 #define IS_SYSTEM_POPUP(MenuInfo) \
-	(0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU))
+	(0 != ((MenuInfo)->Flags & MNF_POPUP) && 0 != ((MenuInfo)->Flags & MNF_SYSDESKMN))
 
 #define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags))
 
@@ -396,7 +399,7 @@
             MenuCleanupRosMenuItemInfo(&item);
             return NO_SELECTED_ITEM;
         }
-        if (!(item.fType & MF_POPUP)) continue;
+        if (!(item.hSubMenu)) continue;
         if (item.hSubMenu == hSubTarget) {
             MenuCleanupRosMenuItemInfo(&item);
             return i;
@@ -507,6 +510,7 @@
   PROSMENUITEMINFO Items, ItemInfo;
   LRESULT MenuChar;
   UINT i;
+  WORD Flags = 0;
 
   TRACE("\tlooking for '%c' (0x%02x) in [%p]\n", (char) Key, Key, MenuInfo);
 
@@ -546,8 +550,11 @@
           }
       }
 
+      Flags |= MenuInfo->Flags & MNF_POPUP ? MF_POPUP : 0;
+      Flags |= MenuInfo->Flags & MNF_SYSDESKMN ? MF_SYSMENU : 0;
+
       MenuChar = SendMessageW(WndOwner, WM_MENUCHAR,
-                              MAKEWPARAM(Key, MenuInfo->Flags), (LPARAM) MenuInfo->Self);
+                              MAKEWPARAM(Key, Flags), (LPARAM) MenuInfo->Self);
       if (HIWORD(MenuChar) == MNC_EXECUTE) return LOWORD(MenuChar);
       if (HIWORD(MenuChar) == MNC_CLOSE) return (UINT)(-2);
     }
@@ -1207,7 +1214,7 @@
 	        dis.rcItem.bottom);
         SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis);
         /* Draw the popup-menu arrow */
-        if (lpitem->fType & MF_POPUP)
+        if (lpitem->hSubMenu)
         {
             RECT rectTemp;
             CopyRect(&rectTemp, &rect);
@@ -1299,7 +1306,7 @@
         HBITMAP bm;
         INT y = rect.top + rect.bottom;
         RECT rc = rect;
-        int checked = FALSE;
+        BOOL checked = FALSE;
         UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK );
         UINT check_bitmap_height = GetSystemMetrics( SM_CYMENUCHECK );
         /* Draw the check mark
@@ -1345,7 +1352,7 @@
             }
         }
         /* Draw the popup-menu arrow */
-        if (lpitem->fType & MF_POPUP)
+        if (lpitem->hSubMenu)
         {
             RECT rectTemp;
             CopyRect(&rectTemp, &rect);
@@ -1547,6 +1554,7 @@
     POINT pt;
     HMONITOR monitor;
     MONITORINFO info;
+    DWORD ex_style = 0; 
 
     TRACE("owner=%p hmenu=%p id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n",
           hwndOwner, hmenu, id, x, y, xanchor, yanchor);
@@ -1588,6 +1596,11 @@
     info.cbSize = sizeof(info);
     GetMonitorInfoW( monitor, &info );
 
+    if (flags & TPM_LAYOUTRTL) 
+    {                               
+        ex_style = WS_EX_LAYOUTRTL; 
+        flags ^= TPM_RIGHTALIGN;
+    } 
     if( flags & TPM_RIGHTALIGN ) x -= width;
     if( flags & TPM_CENTERALIGN ) x -= width / 2;
 
@@ -1615,7 +1628,7 @@
     if( y < info.rcMonitor.top ) y = info.rcMonitor.top;
 
     /* NOTE: In Windows, top menu popup is not owned. */
-    MenuInfo.Wnd = CreateWindowExW( 0, WC_MENU, NULL,
+    MenuInfo.Wnd = CreateWindowExW( ex_style, WC_MENU, NULL,
                                   WS_POPUP, x, y, width, height,
                                   hwndOwner, 0, (HINSTANCE) GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE),
                                  (LPVOID) MenuInfo.Self);
@@ -1650,7 +1663,7 @@
 
      if (!hmenu || !hmenu->MenuItemCount || !hmenu->Wnd) return;
     if (hmenu->FocusedItem == wIndex) return;
-    if (hmenu->Flags & MF_POPUP) hdc = GetDC(hmenu->Wnd);
+    if (hmenu->Flags & MNF_POPUP) hdc = GetDC(hmenu->Wnd);
     else hdc = GetDCEx(hmenu->Wnd, 0, DCX_CACHE | DCX_WINDOW);
     if (!top_popup) {
         top_popup = hmenu->Wnd;
@@ -1671,7 +1684,7 @@
             MenuSetRosMenuItemInfo(hmenu->Self, hmenu->FocusedItem, &ItemInfo);
         }
         MenuDrawMenuItem(hmenu->Wnd, hmenu, hwndOwner, hdc, &ItemInfo,
-                       hmenu->Height, ! (hmenu->Flags & MF_POPUP),
+                       hmenu->Height, !(hmenu->Flags & MNF_POPUP),
                        ODA_SELECT);
     }
 
@@ -1688,20 +1701,24 @@
                 ItemInfo.fState |= MF_HILITE;
                 MenuSetRosMenuItemInfo(hmenu->Self, hmenu->FocusedItem, &ItemInfo);
                 MenuDrawMenuItem(hmenu->Wnd, hmenu, hwndOwner, hdc,
-                               &ItemInfo, hmenu->Height, ! (hmenu->Flags & MF_POPUP),
+                               &ItemInfo, hmenu->Height, !(hmenu->Flags & MNF_POPUP),
                                ODA_SELECT);
             }
             if (sendMenuSelect)
             {
-                SendMessageW(hwndOwner, WM_MENUSELECT,
-                           MAKELONG(ItemInfo.fType & MF_POPUP ? wIndex : ItemInfo.wID,
-                                    ItemInfo.fType | ItemInfo.fState | MF_MOUSESELECT |
-                                    (hmenu->Flags & MF_SYSMENU)), (LPARAM) hmenu->Self);
+                WPARAM wParam = MAKEWPARAM( ItemInfo.hSubMenu ? wIndex : ItemInfo.wID, 
+                                            ItemInfo.fType | ItemInfo.fState |
+                                           (ItemInfo.hSubMenu ? MF_POPUP : 0) |
+                                           (hmenu->Flags & MNF_SYSDESKMN ? MF_SYSMENU : 0 ) );
+
+                SendMessageW(hwndOwner, WM_MENUSELECT, wParam, (LPARAM) hmenu->Self);
             }
         }
     }
-    else if (sendMenuSelect) {
-        if(topmenu) {
+    else if (sendMenuSelect) 
+    {
+        if(topmenu) 
+        {
             int pos;
             pos = MenuFindSubMenu(&topmenu, hmenu->Self);
             if (pos != NO_SELECTED_ITEM)
@@ -1709,11 +1726,11 @@
                 if (MenuGetRosMenuInfo(&TopMenuInfo, topmenu)
                     && MenuGetRosMenuItemInfo(topmenu, pos, &ItemInfo))
                 {
-                    SendMessageW(hwndOwner, WM_MENUSELECT,
-                               MAKELONG(Pos, ItemInfo.fType | ItemInfo.fState
-                                             | MF_MOUSESELECT
-                                             | (TopMenuInfo.Flags & MF_SYSMENU)),
-                               (LPARAM) topmenu);
+                    WPARAM wParam = MAKEWPARAM( Pos, ItemInfo.fType | ItemInfo.fState |
+                                               (ItemInfo.hSubMenu ? MF_POPUP : 0) |
+                                               (TopMenuInfo.Flags & MNF_SYSDESKMN ? MF_SYSMENU : 0 ) );
+
+                    SendMessageW(hwndOwner, WM_MENUSELECT, wParam, (LPARAM) topmenu);
                 }
             }
         }
@@ -1995,11 +2012,11 @@
  *
  * NOTE: flags is equivalent to the mtOption field
  */
-static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu, BOOL unicode )
+static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu)
 {
     WORD flags, id = 0;
     HMENU hSubMenu;
-    LPCSTR str;
+    LPCWSTR str;
     BOOL end = FALSE;
 
     do
@@ -2016,46 +2033,19 @@
             id = GET_WORD(res);
             res += sizeof(WORD);
         }
-        str = res;
-        if(!unicode)
-            res += strlen(str) + 1;
-        else
-            res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR);
+        str = (LPCWSTR)res;
+        res += (strlenW(str) + 1) * sizeof(WCHAR);
+
         if (flags & MF_POPUP)
         {
             hSubMenu = CreatePopupMenu();
             if(!hSubMenu) return NULL;
-            if(!(res = MENU_ParseResource(res, hSubMenu, unicode)))
-                return NULL;
-            if(!unicode)
-                AppendMenuA(hMenu, flags, (UINT)hSubMenu, str);
-            else
-                AppendMenuW(hMenu, flags, (UINT)hSubMenu, (LPCWSTR)str);
+            if(!(res = MENU_ParseResource(res, hSubMenu))) return NULL;
+            AppendMenuW(hMenu, flags, (UINT_PTR)hSubMenu, (LPCWSTR)str);
         }
         else  /* Not a popup */
         {
-            if(!unicode)
-            {
-                if (*str == 0)
-                    flags = MF_SEPARATOR;
-            }
-            else
-            {
-                if (*(LPCWSTR)str == 0)
-                    flags = MF_SEPARATOR;
-            }
-
-            if (flags & MF_SEPARATOR)
-            {
-                if (!(flags & (MF_GRAYED | MF_DISABLED)))
-                    flags |= MF_GRAYED | MF_DISABLED;
-            }
-
-            if(!unicode)
-                AppendMenuA(hMenu, flags, id, *str ? str : NULL);
-            else
-                AppendMenuW(hMenu, flags, id,
-                    *(LPCWSTR)str ? (LPCWSTR)str : NULL);
+            AppendMenuW(hMenu, flags, id, *(LPCWSTR)str ? (LPCWSTR)str : NULL);
         }
     } while(!end);
     return res;
@@ -2071,10 +2061,10 @@
 static LPCSTR MENUEX_ParseResource(LPCSTR res, HMENU hMenu)
 {
     WORD resinfo;
-    MENUITEMINFOW mii;
-
     do
     {
+        MENUITEMINFOW mii;
+
         mii.cbSize = sizeof(mii);
         mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE;
         mii.fType = GET_DWORD(res);
@@ -2114,14 +2104,12 @@
                 return NULL;
             }
             mii.fMask |= MIIM_SUBMENU;
-            mii.fType |= MF_POPUP;
-            mii.wID = (UINT)mii.hSubMenu;
         }
-        else if (!mii.dwTypeData[0])
+        else if (!mii.dwTypeData[0] && !(mii.fType & MF_SEPARATOR))
+        {
             mii.fType |= MF_SEPARATOR;
-
-        if (!InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii))
-            ERR("InsertMenuItemW failed\n");
+        }
+        InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii);
     } while (!(resinfo & MF_END));
     return res;
 }
@@ -2315,7 +2303,7 @@
       MenuCleanupRosMenuItemInfo(&ItemInfo);
       return MenuInfo->Self;
     }
-  if (0 == (ItemInfo.fType & MF_POPUP) || 0 != (ItemInfo.fState & (MF_GRAYED | MF_DISABLED)))
+  if (0 == (ItemInfo.hSubMenu) || 0 != (ItemInfo.fState & (MF_GRAYED | MF_DISABLED)))
     {
       MenuCleanupRosMenuItemInfo(&ItemInfo);
       return MenuInfo->Self;
@@ -2328,7 +2316,7 @@
   if (0 == (Flags & TPM_NONOTIFY))
     {
       SendMessageW(WndOwner, WM_INITMENUPOPUP, (WPARAM) ItemInfo.hSubMenu,
-                   MAKELONG(MenuInfo->FocusedItem, IS_SYSTEM_MENU(MenuInfo)));
+                   MAKELPARAM(MenuInfo->FocusedItem, IS_SYSTEM_MENU(MenuInfo)));
     }
 
   if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo))
@@ -2341,7 +2329,7 @@
   /* correct item if modified as a reaction to WM_INITMENUPOPUP message */
   if (0 == (ItemInfo.fState & MF_HILITE))
     {
-      if (0 != (MenuInfo->Flags & MF_POPUP))
+      if (0 != (MenuInfo->Flags & MNF_POPUP))
         {
           Dc = GetDC(MenuInfo->Wnd);
         }
@@ -2355,7 +2343,7 @@
       ItemInfo.fState |= MF_HILITE;
       MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo);
       MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc, &ItemInfo, MenuInfo->Height,
-                       ! (MenuInfo->Flags & MF_POPUP), ODA_DRAWENTIRE);
+                       ! (MenuInfo->Flags & MNF_POPUP), ODA_DRAWENTIRE);
       ReleaseDC(MenuInfo->Wnd, Dc);
     }
 
@@ -2373,7 +2361,7 @@
     {
       MenuInitSysMenuPopup(ItemInfo.hSubMenu, GetWindowLongPtrW(MenuInfo->Wnd, GWL_STYLE),
                            GetClassLongPtrW(MenuInfo->Wnd, GCL_STYLE), HTSYSMENU);
-
+      if (Flags & TPM_LAYOUTRTL) Rect.left;
       NcGetSysPopupPos(MenuInfo->Wnd, &Rect);
       Rect.top = Rect.bottom;
       Rect.right = GetSystemMetrics(SM_CXSIZE);
@@ -2380,31 +2368,40 @@
       Rect.bottom = GetSystemMetrics(SM_CYSIZE);
     }
   else
-    {
+  {
       GetWindowRect(MenuInfo->Wnd, &Rect);
-      if (0 != (MenuInfo->Flags & MF_POPUP))
-	{
-          Rect.left += ItemInfo.Rect.right - GetSystemMetrics(SM_CXBORDER);
-          Rect.top += ItemInfo.Rect.top - 3;
+      if (0 != (MenuInfo->Flags & MNF_POPUP))
+      {
+          if(Flags & TPM_LAYOUTRTL)
+             Rect.left += GetSystemMetrics(SM_CXBORDER);
+          else
+             Rect.left += ItemInfo.Rect.right- GetSystemMetrics(SM_CXBORDER);
+          Rect.top += ItemInfo.Rect.top - MENU_TOP_MARGIN;//3;
           Rect.right = ItemInfo.Rect.left - ItemInfo.Rect.right + GetSystemMetrics(SM_CXBORDER);
-          Rect.bottom = ItemInfo.Rect.top - ItemInfo.Rect.bottom - 3 - 2
-                                                    - GetSystemMetrics(SM_CYBORDER);
-        }
+          Rect.bottom = ItemInfo.Rect.top - ItemInfo.Rect.bottom - MENU_TOP_MARGIN - MENU_BOTTOM_MARGIN/*2*/
+                                                     - GetSystemMetrics(SM_CYBORDER);
+      }
       else
-        {
-          Rect.left += ItemInfo.Rect.left;
+      {
+          if(Flags & TPM_LAYOUTRTL)
+              Rect.left += Rect.right - ItemInfo.Rect.left;
+          else
+              Rect.left += ItemInfo.Rect.left;
           Rect.top += ItemInfo.Rect.bottom;
           Rect.right = ItemInfo.Rect.right - ItemInfo.Rect.left;
           Rect.bottom = ItemInfo.Rect.bottom - ItemInfo.Rect.top;
-        }
-    }
+      }
+  }
 
+  /* use default alignment for submenus */
+  Flags &= ~(TPM_CENTERALIGN | TPM_RIGHTALIGN | TPM_VCENTERALIGN | TPM_BOTTOMALIGN);
+
   MenuShowPopup(WndOwner, ItemInfo.hSubMenu, MenuInfo->FocusedItem, Flags,
                 Rect.left, Rect.top, Rect.right, Rect.bottom );
   if (SelectFirst && MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu))
-    {
+  {
       MenuMoveSelection(WndOwner, &SubMenuInfo, ITEM_NEXT);
-    }
+  }
 
   Ret = ItemInfo.hSubMenu;
   MenuCleanupRosMenuItemInfo(&ItemInfo);
@@ -2447,7 +2444,7 @@
       MenuInitRosMenuItemInfo(&ItemInfo);
       ItemInfo.fMask |= MIIM_FTYPE | MIIM_STATE;
       if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo)
-          || 0 == (ItemInfo.fType & MF_POPUP)
+          || 0 == (ItemInfo.hSubMenu)
           || 0 == (ItemInfo.fState & MF_MOUSESELECT))
       {
           MenuCleanupRosMenuItemInfo(&ItemInfo);
@@ -2485,7 +2482,7 @@
 
   if (MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu) &&
       Mt->TopMenu != PtMenuInfo->Self &&
-      0 == ((PtMenuInfo->Flags | TopMenuInfo.Flags) & MF_POPUP))
+      0 == ((PtMenuInfo->Flags | TopMenuInfo.Flags) & MNF_POPUP))
     {
       /* both are top level menus (system and menu-bar) */
       MenuHideSubPopups(Mt->OwnerWnd, &TopMenuInfo, FALSE, wFlags);
@@ -2532,7 +2529,7 @@
 
   TRACE("%p %08x %p\n", MenuInfo, ItemInfo.wID, ItemInfo.hSubMenu);
 
-  if (0 == (ItemInfo.fType & MF_POPUP))
+  if (0 == (ItemInfo.hSubMenu))
     {
       if (0 == (ItemInfo.fState & (MF_GRAYED | MF_DISABLED))
           && 0 == (ItemInfo.fType & MF_SEPARATOR))
@@ -2541,7 +2538,7 @@
             do not send a message to the owner */
           if (0 == (Flags & TPM_RETURNCMD))
 	    {
-              if (0 != (MenuInfo->Flags & MF_SYSMENU))
+              if (0 != (MenuInfo->Flags & MNF_SYSDESKMN))
                 {
                   PostMessageW(Mt->OwnerWnd, WM_SYSCOMMAND, ItemInfo.wID,
                                MAKELPARAM((SHORT) Mt->Pt.x, (SHORT) Mt->Pt.y));
@@ -2548,10 +2545,13 @@
                 }
               else
                 {
-                  if (MenuInfo->dwStyle & MNS_NOTIFYBYPOS)
-                      PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND,
-                                                 MenuInfo->FocusedItem,
-                                                       (LPARAM)MenuInfo->Self);
+                  BOOL ret;
+                  ROSMENUINFO topmenuI;
+                  ret = MenuGetRosMenuInfo(&topmenuI, Mt->TopMenu);
+                  DWORD dwStyle = MenuInfo->dwStyle | (ret ? topmenuI.dwStyle : 0);
+
+                  if (dwStyle & MNS_NOTIFYBYPOS)
+                      PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND, MenuInfo->FocusedItem, (LPARAM)MenuInfo->Self);
                   else
                     PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0);
                 }
@@ -2663,7 +2663,7 @@
       if (0 <= Id && MenuGetRosMenuItemInfo(MenuInfo.Self, Id, &ItemInfo) &&
           MenuInfo.FocusedItem == Id)
         {
-          if (0 == (ItemInfo.fType & MF_POPUP))
+          if (0 == (ItemInfo.hSubMenu))
             {
               INT ExecutedMenuId = MenuExecFocusedItem(Mt, &MenuInfo, Flags);
               MenuCleanupRosMenuItemInfo(&ItemInfo);
@@ -2712,7 +2712,7 @@
     {
       MenuInitRosMenuItemInfo(&ItemInfo);
       if (MenuGetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo) &&
-          0 != (ItemInfo.fType & MF_POPUP) &&
+          0 != (ItemInfo.hSubMenu) &&
           0 != (ItemInfo.fState & MF_MOUSESELECT))
         {
           Ret = MenuPtMenu(ItemInfo.hSubMenu, Pt);
@@ -2727,7 +2727,7 @@
 
   /* check the current window (avoiding WM_HITTEST) */
   Ht = DefWndNCHitTest(MenuInfo.Wnd, Pt);
-  if (0 != (MenuInfo.Flags & MF_POPUP))
+  if (0 != (MenuInfo.Flags & MNF_POPUP))
     {
       if (HTNOWHERE != Ht && HTERROR != Ht)
         {
@@ -2826,7 +2826,7 @@
       MenuCleanupRosMenuItemInfo(&ItemInfo);
       return NULL;
     }
-  if (0 != (ItemInfo.fType & MF_POPUP) && 0 != (ItemInfo.fState & MF_MOUSESELECT))
+  if (0 != (ItemInfo.hSubMenu) && 0 != (ItemInfo.fState & MF_MOUSESELECT))
     {
       MenuCleanupRosMenuItemInfo(&ItemInfo);
       return ItemInfo.hSubMenu;
@@ -2978,20 +2978,20 @@
 
     switch( uMsg )
     {
-	case WM_KEYDOWN:
-	     PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
-	     if( msg.message == WM_KEYUP || msg.message == WM_PAINT )
-	     {
-		 PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE);
-	         PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
-	         if( msg.message == WM_KEYDOWN &&
-		    (msg.wParam == VK_LEFT || msg.wParam == VK_RIGHT))
-	         {
-		     Mt->TrackFlags |= TF_SUSPENDPOPUP;
-		     return TRUE;
-	         }
-	     }
-	     break;
+    case WM_KEYDOWN:
+        PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
+        if( msg.message == WM_KEYUP || msg.message == WM_PAINT )
+        {
+            PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE);
+            PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
+            if( msg.message == WM_KEYDOWN &&
+                (msg.wParam == VK_LEFT || msg.wParam == VK_RIGHT))
+            {
+                 Mt->TrackFlags |= TF_SUSPENDPOPUP;
+                 return TRUE;
+            }
+        }
+        break;
     }
     /* failures go through this */
     Mt->TrackFlags &= ~TF_SUSPENDPOPUP;
@@ -3013,7 +3013,7 @@
   if (Mt->CurrentMenu != Mt->TopMenu)
     {
       if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)
-          && 0 != (MenuInfo.Flags & MF_POPUP))
+          && 0 != (MenuInfo.Flags & MNF_POPUP))
         {
           MenuPrev = MenuTmp = Mt->TopMenu;
 
@@ -3085,7 +3085,7 @@
     {
       return;
     }
-  if ((MenuPrev == Mt->TopMenu) && !(TopMenuInfo.Flags & MF_POPUP))
+  if ((MenuPrev == Mt->TopMenu) && !(TopMenuInfo.Flags & MNF_POPUP))
     {
       /* move menu bar selection if no more popups are left */
 
@@ -3125,7 +3125,7 @@
          Mt->CurrentMenu, Mt->TopMenu);
 
     if (! MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu)) return;
-    if ((MenuInfo.Flags & MF_POPUP) || (Mt->CurrentMenu != Mt->TopMenu))
+    if ((MenuInfo.Flags & MNF_POPUP) || (Mt->CurrentMenu != Mt->TopMenu))
     {
       /* If already displaying a popup, try to display sub-popup */
 
@@ -3155,7 +3155,7 @@
        return;
     }
 
-    if (!(MenuInfo.Flags & MF_POPUP)) /* menu bar tracking */
+    if (!(MenuInfo.Flags & MNF_POPUP)) /* menu bar tracking */
     {
       if (Mt->CurrentMenu != Mt->TopMenu)
         {
@@ -3266,7 +3266,7 @@
                 }
                 if (!enterIdleSent)
                 {
-                  HWND win = MenuInfo.Flags & MF_POPUP ? MenuInfo.Wnd : NULL;
+                  HWND win = MenuInfo.Flags & MNF_POPUP ? MenuInfo.Wnd : NULL;
                   enterIdleSent = TRUE;
                   SendMessageW( mt.OwnerWnd, WM_ENTERIDLE, MSGF_MENU, (LPARAM) win);
                 }
@@ -3385,7 +3385,7 @@
                     case VK_DOWN: /* If on menu bar, pull-down the menu */
                         if (MenuGetRosMenuInfo(&MenuInfo, mt.CurrentMenu))
                         {
-                            if (!(MenuInfo.Flags & MF_POPUP))
+                            if (!(MenuInfo.Flags & MNF_POPUP))
                             {
                                 if (MenuGetRosMenuInfo(&MenuInfo, mt.TopMenu))
                                     mt.CurrentMenu = MenuShowSubPopup(mt.OwnerWnd, &MenuInfo, TRUE, wFlags);
@@ -3508,16 +3508,15 @@
             {
                 MenuHideSubPopups(mt.OwnerWnd, &MenuInfo, FALSE, wFlags);
 
-                if (MenuInfo.Flags & MF_POPUP)
+                if (MenuInfo.Flags & MNF_POPUP)
                 {
                     IntNotifyWinEvent(EVENT_SYSTEM_MENUPOPUPEND, MenuInfo.Wnd, OBJID_CLIENT, CHILDID_SELF, 0);
                     DestroyWindow(MenuInfo.Wnd);
                     MenuInfo.Wnd = NULL;
 
-                    if (!(MenuInfo.Flags & TPM_NONOTIFY))
+                    if (!(wFlags & TPM_NONOTIFY))
                       SendMessageW( mt.OwnerWnd, WM_UNINITMENUPOPUP, (WPARAM)mt.TopMenu,
                                  MAKELPARAM(0, IS_SYSTEM_MENU(&MenuInfo)) );
-
                 }
                 MenuSelectItem( mt.OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, FALSE, 0 );
             }
@@ -3585,7 +3584,7 @@
 
     IntNotifyWinEvent( EVENT_SYSTEM_MENUSTART,
                        hWnd,
-                       MenuInfo.Flags & MF_SYSMENU ? OBJID_SYSMENU : OBJID_MENU,
+                       MenuInfo.Flags & MNF_SYSDESKMN ? OBJID_SYSMENU : OBJID_MENU,
                        CHILDID_SELF, 0);
     return TRUE;
 }
@@ -3616,6 +3615,7 @@
 
     TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", hWnd, ht, pt.x, pt.y);
 
+    if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) wFlags |= TPM_LAYOUTRTL;
     if (IsMenu(hMenu))
     {
         /* map point to parent client coordinates */
@@ -3717,6 +3717,7 @@
     /* ReactOS Check */
     if (!ValidateHwnd(Wnd))
     {
+       /* invalid window see wine menu.c test_menu_trackpopupmenu line 3146 */
        return FALSE;
     }
 
@@ -3885,7 +3886,6 @@
 
   if(Flags & MF_POPUP)
   {
-    mii->fType |= MF_POPUP;
     mii->fMask |= MIIM_SUBMENU;
     mii->hSubMenu = (HMENU)IDNewItem;
   }
@@ -3995,7 +3995,7 @@
     if (0 != (Items[i].fType & MF_MENUBARBREAK)) continue;
     if (0 != (Items[i].fType & MF_SEPARATOR)) continue;
 
-    if ((Items[i].fType & MF_POPUP) && (uFlags == MF_BYCOMMAND))
+    if ((Items[i].hSubMenu) && (uFlags == MF_BYCOMMAND))
     {
       MenuCheckMenuRadioItem(Items[i].hSubMenu, idFirst, idLast, idCheck, uFlags, bCheck, pChecked, pUnchecked, pMenuChanged);
       continue;
@@ -4817,7 +4817,7 @@
       offset = GET_WORD(p);
       p += sizeof(WORD) + offset;
       if (!(hMenu = CreateMenu())) return 0;
-      if (!MENU_ParseResource(p, hMenu, TRUE))
+      if (!MENU_ParseResource(p, hMenu))
       {
         DestroyMenu(hMenu);
         return 0;
@@ -4899,7 +4899,7 @@
 
   if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE;
 
-  if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem))
+  if (rmii.hSubMenu && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem))
     NtUserDestroyMenu( rmii.hSubMenu );   /* ModifyMenu() spec */
 
   MenuCleanupRosMenuItemInfo( &rmii );
@@ -4946,7 +4946,7 @@
 
   if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE;
 
-  if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem))
+  if (rmii.hSubMenu && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem))
     NtUserDestroyMenu( rmii.hSubMenu );   /* ModifyMenu() spec */
 
   MenuCleanupRosMenuItemInfo( &rmii );
Index: win32ss/user/user32/windows/class.c
===================================================================
--- win32ss/user/user32/windows/class.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/class.c	(copie de travail)
@@ -1832,6 +1832,7 @@
  */
 LONG
 WINAPI
+DECLSPEC_HOTPATCH
 SetWindowLongA(
   HWND hWnd,
   int nIndex,
Index: win32ss/user/user32/windows/font.c
===================================================================
--- win32ss/user/user32/windows/font.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/font.c	(copie de travail)
@@ -605,7 +605,7 @@
     p = str + chars_fit; /* The character that doesn't fit */
     word_fits = TRUE;
     if (!chars_fit)
-        ; /* we pretend that it fits anyway */
+        word_fits = FALSE;
     else if (*p == SPACE) /* chars_fit < *len_str so this is valid */
         p--; /* the word just fitted */
     else
@@ -615,7 +615,7 @@
             ;
         word_fits = (p != str || *p == SPACE || IsCJKT(p[1]));
     }
-    /* If there was one or the first character didn't fit then */
+    /* If there was one. */
     if (word_fits)
     {
         int next_is_space;
Index: win32ss/user/user32/windows/defwnd.c
===================================================================
--- win32ss/user/user32/windows/defwnd.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/defwnd.c	(copie de travail)
@@ -36,7 +36,9 @@
 /*
  * @implemented
  */
-DWORD WINAPI
+DWORD
+WINAPI
+DECLSPEC_HOTPATCH
 GetSysColor(int nIndex)
 {
   if(nIndex >= 0 && nIndex < NUM_SYSCOLORS)
@@ -51,7 +53,9 @@
 /*
  * @implemented
  */
-HBRUSH WINAPI
+HBRUSH
+WINAPI
+DECLSPEC_HOTPATCH
 GetSysColorBrush(int nIndex)
 {
   if(nIndex >= 0 && nIndex < NUM_SYSCOLORS)
Index: win32ss/user/user32/windows/window.c
===================================================================
--- win32ss/user/user32/windows/window.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/window.c	(copie de travail)
@@ -322,7 +322,9 @@
 /*
  * @implemented
  */
-HWND WINAPI
+HWND
+WINAPI
+DECLSPEC_HOTPATCH
 CreateWindowExA(DWORD dwExStyle,
                 LPCSTR lpClassName,
                 LPCSTR lpWindowName,
@@ -445,7 +447,9 @@
 /*
  * @implemented
  */
-HWND WINAPI
+HWND
+WINAPI
+DECLSPEC_HOTPATCH
 CreateWindowExW(DWORD dwExStyle,
                 LPCWSTR lpClassName,
                 LPCWSTR lpWindowName,
@@ -1143,7 +1147,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 GetWindowInfo(HWND hWnd,
               PWINDOWINFO pwi)
 {
@@ -1636,7 +1642,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 SetWindowTextA(HWND hWnd,
                LPCSTR lpString)
 {
@@ -1659,7 +1667,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 SetWindowTextW(HWND hWnd,
                LPCWSTR lpString)
 {
Index: win32ss/user/user32/windows/winpos.c
===================================================================
--- win32ss/user/user32/windows/winpos.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/winpos.c	(copie de travail)
@@ -218,8 +218,6 @@
        Delta.y -= ToWnd->rcClient.top;
     }
 
-    if (mirror_from) Delta.x = -Delta.x;
-
     for (i = 0; i != cPoints; i++)
     {
         lpPoints[i].x += Delta.x;
Index: win32ss/user/user32/windows/message.c
===================================================================
--- win32ss/user/user32/windows/message.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/message.c	(copie de travail)
@@ -1908,7 +1908,9 @@
 /*
  * @implemented
  */
-LRESULT WINAPI
+LRESULT
+WINAPI
+DECLSPEC_HOTPATCH
 DispatchMessageA(CONST MSG *lpmsg)
 {
     LRESULT Ret = 0;
@@ -2000,7 +2002,9 @@
 /*
  * @implemented
  */
-LRESULT WINAPI
+LRESULT
+WINAPI
+DECLSPEC_HOTPATCH
 DispatchMessageW(CONST MSG *lpmsg)
 {
     LRESULT Ret = 0;
@@ -2100,7 +2104,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 GetMessageA(LPMSG lpMsg,
             HWND hWnd,
             UINT wMsgFilterMin,
@@ -2128,7 +2134,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 GetMessageW(LPMSG lpMsg,
             HWND hWnd,
             UINT wMsgFilterMin,
@@ -2191,7 +2199,9 @@
 /*
  * @implemented
  */
-BOOL WINAPI
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
 PeekMessageA(LPMSG lpMsg,
 	     HWND hWnd,
 	     UINT wMsgFilterMin,
@@ -2217,6 +2227,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 PeekMessageW(
   LPMSG lpMsg,
   HWND hWnd,
Index: win32ss/user/user32/windows/cursoricon.c
===================================================================
--- win32ss/user/user32/windows/cursoricon.c	(rÃ©vision 61927)
+++ win32ss/user/user32/windows/cursoricon.c	(copie de travail)
@@ -1252,7 +1252,7 @@
 /***********************************************************************
  *		ShowCursor (USER32.@)
  */
-INT WINAPI /*DECLSPEC_HOTPATCH*/ ShowCursor( BOOL bShow )
+INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow )
 {
     return NtUserxShowCursor(bShow);
 }
@@ -2112,6 +2112,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetCursorPos(int X, int Y)
 {
     return NtUserxSetCursorPos(X,Y);
@@ -2122,6 +2123,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetCursorPos(LPPOINT lpPoint)
 {
     BOOL res;
Index: win32ss/user/user32/misc/stubs.c
===================================================================
--- win32ss/user/user32/misc/stubs.c	(rÃ©vision 61927)
+++ win32ss/user/user32/misc/stubs.c	(copie de travail)
@@ -297,6 +297,7 @@
  */
 UINT
 WINAPI
+DECLSPEC_HOTPATCH
 GetRawInputBuffer(
     PRAWINPUT pData,
     PUINT pcbSize,
@@ -359,6 +360,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 RegisterRawInputDevices(
     PCRAWINPUTDEVICE pRawInputDevices,
     UINT uiNumDevices,
Index: win32ss/user/user32/misc/dllmain.c
===================================================================
--- win32ss/user/user32/misc/dllmain.c	(rÃ©vision 61927)
+++ win32ss/user/user32/misc/dllmain.c	(copie de travail)
@@ -1,5 +1,7 @@
 #include <user32.h>
 
+#include <ndk/cmfuncs.h>
+
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
Index: win32ss/user/user32/misc/imm.c
===================================================================
--- win32ss/user/user32/misc/imm.c	(rÃ©vision 61927)
+++ win32ss/user/user32/misc/imm.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include <user32.h>
 
+#include <winnls32.h>
+
 #include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
Index: win32ss/pch.h
===================================================================
--- win32ss/pch.h	(rÃ©vision 61927)
+++ win32ss/pch.h	(copie de travail)
@@ -16,15 +16,11 @@
 /* DDK/NDK/SDK headers */
 #undef NTDDI_VERSION
 #define NTDDI_VERSION NTDDI_WS03SP1
-#include <ntddk.h>
+#include <ntifs.h>
 #include <ntddmou.h>
-#include <ntddvdeo.h>
-#include <ntifs.h>
-#include <tvout.h>
 #include <ndk/exfuncs.h>
 #include <ndk/kdfuncs.h>
 #include <ndk/kefuncs.h>
-#include <ndk/lpcfuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
@@ -31,7 +27,6 @@
 #include <ndk/rtlfuncs.h>
 #include <ntstrsafe.h>
 #include <ntddkbd.h>
-#include <bugcodes.h>
 
 /* Win32 headers */
 /* FIXME: Defines in winbase.h that we need... */
@@ -61,11 +56,7 @@
 #define _ENGINE_EXPORT_
 #include <winddi.h>
 #include <winuser.h>
-#include <windowsx.h>
 #include <prntfont.h>
-#include <dde.h>
-#include <wincon.h>
-#include <winnls.h>
 #define _NOCSECT_TYPE
 #include <ddrawi.h>
 
@@ -72,10 +63,6 @@
 /* SEH support with PSEH */
 #include <pseh/pseh2.h>
 
-/* CSRSS Header */
-#include <csr/csr.h>
-#include <win/winmsg.h>
-
 /* Public Win32K headers */
 #include <include/callback.h>
 #include <include/ntusrtyp.h>
@@ -87,20 +74,10 @@
 
 /* Undocumented user definitions */
 #include <undocuser.h>
-#include <winlogon.h>
 
 /* Freetype headers */
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_GLYPH_H
-#include FT_TYPE1_TABLES_H
-#include <freetype/tttables.h>
-#include <freetype/fttrigon.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftbitmap.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ftwinfnt.h>
-#include <freetype/freetype.h>
 
 /* Internal Win32K header */
 #include "win32kp.h"
Index: win32ss/gdi/ntgdi/freetype.c
===================================================================
--- win32ss/gdi/ntgdi/freetype.c	(rÃ©vision 61927)
+++ win32ss/gdi/ntgdi/freetype.c	(copie de travail)
@@ -11,6 +11,14 @@
 
 #include <win32k.h>
 
+#include FT_GLYPH_H
+#include FT_TYPE1_TABLES_H
+#include <tttables.h>
+#include <fttrigon.h>
+#include <ftbitmap.h>
+#include <ftoutln.h>
+#include <ftwinfnt.h>
+
 #define NDEBUG
 #include <debug.h>
 
Index: win32ss/gdi/gdi32/include/gdi32p.h
===================================================================
--- win32ss/gdi/gdi32/include/gdi32p.h	(rÃ©vision 61927)
+++ win32ss/gdi/gdi32/include/gdi32p.h	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#pragma once
 
 /* DATA **********************************************************************/
 
Index: win32ss/gdi/gdi32/include/precomp.h
===================================================================
--- win32ss/gdi/gdi32/include/precomp.h	(rÃ©vision 61927)
+++ win32ss/gdi/gdi32/include/precomp.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _GDI32_PCH_
+#define _GDI32_PCH_
+
 /* INCLUDES ******************************************************************/
 
 /* Definitions */
@@ -14,7 +17,7 @@
 #define COM_NO_WINDOWS_H
 #define NTOS_MODE_USER
 
-#include <stdio.h>
+#include <stdarg.h>
 
 /* SDK/DDK/NDK Headers. */
 #include <windef.h>
@@ -25,18 +28,12 @@
 #include <wingdi.h>
 #define _ENGINE_EXPORT_
 #include <winddi.h>
-#include <d3dnthal.h>
 #include <prntfont.h>
 #include <winddiui.h>
 #include <winspool.h>
 
-#include <pseh/pseh2.h>
-
-#include <ddraw.h>
 #include <ddrawi.h>
-#include <ddrawint.h>
 #include <ddrawgdi.h>
-#include <d3dhal.h>
 
 /* Public Win32K Headers */
 #include <ntgdityp.h>
@@ -49,4 +46,4 @@
 /* Deprecated NTGDI calls which shouldn't exist */
 #include <ntgdibad.h>
 
-/* EOF */
+#endif /* _GDI32_PCH_ */
Index: win32ss/gdi/gdi32/misc/gdientry.c
===================================================================
--- win32ss/gdi/gdi32/misc/gdientry.c	(rÃ©vision 61927)
+++ win32ss/gdi/gdi32/misc/gdientry.c	(copie de travail)
@@ -11,6 +11,9 @@
 
 #include <precomp.h>
 
+#include <stdio.h>
+#include <d3dhal.h>
+
 /* DATA **********************************************************************/
 
 HANDLE ghDirectDraw;
Index: win32ss/gdi/gdi32/CMakeLists.txt
===================================================================
--- win32ss/gdi/gdi32/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/gdi/gdi32/CMakeLists.txt	(copie de travail)
@@ -43,11 +43,13 @@
     objects/text.c
     objects/utils.c
     objects/path.c
+    include/precomp.h)
+
+add_library(gdi32 SHARED
+    ${SOURCE}
     gdi32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def)
 
-add_library(gdi32 SHARED ${SOURCE})
-
 set_module_type(gdi32
     win32dll
     ENTRYPOINT DllMain 12
@@ -59,6 +61,6 @@
     ${PSEH_LIB})
 
 add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)
-add_pch(gdi32 include/precomp.h)
+add_pch(gdi32 include/precomp.h SOURCE)
 add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all)
 
Index: win32ss/gdi/eng/engevent.c
===================================================================
--- win32ss/gdi/eng/engevent.c	(rÃ©vision 61927)
+++ win32ss/gdi/eng/engevent.c	(copie de travail)
@@ -10,6 +10,9 @@
 /* INCLUDES *******************************************************************/
 
 #include <win32k.h>
+
+#include <ntddvdeo.h>
+
 #define NDEBUG
 #include <debug.h>
 
Index: win32ss/gdi/eng/ldevobj.c
===================================================================
--- win32ss/gdi/eng/ldevobj.c	(rÃ©vision 61927)
+++ win32ss/gdi/eng/ldevobj.c	(copie de travail)
@@ -18,7 +18,7 @@
 /** Globals *******************************************************************/
 
 static HSEMAPHORE ghsemLDEVList;
-static LDEVOBJ *gpldevHead = NULL;
+static LIST_ENTRY gleLdevListHead;
 static LDEVOBJ *gpldevWin32k = NULL;
 
 
@@ -31,6 +31,9 @@
 {
     ULONG cbSize;
 
+    /* Initialize the LDEV list head */
+    InitializeListHead(&gleLdevListHead);
+
     /* Initialize the loader lock */
     ghsemLDEVList = EngCreateSemaphore();
     if (!ghsemLDEVList)
@@ -50,8 +53,8 @@
     }
 
     /* Initialize the LDEVOBJ for win32k */
-    gpldevWin32k->pldevNext = NULL;
-    gpldevWin32k->pldevPrev = NULL;
+    gpldevWin32k->leLink.Flink = NULL;
+    gpldevWin32k->leLink.Blink = NULL;
     gpldevWin32k->ldevtype = LDEV_DEVICE_DISPLAY;
     gpldevWin32k->cRefs = 1;
     gpldevWin32k->ulDriverVersion = GDI_ENGINE_VERSION;
@@ -320,6 +323,7 @@
     _In_ ULONG ldevtype)
 {
     WCHAR acwBuffer[MAX_PATH];
+    PLIST_ENTRY pleLink;
     PLDEVOBJ pldev;
     UNICODE_STRING strDriverName;
     SIZE_T cwcLength;
@@ -368,13 +372,15 @@
     EngAcquireSemaphore(ghsemLDEVList);
 
     /* Search the List of LDEVS for the driver name */
-    for (pldev = gpldevHead; pldev != NULL; pldev = pldev->pldevNext)
+    for (pleLink = gleLdevListHead.Flink;
+         pleLink != &gleLdevListHead;
+         pleLink = pleLink->Flink)
     {
+        pldev = CONTAINING_RECORD(pleLink, LDEVOBJ, leLink);
+
         /* Check if the ldev is associated with a file */
         if (pldev->pGdiDriverInfo)
         {
-            ERR("Driver Name 1 %wZ\n", &strDriverName);
-            ERR("Driver Name 2 %wZ\n", &pldev->pGdiDriverInfo->DriverName);
             /* Check for match (case insensative) */
             if (RtlEqualUnicodeString(&pldev->pGdiDriverInfo->DriverName, &strDriverName, 1))
             {
@@ -385,7 +391,7 @@
     }
 
     /* Did we find one? */
-    if (!pldev)
+    if (pleLink == &gleLdevListHead)
     {
         /* No, allocate a new LDEVOBJ */
         pldev = LDEVOBJ_AllocLDEV(ldevtype);
@@ -421,11 +427,7 @@
         }
 
         /* Insert the LDEV into the global list */
-        pldev->pldevPrev = NULL;
-        pldev->pldevNext = gpldevHead;
-        if (gpldevHead)
-            gpldevHead->pldevPrev = pldev;
-        gpldevHead = pldev;
+        InsertHeadList(&gleLdevListHead, &pldev->leLink);
     }
 
     /* Increase ref count */
@@ -459,7 +461,7 @@
     PLDEVOBJ pldev = (PLDEVOBJ)hModule;
 
     /* Make sure the LDEV is in the list */
-    ASSERT(pldev->pldevPrev || pldev->pldevNext);
+    ASSERT((pldev->leLink.Flink != NULL) &&  (pldev->leLink.Blink != NULL));
 
     /* Lock loader */
     EngAcquireSemaphore(ghsemLDEVList);
@@ -471,10 +473,7 @@
     if (pldev->cRefs == 0)
     {
         /* Remove ldev from the list */
-        if (pldev->pldevPrev)
-            pldev->pldevPrev->pldevNext = pldev->pldevNext;
-        if (pldev->pldevNext)
-            pldev->pldevNext->pldevPrev = pldev->pldevPrev;
+        RemoveEntryList(&pldev->leLink);
 
         /* Unload the image and free the LDEV */
         LDEVOBJ_vUnloadImage(pldev);
Index: win32ss/gdi/eng/ldevobj.h
===================================================================
--- win32ss/gdi/eng/ldevobj.h	(rÃ©vision 61927)
+++ win32ss/gdi/eng/ldevobj.h	(copie de travail)
@@ -15,8 +15,7 @@
 
 typedef struct _LDEVOBJ
 {
-    struct _LDEVOBJ *pldevNext;
-    struct _LDEVOBJ *pldevPrev;
+    LIST_ENTRY leLink;
     SYSTEM_GDI_DRIVER_INFORMATION *pGdiDriverInfo;
     LDEVTYPE ldevtype;
     ULONG cRefs;
Index: win32ss/gdi/eng/device.c
===================================================================
--- win32ss/gdi/eng/device.c	(rÃ©vision 61927)
+++ win32ss/gdi/eng/device.c	(copie de travail)
@@ -113,7 +113,8 @@
     pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR);
     RtlCopyMemory(pGraphicsDevice->pwszDescription,
                   pustrDescription->Buffer,
-                  pustrDescription->Length + sizeof(WCHAR));
+                  pustrDescription->Length);
+    pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0;
 
     /* Initialize the pdevmodeInfo list and default index  */
     pGraphicsDevice->pdevmodeInfo = NULL;
Index: win32ss/reactx/dxg/dxg_int.h
===================================================================
--- win32ss/reactx/dxg/dxg_int.h	(rÃ©vision 61927)
+++ win32ss/reactx/dxg/dxg_int.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _DXG_PCH_
+#define _DXG_PCH_
+
 #include <ntifs.h>
 
 /* Win32 Headers */
@@ -102,3 +105,5 @@
 #define drvDxEngUnlockDC        gpEngFuncs[DXENG_INDEX_DxEngUnlockDC]
 #define drvDxEngUnlockHdev      gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev]
 #define drvDxEngLockHdev        gpEngFuncs[DXENG_INDEX_DxEngLockHdev]
+
+#endif /* _DXG_PCH_ */
Index: win32ss/reactx/dxg/historic.c
===================================================================
--- win32ss/reactx/dxg/historic.c	(rÃ©vision 61927)
+++ win32ss/reactx/dxg/historic.c	(copie de travail)
@@ -59,7 +59,7 @@
 * @name DxDdIoctl
 * @implemented
 *
-* The function DxDdIoctl is the ioctl call to diffent DirectX functions 
+* The function DxDdIoctl is the ioctl call to different DirectX functions 
 *
 * @param ULONG ulIoctl
 * The ioctl code that we want call to
Index: win32ss/reactx/dxg/CMakeLists.txt
===================================================================
--- win32ss/reactx/dxg/CMakeLists.txt	(rÃ©vision 61927)
+++ win32ss/reactx/dxg/CMakeLists.txt	(copie de travail)
@@ -1,15 +1,19 @@
 
 spec2def(dxg.sys dxg.spec)
 
-add_library(dxg SHARED
+list(APPEND SOURCE
     main.c
     ddhmg.c
     eng.c
     historic.c
+    dxg_int.h)
+
+add_library(dxg SHARED
+    ${SOURCE}
     dxg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dxg.def)
 
 set_module_type(dxg kernelmodedriver)
 add_importlibs(dxg dxgthk ntoskrnl)
-add_pch(dxg dxg_int.h)
+add_pch(dxg dxg_int.h SOURCE)
 add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all)
Index: ntoskrnl/ke/bug.c
===================================================================
--- ntoskrnl/ke/bug.c	(rÃ©vision 61927)
+++ ntoskrnl/ke/bug.c	(copie de travail)
@@ -275,6 +275,7 @@
     {
         /* Get the current frames (skip the two. One for the dumper, one for the caller) */
         RealFrameCount = RtlCaptureStackBackTrace(2, FrameCount, (PVOID*)Frames, NULL);
+        DPRINT1("RealFrameCount =%lu\n", RealFrameCount);
 
         /* Dump them */
         KeRosDumpStackFrameArray(Frames, RealFrameCount);
Index: ntoskrnl/ke/powerpc/kiinit.c
===================================================================
--- ntoskrnl/ke/powerpc/kiinit.c	(rÃ©vision 61927)
+++ ntoskrnl/ke/powerpc/kiinit.c	(copie de travail)
@@ -189,7 +189,7 @@
     InitThread->Affinity = 1 << Number;
     InitThread->WaitIrql = DISPATCH_LEVEL;
     InitProcess->ActiveProcessors = 1 << Number;
-    
+
     /* HACK for MmUpdatePageDir */
     ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess;
 
@@ -228,11 +228,8 @@
         Prcb->DpcStack = DpcStack;
     }
 
-    /* Free Initial Memory */
-    // MiFreeInitMemory();
+    KfRaiseIrql(DISPATCH_LEVEL);
 
-    KfRaiseIrql(DISPATCH_LEVEL);
-    
     KeSetPriorityThread(InitThread, 0);
     /* Setup decrementer exception */
     KiSetupDecrementerTrap();
@@ -297,7 +294,7 @@
 
     /* Skip initial setup if this isn't the Boot CPU */
     if (Cpu) goto AppCpuInit;
-    
+
     /* Initialize the PCR */
     RtlZeroMemory(Pcr, PAGE_SIZE);
     KiInitializePcr(Cpu,
Index: ntoskrnl/ke/powerpc/stubs.c
===================================================================
--- ntoskrnl/ke/powerpc/stubs.c	(rÃ©vision 61927)
+++ ntoskrnl/ke/powerpc/stubs.c	(copie de travail)
@@ -151,13 +151,6 @@
     return TRUE;
 }
 
-NTSTATUS
-NTAPI
-Mmi386ReleaseMmInfo(PEPROCESS Process)
-{
-    return STATUS_UNSUCCESSFUL;
-}
-
 VOID
 NTAPI
 KeI386VdmInitialize(VOID)
Index: ntoskrnl/ntoskrnl.spec
===================================================================
--- ntoskrnl/ntoskrnl.spec	(rÃ©vision 61927)
+++ ntoskrnl/ntoskrnl.spec	(copie de travail)
@@ -1373,9 +1373,9 @@
 @ stdcall SeRegisterLogonSessionTerminatedRoutine(ptr)
 @ stdcall SeReleaseSecurityDescriptor(ptr long long)
 @ stdcall SeReleaseSubjectContext(ptr)
-;@ cdecl -arch=x86_64 SeReportSecurityEvent
+@ stdcall SeReportSecurityEvent(long ptr ptr ptr)
 @ stdcall SeSetAccessStateGenericMapping(ptr ptr)
-;SeSetAuditParameter
+@ stdcall SeSetAuditParameter(ptr long long ptr)
 @ stdcall SeSetSecurityDescriptorInfo(ptr ptr ptr ptr long ptr)
 @ stdcall SeSetSecurityDescriptorInfoEx(ptr ptr ptr ptr long long ptr)
 @ stdcall SeSinglePrivilegeCheck(long long long)
Index: ntoskrnl/config/cmapi.c
===================================================================
--- ntoskrnl/config/cmapi.c	(rÃ©vision 61927)
+++ ntoskrnl/config/cmapi.c	(copie de travail)
@@ -1434,7 +1434,7 @@
     }
 
     /* Validate buffer length (we do not copy the name!) */
-    *ResultLength = sizeof(KeyCachedInfo);
+    *ResultLength = sizeof(*KeyCachedInfo);
     if (Length < *ResultLength)
     {
         return STATUS_BUFFER_TOO_SMALL;
@@ -1896,8 +1896,7 @@
     if (KeyBody)
     {
         /* Fail */
-        DPRINT1("Trusted classes not yet supported\n");
-        return STATUS_NOT_IMPLEMENTED;
+        DPRINT("Trusted classes not yet supported\n");
     }
 
     /* Build a service QoS for a security context */
Index: ntoskrnl/config/cmname.c
===================================================================
--- ntoskrnl/config/cmname.c	(rÃ©vision 61927)
+++ ntoskrnl/config/cmname.c	(copie de travail)
@@ -65,7 +65,7 @@
     for (i = 0; i < Length; i++)
     {
         /* Copy each character */
-        Destination[i] = (WCHAR)((PCHAR)Source)[i];
+        Destination[i] = (WCHAR)((PUCHAR)Source)[i];
     }
 }
 
@@ -76,7 +76,7 @@
 {
     ULONG i;
 
-    /* For old hives, just retun the length */
+    /* For old hives, just return the length */
     if (Hive->Version == 1) return Name->Length;
 
     /* For new versions, check for compressed name */
@@ -111,27 +111,27 @@
                          IN ULONG NameLength)
 {
     WCHAR *p;
-    CHAR *pp;
-    WCHAR p1, p2;
+    UCHAR *pp;
+    WCHAR chr1, chr2;
     USHORT SearchLength;
     LONG Result;
 
     /* Set the pointers and length and then loop */
     p = SearchName->Buffer;
-    pp = (PCHAR)CompressedName;
+    pp = (PUCHAR)CompressedName;
     SearchLength = (SearchName->Length / sizeof(WCHAR));
     while ((SearchLength) && (NameLength))
     {
         /* Get the characters */
-        p1 = *p++;
-        p2 = (WCHAR)(*pp++);
+        chr1 = *p++;
+        chr2 = (WCHAR)(*pp++);
 
         /* Check if we have a direct match */
-        if (p1 != p2)
+        if (chr1 != chr2)
         {
             /* See if they match and return result if they don't */
-            Result = (LONG)RtlUpcaseUnicodeChar(p1) -
-                     (LONG)RtlUpcaseUnicodeChar(p2);
+            Result = (LONG)RtlUpcaseUnicodeChar(chr1) -
+                     (LONG)RtlUpcaseUnicodeChar(chr2);
             if (Result) return Result;
         }
 
Index: ntoskrnl/io/pnpmgr/pnpmgr.c
===================================================================
--- ntoskrnl/io/pnpmgr/pnpmgr.c	(rÃ©vision 61927)
+++ ntoskrnl/io/pnpmgr/pnpmgr.c	(copie de travail)
@@ -648,7 +648,7 @@
     
     ASSERT(!(DeviceNode->Flags & DNF_DISABLED));
 
-    /* Build the I/O stack locaiton */
+    /* Build the I/O stack location */
     RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
     Stack.MajorFunction = IRP_MJ_PNP;
     Stack.MinorFunction = IRP_MN_START_DEVICE;
Index: ntoskrnl/io/iomgr/deviface.c
===================================================================
--- ntoskrnl/io/iomgr/deviface.c	(rÃ©vision 61927)
+++ ntoskrnl/io/iomgr/deviface.c	(copie de travail)
@@ -466,7 +466,7 @@
         goto cleanup;
     }
 
-    /* Enumerate subkeys (ie the different device objets) */
+    /* Enumerate subkeys (i.e. the different device objects) */
     while (TRUE)
     {
         Status = ZwEnumerateKey(
@@ -729,14 +729,17 @@
                 Status = STATUS_UNSUCCESSFUL;
                 goto cleanup;
             }
-            KeyName.Length = KeyName.MaximumLength = (USHORT)bip->DataLength - 4 * sizeof(WCHAR);
-            KeyName.Buffer = &((PWSTR)bip->Data)[4];
+            KeyName.Length = KeyName.MaximumLength = (USHORT)bip->DataLength;
+            KeyName.Buffer = (PWSTR)bip->Data;
 
+            /* Fixup the prefix (from "\\?\") */
+            RtlCopyMemory(KeyName.Buffer, L"\\??\\", 4 * sizeof(WCHAR));
+
             /* Add new symbolic link to symbolic link list */
             if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength)
             {
                 PWSTR NewBuffer;
-                ReturnBuffer.MaximumLength = (USHORT)max(ReturnBuffer.MaximumLength * 2,
+                ReturnBuffer.MaximumLength = (USHORT)max(ReturnBuffer.MaximumLength * sizeof(WCHAR),
                                                          (USHORT)(ReturnBuffer.Length +
                                                          KeyName.Length +
                                                          2 * sizeof(WCHAR)));
Index: ntoskrnl/io/iomgr/driver.c
===================================================================
--- ntoskrnl/io/iomgr/driver.c	(rÃ©vision 61927)
+++ ntoskrnl/io/iomgr/driver.c	(copie de travail)
@@ -340,7 +340,8 @@
        Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ);
        if (!NT_SUCCESS(Status))
        {
-           DPRINT1("ZwOpenKey() failed with Status %08X\n", Status);
+           DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n",
+                   &CCSName, Status);
            return Status;
        }
 
@@ -348,7 +349,8 @@
        Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ);
        if (!NT_SUCCESS(Status))
        {
-           DPRINT1("ZwOpenKey() failed with Status %08X\n", Status);
+           DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n",
+                   ServiceName, Status);
            ZwClose(CCSKey);
            return Status;
        }
Index: ntoskrnl/se/semgr.c
===================================================================
--- ntoskrnl/se/semgr.c	(rÃ©vision 61927)
+++ ntoskrnl/se/semgr.c	(copie de travail)
@@ -74,10 +74,15 @@
     SepExports.SeAuthenticatedUsersSid = SeAuthenticatedUsersSid;
     SepExports.SeRestrictedSid = SeRestrictedSid;
     SepExports.SeAnonymousLogonSid = SeAnonymousLogonSid;
+    SepExports.SeLocalServiceSid = SeLocalServiceSid;
+    SepExports.SeNetworkServiceSid = SeNetworkServiceSid;
 
     SepExports.SeUndockPrivilege = SeUndockPrivilege;
     SepExports.SeSyncAgentPrivilege = SeSyncAgentPrivilege;
     SepExports.SeEnableDelegationPrivilege = SeEnableDelegationPrivilege;
+    SepExports.SeManageVolumePrivilege = SeManageVolumePrivilege;
+    SepExports.SeImpersonatePrivilege = SeImpersonatePrivilege;
+    SepExports.SeCreateGlobalPrivilege = SeCreateGlobalPrivilege;
 
     SeExports = &SepExports;
     return TRUE;
@@ -311,783 +316,86 @@
     }
 }
 
-
-#define OLD_ACCESS_CHECK
-
-BOOLEAN NTAPI
-SepAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-               IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
-               IN ACCESS_MASK DesiredAccess,
-               IN ACCESS_MASK PreviouslyGrantedAccess,
-               OUT PPRIVILEGE_SET* Privileges,
-               IN PGENERIC_MAPPING GenericMapping,
-               IN KPROCESSOR_MODE AccessMode,
-               OUT PACCESS_MASK GrantedAccess,
-               OUT PNTSTATUS AccessStatus)
+NTSTATUS
+NTAPI
+SeReportSecurityEvent(
+    _In_ ULONG Flags,
+    _In_ PUNICODE_STRING SourceName,
+    _In_opt_ PSID UserSid,
+    _In_ PSE_ADT_PARAMETER_ARRAY AuditParameters)
 {
-    LUID_AND_ATTRIBUTES Privilege;
-#ifdef OLD_ACCESS_CHECK
-    ACCESS_MASK CurrentAccess, AccessMask;
-#endif
-    ACCESS_MASK RemainingAccess;
-    ACCESS_MASK TempAccess;
-    ACCESS_MASK TempGrantedAccess = 0;
-    ACCESS_MASK TempDeniedAccess = 0;
-    PACCESS_TOKEN Token;
-    ULONG i;
-    PACL Dacl;
-    BOOLEAN Present;
-    BOOLEAN Defaulted;
-    PACE CurrentAce;
-    PSID Sid;
+    SECURITY_SUBJECT_CONTEXT SubjectContext;
+    PTOKEN EffectiveToken;
+    PISID Sid;
     NTSTATUS Status;
-    PAGED_CODE();
 
-    /* Check for no access desired */
-    if (!DesiredAccess)
+    /* Validate parameters */
+    if ((Flags != 0) ||
+        (SourceName == NULL) ||
+        (SourceName->Buffer == NULL) ||
+        (SourceName->Length == 0) ||
+        (AuditParameters == NULL) ||
+        (AuditParameters->ParameterCount > SE_MAX_AUDIT_PARAMETERS - 4))
     {
-        /* Check if we had no previous access */
-        if (!PreviouslyGrantedAccess)
-        {
-            /* Then there's nothing to give */
-            *AccessStatus = STATUS_ACCESS_DENIED;
-            return FALSE;
-        }
-
-        /* Return the previous access only */
-        *GrantedAccess = PreviouslyGrantedAccess;
-        *AccessStatus = STATUS_SUCCESS;
-        *Privileges = NULL;
-        return TRUE;
+        return STATUS_INVALID_PARAMETER;
     }
 
-    /* Map given accesses */
-    RtlMapGenericMask(&DesiredAccess, GenericMapping);
-    if (PreviouslyGrantedAccess)
-        RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping);
-
-#ifdef OLD_ACCESS_CHECK
-    CurrentAccess = PreviouslyGrantedAccess;
-#endif
-    /* Initialize remaining access rights */
-    RemainingAccess = DesiredAccess;
-
-    Token = SubjectSecurityContext->ClientToken ?
-    SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken;
-
-    /* Check for system security access */
-    if (RemainingAccess & ACCESS_SYSTEM_SECURITY)
-    {
-        Privilege.Luid = SeSecurityPrivilege;
-        Privilege.Attributes = SE_PRIVILEGE_ENABLED;
-
-        /* Fail if we do not the SeSecurityPrivilege */
-        if (!SepPrivilegeCheck(Token,
-                               &Privilege,
-                               1,
-                               PRIVILEGE_SET_ALL_NECESSARY,
-                               AccessMode))
-        {
-            *AccessStatus = STATUS_PRIVILEGE_NOT_HELD;
-            return FALSE;
-        }
-
-        /* Adjust access rights */
-        RemainingAccess &= ~ACCESS_SYSTEM_SECURITY;
-        PreviouslyGrantedAccess |= ACCESS_SYSTEM_SECURITY;
-
-        /* Succeed if there are no more rights to grant */
-        if (RemainingAccess == 0)
-        {
-            *GrantedAccess = PreviouslyGrantedAccess;
-            *AccessStatus = STATUS_SUCCESS;
-            return TRUE;
-        }
-    }
-
-    /* Get the DACL */
-    Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
-                                          &Present,
-                                          &Dacl,
-                                          &Defaulted);
+    /* Validate the source name */
+    Status = RtlValidateUnicodeString(0, SourceName);
     if (!NT_SUCCESS(Status))
     {
-        *AccessStatus = Status;
-        return FALSE;
+        return Status;
     }
 
-    /* RULE 1: Grant desired access if the object is unprotected */
-    if (Present == FALSE || Dacl == NULL)
+    /* Check if we have a user SID */
+    if (UserSid != NULL)
     {
-        if (DesiredAccess & MAXIMUM_ALLOWED)
+        /* Validate it */
+        if (!RtlValidSid(UserSid))
         {
-            *GrantedAccess = GenericMapping->GenericAll;
-            *GrantedAccess |= (DesiredAccess & ~MAXIMUM_ALLOWED);
+            return STATUS_INVALID_PARAMETER;
         }
-        else
-        {
-            *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess;
-        }
 
-        *AccessStatus = STATUS_SUCCESS;
-        return TRUE;
+        /* Use the user SID */
+        Sid = UserSid;
     }
-
-#ifdef OLD_ACCESS_CHECK
-    CurrentAccess = PreviouslyGrantedAccess;
-#endif
-
-    /* RULE 2: Check token for 'take ownership' privilege */
-    if (DesiredAccess & WRITE_OWNER)
-    {
-        Privilege.Luid = SeTakeOwnershipPrivilege;
-        Privilege.Attributes = SE_PRIVILEGE_ENABLED;
-
-        if (SepPrivilegeCheck(Token,
-                              &Privilege,
-                              1,
-                              PRIVILEGE_SET_ALL_NECESSARY,
-                              AccessMode))
-        {
-            /* Adjust access rights */
-            RemainingAccess &= ~WRITE_OWNER;
-            PreviouslyGrantedAccess |= WRITE_OWNER;
-#ifdef OLD_ACCESS_CHECK
-            CurrentAccess |= WRITE_OWNER;
-#endif
-
-            /* Succeed if there are no more rights to grant */
-            if (RemainingAccess == 0)
-            {
-                *GrantedAccess = PreviouslyGrantedAccess;
-                *AccessStatus = STATUS_SUCCESS;
-                return TRUE;
-            }
-        }
-    }
-
-    /* Deny access if the DACL is empty */
-    if (Dacl->AceCount == 0)
-    {
-        if (RemainingAccess == MAXIMUM_ALLOWED && PreviouslyGrantedAccess != 0)
-        {
-            *GrantedAccess = PreviouslyGrantedAccess;
-            *AccessStatus = STATUS_SUCCESS;
-            return TRUE;
-        }
-        else
-        {
-            *GrantedAccess = 0;
-            *AccessStatus = STATUS_ACCESS_DENIED;
-            return FALSE;
-        }
-    }
-
-    /* Fail if DACL is absent */
-    if (Present == FALSE)
-    {
-        *GrantedAccess = 0;
-        *AccessStatus = STATUS_ACCESS_DENIED;
-        return FALSE;
-    }
-
-    /* Determine the MAXIMUM_ALLOWED access rights according to the DACL */
-    if (DesiredAccess & MAXIMUM_ALLOWED)
-    {
-        CurrentAce = (PACE)(Dacl + 1);
-        for (i = 0; i < Dacl->AceCount; i++)
-        {
-            if (!(CurrentAce->Header.AceFlags & INHERIT_ONLY_ACE))
-            {
-                Sid = (PSID)(CurrentAce + 1);
-                if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
-                {
-                    if (SepSidInToken(Token, Sid))
-                    {
-                        /* Map access rights from the ACE */
-                        TempAccess = CurrentAce->AccessMask;
-                        RtlMapGenericMask(&TempAccess, GenericMapping);
-
-                        /* Deny access rights that have not been granted yet */
-                        TempDeniedAccess |= (TempAccess & ~TempGrantedAccess);
-                    }
-                }
-                else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
-                {
-                    if (SepSidInToken(Token, Sid))
-                    {
-                        /* Map access rights from the ACE */
-                        TempAccess = CurrentAce->AccessMask;
-                        RtlMapGenericMask(&TempAccess, GenericMapping);
-
-                        /* Grant access rights that have not been denied yet */
-                        TempGrantedAccess |= (TempAccess & ~TempDeniedAccess);
-                    }
-                }
-                else
-                {
-                    DPRINT1("Unsupported ACE type 0x%lx\n", CurrentAce->Header.AceType);
-                }
-            }
-
-            /* Get the next ACE */
-            CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize);
-        }
-
-        /* Fail if some rights have not been granted */
-        RemainingAccess &= ~(MAXIMUM_ALLOWED | TempGrantedAccess);
-        if (RemainingAccess != 0)
-        {
-            *GrantedAccess = 0;
-            *AccessStatus = STATUS_ACCESS_DENIED;
-            return FALSE;
-        }
-
-        /* Set granted access right and access status */
-        *GrantedAccess = TempGrantedAccess | PreviouslyGrantedAccess;
-        if (*GrantedAccess != 0)
-        {
-            *AccessStatus = STATUS_SUCCESS;
-            return TRUE;
-        }
-        else
-        {
-            *AccessStatus = STATUS_ACCESS_DENIED;
-            return FALSE;
-        }
-    }
-
-    /* RULE 4: Grant rights according to the DACL */
-    CurrentAce = (PACE)(Dacl + 1);
-    for (i = 0; i < Dacl->AceCount; i++)
-    {
-        if (!(CurrentAce->Header.AceFlags & INHERIT_ONLY_ACE))
-        {
-            Sid = (PSID)(CurrentAce + 1);
-            if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
-            {
-                if (SepSidInToken(Token, Sid))
-                {
-#ifdef OLD_ACCESS_CHECK
-                    *GrantedAccess = 0;
-                    *AccessStatus = STATUS_ACCESS_DENIED;
-                    return FALSE;
-#else
-                    /* Map access rights from the ACE */
-                    TempAccess = CurrentAce->AccessMask;
-                    RtlMapGenericMask(&TempAccess, GenericMapping);
-
-                    /* Leave if a remaining right must be denied */
-                    if (RemainingAccess & TempAccess)
-                        break;
-#endif
-                }
-            }
-            else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
-            {
-                if (SepSidInToken(Token, Sid))
-                {
-#ifdef OLD_ACCESS_CHECK
-                    AccessMask = CurrentAce->AccessMask;
-                    RtlMapGenericMask(&AccessMask, GenericMapping);
-                    CurrentAccess |= AccessMask;
-#else
-                    /* Map access rights from the ACE */
-                    TempAccess = CurrentAce->AccessMask;
-                    RtlMapGenericMask(&TempAccess, GenericMapping);
-
-                    /* Remove granted rights */
-                    RemainingAccess &= ~TempAccess;
-#endif
-                }
-            }
-            else
-            {
-                DPRINT1("Unsupported ACE type 0x%lx\n", CurrentAce->Header.AceType);
-            }
-        }
-
-        /* Get the next ACE */
-        CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize);
-    }
-
-#ifdef OLD_ACCESS_CHECK
-    DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n",
-           CurrentAccess, DesiredAccess);
-
-    *GrantedAccess = CurrentAccess & DesiredAccess;
-
-    if ((*GrantedAccess & ~VALID_INHERIT_FLAGS) ==
-        (DesiredAccess & ~VALID_INHERIT_FLAGS))
-    {
-        *AccessStatus = STATUS_SUCCESS;
-        return TRUE;
-    }
     else
     {
-        DPRINT1("HACK: Should deny access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p).\n",
-                *GrantedAccess, DesiredAccess, GenericMapping);
-        //*AccessStatus = STATUS_ACCESS_DENIED;
-        //return FALSE;
-        *GrantedAccess = DesiredAccess;
-        *AccessStatus = STATUS_SUCCESS;
-        return TRUE;
-    }
-#else
-    DPRINT("DesiredAccess %08lx\nPreviouslyGrantedAccess %08lx\nRemainingAccess %08lx\n",
-           DesiredAccess, PreviouslyGrantedAccess, RemainingAccess);
+        /* No user SID, capture the security subject context */
+        SeCaptureSubjectContext(&SubjectContext);
 
-    /* Fail if some rights have not been granted */
-    if (RemainingAccess != 0)
-    {
-        *GrantedAccess = 0;
-        *AccessStatus = STATUS_ACCESS_DENIED;
-        return FALSE;
-    }
+        /* Extract the effective token */
+        EffectiveToken = SubjectContext.ClientToken ?
+            SubjectContext.ClientToken : SubjectContext.PrimaryToken;
 
-    /* Set granted access rights */
-    *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess;
-
-    DPRINT("GrantedAccess %08lx\n", *GrantedAccess);
-
-    /* Fail if no rights have been granted */
-    if (*GrantedAccess == 0)
-    {
-        *AccessStatus = STATUS_ACCESS_DENIED;
-        return FALSE;
+        /* Use the user-and-groups SID */
+        Sid = EffectiveToken->UserAndGroups->Sid;
     }
 
-    *AccessStatus = STATUS_SUCCESS;
-    return TRUE;
-#endif
-}
+    UNIMPLEMENTED;
 
-static PSID
-SepGetSDOwner(IN PSECURITY_DESCRIPTOR _SecurityDescriptor)
-{
-    PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor;
-    PSID Owner;
-
-    if (SecurityDescriptor->Control & SE_SELF_RELATIVE)
-        Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner +
-                       (ULONG_PTR)SecurityDescriptor);
-    else
-        Owner = (PSID)SecurityDescriptor->Owner;
-
-    return Owner;
-}
-
-static PSID
-SepGetSDGroup(IN PSECURITY_DESCRIPTOR _SecurityDescriptor)
-{
-    PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor;
-    PSID Group;
-
-    if (SecurityDescriptor->Control & SE_SELF_RELATIVE)
-        Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group +
-                       (ULONG_PTR)SecurityDescriptor);
-    else
-        Group = (PSID)SecurityDescriptor->Group;
-
-    return Group;
-}
-
-
-/* PUBLIC FUNCTIONS ***********************************************************/
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-              IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
-              IN BOOLEAN SubjectContextLocked,
-              IN ACCESS_MASK DesiredAccess,
-              IN ACCESS_MASK PreviouslyGrantedAccess,
-              OUT PPRIVILEGE_SET* Privileges,
-              IN PGENERIC_MAPPING GenericMapping,
-              IN KPROCESSOR_MODE AccessMode,
-              OUT PACCESS_MASK GrantedAccess,
-              OUT PNTSTATUS AccessStatus)
-{
-    BOOLEAN ret;
-
-    PAGED_CODE();
-
-    /* Check if this is kernel mode */
-    if (AccessMode == KernelMode)
+    /* Check if we captured the subject context */
+    if (Sid != UserSid)
     {
-        /* Check if kernel wants everything */
-        if (DesiredAccess & MAXIMUM_ALLOWED)
-        {
-            /* Give it */
-            *GrantedAccess = GenericMapping->GenericAll;
-            *GrantedAccess |= (DesiredAccess &~ MAXIMUM_ALLOWED);
-            *GrantedAccess |= PreviouslyGrantedAccess;
-        }
-        else
-        {
-            /* Give the desired and previous access */
-            *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess;
-        }
-
-        /* Success */
-        *AccessStatus = STATUS_SUCCESS;
-        return TRUE;
+        /* Release it */
+        SeReleaseSubjectContext(&SubjectContext);
     }
 
-    /* Check if we didn't get an SD */
-    if (!SecurityDescriptor)
-    {
-        /* Automatic failure */
-        *AccessStatus = STATUS_ACCESS_DENIED;
-        return FALSE;
-    }
-
-    /* Check for invalid impersonation */
-    if ((SubjectSecurityContext->ClientToken) &&
-        (SubjectSecurityContext->ImpersonationLevel < SecurityImpersonation))
-    {
-        *AccessStatus = STATUS_BAD_IMPERSONATION_LEVEL;
-        return FALSE;
-    }
-
-    /* Acquire the lock if needed */
-    if (!SubjectContextLocked)
-        SeLockSubjectContext(SubjectSecurityContext);
-
-    /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */
-    if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED))
-    {
-         PACCESS_TOKEN Token = SubjectSecurityContext->ClientToken ?
-             SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken;
-
-        if (SepTokenIsOwner(Token,
-                            SecurityDescriptor,
-                            FALSE))
-        {
-            if (DesiredAccess & MAXIMUM_ALLOWED)
-                PreviouslyGrantedAccess |= (WRITE_DAC | READ_CONTROL);
-            else
-                PreviouslyGrantedAccess |= (DesiredAccess & (WRITE_DAC | READ_CONTROL));
-
-            DesiredAccess &= ~(WRITE_DAC | READ_CONTROL);
-        }
-    }
-
-    if (DesiredAccess == 0)
-    {
-        *GrantedAccess = PreviouslyGrantedAccess;
-        *AccessStatus = STATUS_SUCCESS;
-        ret = TRUE;
-    }
-    else
-    {
-        /* Call the internal function */
-        ret = SepAccessCheck(SecurityDescriptor,
-                             SubjectSecurityContext,
-                             DesiredAccess,
-                             PreviouslyGrantedAccess,
-                             Privileges,
-                             GenericMapping,
-                             AccessMode,
-                             GrantedAccess,
-                             AccessStatus);
-    }
-
-    /* Release the lock if needed */
-    if (!SubjectContextLocked)
-        SeUnlockSubjectContext(SubjectSecurityContext);
-
-    return ret;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-SeFastTraverseCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-                    IN PACCESS_STATE AccessState,
-                    IN ACCESS_MASK DesiredAccess,
-                    IN KPROCESSOR_MODE AccessMode)
-{
-    PACL Dacl;
-    ULONG AceIndex;
-    PKNOWN_ACE Ace;
-
-    PAGED_CODE();
-
-    NT_ASSERT(AccessMode != KernelMode);
-
-    if (SecurityDescriptor == NULL)
-        return FALSE;
-
-    /* Get DACL */
-    Dacl = SepGetDaclFromDescriptor(SecurityDescriptor);
-    /* If no DACL, grant access */
-    if (Dacl == NULL)
-        return TRUE;
-
-    /* No ACE -> Deny */
-    if (!Dacl->AceCount)
-        return FALSE;
-
-    /* Can't perform the check on restricted token */
-    if (AccessState->Flags & TOKEN_IS_RESTRICTED)
-        return FALSE;
-
-    /* Browse the ACEs */
-    for (AceIndex = 0, Ace = (PKNOWN_ACE)((ULONG_PTR)Dacl + sizeof(ACL));
-         AceIndex < Dacl->AceCount;
-         AceIndex++, Ace = (PKNOWN_ACE)((ULONG_PTR)Ace + Ace->Header.AceSize))
-    {
-        if (Ace->Header.AceFlags & INHERIT_ONLY_ACE)
-            continue;
-
-        /* If access-allowed ACE */
-        if (Ace->Header.AceType & ACCESS_ALLOWED_ACE_TYPE)
-        {
-            /* Check if all accesses are granted */
-            if (!(Ace->Mask & DesiredAccess))
-                continue;
-
-            /* Check SID and grant access if matching */
-            if (RtlEqualSid(SeWorldSid, &(Ace->SidStart)))
-                return TRUE;
-        }
-        /* If access-denied ACE */
-        else if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE)
-        {
-            /* Here, only check if it denies all the access wanted and deny if so */
-            if (Ace->Mask & DesiredAccess)
-                return FALSE;
-        }
-    }
-
-    /* Faulty, deny */
-    return FALSE;
-}
-
-/* SYSTEM CALLS ***************************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-              IN HANDLE TokenHandle,
-              IN ACCESS_MASK DesiredAccess,
-              IN PGENERIC_MAPPING GenericMapping,
-              OUT PPRIVILEGE_SET PrivilegeSet OPTIONAL,
-              IN OUT PULONG PrivilegeSetLength,
-              OUT PACCESS_MASK GrantedAccess,
-              OUT PNTSTATUS AccessStatus)
-{
-    PSECURITY_DESCRIPTOR CapturedSecurityDescriptor = NULL;
-    SECURITY_SUBJECT_CONTEXT SubjectSecurityContext;
-    KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
-    ACCESS_MASK PreviouslyGrantedAccess = 0;
-    PTOKEN Token;
-    NTSTATUS Status;
-    PAGED_CODE();
-
-    /* Check if this is kernel mode */
-    if (PreviousMode == KernelMode)
-    {
-        /* Check if kernel wants everything */
-        if (DesiredAccess & MAXIMUM_ALLOWED)
-        {
-            /* Give it */
-            *GrantedAccess = GenericMapping->GenericAll;
-            *GrantedAccess |= (DesiredAccess &~ MAXIMUM_ALLOWED);
-        }
-        else
-        {
-            /* Just give the desired access */
-            *GrantedAccess = DesiredAccess;
-        }
-
-        /* Success */
-        *AccessStatus = STATUS_SUCCESS;
-        return STATUS_SUCCESS;
-    }
-
-    /* Protect probe in SEH */
-    _SEH2_TRY
-    {
-        /* Probe all pointers */
-        ProbeForRead(GenericMapping, sizeof(GENERIC_MAPPING), sizeof(ULONG));
-        ProbeForRead(PrivilegeSetLength, sizeof(ULONG), sizeof(ULONG));
-        ProbeForWrite(PrivilegeSet, *PrivilegeSetLength, sizeof(ULONG));
-        ProbeForWrite(GrantedAccess, sizeof(ACCESS_MASK), sizeof(ULONG));
-        ProbeForWrite(AccessStatus, sizeof(NTSTATUS), sizeof(ULONG));
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        /* Return the exception code */
-        _SEH2_YIELD(return _SEH2_GetExceptionCode());
-    }
-    _SEH2_END;
-
-    /* Check for unmapped access rights */
-    if (DesiredAccess & (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL))
-        return STATUS_GENERIC_NOT_MAPPED;
-
-    /* Reference the token */
-    Status = ObReferenceObjectByHandle(TokenHandle,
-                                       TOKEN_QUERY,
-                                       SeTokenObjectType,
-                                       PreviousMode,
-                                       (PVOID*)&Token,
-                                       NULL);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT("Failed to reference token (Status %lx)\n", Status);
-        return Status;
-    }
-
-    /* Check token type */
-    if (Token->TokenType != TokenImpersonation)
-    {
-        DPRINT("No impersonation token\n");
-        ObDereferenceObject(Token);
-        return STATUS_NO_IMPERSONATION_TOKEN;
-    }
-
-    /* Check the impersonation level */
-    if (Token->ImpersonationLevel < SecurityIdentification)
-    {
-        DPRINT("Impersonation level < SecurityIdentification\n");
-        ObDereferenceObject(Token);
-        return STATUS_BAD_IMPERSONATION_LEVEL;
-    }
-
-    /* Capture the security descriptor */
-    Status = SeCaptureSecurityDescriptor(SecurityDescriptor,
-                                         PreviousMode,
-                                         PagedPool,
-                                         FALSE,
-                                         &CapturedSecurityDescriptor);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT("Failed to capture the Security Descriptor\n");
-        ObDereferenceObject(Token);
-        return Status;
-    }
-
-    /* Check the captured security descriptor */
-    if (CapturedSecurityDescriptor == NULL)
-    {
-        DPRINT("Security Descriptor is NULL\n");
-        ObDereferenceObject(Token);
-        return STATUS_INVALID_SECURITY_DESCR;
-    }
-
-    /* Check security descriptor for valid owner and group */
-    if (SepGetSDOwner(SecurityDescriptor) == NULL ||  // FIXME: use CapturedSecurityDescriptor
-        SepGetSDGroup(SecurityDescriptor) == NULL)    // FIXME: use CapturedSecurityDescriptor
-    {
-        DPRINT("Security Descriptor does not have a valid group or owner\n");
-        SeReleaseSecurityDescriptor(CapturedSecurityDescriptor,
-                                    PreviousMode,
-                                    FALSE);
-        ObDereferenceObject(Token);
-        return STATUS_INVALID_SECURITY_DESCR;
-    }
-
-    /* Set up the subject context, and lock it */
-    SeCaptureSubjectContext(&SubjectSecurityContext);
-
-    /* Lock the token */
-    SepAcquireTokenLockShared(Token);
-
-    /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */
-    if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED))
-    {
-        if (SepTokenIsOwner(Token, SecurityDescriptor, FALSE)) // FIXME: use CapturedSecurityDescriptor
-        {
-            if (DesiredAccess & MAXIMUM_ALLOWED)
-                PreviouslyGrantedAccess |= (WRITE_DAC | READ_CONTROL);
-            else
-                PreviouslyGrantedAccess |= (DesiredAccess & (WRITE_DAC | READ_CONTROL));
-
-            DesiredAccess &= ~(WRITE_DAC | READ_CONTROL);
-        }
-    }
-
-    if (DesiredAccess == 0)
-    {
-        *GrantedAccess = PreviouslyGrantedAccess;
-        *AccessStatus = STATUS_SUCCESS;
-    }
-    else
-    {
-        /* Now perform the access check */
-        SepAccessCheck(SecurityDescriptor, // FIXME: use CapturedSecurityDescriptor
-                       &SubjectSecurityContext,
-                       DesiredAccess,
-                       PreviouslyGrantedAccess,
-                       &PrivilegeSet, //FIXME
-                       GenericMapping,
-                       PreviousMode,
-                       GrantedAccess,
-                       AccessStatus);
-    }
-
-    /* Release subject context and unlock the token */
-    SeReleaseSubjectContext(&SubjectSecurityContext);
-    SepReleaseTokenLock(Token);
-
-    /* Release the captured security descriptor */
-    SeReleaseSecurityDescriptor(CapturedSecurityDescriptor,
-                                PreviousMode,
-                                FALSE);
-
-    /* Dereference the token */
-    ObDereferenceObject(Token);
-
-    /* Check succeeded */
+    /* Return success */
     return STATUS_SUCCESS;
 }
 
-
+_Const_
 NTSTATUS
 NTAPI
-NtAccessCheckByType(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-                    IN PSID PrincipalSelfSid,
-                    IN HANDLE ClientToken,
-                    IN ACCESS_MASK DesiredAccess,
-                    IN POBJECT_TYPE_LIST ObjectTypeList,
-                    IN ULONG ObjectTypeLength,
-                    IN PGENERIC_MAPPING GenericMapping,
-                    IN PPRIVILEGE_SET PrivilegeSet,
-                    IN OUT PULONG PrivilegeSetLength,
-                    OUT PACCESS_MASK GrantedAccess,
-                    OUT PNTSTATUS AccessStatus)
+SeSetAuditParameter(
+    _Inout_ PSE_ADT_PARAMETER_ARRAY AuditParameters,
+    _In_ SE_ADT_PARAMETER_TYPE Type,
+    _In_range_(<, SE_MAX_AUDIT_PARAMETERS) ULONG Index,
+    _In_reads_(_Inexpressible_("depends on SE_ADT_PARAMETER_TYPE")) PVOID Data)
 {
     UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    return STATUS_SUCCESS;
 }
 
-NTSTATUS
-NTAPI
-NtAccessCheckByTypeResultList(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-                              IN PSID PrincipalSelfSid,
-                              IN HANDLE ClientToken,
-                              IN ACCESS_MASK DesiredAccess,
-                              IN POBJECT_TYPE_LIST ObjectTypeList,
-                              IN ULONG ObjectTypeLength,
-                              IN PGENERIC_MAPPING GenericMapping,
-                              IN PPRIVILEGE_SET PrivilegeSet,
-                              IN OUT PULONG PrivilegeSetLength,
-                              OUT PACCESS_MASK GrantedAccess,
-                              OUT PNTSTATUS AccessStatus)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
 /* EOF */
Index: ntoskrnl/se/sid.c
===================================================================
--- ntoskrnl/se/sid.c	(rÃ©vision 61927)
+++ ntoskrnl/se/sid.c	(copie de travail)
@@ -55,6 +55,8 @@
 PSID SeAuthenticatedUsersSid = NULL;
 PSID SeRestrictedSid = NULL;
 PSID SeAnonymousLogonSid = NULL;
+PSID SeLocalServiceSid = NULL;
+PSID SeNetworkServiceSid = NULL;
 
 /* FUNCTIONS ******************************************************************/
 
@@ -135,6 +137,8 @@
     SeAuthenticatedUsersSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID);
     SeRestrictedSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID);
     SeAnonymousLogonSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID);
+    SeLocalServiceSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID);
+    SeNetworkServiceSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID);
 
     if (SeNullSid == NULL || SeWorldSid == NULL ||
         SeLocalSid == NULL || SeCreatorOwnerSid == NULL ||
@@ -149,7 +153,8 @@
         SeAliasAccountOpsSid == NULL || SeAliasSystemOpsSid == NULL ||
         SeAliasPrintOpsSid == NULL || SeAliasBackupOpsSid == NULL ||
         SeAuthenticatedUsersSid == NULL || SeRestrictedSid == NULL ||
-        SeAnonymousLogonSid == NULL)
+        SeAnonymousLogonSid == NULL || SeLocalServiceSid == NULL ||
+        SeNetworkServiceSid == NULL)
     {
         FreeInitializedSids();
         return FALSE;
@@ -183,6 +188,8 @@
     RtlInitializeSid(SeAuthenticatedUsersSid, &SeNtSidAuthority, 1);
     RtlInitializeSid(SeRestrictedSid, &SeNtSidAuthority, 1);
     RtlInitializeSid(SeAnonymousLogonSid, &SeNtSidAuthority, 1);
+    RtlInitializeSid(SeLocalServiceSid, &SeNtSidAuthority, 1);
+    RtlInitializeSid(SeNetworkServiceSid, &SeNtSidAuthority, 1);
 
     SubAuthority = RtlSubAuthoritySid(SeNullSid, 0);
     *SubAuthority = SECURITY_NULL_RID;
@@ -254,6 +261,10 @@
     *SubAuthority = SECURITY_RESTRICTED_CODE_RID;
     SubAuthority = RtlSubAuthoritySid(SeAnonymousLogonSid, 0);
     *SubAuthority = SECURITY_ANONYMOUS_LOGON_RID;
+    SubAuthority = RtlSubAuthoritySid(SeLocalServiceSid, 0);
+    *SubAuthority = SECURITY_LOCAL_SERVICE_RID;
+    SubAuthority = RtlSubAuthoritySid(SeNetworkServiceSid, 0);
+    *SubAuthority = SECURITY_NETWORK_SERVICE_RID;
 
     return TRUE;
 }
Index: ntoskrnl/se/priv.c
===================================================================
--- ntoskrnl/se/priv.c	(rÃ©vision 61927)
+++ ntoskrnl/se/priv.c	(copie de travail)
@@ -89,6 +89,9 @@
     /* Get the number of privileges that are required to match */
     Required = (PrivilegeControl & PRIVILEGE_SET_ALL_NECESSARY) ? PrivilegeCount : 1;
 
+    /* Acquire a shared token lock */
+    SepAcquireTokenLockShared(Token);
+
     /* Loop all requested privileges until we found the required ones */
     for (i = 0; i < PrivilegeCount; i++)
     {
@@ -96,8 +99,7 @@
         for (j = 0; j < Token->PrivilegeCount; j++)
         {
             /* Check if the LUIDs match */
-            if (Token->Privileges[j].Luid.LowPart == Privileges[i].Luid.LowPart &&
-                Token->Privileges[j].Luid.HighPart == Privileges[i].Luid.HighPart)
+            if (RtlEqualLuid(&Token->Privileges[j].Luid, &Privileges[i].Luid))
             {
                 DPRINT("Found privilege. Attributes: %lx\n",
                        Token->Privileges[j].Attributes);
@@ -112,6 +114,7 @@
                     if (Required == 0)
                     {
                         /* We're done! */
+                        SepReleaseTokenLock(Token);
                         return TRUE;
                     }
                 }
@@ -122,6 +125,9 @@
         }
     }
 
+    /* Release the token lock */
+    SepReleaseTokenLock(Token);
+
     /* When we reached this point, we did not find all privileges */
     NT_ASSERT(Required > 0);
     return FALSE;
@@ -129,6 +135,159 @@
 
 NTSTATUS
 NTAPI
+SepSinglePrivilegeCheck(
+    LUID PrivilegeValue,
+    PTOKEN Token,
+    KPROCESSOR_MODE PreviousMode)
+{
+    LUID_AND_ATTRIBUTES Privilege;
+    PAGED_CODE();
+    ASSERT(!RtlEqualLuid(&PrivilegeValue, &SeTcbPrivilege));
+
+    Privilege.Luid = PrivilegeValue;
+    Privilege.Attributes = SE_PRIVILEGE_ENABLED;
+    return SepPrivilegeCheck(Token,
+                             &Privilege,
+                             1,
+                             PRIVILEGE_SET_ALL_NECESSARY,
+                             PreviousMode);
+}
+
+NTSTATUS
+NTAPI
+SePrivilegePolicyCheck(
+    _Inout_ PACCESS_MASK DesiredAccess,
+    _Inout_ PACCESS_MASK GrantedAccess,
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ PTOKEN Token,
+    _Out_opt_ PPRIVILEGE_SET *OutPrivilegeSet,
+    _In_ KPROCESSOR_MODE PreviousMode)
+{
+    SIZE_T PrivilegeSize;
+    PPRIVILEGE_SET PrivilegeSet;
+    ULONG PrivilegeCount = 0, Index = 0;
+    ACCESS_MASK AccessMask = 0;
+    PAGED_CODE();
+
+    /* Check if we have a security subject context */
+    if (SubjectContext != NULL)
+    {
+        /* Check if there is a client impersonation token */
+        if (SubjectContext->ClientToken != NULL)
+            Token = SubjectContext->ClientToken;
+        else
+            Token = SubjectContext->PrimaryToken;
+    }
+
+    /* Check if the caller wants ACCESS_SYSTEM_SECURITY access */
+    if (*DesiredAccess & ACCESS_SYSTEM_SECURITY)
+    {
+        /* Do the privilege check */
+        if (SepSinglePrivilegeCheck(SeSecurityPrivilege, Token, PreviousMode))
+        {
+            /* Remember this access flag */
+            AccessMask |= ACCESS_SYSTEM_SECURITY;
+            PrivilegeCount++;
+        }
+        else
+        {
+            return STATUS_PRIVILEGE_NOT_HELD;
+        }
+    }
+
+    /* Check if the caller wants WRITE_OWNER access */
+    if (*DesiredAccess & WRITE_OWNER)
+    {
+        /* Do the privilege check */
+        if (SepSinglePrivilegeCheck(SeTakeOwnershipPrivilege, Token, PreviousMode))
+        {
+            /* Remember this access flag */
+            AccessMask |= WRITE_OWNER;
+            PrivilegeCount++;
+        }
+    }
+
+    /* Update the access masks */
+    *GrantedAccess |= AccessMask;
+    *DesiredAccess &= ~AccessMask;
+
+    /* Does the caller want a privilege set? */
+    if (OutPrivilegeSet != NULL)
+    {
+        /* Do we have any privileges to report? */
+        if (PrivilegeCount > 0)
+        {
+            /* Calculate size and allocate the structure */
+            PrivilegeSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]);
+            PrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSize, 'rPeS');
+            *OutPrivilegeSet = PrivilegeSet;
+            if (PrivilegeSet == NULL)
+            {
+                return STATUS_INSUFFICIENT_RESOURCES;
+            }
+
+            PrivilegeSet->PrivilegeCount = PrivilegeCount;
+            PrivilegeSet->Control = 0;
+
+            if (AccessMask & WRITE_OWNER)
+            {
+                PrivilegeSet->Privilege[Index].Luid = SeTakeOwnershipPrivilege;
+                PrivilegeSet->Privilege[Index].Attributes = SE_PRIVILEGE_USED_FOR_ACCESS;
+                Index++;
+            }
+
+            if (AccessMask & ACCESS_SYSTEM_SECURITY)
+            {
+                PrivilegeSet->Privilege[Index].Luid = SeSecurityPrivilege;
+                PrivilegeSet->Privilege[Index].Attributes = SE_PRIVILEGE_USED_FOR_ACCESS;
+            }
+        }
+        else
+        {
+            /* No privileges, no structure */
+            *OutPrivilegeSet = NULL;
+        }
+    }
+
+    return STATUS_SUCCESS;
+}
+
+BOOLEAN
+NTAPI
+SeCheckAuditPrivilege(
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ KPROCESSOR_MODE PreviousMode)
+{
+    PRIVILEGE_SET PrivilegeSet;
+    BOOLEAN Result;
+    PAGED_CODE();
+
+    /* Initialize the privilege set with the single privilege */
+    PrivilegeSet.PrivilegeCount = 1;
+    PrivilegeSet.Control = PRIVILEGE_SET_ALL_NECESSARY;
+    PrivilegeSet.Privilege[0].Luid = SeAuditPrivilege;
+    PrivilegeSet.Privilege[0].Attributes = 0;
+
+    /* Check against the primary token! */
+    Result = SepPrivilegeCheck(SubjectContext->PrimaryToken,
+                               &PrivilegeSet.Privilege[0],
+                               1,
+                               PRIVILEGE_SET_ALL_NECESSARY,
+                               PreviousMode);
+
+    if (PreviousMode != KernelMode)
+    {
+        SePrivilegedServiceAuditAlarm(NULL,
+                                      SubjectContext,
+                                      &PrivilegeSet,
+                                      Result);
+    }
+
+    return Result;
+}
+
+NTSTATUS
+NTAPI
 SeCaptureLuidAndAttributesArray(PLUID_AND_ATTRIBUTES Src,
                                 ULONG PrivilegeCount,
                                 KPROCESSOR_MODE PreviousMode,
@@ -381,11 +540,11 @@
 
     if (PreviousMode != KernelMode)
     {
-#if 0
-        SePrivilegedServiceAuditAlarm(0,
+        SePrivilegedServiceAuditAlarm(NULL,
                                       &SubjectContext,
-                                      &PrivilegeValue);
-#endif
+                                      &Priv,
+                                      Result);
+
     }
 
     SeReleaseSubjectContext(&SubjectContext);
Index: ntoskrnl/se/token.c
===================================================================
--- ntoskrnl/se/token.c	(rÃ©vision 61927)
+++ ntoskrnl/se/token.c	(copie de travail)
@@ -17,6 +17,18 @@
 #pragma alloc_text(INIT, SepInitializeTokenImplementation)
 #endif
 
+#include <ntlsa.h>
+
+typedef struct _TOKEN_AUDIT_POLICY_INFORMATION
+{
+    ULONG PolicyCount;
+    struct
+    {
+        ULONG Category;
+        UCHAR Value;
+    } Policies[1];
+} TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION;
+
 /* GLOBALS ********************************************************************/
 
 POBJECT_TYPE SeTokenObjectType = NULL;
@@ -24,6 +36,7 @@
 
 TOKEN_SOURCE SeSystemTokenSource = {"*SYSTEM*", {0}};
 LUID SeSystemAuthenticationId = SYSTEM_LUID;
+LUID SeAnonymousAuthenticationId = ANONYMOUS_LOGON_LUID;
 
 static GENERIC_MAPPING SepTokenMapping = {
     TOKEN_READ,
@@ -38,11 +51,11 @@
     ICI_SQ_SAME( 0, 0, 0),
 
     /* TokenUser */
-    ICI_SQ_SAME( sizeof(TOKEN_USER),                   sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    ICI_SQ_SAME( sizeof(TOKEN_USER),                   sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
     /* TokenGroups */
-    ICI_SQ_SAME( sizeof(TOKEN_GROUPS),                 sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    ICI_SQ_SAME( sizeof(TOKEN_GROUPS),                 sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
     /* TokenPrivileges */
-    ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES),             sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES),             sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
     /* TokenOwner */
     ICI_SQ_SAME( sizeof(TOKEN_OWNER),                  sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
     /* TokenPrimaryGroup */
@@ -50,13 +63,13 @@
     /* TokenDefaultDacl */
     ICI_SQ_SAME( sizeof(TOKEN_DEFAULT_DACL),           sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
     /* TokenSource */
-    ICI_SQ_SAME( sizeof(TOKEN_SOURCE),                 sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    ICI_SQ_SAME( sizeof(TOKEN_SOURCE),                 sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
     /* TokenType */
     ICI_SQ_SAME( sizeof(TOKEN_TYPE),                   sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ),
     /* TokenImpersonationLevel */
     ICI_SQ_SAME( sizeof(SECURITY_IMPERSONATION_LEVEL), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ),
     /* TokenStatistics */
-    ICI_SQ_SAME( sizeof(TOKEN_STATISTICS),             sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    ICI_SQ_SAME( sizeof(TOKEN_STATISTICS),             sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
     /* TokenRestrictedSids */
     ICI_SQ_SAME( sizeof(TOKEN_GROUPS),                 sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ),
     /* TokenSessionId */
@@ -68,9 +81,9 @@
     /* TokenSandBoxInert */
     ICI_SQ_SAME( sizeof(ULONG),                        sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ),
     /* TokenAuditPolicy */
-    ICI_SQ_SAME( /* FIXME */0,                         sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ),
+    ICI_SQ_SAME( /* FIXME */0,                         sizeof(ULONG), ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ),
     /* TokenOrigin */
-    ICI_SQ_SAME( sizeof(TOKEN_ORIGIN),                 sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ),
+    ICI_SQ_SAME( sizeof(TOKEN_ORIGIN),                 sizeof(ULONG), ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ),
 };
 
 /* FUNCTIONS *****************************************************************/
@@ -1944,11 +1957,137 @@
 
             }
 
+
+            case TokenAuditPolicy:
+            {
+                PTOKEN_AUDIT_POLICY_INFORMATION PolicyInformation =
+                    (PTOKEN_AUDIT_POLICY_INFORMATION)TokenInformation;
+                SEP_AUDIT_POLICY AuditPolicy;
+                ULONG i;
+
+                _SEH2_TRY
+                {
+                    ProbeForRead(PolicyInformation,
+                                 FIELD_OFFSET(TOKEN_AUDIT_POLICY_INFORMATION,
+                                              Policies[PolicyInformation->PolicyCount]),
+                                 sizeof(ULONG));
+
+                    /* Loop all policies in the structure */
+                    for (i = 0; i < PolicyInformation->PolicyCount; i++)
+                    {
+                        /* Set the corresponding bits in the packed structure */
+                        switch (PolicyInformation->Policies[i].Category)
+                        {
+                            case AuditCategorySystem:
+                                AuditPolicy.PolicyElements.System = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryLogon:
+                                AuditPolicy.PolicyElements.Logon = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryObjectAccess:
+                                AuditPolicy.PolicyElements.ObjectAccess = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryPrivilegeUse:
+                                AuditPolicy.PolicyElements.PrivilegeUse = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryDetailedTracking:
+                                AuditPolicy.PolicyElements.DetailedTracking = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryPolicyChange:
+                                AuditPolicy.PolicyElements.PolicyChange = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryAccountManagement:
+                                AuditPolicy.PolicyElements.AccountManagement = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryDirectoryServiceAccess:
+                                AuditPolicy.PolicyElements.DirectoryServiceAccess = PolicyInformation->Policies[i].Value;
+                                break;
+
+                            case AuditCategoryAccountLogon:
+                                AuditPolicy.PolicyElements.AccountLogon = PolicyInformation->Policies[i].Value;
+                                break;
+                        }
+                    }
+                }
+                _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+                {
+                    Status = _SEH2_GetExceptionCode();
+                    goto Cleanup;
+                }
+                _SEH2_END;
+
+                if (!SeSinglePrivilegeCheck(SeTcbPrivilege,
+                                            PreviousMode))
+                {
+                    Status = STATUS_PRIVILEGE_NOT_HELD;
+                    break;
+                }
+
+                /* Lock the token */
+                SepAcquireTokenLockExclusive(Token);
+
+                /* Set the new audit policy */
+                Token->AuditPolicy = AuditPolicy;
+
+                /* Unlock the token */
+                SepReleaseTokenLock(Token);
+
+                break;
+            }
+
+            case TokenOrigin:
+            {
+                TOKEN_ORIGIN TokenOrigin;
+
+                _SEH2_TRY
+                {
+                    /* Copy the token origin */
+                    TokenOrigin = *(PTOKEN_ORIGIN)TokenInformation;
+                }
+                _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+                {
+                    Status = _SEH2_GetExceptionCode();
+                    goto Cleanup;
+                }
+                _SEH2_END;
+
+                /* Check for TCB privilege */
+                if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode))
+                {
+                    Status = STATUS_PRIVILEGE_NOT_HELD;
+                    break;
+                }
+
+                /* Lock the token */
+                SepAcquireTokenLockExclusive(Token);
+
+                /* Check if there is no token origin set yet */
+                if ((Token->OriginatingLogonSession.LowPart == 0) &&
+                    (Token->OriginatingLogonSession.HighPart == 0))
+                {
+                    /* Set the token origin */
+                    Token->OriginatingLogonSession =
+                        TokenOrigin.OriginatingLogonSession;
+                }
+
+                /* Unlock the token */
+                SepReleaseTokenLock(Token);
+
+                break;
+            }
+
             default:
             {
-                DPRINT1("Unhandled TokenInformationClass: 0x%lx\n",
+                DPRINT1("Invalid TokenInformationClass: 0x%lx\n",
                         TokenInformationClass);
-                Status = STATUS_NOT_IMPLEMENTED;
+                Status = STATUS_INVALID_INFO_CLASS;
                 break;
             }
         }
@@ -1956,6 +2095,11 @@
         ObDereferenceObject(Token);
     }
 
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("NtSetInformationToken failed with Status 0x%lx\n", Status);
+    }
+
     return Status;
 }
 
Index: ntoskrnl/se/audit.c
===================================================================
--- ntoskrnl/se/audit.c	(rÃ©vision 61927)
+++ ntoskrnl/se/audit.c	(copie de travail)
@@ -16,6 +16,8 @@
 
 #define SEP_PRIVILEGE_SET_MAX_COUNT 60
 
+UNICODE_STRING SeSubsystemName = RTL_CONSTANT_STRING(L"Security");
+
 /* PRIVATE FUNCTIONS***********************************************************/
 
 BOOLEAN
@@ -202,9 +204,165 @@
     _In_ PTOKEN Token,
     _In_ PTOKEN PrimaryToken,
     _In_ PPRIVILEGE_SET Privileges,
-    _In_ BOOLEAN AccessGranted )
+    _In_ BOOLEAN AccessGranted)
 {
+    DPRINT("SepAdtPrivilegedServiceAuditAlarm is unimplemented\n");
+}
+
+VOID
+NTAPI
+SePrivilegedServiceAuditAlarm(
+    _In_opt_ PUNICODE_STRING ServiceName,
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ PPRIVILEGE_SET PrivilegeSet,
+    _In_ BOOLEAN AccessGranted)
+{
+    PTOKEN EffectiveToken;
+    PSID UserSid;
+    PAGED_CODE();
+
+    /* Get the effective token */
+    if (SubjectContext->ClientToken != NULL)
+        EffectiveToken = SubjectContext->ClientToken;
+    else
+        EffectiveToken = SubjectContext->PrimaryToken;
+
+    /* Get the user SID */
+    UserSid = EffectiveToken->UserAndGroups->Sid;
+
+    /* Check if this is the local system SID */
+    if (RtlEqualSid(UserSid, SeLocalSystemSid))
+    {
+        /* Nothing to do */
+        return;
+    }
+
+    /* Check if this is the network service or local service SID */
+    if (RtlEqualSid(UserSid, SeExports->SeNetworkServiceSid) ||
+        RtlEqualSid(UserSid, SeExports->SeLocalServiceSid))
+    {
+        // FIXME: should continue for a certain set of privileges
+        return;
+    }
+
+    /* Call the worker function */
+    SepAdtPrivilegedServiceAuditAlarm(SubjectContext,
+                                      &SeSubsystemName,
+                                      ServiceName,
+                                      SubjectContext->ClientToken,
+                                      SubjectContext->PrimaryToken,
+                                      PrivilegeSet,
+                                      AccessGranted);
+
+}
+
+
+static
+NTSTATUS
+SeCaptureObjectTypeList(
+    _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList,
+    _In_ ULONG ObjectTypeListLength,
+    _In_ KPROCESSOR_MODE PreviousMode,
+    _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList)
+{
+    SIZE_T Size;
+
+    if (PreviousMode == KernelMode)
+    {
+        return STATUS_NOT_IMPLEMENTED;
+    }
+
+    if (ObjectTypeListLength == 0)
+    {
+        *CapturedObjectTypeList = NULL;
+        return STATUS_SUCCESS;
+    }
+
+    if (ObjectTypeList == NULL)
+    {
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Calculate the list size and check for integer overflow */
+    Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST);
+    if (Size == 0)
+    {
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Allocate a new list */
+    *CapturedObjectTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA);
+    if (*CapturedObjectTypeList == NULL)
+    {
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+    _SEH2_TRY
+    {
+        ProbeForRead(ObjectTypeList, Size, sizeof(ULONG));
+        RtlCopyMemory(*CapturedObjectTypeList, ObjectTypeList, Size);
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA);
+        *CapturedObjectTypeList = NULL;
+        return _SEH2_GetExceptionCode();
+    }
+    _SEH2_END;
+
+    return STATUS_SUCCESS;
+}
+
+static
+VOID
+SeReleaseObjectTypeList(
+    _In_  _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList,
+    _In_ KPROCESSOR_MODE PreviousMode)
+{
+    if ((PreviousMode != KernelMode) && (CapturedObjectTypeList != NULL))
+        ExFreePoolWithTag(CapturedObjectTypeList, TAG_SEPA);
+}
+
+_Must_inspect_result_
+static
+NTSTATUS
+SepAccessCheckAndAuditAlarmWorker(
+    _In_ PUNICODE_STRING SubsystemName,
+    _In_opt_ PVOID HandleId,
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ PUNICODE_STRING ObjectTypeName,
+    _In_ PUNICODE_STRING ObjectName,
+    _In_ PSECURITY_DESCRIPTOR SecurityDescriptor,
+    _In_opt_ PSID PrincipalSelfSid,
+    _In_ ACCESS_MASK DesiredAccess,
+    _In_ AUDIT_EVENT_TYPE AuditType,
+    _In_ BOOLEAN HaveAuditPrivilege,
+    _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList,
+    _In_ ULONG ObjectTypeListLength,
+    _In_ PGENERIC_MAPPING GenericMapping,
+    _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccessList,
+    _Out_writes_(ObjectTypeListLength) PNTSTATUS AccessStatusList,
+    _Out_ PBOOLEAN GenerateOnClose,
+    _In_ BOOLEAN UseResultList)
+{
+    ULONG ResultListLength, i;
+
+    /* Get the length of the result list */
+    ResultListLength = UseResultList ? ObjectTypeListLength : 1;
+
+    /// FIXME: we should do some real work here...
     UNIMPLEMENTED;
+
+    /// HACK: we just pretend all access is granted!
+    for (i = 0; i < ResultListLength; i++)
+    {
+        GrantedAccessList[i] = DesiredAccess;
+        AccessStatusList[i] = STATUS_SUCCESS;
+    }
+
+    *GenerateOnClose = FALSE;
+
+    return STATUS_SUCCESS;
 }
 
 _Must_inspect_result_
@@ -213,7 +371,7 @@
 SepAccessCheckAndAuditAlarm(
     _In_ PUNICODE_STRING SubsystemName,
     _In_opt_ PVOID HandleId,
-    _In_ PHANDLE ClientToken,
+    _In_ PHANDLE ClientTokenHandle,
     _In_ PUNICODE_STRING ObjectTypeName,
     _In_ PUNICODE_STRING ObjectName,
     _In_ PSECURITY_DESCRIPTOR SecurityDescriptor,
@@ -232,14 +390,33 @@
     SECURITY_SUBJECT_CONTEXT SubjectContext;
     ULONG ResultListLength;
     GENERIC_MAPPING LocalGenericMapping;
+    PTOKEN SubjectContextToken, ClientToken;
+    BOOLEAN AllocatedResultLists;
+    BOOLEAN HaveAuditPrivilege;
+    PSECURITY_DESCRIPTOR CapturedSecurityDescriptor;
+    UNICODE_STRING CapturedSubsystemName, CapturedObjectTypeName, CapturedObjectName;
+    ACCESS_MASK GrantedAccess, *SafeGrantedAccessList;
+    NTSTATUS AccessStatus, *SafeAccessStatusList;
+    PSID CapturedPrincipalSelfSid;
+    POBJECT_TYPE_LIST CapturedObjectTypeList;
+    ULONG i;
+    BOOLEAN LocalGenerateOnClose;
     NTSTATUS Status;
     PAGED_CODE();
 
-    DBG_UNREFERENCED_LOCAL_VARIABLE(LocalGenericMapping);
-
     /* Only user mode is supported! */
     ASSERT(ExGetPreviousMode() != KernelMode);
 
+    /* Start clean */
+    AllocatedResultLists = FALSE;
+    ClientToken = NULL;
+    CapturedSecurityDescriptor = NULL;
+    CapturedSubsystemName.Buffer = NULL;
+    CapturedObjectTypeName.Buffer = NULL;
+    CapturedObjectName.Buffer = NULL;
+    CapturedPrincipalSelfSid = NULL;
+    CapturedObjectTypeList = NULL;
+
     /* Validate AuditType */
     if ((AuditType != AuditEventObjectAccess) &&
         (AuditType != AuditEventDirectoryServiceAccess))
@@ -252,12 +429,13 @@
     SeCaptureSubjectContext(&SubjectContext);
 
     /* Did the caller pass a token handle? */
-    if (ClientToken == NULL)
+    if (ClientTokenHandle == NULL)
     {
         /* Check if we have a token in the subject context */
         if (SubjectContext.ClientToken == NULL)
         {
             Status = STATUS_NO_IMPERSONATION_TOKEN;
+            DPRINT1("No token\n");
             goto Cleanup;
         }
 
@@ -265,6 +443,8 @@
         if (SubjectContext.ImpersonationLevel < SecurityIdentification)
         {
             Status = STATUS_BAD_IMPERSONATION_LEVEL;
+            DPRINT1("Invalid impersonation level 0x%lx\n",
+                    SubjectContext.ImpersonationLevel);
             goto Cleanup;
         }
     }
@@ -277,13 +457,30 @@
         if ((ResultListLength == 0) || (ResultListLength > 0x1000))
         {
             Status = STATUS_INVALID_PARAMETER;
+            DPRINT1("Invalud ResultListLength: 0x%lx\n", ResultListLength);
             goto Cleanup;
         }
+
+        /* Allocate a safe buffer from paged pool */
+        SafeGrantedAccessList = ExAllocatePoolWithTag(PagedPool,
+                                                      2 * ResultListLength * sizeof(ULONG),
+                                                      TAG_SEPA);
+        if (SafeGrantedAccessList == NULL)
+        {
+            Status = STATUS_INSUFFICIENT_RESOURCES;
+            DPRINT1("Failed to allocate access lists\n");
+            goto Cleanup;
+        }
+
+        SafeAccessStatusList = (PNTSTATUS)&SafeGrantedAccessList[ResultListLength];
+        AllocatedResultLists = TRUE;
     }
     else
     {
         /* List length is 1 */
         ResultListLength = 1;
+        SafeGrantedAccessList = &GrantedAccess;
+        SafeAccessStatusList = &AccessStatus;
     }
 
     _SEH2_TRY
@@ -303,18 +500,195 @@
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
         Status = _SEH2_GetExceptionCode();
+        DPRINT1("Exception while probing parameters: 0x%lx\n", Status);
         goto Cleanup;
     }
     _SEH2_END;
 
+    /* Do we have a client token? */
+    if (ClientTokenHandle != NULL)
+    {
+        /* Reference the client token */
+        Status = ObReferenceObjectByHandle(*ClientTokenHandle,
+                                           TOKEN_QUERY,
+                                           SeTokenObjectType,
+                                           UserMode,
+                                           (PVOID*)&ClientToken,
+                                           NULL);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("Failed to reference token handle %p: %lx\n",
+                    *ClientTokenHandle, Status);
+            goto Cleanup;
+        }
 
-    UNIMPLEMENTED;
+        SubjectContextToken = SubjectContext.ClientToken;
+        SubjectContext.ClientToken = ClientToken;
+    }
 
-    /* For now pretend everything else is ok */
-    Status = STATUS_SUCCESS;
+    /* Check for audit privilege */
+    HaveAuditPrivilege = SeCheckAuditPrivilege(&SubjectContext, UserMode);
+    if (!HaveAuditPrivilege && !(Flags & AUDIT_ALLOW_NO_PRIVILEGE))
+    {
+        DPRINT1("Caller does not have SeAuditPrivilege\n");
+        Status = STATUS_PRIVILEGE_NOT_HELD;
+        goto Cleanup;
+    }
 
+    /* Generic access must already be mapped to non-generic access types! */
+    if (DesiredAccess & (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL))
+    {
+        DPRINT1("Generic access rights requested: 0x%lx\n", DesiredAccess);
+        Status = STATUS_GENERIC_NOT_MAPPED;
+        goto Cleanup;
+    }
+
+    /* Capture the security descriptor */
+    Status = SeCaptureSecurityDescriptor(SecurityDescriptor,
+                                         UserMode,
+                                         PagedPool,
+                                         FALSE,
+                                         &CapturedSecurityDescriptor);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture security descriptor!\n");
+        goto Cleanup;
+    }
+
+    /* Validate the Security descriptor */
+    if ((SepGetOwnerFromDescriptor(CapturedSecurityDescriptor) == NULL) ||
+        (SepGetGroupFromDescriptor(CapturedSecurityDescriptor) == NULL))
+    {
+        Status = STATUS_INVALID_SECURITY_DESCR;
+        DPRINT1("Invalid security descriptor\n");
+        goto Cleanup;
+    }
+
+    /* Probe and capture the subsystem name */
+    Status = ProbeAndCaptureUnicodeString(&CapturedSubsystemName,
+                                          UserMode,
+                                          SubsystemName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture subsystem name!\n");
+        goto Cleanup;
+    }
+
+    /* Probe and capture the object type name */
+    Status = ProbeAndCaptureUnicodeString(&CapturedObjectTypeName,
+                                          UserMode,
+                                          ObjectTypeName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture object type name!\n");
+        goto Cleanup;
+    }
+
+    /* Probe and capture the object name */
+    Status = ProbeAndCaptureUnicodeString(&CapturedObjectName,
+                                          UserMode,
+                                          ObjectName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture object name!\n");
+        goto Cleanup;
+    }
+
+    /* Check if we have a PrincipalSelfSid */
+    if (PrincipalSelfSid != NULL)
+    {
+        /* Capture it */
+        Status = SepCaptureSid(PrincipalSelfSid,
+                               UserMode,
+                               PagedPool,
+                               FALSE,
+                               &CapturedPrincipalSelfSid);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("Failed to capture PrincipalSelfSid!\n");
+            goto Cleanup;
+        }
+    }
+
+    /* Capture the object type list */
+    Status = SeCaptureObjectTypeList(ObjectTypeList,
+                                     ObjectTypeListLength,
+                                     UserMode,
+                                     &CapturedObjectTypeList);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture object type list!\n");
+        goto Cleanup;
+    }
+
+    /* Call the worker routine with the captured buffers */
+    SepAccessCheckAndAuditAlarmWorker(&CapturedSubsystemName,
+                                      HandleId,
+                                      &SubjectContext,
+                                      &CapturedObjectTypeName,
+                                      &CapturedObjectName,
+                                      CapturedSecurityDescriptor,
+                                      CapturedPrincipalSelfSid,
+                                      DesiredAccess,
+                                      AuditType,
+                                      HaveAuditPrivilege,
+                                      CapturedObjectTypeList,
+                                      ObjectTypeListLength,
+                                      &LocalGenericMapping,
+                                      SafeGrantedAccessList,
+                                      SafeAccessStatusList,
+                                      &LocalGenerateOnClose,
+                                      UseResultList);
+
+    /* Enter SEH to copy the data back to user mode */
+    _SEH2_TRY
+    {
+        /* Loop all result entries (only 1 when no list was requested) */
+        NT_ASSERT(UseResultList || (ResultListLength == 1));
+        for (i = 0; i < ResultListLength; i++)
+        {
+            AccessStatusList[i] = SafeAccessStatusList[i];
+            GrantedAccessList[i] = SafeGrantedAccessList[i];
+        }
+
+        *GenerateOnClose = LocalGenerateOnClose;
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+        DPRINT1("Exception while copying back data: 0x%lx\n", Status);
+    }
+    _SEH2_END;
+
 Cleanup:
 
+    if (CapturedObjectTypeList != NULL)
+        SeReleaseObjectTypeList(CapturedObjectTypeList, UserMode);
+
+    if (CapturedPrincipalSelfSid != NULL)
+        SepReleaseSid(CapturedPrincipalSelfSid, UserMode, FALSE);
+
+    if (CapturedObjectName.Buffer != NULL)
+        ReleaseCapturedUnicodeString(&CapturedObjectName, UserMode);
+
+    if (CapturedObjectTypeName.Buffer != NULL)
+        ReleaseCapturedUnicodeString(&CapturedObjectTypeName, UserMode);
+
+    if (CapturedSubsystemName.Buffer != NULL)
+        ReleaseCapturedUnicodeString(&CapturedSubsystemName, UserMode);
+
+    if (CapturedSecurityDescriptor != NULL)
+        SeReleaseSecurityDescriptor(CapturedSecurityDescriptor, UserMode, FALSE);
+
+    if (ClientToken != NULL)
+    {
+        ObDereferenceObject(ClientToken);
+        SubjectContext.ClientToken = SubjectContextToken;
+    }
+
+    if (AllocatedResultLists)
+        ExFreePoolWithTag(SafeGrantedAccessList, TAG_SEPA);
+
     /* Release the security subject context */
     SeReleaseSubjectContext(&SubjectContext);
 
@@ -487,6 +861,7 @@
     PVOID HandleId,
     BOOLEAN GenerateOnClose)
 {
+    SECURITY_SUBJECT_CONTEXT SubjectContext;
     UNICODE_STRING CapturedSubsystemName;
     KPROCESSOR_MODE PreviousMode;
     BOOLEAN UseImpersonationToken;
@@ -508,11 +883,15 @@
         return STATUS_SUCCESS;
     }
 
-    /* Validate privilege */
-    if (!SeSinglePrivilegeCheck(SeAuditPrivilege, PreviousMode))
+    /* Capture the security subject context */
+    SeCaptureSubjectContext(&SubjectContext);
+
+    /* Check for audit privilege */
+    if (!SeCheckAuditPrivilege(&SubjectContext, PreviousMode))
     {
         DPRINT1("Caller does not have SeAuditPrivilege\n");
-        return STATUS_PRIVILEGE_NOT_HELD;
+        Status = STATUS_PRIVILEGE_NOT_HELD;
+        goto Cleanup;
     }
 
     /* Probe and capture the subsystem name */
@@ -522,7 +901,7 @@
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("Failed to capture subsystem name!\n");
-        return Status;
+        goto Cleanup;
     }
 
     /* Get the current thread and check if it's impersonating */
@@ -563,7 +942,14 @@
         PsDereferencePrimaryToken(Token);
     }
 
-    return STATUS_SUCCESS;
+    Status = STATUS_SUCCESS;
+
+Cleanup:
+
+    /* Release the security subject context */
+    SeReleaseSubjectContext(&SubjectContext);
+
+    return Status;
 }
 
 
@@ -576,26 +962,270 @@
     return STATUS_NOT_IMPLEMENTED;
 }
 
-
-NTSTATUS NTAPI
-NtOpenObjectAuditAlarm(IN PUNICODE_STRING SubsystemName,
-                       IN PVOID HandleId,
-                       IN PUNICODE_STRING ObjectTypeName,
-                       IN PUNICODE_STRING ObjectName,
-                       IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-                       IN HANDLE ClientToken,
-                       IN ULONG DesiredAccess,
-                       IN ULONG GrantedAccess,
-                       IN PPRIVILEGE_SET Privileges,
-                       IN BOOLEAN ObjectCreation,
-                       IN BOOLEAN AccessGranted,
-                       OUT PBOOLEAN GenerateOnClose)
+VOID
+NTAPI
+SepOpenObjectAuditAlarm(
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ PUNICODE_STRING SubsystemName,
+    _In_opt_ PVOID HandleId,
+    _In_ PUNICODE_STRING ObjectTypeName,
+    _In_ PUNICODE_STRING ObjectName,
+    _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor,
+    _In_ PTOKEN ClientToken,
+    _In_ ACCESS_MASK DesiredAccess,
+    _In_ ACCESS_MASK GrantedAccess,
+    _In_opt_ PPRIVILEGE_SET Privileges,
+    _In_ BOOLEAN ObjectCreation,
+    _In_ BOOLEAN AccessGranted,
+    _Out_ PBOOLEAN GenerateOnClose)
 {
+    DBG_UNREFERENCED_PARAMETER(SubjectContext);
+    DBG_UNREFERENCED_PARAMETER(SubsystemName);
+    DBG_UNREFERENCED_PARAMETER(HandleId);
+    DBG_UNREFERENCED_PARAMETER(ObjectTypeName);
+    DBG_UNREFERENCED_PARAMETER(ObjectName);
+    DBG_UNREFERENCED_PARAMETER(SecurityDescriptor);
+    DBG_UNREFERENCED_PARAMETER(ClientToken);
+    DBG_UNREFERENCED_PARAMETER(DesiredAccess);
+    DBG_UNREFERENCED_PARAMETER(GrantedAccess);
+    DBG_UNREFERENCED_PARAMETER(Privileges);
+    DBG_UNREFERENCED_PARAMETER(ObjectCreation);
+    DBG_UNREFERENCED_PARAMETER(AccessGranted);
     UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    *GenerateOnClose = FALSE;
 }
 
+__kernel_entry
+NTSTATUS
+NTAPI
+NtOpenObjectAuditAlarm(
+    _In_ PUNICODE_STRING SubsystemName,
+    _In_opt_ PVOID HandleId,
+    _In_ PUNICODE_STRING ObjectTypeName,
+    _In_ PUNICODE_STRING ObjectName,
+    _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor,
+    _In_ HANDLE ClientTokenHandle,
+    _In_ ACCESS_MASK DesiredAccess,
+    _In_ ACCESS_MASK GrantedAccess,
+    _In_opt_ PPRIVILEGE_SET PrivilegeSet,
+    _In_ BOOLEAN ObjectCreation,
+    _In_ BOOLEAN AccessGranted,
+    _Out_ PBOOLEAN GenerateOnClose)
+{
+    PTOKEN ClientToken;
+    PSECURITY_DESCRIPTOR CapturedSecurityDescriptor;
+    UNICODE_STRING CapturedSubsystemName, CapturedObjectTypeName, CapturedObjectName;
+    ULONG PrivilegeCount, PrivilegeSetSize;
+    volatile PPRIVILEGE_SET CapturedPrivilegeSet;
+    BOOLEAN LocalGenerateOnClose;
+    PVOID CapturedHandleId;
+    SECURITY_SUBJECT_CONTEXT SubjectContext;
+    NTSTATUS Status;
+    PAGED_CODE();
 
+    /* Only user mode is supported! */
+    ASSERT(ExGetPreviousMode() != KernelMode);
+
+    /* Start clean */
+    ClientToken = NULL;
+    CapturedSecurityDescriptor = NULL;
+    CapturedPrivilegeSet = NULL;
+    CapturedSubsystemName.Buffer = NULL;
+    CapturedObjectTypeName.Buffer = NULL;
+    CapturedObjectName.Buffer = NULL;
+
+    /* Reference the client token */
+    Status = ObReferenceObjectByHandle(ClientTokenHandle,
+                                       TOKEN_QUERY,
+                                       SeTokenObjectType,
+                                       UserMode,
+                                       (PVOID*)&ClientToken,
+                                       NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to reference token handle %p: %lx\n",
+                ClientTokenHandle, Status);
+        return Status;
+    }
+
+    /* Capture the security subject context */
+    SeCaptureSubjectContext(&SubjectContext);
+
+    /* Validate the token's impersonation level */
+    if ((ClientToken->TokenType == TokenImpersonation) &&
+        (ClientToken->ImpersonationLevel < SecurityIdentification))
+    {
+        DPRINT1("Invalid impersonation level (%u)\n", ClientToken->ImpersonationLevel);
+        Status = STATUS_BAD_IMPERSONATION_LEVEL;
+        goto Cleanup;
+    }
+
+    /* Check for audit privilege */
+    if (!SeCheckAuditPrivilege(&SubjectContext, UserMode))
+    {
+        DPRINT1("Caller does not have SeAuditPrivilege\n");
+        Status = STATUS_PRIVILEGE_NOT_HELD;
+        goto Cleanup;
+    }
+
+    /* Check for NULL SecurityDescriptor */
+    if (SecurityDescriptor == NULL)
+    {
+        /* Nothing to do */
+        Status = STATUS_SUCCESS;
+        goto Cleanup;
+    }
+
+    /* Capture the security descriptor */
+    Status = SeCaptureSecurityDescriptor(SecurityDescriptor,
+                                         UserMode,
+                                         PagedPool,
+                                         FALSE,
+                                         &CapturedSecurityDescriptor);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture security descriptor!\n");
+        goto Cleanup;
+    }
+
+    _SEH2_TRY
+    {
+        /* Check if we have a privilege set */
+        if (PrivilegeSet != NULL)
+        {
+            /* Probe the basic privilege set structure */
+            ProbeForRead(PrivilegeSet, sizeof(PRIVILEGE_SET), sizeof(ULONG));
+
+            /* Validate privilege count */
+            PrivilegeCount = PrivilegeSet->PrivilegeCount;
+            if (PrivilegeCount > SEP_PRIVILEGE_SET_MAX_COUNT)
+            {
+                Status = STATUS_INVALID_PARAMETER;
+                goto Cleanup;
+            }
+
+            /* Calculate the size of the PrivilegeSet structure */
+            PrivilegeSetSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]);
+
+            /* Probe the whole structure */
+            ProbeForRead(PrivilegeSet, PrivilegeSetSize, sizeof(ULONG));
+
+            /* Allocate a temp buffer */
+            CapturedPrivilegeSet = ExAllocatePoolWithTag(PagedPool,
+                                                         PrivilegeSetSize,
+                                                         'rPeS');
+            if (CapturedPrivilegeSet == NULL)
+            {
+                DPRINT1("Failed to allocate %u bytes\n", PrivilegeSetSize);
+                Status = STATUS_INSUFFICIENT_RESOURCES;
+                goto Cleanup;
+            }
+
+            /* Copy the privileges */
+            RtlCopyMemory(CapturedPrivilegeSet, PrivilegeSet, PrivilegeSetSize);
+        }
+
+        if (HandleId != NULL)
+        {
+            ProbeForRead(HandleId, sizeof(PVOID), sizeof(PVOID));
+            CapturedHandleId = *(PVOID*)HandleId;
+        }
+
+        ProbeForWrite(GenerateOnClose, sizeof(BOOLEAN), sizeof(BOOLEAN));
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+        DPRINT1("Exception while probing parameters: 0x%lx\n", Status);
+        goto Cleanup;
+    }
+    _SEH2_END;
+
+    /* Probe and capture the subsystem name */
+    Status = ProbeAndCaptureUnicodeString(&CapturedSubsystemName,
+                                          UserMode,
+                                          SubsystemName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture subsystem name!\n");
+        goto Cleanup;
+    }
+
+    /* Probe and capture the object type name */
+    Status = ProbeAndCaptureUnicodeString(&CapturedObjectTypeName,
+                                          UserMode,
+                                          ObjectTypeName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture object type name!\n");
+        goto Cleanup;
+    }
+
+    /* Probe and capture the object name */
+    Status = ProbeAndCaptureUnicodeString(&CapturedObjectName,
+                                          UserMode,
+                                          ObjectName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to capture object name!\n");
+        goto Cleanup;
+    }
+
+    /* Call the internal function */
+    SepOpenObjectAuditAlarm(&SubjectContext,
+                            &CapturedSubsystemName,
+                            CapturedHandleId,
+                            &CapturedObjectTypeName,
+                            &CapturedObjectName,
+                            CapturedSecurityDescriptor,
+                            ClientToken,
+                            DesiredAccess,
+                            GrantedAccess,
+                            CapturedPrivilegeSet,
+                            ObjectCreation,
+                            AccessGranted,
+                            &LocalGenerateOnClose);
+
+    Status = STATUS_SUCCESS;
+
+    /* Enter SEH to copy the data back to user mode */
+    _SEH2_TRY
+    {
+        *GenerateOnClose = LocalGenerateOnClose;
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+        DPRINT1("Exception while copying back data: 0x%lx\n", Status);
+    }
+    _SEH2_END;
+
+Cleanup:
+
+    if (CapturedObjectName.Buffer != NULL)
+        ReleaseCapturedUnicodeString(&CapturedObjectName, UserMode);
+
+    if (CapturedObjectTypeName.Buffer != NULL)
+        ReleaseCapturedUnicodeString(&CapturedObjectTypeName, UserMode);
+
+    if (CapturedSubsystemName.Buffer != NULL)
+        ReleaseCapturedUnicodeString(&CapturedSubsystemName, UserMode);
+
+    if (CapturedSecurityDescriptor != NULL)
+        SeReleaseSecurityDescriptor(CapturedSecurityDescriptor, UserMode, FALSE);
+
+    if (CapturedPrivilegeSet != NULL)
+        ExFreePoolWithTag(CapturedPrivilegeSet, 'rPeS');
+
+    /* Release the security subject context */
+    SeReleaseSubjectContext(&SubjectContext);
+
+    ObDereferenceObject(ClientToken);
+
+    return Status;
+}
+
+
 __kernel_entry
 NTSTATUS
 NTAPI
@@ -602,12 +1232,12 @@
 NtPrivilegedServiceAuditAlarm(
     _In_opt_ PUNICODE_STRING SubsystemName,
     _In_opt_ PUNICODE_STRING ServiceName,
-    _In_ HANDLE ClientToken,
+    _In_ HANDLE ClientTokenHandle,
     _In_ PPRIVILEGE_SET Privileges,
     _In_ BOOLEAN AccessGranted )
 {
     KPROCESSOR_MODE PreviousMode;
-    PTOKEN Token;
+    PTOKEN ClientToken;
     volatile PPRIVILEGE_SET CapturedPrivileges = NULL;
     UNICODE_STRING CapturedSubsystemName;
     UNICODE_STRING CapturedServiceName;
@@ -620,12 +1250,15 @@
     PreviousMode = ExGetPreviousMode();
     ASSERT(PreviousMode != KernelMode);
 
+    CapturedSubsystemName.Buffer = NULL;
+    CapturedServiceName.Buffer = NULL;
+
     /* Reference the client token */
-    Status = ObReferenceObjectByHandle(ClientToken,
+    Status = ObReferenceObjectByHandle(ClientTokenHandle,
                                        TOKEN_QUERY,
                                        SeTokenObjectType,
                                        PreviousMode,
-                                       (PVOID*)&Token,
+                                       (PVOID*)&ClientToken,
                                        NULL);
     if (!NT_SUCCESS(Status))
     {
@@ -634,20 +1267,23 @@
     }
 
     /* Validate the token's impersonation level */
-    if ((Token->TokenType == TokenImpersonation) &&
-        (Token->ImpersonationLevel < SecurityIdentification))
+    if ((ClientToken->TokenType == TokenImpersonation) &&
+        (ClientToken->ImpersonationLevel < SecurityIdentification))
     {
-        DPRINT1("Invalid impersonation level (%u)\n", Token->ImpersonationLevel);
-        ObfDereferenceObject(Token);
+        DPRINT1("Invalid impersonation level (%u)\n", ClientToken->ImpersonationLevel);
+        ObDereferenceObject(ClientToken);
         return STATUS_BAD_IMPERSONATION_LEVEL;
     }
 
-    /* Validate privilege */
-    if (!SeSinglePrivilegeCheck(SeAuditPrivilege, PreviousMode))
+    /* Capture the security subject context */
+    SeCaptureSubjectContext(&SubjectContext);
+
+    /* Check for audit privilege */
+    if (!SeCheckAuditPrivilege(&SubjectContext, PreviousMode))
     {
         DPRINT1("Caller does not have SeAuditPrivilege\n");
-        ObfDereferenceObject(Token);
-        return STATUS_PRIVILEGE_NOT_HELD;
+        Status = STATUS_PRIVILEGE_NOT_HELD;
+        goto Cleanup;
     }
 
     /* Do we have a subsystem name? */
@@ -719,33 +1355,33 @@
     }
     _SEH2_END;
 
-    /* Capture the security subject context */
-    SeCaptureSubjectContext(&SubjectContext);
-
     /* Call the internal function */
     SepAdtPrivilegedServiceAuditAlarm(&SubjectContext,
-                                      &CapturedSubsystemName,
-                                      &CapturedServiceName,
-                                      Token,
+                                      SubsystemName ? &CapturedSubsystemName : NULL,
+                                      ServiceName ? &CapturedServiceName : NULL,
+                                      ClientToken,
                                       SubjectContext.PrimaryToken,
                                       CapturedPrivileges,
                                       AccessGranted);
 
-    /* Release the security subject context */
-    SeReleaseSubjectContext(&SubjectContext);
-
     Status = STATUS_SUCCESS;
 
 Cleanup:
     /* Cleanup resources */
-    if (SubsystemName != NULL)
+    if (CapturedSubsystemName.Buffer != NULL)
         ReleaseCapturedUnicodeString(&CapturedSubsystemName, PreviousMode);
-    if (ServiceName != NULL)
+
+    if (CapturedServiceName.Buffer != NULL)
         ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode);
+
     if (CapturedPrivileges != NULL)
-        ExFreePoolWithTag(CapturedPrivileges, 0);
-    ObDereferenceObject(Token);
+        ExFreePoolWithTag(CapturedPrivileges, 'rPeS');
 
+    /* Release the security subject context */
+    SeReleaseSubjectContext(&SubjectContext);
+
+    ObDereferenceObject(ClientToken);
+
     return Status;
 }
 
Index: ntoskrnl/se/accesschk.c
===================================================================
--- ntoskrnl/se/accesschk.c	(rÃ©vision 0)
+++ ntoskrnl/se/accesschk.c	(rÃ©vision 62573)
@@ -0,0 +1,774 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/se/accesschk.c
+ * PURPOSE:         Security manager
+ *
+ * PROGRAMMERS:     No programmer listed.
+ */
+
+/* INCLUDES *******************************************************************/
+
+#include <ntoskrnl.h>
+#define NDEBUG
+#include <debug.h>
+
+/* GLOBALS ********************************************************************/
+
+
+/* PRIVATE FUNCTIONS **********************************************************/
+
+#define OLD_ACCESS_CHECK
+
+BOOLEAN NTAPI
+SepAccessCheckEx(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+               IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
+               IN ACCESS_MASK DesiredAccess,
+               IN POBJECT_TYPE_LIST ObjectTypeList,
+               IN ULONG ObjectTypeListLength,
+               IN ACCESS_MASK PreviouslyGrantedAccess,
+               OUT PPRIVILEGE_SET* Privileges,
+               IN PGENERIC_MAPPING GenericMapping,
+               IN KPROCESSOR_MODE AccessMode,
+               OUT PACCESS_MASK GrantedAccessList,
+               OUT PNTSTATUS AccessStatusList,
+               IN BOOLEAN UseResultList)
+{
+    ACCESS_MASK RemainingAccess;
+    ACCESS_MASK TempAccess;
+    ACCESS_MASK TempGrantedAccess = 0;
+    ACCESS_MASK TempDeniedAccess = 0;
+    PACCESS_TOKEN Token;
+    ULONG i, ResultListLength;
+    PACL Dacl;
+    BOOLEAN Present;
+    BOOLEAN Defaulted;
+    PACE CurrentAce;
+    PSID Sid;
+    NTSTATUS Status;
+    PAGED_CODE();
+
+    /* Check for no access desired */
+    if (!DesiredAccess)
+    {
+        /* Check if we had no previous access */
+        if (!PreviouslyGrantedAccess)
+        {
+            /* Then there's nothing to give */
+            Status = STATUS_ACCESS_DENIED;
+            goto ReturnCommonStatus;
+        }
+
+        /* Return the previous access only */
+        Status = STATUS_SUCCESS;
+        *Privileges = NULL;
+        goto ReturnCommonStatus;
+    }
+
+    /* Map given accesses */
+    RtlMapGenericMask(&DesiredAccess, GenericMapping);
+    if (PreviouslyGrantedAccess)
+        RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping);
+
+    /* Initialize remaining access rights */
+    RemainingAccess = DesiredAccess;
+
+    Token = SubjectSecurityContext->ClientToken ?
+        SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken;
+
+    /* Check for ACCESS_SYSTEM_SECURITY and WRITE_OWNER access */
+    Status = SePrivilegePolicyCheck(&RemainingAccess,
+                                    &PreviouslyGrantedAccess,
+                                    NULL,
+                                    Token,
+                                    NULL,
+                                    UserMode);
+    if (!NT_SUCCESS(Status))
+    {
+        goto ReturnCommonStatus;
+    }
+
+    /* Succeed if there are no more rights to grant */
+    if (RemainingAccess == 0)
+    {
+        Status = STATUS_SUCCESS;
+        goto ReturnCommonStatus;
+    }
+
+    /* Get the DACL */
+    Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
+                                          &Present,
+                                          &Dacl,
+                                          &Defaulted);
+    if (!NT_SUCCESS(Status))
+    {
+        goto ReturnCommonStatus;
+    }
+
+    /* RULE 1: Grant desired access if the object is unprotected */
+    if (Present == FALSE || Dacl == NULL)
+    {
+        PreviouslyGrantedAccess |= RemainingAccess;
+        if (RemainingAccess & MAXIMUM_ALLOWED)
+        {
+            PreviouslyGrantedAccess &= ~MAXIMUM_ALLOWED;
+            PreviouslyGrantedAccess |= GenericMapping->GenericAll;
+        }
+
+        Status = STATUS_SUCCESS;
+        goto ReturnCommonStatus;
+    }
+
+    /* Deny access if the DACL is empty */
+    if (Dacl->AceCount == 0)
+    {
+        if (RemainingAccess == MAXIMUM_ALLOWED && PreviouslyGrantedAccess != 0)
+        {
+            Status = STATUS_SUCCESS;
+        }
+        else
+        {
+            PreviouslyGrantedAccess = 0;
+            Status = STATUS_ACCESS_DENIED;
+        }
+        goto ReturnCommonStatus;
+    }
+
+    /* Determine the MAXIMUM_ALLOWED access rights according to the DACL */
+    if (DesiredAccess & MAXIMUM_ALLOWED)
+    {
+        CurrentAce = (PACE)(Dacl + 1);
+        for (i = 0; i < Dacl->AceCount; i++)
+        {
+            if (!(CurrentAce->Header.AceFlags & INHERIT_ONLY_ACE))
+            {
+                Sid = (PSID)(CurrentAce + 1);
+                if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
+                {
+                    if (SepSidInToken(Token, Sid))
+                    {
+                        /* Map access rights from the ACE */
+                        TempAccess = CurrentAce->AccessMask;
+                        RtlMapGenericMask(&TempAccess, GenericMapping);
+
+                        /* Deny access rights that have not been granted yet */
+                        TempDeniedAccess |= (TempAccess & ~TempGrantedAccess);
+                    }
+                }
+                else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
+                {
+                    if (SepSidInToken(Token, Sid))
+                    {
+                        /* Map access rights from the ACE */
+                        TempAccess = CurrentAce->AccessMask;
+                        RtlMapGenericMask(&TempAccess, GenericMapping);
+
+                        /* Grant access rights that have not been denied yet */
+                        TempGrantedAccess |= (TempAccess & ~TempDeniedAccess);
+                    }
+                }
+                else
+                {
+                    DPRINT1("Unsupported ACE type 0x%lx\n", CurrentAce->Header.AceType);
+                }
+            }
+
+            /* Get the next ACE */
+            CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize);
+        }
+
+        /* Fail if some rights have not been granted */
+        RemainingAccess &= ~(MAXIMUM_ALLOWED | TempGrantedAccess);
+        if (RemainingAccess != 0)
+        {
+            PreviouslyGrantedAccess = 0;
+            Status = STATUS_ACCESS_DENIED;
+            goto ReturnCommonStatus;
+        }
+
+        /* Set granted access right and access status */
+        PreviouslyGrantedAccess |= TempGrantedAccess;
+        if (PreviouslyGrantedAccess != 0)
+        {
+            Status = STATUS_SUCCESS;
+        }
+        else
+        {
+            Status = STATUS_ACCESS_DENIED;
+        }
+        goto ReturnCommonStatus;
+    }
+
+    /* RULE 4: Grant rights according to the DACL */
+    CurrentAce = (PACE)(Dacl + 1);
+    for (i = 0; i < Dacl->AceCount; i++)
+    {
+        if (!(CurrentAce->Header.AceFlags & INHERIT_ONLY_ACE))
+        {
+            Sid = (PSID)(CurrentAce + 1);
+            if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
+            {
+                if (SepSidInToken(Token, Sid))
+                {
+#ifdef OLD_ACCESS_CHECK
+                    PreviouslyGrantedAccess = 0;
+                    Status = STATUS_ACCESS_DENIED;
+                    goto ReturnCommonStatus;
+#else
+                    /* Map access rights from the ACE */
+                    TempAccess = CurrentAce->AccessMask;
+                    RtlMapGenericMask(&TempAccess, GenericMapping);
+
+                    /* Leave if a remaining right must be denied */
+                    if (RemainingAccess & TempAccess)
+                        break;
+#endif
+                }
+            }
+            else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
+            {
+                if (SepSidInToken(Token, Sid))
+                {
+#ifdef OLD_ACCESS_CHECK
+                    TempAccess = CurrentAce->AccessMask;
+                    RtlMapGenericMask(&TempAccess, GenericMapping);
+                    PreviouslyGrantedAccess |= TempAccess;
+#else
+                    /* Map access rights from the ACE */
+                    TempAccess = CurrentAce->AccessMask;
+                    RtlMapGenericMask(&TempAccess, GenericMapping);
+
+                    /* Remove granted rights */
+                    RemainingAccess &= ~TempAccess;
+#endif
+                }
+            }
+            else
+            {
+                DPRINT1("Unsupported ACE type 0x%lx\n", CurrentAce->Header.AceType);
+            }
+        }
+
+        /* Get the next ACE */
+        CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize);
+    }
+
+#ifdef OLD_ACCESS_CHECK
+    DPRINT("PreviouslyGrantedAccess %08lx\n DesiredAccess %08lx\n",
+           PreviouslyGrantedAccess, DesiredAccess);
+
+    PreviouslyGrantedAccess &= DesiredAccess;
+
+    if ((PreviouslyGrantedAccess & ~VALID_INHERIT_FLAGS) ==
+        (DesiredAccess & ~VALID_INHERIT_FLAGS))
+    {
+        Status = STATUS_SUCCESS;
+        goto ReturnCommonStatus;
+    }
+    else
+    {
+        DPRINT1("HACK: Should deny access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p).\n",
+                PreviouslyGrantedAccess, DesiredAccess, GenericMapping);
+        //*AccessStatus = STATUS_ACCESS_DENIED;
+        //return FALSE;
+        PreviouslyGrantedAccess = DesiredAccess;
+        Status = STATUS_SUCCESS;
+        goto ReturnCommonStatus;
+    }
+#else
+    DPRINT("DesiredAccess %08lx\nPreviouslyGrantedAccess %08lx\nRemainingAccess %08lx\n",
+           DesiredAccess, PreviouslyGrantedAccess, RemainingAccess);
+
+    /* Fail if some rights have not been granted */
+    if (RemainingAccess != 0)
+    {
+        *GrantedAccess = 0;
+        Status = STATUS_ACCESS_DENIED;
+        goto ReturnCommonStatus;
+    }
+
+    /* Set granted access rights */
+    PreviouslyGrantedAccess |= DesiredAccess;
+
+    DPRINT("GrantedAccess %08lx\n", *GrantedAccess);
+
+    /* Fail if no rights have been granted */
+    if (PreviouslyGrantedAccess == 0)
+    {
+        Status = STATUS_ACCESS_DENIED;
+        goto ReturnCommonStatus;
+    }
+
+    Status = STATUS_SUCCESS;
+    goto ReturnCommonStatus;
+#endif
+
+ReturnCommonStatus:
+
+    ResultListLength = UseResultList ? ObjectTypeListLength : 1;
+    for (i = 0; i < ResultListLength; i++)
+    {
+        GrantedAccessList[i] = PreviouslyGrantedAccess;
+        AccessStatusList[i] = Status;
+    }
+
+    return NT_SUCCESS(Status);
+}
+
+BOOLEAN NTAPI
+SepAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+               IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
+               IN ACCESS_MASK DesiredAccess,
+               IN ACCESS_MASK PreviouslyGrantedAccess,
+               OUT PPRIVILEGE_SET* Privileges,
+               IN PGENERIC_MAPPING GenericMapping,
+               IN KPROCESSOR_MODE AccessMode,
+               OUT PACCESS_MASK GrantedAccess,
+               OUT PNTSTATUS AccessStatus)
+{
+    return SepAccessCheckEx(SecurityDescriptor,
+                            SubjectSecurityContext,
+                            DesiredAccess,
+                            NULL,
+                            0,
+                            PreviouslyGrantedAccess,
+                            Privileges,
+                            GenericMapping,
+                            AccessMode,
+                            GrantedAccess,
+                            AccessStatus,
+                            FALSE);
+}
+
+static PSID
+SepGetSDOwner(IN PSECURITY_DESCRIPTOR _SecurityDescriptor)
+{
+    PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor;
+    PSID Owner;
+
+    if (SecurityDescriptor->Control & SE_SELF_RELATIVE)
+        Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner +
+                       (ULONG_PTR)SecurityDescriptor);
+    else
+        Owner = (PSID)SecurityDescriptor->Owner;
+
+    return Owner;
+}
+
+static PSID
+SepGetSDGroup(IN PSECURITY_DESCRIPTOR _SecurityDescriptor)
+{
+    PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor;
+    PSID Group;
+
+    if (SecurityDescriptor->Control & SE_SELF_RELATIVE)
+        Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group +
+                       (ULONG_PTR)SecurityDescriptor);
+    else
+        Group = (PSID)SecurityDescriptor->Group;
+
+    return Group;
+}
+
+
+/* PUBLIC FUNCTIONS ***********************************************************/
+
+/*
+ * @implemented
+ */
+BOOLEAN
+NTAPI
+SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+              IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
+              IN BOOLEAN SubjectContextLocked,
+              IN ACCESS_MASK DesiredAccess,
+              IN ACCESS_MASK PreviouslyGrantedAccess,
+              OUT PPRIVILEGE_SET* Privileges,
+              IN PGENERIC_MAPPING GenericMapping,
+              IN KPROCESSOR_MODE AccessMode,
+              OUT PACCESS_MASK GrantedAccess,
+              OUT PNTSTATUS AccessStatus)
+{
+    BOOLEAN ret;
+
+    PAGED_CODE();
+
+    /* Check if this is kernel mode */
+    if (AccessMode == KernelMode)
+    {
+        /* Check if kernel wants everything */
+        if (DesiredAccess & MAXIMUM_ALLOWED)
+        {
+            /* Give it */
+            *GrantedAccess = GenericMapping->GenericAll;
+            *GrantedAccess |= (DesiredAccess &~ MAXIMUM_ALLOWED);
+            *GrantedAccess |= PreviouslyGrantedAccess;
+        }
+        else
+        {
+            /* Give the desired and previous access */
+            *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess;
+        }
+
+        /* Success */
+        *AccessStatus = STATUS_SUCCESS;
+        return TRUE;
+    }
+
+    /* Check if we didn't get an SD */
+    if (!SecurityDescriptor)
+    {
+        /* Automatic failure */
+        *AccessStatus = STATUS_ACCESS_DENIED;
+        return FALSE;
+    }
+
+    /* Check for invalid impersonation */
+    if ((SubjectSecurityContext->ClientToken) &&
+        (SubjectSecurityContext->ImpersonationLevel < SecurityImpersonation))
+    {
+        *AccessStatus = STATUS_BAD_IMPERSONATION_LEVEL;
+        return FALSE;
+    }
+
+    /* Acquire the lock if needed */
+    if (!SubjectContextLocked)
+        SeLockSubjectContext(SubjectSecurityContext);
+
+    /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */
+    if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED))
+    {
+         PACCESS_TOKEN Token = SubjectSecurityContext->ClientToken ?
+             SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken;
+
+        if (SepTokenIsOwner(Token,
+                            SecurityDescriptor,
+                            FALSE))
+        {
+            if (DesiredAccess & MAXIMUM_ALLOWED)
+                PreviouslyGrantedAccess |= (WRITE_DAC | READ_CONTROL);
+            else
+                PreviouslyGrantedAccess |= (DesiredAccess & (WRITE_DAC | READ_CONTROL));
+
+            DesiredAccess &= ~(WRITE_DAC | READ_CONTROL);
+        }
+    }
+
+    if (DesiredAccess == 0)
+    {
+        *GrantedAccess = PreviouslyGrantedAccess;
+        *AccessStatus = STATUS_SUCCESS;
+        ret = TRUE;
+    }
+    else
+    {
+        /* Call the internal function */
+        ret = SepAccessCheck(SecurityDescriptor,
+                             SubjectSecurityContext,
+                             DesiredAccess,
+                             PreviouslyGrantedAccess,
+                             Privileges,
+                             GenericMapping,
+                             AccessMode,
+                             GrantedAccess,
+                             AccessStatus);
+    }
+
+    /* Release the lock if needed */
+    if (!SubjectContextLocked)
+        SeUnlockSubjectContext(SubjectSecurityContext);
+
+    return ret;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN
+NTAPI
+SeFastTraverseCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+                    IN PACCESS_STATE AccessState,
+                    IN ACCESS_MASK DesiredAccess,
+                    IN KPROCESSOR_MODE AccessMode)
+{
+    PACL Dacl;
+    ULONG AceIndex;
+    PKNOWN_ACE Ace;
+
+    PAGED_CODE();
+
+    NT_ASSERT(AccessMode != KernelMode);
+
+    if (SecurityDescriptor == NULL)
+        return FALSE;
+
+    /* Get DACL */
+    Dacl = SepGetDaclFromDescriptor(SecurityDescriptor);
+    /* If no DACL, grant access */
+    if (Dacl == NULL)
+        return TRUE;
+
+    /* No ACE -> Deny */
+    if (!Dacl->AceCount)
+        return FALSE;
+
+    /* Can't perform the check on restricted token */
+    if (AccessState->Flags & TOKEN_IS_RESTRICTED)
+        return FALSE;
+
+    /* Browse the ACEs */
+    for (AceIndex = 0, Ace = (PKNOWN_ACE)((ULONG_PTR)Dacl + sizeof(ACL));
+         AceIndex < Dacl->AceCount;
+         AceIndex++, Ace = (PKNOWN_ACE)((ULONG_PTR)Ace + Ace->Header.AceSize))
+    {
+        if (Ace->Header.AceFlags & INHERIT_ONLY_ACE)
+            continue;
+
+        /* If access-allowed ACE */
+        if (Ace->Header.AceType & ACCESS_ALLOWED_ACE_TYPE)
+        {
+            /* Check if all accesses are granted */
+            if (!(Ace->Mask & DesiredAccess))
+                continue;
+
+            /* Check SID and grant access if matching */
+            if (RtlEqualSid(SeWorldSid, &(Ace->SidStart)))
+                return TRUE;
+        }
+        /* If access-denied ACE */
+        else if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE)
+        {
+            /* Here, only check if it denies all the access wanted and deny if so */
+            if (Ace->Mask & DesiredAccess)
+                return FALSE;
+        }
+    }
+
+    /* Faulty, deny */
+    return FALSE;
+}
+
+/* SYSTEM CALLS ***************************************************************/
+
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+              IN HANDLE TokenHandle,
+              IN ACCESS_MASK DesiredAccess,
+              IN PGENERIC_MAPPING GenericMapping,
+              OUT PPRIVILEGE_SET PrivilegeSet OPTIONAL,
+              IN OUT PULONG PrivilegeSetLength,
+              OUT PACCESS_MASK GrantedAccess,
+              OUT PNTSTATUS AccessStatus)
+{
+    PSECURITY_DESCRIPTOR CapturedSecurityDescriptor = NULL;
+    SECURITY_SUBJECT_CONTEXT SubjectSecurityContext;
+    KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
+    ACCESS_MASK PreviouslyGrantedAccess = 0;
+    PTOKEN Token;
+    NTSTATUS Status;
+    PAGED_CODE();
+
+    /* Check if this is kernel mode */
+    if (PreviousMode == KernelMode)
+    {
+        /* Check if kernel wants everything */
+        if (DesiredAccess & MAXIMUM_ALLOWED)
+        {
+            /* Give it */
+            *GrantedAccess = GenericMapping->GenericAll;
+            *GrantedAccess |= (DesiredAccess &~ MAXIMUM_ALLOWED);
+        }
+        else
+        {
+            /* Just give the desired access */
+            *GrantedAccess = DesiredAccess;
+        }
+
+        /* Success */
+        *AccessStatus = STATUS_SUCCESS;
+        return STATUS_SUCCESS;
+    }
+
+    /* Protect probe in SEH */
+    _SEH2_TRY
+    {
+        /* Probe all pointers */
+        ProbeForRead(GenericMapping, sizeof(GENERIC_MAPPING), sizeof(ULONG));
+        ProbeForRead(PrivilegeSetLength, sizeof(ULONG), sizeof(ULONG));
+        ProbeForWrite(PrivilegeSet, *PrivilegeSetLength, sizeof(ULONG));
+        ProbeForWrite(GrantedAccess, sizeof(ACCESS_MASK), sizeof(ULONG));
+        ProbeForWrite(AccessStatus, sizeof(NTSTATUS), sizeof(ULONG));
+
+        /* Initialize the privilege set */
+        PrivilegeSet->PrivilegeCount = 0;
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        /* Return the exception code */
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
+    }
+    _SEH2_END;
+
+    /* Check for unmapped access rights */
+    if (DesiredAccess & (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL))
+        return STATUS_GENERIC_NOT_MAPPED;
+
+    /* Reference the token */
+    Status = ObReferenceObjectByHandle(TokenHandle,
+                                       TOKEN_QUERY,
+                                       SeTokenObjectType,
+                                       PreviousMode,
+                                       (PVOID*)&Token,
+                                       NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT("Failed to reference token (Status %lx)\n", Status);
+        return Status;
+    }
+
+    /* Check token type */
+    if (Token->TokenType != TokenImpersonation)
+    {
+        DPRINT("No impersonation token\n");
+        ObDereferenceObject(Token);
+        return STATUS_NO_IMPERSONATION_TOKEN;
+    }
+
+    /* Check the impersonation level */
+    if (Token->ImpersonationLevel < SecurityIdentification)
+    {
+        DPRINT("Impersonation level < SecurityIdentification\n");
+        ObDereferenceObject(Token);
+        return STATUS_BAD_IMPERSONATION_LEVEL;
+    }
+
+    /* Capture the security descriptor */
+    Status = SeCaptureSecurityDescriptor(SecurityDescriptor,
+                                         PreviousMode,
+                                         PagedPool,
+                                         FALSE,
+                                         &CapturedSecurityDescriptor);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT("Failed to capture the Security Descriptor\n");
+        ObDereferenceObject(Token);
+        return Status;
+    }
+
+    /* Check the captured security descriptor */
+    if (CapturedSecurityDescriptor == NULL)
+    {
+        DPRINT("Security Descriptor is NULL\n");
+        ObDereferenceObject(Token);
+        return STATUS_INVALID_SECURITY_DESCR;
+    }
+
+    /* Check security descriptor for valid owner and group */
+    if (SepGetSDOwner(SecurityDescriptor) == NULL ||  // FIXME: use CapturedSecurityDescriptor
+        SepGetSDGroup(SecurityDescriptor) == NULL)    // FIXME: use CapturedSecurityDescriptor
+    {
+        DPRINT("Security Descriptor does not have a valid group or owner\n");
+        SeReleaseSecurityDescriptor(CapturedSecurityDescriptor,
+                                    PreviousMode,
+                                    FALSE);
+        ObDereferenceObject(Token);
+        return STATUS_INVALID_SECURITY_DESCR;
+    }
+
+    /* Set up the subject context, and lock it */
+    SeCaptureSubjectContext(&SubjectSecurityContext);
+
+    /* Lock the token */
+    SepAcquireTokenLockShared(Token);
+
+    /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */
+    if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED))
+    {
+        if (SepTokenIsOwner(Token, SecurityDescriptor, FALSE)) // FIXME: use CapturedSecurityDescriptor
+        {
+            if (DesiredAccess & MAXIMUM_ALLOWED)
+                PreviouslyGrantedAccess |= (WRITE_DAC | READ_CONTROL);
+            else
+                PreviouslyGrantedAccess |= (DesiredAccess & (WRITE_DAC | READ_CONTROL));
+
+            DesiredAccess &= ~(WRITE_DAC | READ_CONTROL);
+        }
+    }
+
+    if (DesiredAccess == 0)
+    {
+        *GrantedAccess = PreviouslyGrantedAccess;
+        *AccessStatus = STATUS_SUCCESS;
+    }
+    else
+    {
+        /* Now perform the access check */
+        SepAccessCheck(SecurityDescriptor, // FIXME: use CapturedSecurityDescriptor
+                       &SubjectSecurityContext,
+                       DesiredAccess,
+                       PreviouslyGrantedAccess,
+                       &PrivilegeSet, //FIXME
+                       GenericMapping,
+                       PreviousMode,
+                       GrantedAccess,
+                       AccessStatus);
+    }
+
+    /* Release subject context and unlock the token */
+    SeReleaseSubjectContext(&SubjectSecurityContext);
+    SepReleaseTokenLock(Token);
+
+    /* Release the captured security descriptor */
+    SeReleaseSecurityDescriptor(CapturedSecurityDescriptor,
+                                PreviousMode,
+                                FALSE);
+
+    /* Dereference the token */
+    ObDereferenceObject(Token);
+
+    /* Check succeeded */
+    return STATUS_SUCCESS;
+}
+
+
+NTSTATUS
+NTAPI
+NtAccessCheckByType(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+                    IN PSID PrincipalSelfSid,
+                    IN HANDLE ClientToken,
+                    IN ACCESS_MASK DesiredAccess,
+                    IN POBJECT_TYPE_LIST ObjectTypeList,
+                    IN ULONG ObjectTypeLength,
+                    IN PGENERIC_MAPPING GenericMapping,
+                    IN PPRIVILEGE_SET PrivilegeSet,
+                    IN OUT PULONG PrivilegeSetLength,
+                    OUT PACCESS_MASK GrantedAccess,
+                    OUT PNTSTATUS AccessStatus)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+NTAPI
+NtAccessCheckByTypeResultList(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+                              IN PSID PrincipalSelfSid,
+                              IN HANDLE ClientToken,
+                              IN ACCESS_MASK DesiredAccess,
+                              IN POBJECT_TYPE_LIST ObjectTypeList,
+                              IN ULONG ObjectTypeLength,
+                              IN PGENERIC_MAPPING GenericMapping,
+                              IN PPRIVILEGE_SET PrivilegeSet,
+                              IN OUT PULONG PrivilegeSetLength,
+                              OUT PACCESS_MASK GrantedAccess,
+                              OUT PNTSTATUS AccessStatus)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
+/* EOF */

Modification de propriÃ©tÃ©s sur ntoskrnl/se/accesschk.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ntoskrnl/kd64/kdapi.c
===================================================================
--- ntoskrnl/kd64/kdapi.c	(rÃ©vision 61927)
+++ ntoskrnl/kd64/kdapi.c	(copie de travail)
@@ -1354,6 +1354,19 @@
                 KdpNotSupported(&ManipulateState);
                 break;
 
+            case 0x315f: // This one is unknown, but used by WinDbg, keep silent!
+
+                /* Setup an empty message, with failure */
+                Data.Length = 0;
+                ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL;
+
+                /* Send it */
+                KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                             &Header,
+                             &Data,
+                             &KdpContext);
+                break;
+
             /* Unsupported Message */
             default:
 
@@ -1739,7 +1752,7 @@
     {
         /* Queue a DPC for the time slip */
         InterlockedIncrement(&KdpTimeSlipPending);
-        KeInsertQueueDpc(&KdpTimeSlipDpc, NULL, NULL);
+        KeInsertQueueDpc(&KdpTimeSlipDpc, NULL, NULL); // FIXME: this can trigger context switches!
     }
 }
 
Index: ntoskrnl/mm/pagefile.c
===================================================================
--- ntoskrnl/mm/pagefile.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/pagefile.c	(copie de travail)
@@ -351,37 +351,6 @@
    MiPagingFileCount = 0;
 }
 
-BOOLEAN
-NTAPI
-MmReserveSwapPages(ULONG Nr)
-{
-   KIRQL oldIrql;
-   ULONG MiAvailSwapPages;
-
-   KeAcquireSpinLock(&PagingFileListLock, &oldIrql);
-   MiAvailSwapPages =
-      (MiFreeSwapPages * MM_PAGEFILE_COMMIT_RATIO) + MM_PAGEFILE_COMMIT_GRACE;
-   MiReservedSwapPages = MiReservedSwapPages + Nr;
-   if ((MM_PAGEFILE_COMMIT_RATIO != 0) && (MiAvailSwapPages < MiReservedSwapPages))
-   {
-      KeReleaseSpinLock(&PagingFileListLock, oldIrql);
-      return(FALSE);
-   }
-   KeReleaseSpinLock(&PagingFileListLock, oldIrql);
-   return(TRUE);
-}
-
-VOID
-NTAPI
-MmDereserveSwapPages(ULONG Nr)
-{
-   KIRQL oldIrql;
-
-   KeAcquireSpinLock(&PagingFileListLock, &oldIrql);
-   MiReservedSwapPages = MiReservedSwapPages - Nr;
-   KeReleaseSpinLock(&PagingFileListLock, oldIrql);
-}
-
 static ULONG
 MiAllocPageFromPagingFile(PPAGINGFILE PagingFile)
 {
@@ -439,13 +408,6 @@
    KeReleaseSpinLock(&PagingFileListLock, oldIrql);
 }
 
-BOOLEAN
-NTAPI
-MmIsAvailableSwapPage(VOID)
-{
-   return(MiFreeSwapPages > 0);
-}
-
 SWAPENTRY
 NTAPI
 MmAllocSwapPage(VOID)
Index: ntoskrnl/mm/freelist.c
===================================================================
--- ntoskrnl/mm/freelist.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/freelist.c	(copie de travail)
@@ -14,21 +14,15 @@
 #define NDEBUG
 #include <debug.h>
 
-#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, MmInitializePageList)
-#endif
-
 #define MODULE_INVOLVED_IN_ARM3
 #include "ARM3/miarm.h"
 
+#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE);
+
 /* GLOBALS ****************************************************************/
 
-// ReactOS to NT Physical Page Descriptor Entry Legacy Mapping Definitions
-#define PHYSICAL_PAGE        MMPFN
-#define PPHYSICAL_PAGE       PMMPFN
+PMMPFN MmPfnDatabase;
 
-PPHYSICAL_PAGE MmPfnDatabase;
-
 PFN_NUMBER MmAvailablePages;
 PFN_NUMBER MmResidentAvailablePages;
 PFN_NUMBER MmResidentAvailableAtInit;
@@ -164,7 +158,7 @@
     PFN_NUMBER PageCount, LowPage, HighPage, SkipPages, PagesFound = 0, Page;
     PPFN_NUMBER MdlPage, LastMdlPage;
     KIRQL OldIrql;
-    PPHYSICAL_PAGE Pfn1;
+    PMMPFN Pfn1;
     INT LookForZeroedPages;
     ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
     DPRINT1("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %lu\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags);
@@ -407,7 +401,7 @@
         ASSERT(MiIsPfnInUse(Pfn1) == TRUE);
 
         /* Set the list head address */
-        MI_GET_ROS_DATA(Pfn1)->RmapListHead = ListHead;
+        Pfn1->RmapListHead = ListHead;
     }
     else
     {
@@ -415,7 +409,7 @@
         ASSERT(MiIsPfnInUse(Pfn1) == TRUE);
 
         /* In this case, the RMAP is actually being removed, so clear field */
-        MI_GET_ROS_DATA(Pfn1)->RmapListHead = NULL;
+        Pfn1->RmapListHead = NULL;
 
         /* ReactOS semantics will now release the page, which will make it free and enter a colored list */
     }
@@ -440,7 +434,7 @@
     ASSERT_IS_ROS_PFN(Pfn1);
 
     /* Get the list head */
-    ListHead = MI_GET_ROS_DATA(Pfn1)->RmapListHead;
+    ListHead = Pfn1->RmapListHead;
 
     /* Should not have an RMAP for a non-active page */
     ASSERT(MiIsPfnInUse(Pfn1) == TRUE);
@@ -455,14 +449,14 @@
 MmSetSavedSwapEntryPage(PFN_NUMBER Pfn,  SWAPENTRY SwapEntry)
 {
    KIRQL oldIrql;
-   PPHYSICAL_PAGE Page;
+   PMMPFN Pfn1;
 
-   Page = MiGetPfnEntry(Pfn);
-   ASSERT(Page);
-   ASSERT_IS_ROS_PFN(Page);
+   Pfn1 = MiGetPfnEntry(Pfn);
+   ASSERT(Pfn1);
+   ASSERT_IS_ROS_PFN(Pfn1);
 
    oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock);
-   MI_GET_ROS_DATA(Page)->SwapEntry = SwapEntry;
+   Pfn1->u1.SwapEntry = SwapEntry;
    KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql);
 }
 
@@ -472,14 +466,14 @@
 {
    SWAPENTRY SwapEntry;
    KIRQL oldIrql;
-   PPHYSICAL_PAGE Page;
+   PMMPFN Pfn1;
 
-   Page = MiGetPfnEntry(Pfn);
-   ASSERT(Page);
-   ASSERT_IS_ROS_PFN(Page);
+   Pfn1 = MiGetPfnEntry(Pfn);
+   ASSERT(Pfn1);
+   ASSERT_IS_ROS_PFN(Pfn1);
 
    oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock);
-   SwapEntry = MI_GET_ROS_DATA(Page)->SwapEntry;
+   SwapEntry = Pfn1->u1.SwapEntry;
    KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql);
 
    return(SwapEntry);
@@ -489,7 +483,7 @@
 NTAPI
 MmReferencePage(PFN_NUMBER Pfn)
 {
-   PPHYSICAL_PAGE Page;
+   PMMPFN Pfn1;
 
    DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT);
 
@@ -497,12 +491,12 @@
    ASSERT(Pfn != 0);
    ASSERT(Pfn <= MmHighestPhysicalPage);
 
-   Page = MiGetPfnEntry(Pfn);
-   ASSERT(Page);
-   ASSERT_IS_ROS_PFN(Page);
+   Pfn1 = MiGetPfnEntry(Pfn);
+   ASSERT(Pfn1);
+   ASSERT_IS_ROS_PFN(Pfn1);
 
-   ASSERT(Page->u3.e2.ReferenceCount != 0);
-   Page->u3.e2.ReferenceCount++;
+   ASSERT(Pfn1->u3.e2.ReferenceCount != 0);
+   Pfn1->u3.e2.ReferenceCount++;
 }
 
 ULONG
@@ -511,16 +505,16 @@
 {
    KIRQL oldIrql;
    ULONG RCount;
-   PPHYSICAL_PAGE Page;
+   PMMPFN Pfn1;
 
    DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT);
 
    oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock);
-   Page = MiGetPfnEntry(Pfn);
-   ASSERT(Page);
-   ASSERT_IS_ROS_PFN(Page);
+   Pfn1 = MiGetPfnEntry(Pfn);
+   ASSERT(Pfn1);
+   ASSERT_IS_ROS_PFN(Pfn1);
 
-   RCount = Page->u3.e2.ReferenceCount;
+   RCount = Pfn1->u3.e2.ReferenceCount;
 
    KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql);
    return(RCount);
@@ -537,24 +531,22 @@
 NTAPI
 MmDereferencePage(PFN_NUMBER Pfn)
 {
-   PPHYSICAL_PAGE Page;
+   PMMPFN Pfn1;
    DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT);
 
-   Page = MiGetPfnEntry(Pfn);
-   ASSERT(Page);
-   ASSERT_IS_ROS_PFN(Page);
+   Pfn1 = MiGetPfnEntry(Pfn);
+   ASSERT(Pfn1);
+   ASSERT_IS_ROS_PFN(Pfn1);
 
-   ASSERT(Page->u3.e2.ReferenceCount != 0);
-   Page->u3.e2.ReferenceCount--;
-   if (Page->u3.e2.ReferenceCount == 0)
+   ASSERT(Pfn1->u3.e2.ReferenceCount != 0);
+   Pfn1->u3.e2.ReferenceCount--;
+   if (Pfn1->u3.e2.ReferenceCount == 0)
    {
         /* Mark the page temporarily as valid, we're going to make it free soon */
-        Page->u3.e1.PageLocation = ActiveAndValid;
+        Pfn1->u3.e1.PageLocation = ActiveAndValid;
 
         /* It's not a ROS PFN anymore */
-        Page->u4.AweAllocation = FALSE;
-        ExFreePoolWithTag(MI_GET_ROS_DATA(Page), 'RsPf');
-        Page->RosMmData = 0;
+        Pfn1->u4.AweAllocation = FALSE;
 
         /* Bring it back into the free list */
         DPRINT("Legacy free: %lx\n", Pfn);
@@ -586,11 +578,8 @@
    Pfn1->u4.AweAllocation = TRUE;
 
    /* Allocate the extra ReactOS Data and zero it out */
-   Pfn1->RosMmData = (LONG)ExAllocatePoolWithTag(NonPagedPool, sizeof(MMROSPFN), 'RsPf');
-   ASSERT(MI_GET_ROS_DATA(Pfn1) != NULL);
-   ASSERT_IS_ROS_PFN(Pfn1);
-   MI_GET_ROS_DATA(Pfn1)->SwapEntry = 0;
-   MI_GET_ROS_DATA(Pfn1)->RmapListHead = NULL;
+   Pfn1->u1.SwapEntry = 0;
+   Pfn1->RmapListHead = NULL;
 
    return PfnOffset;
 }
Index: ntoskrnl/mm/arm/page.c
===================================================================
--- ntoskrnl/mm/arm/page.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/arm/page.c	(copie de travail)
@@ -137,16 +137,6 @@
     return FALSE;
 }
 
-VOID
-NTAPI
-MmUpdatePageDir(IN PEPROCESS Process,
-                IN PVOID Address,
-                IN ULONG Size)
-{
-    /* Nothing to do */
-    return;
-}
-
 PULONG
 NTAPI
 MmGetPageDirectory(VOID)
@@ -309,19 +299,3 @@
     }
 }
 
-/* PUBLIC FUNCTIONS ***********************************************************/
-
-/*
- * @implemented
- */
-PHYSICAL_ADDRESS
-NTAPI
-MmGetPhysicalAddress(IN PVOID Address)
-{
-    PHYSICAL_ADDRESS PhysicalAddress;
-    PhysicalAddress.QuadPart = 0;
-
-    UNIMPLEMENTED_DBGBREAK();
-
-    return PhysicalAddress;
-}
Index: ntoskrnl/mm/arm/stubs.c
===================================================================
--- ntoskrnl/mm/arm/stubs.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/arm/stubs.c	(copie de travail)
@@ -237,58 +237,6 @@
     return Pte;
 }
 
-VOID
-NTAPI
-MmDeletePageTable(IN PEPROCESS Process,
-                  IN PVOID Address)
-{
-    PMMPDE_HARDWARE PointerPde;
-
-    //
-    // Not valid for kernel addresses
-    //
-    DPRINT("MmDeletePageTable(%p, %p)\n", Process, Address);
-    ASSERT(Address < MmSystemRangeStart);
-
-    //
-    // Check if this is for a different process
-    //
-    if ((Process) && (Process != PsGetCurrentProcess()))
-    {
-        //
-        // FIXME-USER: Need to attach to the process
-        //
-        ASSERT(FALSE);
-    }
-
-    //
-    // Get the PDE
-    //
-    PointerPde = MiGetPdeAddress(Address);
-
-    //
-    // On ARM, we use a section mapping for the original low-memory mapping
-    //
-    if ((Address) || (PointerPde->u.Hard.Section.Valid == 0))
-    {
-        //
-        // Make sure it's valid
-        //
-        ASSERT(PointerPde->u.Hard.Coarse.Valid == 1);
-    }
-
-    //
-    // Clear the PDE
-    //
-    PointerPde->u.Hard.AsUlong = 0;
-    ASSERT(PointerPde->u.Hard.Coarse.Valid == 0);
-
-    //
-    // Invalidate the TLB entry
-    //
-    MiFlushTlb((PMMPTE)PointerPde, MiGetPteAddress(Address));
-}
-
 BOOLEAN
 NTAPI
 MmCreateProcessAddressSpace(IN ULONG MinWs,
@@ -367,17 +315,6 @@
     return TRUE;
 }
 
-NTSTATUS
-NTAPI
-Mmi386ReleaseMmInfo(IN PEPROCESS Process)
-{
-    //
-    // FIXME-USER: Need to delete address space
-    //
-    UNIMPLEMENTED_DBGBREAK();
-    return STATUS_NOT_IMPLEMENTED;
-}
-
 PULONG
 NTAPI
 MmGetPageDirectory(VOID)
@@ -388,17 +325,6 @@
     return (PULONG)KeArmTranslationTableRegisterGet().AsUlong;
 }
 
-VOID
-NTAPI
-MmEnableVirtualMapping(IN PEPROCESS Process,
-                       IN PVOID Address)
-{
-    //
-    // TODO
-    //
-    UNIMPLEMENTED_DBGBREAK();
-}
-
 NTSTATUS
 NTAPI
 MmCreateVirtualMappingInternal(IN PEPROCESS Process,
@@ -484,24 +410,6 @@
 
 NTSTATUS
 NTAPI
-MmCreateVirtualMappingForKernel(IN PVOID Address,
-                                IN ULONG Protection,
-                                IN PPFN_NUMBER Pages,
-                                IN ULONG PageCount)
-{
-    //
-    // Call the internal version
-    //
-    return MmCreateVirtualMappingInternal(NULL,
-                                          Address,
-                                          Protection,
-                                          Pages,
-                                          PageCount,
-                                          FALSE);
-}
-
-NTSTATUS
-NTAPI
 MmCreateVirtualMappingUnsafe(IN PEPROCESS Process,
                              IN PVOID Address,
                              IN ULONG Protection,
@@ -774,60 +682,7 @@
     }
 }
 
-VOID
-NTAPI
-MiInitPageDirectoryMap(VOID)
-{
-    MEMORY_AREA* MemoryArea = NULL;
-    PVOID BaseAddress;
-    NTSTATUS Status;
 
-    //
-    // Create memory area for the PTE area
-    //
-    BaseAddress = (PVOID)PTE_BASE;
-    Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                                MEMORY_AREA_OWNED_BY_ARM3,
-                                &BaseAddress,
-                                0x1000000,
-                                PAGE_READWRITE,
-                                &MemoryArea,
-                                TRUE,
-                                0,
-                                PAGE_SIZE);
-    ASSERT(NT_SUCCESS(Status));
-
-    //
-    // Create memory area for the PDE area
-    //
-    BaseAddress = (PVOID)PDE_BASE;
-    Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                                MEMORY_AREA_OWNED_BY_ARM3,
-                                &BaseAddress,
-                                0x100000,
-                                PAGE_READWRITE,
-                                &MemoryArea,
-                                TRUE,
-                                0,
-                                PAGE_SIZE);
-    ASSERT(NT_SUCCESS(Status));
-
-    //
-    // And finally, hyperspace
-    //
-    BaseAddress = (PVOID)HYPER_SPACE;
-    Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                                MEMORY_AREA_OWNED_BY_ARM3,
-                                &BaseAddress,
-                                PAGE_SIZE,
-                                PAGE_READWRITE,
-                                &MemoryArea,
-                                TRUE,
-                                0,
-                                PAGE_SIZE);
-    ASSERT(NT_SUCCESS(Status));
-}
-
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 /*
Index: ntoskrnl/mm/powerpc/page.c
===================================================================
--- ntoskrnl/mm/powerpc/page.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/powerpc/page.c	(copie de travail)
@@ -17,7 +17,6 @@
 
 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory)
-#pragma alloc_text(INIT, MiInitPageDirectoryMap)
 #endif
 
 /* GLOBALS *****************************************************************/
@@ -103,22 +102,6 @@
     return(STATUS_SUCCESS);
 }
 
-NTSTATUS
-NTAPI
-MmInitializeHandBuiltProcess(IN PEPROCESS Process,
-                             IN PLARGE_INTEGER DirectoryTableBase)
-{
-    /* Share the directory base with the idle process */
-    *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase;
-
-    /* Initialize the Addresss Space */
-    MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot);
-
-    /* The process now has an address space */
-    Process->HasAddressSpace = TRUE;
-    return STATUS_SUCCESS;
-}
-
 BOOLEAN
 NTAPI
 MmCreateProcessAddressSpace(IN ULONG MinWs,
@@ -177,20 +160,6 @@
     return (PVOID)info.phys;
 }
 
-/*
- * @implemented
- */
-PHYSICAL_ADDRESS NTAPI
-MmGetPhysicalAddress(PVOID vaddr)
-/*
- * FUNCTION: Returns the physical address corresponding to a virtual address
- */
-{
-    PHYSICAL_ADDRESS Addr;
-    Addr.QuadPart = (ULONG)MmGetPhysicalAddressProcess(PsGetCurrentProcess()->UniqueProcessId, vaddr);
-    return Addr;
-}
-
 PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(PEPROCESS Process,
@@ -274,24 +243,6 @@
     return !!(info.flags & MMU_PAGE_DIRTY);
 }
 
-BOOLEAN
-NTAPI
-MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address)
-{
-    ppc_map_info_t info = { 0 };
-
-    if (Address < MmSystemRangeStart && Process == NULL)
-    {
-        DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n");
-        ASSERT(FALSE);
-    }
-
-    info.proc = Process ? (int)Process->UniqueProcessId : 0;
-    info.addr = (vaddr_t)Address;
-    MmuInqPage(&info, 1);
-    return !!(info.flags /*& MMU_PAGE_ACCESS*/);
-}
-
 VOID
 NTAPI
 MmSetCleanPage(PEPROCESS Process, PVOID Address)
@@ -304,12 +255,6 @@
 {
 }
 
-VOID
-NTAPI
-MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
-{
-}
-
 BOOLEAN
 NTAPI
 MmIsPagePresent(PEPROCESS Process, PVOID Address)
@@ -337,44 +282,6 @@
 
 NTSTATUS
 NTAPI
-MmCreateVirtualMappingForKernel(PVOID Address,
-                                ULONG flProtect,
-                                PPFN_NUMBER Pages,
-                                ULONG PageCount)
-{
-    ULONG i;
-    PVOID Addr;
-
-    DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n",
-           Address, flProtect, Pages, PageCount);
-
-    if (Address < MmSystemRangeStart)
-    {
-        DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n");
-        ASSERT(FALSE);
-    }
-
-    Addr = Address;
-
-    for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE))
-    {
-#if 0
-        if (!(Attributes & PA_PRESENT) && Pages[i] != 0)
-        {
-            DPRINT1("Setting physical address but not allowing access at address "
-                    "0x%.8X with attributes %x/%x.\n",
-                    Addr, Attributes, flProtect);
-            ASSERT(FALSE);
-        }
-        (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes);
-#endif
-    }
-
-    return(STATUS_SUCCESS);
-}
-
-NTSTATUS
-NTAPI
 MmCreatePageFileMapping(PEPROCESS Process,
                         PVOID Address,
                         SWAPENTRY SwapEntry)
@@ -570,23 +477,6 @@
 
 PFN_NUMBER
 NTAPI
-MmChangeHyperspaceMapping(PVOID Address, PFN_NUMBER NewPage)
-{
-    PFN_NUMBER OldPage;
-    ppc_map_info_t info = { 0 };
-
-    info.proc = 0;
-    info.addr = (vaddr_t)Address;
-    MmuUnmapPage(&info, 1);
-    OldPage = info.phys;
-    info.phys = (paddr_t)NewPage;
-    MmuMapPage(&info, 1);
-
-    return NewPage;
-}
-
-PFN_NUMBER
-NTAPI
 MmDeleteHyperspaceMapping(PVOID Address)
 {
     ppc_map_info_t info = { 0 };
@@ -607,26 +497,6 @@
 {
 }
 
-VOID
-INIT_FUNCTION
-NTAPI
-MiInitPageDirectoryMap(VOID)
-{
-}
-
-ULONG
-NTAPI
-MiGetUserPageDirectoryCount(VOID)
-{
-    return 0;
-}
-
-VOID
-NTAPI
-MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size)
-{
-}
-
 /* Create a simple, primitive mapping at the specified address on a new page */
 NTSTATUS MmPPCCreatePrimitiveMapping(ULONG_PTR PageAddr)
 {
Index: ntoskrnl/mm/ARM3/virtual.c
===================================================================
--- ntoskrnl/mm/ARM3/virtual.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/ARM3/virtual.c	(copie de travail)
@@ -2859,7 +2859,259 @@
     return Status;
 }
 
+FORCEINLINE
+BOOLEAN
+MI_IS_LOCKED_VA(
+    PMMPFN Pfn1,
+    ULONG LockType)
+{
+    // HACK until we have proper WSLIST support
+    PMMWSLE Wsle = &Pfn1->Wsle;
+
+    if ((LockType & MAP_PROCESS) && (Wsle->u1.e1.LockedInWs))
+        return TRUE;
+    if ((LockType & MAP_SYSTEM) && (Wsle->u1.e1.LockedInMemory))
+        return TRUE;
+
+    return FALSE;
+}
+
+FORCEINLINE
+VOID
+MI_LOCK_VA(
+    PMMPFN Pfn1,
+    ULONG LockType)
+{
+    // HACK until we have proper WSLIST support
+    PMMWSLE Wsle = &Pfn1->Wsle;
+
+    if (!Wsle->u1.e1.LockedInWs &&
+        !Wsle->u1.e1.LockedInMemory)
+    {
+        MiReferenceProbedPageAndBumpLockCount(Pfn1);
+    }
+
+    if (LockType & MAP_PROCESS)
+        Wsle->u1.e1.LockedInWs = 1;
+    if (LockType & MAP_SYSTEM)
+        Wsle->u1.e1.LockedInMemory = 1;
+}
+
+FORCEINLINE
+VOID
+MI_UNLOCK_VA(
+    PMMPFN Pfn1,
+    ULONG LockType)
+{
+    // HACK until we have proper WSLIST support
+    PMMWSLE Wsle = &Pfn1->Wsle;
+
+    if (LockType & MAP_PROCESS)
+        Wsle->u1.e1.LockedInWs = 0;
+    if (LockType & MAP_SYSTEM)
+        Wsle->u1.e1.LockedInMemory = 0;
+
+    if (!Wsle->u1.e1.LockedInWs &&
+        !Wsle->u1.e1.LockedInMemory)
+    {
+        MiDereferencePfnAndDropLockCount(Pfn1);
+    }
+}
+
+static
 NTSTATUS
+MiCheckVadsForLockOperation(
+    _Inout_ PVOID *BaseAddress,
+    _Inout_ PSIZE_T RegionSize,
+    _Inout_ PVOID *EndAddress)
+
+{
+    PMMVAD Vad;
+    PVOID CurrentVa;
+
+    /* Get the base address and align the start address */
+    *EndAddress = (PUCHAR)*BaseAddress + *RegionSize;
+    *EndAddress = ALIGN_UP_POINTER_BY(*EndAddress, PAGE_SIZE);
+    *BaseAddress = ALIGN_DOWN_POINTER_BY(*BaseAddress, PAGE_SIZE);
+
+    /* First loop and check all VADs */
+    CurrentVa = *BaseAddress;
+    while (CurrentVa < *EndAddress)
+    {
+        /* Get VAD */
+        Vad = MiLocateAddress(CurrentVa);
+        if (Vad == NULL)
+        {
+            /// FIXME: this might be a memory area for a section view...
+            return STATUS_ACCESS_VIOLATION;
+        }
+
+        /* Check VAD type */
+        if ((Vad->u.VadFlags.VadType != VadNone) &&
+            (Vad->u.VadFlags.VadType != VadImageMap) &&
+            (Vad->u.VadFlags.VadType != VadWriteWatch))
+        {
+            *EndAddress = CurrentVa;
+            *RegionSize = (PUCHAR)*EndAddress - (PUCHAR)*BaseAddress;
+            return STATUS_INCOMPATIBLE_FILE_MAP;
+        }
+
+        CurrentVa = (PVOID)((Vad->EndingVpn + 1) << PAGE_SHIFT);
+    }
+
+    *RegionSize = (PUCHAR)*EndAddress - (PUCHAR)*BaseAddress;
+    return STATUS_SUCCESS;
+}
+
+static
+NTSTATUS
+MiLockVirtualMemory(
+    IN OUT PVOID *BaseAddress,
+    IN OUT PSIZE_T RegionSize,
+    IN ULONG MapType)
+{
+    PEPROCESS CurrentProcess;
+    PMMSUPPORT AddressSpace;
+    PVOID CurrentVa, EndAddress;
+    PMMPTE PointerPte, LastPte;
+    PMMPDE PointerPde;
+#if (_MI_PAGING_LEVELS >= 3)
+    PMMPDE PointerPpe;
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+    PMMPDE PointerPxe;
+#endif
+    PMMPFN Pfn1;
+    NTSTATUS Status, TempStatus;
+
+    /* Lock the address space */
+    AddressSpace = MmGetCurrentAddressSpace();
+    MmLockAddressSpace(AddressSpace);
+
+    /* Make sure we still have an address space */
+    CurrentProcess = PsGetCurrentProcess();
+    if (CurrentProcess->VmDeleted)
+    {
+        Status = STATUS_PROCESS_IS_TERMINATING;
+        goto Cleanup;
+    }
+
+    /* Check the VADs in the requested range */
+    Status = MiCheckVadsForLockOperation(BaseAddress, RegionSize, &EndAddress);
+    if (!NT_SUCCESS(Status))
+    {
+        goto Cleanup;
+    }
+
+    /* Enter SEH for probing */
+    _SEH2_TRY
+    {
+        /* Loop all pages and probe them */
+        CurrentVa = *BaseAddress;
+        while (CurrentVa < EndAddress)
+        {
+            (void)(*(volatile CHAR*)CurrentVa);
+            CurrentVa = (PUCHAR)CurrentVa + PAGE_SIZE;
+        }
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+        goto Cleanup;
+    }
+    _SEH2_END;
+
+    /* All pages were accessible, since we hold the address space lock, nothing
+       can be de-committed. Assume success for now. */
+    Status = STATUS_SUCCESS;
+
+    /* Get the PTE and PDE */
+    PointerPte = MiAddressToPte(*BaseAddress);
+    PointerPde = MiAddressToPde(*BaseAddress);
+#if (_MI_PAGING_LEVELS >= 3)
+    PointerPpe = MiAddressToPpe(*BaseAddress);
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+    PointerPxe = MiAddressToPxe(*BaseAddress);
+#endif
+
+    /* Get the last PTE */
+    LastPte = MiAddressToPte((PVOID)((ULONG_PTR)EndAddress - 1));
+
+    /* Lock the process working set */
+    MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread());
+
+    /* Loop the pages */
+    do
+    {
+        /* Check for a page that is not accessible */
+        while (
+#if (_MI_PAGING_LEVELS == 4)
+               (PointerPxe->u.Hard.Valid == 0) ||
+#endif
+#if (_MI_PAGING_LEVELS >= 3)
+               (PointerPpe->u.Hard.Valid == 0) ||
+#endif
+               (PointerPde->u.Hard.Valid == 0) ||
+               (PointerPte->u.Hard.Valid == 0))
+        {
+            /* Release process working set */
+            MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread());
+
+            /* Access the page */
+            CurrentVa = MiPteToAddress(PointerPte);
+
+            //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked
+            TempStatus = MmAccessFault(TRUE, CurrentVa, KernelMode, (PVOID)0xBADBADA3);
+            if (!NT_SUCCESS(TempStatus))
+            {
+                // This should only happen, when remote backing storage is not accessible
+                ASSERT(FALSE);
+                Status = TempStatus;
+                goto Cleanup;
+            }
+
+            /* Lock the process working set */
+            MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread());
+        }
+
+        /* Get the PFN */
+        Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte));
+        ASSERT(Pfn1 != NULL);
+
+        /* Check the previous lock status */
+        if (MI_IS_LOCKED_VA(Pfn1, MapType))
+        {
+            Status = STATUS_WAS_LOCKED;
+        }
+
+        /* Lock it */
+        MI_LOCK_VA(Pfn1, MapType);
+
+        /* Go to the next PTE */
+        PointerPte++;
+
+        /* Check if we're on a PDE boundary */
+        if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++;
+#if (_MI_PAGING_LEVELS >= 3)
+        if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++;
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+        if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++;
+#endif
+    } while (PointerPte <= LastPte);
+
+    /* Release process working set */
+    MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread());
+
+Cleanup:
+    /* Unlock address space */
+    MmUnlockAddressSpace(AddressSpace);
+
+    return Status;
+}
+
+NTSTATUS
 NTAPI
 NtLockVirtualMemory(IN HANDLE ProcessHandle,
                     IN OUT PVOID *BaseAddress,
@@ -2987,9 +3239,11 @@
     }
 
     //
-    // Oops :(
+    // Call the internal function
     //
-    UNIMPLEMENTED;
+    Status = MiLockVirtualMemory(&CapturedBaseAddress,
+                                 &CapturedBytesToLock,
+                                 MapType);
 
     //
     // Detach if needed
@@ -3010,7 +3264,7 @@
         // Return data to user
         //
         *BaseAddress = CapturedBaseAddress;
-        *NumberOfBytesToLock = 0;
+        *NumberOfBytesToLock = CapturedBytesToLock;
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -3024,10 +3278,176 @@
     //
     // Return status
     //
-    return STATUS_SUCCESS;
+    return Status;
 }
 
+
+static
 NTSTATUS
+MiUnlockVirtualMemory(
+    IN OUT PVOID *BaseAddress,
+    IN OUT PSIZE_T RegionSize,
+    IN ULONG MapType)
+{
+    PEPROCESS CurrentProcess;
+    PMMSUPPORT AddressSpace;
+    PVOID EndAddress;
+    PMMPTE PointerPte, LastPte;
+    PMMPDE PointerPde;
+#if (_MI_PAGING_LEVELS >= 3)
+    PMMPDE PointerPpe;
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+    PMMPDE PointerPxe;
+#endif
+    PMMPFN Pfn1;
+    NTSTATUS Status;
+
+    /* Lock the address space */
+    AddressSpace = MmGetCurrentAddressSpace();
+    MmLockAddressSpace(AddressSpace);
+
+    /* Make sure we still have an address space */
+    CurrentProcess = PsGetCurrentProcess();
+    if (CurrentProcess->VmDeleted)
+    {
+        Status = STATUS_PROCESS_IS_TERMINATING;
+        goto Cleanup;
+    }
+
+    /* Check the VADs in the requested range */
+    Status = MiCheckVadsForLockOperation(BaseAddress, RegionSize, &EndAddress);
+
+    /* Note: only bail out, if we hit an area without a VAD. If we hit an
+       incompatible VAD we continue, like Windows does */
+    if (Status == STATUS_ACCESS_VIOLATION)
+    {
+        Status = STATUS_NOT_LOCKED;
+        goto Cleanup;
+    }
+
+    /* Get the PTE and PDE */
+    PointerPte = MiAddressToPte(*BaseAddress);
+    PointerPde = MiAddressToPde(*BaseAddress);
+#if (_MI_PAGING_LEVELS >= 3)
+    PointerPpe = MiAddressToPpe(*BaseAddress);
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+    PointerPxe = MiAddressToPxe(*BaseAddress);
+#endif
+
+    /* Get the last PTE */
+    LastPte = MiAddressToPte((PVOID)((ULONG_PTR)EndAddress - 1));
+
+    /* Lock the process working set */
+    MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread());
+
+    /* Loop the pages */
+    do
+    {
+        /* Check for a page that is not present */
+        if (
+#if (_MI_PAGING_LEVELS == 4)
+               (PointerPxe->u.Hard.Valid == 0) ||
+#endif
+#if (_MI_PAGING_LEVELS >= 3)
+               (PointerPpe->u.Hard.Valid == 0) ||
+#endif
+               (PointerPde->u.Hard.Valid == 0) ||
+               (PointerPte->u.Hard.Valid == 0))
+        {
+            /* Remember it, but keep going */
+            Status = STATUS_NOT_LOCKED;
+        }
+        else
+        {
+            /* Get the PFN */
+            Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte));
+            ASSERT(Pfn1 != NULL);
+
+            /* Check if all of the requested locks are present */
+            if (((MapType & MAP_SYSTEM) && !MI_IS_LOCKED_VA(Pfn1, MAP_SYSTEM)) ||
+                ((MapType & MAP_PROCESS) && !MI_IS_LOCKED_VA(Pfn1, MAP_PROCESS)))
+            {
+                /* Remember it, but keep going */
+                Status = STATUS_NOT_LOCKED;
+
+                /* Check if no lock is present */
+                if (!MI_IS_LOCKED_VA(Pfn1, MAP_PROCESS | MAP_SYSTEM))
+                {
+                    DPRINT1("FIXME: Should remove the page from WS\n");
+                }
+            }
+        }
+
+        /* Go to the next PTE */
+        PointerPte++;
+
+        /* Check if we're on a PDE boundary */
+        if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++;
+#if (_MI_PAGING_LEVELS >= 3)
+        if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++;
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+        if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++;
+#endif
+    } while (PointerPte <= LastPte);
+
+    /* Check if we hit a page that was not locked */
+    if (Status == STATUS_NOT_LOCKED)
+    {
+        goto CleanupWithWsLock;
+    }
+
+    /* All pages in the region were locked, so unlock them all */
+
+    /* Get the PTE and PDE */
+    PointerPte = MiAddressToPte(*BaseAddress);
+    PointerPde = MiAddressToPde(*BaseAddress);
+#if (_MI_PAGING_LEVELS >= 3)
+    PointerPpe = MiAddressToPpe(*BaseAddress);
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+    PointerPxe = MiAddressToPxe(*BaseAddress);
+#endif
+
+    /* Loop the pages */
+    do
+    {
+        /* Unlock it */
+        Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte));
+        MI_UNLOCK_VA(Pfn1, MapType);
+
+        /* Go to the next PTE */
+        PointerPte++;
+
+        /* Check if we're on a PDE boundary */
+        if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++;
+#if (_MI_PAGING_LEVELS >= 3)
+        if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++;
+#endif
+#if (_MI_PAGING_LEVELS == 4)
+        if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++;
+#endif
+    } while (PointerPte <= LastPte);
+
+    /* Everything is done */
+    Status = STATUS_SUCCESS;
+
+CleanupWithWsLock:
+
+    /* Release process working set */
+    MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread());
+
+Cleanup:
+    /* Unlock address space */
+    MmUnlockAddressSpace(AddressSpace);
+
+    return Status;
+}
+
+
+NTSTATUS
 NTAPI
 NtUnlockVirtualMemory(IN HANDLE ProcessHandle,
                       IN OUT PVOID *BaseAddress,
@@ -3155,9 +3575,11 @@
     }
 
     //
-    // Oops :(
+    // Call the internal function
     //
-    UNIMPLEMENTED;
+    Status = MiUnlockVirtualMemory(&CapturedBaseAddress,
+                                   &CapturedBytesToUnlock,
+                                   MapType);
 
     //
     // Detach if needed
@@ -3177,8 +3599,8 @@
         //
         // Return data to user
         //
-        *BaseAddress = PAGE_ALIGN(CapturedBaseAddress);
-        *NumberOfBytesToUnlock = 0;
+        *BaseAddress = CapturedBaseAddress;
+        *NumberOfBytesToUnlock = CapturedBytesToUnlock;
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -4414,7 +4836,7 @@
     PMEMORY_AREA MemoryArea;
     SIZE_T PRegionSize;
     PVOID PBaseAddress;
-    ULONG_PTR CommitReduction = 0;
+    LONG_PTR CommitReduction = 0;
     ULONG_PTR StartingAddress, EndingAddress;
     PMMVAD Vad;
     NTSTATUS Status;
@@ -4861,7 +5283,7 @@
         if (TempPde.u.Hard.LargePage)
         {
             /* Physical address is base page + large page offset */
-            PhysicalAddress.QuadPart = TempPde.u.Hard.PageFrameNumber << PAGE_SHIFT;
+            PhysicalAddress.QuadPart = (ULONG64)TempPde.u.Hard.PageFrameNumber << PAGE_SHIFT;
             PhysicalAddress.QuadPart += ((ULONG_PTR)Address & (PAGE_SIZE * PTE_PER_PAGE - 1));
             return PhysicalAddress;
         }
@@ -4871,12 +5293,13 @@
         if (TempPte.u.Hard.Valid)
         {
             /* Physical address is base page + page offset */
-            PhysicalAddress.QuadPart = TempPte.u.Hard.PageFrameNumber << PAGE_SHIFT;
+            PhysicalAddress.QuadPart = (ULONG64)TempPte.u.Hard.PageFrameNumber << PAGE_SHIFT;
             PhysicalAddress.QuadPart += ((ULONG_PTR)Address & (PAGE_SIZE - 1));
             return PhysicalAddress;
         }
     }
 
+    KeRosDumpStackFrames(NULL, 20);
     DPRINT1("MM:MmGetPhysicalAddressFailed base address was %p\n", Address);
     PhysicalAddress.QuadPart = 0;
     return PhysicalAddress;
Index: ntoskrnl/mm/ARM3/mmsup.c
===================================================================
--- ntoskrnl/mm/ARM3/mmsup.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/ARM3/mmsup.c	(copie de travail)
@@ -15,6 +15,12 @@
 #define MODULE_INVOLVED_IN_ARM3
 #include "../ARM3/miarm.h"
 
+/* GLOBALS ********************************************************************/
+
+SIZE_T MmMinimumWorkingSetSize;
+SIZE_T MmMaximumWorkingSetSize;
+SIZE_T MmPagesAboveWsMinimum;
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 /*
@@ -40,8 +46,111 @@
                        IN ULONG SystemCache,
                        IN BOOLEAN IncreaseOkay)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    SIZE_T MinimumWorkingSetSize, MaximumWorkingSetSize;
+    SSIZE_T Delta;
+    PMMSUPPORT Ws;
+    NTSTATUS Status;
+
+    /* Check for special case: empty the working set */
+    if ((WorkingSetMinimumInBytes == -1) &&
+        (WorkingSetMaximumInBytes == -1))
+    {
+        UNIMPLEMENTED;
+        return STATUS_NOT_IMPLEMENTED;
+    }
+
+    /* Assume success */
+    Status = STATUS_SUCCESS;
+
+    /* Get the working set and lock it */
+    Ws = &PsGetCurrentProcess()->Vm;
+    MiLockWorkingSet(PsGetCurrentThread(), Ws);
+
+    /* Calculate the actual minimum and maximum working set size to set */
+    MinimumWorkingSetSize = (WorkingSetMinimumInBytes != 0) ?
+        (WorkingSetMinimumInBytes / PAGE_SIZE) : Ws->MinimumWorkingSetSize;
+    MaximumWorkingSetSize = (WorkingSetMaximumInBytes != 0) ?
+        (WorkingSetMaximumInBytes / PAGE_SIZE) : Ws->MaximumWorkingSetSize;
+
+    /* Check if the new maximum exceeds the global maximum */
+    if (MaximumWorkingSetSize > MmMaximumWorkingSetSize)
+    {
+        MaximumWorkingSetSize = MmMaximumWorkingSetSize;
+        Status = STATUS_WORKING_SET_LIMIT_RANGE;
+    }
+
+    /* Check if the new minimum is below the global minimum */
+    if (MinimumWorkingSetSize < MmMinimumWorkingSetSize)
+    {
+        MinimumWorkingSetSize = MmMinimumWorkingSetSize;
+        Status = STATUS_WORKING_SET_LIMIT_RANGE;
+    }
+
+    /* Check if the new minimum exceeds the new maximum */
+    if (MinimumWorkingSetSize > MaximumWorkingSetSize)
+    {
+        DPRINT1("MinimumWorkingSetSize > MaximumWorkingSetSize\n");
+        Status = STATUS_BAD_WORKING_SET_LIMIT;
+        goto Cleanup;
+    }
+
+    /* Calculate the minimum WS size adjustment and check if we increase */
+    Delta = MinimumWorkingSetSize - Ws->MinimumWorkingSetSize;
+    if (Delta > 0)
+    {
+        /* Is increasing ok? */
+        if (!IncreaseOkay)
+        {
+            DPRINT1("Privilege for WS size increase not held\n");
+            Status = STATUS_PRIVILEGE_NOT_HELD;
+            goto Cleanup;
+        }
+
+        /* Check if the number of available pages is large enough */
+        if (((SIZE_T)Delta / 1024) > (MmAvailablePages - 128))
+        {
+            DPRINT1("Not enough available pages\n");
+            Status = STATUS_INSUFFICIENT_RESOURCES;
+            goto Cleanup;
+        }
+
+        /* Check if there are enough resident available pages */
+        if ((SIZE_T)Delta >
+            (MmResidentAvailablePages - MmSystemLockPagesCount - 256))
+        {
+            DPRINT1("Not enough resident pages\n");
+            Status = STATUS_INSUFFICIENT_RESOURCES;
+            goto Cleanup;
+        }
+    }
+
+    /* Update resident available pages */
+    if (Delta != 0)
+    {
+        InterlockedExchangeAddSizeT(&MmResidentAvailablePages, -Delta);
+    }
+
+    /* Calculate new pages above minimum WS size */
+    Delta += max((SSIZE_T)Ws->WorkingSetSize - MinimumWorkingSetSize, 0);
+
+    /* Subtract old pages above minimum WS size */
+    Delta -= max((SSIZE_T)Ws->WorkingSetSize - Ws->MinimumWorkingSetSize, 0);
+
+    /* If it changed, add it to the global variable */
+    if (Delta != 0)
+    {
+        InterlockedExchangeAddSizeT(&MmPagesAboveWsMinimum, Delta);
+    }
+
+    /* Set the new working set size */
+    Ws->MinimumWorkingSetSize = MinimumWorkingSetSize;
+    Ws->MaximumWorkingSetSize = MaximumWorkingSetSize;
+
+Cleanup:
+
+    /* Unlock the working set and return the status */
+    MiUnlockWorkingSet(PsGetCurrentThread(), Ws);
+    return Status;
 }
 
 /*
Index: ntoskrnl/mm/ARM3/section.c
===================================================================
--- ntoskrnl/mm/ARM3/section.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/ARM3/section.c	(copie de travail)
@@ -2118,7 +2118,7 @@
                    IN PCONTROL_AREA ControlArea,
                    IN PMMSUPPORT Ws)
 {
-    PMMPTE PointerPte;//, FirstPte;
+    PMMPTE PointerPte, ProtoPte;//, FirstPte;
     PMMPDE PointerPde, SystemMapPde;
     PMMPFN Pfn1, Pfn2;
     MMPTE PteContents;
@@ -2125,6 +2125,8 @@
     KIRQL OldIrql;
     DPRINT("Removing mapped view at: 0x%p\n", BaseAddress);
 
+    ASSERT(Ws == NULL);
+
     /* Get the PTE and loop each one */
     PointerPte = MiAddressToPte(BaseAddress);
     //FirstPte = PointerPte;
@@ -2175,8 +2177,15 @@
             /* Windows ASSERT */
             ASSERT((PteContents.u.Long == 0) || (PteContents.u.Soft.Prototype == 1));
 
-            /* But not handled in ARM3 */
-            ASSERT(PteContents.u.Soft.Prototype == 0);
+            /* Check if this is a prototype pointer PTE */
+            if (PteContents.u.Soft.Prototype == 1)
+            {
+                /* Get the prototype PTE */
+                ProtoPte = MiProtoPteToPte(&PteContents);
+
+                /* We don't support anything else atm */
+                ASSERT(ProtoPte->u.Long == 0);
+            }
         }
 
         /* Make the PTE into a zero PTE */
Index: ntoskrnl/mm/ARM3/expool.c
===================================================================
--- ntoskrnl/mm/ARM3/expool.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/ARM3/expool.c	(copie de travail)
@@ -1336,7 +1336,7 @@
             InterlockedIncrementUL(&ExpPoolBigEntriesInUse);
             if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize / 4)))
             {
-                DPRINT1("Should attempt expansion since we now have %lu entries\n",
+                DPRINT("Should attempt expansion since we now have %lu entries\n",
                         ExpPoolBigEntriesInUse);
             }
 
Index: ntoskrnl/mm/ARM3/miarm.h
===================================================================
--- ntoskrnl/mm/ARM3/miarm.h	(rÃ©vision 61927)
+++ ntoskrnl/mm/ARM3/miarm.h	(copie de travail)
@@ -1121,24 +1121,8 @@
     return FALSE;
 }
 
-#ifdef _WIN64
-// HACK ON TOP OF HACK ALERT!!!
-#define MI_GET_ROS_DATA(x) \
-    (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \
-                                    ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL))))
-#else
-#define MI_GET_ROS_DATA(x)   ((PMMROSPFN)(x->RosMmData))
-#endif
-#define MI_IS_ROS_PFN(x)     (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL))
-#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE);
-typedef struct _MMROSPFN
-{
-    PMM_RMAP_ENTRY RmapListHead;
-    SWAPENTRY SwapEntry;
-} MMROSPFN, *PMMROSPFN;
+#define MI_IS_ROS_PFN(x)     ((x)->u4.AweAllocation == TRUE)
 
-#define RosMmData            AweReferenceCount
-
 VOID
 NTAPI
 MiDecrementReferenceCount(
Index: ntoskrnl/mm/ARM3/sysldr.c
===================================================================
--- ntoskrnl/mm/ARM3/sysldr.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/ARM3/sysldr.c	(copie de travail)
@@ -1896,8 +1896,8 @@
         }
         else
         {
-            /* No referencing needed */
-            LdrEntry->LoadCount = 0;
+            /* Add a reference for all other modules as well */
+            LdrEntry->LoadCount = 1;
         }
 
         /* Remember this came from the loader */
Index: ntoskrnl/mm/marea.c
===================================================================
--- ntoskrnl/mm/marea.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/marea.c	(copie de travail)
@@ -1205,7 +1205,7 @@
 
    MmUnlockAddressSpace(&Process->Vm);
 
-   DPRINT("Finished MmReleaseMmInfo()\n");
+   DPRINT("Finished MmDeleteProcessAddressSpace()\n");
    MmDeleteProcessAddressSpace2(Process);
    return(STATUS_SUCCESS);
 }
Index: ntoskrnl/mm/i386/page.c
===================================================================
--- ntoskrnl/mm/i386/page.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/i386/page.c	(copie de travail)
@@ -16,7 +16,6 @@
 
 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory)
-#pragma alloc_text(INIT, MiInitPageDirectoryMap)
 #endif
 
 
@@ -40,23 +39,11 @@
 #define PA_ACCESSED  (1 << PA_BIT_ACCESSED)
 #define PA_GLOBAL    (1 << PA_BIT_GLOBAL)
 
-#define HYPERSPACE          (0xc0400000)
-#define IS_HYPERSPACE(v)    (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < HYPERSPACE + 0x400000))
+#define IS_HYPERSPACE(v)    (((ULONG)(v) >= HYPER_SPACE && (ULONG)(v) <= HYPER_SPACE_END))
 
 #define PTE_TO_PFN(X)  ((X) >> PAGE_SHIFT)
 #define PFN_TO_PTE(X)  ((X) << PAGE_SHIFT)
 
-#if defined(__GNUC__)
-#define PTE_TO_PAGE(X) ((LARGE_INTEGER)(LONGLONG)(PAGE_MASK(X)))
-#else
-__inline LARGE_INTEGER PTE_TO_PAGE(ULONG npage)
-{
-    LARGE_INTEGER dummy;
-    dummy.QuadPart = (LONGLONG)(PAGE_MASK(npage));
-    return dummy;
-}
-#endif
-
 const
 ULONG
 MmProtectToPteMask[32] =
@@ -604,35 +591,6 @@
     }
 }
 
-VOID
-NTAPI
-MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
-{
-    PULONG Pt;
-    ULONG Pte;
-
-    Pt = MmGetPageTableForProcess(Process, Address, FALSE);
-    if (Pt == NULL)
-    {
-        //HACK to get DPH working, waiting for MM rewrite :-/
-        //KeBugCheck(MEMORY_MANAGEMENT);
-        return;
-    }
-
-    /* Do not mark a 0 page as present */
-    if(0 == InterlockedCompareExchangePte(Pt, 0, 0))
-        return;
-
-    do
-    {
-        Pte = *Pt;
-    } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_PRESENT, Pte));
-
-    /* We don't need to flush the TLB here because it
-     * won't cache translations for non-present pages */
-    MmUnmapPageTable(Pt);
-}
-
 BOOLEAN
 NTAPI
 MmIsPagePresent(PEPROCESS Process, PVOID Address)
Index: ntoskrnl/mm/i386/pagepae.c
===================================================================
--- ntoskrnl/mm/i386/pagepae.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/i386/pagepae.c	(copie de travail)
@@ -15,7 +15,6 @@
 
 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory)
-#pragma alloc_text(INIT, MiInitPageDirectoryMap)
 #endif
 
 
@@ -56,17 +55,6 @@
 #define PAE_PTE_TO_PFN(X)   (PAE_PAGE_MASK(X) >> PAGE_SHIFT)
 #define PAE_PFN_TO_PTE(X)   ((X) << PAGE_SHIFT)
 
-#if defined(__GNUC__)
-#define PTE_TO_PAGE(X) ((LARGE_INTEGER)(LONGLONG)(PAGE_MASK(X)))
-#else
-__inline LARGE_INTEGER PTE_TO_PAGE(ULONG npage)
-{
-   LARGE_INTEGER dummy;
-   dummy.QuadPart = (LONGLONG)(PAGE_MASK(npage));
-   return dummy;
-}
-#endif
-
 extern BOOLEAN Ke386Pae;
 extern BOOLEAN Ke386NoExecute;
 
@@ -197,149 +185,6 @@
 
 #define PAE_ADDR_TO_PTE_OFFSET(v)   ((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE)
 
-
-NTSTATUS
-NTAPI
-Mmi386ReleaseMmInfo(PEPROCESS Process)
-{
-   PUSHORT LdtDescriptor;
-   ULONG LdtBase;
-   ULONG i, j;
-
-   DPRINT("Mmi386ReleaseMmInfo(Process %x)\n",Process);
-
-   LdtDescriptor = (PUSHORT) &Process->Pcb.LdtDescriptor;
-   LdtBase = LdtDescriptor[1] |
-             ((LdtDescriptor[2] & 0xff) << 16) |
-             ((LdtDescriptor[3] & ~0xff) << 16);
-
-   DPRINT("LdtBase: %x\n", LdtBase);
-
-   if (LdtBase)
-   {
-      ExFreePool((PVOID) LdtBase);
-   }
-
-   if (Ke386Pae)
-   {
-      PULONGLONG PageDirTable;
-      PULONGLONG PageDir;
-      PULONGLONG Pde;
-      ULONG k;
-
-      PageDirTable = (PULONGLONG)MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart));
-      for (i = 0; i < 4; i++)
-      {
-         PageDir = (PULONGLONG)MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(PageDirTable[i]));
-         if (i < PAE_ADDR_TO_PDTE_OFFSET(MmSystemRangeStart))
-         {
-            for (j = 0; j < 512; j++)
-            {
-               if (PageDir[j] != 0LL)
-               {
-                  DPRINT1("ProcessId %d, Pde for %08x - %08x is not freed, RefCount %d\n",
-                          Process->UniqueProcessId,
-                          (i * 512 + j) * 512 * PAGE_SIZE, (i * 512 + j + 1) * 512 * PAGE_SIZE - 1,
-                          ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable[i*512 + j]);
-                  Pde = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(PageDir[j]));
-                  for (k = 0; k < 512; k++)
-                  {
-                     if(Pde[k] != 0)
-                     {
-                        if (Pde[k] & PA_PRESENT)
-                        {
-                           DPRINT1("Page at %08x is not freed\n",
-                                   (i * 512 + j) * 512 * PAGE_SIZE + k * PAGE_SIZE);
-                        }
-                        else
-                        {
-                           DPRINT1("Swapentry %x at %x is not freed\n",
-                                   (i * 512 + j) * 512 * PAGE_SIZE + k * PAGE_SIZE);
-                        }
-                     }
-                  }
-                  MmDeleteHyperspaceMapping(Pde);
-                  MmReleasePageMemoryConsumer(MC_NPPOOL, PAE_PTE_TO_PFN(PageDir[j]));
-               }
-            }
-         }
-         if (i == PAE_ADDR_TO_PDTE_OFFSET(HYPERSPACE))
-         {
-            MmReleasePageMemoryConsumer(MC_NPPOOL, PAE_PTE_TO_PFN(PageDir[PAE_ADDR_TO_PDE_PAGE_OFFSET(HYPERSPACE)]));
-            MmReleasePageMemoryConsumer(MC_NPPOOL, PAE_PTE_TO_PFN(PageDir[PAE_ADDR_TO_PDE_PAGE_OFFSET(HYPERSPACE)+1]));
-         }
-         MmDeleteHyperspaceMapping(PageDir);
-         MmReleasePageMemoryConsumer(MC_NPPOOL, PAE_PTE_TO_PFN(PageDirTable[i]));
-      }
-      MmDeleteHyperspaceMapping((PVOID)PageDirTable);
-      MmReleasePageMemoryConsumer(MC_NPPOOL, PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart));
-   }
-   else
-   {
-      PULONG Pde;
-      PULONG PageDir;
-      PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart));
-      for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++)
-      {
-         if (PageDir[i] != 0)
-         {
-            DPRINT1("Pde for %08x - %08x is not freed, RefCount %d\n",
-                    i * 4 * 1024 * 1024, (i + 1) * 4 * 1024 * 1024 - 1,
-                    ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable[i]);
-            Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(PageDir[i]));
-            for (j = 0; j < 1024; j++)
-            {
-               if(Pde[j] != 0)
-               {
-                  if (Pde[j] & PA_PRESENT)
-                  {
-                     DPRINT1("Page at %08x is not freed\n",
-                             i * 4 * 1024 * 1024 + j * PAGE_SIZE);
-                  }
-                  else
-                  {
-                     DPRINT1("Swapentry %x at %x is not freed\n",
-                             Pde[j], i * 4 * 1024 * 1024 + j * PAGE_SIZE);
-                  }
-               }
-            }
-            MmDeleteHyperspaceMapping(Pde);
-            MmReleasePageMemoryConsumer(MC_NPPOOL, PTE_TO_PFN(PageDir[i]));
-         }
-      }
-      MmReleasePageMemoryConsumer(MC_NPPOOL, PTE_TO_PFN(PageDir[ADDR_TO_PDE_OFFSET(HYPERSPACE)]));
-      MmDeleteHyperspaceMapping(PageDir);
-      MmReleasePageMemoryConsumer(MC_NPPOOL, PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart));
-   }
-
-#if defined(__GNUC__)
-
-   Process->Pcb.DirectoryTableBase.QuadPart = 0LL;
-#else
-
-   Process->Pcb.DirectoryTableBase.QuadPart = 0;
-#endif
-
-   DPRINT("Finished Mmi386ReleaseMmInfo()\n");
-   return(STATUS_SUCCESS);
-}
-
-NTSTATUS
-NTAPI
-MmInitializeHandBuiltProcess(IN PEPROCESS Process,
-                             IN PLARGE_INTEGER DirectoryTableBase)
-{
-    /* Share the directory base with the idle process */
-    *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase;
-
-    /* Initialize the Addresss Space */
-    MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot);
-
-    /* The process now has an address space */
-    Process->HasAddressSpace = TRUE;
-    return STATUS_SUCCESS;
-}
-
 BOOLEAN
 NTAPI
 MmCreateProcessAddressSpace(IN ULONG MinWs,
@@ -422,39 +267,6 @@
 
 VOID
 NTAPI
-MmDeletePageTable(PEPROCESS Process, PVOID Address)
-{
-   PEPROCESS CurrentProcess = PsGetCurrentProcess();
-
-   if (Process != NULL && Process != CurrentProcess)
-   {
-      KeAttachProcess(&Process->Pcb);
-   }
-
-   if (Ke386Pae)
-   {
-      ULONGLONG ZeroPde = 0LL;
-      (void)ExfpInterlockedExchange64UL(PAE_ADDR_TO_PDE(Address), &ZeroPde);
-      MiFlushTlb((PULONG)PAE_ADDR_TO_PDE(Address), PAE_ADDR_TO_PTE(Address));
-   }
-   else
-   {
-      *(ADDR_TO_PDE(Address)) = 0;
-      MiFlushTlb(ADDR_TO_PDE(Address), ADDR_TO_PTE(Address));
-   }
-   if (Address >= MmSystemRangeStart)
-   {
-      ASSERT(FALSE);
-      //       MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0;
-   }
-   if (Process != NULL && Process != CurrentProcess)
-   {
-      KeDetachProcess();
-   }
-}
-
-VOID
-NTAPI
 MmFreePageTable(PEPROCESS Process, PVOID Address)
 {
    PEPROCESS CurrentProcess = PsGetCurrentProcess();
@@ -1105,73 +917,6 @@
    }
 }
 
-BOOLEAN
-NTAPI
-MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address)
-{
-   if (Address < MmSystemRangeStart && Process == NULL)
-   {
-      DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n");
-      ASSERT(FALSE);
-   }
-   if (Ke386Pae)
-   {
-      PULONGLONG Pt;
-      ULONGLONG Pte;
-      ULONGLONG tmpPte;
-
-      Pt = MmGetPageTableForProcessForPAE(Process, Address, FALSE);
-      if (Pt == NULL)
-      {
-         ASSERT(FALSE);
-      }
-
-      do
-      {
-         Pte = *Pt;
-         tmpPte = Pte & ~PA_ACCESSED;
-      } while (Pte != ExfInterlockedCompareExchange64UL(Pt, &tmpPte, &Pte));
-
-      if (Pte & PA_ACCESSED)
-      {
-         MiFlushTlb((PULONG)Pt, Address);
-         return TRUE;
-      }
-      else
-      {
-         MmUnmapPageTable((PULONG)Pt);
-         return FALSE;
-      }
-   }
-   else
-   {
-      PULONG Pt;
-      ULONG Pte;
-
-      Pt = MmGetPageTableForProcess(Process, Address, FALSE);
-      if (Pt == NULL)
-      {
-         ASSERT(FALSE);
-      }
-
-      do
-      {
-         Pte = *Pt;
-      } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte));
-
-      if (Pte & PA_ACCESSED)
-      {
-         MiFlushTlb(Pt, Address);
-         return TRUE;
-      }
-      else
-      {
-         MmUnmapPageTable(Pt);
-         return FALSE;
-      }
-   }
-}
-
 VOID
 NTAPI
 MmSetCleanPage(PEPROCESS Process, PVOID Address)
@@ -1298,62 +1043,6 @@
    }
 }
 
-VOID
-NTAPI
-MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
-{
-   if (Ke386Pae)
-   {
-      PULONGLONG Pt;
-      ULONGLONG Pte;
-      ULONGLONG tmpPte;
-
-      Pt = MmGetPageTableForProcessForPAE(Process, Address, FALSE);
-      if (Pt == NULL)
-      {
-         ASSERT(FALSE);
-      }
-
-      do
-      {
-         Pte = *Pt;
-         tmpPte = Pte | PA_PRESENT;
-      } while (Pte != ExfInterlockedCompareExchange64UL(Pt, &tmpPte, &Pte));
-      if (!(Pte & PA_PRESENT))
-      {
-         MiFlushTlb((PULONG)Pt, Address);
-      }
-      else
-      {
-         MmUnmapPageTable((PULONG)Pt);
-      }
-   }
-   else
-   {
-      PULONG Pt;
-      ULONG Pte;
-
-      Pt = MmGetPageTableForProcess(Process, Address, FALSE);
-      if (Pt == NULL)
-      {
-         ASSERT(FALSE);
-      }
-
-      do
-      {
-         Pte = *Pt;
-      } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_PRESENT, Pte));
-      if (!(Pte & PA_PRESENT))
-      {
-         MiFlushTlb(Pt, Address);
-      }
-      else
-      {
-         MmUnmapPageTable(Pt);
-      }
-   }
-}
-
 BOOLEAN
 NTAPI
 MmIsPagePresent(PEPROCESS Process, PVOID Address)
@@ -1388,134 +1077,6 @@
 
 NTSTATUS
 NTAPI
-MmCreateVirtualMappingForKernel(PVOID Address,
-                                ULONG flProtect,
-                                PPFN_NUMBER Pages,
-                                ULONG PageCount)
-{
-   ULONG Attributes;
-   ULONG i;
-   PVOID Addr;
-   ULONG PdeOffset, oldPdeOffset;
-   BOOLEAN NoExecute = FALSE;
-
-   DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n",
-           Address, flProtect, Pages, PageCount);
-
-   if (Address < MmSystemRangeStart)
-   {
-      DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n");
-      ASSERT(FALSE);
-   }
-
-   Attributes = ProtectToPTE(flProtect);
-   if (Attributes & 0x80000000)
-   {
-      NoExecute = TRUE;
-   }
-   Attributes &= 0xfff;
-   if (Ke386GlobalPagesEnabled)
-   {
-      Attributes |= PA_GLOBAL;
-   }
-
-   Addr = Address;
-
-   if (Ke386Pae)
-   {
-      PULONGLONG Pt = NULL;
-      ULONGLONG Pte;
-
-      oldPdeOffset = PAE_ADDR_TO_PDE_OFFSET(Addr) + 1;
-      for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE))
-      {
-         if (!(Attributes & PA_PRESENT) && Pages[i] != 0)
-         {
-            DPRINT1("Setting physical address but not allowing access at address "
-                    "0x%.8X with attributes %x/%x.\n",
-                    Addr, Attributes, flProtect);
-            ASSERT(FALSE);
-         }
-
-         PdeOffset = PAE_ADDR_TO_PDE_OFFSET(Addr);
-         if (oldPdeOffset != PdeOffset)
-         {
-            Pt = MmGetPageTableForProcessForPAE(NULL, Addr, TRUE);
-            if (Pt == NULL)
-            {
-               ASSERT(FALSE);
-            }
-         }
-         else
-         {
-            Pt++;
-         }
-         oldPdeOffset = PdeOffset;
-
-         Pte = PFN_TO_PTE(Pages[i]) | Attributes;
-         if (NoExecute)
-         {
-            Pte |= 0x8000000000000000LL;
-         }
-         Pte = ExfpInterlockedExchange64UL(Pt, &Pte);
-         if (Pte != 0LL)
-         {
-            ASSERT(FALSE);
-         }
-      }
-   }
-   else
-   {
-      PULONG Pt;
-      ULONG Pte;
-
-      oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr);
-      Pt = MmGetPageTableForProcess(NULL, Addr, TRUE);
-      if (Pt == NULL)
-      {
-         ASSERT(FALSE);
-      }
-      Pt--;
-
-      for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE))
-      {
-         if (!(Attributes & PA_PRESENT) && Pages[i] != 0)
-         {
-            DPRINT1("Setting physical address but not allowing access at address "
-                    "0x%.8X with attributes %x/%x.\n",
-                    Addr, Attributes, flProtect);
-            ASSERT(FALSE);
-         }
-
-         PdeOffset = ADDR_TO_PDE_OFFSET(Addr);
-         if (oldPdeOffset != PdeOffset)
-         {
-            Pt = MmGetPageTableForProcess(NULL, Addr, TRUE);
-            if (Pt == NULL)
-            {
-               ASSERT(FALSE);
-            }
-         }
-         else
-         {
-            Pt++;
-         }
-         oldPdeOffset = PdeOffset;
-
-         Pte = *Pt;
-         if (Pte != 0)
-         {
-            ASSERT(FALSE);
-         }
-         (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes);
-      }
-   }
-
-   return(STATUS_SUCCESS);
-}
-
-NTSTATUS
-NTAPI
 MmCreatePageFileMapping(PEPROCESS Process,
                         PVOID Address,
                         SWAPENTRY SwapEntry)
@@ -1949,49 +1510,6 @@
    }
 }
 
-/*
- * @implemented
- */
-PHYSICAL_ADDRESS NTAPI
-MmGetPhysicalAddress(PVOID vaddr)
-/*
- * FUNCTION: Returns the physical address corresponding to a virtual address
- */
-{
-   PHYSICAL_ADDRESS p;
-
-   DPRINT("MmGetPhysicalAddress(vaddr %x)\n", vaddr);
-   if (Ke386Pae)
-   {
-      ULONGLONG Pte;
-      Pte = MmGetPageEntryForProcessForPAE(NULL, vaddr);
-      if (Pte != 0 && Pte & PA_PRESENT)
-      {
-         p.QuadPart = PAE_PAGE_MASK(Pte);
-         p.u.LowPart |= (ULONG_PTR)vaddr & (PAGE_SIZE - 1);
-      }
-      else
-      {
-         p.QuadPart = 0;
-      }
-   }
-   else
-   {
-      ULONG Pte;
-      Pte = MmGetPageEntryForProcess(NULL, vaddr);
-      if (Pte != 0 && Pte & PA_PRESENT)
-      {
-         p.QuadPart = PAGE_MASK(Pte);
-         p.u.LowPart |= (ULONG_PTR)vaddr & (PAGE_SIZE - 1);
-      }
-      else
-      {
-         p.QuadPart = 0;
-      }
-   }
-   return p;
-}
-
 PVOID
 NTAPI
 MmCreateHyperspaceMapping(PFN_NUMBER Page)
@@ -2123,28 +1641,6 @@
 
 PFN_NUMBER
 NTAPI
-MmChangeHyperspaceMapping(PVOID Address, PFN_NUMBER NewPage)
-{
-   PFN_NUMBER Pfn;
-   ASSERT (IS_HYPERSPACE(Address));
-   if (Ke386Pae)
-   {
-      ULONGLONG Entry = PAE_PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE;
-      Entry = (ULONG)ExfpInterlockedExchange64UL(PAE_ADDR_TO_PTE(Address), &Entry);
-      Pfn = PAE_PTE_TO_PFN(Entry);
-   }
-   else
-   {
-      ULONG Entry;
-      Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE);
-      Pfn = PTE_TO_PFN(Entry);
-   }
-   __invlpg(Address);
-   return Pfn;
-}
-
-PFN_NUMBER
-NTAPI
 MmDeleteHyperspaceMapping(PVOID Address)
 {
    PFN_NUMBER Pfn;
@@ -2166,91 +1662,6 @@
 }
 
 VOID
-NTAPI
-MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size)
-{
-   ULONG StartOffset, EndOffset, Offset;
-
-   if (Address < MmSystemRangeStart)
-   {
-      ASSERT(FALSE);
-   }
-   if (Ke386Pae)
-   {
-      PULONGLONG PageDirTable;
-      PULONGLONG Pde;
-      ULONGLONG ZeroPde = 0LL;
-      ULONG i;
-
-      for (i = PAE_ADDR_TO_PDTE_OFFSET(Address); i <= PAE_ADDR_TO_PDTE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); i++)
-      {
-         if (i == PAE_ADDR_TO_PDTE_OFFSET(Address))
-         {
-            StartOffset = PAE_ADDR_TO_PDE_PAGE_OFFSET(Address);
-         }
-         else
-         {
-            StartOffset = 0;
-         }
-         if (i == PAE_ADDR_TO_PDTE_OFFSET((PVOID)((ULONG_PTR)Address + Size)))
-         {
-            EndOffset = PAE_ADDR_TO_PDE_PAGE_OFFSET((PVOID)((ULONG_PTR)Address + Size));
-         }
-         else
-         {
-            EndOffset = 511;
-         }
-
-         if (Process != NULL && Process != PsGetCurrentProcess())
-         {
-            PageDirTable = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart));
-            Pde = (PULONGLONG)MmCreateHyperspaceMapping(PTE_TO_PFN(PageDirTable[i]));
-            MmDeleteHyperspaceMapping(PageDirTable);
-         }
-         else
-         {
-            Pde = (PULONGLONG)PAE_PAGEDIRECTORY_MAP + i*512;
-         }
-
-         for (Offset = StartOffset; Offset <= EndOffset; Offset++)
-         {
-            if (i * 512 + Offset < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || i * 512 + Offset >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)+4)
-            {
-               (void)ExfInterlockedCompareExchange64UL(&Pde[Offset], &MmGlobalKernelPageDirectoryForPAE[i*512 + Offset], &ZeroPde);
-            }
-         }
-         MmUnmapPageTable((PULONG)Pde);
-      }
-   }
-   else
-   {
-      PULONG Pde;
-      StartOffset = ADDR_TO_PDE_OFFSET(Address);
-      EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size));
-
-      if (Process != NULL && Process != PsGetCurrentProcess())
-      {
-         Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart));
-      }
-      else
-      {
-         Pde = (PULONG)PAGEDIRECTORY_MAP;
-      }
-      for (Offset = StartOffset; Offset <= EndOffset; Offset++)
-      {
-         if (Offset != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP))
-         {
-            (void)InterlockedCompareExchangeUL(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0);
-         }
-      }
-      if (Pde != (PULONG)PAGEDIRECTORY_MAP)
-      {
-         MmDeleteHyperspaceMapping(Pde);
-      }
-   }
-}
-
-VOID
 INIT_FUNCTION
 NTAPI
 MmInitGlobalKernelPageDirectory(VOID)
@@ -2297,53 +1708,4 @@
    }
 }
 
-ULONG
-NTAPI
-MiGetUserPageDirectoryCount(VOID)
-{
-   return Ke386Pae ? PAE_ADDR_TO_PDE_OFFSET(MmSystemRangeStart) : ADDR_TO_PDE_OFFSET(MmSystemRangeStart);
-}
-
-VOID
-INIT_FUNCTION
-NTAPI
-MiInitPageDirectoryMap(VOID)
-{
-   MEMORY_AREA* kernel_map_desc = NULL;
-   MEMORY_AREA* hyperspace_desc = NULL;
-   PVOID BaseAddress;
-   NTSTATUS Status;
-
-   DPRINT("MiInitPageDirectoryMap()\n");
-
-   BaseAddress = (PVOID)PAGETABLE_MAP;
-   Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                               MEMORY_AREA_SYSTEM,
-                               &BaseAddress,
-                               Ke386Pae ? 0x800000 : 0x400000,
-                               PAGE_READWRITE,
-                               &kernel_map_desc,
-                               TRUE,
-                               0,
-                               PAGE_SIZE);
-   if (!NT_SUCCESS(Status))
-   {
-      ASSERT(FALSE);
-   }
-   BaseAddress = (PVOID)HYPERSPACE;
-   Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                               MEMORY_AREA_SYSTEM,
-                               &BaseAddress,
-                               0x400000,
-                               PAGE_READWRITE,
-                               &hyperspace_desc,
-                               TRUE,
-                               0,
-                               PAGE_SIZE);
-   if (!NT_SUCCESS(Status))
-   {
-      ASSERT(FALSE);
-   }
-}
-
 /* EOF */
Index: ntoskrnl/mm/amd64/page.c
===================================================================
--- ntoskrnl/mm/amd64/page.c	(rÃ©vision 61927)
+++ ntoskrnl/mm/amd64/page.c	(copie de travail)
@@ -138,57 +138,6 @@
 }
 
 static
-VOID
-MmDeletePageTablePfn(PFN_NUMBER PageFrameNumber, ULONG Level)
-{
-    PMMPTE PageTable;
-    KIRQL OldIrql;
-    PMMPFN PfnEntry;
-    ULONG i, NumberEntries;
-
-    /* Check if this is a page table */
-    if (Level > 0)
-    {
-        NumberEntries = (Level == 4) ? MiAddressToPxi(MmHighestUserAddress)+1 : 512;
-
-        /* Map the page table in hyperspace */
-        PageTable = (PMMPTE)MmCreateHyperspaceMapping(PageFrameNumber);
-
-        /* Loop all page table entries */
-        for (i = 0; i < NumberEntries; i++)
-        {
-            /* Check if the entry is valid */
-            if (PageTable[i].u.Hard.Valid)
-            {
-                /* Recursively free the page that backs it */
-                MmDeletePageTablePfn(PageTable[i].u.Hard.PageFrameNumber, Level - 1);
-            }
-        }
-
-        /* Delete the hyperspace mapping */
-        MmDeleteHyperspaceMapping(PageTable);
-    }
-
-    /* Check if this is a legacy allocation */
-    PfnEntry = MiGetPfnEntry(PageFrameNumber);
-    if (MI_IS_ROS_PFN(PfnEntry))
-    {
-        /* Free it using the legacy API */
-        MmReleasePageMemoryConsumer(MC_SYSTEM, PageFrameNumber);
-    }
-    else
-    {
-        OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock);
-
-        /* Free it using the ARM3 API */
-        MI_SET_PFN_DELETED(PfnEntry);
-        MiDecrementShareCount(PfnEntry, PageFrameNumber);
-
-        KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql);
-    }
-}
-
-static
 PMMPTE
 MiGetPteForProcess(
     PEPROCESS Process,
@@ -497,15 +446,6 @@
     MiFlushTlb(Pte, Address);
 }
 
-
-NTSTATUS
-NTAPI
-Mmi386ReleaseMmInfo(PEPROCESS Process)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
 VOID
 NTAPI
 MmDeleteVirtualMapping(
@@ -560,15 +500,6 @@
     UNIMPLEMENTED;
 }
 
-
-VOID
-NTAPI
-MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
-{
-    UNIMPLEMENTED;
-}
-
-
 NTSTATUS
 NTAPI
 MmCreatePageFileMapping(PEPROCESS Process,
Index: ntoskrnl/ex/sysinfo.c
===================================================================
--- ntoskrnl/ex/sysinfo.c	(rÃ©vision 61927)
+++ ntoskrnl/ex/sysinfo.c	(copie de travail)
@@ -180,6 +180,62 @@
     return Status;
 }
 
+VOID
+NTAPI
+ExUnlockUserBuffer(PMDL Mdl)
+{
+    MmUnlockPages(Mdl);
+    ExFreePoolWithTag(Mdl, TAG_MDL);
+}
+
+NTSTATUS
+NTAPI
+ExLockUserBuffer(
+    PVOID BaseAddress,
+    ULONG Length,
+    KPROCESSOR_MODE AccessMode,
+    LOCK_OPERATION Operation,
+    PVOID *MappedSystemVa,
+    PMDL *OutMdl)
+{
+    PMDL Mdl;
+    PAGED_CODE();
+
+    *MappedSystemVa = NULL;
+    *OutMdl = NULL;
+
+    /* Allocate an MDL for the buffer */
+    Mdl = IoAllocateMdl(BaseAddress, Length, FALSE, TRUE, NULL);
+    if (Mdl == NULL)
+    {
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+    /* Enter SEH for probing */
+    _SEH2_TRY
+    {
+        MmProbeAndLockPages(Mdl, AccessMode, Operation);
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ExFreePoolWithTag(Mdl, TAG_MDL);
+        return _SEH2_GetExceptionCode();
+    }
+    _SEH2_END;
+
+    /* Return the safe kernel mode buffer */
+    *MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority);
+    if (*MappedSystemVa == NULL)
+    {
+        ExUnlockUserBuffer(Mdl);
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+    /* Return the MDL */
+    *OutMdl = Mdl;
+    return STATUS_SUCCESS;
+}
+
 /* FUNCTIONS *****************************************************************/
 
 /*
@@ -1799,13 +1855,151 @@
     return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer);
 }
 
+static
+VOID
+ExpCopyLookasideInformation(
+    PSYSTEM_LOOKASIDE_INFORMATION *InfoPointer,
+    PULONG RemainingPointer,
+    PLIST_ENTRY ListHead,
+    BOOLEAN ListUsesMisses)
 
+{
+    PSYSTEM_LOOKASIDE_INFORMATION Info;
+    PGENERAL_LOOKASIDE LookasideList;
+    PLIST_ENTRY ListEntry;
+    ULONG Remaining;
+
+    /* Get info pointer and remaining count of free array element */
+    Info = *InfoPointer;
+    Remaining = *RemainingPointer;
+
+    /* Loop as long as we have lookaside lists and free array elements */
+    for (ListEntry = ListHead->Flink;
+         (ListEntry != ListHead) && (Remaining > 0);
+         ListEntry = ListEntry->Flink, Remaining--)
+    {
+        LookasideList = CONTAINING_RECORD(ListEntry, GENERAL_LOOKASIDE, ListEntry);
+
+        /* Fill the next array element */
+        Info->CurrentDepth = LookasideList->Depth;
+        Info->MaximumDepth = LookasideList->MaximumDepth;
+        Info->TotalAllocates = LookasideList->TotalAllocates;
+        Info->TotalFrees = LookasideList->TotalFrees;
+        Info->Type = LookasideList->Type;
+        Info->Tag = LookasideList->Tag;
+        Info->Size = LookasideList->Size;
+
+        /* Check how the lists track misses/hits */
+        if (ListUsesMisses)
+        {
+            /* Copy misses */
+            Info->AllocateMisses = LookasideList->AllocateMisses;
+            Info->FreeMisses = LookasideList->FreeMisses;
+        }
+        else
+        {
+            /* Calculate misses */
+            Info->AllocateMisses = LookasideList->TotalAllocates
+                                   - LookasideList->AllocateHits;
+            Info->FreeMisses = LookasideList->TotalFrees
+                               - LookasideList->FreeHits;
+        }
+    }
+
+    /* Return the updated pointer and remaining count */
+    *InfoPointer = Info;
+    *RemainingPointer = Remaining;
+}
+
 /* Class 45 - Lookaside Information */
 QSI_DEF(SystemLookasideInformation)
 {
-    /* FIXME */
-    DPRINT1("NtQuerySystemInformation - SystemLookasideInformation not implemented\n");
-    return STATUS_NOT_IMPLEMENTED;
+    KPROCESSOR_MODE PreviousMode;
+    PSYSTEM_LOOKASIDE_INFORMATION Info;
+    PMDL Mdl;
+    ULONG MaxCount, Remaining;
+    KIRQL OldIrql;
+    NTSTATUS Status;
+
+    /* First we need to lock down the memory, since we are going to access it
+       at high IRQL */
+    PreviousMode = ExGetPreviousMode();
+    Status = ExLockUserBuffer(Buffer,
+                              Size,
+                              PreviousMode,
+                              IoWriteAccess,
+                              (PVOID*)&Info,
+                              &Mdl);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to lock the user buffer: 0x%lx\n", Status);
+        return Status;
+    }
+
+    /* Calculate how many items we can store */
+    Remaining = MaxCount = Size / sizeof(SYSTEM_LOOKASIDE_INFORMATION);
+    if (Remaining == 0)
+    {
+        goto Leave;
+    }
+
+    /* Copy info from pool lookaside lists */
+    ExpCopyLookasideInformation(&Info,
+                                &Remaining,
+                                &ExPoolLookasideListHead,
+                                FALSE);
+    if (Remaining == 0)
+    {
+        goto Leave;
+    }
+
+    /* Copy info from system lookaside lists */
+    ExpCopyLookasideInformation(&Info,
+                                &Remaining,
+                                &ExSystemLookasideListHead,
+                                TRUE);
+    if (Remaining == 0)
+    {
+        goto Leave;
+    }
+
+    /* Acquire spinlock for ExpNonPagedLookasideListHead */
+    OldIrql = KfAcquireSpinLock(&ExpNonPagedLookasideListLock);
+
+    /* Copy info from non-paged lookaside lists */
+    ExpCopyLookasideInformation(&Info,
+                                &Remaining,
+                                &ExpNonPagedLookasideListHead,
+                                TRUE);
+
+    /* Release spinlock for ExpNonPagedLookasideListHead */
+    KfReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql);
+
+    if (Remaining == 0)
+    {
+        goto Leave;
+    }
+
+    /* Acquire spinlock for ExpPagedLookasideListHead */
+    OldIrql = KfAcquireSpinLock(&ExpPagedLookasideListLock);
+
+    /* Copy info from paged lookaside lists */
+    ExpCopyLookasideInformation(&Info,
+                                &Remaining,
+                                &ExpPagedLookasideListHead,
+                                TRUE);
+
+    /* Release spinlock for ExpPagedLookasideListHead */
+    KfReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql);
+
+Leave:
+
+    /* Release the locked user buffer */
+    ExUnlockUserBuffer(Mdl);
+
+    /* Return the size of the actually written data */
+    *ReqSize = (MaxCount - Remaining) * sizeof(SYSTEM_LOOKASIDE_INFORMATION);
+    return STATUS_SUCCESS;
 }
 
 
Index: ntoskrnl/CMakeLists.txt
===================================================================
--- ntoskrnl/CMakeLists.txt	(rÃ©vision 61927)
+++ ntoskrnl/CMakeLists.txt	(copie de travail)
@@ -1,436 +1,23 @@
 
 PROJECT(NTOS)
 
-spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB)
+include(ntos.cmake)
 
-include_directories(
-    ${REACTOS_SOURCE_DIR}
-    ${REACTOS_SOURCE_DIR}/lib/cmlib
-    include
-    ${CMAKE_CURRENT_BINARY_DIR}/include
-    ${CMAKE_CURRENT_BINARY_DIR}/include/internal
-    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+set(NTOSKRNL_SOURCE ${SOURCE})
+set(NTOSKRNL_ASM_SOURCE ${ASM_SOURCE})
 
-add_definitions(
-    -D__NTOSKRNL__
-    -D_NTOSKRNL_
-    -D_NTSYSTEM_
-    -D_IN_KERNEL_
-    -DNTDDI_VERSION=0x05020400)
+set(NTKRNLMP_SOURCE ${SOURCE})
+set(NTKRNLMP_ASM_SOURCE ${ASM_SOURCE})
 
-if(NOT DEFINED NEWCC)
-    set(NEWCC FALSE)
-endif()
+spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB)
 
-if(NEWCC)
-    add_definitions(-DNEWCC)
-    list(APPEND SOURCE
-        cache/cachesub.c
-        cache/copysup.c
-        cache/fssup.c
-        cache/lazyrite.c
-        cache/logsup.c
-        cache/mdlsup.c
-        cache/pinsup.c)
-else()
-    list(APPEND SOURCE
-        cc/cacheman.c
-        cc/copy.c
-        cc/fs.c
-        cc/mdl.c
-        cc/pin.c
-        cc/view.c)
-endif()
+add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE})
 
-list(APPEND SOURCE
-    cache/section/io.c
-    cache/section/data.c
-    cache/section/fault.c
-    cache/section/reqtools.c
-    cache/section/sptab.c
-    cache/section/swapout.c
-    config/cmalloc.c
-    config/cmapi.c
-    config/cmboot.c
-    config/cmcheck.c
-    config/cmconfig.c
-    config/cmcontrl.c
-    config/cmdata.c
-    config/cmdelay.c
-    config/cmhook.c
-    config/cmhvlist.c
-    config/cmindex.c
-    config/cminit.c
-    config/cmkcbncb.c
-    config/cmkeydel.c
-    config/cmlazy.c
-    config/cmmapvw.c
-    config/cmname.c
-    config/cmnotify.c
-    config/cmparse.c
-    config/cmquota.c
-    config/cmse.c
-    config/cmsecach.c
-    config/cmsysini.c
-    config/cmvalche.c
-    config/cmvalue.c
-    config/cmwraprs.c
-    config/ntapi.c
-    dbgk/dbgkobj.c
-    dbgk/dbgkutil.c
-    ex/atom.c
-    ex/callback.c
-    ex/dbgctrl.c
-    ex/efi.c
-    ex/event.c
-    ex/evtpair.c
-    ex/exintrin.c
-    ex/fmutex.c
-    ex/handle.c
-    ex/harderr.c
-    ex/hdlsterm.c
-    ex/init.c
-    ex/interlocked.c
-    ex/keyedevt.c
-    ex/locale.c
-    ex/lookas.c
-    ex/mutant.c
-    ex/profile.c
-    ex/pushlock.c
-    ex/resource.c
-    ex/rundown.c
-    ex/sem.c
-    ex/shutdown.c
-    ex/sysinfo.c
-    ex/time.c
-    ex/timer.c
-    ex/uuid.c
-    ex/win32k.c
-    ex/work.c
-    ex/xipdisp.c
-    ex/zone.c
-    fsrtl/dbcsname.c
-    fsrtl/fastio.c
-    fsrtl/faulttol.c
-    fsrtl/filelock.c
-    fsrtl/filter.c
-    fsrtl/filtrctx.c
-    fsrtl/fsfilter.c
-    fsrtl/fsrtlpc.c
-    fsrtl/largemcb.c
-    fsrtl/mcb.c
-    fsrtl/name.c
-    fsrtl/notify.c
-    fsrtl/oplock.c
-    fsrtl/pnp.c
-    fsrtl/stackovf.c
-    fsrtl/tunnel.c
-    fsrtl/unc.c
-    fstub/disksup.c
-    fstub/fstubex.c
-    fstub/halstub.c
-    fstub/translate.c
-    inbv/inbv.c
-    inbv/inbvport.c
-    io/iomgr/adapter.c
-    io/iomgr/arcname.c
-    io/iomgr/bootlog.c
-    io/iomgr/controller.c
-    io/iomgr/device.c
-    io/iomgr/deviface.c
-    io/iomgr/driver.c
-    io/iomgr/error.c
-    io/iomgr/file.c
-    io/iomgr/iocomp.c
-    io/iomgr/ioevent.c
-    io/iomgr/iofunc.c
-    io/iomgr/iomdl.c
-    io/iomgr/iomgr.c
-    io/iomgr/iorsrce.c
-    io/iomgr/iotimer.c
-    io/iomgr/iowork.c
-    io/iomgr/irp.c
-    io/iomgr/irq.c
-    io/iomgr/ramdisk.c
-    io/iomgr/rawfs.c
-    io/iomgr/remlock.c
-    io/iomgr/symlink.c
-    io/iomgr/util.c
-    io/iomgr/volume.c
-    io/pnpmgr/plugplay.c
-    io/pnpmgr/pnpdma.c
-    io/pnpmgr/pnpinit.c
-    io/pnpmgr/pnpmgr.c
-    io/pnpmgr/pnpnotify.c
-    io/pnpmgr/pnpreport.c
-    io/pnpmgr/pnpres.c
-    io/pnpmgr/pnproot.c
-    io/pnpmgr/pnputil.c
-    ke/apc.c
-    ke/balmgr.c
-    ke/bug.c
-    ke/clock.c
-    ke/config.c
-    ke/devqueue.c
-    ke/dpc.c
-    ke/eventobj.c
-    ke/except.c
-    ke/freeze.c
-    ke/gate.c
-    ke/gmutex.c
-    ke/ipi.c
-    ke/krnlinit.c
-    ke/mutex.c
-    ke/procobj.c
-    ke/profobj.c
-    ke/queue.c
-    ke/semphobj.c
-    ke/spinlock.c
-    ke/thrdobj.c
-    ke/thrdschd.c
-    ke/time.c
-    ke/timerobj.c
-    ke/wait.c
-    lpc/close.c
-    lpc/complete.c
-    lpc/connect.c
-    lpc/create.c
-    lpc/listen.c
-    lpc/port.c
-    lpc/reply.c
-    lpc/send.c
-    mm/ARM3/contmem.c
-    mm/ARM3/drvmgmt.c
-    mm/ARM3/dynamic.c
-    mm/ARM3/expool.c
-    mm/ARM3/hypermap.c
-    mm/ARM3/iosup.c
-    mm/ARM3/largepag.c
-    mm/ARM3/mdlsup.c
-    mm/ARM3/mmdbg.c
-    mm/ARM3/mminit.c
-    mm/ARM3/mmsup.c
-    mm/ARM3/ncache.c
-    mm/ARM3/pagfault.c
-    mm/ARM3/pfnlist.c
-    mm/ARM3/pool.c
-    mm/ARM3/procsup.c
-    mm/ARM3/section.c
-    mm/ARM3/session.c
-    mm/ARM3/special.c
-    mm/ARM3/sysldr.c
-    mm/ARM3/syspte.c
-    mm/ARM3/vadnode.c
-    mm/ARM3/virtual.c
-    mm/ARM3/zeropage.c
-    mm/balance.c
-    mm/freelist.c
-    mm/marea.c
-    mm/mmfault.c
-    mm/mminit.c
-    mm/pagefile.c
-    mm/region.c
-    mm/rmap.c
-    mm/section.c
-    ob/obdir.c
-    ob/obhandle.c
-    ob/obinit.c
-    ob/oblife.c
-    ob/oblink.c
-    ob/obname.c
-    ob/obref.c
-    ob/obsdcach.c
-    ob/obsecure.c
-    ob/obwait.c
-    po/events.c
-    po/guid.c
-    po/poshtdwn.c
-    po/povolume.c
-    po/power.c
-    ps/debug.c
-    ps/job.c
-    ps/kill.c
-    ps/process.c
-    ps/psmgr.c
-    ps/psnotify.c
-    ps/query.c
-    ps/quota.c
-    ps/security.c
-    ps/state.c
-    ps/thread.c
-    ps/win32.c
-    rtl/libsupp.c
-    rtl/misc.c
-    se/access.c
-    se/acl.c
-    se/audit.c
-    se/lsa.c
-    se/priv.c
-    se/sd.c
-    se/semgr.c
-    se/sid.c
-    se/token.c
-    vf/driver.c
-    wmi/wmi.c
-    ntoskrnl.rc)
-
-list(APPEND ASM_SOURCE ex/zw.S)
-
-if(ARCH STREQUAL "i386")
-    list(APPEND ASM_SOURCE
-        ex/i386/fastinterlck_asm.S
-        ex/i386/ioport.S
-        ke/i386/ctxswitch.S
-        ke/i386/trap.s
-        ke/i386/usercall_asm.S
-        rtl/i386/stack.S)
-    list(APPEND SOURCE
-        config/i386/cmhardwr.c
-        ke/i386/abios.c
-        ke/i386/cpu.c
-        ke/i386/context.c
-        ke/i386/exp.c
-        ke/i386/irqobj.c
-        ke/i386/kiinit.c
-        ke/i386/ldt.c
-        ke/i386/mtrr.c
-        ke/i386/patpge.c
-        ke/i386/thrdini.c
-        ke/i386/traphdlr.c
-        ke/i386/usercall.c
-        ke/i386/v86vdm.c
-        mm/i386/page.c
-        mm/ARM3/i386/init.c
-        ps/i386/psctx.c
-        ps/i386/psldt.c
-        vdm/vdmmain.c
-        vdm/vdmexec.c)
-elseif(ARCH STREQUAL "amd64")
-    list(APPEND ASM_SOURCE
-        ke/amd64/boot.S
-        ke/amd64/ctxswitch.S
-        ke/amd64/trap.S)
-    list(APPEND SOURCE
-        config/i386/cmhardwr.c
-        ke/amd64/context.c
-        ke/amd64/cpu.c
-        ke/amd64/except.c
-        ke/amd64/interrupt.c
-        ke/amd64/irql.c
-        ke/amd64/kiinit.c
-        ke/amd64/krnlinit.c
-        ke/amd64/spinlock.c
-        ke/amd64/stubs.c
-        ke/amd64/thrdini.c
-        mm/amd64/init.c
-        mm/amd64/page.c
-        ps/amd64/psctx.c)
-elseif(ARCH STREQUAL "arm")
-    list(APPEND ASM_SOURCE
-        ke/arm/boot.s
-        ke/arm/ctxswtch.s
-        ke/arm/stubs_asm.s
-        ke/arm/trap.s)
-    list(APPEND SOURCE
-        config/arm/cmhardwr.c
-        ke/arm/cpu.c
-        ke/arm/exp.c
-        ke/arm/kiinit.c
-        ke/arm/thrdini.c
-        ke/arm/trapc.c
-        ke/arm/usercall.c
-        mm/arm/page.c
-        mm/ARM3/arm/init.c
-        ps/arm/psctx.c
-        rtl/arm/rtlexcpt.c)
-elseif(ARCH STREQUAL "powerpc")
-    list(APPEND ASM_SOURCE
-        ke/powerpc/main_asm.S
-        ke/powerpc/ctxhelp.S)
-    list(APPEND SOURCE
-        config/powerpc/cmhardwr.c
-        ke/powerpc/cpu.c
-        ke/powerpc/exp.c
-        ke/powerpc/kiinit.c
-        ke/powerpc/ppc_irq.c
-        ke/powerpc/stubs.c
-        ke/powerpc/systimer.c
-        ke/powerpc/thrdini.c
-        ke/powerpc/ctxswitch.c
-        mm/powerpc/pfault.c
-        mm/powerpc/page.c)
-endif()
-
-if(NOT _WINKD_)
-    if(ARCH STREQUAL "i386")
-        list(APPEND SOURCE
-            kd/i386/kdbg.c
-            kd/i386/kdmemsup.c
-            kd/wrappers/gdbstub.c)
-        if(KDBG)
-            list(APPEND ASM_SOURCE kdbg/i386/kdb_help.S)
-            list(APPEND SOURCE kdbg/i386/i386-dis.c)
-        endif()
-    elseif(ARCH STREQUAL "amd64")
-        list(APPEND SOURCE
-            kd/amd64/kd.c
-            kd/i386/kdbg.c  # Use the x86 file
-            kd/amd64/kdmemsup.c)
-        if(KDBG)
-            list(APPEND ASM_SOURCE kdbg/amd64/kdb_help.S)
-            list(APPEND SOURCE
-                kdbg/amd64/i386-dis.c
-                kdbg/amd64/kdb.c)
-        endif()
-    elseif(ARCH STREQUAL "arm")
-        list(APPEND SOURCE kd/arm/kdbg.c)
-    elseif(ARCH STREQUAL "powerpc")
-        list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c)
-    endif()
-
-    if(KDBG)
-        list(APPEND SOURCE
-            kdbg/kdb.c
-            kdbg/kdb_cli.c
-            kdbg/kdb_expr.c
-            kdbg/kdb_keyboard.c
-            kdbg/kdb_serial.c
-            kdbg/kdb_symbols.c)
-    endif()
-
-    list(APPEND SOURCE
-        kd/wrappers/bochs.c
-        kd/wrappers/kdbg.c
-        kd/kdinit.c
-        kd/kdio.c
-        kd/kdmain.c)
-
-else() # _WINKD_
-
-    list(APPEND SOURCE
-        kd64/kdapi.c
-        kd64/kdbreak.c
-        kd64/kddata.c
-        kd64/kdinit.c
-        kd64/kdlock.c
-        kd64/kdprint.c
-        kd64/kdtrap.c)
-
-    if(ARCH STREQUAL "i386")
-        list(APPEND SOURCE kd64/i386/kdx86.c)
-    elseif(ARCH STREQUAL "amd64")
-        list(APPEND SOURCE kd64/amd64/kdx64.c)
-    elseif(ARCH STREQUAL "arm")
-        list(APPEND SOURCE kd64/arm/kdarm.c)
-    endif()
-
-endif()
-
-add_asm_files(ntoskrnl_asm ${ASM_SOURCE})
-
 add_executable(ntoskrnl
     ${ntoskrnl_asm}
-    ${SOURCE}
+    ${NTOSKRNL_SOURCE}
+    guid.c
+    ntoskrnl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def)
 
 if(ARCH STREQUAL "i386")
@@ -463,48 +50,12 @@
     ioevent)
 
 add_importlibs(ntoskrnl hal kdcom bootvid)
-add_pch(ntoskrnl include/ntoskrnl.h)
+add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTOSKRNL_SOURCE)
 add_dependencies(ntoskrnl psdk bugcodes asm)
 add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all)
 
 if(BUILD_MP)
-    spec2def(ntkrnlmp.exe ntoskrnl.spec)
-
-    if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
-        set_source_files_properties(${ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "CONFIG_SMP")
-    endif()
-
-    add_asm_files(ntkrnlmp_asm ${ASM_SOURCE})
-
-    add_executable(ntkrnlmp
-        ${ntkrnlmp_asm}
-        ${SOURCE}
-        ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def)
-
-    add_target_compile_definitions(ntkrnlmp CONFIG_SMP)
-
-    if(ARCH STREQUAL "i386")
-        set_entrypoint(ntkrnlmp KiSystemStartup 4)
-    else()
-        set_entrypoint(ntkrnlmp KiSystemStartup)
-    endif()
-    set_subsystem(ntkrnlmp native)
-
-    if(MSVC)
-        set_image_base(ntkrnlmp 0x00400000)
-    else()
-        set_image_base(ntkrnlmp 0x80800000)
-    endif()
-
-    # Linker bug
-    if(NOT MSVC AND LTCG)
-        add_target_link_flags(ntkrnlmp "-shared")
-    endif()
-
-    target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} cmlib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent)
-    add_importlibs(ntkrnlmp hal kdcom bootvid)
-    add_dependencies(ntkrnlmp psdk bugcodes asm)
-    add_cd_file(TARGET ntkrnlmp DESTINATION reactos/system32 NO_CAB FOR all)
+    add_subdirectory(ntkrnlmp)
 endif()
 
 add_asm_files(ntdllsys_asm ntdll.S)
Index: ntoskrnl/lpc/reply.c
===================================================================
--- ntoskrnl/lpc/reply.c	(rÃ©vision 61927)
+++ ntoskrnl/lpc/reply.c	(copie de travail)
@@ -90,6 +90,49 @@
     if (!LockHeld) KeReleaseGuardedMutex(&LpcpLock);
 }
 
+PLPCP_MESSAGE
+NTAPI
+LpcpFindDataInfoMessage(
+    IN PLPCP_PORT_OBJECT Port,
+    IN ULONG MessageId,
+    IN LPC_CLIENT_ID ClientId)
+{
+    PLPCP_MESSAGE Message;
+    PLIST_ENTRY ListEntry;
+    PAGED_CODE();
+
+    /* Check if the port we want is the connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) > LPCP_UNCONNECTED_PORT)
+    {
+        /* Use it */
+        Port = Port->ConnectionPort;
+        if (!Port)
+        {
+            /* Return NULL */
+            return NULL;
+        }
+    }
+
+    /* Loop all entries in the list */
+    for (ListEntry = Port->LpcDataInfoChainHead.Flink;
+         ListEntry != &Port->LpcDataInfoChainHead;
+         ListEntry = ListEntry->Flink)
+    {
+        Message = CONTAINING_RECORD(ListEntry, LPCP_MESSAGE, Entry);
+
+        /* Check if this is the desired message */
+        if ((Message->Request.MessageId == MessageId) &&
+            (Message->Request.ClientId.UniqueProcess == ClientId.UniqueProcess) &&
+            (Message->Request.ClientId.UniqueThread == ClientId.UniqueThread))
+        {
+            /* It is, return it */
+            return Message;
+        }
+    }
+
+    return NULL;
+}
+
 VOID
 NTAPI
 LpcpMoveMessage(IN PPORT_MESSAGE Destination,
@@ -132,7 +175,7 @@
     /* Copy the Message Data */
     RtlCopyMemory(Destination + 1,
                   Data,
-                  ((Destination->u1.Length & 0xFFFF) + 3) &~3);
+                  ALIGN_UP_BY(Destination->u1.s1.DataLength, sizeof(ULONG)));
 }
 
 /* PUBLIC FUNCTIONS **********************************************************/
@@ -710,6 +753,199 @@
     return STATUS_NOT_IMPLEMENTED;
 }
 
+NTSTATUS
+NTAPI
+LpcpCopyRequestData(
+    IN BOOLEAN Write,
+    IN HANDLE PortHandle,
+    IN PPORT_MESSAGE Message,
+    IN ULONG Index,
+    IN PVOID Buffer,
+    IN ULONG BufferLength,
+    OUT PULONG Returnlength)
+{
+    KPROCESSOR_MODE PreviousMode;
+    PORT_MESSAGE CapturedMessage;
+    PLPCP_PORT_OBJECT Port = NULL;
+    PETHREAD ClientThread = NULL;
+    ULONG LocalReturnlength;
+    PLPCP_MESSAGE InfoMessage;
+    PLPCP_DATA_INFO DataInfo;
+    PVOID DataInfoBaseAddress;
+    NTSTATUS Status;
+    PAGED_CODE();
+
+    /* Check the previous mode */
+    PreviousMode = ExGetPreviousMode();
+    if (PreviousMode == KernelMode)
+    {
+        CapturedMessage = *Message;
+    }
+    else
+    {
+        _SEH2_TRY
+        {
+            ProbeForRead(Message, sizeof(*Message), sizeof(PVOID));
+            CapturedMessage = *Message;
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            DPRINT1("Got exception!\n");
+            return _SEH2_GetExceptionCode();
+        }
+        _SEH2_END;
+    }
+
+    /* Make sure there is any data to copy */
+    if (CapturedMessage.u2.s2.DataInfoOffset == 0)
+    {
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Reference the port handle */
+    Status = ObReferenceObjectByHandle(PortHandle,
+                                       PORT_ALL_ACCESS,
+                                       LpcPortObjectType,
+                                       PreviousMode,
+                                       (PVOID*)&Port,
+                                       NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to reference port handle: 0x%ls\n", Status);
+        return Status;
+    }
+
+    /* Look up the client thread */
+    Status = PsLookupProcessThreadByCid(&CapturedMessage.ClientId,
+                                        NULL,
+                                        &ClientThread);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to lookup client thread for [0x%lx:0x%lx]: 0x%ls\n",
+                CapturedMessage.ClientId.UniqueProcess,
+                CapturedMessage.ClientId.UniqueThread, Status);
+        goto Cleanup;
+    }
+
+    /* Acquire the global LPC lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Check for message id mismatch */
+    if ((ClientThread->LpcReplyMessageId != CapturedMessage.MessageId) ||
+        (CapturedMessage.MessageId == 0))
+    {
+        DPRINT1("LpcReplyMessageId mismatch: 0x%lx/0x%lx.\n",
+                ClientThread->LpcReplyMessageId, CapturedMessage.MessageId);
+        Status = STATUS_REPLY_MESSAGE_MISMATCH;
+        goto CleanupWithLock;
+    }
+
+    /* Validate the port */
+    if (!LpcpValidateClientPort(ClientThread, Port))
+    {
+        DPRINT1("LpcpValidateClientPort failed\n");
+        Status = STATUS_REPLY_MESSAGE_MISMATCH;
+        goto CleanupWithLock;
+    }
+
+    /* Find the message with the data */
+    InfoMessage = LpcpFindDataInfoMessage(Port,
+                                          CapturedMessage.MessageId,
+                                          CapturedMessage.ClientId);
+    if (InfoMessage == NULL)
+    {
+        DPRINT1("LpcpFindDataInfoMessage failed\n");
+        Status = STATUS_INVALID_PARAMETER;
+        goto CleanupWithLock;
+    }
+
+    /* Get the data info */
+    DataInfo = LpcpGetDataInfoFromMessage(&InfoMessage->Request);
+
+    /* Check if the index is within bounds */
+    if (Index >= DataInfo->NumberOfEntries)
+    {
+        DPRINT1("Message data index %lu out of bounds (%lu in msg)\n",
+                Index, DataInfo->NumberOfEntries);
+        Status = STATUS_INVALID_PARAMETER;
+        goto CleanupWithLock;
+    }
+
+    /* Check if the caller wants to read/write more data than expected */
+    if (BufferLength > DataInfo->Entries[Index].DataLength)
+    {
+        DPRINT1("Trying to read more data (%lu) than available (%lu)\n",
+                BufferLength, DataInfo->Entries[Index].DataLength);
+        Status = STATUS_INVALID_PARAMETER;
+        goto CleanupWithLock;
+    }
+
+    /* Get the data pointer */
+    DataInfoBaseAddress = DataInfo->Entries[Index].BaseAddress;
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    if (Write)
+    {
+        /* Copy data from the caller to the message sender */
+        Status = MmCopyVirtualMemory(PsGetCurrentProcess(),
+                                     Buffer,
+                                     ClientThread->ThreadsProcess,
+                                     DataInfoBaseAddress,
+                                     BufferLength,
+                                     PreviousMode,
+                                     &LocalReturnlength);
+    }
+    else
+    {
+        /* Copy data from the message sender to the caller */
+        Status = MmCopyVirtualMemory(ClientThread->ThreadsProcess,
+                                     DataInfoBaseAddress,
+                                     PsGetCurrentProcess(),
+                                     Buffer,
+                                     BufferLength,
+                                     PreviousMode,
+                                     &LocalReturnlength);
+    }
+
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("MmCopyVirtualMemory failed: 0x%ls\n", Status);
+        goto Cleanup;
+    }
+
+    /* Check if the caller asked to return the copied length */
+    if (Returnlength != NULL)
+    {
+        _SEH2_TRY
+        {
+            *Returnlength = LocalReturnlength;
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            /* Ignore */
+            DPRINT1("Exception writing Returnlength, ignoring\n");
+        }
+        _SEH2_END;
+    }
+
+Cleanup:
+
+    if (ClientThread != NULL)
+        ObDereferenceObject(ClientThread);
+
+    ObDereferenceObject(Port);
+
+    return Status;
+
+CleanupWithLock:
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+    goto Cleanup;
+}
+
 /*
  * @unimplemented
  */
@@ -720,10 +956,16 @@
                   IN ULONG Index,
                   IN PVOID Buffer,
                   IN ULONG BufferLength,
-                  OUT PULONG Returnlength)
+                  OUT PULONG ReturnLength)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* Call the internal function */
+    return LpcpCopyRequestData(FALSE,
+                               PortHandle,
+                               Message,
+                               Index,
+                               Buffer,
+                               BufferLength,
+                               ReturnLength);
 }
 
 /*
@@ -738,8 +980,14 @@
                    IN ULONG BufferLength,
                    OUT PULONG ReturnLength)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* Call the internal function */
+    return LpcpCopyRequestData(TRUE,
+                               PortHandle,
+                               Message,
+                               Index,
+                               Buffer,
+                               BufferLength,
+                               ReturnLength);
 }
 
 /* EOF */
Index: ntoskrnl/lpc/port.c
===================================================================
--- ntoskrnl/lpc/port.c	(rÃ©vision 61927)
+++ ntoskrnl/lpc/port.c	(copie de travail)
@@ -84,6 +84,40 @@
     return TRUE;
 }
 
+BOOLEAN
+NTAPI
+LpcpValidateClientPort(
+    PETHREAD ClientThread,
+    PLPCP_PORT_OBJECT Port)
+{
+    PLPCP_PORT_OBJECT ThreadPort;
+
+    /* Get the thread's port */
+    ThreadPort = LpcpGetPortFromThread(ClientThread);
+    if (ThreadPort == NULL)
+    {
+        return FALSE;
+    }
+
+    /* Check if the port matches directly */
+    if ((Port == ThreadPort) ||
+        (Port == ThreadPort->ConnectionPort) ||
+        (Port == ThreadPort->ConnectedPort))
+    {
+        return TRUE;
+    }
+
+    /* Check if this is a communication port and the connection port matches */
+    if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_COMMUNICATION_PORT) &&
+        (Port->ConnectionPort == ThreadPort))
+    {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
 /* PUBLIC FUNCTIONS **********************************************************/
 
 NTSTATUS
@@ -91,8 +125,153 @@
 NtImpersonateClientOfPort(IN HANDLE PortHandle,
                           IN PPORT_MESSAGE ClientMessage)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    KPROCESSOR_MODE PreviousMode;
+    CLIENT_ID ClientId;
+    ULONG MessageId;
+    PLPCP_PORT_OBJECT Port = NULL, ConnectedPort = NULL;
+    PETHREAD ClientThread = NULL;
+    SECURITY_CLIENT_CONTEXT ClientContext;
+    NTSTATUS Status;
+    PAGED_CODE();
+
+    /* Check the previous mode */
+    PreviousMode = ExGetPreviousMode();
+    if (PreviousMode == KernelMode)
+    {
+        ClientId = ClientMessage->ClientId;
+        MessageId = ClientMessage->MessageId;
+    }
+    else
+    {
+        _SEH2_TRY
+        {
+            ProbeForRead(ClientMessage, sizeof(*ClientMessage), sizeof(PVOID));
+            ClientId = ClientMessage->ClientId;
+            MessageId = ClientMessage->MessageId;
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            DPRINT1("Got exception!\n");
+            return _SEH2_GetExceptionCode();
+        }
+        _SEH2_END;
+    }
+
+    /* Reference the port handle */
+    Status = ObReferenceObjectByHandle(PortHandle,
+                                       PORT_ALL_ACCESS,
+                                       LpcPortObjectType,
+                                       PreviousMode,
+                                       (PVOID*)&Port,
+                                       NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to reference port handle: 0x%ls\n", Status);
+        return Status;
+    }
+
+    /* Make sure this is a connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT)
+    {
+        /* It isn't, fail */
+        DPRINT1("Port is not a communication port\n");
+        Status = STATUS_INVALID_PORT_HANDLE;
+        goto Cleanup;
+    }
+
+    /* Look up the client thread */
+    Status = PsLookupProcessThreadByCid(&ClientId, NULL, &ClientThread);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to lookup client thread: 0x%ls\n", Status);
+        goto Cleanup;
+    }
+
+    /* Acquire the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Get the connected port and try to reference it */
+    ConnectedPort = Port->ConnectedPort;
+    if ((ConnectedPort == NULL) ||
+        !ObReferenceObjectSafe(ConnectedPort))
+    {
+        DPRINT1("Failed to reference the connected port\n");
+        ConnectedPort = NULL;
+        Status = STATUS_PORT_DISCONNECTED;
+        goto CleanupWithLock;
+    }
+
+    /* Check for no-impersonation flag */
+    if ((ULONG_PTR)ClientThread->LpcReplyMessage & LPCP_THREAD_FLAG_NO_IMPERSONATION)
+    {
+        DPRINT1("Reply message has no impersonation flag set\n");
+        Status = STATUS_ACCESS_DENIED;
+        goto CleanupWithLock;
+    }
+
+    /* Check for message id mismatch */
+    if ((ClientThread->LpcReplyMessageId != MessageId) || (MessageId == 0))
+    {
+        DPRINT1("LpcReplyMessageId mismatch: 0x%lx/0x%lx.\n",
+                ClientThread->LpcReplyMessageId, MessageId);
+        Status = STATUS_REPLY_MESSAGE_MISMATCH;
+        goto CleanupWithLock;
+    }
+
+    /* Validate the port */
+    if (!LpcpValidateClientPort(ClientThread, Port))
+    {
+        DPRINT1("LpcpValidateClientPort failed\n");
+        Status = STATUS_REPLY_MESSAGE_MISMATCH;
+        goto CleanupWithLock;
+    }
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Check if security is static */
+    if (!(ConnectedPort->Flags & LPCP_SECURITY_DYNAMIC))
+    {
+        /* Use the static security for impersonation */
+        Status = SeImpersonateClientEx(&ConnectedPort->StaticSecurity, NULL);
+        goto Cleanup;
+    }
+
+    /* Create new dynamic security */
+    Status = SeCreateClientSecurity(ClientThread,
+                                    &ConnectedPort->SecurityQos,
+                                    FALSE,
+                                    &ClientContext);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("SeCreateClientSecurity failed\n");
+        goto Cleanup;
+    }
+
+    /* Use dynamic security for impersonation */
+    Status = SeImpersonateClientEx(&ClientContext, NULL);
+
+    /* Get rid of the security context */
+    SeDeleteClientSecurity(&ClientContext);
+
+    goto Cleanup;
+
+CleanupWithLock:
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+Cleanup:
+
+    if (ConnectedPort != NULL)
+        ObDereferenceObject(ConnectedPort);
+
+    if (ClientThread != NULL)
+        ObDereferenceObject(ClientThread);
+
+    ObDereferenceObject(Port);
+
+    return Status;
 }
 
 NTSTATUS
Index: ntoskrnl/lpc/send.c
===================================================================
--- ntoskrnl/lpc/send.c	(rÃ©vision 61927)
+++ ntoskrnl/lpc/send.c	(copie de travail)
@@ -207,18 +207,18 @@
     {
         /* No type */
         case 0:
-            
+
             /* Assume LPC request */
             MessageType = LPC_REQUEST;
             break;
-        
+
         /* LPC request callback */
         case LPC_REQUEST:
-            
+
             /* This is a callback */
             Callback = TRUE;
             break;
-        
+
         /* Anything else */
         case LPC_CLIENT_DIED:
         case LPC_PORT_CLOSED:
@@ -225,16 +225,16 @@
         case LPC_EXCEPTION:
         case LPC_DEBUG_EVENT:
         case LPC_ERROR_EVENT:
-            
+
             /* Nothing to do */
             break;
-            
+
         default:
-            
+
             /* Invalid message type */
             return STATUS_INVALID_PARAMETER;
     }
-    
+
     /* Set the request type */
     LpcRequest->u2.s2.Type = MessageType;
 
@@ -401,10 +401,10 @@
                             (&Message->Request) + 1,
                             0,
                             NULL);
-            
+
             /* Acquire the lock */
             KeAcquireGuardedMutex(&LpcpLock);
-            
+
             /* Check if we replied to a thread */
             if (Message->RepliedToThread)
             {
@@ -633,6 +633,47 @@
     return Status;
 }
 
+NTSTATUS
+NTAPI
+LpcpVerifyMessageDataInfo(
+    _In_ PPORT_MESSAGE Message,
+    _Out_ PULONG NumberOfDataEntries)
+{
+    PLPCP_DATA_INFO DataInfo;
+    PUCHAR EndOfEntries;
+
+    /* Check if we have no data info at all */
+    if (Message->u2.s2.DataInfoOffset == 0)
+    {
+        *NumberOfDataEntries = 0;
+        return STATUS_SUCCESS;
+    }
+
+    /* Make sure the data info structure is within the message */
+    if (((ULONG)Message->u1.s1.TotalLength <
+            sizeof(PORT_MESSAGE) + sizeof(LPCP_DATA_INFO)) ||
+        ((ULONG)Message->u2.s2.DataInfoOffset < sizeof(PORT_MESSAGE)) ||
+        ((ULONG)Message->u2.s2.DataInfoOffset >
+            ((ULONG)Message->u1.s1.TotalLength - sizeof(LPCP_DATA_INFO))))
+    {
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Get a pointer to the data info */
+    DataInfo = LpcpGetDataInfoFromMessage(Message);
+
+    /* Make sure the full data info with all entries is within the message */
+    EndOfEntries = (PUCHAR)&DataInfo->Entries[DataInfo->NumberOfEntries];
+    if ((EndOfEntries > ((PUCHAR)Message + (ULONG)Message->u1.s1.TotalLength)) ||
+        (EndOfEntries < (PUCHAR)Message))
+    {
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    *NumberOfDataEntries = DataInfo->NumberOfEntries;
+    return STATUS_SUCCESS;
+}
+
 /*
  * @implemented
  */
@@ -642,6 +683,8 @@
                        IN PPORT_MESSAGE LpcRequest,
                        IN OUT PPORT_MESSAGE LpcReply)
 {
+    PORT_MESSAGE LocalLpcRequest;
+    ULONG NumberOfDataEntries;
     PLPCP_PORT_OBJECT Port, QueuePort, ReplyPort, ConnectionPort = NULL;
     KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
     NTSTATUS Status;
@@ -650,6 +693,7 @@
     BOOLEAN Callback;
     PKSEMAPHORE Semaphore;
     ULONG MessageType;
+    PLPCP_DATA_INFO DataInfo;
     PAGED_CODE();
     LPCTRACE(LPC_SEND_DEBUG,
              "Handle: %p. Messages: %p/%p. Type: %lx\n",
@@ -661,32 +705,78 @@
     /* Check if the thread is dying */
     if (Thread->LpcExitThreadCalled) return STATUS_THREAD_IS_TERMINATING;
 
+    /* Check for user mode access */
+    if (PreviousMode != KernelMode)
+    {
+        _SEH2_TRY
+        {
+            /* Probe the full request message and copy the base structure */
+            ProbeForRead(LpcRequest, sizeof(*LpcRequest), sizeof(ULONG));
+            ProbeForRead(LpcRequest, LpcRequest->u1.s1.TotalLength, sizeof(ULONG));
+            LocalLpcRequest = *LpcRequest;
+
+            /* Probe the reply message for write */
+            ProbeForWrite(LpcReply, sizeof(*LpcReply), sizeof(ULONG));
+
+            /* Make sure the data entries in the request message are valid */
+            Status = LpcpVerifyMessageDataInfo(LpcRequest, &NumberOfDataEntries);
+            if (!NT_SUCCESS(Status))
+            {
+                DPRINT1("LpcpVerifyMessageDataInfo failed\n");
+                return Status;
+            }
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            DPRINT1("Got exception\n");
+            return _SEH2_GetExceptionCode();
+        }
+        _SEH2_END;
+    }
+    else
+    {
+        LocalLpcRequest = *LpcRequest;
+        Status = LpcpVerifyMessageDataInfo(LpcRequest, &NumberOfDataEntries);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("LpcpVerifyMessageDataInfo failed\n");
+            return Status;
+        }
+    }
+
     /* Check if this is an LPC Request */
-    if (LpcpGetMessageType(LpcRequest) == LPC_REQUEST)
+    if (LpcpGetMessageType(&LocalLpcRequest) == LPC_REQUEST)
     {
         /* Then it's a callback */
         Callback = TRUE;
     }
-    else if (LpcpGetMessageType(LpcRequest))
+    else if (LpcpGetMessageType(&LocalLpcRequest))
     {
         /* This is a not kernel-mode message */
+        DPRINT1("Not a kernel-mode message!\n");
         return STATUS_INVALID_PARAMETER;
     }
     else
     {
         /* This is a kernel-mode message without a callback */
-        LpcRequest->u2.s2.Type |= LPC_REQUEST;
+        LocalLpcRequest.u2.s2.Type |= LPC_REQUEST;
         Callback = FALSE;
     }
 
     /* Get the message type */
-    MessageType = LpcRequest->u2.s2.Type;
+    MessageType = LocalLpcRequest.u2.s2.Type;
 
+    /* Due to the above probe, we know that TotalLength is positive */
+    NT_ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0);
+
     /* Validate the length */
-    if (((ULONG)LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) >
-         (ULONG)LpcRequest->u1.s1.TotalLength)
+    if ((((ULONG)(USHORT)LocalLpcRequest.u1.s1.DataLength + sizeof(PORT_MESSAGE)) >
+         (ULONG)LocalLpcRequest.u1.s1.TotalLength))
     {
         /* Fail */
+        DPRINT1("Invalid message length: %u, %u\n",
+                LocalLpcRequest.u1.s1.DataLength,
+                LocalLpcRequest.u1.s1.TotalLength);
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -700,10 +790,13 @@
     if (!NT_SUCCESS(Status)) return Status;
 
     /* Validate the message length */
-    if (((ULONG)LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) ||
-        ((ULONG)LpcRequest->u1.s1.TotalLength <= (ULONG)LpcRequest->u1.s1.DataLength))
+    if (((ULONG)LocalLpcRequest.u1.s1.TotalLength > Port->MaxMessageLength) ||
+        ((ULONG)LocalLpcRequest.u1.s1.TotalLength <= (ULONG)LocalLpcRequest.u1.s1.DataLength))
     {
         /* Fail */
+        DPRINT1("Invalid message length: %u, %u\n",
+                LocalLpcRequest.u1.s1.DataLength,
+                LocalLpcRequest.u1.s1.TotalLength);
         ObDereferenceObject(Port);
         return STATUS_PORT_MESSAGE_TOO_LONG;
     }
@@ -713,6 +806,7 @@
     if (!Message)
     {
         /* Fail if we couldn't allocate a message */
+        DPRINT1("Failed to allocate a message!\n");
         ObDereferenceObject(Port);
         return STATUS_NO_MEMORY;
     }
@@ -729,6 +823,22 @@
         /* No callback, just copy the message */
         _SEH2_TRY
         {
+            /* Check if we have data info entries */
+            if (LpcRequest->u2.s2.DataInfoOffset != 0)
+            {
+                /* Get the data info and check if the number of entries matches
+                   what we expect */
+                DataInfo = LpcpGetDataInfoFromMessage(LpcRequest);
+                if (DataInfo->NumberOfEntries != NumberOfDataEntries)
+                {
+                    LpcpFreeToPortZone(Message, 0);
+                    ObDereferenceObject(Port);
+                    DPRINT1("NumberOfEntries has changed: %u, %u\n",
+                            DataInfo->NumberOfEntries, NumberOfDataEntries);
+                    return STATUS_INVALID_PARAMETER;
+                }
+            }
+
             /* Copy it */
             LpcpMoveMessage(&Message->Request,
                             LpcRequest,
@@ -739,6 +849,7 @@
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
             /* Fail */
+            DPRINT1("Got exception!\n");
             LpcpFreeToPortZone(Message, 0);
             ObDereferenceObject(Port);
             _SEH2_YIELD(return _SEH2_GetExceptionCode());
@@ -759,6 +870,7 @@
             if (!QueuePort)
             {
                 /* We have no connected port, fail */
+                DPRINT1("No connected port\n");
                 LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
                 ObDereferenceObject(Port);
                 return STATUS_PORT_DISCONNECTED;
@@ -767,22 +879,14 @@
             /* This will be the rundown port */
             ReplyPort = QueuePort;
 
-            /* Check if this is a communication port */
+            /* Check if this is a client port */
             if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
             {
-                /* Copy the port context and use the connection port */
+                /* Copy the port context */
                 Message->PortContext = QueuePort->PortContext;
-                ConnectionPort = QueuePort = Port->ConnectionPort;
-                if (!ConnectionPort)
-                {
-                    /* Fail */
-                    LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
-                    ObDereferenceObject(Port);
-                    return STATUS_PORT_DISCONNECTED;
-                }
             }
-            else if ((Port->Flags & LPCP_PORT_TYPE_MASK) !=
-                      LPCP_COMMUNICATION_PORT)
+
+            if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT)
             {
                 /* Use the connection port for anything but communication ports */
                 ConnectionPort = QueuePort = Port->ConnectionPort;
@@ -789,6 +893,7 @@
                 if (!ConnectionPort)
                 {
                     /* Fail */
+                    DPRINT1("No connection port\n");
                     LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
                     ObDereferenceObject(Port);
                     return STATUS_PORT_DISCONNECTED;
@@ -883,6 +988,7 @@
             }
             _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
             {
+                DPRINT1("Got exception!\n");
                 Status = _SEH2_GetExceptionCode();
             }
             _SEH2_END;
Index: ntoskrnl/po/power.c
===================================================================
--- ntoskrnl/po/power.c	(rÃ©vision 61927)
+++ ntoskrnl/po/power.c	(copie de travail)
@@ -9,7 +9,6 @@
 
 /* INCLUDES ******************************************************************/
 
-#include "initguid.h"
 #include <ntoskrnl.h>
 #define NDEBUG
 #include <debug.h>
Index: ntoskrnl/ps/query.c
===================================================================
--- ntoskrnl/ps/query.c	(rÃ©vision 61927)
+++ ntoskrnl/ps/query.c	(copie de travail)
@@ -1917,10 +1917,13 @@
              break;
 
         case ProcessQuotaLimits:
-            DPRINT1("Quota Limits not implemented\n");
-            Status = STATUS_NOT_IMPLEMENTED;
-            break;
 
+            return PspSetQuotaLimits(ProcessHandle,
+                                     1,
+                                     ProcessInformation,
+                                     ProcessInformationLength,
+                                     PreviousMode);
+
         case ProcessWorkingSetWatch:
             DPRINT1("WS watch not implemented\n");
             Status = STATUS_NOT_IMPLEMENTED;
Index: ntoskrnl/ps/security.c
===================================================================
--- ntoskrnl/ps/security.c	(rÃ©vision 61927)
+++ ntoskrnl/ps/security.c	(copie de travail)
@@ -698,26 +698,8 @@
 
     /* Check if we don't have impersonation info */
     Process = Thread->ThreadsProcess;
-    if (!Thread->ActiveImpersonationInfo)
+    if (Thread->ActiveImpersonationInfo)
     {
-        /* Fast Reference the Token */
-        Token = ObFastReferenceObject(&Process->Token);
-
-        /* Check if we got the Token or if we got locked */
-        if (!Token)
-        {
-            /* Lock the Process */
-            PspLockProcessSecurityShared(Process);
-
-            /* Do a Locked Fast Reference */
-            Token = ObFastReferenceObjectLocked(&Process->Token);
-
-            /* Unlock the Process */
-            PspUnlockProcessSecurityShared(Process);
-        }
-    }
-    else
-    {
         /* Lock the Process */
         PspLockProcessSecurityShared(Process);
 
@@ -742,6 +724,22 @@
         PspUnlockProcessSecurityShared(Process);
     }
 
+    /* Fast Reference the Token */
+    Token = ObFastReferenceObject(&Process->Token);
+
+    /* Check if we got the Token or if we got locked */
+    if (!Token)
+    {
+        /* Lock the Process */
+        PspLockProcessSecurityShared(Process);
+
+        /* Do a Locked Fast Reference */
+        Token = ObFastReferenceObjectLocked(&Process->Token);
+
+        /* Unlock the Process */
+        PspUnlockProcessSecurityShared(Process);
+    }
+
     /* Return the token */
     *TokenType = TokenPrimary;
     *EffectiveOnly = FALSE;
Index: ntoskrnl/ps/quota.c
===================================================================
--- ntoskrnl/ps/quota.c	(rÃ©vision 61927)
+++ ntoskrnl/ps/quota.c	(copie de travail)
@@ -11,11 +11,20 @@
 /* INCLUDES **************************************************************/
 
 #include <ntoskrnl.h>
+#include <ntintsafe.h>
 #define NDEBUG
 #include <debug.h>
 
 EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock;
+static LIST_ENTRY PspQuotaBlockList = {&PspQuotaBlockList, &PspQuotaBlockList};
+static KSPIN_LOCK PspQuotaLock;
 
+#define TAG_QUOTA_BLOCK 'bQsP'
+#define VALID_QUOTA_FLAGS (QUOTA_LIMITS_HARDWS_MIN_ENABLE | \
+                           QUOTA_LIMITS_HARDWS_MIN_DISABLE | \
+                           QUOTA_LIMITS_HARDWS_MAX_ENABLE | \
+                           QUOTA_LIMITS_HARDWS_MAX_DISABLE)
+
 /* PRIVATE FUNCTIONS *******************************************************/
 
 /*
@@ -118,13 +127,29 @@
 
 VOID
 NTAPI
+PspInsertQuotaBlock(
+    PEPROCESS_QUOTA_BLOCK QuotaBlock)
+{
+    KIRQL OldIrql;
+
+    OldIrql = KfAcquireSpinLock(&PspQuotaLock);
+    InsertTailList(&PspQuotaBlockList, &QuotaBlock->QuotaList);
+    KfReleaseSpinLock(&PspQuotaLock, OldIrql);
+}
+
+VOID
+NTAPI
 PspDestroyQuotaBlock(PEPROCESS Process)
 {
     PEPROCESS_QUOTA_BLOCK QuotaBlock = Process->QuotaBlock;
+    KIRQL OldIrql;
 
     if (QuotaBlock != &PspDefaultQuotaBlock &&
         InterlockedDecrementUL(&QuotaBlock->ReferenceCount) == 0)
     {
+        OldIrql = KfAcquireSpinLock(&PspQuotaLock);
+        RemoveEntryList(&QuotaBlock->QuotaList);
+        KfReleaseSpinLock(&PspQuotaLock, OldIrql);
         ExFreePool(QuotaBlock);
     }
 }
@@ -264,4 +289,181 @@
     return STATUS_SUCCESS;
 }
 
+NTSTATUS
+NTAPI
+PspSetQuotaLimits(
+    _In_ HANDLE ProcessHandle,
+    _In_ ULONG Unused,
+    _In_ PVOID QuotaLimits,
+    _In_ ULONG QuotaLimitsLength,
+    _In_ KPROCESSOR_MODE PreviousMode)
+{
+    QUOTA_LIMITS_EX CapturedQuotaLimits;
+    PEPROCESS Process;
+    PEPROCESS_QUOTA_BLOCK QuotaBlock, OldQuotaBlock;
+    BOOLEAN IncreaseOkay;
+    KAPC_STATE SavedApcState;
+    NTSTATUS Status;
+
+    UNREFERENCED_PARAMETER(Unused);
+
+    _SEH2_TRY
+    {
+        ProbeForRead(QuotaLimits, QuotaLimitsLength, sizeof(ULONG));
+
+        /* Check if we have the basic or extended structure */
+        if (QuotaLimitsLength == sizeof(QUOTA_LIMITS))
+        {
+            /* Copy the basic structure, zero init the remaining fields */
+            RtlCopyMemory(&CapturedQuotaLimits, QuotaLimits, sizeof(QUOTA_LIMITS));
+            CapturedQuotaLimits.WorkingSetLimit = 0;
+            CapturedQuotaLimits.Reserved2 = 0;
+            CapturedQuotaLimits.Reserved3 = 0;
+            CapturedQuotaLimits.Reserved4 = 0;
+            CapturedQuotaLimits.CpuRateLimit.RateData = 0;
+            CapturedQuotaLimits.Flags = 0;
+        }
+        else if (QuotaLimitsLength == sizeof(QUOTA_LIMITS_EX))
+        {
+            /* Copy the full structure */
+            RtlCopyMemory(&CapturedQuotaLimits, QuotaLimits, sizeof(QUOTA_LIMITS_EX));
+
+            /* Verify that the caller passed valid flags */
+            if ((CapturedQuotaLimits.Flags & ~VALID_QUOTA_FLAGS) ||
+                ((CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MIN_ENABLE) &&
+                 (CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MIN_DISABLE)) ||
+                ((CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MAX_ENABLE) &&
+                 (CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MAX_DISABLE)))
+            {
+                DPRINT1("Invalid quota flags: 0x%lx\n", CapturedQuotaLimits.Flags);
+                return STATUS_INVALID_PARAMETER;
+            }
+
+            /* Verify that the caller didn't pass reserved values */
+            if ((CapturedQuotaLimits.WorkingSetLimit != 0) ||
+                (CapturedQuotaLimits.Reserved2 != 0) ||
+                (CapturedQuotaLimits.Reserved3 != 0) ||
+                (CapturedQuotaLimits.Reserved4 != 0) ||
+                (CapturedQuotaLimits.CpuRateLimit.RateData != 0))
+            {
+                DPRINT1("Invalid value: (%lx,%lx,%lx,%lx,%lx)\n",
+                        CapturedQuotaLimits.WorkingSetLimit,
+                        CapturedQuotaLimits.Reserved2,
+                        CapturedQuotaLimits.Reserved3,
+                        CapturedQuotaLimits.Reserved4,
+                        CapturedQuotaLimits.CpuRateLimit.RateData);
+                return STATUS_INVALID_PARAMETER;
+            }
+        }
+        else
+        {
+            DPRINT1("Invalid quota size: 0x%lx\n", QuotaLimitsLength);
+            return STATUS_INFO_LENGTH_MISMATCH;
+        }
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        DPRINT1("Exception while copying data\n");
+        return _SEH2_GetExceptionCode();
+    }
+    _SEH2_END;
+
+    /* Reference the process */
+    Status = ObReferenceObjectByHandle(ProcessHandle,
+                                       PROCESS_SET_QUOTA,
+                                       PsProcessType,
+                                       PreviousMode,
+                                       (PVOID*)&Process,
+                                       NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to reference process handle: 0x%lx\n", Status);
+        return Status;
+    }
+
+    /* Check the caller changes the working set size limits */
+    if ((CapturedQuotaLimits.MinimumWorkingSetSize != 0) &&
+        (CapturedQuotaLimits.MaximumWorkingSetSize != 0))
+    {
+        /* Check for special case: trimming the WS */
+        if ((CapturedQuotaLimits.MinimumWorkingSetSize == SIZE_T_MAX) &&
+            (CapturedQuotaLimits.MaximumWorkingSetSize == SIZE_T_MAX))
+        {
+            /* No increase allowed */
+            IncreaseOkay = FALSE;
+        }
+        else
+        {
+            /* Check if the caller has the required privilege */
+            IncreaseOkay = SeSinglePrivilegeCheck(SeIncreaseQuotaPrivilege,
+                                                  PreviousMode);
+        }
+
+        /* Attach to the target process and disable APCs */
+        KeStackAttachProcess(&Process->Pcb, &SavedApcState);
+        KeEnterGuardedRegion();
+
+        /* Call Mm to adjust the process' working set size */
+        Status = MmAdjustWorkingSetSize(CapturedQuotaLimits.MinimumWorkingSetSize,
+                                        CapturedQuotaLimits.MaximumWorkingSetSize,
+                                        0,
+                                        IncreaseOkay);
+
+        /* Bring back APCs and detach from the process */
+        KeLeaveGuardedRegion();
+        KeUnstackDetachProcess(&SavedApcState);
+    }
+    else if (Process->QuotaBlock == &PspDefaultQuotaBlock)
+    {
+        /* Check if the caller has the required privilege */
+        if (!SeSinglePrivilegeCheck(SeIncreaseQuotaPrivilege, PreviousMode))
+        {
+            ObDereferenceObject(Process);
+            return STATUS_PRIVILEGE_NOT_HELD;
+        }
+
+        /* Allocate a new quota block */
+        QuotaBlock = ExAllocatePoolWithTag(NonPagedPool,
+                                           sizeof(EPROCESS_QUOTA_BLOCK),
+                                           TAG_QUOTA_BLOCK);
+        if (QuotaBlock == NULL)
+        {
+            ObDereferenceObject(Process);
+            return STATUS_NO_MEMORY;
+        }
+
+        /* Initialize the quota block */
+        QuotaBlock->ReferenceCount = 1;
+        QuotaBlock->ProcessCount = 1;
+        QuotaBlock->QuotaEntry[0].Peak = Process->QuotaPeak[0];
+        QuotaBlock->QuotaEntry[1].Peak = Process->QuotaPeak[1];
+        QuotaBlock->QuotaEntry[2].Peak = Process->QuotaPeak[2];
+        QuotaBlock->QuotaEntry[0].Limit = PspDefaultQuotaBlock.QuotaEntry[0].Limit;
+        QuotaBlock->QuotaEntry[1].Limit = PspDefaultQuotaBlock.QuotaEntry[1].Limit;
+        QuotaBlock->QuotaEntry[2].Limit = PspDefaultQuotaBlock.QuotaEntry[2].Limit;
+
+        /* Try to exchange the quota block, if that failed, just drop it */
+        OldQuotaBlock = InterlockedCompareExchangePointer(&Process->QuotaBlock,
+                                                          QuotaBlock,
+                                                          &PspDefaultQuotaBlock);
+        if (OldQuotaBlock == &PspDefaultQuotaBlock)
+        {
+            /* Success, insert the new quota block */
+            PspInsertQuotaBlock(QuotaBlock);
+        }
+        else
+        {
+            /* Failed, free the quota block and ignore it */
+            ExFreePoolWithTag(QuotaBlock, TAG_QUOTA_BLOCK);
+        }
+
+        Status = STATUS_SUCCESS;
+    }
+
+    /* Dereference the process and return the status */
+    ObDereferenceObject(Process);
+    return Status;
+}
+
+
 /* EOF */
Index: ntoskrnl/include/internal/ps.h
===================================================================
--- ntoskrnl/include/internal/ps.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/ps.h	(copie de travail)
@@ -300,6 +300,15 @@
     IN PEPROCESS Process
 );
 
+NTSTATUS
+NTAPI
+PspSetQuotaLimits(
+    _In_ HANDLE ProcessHandle,
+    _In_ ULONG Unused,
+    _In_ PVOID QuotaLimits,
+    _In_ ULONG QuotaLimitsLength,
+    _In_ KPROCESSOR_MODE PreviousMode);
+
 #if defined(_X86_)
 //
 // VDM and LDT Support
Index: ntoskrnl/include/internal/lpc_x.h
===================================================================
--- ntoskrnl/include/internal/lpc_x.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/lpc_x.h	(copie de travail)
@@ -164,3 +164,10 @@
     Thread->LpcWaitingOnPort = (PVOID)(((ULONG_PTR)Port) |
                                        LPCP_THREAD_FLAG_IS_PORT);
 }
+
+FORCEINLINE
+PLPCP_DATA_INFO
+LpcpGetDataInfoFromMessage(PPORT_MESSAGE Message)
+{
+    return (PLPCP_DATA_INFO)((PUCHAR)Message + Message->u2.s2.DataInfoOffset);
+}
Index: ntoskrnl/include/internal/se.h
===================================================================
--- ntoskrnl/include/internal/se.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/se.h	(copie de travail)
@@ -143,6 +143,8 @@
 extern PSID SeAuthenticatedUsersSid;
 extern PSID SeRestrictedSid;
 extern PSID SeAnonymousLogonSid;
+extern PSID SeLocalServiceSid;
+extern PSID SeNetworkServiceSid;
 
 /* Privileges */
 extern const LUID SeCreateTokenPrivilege;
@@ -245,10 +247,6 @@
 NTAPI
 SeInitSystem(VOID);
 
-BOOLEAN
-NTAPI
-SeInitSRM(VOID);
-
 VOID
 NTAPI
 ExpInitLuid(VOID);
@@ -384,6 +382,16 @@
     KPROCESSOR_MODE PreviousMode
 );
 
+NTSTATUS
+NTAPI
+SePrivilegePolicyCheck(
+    _Inout_ PACCESS_MASK DesiredAccess,
+    _Inout_ PACCESS_MASK GrantedAccess,
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ PTOKEN Token,
+    _Out_opt_ PPRIVILEGE_SET *OutPrivilegeSet,
+    _In_ KPROCESSOR_MODE PreviousMode);
+
 BOOLEAN
 NTAPI
 SeCheckPrivilegedObject(
@@ -525,6 +533,20 @@
                     IN ACCESS_MASK DesiredAccess,
                     IN KPROCESSOR_MODE AccessMode);
 
+BOOLEAN
+NTAPI
+SeCheckAuditPrivilege(
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ KPROCESSOR_MODE PreviousMode);
+
+VOID
+NTAPI
+SePrivilegedServiceAuditAlarm(
+    _In_opt_ PUNICODE_STRING ServiceName,
+    _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext,
+    _In_ PPRIVILEGE_SET PrivilegeSet,
+    _In_ BOOLEAN AccessGranted);
+
 #endif
 
 /* EOF */
Index: ntoskrnl/include/internal/mm.h
===================================================================
--- ntoskrnl/include/internal/mm.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/mm.h	(copie de travail)
@@ -9,9 +9,6 @@
 extern PMMSUPPORT MmKernelAddressSpace;
 extern PFN_COUNT MiFreeSwapPages;
 extern PFN_COUNT MiUsedSwapPages;
-extern SIZE_T MmTotalPagedPoolQuota;
-extern SIZE_T MmTotalNonPagedPoolQuota;
-extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress;
 extern PFN_COUNT MmNumberOfPhysicalPages;
 extern UCHAR MmDisablePagingExecutive;
 extern PFN_NUMBER MmLowestPhysicalPage;
@@ -19,9 +16,6 @@
 extern PFN_NUMBER MmAvailablePages;
 extern PFN_NUMBER MmResidentAvailablePages;
 
-extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor;
-extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg;
-
 extern LIST_ENTRY MmLoadedUserImageList;
 
 extern KMUTANT MmSystemLoadLock;
@@ -43,8 +37,8 @@
 extern SIZE_T MmPeakCommitment;
 extern SIZE_T MmtotalCommitLimitMaximum;
 
-extern PVOID MiDebugMapping;
-extern PMMPTE MmDebugPte;
+extern PVOID MiDebugMapping; // internal
+extern PMMPTE MmDebugPte; // internal
 
 struct _KTRAP_FRAME;
 struct _EPROCESS;
@@ -66,7 +60,7 @@
 //
 #define MMDBG_COPY_MAX_SIZE         0x8
 
-#if defined(_X86_)
+#if defined(_X86_) // intenal for marea.c
 #define MI_STATIC_MEMORY_AREAS              (14)
 #else
 #define MI_STATIC_MEMORY_AREAS              (13)
@@ -77,19 +71,6 @@
 #define MEMORY_AREA_OWNED_BY_ARM3           (15)
 #define MEMORY_AREA_STATIC                  (0x80000000)
 
-#define MM_PHYSICAL_PAGE_MPW_PENDING        (0x8)
-
-#define MM_CORE_DUMP_TYPE_NONE              (0x0)
-#define MM_CORE_DUMP_TYPE_MINIMAL           (0x1)
-#define MM_CORE_DUMP_TYPE_FULL              (0x2)
-
-/* Number of list heads to use */
-#define MI_FREE_POOL_LISTS 4
-
-
-/* Signature of free pool blocks */
-#define MM_FREE_POOL_TAG    'lprF'
-
 /* Although Microsoft says this isn't hardcoded anymore,
    they won't be able to change it. Stuff depends on it */
 #define MM_VIRTMEM_GRANULARITY              (64 * 1024)
@@ -119,14 +100,7 @@
 #define SESSION_POOL_MASK                   32
 #define VERIFIER_POOL_MASK                  64
 
-#define MM_PAGED_POOL_SIZE                  (100*1024*1024)
-#define MM_NONPAGED_POOL_SIZE               (100*1024*1024)
-
-/*
- * Paged and non-paged pools are 8-byte aligned
- */
-#define MM_POOL_ALIGNMENT                   8
-
+// FIXME: use ALIGN_UP_BY
 #define MM_ROUND_UP(x,s)                    \
     ((PVOID)(((ULONG_PTR)(x)+(s)-1) & ~((ULONG_PTR)(s)-1)))
 
@@ -133,18 +107,6 @@
 #define MM_ROUND_DOWN(x,s)                  \
     ((PVOID)(((ULONG_PTR)(x)) & ~((ULONG_PTR)(s)-1)))
 
-#define PAGE_FLAGS_VALID_FROM_USER_MODE     \
-    (PAGE_READONLY | \
-    PAGE_READWRITE | \
-    PAGE_WRITECOPY | \
-    PAGE_EXECUTE | \
-    PAGE_EXECUTE_READ | \
-    PAGE_EXECUTE_READWRITE | \
-    PAGE_EXECUTE_WRITECOPY | \
-    PAGE_GUARD | \
-    PAGE_NOACCESS | \
-    PAGE_NOCACHE)
-
 #define PAGE_FLAGS_VALID_FOR_SECTION \
     (PAGE_READONLY | \
      PAGE_READWRITE | \
@@ -331,18 +293,22 @@
     USHORT RemovalRequested:1;
     USHORT CacheAttribute:2;
     USHORT Rom:1;
-    USHORT ParityError:1;                    // HasRmap
+    USHORT ParityError:1;
 } MMPFNENTRY;
 
+// Mm internal
 typedef struct _MMPFN
 {
     union
     {
         PFN_NUMBER Flink;
-        ULONG WsIndex;                       // SavedSwapEntry
+        ULONG WsIndex;
         PKEVENT Event;
         NTSTATUS ReadStatus;
         SINGLE_LIST_ENTRY NextStackPfn;
+
+        // HACK for ROSPFN
+        SWAPENTRY SwapEntry;
     } u1;
     PMMPTE PteAddress;
     union
@@ -354,7 +320,7 @@
     {
         struct
         {
-            USHORT ReferenceCount;           // ReferenceCount
+            USHORT ReferenceCount;
             MMPFNENTRY e1;
         };
         struct
@@ -366,7 +332,10 @@
     union
     {
         MMPTE OriginalPte;
-        LONG AweReferenceCount;              // RmapListHead
+        LONG AweReferenceCount;
+
+        // HACK for ROSPFN
+        PMM_RMAP_ENTRY RmapListHead;
     };
     union
     {
@@ -385,6 +354,9 @@
     MI_PFN_USAGES PfnUsage;
     CHAR ProcessName[16];
 #endif
+
+    // HACK until WS lists are supported
+    MMWSLE Wsle;
 } MMPFN, *PMMPFN;
 
 extern PMMPFN MmPfnDatabase;
@@ -418,6 +390,7 @@
     LIST_ENTRY RegionListEntry;
 } MM_REGION, *PMM_REGION;
 
+// Mm internal
 /* Entry describing free pool memory */
 typedef struct _MMFREE_POOL_ENTRY
 {
@@ -522,9 +495,10 @@
     PVOID Address
 );
 
+// fixme: unused?
 ULONG_PTR
 NTAPI
-MmFindGapAtAddress(
+MmFindGapAtAddress_(
     PMMSUPPORT AddressSpace,
     PVOID Address
 );
@@ -547,10 +521,6 @@
     PVOID FreePageContext
 );
 
-VOID
-NTAPI
-MmDumpMemoryAreas(PMMSUPPORT AddressSpace);
-
 PMEMORY_AREA
 NTAPI
 MmLocateMemoryAreaByRegion(
@@ -570,14 +540,6 @@
 
 VOID
 NTAPI
-MmReleaseMemoryAreaIfDecommitted(
-    struct _EPROCESS *Process,
-    PMMSUPPORT AddressSpace,
-    PVOID BaseAddress
-);
-
-VOID
-NTAPI
 MmMapMemoryArea(PVOID BaseAddress,
                 SIZE_T Length,
                 ULONG Consumer,
@@ -596,14 +558,6 @@
 
 VOID
 NTAPI
-MiDebugDumpNonPagedPool(BOOLEAN NewOnly);
-
-VOID
-NTAPI
-MiDebugDumpNonPagedPoolStats(BOOLEAN NewOnly);
-
-VOID
-NTAPI
 MiInitializeNonPagedPool(VOID);
 
 PVOID
@@ -625,73 +579,10 @@
     IN PVOID StartingAddress
 );
 
-PVOID
-NTAPI
-MmGetMdlPageAddress(
-    PMDL Mdl,
-    PVOID Offset
-);
-
 /* pool.c *******************************************************************/
 
-PVOID
-NTAPI
-ExAllocateNonPagedPoolWithTag(
-    POOL_TYPE type,
-    ULONG size,
-    ULONG Tag,
-    PVOID Caller
-);
-
-PVOID
-NTAPI
-ExAllocatePagedPoolWithTag(
-    POOL_TYPE Type,
-    ULONG size,
-    ULONG Tag
-);
-
-VOID
-NTAPI
-ExFreeNonPagedPool(PVOID block);
-
-VOID
-NTAPI
-ExFreePagedPool(IN PVOID Block);
-
 BOOLEAN
 NTAPI
-ExpIsPoolTagDebuggable(ULONG Tag);
-
-PVOID
-NTAPI
-ExpAllocateDebugPool(
-    POOL_TYPE Type,
-    ULONG Size,
-    ULONG Tag,
-    PVOID Caller,
-    BOOLEAN EndOfPage
-);
-
-VOID
-NTAPI
-ExpFreeDebugPool(PVOID Block, BOOLEAN PagedPool);
-
-VOID
-NTAPI
-MmInitializePagedPool(VOID);
-
-PVOID
-NTAPI
-MiAllocateSpecialPool(
-    IN POOL_TYPE PoolType,
-    IN SIZE_T NumberOfBytes,
-    IN ULONG Tag,
-    IN ULONG Underrun
-);
-
-BOOLEAN
-NTAPI
 MiRaisePoolQuota(
     IN POOL_TYPE PoolType,
     IN ULONG CurrentMaxQuota,
@@ -711,10 +602,6 @@
 
 VOID
 NTAPI
-MiShutdownMemoryManager(VOID);
-
-VOID
-NTAPI
 MmInit1(
     VOID
 );
@@ -724,14 +611,7 @@
 MmInitSystem(IN ULONG Phase,
              IN PLOADER_PARAMETER_BLOCK LoaderBlock);
 
-VOID
-NTAPI
-MiFreeInitMemory(VOID);
 
-VOID
-NTAPI
-MmInitializeMdlImplementation(VOID);
-
 /* pagefile.c ****************************************************************/
 
 SWAPENTRY
@@ -740,10 +620,6 @@
 
 VOID
 NTAPI
-MmDereserveSwapPages(ULONG Nr);
-
-VOID
-NTAPI
 MmFreeSwapPage(SWAPENTRY Entry);
 
 VOID
@@ -761,10 +637,6 @@
     PFN_NUMBER Page
 );
 
-BOOLEAN
-NTAPI
-MmReserveSwapPages(ULONG Nr);
-
 NTSTATUS
 NTAPI
 MmWriteToSwapPage(
@@ -772,21 +644,6 @@
     PFN_NUMBER Page
 );
 
-NTSTATUS
-NTAPI
-MmDumpToPagingFile(
-    ULONG BugCode,
-    ULONG BugCodeParameter1,
-    ULONG BugCodeParameter2,
-    ULONG BugCodeParameter3,
-    ULONG BugCodeParameter4,
-    struct _KTRAP_FRAME* TrapFrame
-);
-
-BOOLEAN
-NTAPI
-MmIsAvailableSwapPage(VOID);
-
 VOID
 NTAPI
 MmShowOutOfSpaceMessagePagingFile(VOID);
@@ -899,75 +756,8 @@
     IN PVOID TrapInformation
 );
 
-/* anonmem.c *****************************************************************/
-
-NTSTATUS
-NTAPI
-MmNotPresentFaultVirtualMemory(
-    PMMSUPPORT AddressSpace,
-    MEMORY_AREA* MemoryArea,
-    PVOID Address
-);
-
-NTSTATUS
-NTAPI
-MmPageOutVirtualMemory(
-    PMMSUPPORT AddressSpace,
-    PMEMORY_AREA MemoryArea,
-    PVOID Address,
-    PFN_NUMBER Page
-);
-
-NTSTATUS
-NTAPI
-MmQueryAnonMem(
-    PMEMORY_AREA MemoryArea,
-    PVOID Address,
-    PMEMORY_BASIC_INFORMATION Info,
-    PSIZE_T ResultLength
-);
-
-VOID
-NTAPI
-MmFreeVirtualMemory(
-    struct _EPROCESS* Process,
-    PMEMORY_AREA MemoryArea
-);
-
-NTSTATUS
-NTAPI
-MmProtectAnonMem(
-    PMMSUPPORT AddressSpace,
-    PMEMORY_AREA MemoryArea,
-    PVOID BaseAddress,
-    SIZE_T Length,
-    ULONG Protect,
-    PULONG OldProtect
-);
-
-NTSTATUS
-NTAPI
-MmWritePageVirtualMemory(
-    PMMSUPPORT AddressSpace,
-    PMEMORY_AREA MArea,
-    PVOID Address,
-    PFN_NUMBER Page
-);
-
 /* kmap.c ********************************************************************/
 
-PVOID
-NTAPI
-ExAllocatePage(VOID);
-
-VOID
-NTAPI
-ExUnmapPage(PVOID Addr);
-
-PVOID
-NTAPI
-ExAllocatePageWithPhysPage(PFN_NUMBER Page);
-
 NTSTATUS
 NTAPI
 MiCopyFromUserPage(
@@ -975,16 +765,6 @@
     PFN_NUMBER OldPage
 );
 
-NTSTATUS
-NTAPI
-MiZeroPage(PFN_NUMBER Page);
-
-/* memsafe.s *****************************************************************/
-
-PVOID
-FASTCALL
-MmSafeReadPtr(PVOID Source);
-
 /* process.c *****************************************************************/
 
 PVOID
@@ -1142,38 +922,10 @@
 
 VOID
 NTAPI
-MmLockPage(PFN_NUMBER Page);
-
-VOID
-NTAPI
-MmUnlockPage(PFN_NUMBER Page);
-
-ULONG
-NTAPI
-MmGetLockCountPage(PFN_NUMBER Page);
-
-VOID
-NTAPI
-MmInitializePageList(
-    VOID
-);
-
-VOID
-NTAPI
 MmDumpArmPfnDatabase(
    IN BOOLEAN StatusOnly
 );
 
-PFN_NUMBER
-NTAPI
-MmGetContinuousPages(
-    ULONG NumberOfBytes,
-    PHYSICAL_ADDRESS LowestAcceptableAddress,
-    PHYSICAL_ADDRESS HighestAcceptableAddress,
-    PHYSICAL_ADDRESS BoundaryAddressMultiple,
-    BOOLEAN ZeroPages
-);
-
 VOID
 NTAPI
 MmZeroPageThread(
@@ -1224,22 +976,6 @@
 
 NTSTATUS
 NTAPI
-MmCreateVirtualMappingForKernel(
-    PVOID Address,
-    ULONG flProtect,
-    PPFN_NUMBER Pages,
-    ULONG PageCount
-);
-
-NTSTATUS
-NTAPI
-MmCommitPagedPoolAddress(
-    PVOID Address,
-    BOOLEAN Locked
-);
-
-NTSTATUS
-NTAPI
 MmCreateVirtualMapping(
     struct _EPROCESS* Process,
     PVOID Address,
@@ -1292,13 +1028,6 @@
 
 VOID
 NTAPI
-MmEnableVirtualMapping(
-    struct _EPROCESS *Process,
-    PVOID Address
-);
-
-VOID
-NTAPI
 MmGetPageFileMapping(
 	struct _EPROCESS *Process,
 	PVOID Address,
@@ -1329,13 +1058,6 @@
 
 VOID
 NTAPI
-MmTransferOwnershipPage(
-    PFN_NUMBER Page,
-    ULONG NewConsumer
-);
-
-VOID
-NTAPI
 MmSetDirtyPage(
     struct _EPROCESS *Process,
     PVOID Address
@@ -1347,16 +1069,6 @@
     ULONG Consumer
 );
 
-LONG
-NTAPI
-MmAllocPagesSpecifyRange(
-    ULONG Consumer,
-    PHYSICAL_ADDRESS LowestAddress,
-    PHYSICAL_ADDRESS HighestAddress,
-    ULONG NumberOfPages,
-    PPFN_NUMBER Pages
-);
-
 VOID
 NTAPI
 MmDereferencePage(PFN_NUMBER Page);
@@ -1390,10 +1102,6 @@
     PVOID Address
 );
 
-NTSTATUS
-NTAPI
-MmCreatePageTable(PVOID PAddress);
-
 VOID
 NTAPI
 MmDeletePageTable(
@@ -1432,10 +1140,6 @@
 
 NTSTATUS
 NTAPI
-MmReleaseMmInfo(struct _EPROCESS *Process);
-
-NTSTATUS
-NTAPI
 MmSetExecuteOptions(IN ULONG ExecuteOptions);
 
 NTSTATUS
@@ -1444,10 +1148,6 @@
 
 VOID
 NTAPI
-MmDeleteProcessPageDirectory(struct _EPROCESS *Process);
-
-VOID
-NTAPI
 MmDeleteVirtualMapping(
     struct _EPROCESS *Process,
     PVOID Address,
@@ -1463,30 +1163,6 @@
     PVOID Address
 );
 
-VOID
-NTAPI
-MmMarkPageMapped(PFN_NUMBER Page);
-
-VOID
-NTAPI
-MmMarkPageUnmapped(PFN_NUMBER Page);
-
-VOID
-NTAPI
-MmUpdatePageDir(
-    struct _EPROCESS *Process,
-    PVOID Address,
-    ULONG Size
-);
-
-VOID
-NTAPI
-MiInitPageDirectoryMap(VOID);
-
-ULONG
-NTAPI
-MiGetUserPageDirectoryCount(VOID);
-
 /* wset.c ********************************************************************/
 
 NTSTATUS
@@ -1556,13 +1232,6 @@
     OUT POBJECT_NAME_INFORMATION *ModuleName
 );
 
-PVOID
-NTAPI
-MmAllocateSection(
-    IN SIZE_T Length,
-    PVOID BaseAddress
-);
-
 NTSTATUS
 NTAPI
 MmQuerySectionView(
@@ -1621,41 +1290,6 @@
 NTAPI
 MmFreeSectionSegments(PFILE_OBJECT FileObject);
 
-/* mpw.c *********************************************************************/
-
-NTSTATUS
-NTAPI
-MmInitMpwThread(VOID);
-
-NTSTATUS
-NTAPI
-MmInitBsmThread(VOID);
-
-/* pager.c *******************************************************************/
-
-BOOLEAN
-NTAPI
-MiIsPagerThread(VOID);
-
-VOID
-NTAPI
-MiStartPagerThread(VOID);
-
-VOID
-NTAPI
-MiStopPagerThread(VOID);
-
-NTSTATUS
-FASTCALL
-MiQueryVirtualMemory(
-    IN HANDLE ProcessHandle,
-    IN PVOID Address,
-    IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass,
-    OUT PVOID VirtualMemoryInformation,
-    IN SIZE_T Length,
-    OUT PSIZE_T ResultLength
-);
-
 /* sysldr.c ******************************************************************/
 
 VOID
@@ -1758,6 +1392,17 @@
     ULONG Tag);
 
 
+/* mmsup.c *****************************************************************/
+
+NTSTATUS
+NTAPI
+MmAdjustWorkingSetSize(
+    IN SIZE_T WorkingSetMinimumInBytes,
+    IN SIZE_T WorkingSetMaximumInBytes,
+    IN ULONG SystemCache,
+    IN BOOLEAN IncreaseOkay);
+
+
 /* session.c *****************************************************************/
 
 _IRQL_requires_max_(APC_LEVEL)
@@ -1789,3 +1434,17 @@
 NTAPI
 MmSetSessionLocaleId(
     _In_ LCID LocaleId);
+
+
+/* virtual.c *****************************************************************/
+
+NTSTATUS
+NTAPI
+MmCopyVirtualMemory(IN PEPROCESS SourceProcess,
+                    IN PVOID SourceAddress,
+                    IN PEPROCESS TargetProcess,
+                    OUT PVOID TargetAddress,
+                    IN SIZE_T BufferSize,
+                    IN KPROCESSOR_MODE PreviousMode,
+                    OUT PSIZE_T ReturnSize);
+
Index: ntoskrnl/include/internal/ex.h
===================================================================
--- ntoskrnl/include/internal/ex.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/ex.h	(copie de travail)
@@ -27,6 +27,11 @@
 extern ULONG ExpAltTimeZoneBias;
 extern LIST_ENTRY ExSystemLookasideListHead;
 extern PCALLBACK_OBJECT PowerStateCallback;
+extern LIST_ENTRY ExPoolLookasideListHead;
+extern LIST_ENTRY ExpNonPagedLookasideListHead;
+extern LIST_ENTRY ExpPagedLookasideListHead;
+extern KSPIN_LOCK ExpNonPagedLookasideListLock;
+extern KSPIN_LOCK ExpPagedLookasideListLock;
 
 typedef struct _EXHANDLE
 {
Index: ntoskrnl/include/internal/lpc.h
===================================================================
--- ntoskrnl/include/internal/lpc.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/lpc.h	(copie de travail)
@@ -63,6 +63,18 @@
 #define LPCP_LOCK_HELD      1
 #define LPCP_LOCK_RELEASE   2
 
+
+typedef struct _LPCP_DATA_INFO
+{
+    ULONG NumberOfEntries;
+    struct
+    {
+        PVOID BaseAddress;
+        ULONG DataLength;
+    } Entries[1];
+} LPCP_DATA_INFO, *PLPCP_DATA_INFO;
+
+
 //
 // Internal Port Management
 //
@@ -131,6 +143,13 @@
     VOID
 );
 
+BOOLEAN
+NTAPI
+LpcpValidateClientPort(
+    PETHREAD ClientThread,
+    PLPCP_PORT_OBJECT Port);
+
+
 //
 // Global data inside the Process Manager
 //
Index: ntoskrnl/include/internal/fsrtl.h
===================================================================
--- ntoskrnl/include/internal/fsrtl.h	(rÃ©vision 61927)
+++ ntoskrnl/include/internal/fsrtl.h	(copie de travail)
@@ -53,9 +53,9 @@
 // Notifications flags
 //
 #define WATCH_TREE         0x01
-#define INVALIDATE_BUFFERS 0x02
+#define NOTIFY_IMMEDIATELY 0x02
 #define CLEANUP_IN_PROCESS 0x04
-#define ENUMERATE_DIR      0x08
+#define NOTIFY_LATER       0x08
 #define WATCH_ROOT         0x10
 #define DELETE_IN_PROCESS  0x20
 
Index: ntoskrnl/include/ntoskrnl.h
===================================================================
--- ntoskrnl/include/ntoskrnl.h	(rÃ©vision 61927)
+++ ntoskrnl/include/ntoskrnl.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _NTOSKRNL_PCH
+#define _NTOSKRNL_PCH
+
 /* INCLUDES ******************************************************************/
 
 /* ARM Bringup Hack */
@@ -69,9 +72,6 @@
 /* SEH support with PSEH */
 #include <pseh/pseh2.h>
 
-/* ReactOS Headers */
-#include <reactos/bugcodes.h>
-
 /* SetupLDR Support */
 #include <arc/setupblk.h>
 
@@ -125,3 +125,4 @@
 #include "internal/probe.h"
 #include "resource.h"
 
+#endif /* _NTOSKRNL_PCH */
Index: ntoskrnl/fsrtl/notify.c
===================================================================
--- ntoskrnl/fsrtl/notify.c	(rÃ©vision 61927)
+++ ntoskrnl/fsrtl/notify.c	(copie de travail)
@@ -12,6 +12,55 @@
 #define NDEBUG
 #include <debug.h>
 
+/* INLINED FUNCTIONS *********************************************************/
+
+/*
+ * @implemented
+ */
+FORCEINLINE
+VOID
+FsRtlNotifyAcquireFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync)
+{
+    ULONG_PTR CurrentThread = (ULONG_PTR)KeGetCurrentThread();
+
+    /* Only acquire fast mutex if it's not already acquired by the current thread */
+    if (RealNotifySync->OwningThread != CurrentThread)
+    {
+        ExAcquireFastMutexUnsafe(&(RealNotifySync->FastMutex));
+        RealNotifySync->OwningThread = CurrentThread;
+    }
+    /* Whatever the case, keep trace of the attempt to acquire fast mutex */
+    RealNotifySync->OwnerCount++;
+}
+
+/*
+ * @implemented
+ */
+FORCEINLINE
+VOID
+FsRtlNotifyReleaseFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync)
+{
+    RealNotifySync->OwnerCount--;
+    /* Release the fast mutex only if no other instance needs it */
+    if (!RealNotifySync->OwnerCount)
+    {
+        ExReleaseFastMutexUnsafe(&(RealNotifySync->FastMutex));
+        RealNotifySync->OwningThread = (ULONG_PTR)0;
+    }
+}
+
+#define FsRtlNotifyGetLastPartOffset(FullLen, TargLen, Type, Chr)                 \
+    for (FullPosition = 0; FullPosition < FullLen; ++FullPosition)                \
+        if (((Type)NotifyChange->FullDirectoryName->Buffer)[FullPosition] == Chr) \
+            ++FullNumberOfParts;                                                  \
+    for (LastPartOffset = 0; LastPartOffset < TargLen; ++LastPartOffset) {        \
+        if ( ((Type)TargetDirectory.Buffer)[LastPartOffset] == Chr) {             \
+            ++TargetNumberOfParts;                                                \
+        if (TargetNumberOfParts == FullNumberOfParts)                             \
+            break;                                                                \
+        }                                                                         \
+    }
+
 /* PRIVATE FUNCTIONS *********************************************************/
 
 VOID
@@ -22,13 +71,161 @@
 FsRtlNotifySetCancelRoutine(IN PIRP Irp,
                             IN PNOTIFY_CHANGE NotifyChange OPTIONAL);
 
+/*
+ * @implemented
+ */
 VOID
 NTAPI
 FsRtlCancelNotify(IN PDEVICE_OBJECT DeviceObject,
                   IN PIRP Irp)
 {
+    PVOID Buffer;
+    PIRP NotifyIrp;
+    ULONG BufferLength;
+    PIO_STACK_LOCATION Stack;
+    PNOTIFY_CHANGE NotifyChange;
+    PREAL_NOTIFY_SYNC RealNotifySync;
+    PSECURITY_SUBJECT_CONTEXT SubjectContext = NULL;
+
+    /* Get the NOTIFY_CHANGE struct and reset it */
+    NotifyChange = (PNOTIFY_CHANGE)Irp->IoStatus.Information;
+    Irp->IoStatus.Information = 0;
+    /* Reset the cancel routine */
+    IoSetCancelRoutine(Irp, NULL);
+    /* And release lock */
     IoReleaseCancelSpinLock(Irp->CancelIrql);
-    UNIMPLEMENTED;
+    /* Get REAL_NOTIFY_SYNC struct */
+    RealNotifySync = NotifyChange->NotifySync;
+
+    FsRtlNotifyAcquireFastMutex(RealNotifySync);
+
+   _SEH2_TRY
+   {
+       /* Remove the IRP from the notifications list and mark it pending */
+       RemoveEntryList(&(Irp->Tail.Overlay.ListEntry));
+       IoMarkIrpPending(Irp);
+
+       /* Now, the tricky part - let's find a buffer big enough to hold the return data */
+       if (NotifyChange->Buffer && NotifyChange->AllocatedBuffer == NULL &&
+           ((Irp->MdlAddress && MmGetSystemAddressForMdl(Irp->MdlAddress) == NotifyChange->Buffer) ||
+           NotifyChange->Buffer == Irp->AssociatedIrp.SystemBuffer))
+       {
+           /* Assume we didn't find any */
+           Buffer = NULL;
+           BufferLength = 0;
+
+           /* If we don't have IRPs, check if current buffer is big enough */
+           if (IsListEmpty(&NotifyChange->NotifyIrps))
+           {
+               if (NotifyChange->BufferLength >= NotifyChange->DataLength)
+               {
+                   BufferLength = NotifyChange->BufferLength;
+               }
+           }
+           else
+           {
+               /* Otherwise, try to look at next IRP available */
+               NotifyIrp = CONTAINING_RECORD(NotifyChange->NotifyIrps.Flink, IRP, Tail.Overlay.ListEntry);
+               Stack = IoGetCurrentIrpStackLocation(NotifyIrp);
+
+               /* If its buffer is big enough, get it */
+               if (Stack->Parameters.NotifyDirectory.Length >= NotifyChange->BufferLength)
+               {
+                   /* Is it MDL? */
+                   if (NotifyIrp->AssociatedIrp.SystemBuffer == NULL)
+                   {
+                       if (NotifyIrp->MdlAddress != NULL)
+                       {
+                           Buffer = MmGetSystemAddressForMdl(NotifyIrp->MdlAddress);
+                       }
+                   }
+                   else
+                   {
+                       Buffer = NotifyIrp->AssociatedIrp.MasterIrp;
+                   }
+
+                   /* Backup our accepted buffer length */
+                   BufferLength = Stack->Parameters.NotifyDirectory.Length;
+                   if (BufferLength > NotifyChange->BufferLength)
+                   {
+                       BufferLength = NotifyChange->BufferLength;
+                   }
+               }
+           }
+
+           /* At that point, we *may* have a buffer */
+
+           /* If it has null length, then note that we won't use it */
+           if (BufferLength == 0)
+           {
+               NotifyChange->Flags |= NOTIFY_IMMEDIATELY;
+           }
+           else
+           {
+               /* If we have a buffer length, but no buffer then allocate one */
+               if (Buffer == NULL)
+               {
+                   PsChargePoolQuota(NotifyChange->OwningProcess, PagedPool, BufferLength);
+                   Buffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, BufferLength, 'NrSF');
+                   NotifyChange->AllocatedBuffer = Buffer;
+               }
+
+               /* Copy data in that buffer */
+               RtlCopyMemory(Buffer, NotifyChange->Buffer, NotifyChange->DataLength);
+               NotifyChange->ThisBufferLength = BufferLength;
+               NotifyChange->Buffer = Buffer;
+           }
+
+           /* If we have to notify immediately, ensure that any buffer is 0-ed out */
+           if (NotifyChange->Flags & NOTIFY_IMMEDIATELY)
+           {
+               NotifyChange->Buffer = 0;
+               NotifyChange->AllocatedBuffer = 0;
+               NotifyChange->LastEntry = 0;
+               NotifyChange->DataLength = 0;
+               NotifyChange->ThisBufferLength = 0;
+           }
+       }
+
+       /* It's now time to complete - data are ready */
+
+       /* Set appropriate status and complete */
+       Irp->IoStatus.Status = STATUS_CANCELLED;
+       IofCompleteRequest(Irp, EVENT_INCREMENT);
+
+       /* If that notification isn't referenced any longer, drop it */
+       if (!InterlockedDecrement((PLONG)&(NotifyChange->ReferenceCount)))
+       {
+           /* If it had an allocated buffer, delete */
+           if (NotifyChange->AllocatedBuffer)
+           {
+               PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NotifyChange->ThisBufferLength);
+               ExFreePoolWithTag(NotifyChange->AllocatedBuffer, 'NrSF');
+           }
+
+           /* In case of full name, remember subject context for later deletion */
+           if (NotifyChange->FullDirectoryName)
+           {
+               SubjectContext = NotifyChange->SubjectContext;
+           }
+
+           /* We mustn't have ANY change left anymore */
+           ASSERT(NotifyChange->NotifyList.Flink == NULL);
+           ExFreePoolWithTag(NotifyChange, 0);
+       }
+    }
+    _SEH2_FINALLY
+    {
+        FsRtlNotifyReleaseFastMutex(RealNotifySync);
+
+        /* If the subject security context was captured, release and free it */
+        if (SubjectContext)
+        {
+            SeReleaseSubjectContext(SubjectContext);
+            ExFreePool(SubjectContext);
+        }
+    }
+    _SEH2_END;
 }
 
 /*
@@ -58,6 +255,9 @@
     }
 }
 
+/*
+ *@implemented
+ */
 PNOTIFY_CHANGE
 FsRtlIsNotifyOnList(IN PLIST_ENTRY NotifyList,
                     IN PVOID FsContext)
@@ -83,22 +283,6 @@
     return NULL;
 }
 
-FORCEINLINE
-VOID
-FsRtlNotifyAcquireFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync)
-{
-    ULONG_PTR CurrentThread = (ULONG_PTR)KeGetCurrentThread();
-
-    /* Only acquire fast mutex if it's not already acquired by the current thread */
-    if (RealNotifySync->OwningThread != CurrentThread)
-    {
-        ExAcquireFastMutexUnsafe(&(RealNotifySync->FastMutex));
-        RealNotifySync->OwningThread = CurrentThread;
-    }
-    /* Whatever the case, keep trace of the attempt to acquire fast mutex */
-    RealNotifySync->OwnerCount++;
-}
-
 /*
  * @implemented
  */
@@ -216,7 +400,7 @@
 
     DataLength = NotifyChange->DataLength;
 
-    NotifyChange->Flags &= (INVALIDATE_BUFFERS | WATCH_TREE);
+    NotifyChange->Flags &= (NOTIFY_IMMEDIATELY | WATCH_TREE);
     NotifyChange->DataLength = 0;
     NotifyChange->LastEntry = 0;
 
@@ -233,19 +417,6 @@
     }
 }
 
-FORCEINLINE
-VOID
-FsRtlNotifyReleaseFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync)
-{
-    RealNotifySync->OwnerCount--;
-    /* Release the fast mutex only if no other instance needs it */
-    if (!RealNotifySync->OwnerCount)
-    {
-        ExReleaseFastMutexUnsafe(&(RealNotifySync->FastMutex));
-        RealNotifySync->OwningThread = (ULONG_PTR)0;
-    }
-}
-
 /*
  * @implemented
  */
@@ -295,6 +466,92 @@
     return FALSE;
 }
 
+/*
+ * @implemented
+ */
+BOOLEAN
+FsRtlNotifyUpdateBuffer(OUT PFILE_NOTIFY_INFORMATION OutputBuffer,
+                        IN ULONG Action,
+                        IN PSTRING ParentName,
+                        IN PSTRING TargetName,
+                        IN PSTRING StreamName,
+                        IN BOOLEAN IsUnicode,
+                        IN ULONG DataLength)
+{
+    /* Unless there's an issue with buffers, there's no reason to fail */
+    BOOLEAN Succeed = TRUE;
+    ULONG AlreadyWritten = 0, ResultSize;
+
+    PAGED_CODE();
+
+    /* Update user buffer with the change that occured
+     * First copy parent name if any
+     * Then copy target name, there's always one
+     * And finally, copy stream name if any
+     * If these names aren't unicode, then convert first
+     */
+    _SEH2_TRY
+    {
+        OutputBuffer->NextEntryOffset = 0;
+        OutputBuffer->Action = Action;
+        OutputBuffer->FileNameLength = DataLength - FIELD_OFFSET(FILE_NOTIFY_INFORMATION, FileName);
+        if (IsUnicode)
+        {
+            if (ParentName->Length)
+            {
+                RtlCopyMemory(OutputBuffer->FileName, ParentName->Buffer, ParentName->Length);
+                OutputBuffer->FileName[ParentName->Length / sizeof(WCHAR)] = L'\\';
+                AlreadyWritten = ParentName->Length + sizeof(WCHAR);
+            }
+            RtlCopyMemory((PVOID)((ULONG_PTR)OutputBuffer->FileName + AlreadyWritten),
+                          TargetName->Buffer, TargetName->Length);
+            if (StreamName)
+            {
+                AlreadyWritten += TargetName->Length;
+                OutputBuffer->FileName[AlreadyWritten / sizeof(WCHAR)] = L':';
+                RtlCopyMemory((PVOID)((ULONG_PTR)OutputBuffer->FileName + AlreadyWritten + sizeof(WCHAR)),
+                              StreamName->Buffer, StreamName->Length);
+            }
+        }
+        else
+        {
+            if (!ParentName->Length)
+            {
+                ASSERT(StreamName);
+                RtlCopyMemory(OutputBuffer->FileName, StreamName->Buffer, StreamName->Length);
+            }
+            else
+            {
+                RtlOemToUnicodeN(OutputBuffer->FileName, OutputBuffer->FileNameLength,
+                                 &ResultSize, ParentName->Buffer,
+                                 ParentName->Length);
+                OutputBuffer->FileName[ResultSize / sizeof(WCHAR)] = L'\\';
+                AlreadyWritten = ResultSize + sizeof(WCHAR);
+
+                RtlOemToUnicodeN((PVOID)((ULONG_PTR)OutputBuffer->FileName + AlreadyWritten),
+                                 OutputBuffer->FileNameLength, &ResultSize,
+                                 TargetName->Buffer, TargetName->Length);
+
+                if (StreamName)
+                {
+                    AlreadyWritten += ResultSize;
+                    OutputBuffer->FileName[AlreadyWritten / sizeof(WCHAR)] = L':';
+                    RtlOemToUnicodeN((PVOID)((ULONG_PTR)OutputBuffer->FileName + AlreadyWritten + sizeof(WCHAR)),
+                                     OutputBuffer->FileNameLength, &ResultSize,
+                                     StreamName->Buffer, StreamName->Length);
+                }
+            }
+        }
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Succeed = FALSE;
+    }
+    _SEH2_END;
+
+    return Succeed;
+}
+
 /* PUBLIC FUNCTIONS **********************************************************/
 
 /*++
@@ -445,7 +702,7 @@
 
 /*++
  * @name FsRtlNotifyFilterChangeDirectory
- * @unimplemented
+ * @implemented
  *
  * FILLME
  *
@@ -559,16 +816,16 @@
                 NotifyIrp->IoStatus.Status = STATUS_DELETE_PENDING;
                 IoCompleteRequest(NotifyIrp, EVENT_INCREMENT);
             }
-            /* Complete if there is directory enumeration and no buffer available any more */
-            if ((NotifyChange->Flags & INVALIDATE_BUFFERS) && (NotifyChange->Flags & ENUMERATE_DIR))
+            /* Complete now if asked to (and not asked to notify later on) */
+            if ((NotifyChange->Flags & NOTIFY_IMMEDIATELY) && !(NotifyChange->Flags & NOTIFY_LATER))
             {
-                NotifyChange->Flags &= ~INVALIDATE_BUFFERS;
+                NotifyChange->Flags &= ~NOTIFY_IMMEDIATELY;
                 IoMarkIrpPending(NotifyIrp);
                 NotifyIrp->IoStatus.Status = STATUS_NOTIFY_ENUM_DIR;
                 IoCompleteRequest(NotifyIrp, EVENT_INCREMENT);
             }
-            /* If no data yet, or directory enumeration, handle */
-            else if (NotifyChange->DataLength == 0 || (NotifyChange->Flags & ENUMERATE_DIR))
+            /* If no data yet, or asked to notify later on, handle */
+            else if (NotifyChange->DataLength == 0 || (NotifyChange->Flags & NOTIFY_LATER))
             {
                 goto HandleIRP;
             }
@@ -612,21 +869,14 @@
         else
         {
             /* If it can't contain WCHAR, it's ANSI */
-            if (FullDirectoryName->Length < sizeof(WCHAR))
+            if (FullDirectoryName->Length < sizeof(WCHAR) || ((CHAR*)FullDirectoryName->Buffer)[1] != 0)
             {
                 NotifyChange->CharacterSize = sizeof(CHAR);
             }
-            /* First char is \, so in unicode, right part is 0
-             * whereas in ANSI it contains next char
-             */
-            else if (((CHAR*)FullDirectoryName->Buffer)[1] == 0)
+            else
             {
                 NotifyChange->CharacterSize = sizeof(WCHAR);
             }
-            else
-            {
-                NotifyChange->CharacterSize = sizeof(CHAR);
-            }
 
             /* Now, check is user is willing to watch root */
             if (FullDirectoryName->Length == NotifyChange->CharacterSize)
@@ -668,7 +918,7 @@
         FsRtlNotifyReleaseFastMutex(RealNotifySync);
 
         /* If the subject security context was captured and there's no notify */
-        if (SubjectContext && (!NotifyChange || FullDirectoryName))
+        if (SubjectContext && (!NotifyChange || NotifyChange->FullDirectoryName))
         {
             SeReleaseSubjectContext(SubjectContext);
             ExFreePool(SubjectContext);
@@ -679,7 +929,7 @@
 
 /*++
  * @name FsRtlNotifyFilterReportChange
- * @unimplemented
+ * @implemented
  *
  * FILLME
  *
@@ -731,7 +981,432 @@
                               IN PVOID TargetContext,
                               IN PVOID FilterContext)
 {
-    KeBugCheck(FILE_SYSTEM);
+    PIRP Irp;
+    PVOID OutputBuffer;
+    USHORT FullPosition;
+    PLIST_ENTRY NextEntry;
+    PIO_STACK_LOCATION Stack;
+    PNOTIFY_CHANGE NotifyChange;
+    PREAL_NOTIFY_SYNC RealNotifySync;
+    PFILE_NOTIFY_INFORMATION FileNotifyInfo;
+    BOOLEAN IsStream, IsParent, PoolQuotaCharged;
+    STRING TargetDirectory, TargetName, ParentName, IntNormalizedParentName;
+    ULONG NumberOfBytes, TargetNumberOfParts, FullNumberOfParts, LastPartOffset, ParentNameOffset, ParentNameLength;
+    ULONG DataLength, AlignedDataLength;
+
+    TargetDirectory.Length = 0;
+    TargetDirectory.MaximumLength = 0;
+    TargetDirectory.Buffer = NULL;
+    TargetName.Length = 0;
+    TargetName.MaximumLength = 0;
+    TargetName.Buffer = NULL;
+    ParentName.Length = 0;
+    ParentName.MaximumLength = 0;
+    ParentName.Buffer = NULL;
+    IsStream = FALSE;
+
+    PAGED_CODE();
+
+    DPRINT("FsRtlNotifyFilterReportChange(%p, %p, %p, %u, %p, %p, %p, %x, %x, %p, %p)\n",
+           NotifySync, NotifyList, FullTargetName, TargetNameOffset, StreamName, NormalizedParentName,
+           FilterMatch, Action, TargetContext, FilterContext);
+
+    /* We need offset in name */
+    if (!TargetNameOffset && FullTargetName)
+    {
+        return;
+    }
+
+    /* Get real structure hidden behind the opaque pointer */
+    RealNotifySync = (PREAL_NOTIFY_SYNC)NotifySync;
+    /* Acquire lock - will be released in finally block */
+    FsRtlNotifyAcquireFastMutex(RealNotifySync);
+    _SEH2_TRY
+    {
+        /* Browse all the registered notifications we have */
+        for (NextEntry = NotifyList->Flink; NextEntry != NotifyList;
+             NextEntry = NextEntry->Flink)
+        {
+            /* Try to find an entry matching our change */
+            NotifyChange = CONTAINING_RECORD(NextEntry, NOTIFY_CHANGE, NotifyList);
+            if (FullTargetName != NULL)
+            {
+                ASSERT(NotifyChange->FullDirectoryName != NULL);
+                if (!NotifyChange->FullDirectoryName->Length)
+                {
+                    continue;
+                }
+
+                if (!(FilterMatch & NotifyChange->CompletionFilter))
+                {
+                    continue;
+                }
+
+                /* If no normalized name provided, construct it from full target name */
+                if (NormalizedParentName == NULL)
+                {
+                    IntNormalizedParentName.Buffer = FullTargetName->Buffer;
+                    if (TargetNameOffset != NotifyChange->CharacterSize)
+                    {
+                        IntNormalizedParentName.MaximumLength =
+                        IntNormalizedParentName.Length = TargetNameOffset - NotifyChange->CharacterSize;
+                    }
+                    else
+                    {
+                        IntNormalizedParentName.MaximumLength =
+                        IntNormalizedParentName.Length = TargetNameOffset;
+                    }
+                    NormalizedParentName = &IntNormalizedParentName;
+                }
+
+                /* heh? Watched directory bigger than changed file? */
+                if (NormalizedParentName->Length < NotifyChange->FullDirectoryName->Length)
+                {
+                    continue;
+                }
+
+                /* Same len => parent */
+                if (NormalizedParentName->Length == NotifyChange->FullDirectoryName->Length)
+                {
+                    IsParent = TRUE;
+                }
+                /* If not, then, we have to be watching the tree, otherwise we don't have to report such changes */
+                else if (!(NotifyChange->Flags & WATCH_TREE))
+                {
+                    continue;
+                }
+                /* And finally, we've to check we're properly \-terminated */
+                else
+                {
+                    if (!(NotifyChange->Flags & WATCH_ROOT))
+                    {
+                        if (NotifyChange->CharacterSize == sizeof(CHAR))
+                        {
+                            if (((PSTR)NormalizedParentName->Buffer)[NotifyChange->FullDirectoryName->Length] != '\\')
+                            {
+                                continue;
+                            }
+                        }
+                        else
+                        {
+                            if (((PWSTR)NormalizedParentName->Buffer)[NotifyChange->FullDirectoryName->Length / sizeof (WCHAR)] != L'\\')
+                            {
+                                continue;
+                            }
+                        }
+                    }
+
+                    IsParent = FALSE;
+                }
+
+                /* If len matches, then check that both name are equal */
+                if (!RtlEqualMemory(NormalizedParentName->Buffer, NotifyChange->FullDirectoryName->Buffer,
+                                    NotifyChange->FullDirectoryName->Length))
+                {
+                    continue;
+                }
+
+                /* Call traverse callback (only if we have to traverse ;-)) */
+                if (!IsParent
+                    && NotifyChange->TraverseCallback != NULL
+                    && !NotifyChange->TraverseCallback(NotifyChange->FsContext,
+                                                       TargetContext,
+                                                       NotifyChange->SubjectContext))
+                {
+                    continue;
+                }
+
+                /* And then, filter callback if provided */
+                if (NotifyChange->FilterCallback != NULL
+                    && FilterContext != NULL
+                    && !NotifyChange->FilterCallback(NotifyChange->FsContext, FilterContext))
+                {
+                    continue;
+                }
+            }
+            /* We have a stream! */
+            else
+            {
+                ASSERT(NotifyChange->FullDirectoryName == NULL);
+                if (TargetContext != NotifyChange->SubjectContext)
+                {
+                    continue;
+                }
+
+                ParentName.Buffer = NULL;
+                ParentName.Length = 0;
+                IsStream = TRUE;
+                IsParent = FALSE;
+            }
+
+            /* If we don't have to notify immediately, prepare for output */
+            if (!(NotifyChange->Flags & NOTIFY_IMMEDIATELY))
+            {
+                /* If we have something to output... */
+                if (NotifyChange->BufferLength)
+                {
+                    /* Get size of the output */
+                    NumberOfBytes = 0;
+                    Irp = NULL;
+                    if (!NotifyChange->ThisBufferLength)
+                    {
+                        if (IsListEmpty(&NotifyChange->NotifyIrps))
+                        {
+                            NumberOfBytes = NotifyChange->BufferLength;
+                        }
+                        else
+                        {
+                            Irp = CONTAINING_RECORD(NotifyChange->NotifyIrps.Flink, IRP, Tail.Overlay.ListEntry);
+                            Stack = IoGetCurrentIrpStackLocation(Irp);
+                            NumberOfBytes = Stack->Parameters.NotifyDirectory.Length;
+                        }
+                    }
+                    else
+                    {
+                        NumberOfBytes = NotifyChange->ThisBufferLength;
+                    }
+
+                    /* If we're matching parent, we don't care about parent (redundant) */
+                    if (IsParent)
+                    {
+                        ParentName.Length = 0;
+                    }
+                    else
+                    {
+                        /* If we don't deal with streams, some more work is required */
+                        if (!IsStream)
+                        {
+                            if (NotifyChange->Flags & WATCH_ROOT ||
+                                (NormalizedParentName->Buffer != FullTargetName->Buffer))
+                            {
+                                /* Construct TargetDirectory if we don't have it yet */
+                                if (TargetDirectory.Buffer == NULL)
+                                {
+                                    TargetDirectory.Buffer = FullTargetName->Buffer;
+                                    TargetDirectory.Length = TargetNameOffset;
+                                    if (TargetNameOffset != NotifyChange->CharacterSize)
+                                    {
+                                        TargetDirectory.Length = TargetNameOffset - NotifyChange->CharacterSize;
+                                    }
+                                    TargetDirectory.MaximumLength = TargetDirectory.Length;
+                                }
+                                /* Now, we start looking for matching parts (unless we watch root) */
+                                TargetNumberOfParts = 0;
+                                if (!(NotifyChange->Flags & WATCH_ROOT))
+                                {
+                                    FullNumberOfParts = 1;
+                                    if (NotifyChange->CharacterSize == sizeof(CHAR))
+                                    {
+                                        FsRtlNotifyGetLastPartOffset(NotifyChange->FullDirectoryName->Length,
+                                                                     TargetDirectory.Length, PSTR, '\\');
+                                    }
+                                    else
+                                    {
+                                        FsRtlNotifyGetLastPartOffset(NotifyChange->FullDirectoryName->Length / sizeof(WCHAR),
+                                                                     TargetDirectory.Length / sizeof(WCHAR), PWSTR, L'\\');
+                                        LastPartOffset *= NotifyChange->CharacterSize;
+                                    }
+                                }
+
+                                /* Then, we can construct proper parent name */
+                                ParentNameOffset = NotifyChange->CharacterSize + LastPartOffset;
+                                ParentName.Buffer = &TargetDirectory.Buffer[ParentNameOffset];
+                                ParentNameLength = TargetDirectory.Length;
+                            }
+                            else
+                            {
+                                /* Construct parent name even for streams */
+                                ParentName.Buffer = &NormalizedParentName->Buffer[NotifyChange->FullDirectoryName->Length] + NotifyChange->CharacterSize;
+                                ParentNameLength = NormalizedParentName->Length - NotifyChange->FullDirectoryName->Length;
+                                ParentNameOffset = NotifyChange->CharacterSize;
+                            }
+                            ParentNameLength -= ParentNameOffset;
+                            ParentName.Length = ParentNameLength;
+                            ParentName.MaximumLength = ParentNameLength;
+                        }
+                    }
+
+                    /* Start to count amount of data to write, we've first the structure itself */
+                    DataLength = FIELD_OFFSET(FILE_NOTIFY_INFORMATION, FileName);
+
+                    /* If stream, we'll just append stream name */
+                    if (IsStream)
+                    {
+                        ASSERT(StreamName != NULL);
+                        DataLength += StreamName->Length;
+                    }
+                    else
+                    {
+                        /* If not parent, we've to append parent name */
+                        if (!IsParent)
+                        {
+                            if (NotifyChange->CharacterSize == sizeof(CHAR))
+                            {
+                                DataLength += RtlOemStringToCountedUnicodeSize(&ParentName);
+                            }
+                            else
+                            {
+                                DataLength += ParentName.Length;
+                            }
+                            DataLength += sizeof(WCHAR);
+                        }
+
+                        /* Look for target name & construct it, if required */
+                        if (TargetName.Buffer == NULL)
+                        {
+                            TargetName.Buffer = &FullTargetName->Buffer[TargetNameOffset];
+                            TargetName.Length =
+                            TargetName.MaximumLength = FullTargetName->Length - TargetNameOffset;
+                        }
+
+                        /* Then, we will append it as well */
+                        if (NotifyChange->CharacterSize == sizeof(CHAR))
+                        {
+                            DataLength += RtlOemStringToCountedUnicodeSize(&TargetName);
+                        }
+                        else
+                        {
+                            DataLength += TargetName.Length;
+                        }
+
+                        /* If we also had a stream name, then we can append it as well */
+                        if (StreamName != NULL)
+                        {
+                            if (NotifyChange->CharacterSize == sizeof(WCHAR))
+                            {
+                                DataLength += StreamName->Length + sizeof(WCHAR);
+                            }
+                            else
+                            {
+                                DataLength = DataLength + RtlOemStringToCountedUnicodeSize(&TargetName) + sizeof(CHAR);
+                            }
+                        }
+                    }
+
+                    /* Get the position where we can put our data (aligned!) */
+                    AlignedDataLength = ROUND_UP(NotifyChange->DataLength, sizeof(ULONG));
+                    /* If it's higher than buffer length, then, bail out without outputing */
+                    if (DataLength > NumberOfBytes || AlignedDataLength + DataLength > NumberOfBytes)
+                    {
+                        NotifyChange->Flags |= NOTIFY_IMMEDIATELY;
+                    }
+                    else
+                    {
+                        OutputBuffer = NULL;
+                        FileNotifyInfo = NULL;
+                        /* If we already had a buffer, update last entry position */
+                        if (NotifyChange->Buffer != NULL)
+                        {
+                            FileNotifyInfo = (PVOID)((ULONG_PTR)NotifyChange->Buffer + NotifyChange->LastEntry);
+                            FileNotifyInfo->NextEntryOffset = AlignedDataLength - NotifyChange->LastEntry;
+                            NotifyChange->LastEntry = AlignedDataLength;
+                            /* And get our output buffer */
+                            OutputBuffer = (PVOID)((ULONG_PTR)NotifyChange->Buffer + AlignedDataLength);
+                        }
+                        /* If we hadn't buffer, try to find one */
+                        else if (Irp != NULL)
+                        {
+                            if (Irp->AssociatedIrp.SystemBuffer != NULL)
+                            {
+                                OutputBuffer = Irp->AssociatedIrp.SystemBuffer;
+                            }
+                            else if (Irp->MdlAddress != NULL)
+                            {
+                                OutputBuffer = MmGetSystemAddressForMdl(Irp->MdlAddress);
+                            }
+
+                            NotifyChange->Buffer = OutputBuffer;
+                            NotifyChange->ThisBufferLength = NumberOfBytes;
+                        }
+
+                        /* If we couldn't find one, then allocate one */
+                        if (NotifyChange->Buffer == NULL)
+                        {
+                            PoolQuotaCharged = FALSE;
+                            _SEH2_TRY
+                            {
+                                PsChargePoolQuota(NotifyChange->OwningProcess, PagedPool, NumberOfBytes);
+                                PoolQuotaCharged = TRUE;
+                                OutputBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
+                                                                     NumberOfBytes, 'NrSF');
+                                NotifyChange->Buffer = OutputBuffer;
+                                NotifyChange->AllocatedBuffer = OutputBuffer;
+                            }
+                            /* If something went wrong during allocation, notify immediately instead of outputing */
+                            _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+                            {
+                                if (PoolQuotaCharged)
+                                {
+                                    PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NumberOfBytes); 
+                                }
+                                NotifyChange->Flags |= NOTIFY_IMMEDIATELY;
+                            }
+                            _SEH2_END;
+                        }
+
+                        /* Finally, if we have a buffer, fill it in! */
+                        if (OutputBuffer != NULL)
+                        {
+                            if (FsRtlNotifyUpdateBuffer((FILE_NOTIFY_INFORMATION *)OutputBuffer,
+                                                         Action, &ParentName, &TargetName,
+                                                         StreamName, NotifyChange->CharacterSize == sizeof(WCHAR),
+                                                         DataLength))
+                            {
+                                NotifyChange->DataLength = DataLength + AlignedDataLength;
+                            }
+                            /* If it failed, notify immediately */
+                            else
+                            {
+                                NotifyChange->Flags |= NOTIFY_IMMEDIATELY;
+                            }
+                        }
+                    }
+
+                    /* If we have to notify right now (something went wrong?) */
+                    if (NotifyChange->Flags & NOTIFY_IMMEDIATELY)
+                    {
+                        /* Ensure that all our buffers are NULL */
+                        if (NotifyChange->Buffer != NULL)
+                        {
+                            if (NotifyChange->AllocatedBuffer != NULL)
+                            {
+                                PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NotifyChange->ThisBufferLength);
+                                ExFreePoolWithTag(NotifyChange->AllocatedBuffer, 'NrSF');
+                            }
+
+                            NotifyChange->Buffer = NULL;
+                            NotifyChange->AllocatedBuffer = NULL;
+                            NotifyChange->LastEntry = 0;
+                            NotifyChange->DataLength = 0;
+                            NotifyChange->ThisBufferLength = 0;
+                        }
+                    }
+                }
+            }
+
+            /* If asking for old name in case of a rename, notify later on,
+             * so that we can wait for new name.
+             * http://msdn.microsoft.com/en-us/library/dn392331.aspx
+             */
+            if (Action == FILE_ACTION_RENAMED_OLD_NAME)
+            {
+                NotifyChange->Flags |= NOTIFY_LATER;
+            }
+            else
+            {
+                NotifyChange->Flags &= ~NOTIFY_LATER;
+                if (!IsListEmpty(&NotifyChange->NotifyIrps))
+                {
+                    FsRtlNotifyCompleteIrpList(NotifyChange, STATUS_SUCCESS);
+                }
+            }
+        }
+    }
+    _SEH2_FINALLY
+    {
+        FsRtlNotifyReleaseFastMutex(RealNotifySync);
+    }
+    _SEH2_END;
 }
 
 /*++
Index: ntoskrnl/guid.c
===================================================================
--- ntoskrnl/guid.c	(rÃ©vision 0)
+++ ntoskrnl/guid.c	(rÃ©vision 62573)
@@ -0,0 +1,8 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <wdm.h>
+#include <batclass.h>
+#include <initguid.h>
+#include <poclass.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modification de propriÃ©tÃ©s sur ntoskrnl/guid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ntoskrnl/ntkrnlmp/CMakeLists.txt
===================================================================
--- ntoskrnl/ntkrnlmp/CMakeLists.txt	(rÃ©vision 0)
+++ ntoskrnl/ntkrnlmp/CMakeLists.txt	(rÃ©vision 62573)
@@ -0,0 +1,52 @@
+include(../ntos.cmake)
+
+spec2def(ntkrnlmp.exe ../ntoskrnl.spec)
+
+if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
+    set_source_files_properties(${NTKRNLMP_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "CONFIG_SMP")
+endif()
+
+add_asm_files(ntkrnlmp_asm ${NTKRNLMP_ASM_SOURCE})
+
+add_executable(ntkrnlmp
+    ${ntkrnlmp_asm}
+    ${NTKRNLMP_SOURCE}
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/guid.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ntoskrnl.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def)
+
+add_target_compile_definitions(ntkrnlmp CONFIG_SMP)
+
+if(ARCH STREQUAL "i386")
+    set_entrypoint(ntkrnlmp KiSystemStartup 4)
+else()
+    set_entrypoint(ntkrnlmp KiSystemStartup)
+endif()
+set_subsystem(ntkrnlmp native)
+
+if(MSVC)
+    set_image_base(ntkrnlmp 0x00400000)
+else()
+    set_image_base(ntkrnlmp 0x80800000)
+endif()
+
+# Linker bug
+if(NOT MSVC AND LTCG)
+    add_target_link_flags(ntkrnlmp "-shared")
+endif()
+
+target_link_libraries(ntkrnlmp
+    cportlib
+    csq
+    ${PSEH_LIB}
+    cmlib
+    rtl
+    ${ROSSYM_LIB}
+    libcntpr
+    wdmguid
+    ioevent)
+
+add_importlibs(ntkrnlmp hal kdcom bootvid)
+add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTKRNLMP_SOURCE)
+add_dependencies(ntkrnlmp psdk bugcodes asm)
+add_cd_file(TARGET ntkrnlmp DESTINATION reactos/system32 NO_CAB FOR all)

Modification de propriÃ©tÃ©s sur ntoskrnl/ntkrnlmp/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ntoskrnl/ntkrnlmp
===================================================================
--- ntoskrnl/ntkrnlmp	(rÃ©vision 0)
+++ ntoskrnl/ntkrnlmp	(copie de travail)

Modification de propriÃ©tÃ©s sur ntoskrnl/ntkrnlmp
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: ntoskrnl/ntos.cmake
===================================================================
--- ntoskrnl/ntos.cmake	(rÃ©vision 0)
+++ ntoskrnl/ntos.cmake	(rÃ©vision 62573)
@@ -0,0 +1,424 @@
+
+include_directories(
+    ${REACTOS_SOURCE_DIR}
+    ${REACTOS_SOURCE_DIR}/lib/cmlib
+    include
+    ${CMAKE_CURRENT_BINARY_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}/include/internal
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+add_definitions(
+    -D__NTOSKRNL__
+    -D_NTOSKRNL_
+    -D_NTSYSTEM_
+    -D_IN_KERNEL_
+    -DNTDDI_VERSION=0x05020400)
+
+if(NOT DEFINED NEWCC)
+    set(NEWCC FALSE)
+endif()
+
+if(NEWCC)
+    add_definitions(-DNEWCC)
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/cachesub.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/copysup.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/fssup.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/lazyrite.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/logsup.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/mdlsup.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/pinsup.c)
+else()
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/cacheman.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/copy.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/fs.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/mdl.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/pin.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/view.c)
+endif()
+
+list(APPEND SOURCE
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/io.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/data.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/fault.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/reqtools.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/sptab.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/swapout.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmalloc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmapi.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmcheck.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmconfig.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmcontrl.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmdata.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmdelay.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmhook.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmhvlist.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmindex.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cminit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmkcbncb.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmkeydel.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmlazy.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmmapvw.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmname.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmnotify.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmparse.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmquota.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmse.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmsecach.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmsysini.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmvalche.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmvalue.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmwraprs.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/ntapi.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/dbgk/dbgkobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/dbgk/dbgkutil.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/atom.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/callback.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/dbgctrl.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/efi.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/event.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/evtpair.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/exintrin.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/fmutex.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/handle.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/harderr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/hdlsterm.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/init.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/interlocked.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/keyedevt.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/locale.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/lookas.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/mutant.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/profile.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/pushlock.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/resource.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/rundown.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/sem.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/shutdown.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/sysinfo.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/time.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/timer.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/uuid.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/win32k.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/work.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/xipdisp.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zone.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/dbcsname.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/fastio.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/faulttol.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/filelock.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/filter.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/filtrctx.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/fsfilter.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/fsrtlpc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/largemcb.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/mcb.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/name.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/notify.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/oplock.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/pnp.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/stackovf.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/tunnel.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/unc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/disksup.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/fstubex.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/halstub.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/translate.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/inbv/inbv.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/inbv/inbvport.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/adapter.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/arcname.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/bootlog.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/controller.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/device.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/deviface.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/driver.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/error.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/file.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iocomp.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/ioevent.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iofunc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iomdl.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iomgr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iorsrce.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iotimer.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iowork.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/irp.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/irq.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/ramdisk.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/rawfs.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/remlock.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/symlink.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/util.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/volume.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/plugplay.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpdma.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpinit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpmgr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpnotify.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpreport.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpres.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnproot.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnputil.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/apc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/balmgr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/bug.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/clock.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/config.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/devqueue.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/dpc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/eventobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/except.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/freeze.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/gate.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/gmutex.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/ipi.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/krnlinit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/mutex.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/procobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/profobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/queue.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/semphobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/spinlock.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/thrdobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/thrdschd.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/time.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/timerobj.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/wait.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/close.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/complete.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/connect.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/create.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/listen.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/port.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/reply.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/send.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/contmem.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/drvmgmt.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/dynamic.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/expool.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/hypermap.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/iosup.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/largepag.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mdlsup.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mmdbg.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mminit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mmsup.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/ncache.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/pagfault.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/pfnlist.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/pool.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/procsup.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/section.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/session.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/special.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/sysldr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/syspte.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/vadnode.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/virtual.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/zeropage.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/balance.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/freelist.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/marea.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/mmfault.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/mminit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/pagefile.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/region.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/rmap.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/section.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obdir.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obhandle.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obinit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/oblife.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/oblink.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obname.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obref.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obsdcach.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obsecure.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obwait.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/po/events.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/po/guid.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/po/poshtdwn.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/po/povolume.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/po/power.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/debug.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/job.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/kill.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/process.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psmgr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psnotify.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/query.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/quota.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/security.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/state.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/thread.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/win32.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/libsupp.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/misc.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/access.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/accesschk.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/acl.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/audit.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/lsa.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/priv.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sd.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/semgr.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c)
+
+list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zw.S)
+
+if(ARCH STREQUAL "i386")
+    list(APPEND ASM_SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/i386/fastinterlck_asm.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/i386/ioport.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/ctxswitch.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/trap.s
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/usercall_asm.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/i386/stack.S)
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/abios.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/cpu.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/context.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/exp.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/irqobj.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/kiinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/ldt.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/mtrr.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/patpge.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/thrdini.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/traphdlr.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/usercall.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/v86vdm.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/i386/page.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/i386/init.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psctx.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psldt.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/vdm/vdmmain.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/vdm/vdmexec.c)
+elseif(ARCH STREQUAL "amd64")
+    list(APPEND ASM_SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/boot.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/ctxswitch.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/trap.S)
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/context.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/cpu.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/except.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/interrupt.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/irql.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/kiinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/krnlinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/spinlock.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/stubs.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/thrdini.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/init.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/page.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/amd64/psctx.c)
+elseif(ARCH STREQUAL "arm")
+    list(APPEND ASM_SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/boot.s
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/ctxswtch.s
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/stubs_asm.s
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trap.s)
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/kiinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/thrdini.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trapc.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/usercall.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/arm/page.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/arm/init.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/arm/psctx.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/arm/rtlexcpt.c)
+elseif(ARCH STREQUAL "powerpc")
+    list(APPEND ASM_SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/main_asm.S
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/ctxhelp.S)
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/config/powerpc/cmhardwr.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/cpu.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/exp.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/kiinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/ppc_irq.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/stubs.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/systimer.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/thrdini.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/ctxswitch.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/powerpc/pfault.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/powerpc/page.c)
+endif()
+
+if(NOT _WINKD_)
+    if(ARCH STREQUAL "i386")
+        list(APPEND SOURCE
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdmemsup.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/gdbstub.c)
+        if(KDBG)
+            list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/kdb_help.S)
+            list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c)
+        endif()
+    elseif(ARCH STREQUAL "amd64")
+        list(APPEND SOURCE
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/amd64/kd.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c  # Use the x86 file
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/amd64/kdmemsup.c)
+        if(KDBG)
+            list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb_help.S)
+            list(APPEND SOURCE
+                ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/i386-dis.c
+                ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb.c)
+        endif()
+    elseif(ARCH STREQUAL "arm")
+        list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c)
+    elseif(ARCH STREQUAL "powerpc")
+        list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/gdbstub_powerpc.c)
+    endif()
+
+    if(KDBG)
+        list(APPEND SOURCE
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_expr.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_keyboard.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_serial.c
+            ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_symbols.c)
+    endif()
+
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/bochs.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/kdbg.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c)
+
+else() # _WINKD_
+
+    list(APPEND SOURCE
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdbreak.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdinit.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdtrap.c)
+
+    if(ARCH STREQUAL "i386")
+        list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/i386/kdx86.c)
+    elseif(ARCH STREQUAL "amd64")
+        list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/amd64/kdx64.c)
+    elseif(ARCH STREQUAL "arm")
+        list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/arm/kdarm.c)
+    endif()
+
+endif()

Modification de propriÃ©tÃ©s sur ntoskrnl/ntos.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/setup/usetup/interface/usetup.c
===================================================================
--- base/setup/usetup/interface/usetup.c	(rÃ©vision 61927)
+++ base/setup/usetup/interface/usetup.c	(copie de travail)
@@ -1472,6 +1472,11 @@
             /* FIXME: show an error dialog */
             return QUIT_PAGE;
         }
+        else if (IsListEmpty (&PartitionList->DiskListHead))
+        {
+            MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER);
+            return QUIT_PAGE;
+        }
     }
 
     DrawPartitionList(PartitionList);
Index: base/setup/usetup/usetup.h
===================================================================
--- base/setup/usetup/usetup.h	(rÃ©vision 61927)
+++ base/setup/usetup/usetup.h	(copie de travail)
@@ -24,6 +24,9 @@
  * PROGRAMMER:      Eric Kohl
  */
 
+#ifndef _USETUP_PCH_
+#define _USETUP_PCH_
+
 /* C Headers */
 #include <stdio.h>
 #include <stdlib.h>
@@ -172,4 +175,4 @@
   InsertTailList(current, &((NewEntry)->ListEntryField));\
 }
 
-/* EOF */
+#endif /* _USETUP_PCH_ */
Index: base/setup/usetup/CMakeLists.txt
===================================================================
--- base/setup/usetup/CMakeLists.txt	(rÃ©vision 61927)
+++ base/setup/usetup/CMakeLists.txt	(copie de travail)
@@ -6,7 +6,7 @@
     ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib
     ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 
-add_executable(usetup
+list(APPEND SOURCE
     interface/usetup.c
     interface/devinst.c
     interface/consup.c
@@ -30,8 +30,10 @@
     progress.c
     registry.c
     settings.c
-    usetup.rc)
+    usetup.h)
 
+add_executable(usetup ${SOURCE} usetup.rc)
+
 target_link_libraries(usetup
     zlib
     inflib
@@ -40,5 +42,5 @@
 
 set_module_type(usetup nativecui)
 add_importlibs(usetup ntdll)
-add_pch(usetup usetup.h)
+add_pch(usetup usetup.h SOURCE)
 add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)
Index: base/services/svchost/CMakeLists.txt
===================================================================
--- base/services/svchost/CMakeLists.txt	(rÃ©vision 61927)
+++ base/services/svchost/CMakeLists.txt	(copie de travail)
@@ -2,13 +2,18 @@
 list(APPEND SOURCE
     globals.c
     registry.c
-    security.cxx
     rpcsrv.c
     netbios.c
-    svchost.c)
+    svchost.c
+    svchost.h)
 
-add_executable(svchost ${SOURCE} svchost.rc)
+add_executable(svchost
+    ${SOURCE}
+    security.cxx
+    svchost.rc)
+
 target_link_libraries(svchost uuid)
 set_module_type(svchost win32cui UNICODE)
 add_importlibs(svchost advapi32 netapi32 rpcrt4 ole32 kernel32 ntdll)
+add_pch(svchost svchost.h SOURCE)
 add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all)
Index: base/services/svchost/svchost.h
===================================================================
--- base/services/svchost/svchost.h	(rÃ©vision 61927)
+++ base/services/svchost/svchost.h	(copie de travail)
@@ -6,7 +6,8 @@
  * PROGRAMMERS: ReactOS Portable Systems Group
  */
 
-#pragma once
+#ifndef _SVCHOST_PCH_
+#define _SVCHOST_PCH_
 
 #define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
@@ -296,3 +297,4 @@
 
 extern PSVCHOST_GLOBALS g_pSvchostSharedGlobals;
 
+#endif /* _SVCHOST_PCH_ */
Index: base/services/rpcss/CMakeLists.txt
===================================================================
--- base/services/rpcss/CMakeLists.txt	(rÃ©vision 61927)
+++ base/services/rpcss/CMakeLists.txt	(copie de travail)
@@ -9,13 +9,13 @@
     irotp.c
     rpcss_main.c
     service_main.c
-    rpcss.rc
+    rpcss.h
     ${CMAKE_CURRENT_BINARY_DIR}/epm_s.c
     ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c)
 
 include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
 
-add_executable(rpcss ${SOURCE})
+add_executable(rpcss ${SOURCE} rpcss.rc)
 
 target_link_libraries(rpcss
     ${PSEH_LIB}
@@ -24,4 +24,5 @@
 set_module_type(rpcss win32cui UNICODE)
 
 add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
+add_pch(rpcss rpcss.h SOURCE)
 add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all)
Index: base/services/audiosrv/CMakeLists.txt
===================================================================
--- base/services/audiosrv/CMakeLists.txt	(rÃ©vision 61927)
+++ base/services/audiosrv/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-add_executable(audiosrv
+list(APPEND SOURCE
     main.c
     pnp_list_manager.c
     pnp_list_lock.c
@@ -6,9 +6,10 @@
     pnp.c
     services.c
     debug.c
-    audiosrv.rc)
+    audiosrv.h)
 
+add_executable(audiosrv ${SOURCE} audiosrv.rc)
 set_module_type(audiosrv win32cui UNICODE)
-add_pch(audiosrv audiosrv.h)
 add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32)
+add_pch(audiosrv audiosrv.h SOURCE)
 add_cd_file(TARGET audiosrv DESTINATION reactos/system32 FOR all)
Index: base/services/audiosrv/audiosrv.h
===================================================================
--- base/services/audiosrv/audiosrv.h	(rÃ©vision 61927)
+++ base/services/audiosrv/audiosrv.h	(copie de travail)
@@ -6,6 +6,9 @@
  * COPYRIGHT:        Copyright 2007 Andrew Greenwood
  */
 
+#ifndef _AUDIOSRV_PCH_
+#define _AUDIOSRV_PCH_
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -64,3 +67,5 @@
 void logmsg(char* string, ...);
 
 #endif
+
+#endif /* _AUDIOSRV_PCH_ */
Index: base/services/wlansvc/CMakeLists.txt
===================================================================
--- base/services/wlansvc/CMakeLists.txt	(rÃ©vision 61927)
+++ base/services/wlansvc/CMakeLists.txt	(copie de travail)
@@ -3,12 +3,14 @@
 
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl)
 
-
-add_executable(wlansvc
+list(APPEND SOURCE
     wlansvc.c
     rpcserver.c
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_s.c)
 
+add_executable(wlansvc ${SOURCE})
+
 if(NOT MSVC)
     target_link_libraries(wlansvc ${PSEH_LIB})
 endif()
@@ -15,4 +17,5 @@
 
 set_module_type(wlansvc win32cui UNICODE)
 add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll)
+add_pch(wlansvc precomp.h SOURCE)
 add_cd_file(TARGET wlansvc DESTINATION reactos/system32 FOR all)
Index: base/services/wlansvc/wlansvc.c
===================================================================
--- base/services/wlansvc/wlansvc.c	(rÃ©vision 61927)
+++ base/services/wlansvc/wlansvc.c	(copie de travail)
@@ -10,7 +10,7 @@
 
 #include "precomp.h"
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 /* GLOBALS ******************************************************************/
Index: base/services/eventlog/CMakeLists.txt
===================================================================
--- base/services/eventlog/CMakeLists.txt	(rÃ©vision 61927)
+++ base/services/eventlog/CMakeLists.txt	(copie de travail)
@@ -1,20 +1,20 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/idl
     ${CMAKE_CURRENT_BINARY_DIR})
 
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl)
 
-
 list(APPEND SOURCE
     eventlog.c
     eventsource.c
     logport.c
-    eventlog.rc
     rpc.c
     file.c
+    eventlog.h
     ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_s.c)
 
-add_executable(eventlog ${SOURCE})
+add_executable(eventlog ${SOURCE} eventlog.rc)
 
 if(NOT MSVC)
     target_link_libraries(eventlog ${PSEH_LIB})
@@ -22,5 +22,5 @@
 
 set_module_type(eventlog win32cui UNICODE)
 add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_pch(eventlog eventlog.h)
+add_pch(eventlog eventlog.h SOURCE)
 add_cd_file(TARGET eventlog DESTINATION reactos/system32 FOR all)
Index: base/services/tcpsvcs/tcpsvcs.h
===================================================================
--- base/services/tcpsvcs/tcpsvcs.h	(rÃ©vision 61927)
+++ base/services/tcpsvcs/tcpsvcs.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _TCPSVCS_H
+#define _TCPSVCS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -53,3 +56,5 @@
 DWORD WINAPI EchoHandler(VOID* sock_);
 DWORD WINAPI DiscardHandler(VOID* sock_);
 DWORD WINAPI QotdHandler(VOID* sock_);
+
+#endif /* _TCPSVCS_H */
Index: base/services/tcpsvcs/CMakeLists.txt
===================================================================
--- base/services/tcpsvcs/CMakeLists.txt	(rÃ©vision 61927)
+++ base/services/tcpsvcs/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,4 @@
 
-
 list(APPEND SOURCE
     tcpsvcs.c
     skelserver.c
@@ -8,15 +7,12 @@
     daytime.c
     qotd.c
     chargen.c
-    tcpsvcs.rc
-    log.c)
+    log.c
+    tcpsvcs.h)
 
-add_executable(tcpsvcs ${SOURCE})
-
+add_executable(tcpsvcs ${SOURCE} tcpsvcs.rc)
 set_module_type(tcpsvcs win32cui UNICODE)
 add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll)
-add_pch(tcpsvcs tcpsvcs.h)
-
-
+add_pch(tcpsvcs tcpsvcs.h SOURCE)
 add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32 FOR all)
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/quotes DESTINATION reactos/system32/drivers/etc FOR all)
Index: base/system/diskpart/CMakeLists.txt
===================================================================
--- base/system/diskpart/CMakeLists.txt	(rÃ©vision 61927)
+++ base/system/diskpart/CMakeLists.txt	(copie de travail)
@@ -1,48 +1,50 @@
 
-add_executable(diskpart
-	active.c
-	add.c
-	assign.c
-	attach.c
-	attributes.c
-	automount.c
-	break.c
-	clean.c
-	compact.c
-	convert.c
-	create.c
-	delete.c
-	detach.c
-	detail.c
-	diskpart.c
-	expand.c
-	extend.c
-	filesystems.c
-	format.c
-	gpt.c
-	help.c
-	import.c
-	inactive.c
-	interpreter.c
-	list.c
-	merge.c
-	offline.c
-	online.c
-	recover.c
-	remove.c
-	repair.c
-	rescan.c
-	retain.c
-	san.c
-	select.c
-	setid.c
-	shrink.c
-	uniqueid.c
-	diskpart.rc)
+list(APPEND SOURCE
+    active.c
+    add.c
+    assign.c
+    attach.c
+    attributes.c
+    automount.c
+    break.c
+    clean.c
+    compact.c
+    convert.c
+    create.c
+    delete.c
+    detach.c
+    detail.c
+    diskpart.c
+    expand.c
+    extend.c
+    filesystems.c
+    format.c
+    gpt.c
+    help.c
+    import.c
+    inactive.c
+    interpreter.c
+    list.c
+    merge.c
+    offline.c
+    online.c
+    recover.c
+    remove.c
+    repair.c
+    rescan.c
+    retain.c
+    san.c
+    select.c
+    setid.c
+    shrink.c
+    uniqueid.c
+    diskpart.h)
 
+add_executable(diskpart ${SOURCE} diskpart.rc)
 set_module_type(diskpart win32cui UNICODE)
 add_importlibs(diskpart user32 msvcrt advapi32 kernel32)
 if(MSVC)
 	add_importlibs(diskpart ntdll)
 endif()
+add_pch(diskpart diskpart.h SOURCE)
 add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all)
Index: base/system/services/services.h
===================================================================
--- base/system/services/services.h	(rÃ©vision 61927)
+++ base/system/services/services.h	(copie de travail)
@@ -2,6 +2,9 @@
  * services.h
  */
 
+#ifndef _SERVICES_H
+#define _SERVICES_H
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -192,4 +195,4 @@
                  LPCWSTR *lpStrings);
 VOID ScmWaitForLsa(VOID);
 
-/* EOF */
+#endif /* _SERVICES_H */
Index: base/system/services/rpcserver.c
===================================================================
--- base/system/services/rpcserver.c	(rÃ©vision 61927)
+++ base/system/services/rpcserver.c	(copie de travail)
@@ -1617,12 +1617,13 @@
 {
     PSERVICE lpService;
     DWORD dwPreviousState;
+    DWORD dwPreviousType;
     LPCWSTR lpErrorStrings[2];
     WCHAR szErrorBuffer[32];
 
     DPRINT("RSetServiceStatus() called\n");
     DPRINT("hServiceStatus = %lu\n", hServiceStatus);
-    DPRINT("dwServiceType = %lu\n", lpServiceStatus->dwServiceType);
+    DPRINT("dwServiceType = 0x%lx\n", lpServiceStatus->dwServiceType);
     DPRINT("dwCurrentState = %lu\n", lpServiceStatus->dwCurrentState);
     DPRINT("dwControlsAccepted = %lu\n", lpServiceStatus->dwControlsAccepted);
     DPRINT("dwWin32ExitCode = %lu\n", lpServiceStatus->dwWin32ExitCode);
@@ -1660,6 +1661,16 @@
         return ERROR_INVALID_DATA;
     }
 
+    /* Set the wait hint and check point only if the service is in a pending state,
+       otherwise they should be 0 */
+    if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED ||
+        lpServiceStatus->dwCurrentState == SERVICE_PAUSED ||
+        lpServiceStatus->dwCurrentState == SERVICE_RUNNING)
+    {
+        lpServiceStatus->dwWaitHint = 0;
+        lpServiceStatus->dwCheckPoint = 0;
+    }
+
     /* Lock the service database exclusively */
     ScmLockDatabaseExclusive();
 
@@ -1666,10 +1677,17 @@
     /* Save the current service state */
     dwPreviousState = lpService->Status.dwCurrentState;
 
+    /* Save the current service type */
+    dwPreviousType = lpService->Status.dwServiceType;
+
+    /* Update the service status */
     RtlCopyMemory(&lpService->Status,
                   lpServiceStatus,
                   sizeof(SERVICE_STATUS));
 
+    /* Restore the previous service type */
+    lpService->Status.dwServiceType = dwPreviousType;
+
     /* Unlock the service database */
     ScmUnlockDatabase();
 
@@ -1755,7 +1773,7 @@
     LPWSTR lpImagePathW = NULL;
 
     DPRINT("RChangeServiceConfigW() called\n");
-    DPRINT("dwServiceType = %lu\n", dwServiceType);
+    DPRINT("dwServiceType = 0x%lx\n", dwServiceType);
     DPRINT("dwStartType = %lu\n", dwStartType);
     DPRINT("dwErrorControl = %lu\n", dwErrorControl);
     DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName);
@@ -1999,7 +2017,7 @@
     DPRINT("lpServiceName = %S\n", lpServiceName);
     DPRINT("lpDisplayName = %S\n", lpDisplayName);
     DPRINT("dwDesiredAccess = %lx\n", dwDesiredAccess);
-    DPRINT("dwServiceType = %lu\n", dwServiceType);
+    DPRINT("dwServiceType = 0x%lx\n", dwServiceType);
     DPRINT("dwStartType = %lu\n", dwStartType);
     DPRINT("dwErrorControl = %lu\n", dwErrorControl);
     DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName);
Index: base/system/services/CMakeLists.txt
===================================================================
--- base/system/services/CMakeLists.txt	(rÃ©vision 61927)
+++ base/system/services/CMakeLists.txt	(copie de travail)
@@ -16,10 +16,10 @@
     lock.c
     rpcserver.c
     services.c
-    services.rc
+    services.h
     ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.c)
 
-add_executable(services ${SOURCE})
+add_executable(services ${SOURCE} services.rc)
 
 if(NOT MSVC)
     target_link_libraries(services ${PSEH_LIB})
@@ -27,5 +27,5 @@
 
 set_module_type(services win32gui UNICODE)
 add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_pch(services services.h ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.h)
+add_pch(services services.h SOURCE)
 add_cd_file(TARGET services DESTINATION reactos/system32 FOR all)
Index: base/system/smss/CMakeLists.txt
===================================================================
--- base/system/smss/CMakeLists.txt	(rÃ©vision 61927)
+++ base/system/smss/CMakeLists.txt	(copie de travail)
@@ -11,11 +11,11 @@
     smsubsys.c
     smutil.c
     smss.c
-    smss.rc)
+    smss.h)
 
-add_executable(smss WIN32 ${SOURCE})
+add_executable(smss WIN32 ${SOURCE} smss.rc)
 target_link_libraries(smss nt ${PSEH_LIB} smlib)
-add_pch(smss smss.h)
 set_module_type(smss nativecui)
 add_importlibs(smss ntdll)
+add_pch(smss smss.h SOURCE)
 add_cd_file(TARGET smss DESTINATION reactos/system32 FOR all)
Index: base/system/winlogon/CMakeLists.txt
===================================================================
--- base/system/winlogon/CMakeLists.txt	(rÃ©vision 61927)
+++ base/system/winlogon/CMakeLists.txt	(copie de travail)
@@ -6,13 +6,11 @@
     setup.c
     winlogon.c
     wlx.c
-    winlogon.rc)
+    winlogon.h)
 
-add_executable(winlogon ${SOURCE})
-
+add_executable(winlogon ${SOURCE} winlogon.rc)
 target_link_libraries(winlogon wine)
-
 set_module_type(winlogon win32gui)
 add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)
-add_pch(winlogon winlogon.h)
+add_pch(winlogon winlogon.h SOURCE)
 add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all)
Index: base/system/msiexec/CMakeLists.txt
===================================================================
--- base/system/msiexec/CMakeLists.txt	(rÃ©vision 61927)
+++ base/system/msiexec/CMakeLists.txt	(copie de travail)
@@ -3,12 +3,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/wine)
 
-add_executable(msiexec
+list(APPEND SOURCE
     msiexec.c
     service.c
-    rsrc.rc)
+    precomp.h)
 
+add_executable(msiexec ${SOURCE} rsrc.rc)
+
 set_module_type(msiexec win32gui)
 target_link_libraries(msiexec uuid wine)
 add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)
+add_pch(msiexec precomp.h SOURCE)
 add_cd_file(TARGET msiexec DESTINATION reactos/system32 FOR all)
Index: base/applications/calc/calc.h
===================================================================
--- base/applications/calc/calc.h	(rÃ©vision 61927)
+++ base/applications/calc/calc.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _CALC_H
+#define _CALC_H
+
 #include <stdarg.h>
 #include <windef.h>
 #include <winuser.h>
@@ -225,3 +228,5 @@
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
+
+#endif /* _CALC_H */
Index: base/applications/calc/CMakeLists.txt
===================================================================
--- base/applications/calc/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/calc/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
-add_executable(calc 
+list(APPEND SOURCE
     about.c
     convert.c
     function.c
@@ -8,12 +8,13 @@
     rpn.c
     utl.c
     winmain.c
-    resource.rc)
+    calc.h)
 
+add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
 if(MSVC)
     add_importlibs(calc ntdll)
 endif()
-add_pch(calc calc.h)
+add_pch(calc calc.h SOURCE)
 add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all)
Index: base/applications/calc/lang/tr-TR.rc
===================================================================
--- base/applications/calc/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/calc/lang/tr-TR.rc	(copie de travail)
@@ -415,7 +415,7 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ile yayÄ±nlanan Ã¶zgÃ¼r bir yazÄ±lÄ±mdÄ±r.\r\n\r\nGNU GPL'nin bir tÄ±pkÄ±sÄ±nÄ± buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL'nin Ã§evirilerini buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
+    IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ile yayÄ±nlanan Ã¶zgÃ¼r bir yazÄ±lÄ±mdÄ±r.\r\n\r\nGNU GPL'nin bir sÃ»retini buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL'nin Ã§evirilerini buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "YanlÄ±ÅŸlÄ±k"
     IDS_QUICKHELP "HÄ±zlÄ± YardÄ±m"
 END
Index: base/applications/screensavers/3dtext/3dtext.h
===================================================================
--- base/applications/screensavers/3dtext/3dtext.h	(rÃ©vision 61927)
+++ base/applications/screensavers/3dtext/3dtext.h	(copie de travail)
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _3DTEXT_H_
+#define _3DTEXT_H_
+
 #include <tchar.h>
 #include <windef.h>
 
@@ -25,3 +28,5 @@
 
 VOID LoadSettings(VOID);
 VOID SaveSettings(VOID);
+
+#endif /* _3DTEXT_H_ */
Index: base/applications/screensavers/3dtext/CMakeLists.txt
===================================================================
--- base/applications/screensavers/3dtext/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/screensavers/3dtext/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,13 @@
 
-add_executable(3dtext
+list(APPEND SOURCE
     3dtext.c
     settings.c
-    rsrc.rc)
+    3dtext.h)
 
+add_executable(3dtext ${SOURCE} rsrc.rc)
 set_module_type(3dtext win32gui UNICODE)
-add_pch(3dtext 3dtext.h)
 set_target_properties(3dtext PROPERTIES SUFFIX ".scr")
 target_link_libraries(3dtext scrnsave)
 add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)
+add_pch(3dtext 3dtext.h SOURCE)
 add_cd_file(TARGET 3dtext DESTINATION reactos/system32 FOR all)
Index: base/applications/mscutils/devmgmt/lang/tr-TR.rc
===================================================================
--- base/applications/mscutils/devmgmt/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/devmgmt/lang/tr-TR.rc	(copie de travail)
@@ -55,7 +55,7 @@
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼rdÃ¼r, yÃ¢ni bu yazÄ±lÄ±mÄ± Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±nladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n 2. sÃ¼rÃ¼mÃ¼ veyÃ¢ daha sonraki sÃ¼rÃ¼mleri altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bilhassa SATILABÄ°LÄ°RLÄ°K ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUK aÃ§Ä±sÄ±ndan olmak Ã¼zere bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retine de iye olmanÄ±z gerekir, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± A.Åž.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r; bu yazÄ±lÄ±mÄ±, Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±mladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n, 2. sÃ¼rÃ¼mÃ¼nÃ¼n ya da daha sonraki herhangi bir sÃ¼rÃ¼mÃ¼nÃ¼n (OrasÄ± size baÄŸlÄ±.) koÅŸullarÄ± altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLÄ°ÄžÄ°N ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN  demek istenilen garantisi bile. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retini almÄ±ÅŸ olmalÄ±sÄ±nÄ±z, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
Index: base/applications/mscutils/devmgmt/devmgmt.rc
===================================================================
--- base/applications/mscutils/devmgmt/devmgmt.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/devmgmt/devmgmt.rc	(copie de travail)
@@ -84,6 +84,9 @@
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif
Index: base/applications/mscutils/devmgmt/CMakeLists.txt
===================================================================
--- base/applications/mscutils/devmgmt/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/mscutils/devmgmt/CMakeLists.txt	(copie de travail)
@@ -5,10 +5,10 @@
     enumdevices.c
     mainwnd.c
     misc.c
-    devmgmt.rc)
+    precomp.h)
 
-add_executable(devmgmt ${SOURCE})
+add_executable(devmgmt ${SOURCE} devmgmt.rc)
 set_module_type(devmgmt win32gui UNICODE)
 add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
-add_pch(devmgmt precomp.h)
+add_pch(devmgmt precomp.h SOURCE)
 add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all)
Index: base/applications/mscutils/servman/CMakeLists.txt
===================================================================
--- base/applications/mscutils/servman/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/mscutils/servman/CMakeLists.txt	(copie de travail)
@@ -19,10 +19,10 @@
     start.c
     stop.c
     stop_dependencies.c
-    servman.rc)
+    precomp.h)
 
-add_executable(servman ${SOURCE})
+add_executable(servman ${SOURCE} servman.rc)
 set_module_type(servman win32gui UNICODE)
 add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
-add_pch(servman precomp.h)
+add_pch(servman precomp.h SOURCE)
 add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all)
Index: base/applications/mscutils/servman/lang/tr-TR.rc
===================================================================
--- base/applications/mscutils/servman/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/servman/lang/tr-TR.rc	(copie de travail)
@@ -39,7 +39,7 @@
     END
     POPUP "&YardÄ±m"
     BEGIN
-        MENUITEM "&YardÄ±m KonularÄ±", ID_HELP
+        MENUITEM "&YardÄ±m", ID_HELP
         MENUITEM "&HakkÄ±nda", ID_ABOUT
     END
 END
@@ -203,7 +203,7 @@
     IDS_SERVICES_STOPPED "Durdu"
     IDS_SERVICES_AUTO "KendiliÄŸinden"
     IDS_SERVICES_MAN "Elle"
-    IDS_SERVICES_DIS "Devre DÄ±ÅŸÄ±"
+    IDS_SERVICES_DIS "Edilgin"
 END
 
 STRINGTABLE
@@ -211,7 +211,7 @@
     IDS_NUM_SERVICES "Hizmet SayÄ±sÄ±: %d"
     IDS_STOP_DEPENDS "%s durduÄŸunda, bu hizmetler de durur:"
     IDS_NO_DEPENDS "<BaÄŸÄ±mlÄ±lÄ±k Yok>"
-    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼rdÃ¼r, yÃ¢ni bu yazÄ±lÄ±mÄ± Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±nladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n 2. sÃ¼rÃ¼mÃ¼ veyÃ¢ daha sonraki sÃ¼rÃ¼mleri altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bilhassa SATILABÄ°LÄ°RLÄ°K ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUK aÃ§Ä±sÄ±ndan olmak Ã¼zere bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retine de iye olmanÄ±z gerekir, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± A.Åž.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r; bu yazÄ±lÄ±mÄ±, Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±mladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n, 2. sÃ¼rÃ¼mÃ¼nÃ¼n ya da daha sonraki herhangi bir sÃ¼rÃ¼mÃ¼nÃ¼n (OrasÄ± size baÄŸlÄ±.) koÅŸullarÄ± altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLÄ°ÄžÄ°N ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN  demek istenilen garantisi bile. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retini almÄ±ÅŸ olmalÄ±sÄ±nÄ±z, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
Index: base/applications/mscutils/devmgmt_new/lang/tr-TR.rc
===================================================================
--- base/applications/mscutils/devmgmt_new/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/devmgmt_new/lang/tr-TR.rc	(copie de travail)
@@ -48,7 +48,7 @@
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼rdÃ¼r, yÃ¢ni bu yazÄ±lÄ±mÄ± Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±nladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n 2. sÃ¼rÃ¼mÃ¼ veyÃ¢ daha sonraki sÃ¼rÃ¼mleri altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bilhassa SATILABÄ°LÄ°RLÄ°K ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUK aÃ§Ä±sÄ±ndan olmak Ã¼zere bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retine de iye olmanÄ±z gerekir, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± A.Åž.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r; bu yazÄ±lÄ±mÄ±, Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±mladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n, 2. sÃ¼rÃ¼mÃ¼nÃ¼n ya da daha sonraki herhangi bir sÃ¼rÃ¼mÃ¼nÃ¼n (OrasÄ± size baÄŸlÄ±.) koÅŸullarÄ± altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLÄ°ÄžÄ°N ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN  demek istenilen garantisi bile. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retini almÄ±ÅŸ olmalÄ±sÄ±nÄ±z, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/uk-UA.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/uk-UA.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/uk-UA.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&ÐžÐ¿Ð¸Ñ�:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Ð”Ð°Ñ‚Ð°:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð°", IDC_EVENTDATESTATIC, 59, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 59, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð§Ð°Ñ�:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð¸Ð¹", IDC_EVENTTIMESTATIC, 59, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 59, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&ÐšÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡:", IDC_STATIC, 14, 41, 41, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð¸Ð¹", IDC_EVENTUSERSTATIC, 59, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 59, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐšÐ¾&Ð¼Ð¿'ÑŽÑ‚ÐµÑ€:", IDC_STATIC, 14, 54, 37, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð¸Ð¹", IDC_EVENTCOMPUTERSTATIC, 59, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 59, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ID ÐŸÐ¾Ð´Ñ–Ñ—:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð¸Ð¹", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT  IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð”Ð¶ÐµÑ€ÐµÐ»Ð¾:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ðµ", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð¢Ð¸Ð¿:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð¸Ð¹", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ�:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "ÐŸÐ¾Ñ�Ñ‚Ñ–Ð¹Ð½Ð°", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "Ð”&aÑ‚Ð°", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Ð‘Ð°Ð¹Ñ‚", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Ð¡Ð»Ð¾Ð²Ð¾", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Ð‘Ð°Ð¹Ñ‚", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Ð¡Ð»Ð¾Ð²Ð¾", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/ko-KR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ko-KR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/ko-KR.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "ì„¤ëª…(&D):", IDC_STATIC, 15, 70, 39, 8
     LTEXT "ë‚ ì§œ:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ì‹œê°„:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ì‚¬ìš©ìž�(&U):", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ì»´í“¨í„°(&C):", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ì�´ë²¤íŠ¸ID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ì†ŒìŠ¤:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "íƒ€ìž…:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ì¹´í…Œê³ ë¦¬:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "ê³ ì •", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "ë�°ì�´í„°(&A)", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "ë°”ì�´íŠ¸(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "ê¸€ìž�(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "ë°”ì�´íŠ¸(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "ê¸€ìž�(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/pt-BR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/pt-BR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/pt-BR.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&DescriÃ§Ã£o:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Data:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tempo:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&UsuÃ¡rio:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Computador:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "EventID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Fonte:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tipo:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Categoria:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "EstÃ¡tico", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "Dad&os", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/pl-PL.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/pl-PL.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/pl-PL.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Opis:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Data:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Statycznie", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Czas:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Statycznie", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&UÅ¼ytkownik:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Statycznie", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Komputer:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Statycznie", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Numer ID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Statycznie", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Å¹rÃ³dÅ‚o:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Statycznie", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Typ:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Statycznie", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kategoria:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Statycznie", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ane", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&SÅ‚owa", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&SÅ‚owa", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/no-NO.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/no-NO.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/no-NO.rc	(copie de travail)
@@ -61,25 +61,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Beskrivelse:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Dato:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Statisk", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT "Statisk", IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tid:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Statisk", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT "Statisk", IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Bruker:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Statisk", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT "Statisk", IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Datamaskin:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Statisk", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT "Statisk", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Hendelse ID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Statisk", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT "Statisk", IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kilde:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Statisk", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT "Statisk", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Type:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Statisk", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT "Statisk", IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kategori:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Statisk", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT "Statisk", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ata", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Tegn", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Ord", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Tegn", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Ord", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/it-IT.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/it-IT.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/it-IT.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Descrizione:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Data:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ore:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&UTente:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Computer:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "IDEvento:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Sorgente:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tipo:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Categoria:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ati", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/en-US.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/en-US.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/en-US.rc	(copie de travail)
@@ -69,25 +69,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Description:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Date:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Time:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&User:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Computer:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "EventID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Source:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Type:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Category:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ata", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/sk-SK.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/sk-SK.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/sk-SK.rc	(copie de travail)
@@ -66,25 +66,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Popis:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "DÃ¡tum:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÄŒas:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Po&uÅ¾Ã­vateÄ¾:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "P&oÄ�Ã­taÄ�:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ID udalosti:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Zdroj:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Typ:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "KategÃ³ria:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "Ãš&daje:", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&SlovÃ¡", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&SlovÃ¡", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/sv-SE.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/sv-SE.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/sv-SE.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Beskrivning:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Datum:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tid:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&AnvÃ¤ndare:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Dator:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "HÃ¤ndelse ID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "KÃ¤lla:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Type:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kategori:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ata", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Byte", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Ord", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Byte", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Ord", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/he-IL.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/he-IL.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/he-IL.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "×ª×™×�×•×¨", IDC_STATIC, 15, 70, 39, 8
     LTEXT "×ª×�×¨×™×š:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×–×ž×Ÿ:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×ž×©×ª×ž×©:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×ž×—×©×‘:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×ž×–×”×” ×�×™×¨×•×¢:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×ž×§×•×¨:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×¡×•×’:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "×§×˜×’×•×¨×™×”:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "× ×ª×•× ×™×�:", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "×‘×ª×™×�", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "×ž×™×œ×™×�", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "×‘×ª×™×�", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "×ž×™×œ×™×�", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/ro-RO.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ro-RO.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/ro-RO.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Descriere:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "DatÄƒ:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "OrÄƒ:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Utilizator:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Calculator:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ID Eveniment:", IDC_STATIC, 133, 15, 46, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 185, 15, 77, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 185, 15, 77, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "SursÄƒ:", IDC_STATIC, 133, 28, 46, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 185, 28, 77, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 185, 28, 77, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tip:", IDC_STATIC, 133, 42, 46, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 185, 42, 77, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 185, 42, 77, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Categorie:", IDC_STATIC, 133, 55, 46, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 185, 55, 77, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 185, 55, 77, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ate", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&8 biÈ›i", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&16 biÈ›i", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&8 biÈ›i", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&16 biÈ›i", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/ja-JP.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ja-JP.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/ja-JP.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "èª¬æ˜Ž(&D):", IDC_STATIC, 15, 70, 39, 8
     LTEXT "æ—¥ä»˜:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "æ™‚åˆ»:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ãƒ¦ãƒ¼ã‚¶ãƒ¼(&U):", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿(&C):", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ã‚¤ãƒ™ãƒ³ãƒˆID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ã‚½ãƒ¼ã‚¹:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ç¨®é¡ž:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "åˆ†é¡ž:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "ãƒ‡ãƒ¼ã‚¿(&A)", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "ãƒ�ã‚¤ãƒˆ(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "ãƒ¯ãƒ¼ãƒ‰(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "ãƒ�ã‚¤ãƒˆ(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "ãƒ¯ãƒ¼ãƒ‰(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/el-GR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/el-GR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/el-GR.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Î ÎµÏ�Î¹Î³Ï�Î±Ï†Î®:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Î—Î¼ÎµÏ�Î¿Î¼Î·Î½Î¯Î±:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Î�Ï�Î±:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Î§Ï�Î®ÏƒÏ„Î·Ï‚:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Î¥Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "EventID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Î Î·Î³Î®:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Î¤Ï�Ï€Î¿Ï‚:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÎšÎ±Ï„Î·Î³Î¿Ï�Î¯Î±:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "Î”&ÎµÎ´Î¿Î¼Î­Î½Î±", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/tr-TR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/tr-TR.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -19,7 +19,7 @@
     MENUITEM "&SeÃ§enekler", ID_OPTIONS
     POPUP "&YardÄ±m"
     BEGIN
-        MENUITEM "&YardÄ±m KonularÄ±", IDM_HELP
+        MENUITEM "&YardÄ±m", IDM_HELP
         MENUITEM SEPARATOR
         MENUITEM "&HakkÄ±nda", IDM_ABOUT
     END
@@ -47,7 +47,7 @@
 CAPTION "YÃ¼kleniyor"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CTEXT "Olaylar yÃ¼kleniyor, lÃ¼tfen bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
+    CTEXT "Olaylar yÃ¼kleniyor, bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282
@@ -63,32 +63,32 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "AÃ§Ä±klama:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "TÃ¢rih:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Saat:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "KullanÄ±cÄ±:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Bilgisayar:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Olay KimliÄŸi:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kaynak:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "TÃ¼r:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ulam:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "&Veri:", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Ã‡oklu", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "SÃ¶&zcÃ¼k", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Ã‡oklu", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "SÃ¶&zcÃ¼k", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
 BEGIN
     IDS_APP_TITLE "Olay GÃ¶rÃ¼ntÃ¼leyicisi"
-    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_APP_TITLE_EX "%s - %s Oturum AÃ§ \\\\"
+    IDS_STATUS_MSG "%s'nin %lu olayÄ± vardÄ±r."
     IDS_EVENTSTRINGIDNOTFOUND "Kaynaktaki olay kimliÄŸi (%lu) iÃ§in aÃ§Ä±klama (%s) bulunamadÄ±. Yerli bilgisayarda, uzaktaki bilgisayardan ileti gÃ¶rÃ¼ntÃ¼lemesi iÃ§in gerekli, deÄŸer bilgileri veyÃ¢ kitaplÄ±klar olmayabilir."
     IDS_EVENTLOG_ERROR_TYPE "YanlÄ±ÅŸlÄ±k"
     IDS_EVENTLOG_WARNING_TYPE "UyarÄ±"
Index: base/applications/mscutils/eventvwr/lang/ru-RU.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ru-RU.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/ru-RU.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "ÐžÐ¿Ð¸Ñ�Ð°Ð½Ð¸Ðµ:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Ð”Ð°Ñ‚Ð°:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð’Ñ€ÐµÐ¼Ñ�:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ:", IDC_STATIC, 14, 41, 50, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐšÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€:", IDC_STATIC, 14, 54, 45, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐšÐ¾Ð´ (ID):", IDC_STATIC, 143, 15, 45, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð˜Ñ�Ñ‚Ð¾Ñ‡Ð½Ð¸Ðº:", IDC_STATIC, 143, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð¢Ð¸Ð¿:", IDC_STATIC, 143, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ�:", IDC_STATIC, 143, 55, 38, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "Ð”Ð°Ð½Ð½Ñ‹Ðµ:", IDC_STATIC, 14, 192, 30, 8
-    CONTROL "&Ð‘Ð°Ð¹Ñ‚Ñ‹", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 49, 192, 34, 10
-    CONTROL "&Ð¡Ð»Ð¾Ð²Ð°", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 87, 192, 33, 10
+    CONTROL "&Ð‘Ð°Ð¹Ñ‚Ñ‹", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 49, 192, 34, 8
+    CONTROL "&Ð¡Ð»Ð¾Ð²Ð°", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 87, 192, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/es-ES.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/es-ES.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/es-ES.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&DescripciÃ³n:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Fecha:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Hora:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Usuario:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Equipo:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ID de suceso:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Origen:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tipo:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "CategorÃ­a:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&atos", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/fr-FR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/fr-FR.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/fr-FR.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Description:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Date:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Heure :", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Utilisateur :", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ordinateur :", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ã‰vÃ©nement :", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Source:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Type:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "CatÃ©gorie :", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "DonnÃ©es", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/sq-AL.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/sq-AL.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/sq-AL.rc	(copie de travail)
@@ -69,25 +69,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "PÃ«rshkrimi:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Data:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Statistika", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ora:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Statistika", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "PÃ«rdoruesi:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Statistika", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kompjuteri:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Statistika", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "NgjarjeID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Statistika", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Burimi:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Statistika", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Tipi:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Statistika", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kategoria:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Statistika", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&ata", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/bg-BG.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/bg-BG.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/bg-BG.rc	(copie de travail)
@@ -61,25 +61,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&ÐžÐ¿Ð¸Ñ�Ð°Ð½Ð¸Ðµ:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Ð”Ð°Ñ‚Ð°:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTDATESTATIC, 60, 14, 40, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 60, 14, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð’Ñ€ÐµÐ¼Ðµ:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTTIMESTATIC, 60, 27, 40, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 60, 27, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»:", IDC_STATIC, 14, 41, 50, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTUSERSTATIC, 60, 41, 40, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 60, 41, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&ÐšÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€:", IDC_STATIC, 14, 54, 40, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTCOMPUTERSTATIC, 60, 54, 40, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 60, 54, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ÐžÐ·Ð½Ð°Ñ‡Ð¸Ñ‚ÐµÐ» Ñ�ÑŠÐ±Ð¸Ñ‚Ð¸Ðµ:", IDC_STATIC, 105, 15, 71, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTIDSTATIC, 175, 15, 40, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð˜Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ðº:", IDC_STATIC, 105, 28, 36, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTSOURCESTATIC, 175, 28, 40, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð’Ð¸Ð´:", IDC_STATIC, 105, 42, 36, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTTYPESTATIC, 175, 42, 40, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ð Ð°Ð·Ð´ÐµÐ»:", IDC_STATIC, 105, 55, 36, 8
-    LTEXT "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½", IDC_EVENTCATEGORYSTATIC, 175, 55, 40, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 40, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "&Ð”Ð°Ð½Ð½Ð¸", IDC_STATIC, 14, 194, 25, 8
-    CONTROL "&Ð‘Ð°Ð¹Ñ‚Ð¾Ð²Ðµ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 40, 10
-    CONTROL "&Ð”ÑƒÐ¼Ð¸", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 85, 194, 33, 10
+    CONTROL "&Ð‘Ð°Ð¹Ñ‚Ð¾Ð²Ðµ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 40, 8
+    CONTROL "&Ð”ÑƒÐ¼Ð¸", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 85, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/de-DE.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/de-DE.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/de-DE.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "&Bezeichnung:", IDC_STATIC, 15, 70, 39, 8
     LTEXT "Datum:", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Zeit:", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Benutzer:", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Computer:", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Ereignis-ID:", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Quelle:", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Typ:", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Kategorie:", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "D&aten", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/mscutils/eventvwr/lang/zh-CN.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/zh-CN.rc	(rÃ©vision 61927)
+++ base/applications/mscutils/eventvwr/lang/zh-CN.rc	(copie de travail)
@@ -63,25 +63,25 @@
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
     LTEXT "æ��è¿°(&D)ï¼š", IDC_STATIC, 15, 70, 39, 8
     LTEXT "æ—¥æœŸï¼š", IDC_STATIC, 14, 14, 36, 8
-    LTEXT "Static", IDC_EVENTDATESTATIC, 56, 14, 72, 8
+    EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "æ—¶é—´ï¼š", IDC_STATIC, 14, 27, 36, 8
-    LTEXT "Static", IDC_EVENTTIMESTATIC, 56, 27, 72, 8
+    EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ç”¨æˆ·(&U)ï¼š", IDC_STATIC, 14, 41, 36, 8
-    LTEXT "Static", IDC_EVENTUSERSTATIC, 56, 41, 72, 8
+    EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "è®¡ç®—æœº(&C)ï¼š", IDC_STATIC, 14, 54, 36, 8
-    LTEXT "Static", IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "äº‹ä»¶ IDï¼š", IDC_STATIC, 133, 15, 36, 8
-    LTEXT "Static", IDC_EVENTIDSTATIC, 175, 15, 87, 8
+    EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "æ�¥æº�ï¼š", IDC_STATIC, 133, 28, 36, 8
-    LTEXT "Static", IDC_EVENTSOURCESTATIC, 175, 28, 87, 8
+    EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "ç±»åž‹ï¼š", IDC_STATIC, 133, 42, 36, 8
-    LTEXT "Static", IDC_EVENTTYPESTATIC, 175, 42, 87, 8
+    EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "åˆ†ç±»ï¼š", IDC_STATIC, 133, 55, 36, 8
-    LTEXT "Static", IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8
+    EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
     LTEXT "æ•°æ�®(&A)", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "å­—èŠ‚(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 10
-    CONTROL "å­—(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 10
+    CONTROL "å­—èŠ‚(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
+    CONTROL "å­—(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
 END
 
 STRINGTABLE
Index: base/applications/msconfig/CMakeLists.txt
===================================================================
--- base/applications/msconfig/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/msconfig/CMakeLists.txt	(copie de travail)
@@ -7,10 +7,10 @@
     freeldrpage.c
     generalpage.c
     msconfig.c
-    msconfig.rc)
+    precomp.h)
 
-add_executable(msconfig ${SOURCE})
+add_executable(msconfig ${SOURCE} msconfig.rc)
 set_module_type(msconfig win32gui UNICODE)
 add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
-add_pch(msconfig precomp.h)
+add_pch(msconfig precomp.h SOURCE)
 add_cd_file(TARGET msconfig DESTINATION reactos/system32 FOR all)
Index: base/applications/msconfig/lang/sv-SE.rc
===================================================================
--- base/applications/msconfig/lang/sv-SE.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/sv-SE.rc	(copie de travail)
@@ -73,12 +73,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Uppstartsval", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal uppstart - ladda in alla drivrutiner och tjÃ¤nster", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 236, 10
-    CONTROL "&Diagnostisk uppstart - ladda bara in grundlÃ¤ggande drivrutiner och tjÃ¤nster", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 236, 10
-    CONTROL "&Selektiv uppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "L&adda in SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Ladda in SystemtjÃ¤nster", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10
-    AUTOCHECKBOX "La&dda in uppstartsprylar", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10
+    CONTROL "&Normal uppstart - ladda in alla drivrutiner och tjÃ¤nster", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostisk uppstart - ladda bara in grundlÃ¤ggande drivrutiner och tjÃ¤nster", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "&Selektiv uppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "L&adda in SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Ladda in SystemtjÃ¤nster", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "La&dda in uppstartsprylar", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/ro-RO.rc
===================================================================
--- base/applications/msconfig/lang/ro-RO.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/ro-RO.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Moduri de pornire sistem", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Pornire normalÄƒ - Ã®ncarcÄƒ toate serviciile È™i modulele pilot", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "Pornire de &diagnostic - Ã®ncarcÄƒ doar modulele pilot de bazÄƒ", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "Pornire &selectivÄƒ", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&roceseazÄƒ fiÈ™ierul SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 150, 10
-    AUTOCHECKBOX "ÃŽn&carcÄƒ serviciile de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 150, 10
-    AUTOCHECKBOX "ÃŽncarcÄƒ &elementele autolansate", IDC_CBX_STARTUP_ITEM, 30, 110, 150, 10
+    CONTROL "&Pornire normalÄƒ - Ã®ncarcÄƒ toate serviciile È™i modulele pilot", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "Pornire de &diagnostic - Ã®ncarcÄƒ doar modulele pilot de bazÄƒ", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Pornire &selectivÄƒ", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&roceseazÄƒ fiÈ™ierul SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "ÃŽn&carcÄƒ serviciile de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "ÃŽncarcÄƒ &elementele autolansate", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/he-IL.rc
===================================================================
--- base/applications/msconfig/lang/he-IL.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/he-IL.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "×‘×—×™×¨×ª ×�×ª×—×•×œ", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "×�×ª×—×•×œ ×¨×’×™×œ - ×˜×¢×Ÿ ×�×ª ×›×œ ×ž× ×”×œ×™ ×”×”×ª×§× ×™×� ×•×”×©×™×¨×•×ª×™×�", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 191, 10
-    CONTROL "×�×ª×—×•×œ ×ž×�×‘×—×Ÿ - ×˜×¢×Ÿ ×”×ª×§× ×™×� ×•×©×™×¨×•×ª×™×� ×‘×¡×™×¡×™×™×� ×‘×œ×‘×“", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "×�×ª×—×•×œ ×¡×œ×§×˜×™×‘×™", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "×¢×‘×“ ×�×ª ×”×§×•×‘×¥ SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 105, 10
-    AUTOCHECKBOX "&×˜×¢×Ÿ ×©×™×¨×•×ª×™ ×ž×¢×¨×›×ª", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "×˜×¢×Ÿ ×¤×¨×™×˜×™ ×�×ª×—×•×œ", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "×�×ª×—×•×œ ×¨×’×™×œ - ×˜×¢×Ÿ ×�×ª ×›×œ ×ž× ×”×œ×™ ×”×”×ª×§× ×™×� ×•×”×©×™×¨×•×ª×™×�", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "×�×ª×—×•×œ ×ž×�×‘×—×Ÿ - ×˜×¢×Ÿ ×”×ª×§× ×™×� ×•×©×™×¨×•×ª×™×� ×‘×¡×™×¡×™×™×� ×‘×œ×‘×“", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "×�×ª×—×•×œ ×¡×œ×§×˜×™×‘×™", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "×¢×‘×“ ×�×ª ×”×§×•×‘×¥ SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&×˜×¢×Ÿ ×©×™×¨×•×ª×™ ×ž×¢×¨×›×ª", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "×˜×¢×Ÿ ×¤×¨×™×˜×™ ×�×ª×—×•×œ", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/el-GR.rc
===================================================================
--- base/applications/msconfig/lang/el-GR.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/el-GR.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Î•Ï€Î¹Î»Î¿Î³Î® ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Î¦ÏŒÏ�Ï„Ï‰ÏƒÎ· Ï…Ï€Î·Ï�ÎµÏƒÎ¹ÏŽÎ½ ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Ï‰Î½", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "Î¦ÏŒ&Ï�Ï„Ï‰ÏƒÎ· Startup Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼Î­Î½Ï‰Î½", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Î¦ÏŒÏ�Ï„Ï‰ÏƒÎ· Ï…Ï€Î·Ï�ÎµÏƒÎ¹ÏŽÎ½ ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Ï‰Î½", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Î¦ÏŒ&Ï�Ï„Ï‰ÏƒÎ· Startup Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼Î­Î½Ï‰Î½", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/tr-TR.rc
===================================================================
--- base/applications/msconfig/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/tr-TR.rc	(copie de travail)
@@ -22,7 +22,7 @@
     CONTROL "List3", IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
             LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON "&Hepsini EtkinleÅŸtir", IDC_BTN_STARTUP_ACTIVATE, 223, 155, 66, 14
-    PUSHBUTTON "H&epsini Devre DÄ±ÅŸÄ± BÄ±rak", IDC_BTN_STARTUP_DEACTIVATE, 295, 155, 66, 14
+    PUSHBUTTON "H&epsini EdilginleÅŸtir", IDC_BTN_STARTUP_DEACTIVATE, 295, 155, 66, 14
 END
 
 IDD_SYSTEM_PAGE DIALOGEX 0, 0, 362, 175
@@ -35,12 +35,12 @@
     PUSHBUTTON "B&ir YukarÄ± TaÅŸÄ±", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
     PUSHBUTTON "Bi&r AÅŸaÄŸÄ± TaÅŸÄ±", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
     PUSHBUTTON "E&tkinleÅŸtir", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON "&Devre DÄ±ÅŸÄ± BÄ±rak", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+    PUSHBUTTON "E&dilginleÅŸtir", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
     PUSHBUTTON "&Ara", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON "Ye&ni", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON "&Yeni", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
     PUSHBUTTON "De&ÄŸiÅŸtir", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
     PUSHBUTTON "&Hepsini EtkinleÅŸtir", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON "H&epsini Devre DÄ±ÅŸÄ± BÄ±rak", IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+    PUSHBUTTON "H&epsini EdilginleÅŸtir", IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
 END
 
 IDD_TOOLS_PAGE DIALOGEX 0, 0, 362, 175
@@ -60,7 +60,7 @@
     CONTROL "List1", IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
             LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON "&Hepsini EtkinleÅŸtir", IDC_BTN_SERVICES_ACTIVATE, 223, 155, 66, 14
-    PUSHBUTTON "H&epsini Devre DÄ±ÅŸÄ± BÄ±rak", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
+    PUSHBUTTON "H&epsini EdilginleÅŸtir", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
 IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "BaÅŸlangÄ±Ã§ SeÃ§enekleri", -1, 10, 10, 340, 150,0, WS_EX_TRANSPARENT
-    CONTROL "&Bilindik BaÅŸlangÄ±Ã§ (SÃ¼rÃ¼cÃ¼lerin ve hizmetlerin tÃ¼mÃ¼ yÃ¼klensin.)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&TanÄ±lÄ±k BaÅŸlangÄ±Ã§ (YalnÄ±zca sÃ¼rÃ¼cÃ¼lerin ve hizmetlerin zorunlularÄ± yÃ¼klensin.)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "&SeÃ§meli BaÅŸlangÄ±Ã§", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "syst&em.ini KÃ¼tÃ¼ÄŸÃ¼nÃ¼ YÃ¼kle", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Hizmetleri YÃ¼kle", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "B&aÅŸlangÄ±Ã§ Ã–ÄŸelerini YÃ¼kle", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Bilindik BaÅŸlangÄ±Ã§ (SÃ¼rÃ¼cÃ¼lerin ve hizmetlerin tÃ¼mÃ¼ yÃ¼klensin.)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&TanÄ±lÄ±k BaÅŸlangÄ±Ã§ (YalnÄ±zca sÃ¼rÃ¼cÃ¼lerin ve hizmetlerin zorunlularÄ± yÃ¼klensin.)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "&SeÃ§meli BaÅŸlangÄ±Ã§", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "syst&em.ini KÃ¼tÃ¼ÄŸÃ¼nÃ¼ YÃ¼kle", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Hizmetleri YÃ¼kle", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "B&aÅŸlangÄ±Ã§ Ã–ÄŸelerini YÃ¼kle", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/zh-TW.rc
===================================================================
--- base/applications/msconfig/lang/zh-TW.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/zh-TW.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "å•Ÿå‹•é�¸æ“‡", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "æ­£å¸¸å•Ÿå‹• - è¼‰å…¥æ‰€æœ‰è£�ç½®é©…å‹•ç¨‹å¼�å’Œæœ�å‹™(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "è¨ºæ–·å•Ÿå‹• - åƒ…è¼‰å…¥åŸºæœ¬è£�ç½®é©…å‹•ç¨‹å¼�å’Œæœ�å‹™(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "æœ‰é�¸æ“‡çš„å•Ÿå‹•(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "è™•ç�† SYSTEM.INI æ–‡ä»¶(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "è¼‰å…¥ç³»ç»Ÿæœ�å‹™(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "è¼‰å…¥å•Ÿå‹•é …ç›®(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "æ­£å¸¸å•Ÿå‹• - è¼‰å…¥æ‰€æœ‰è£�ç½®é©…å‹•ç¨‹å¼�å’Œæœ�å‹™(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "è¨ºæ–·å•Ÿå‹• - åƒ…è¼‰å…¥åŸºæœ¬è£�ç½®é©…å‹•ç¨‹å¼�å’Œæœ�å‹™(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "æœ‰é�¸æ“‡çš„å•Ÿå‹•(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "è™•ç�† SYSTEM.INI æ–‡ä»¶(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "è¼‰å…¥ç³»ç»Ÿæœ�å‹™(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "è¼‰å…¥å•Ÿå‹•é …ç›®(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/ru-RU.rc
===================================================================
--- base/applications/msconfig/lang/ru-RU.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/ru-RU.rc	(copie de travail)
@@ -70,10 +70,10 @@
     GROUPBOX "Ð’Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ñ‹ Ð·Ð°Ð¿ÑƒÑ�ÐºÐ°", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
     CONTROL "&ÐžÐ±Ñ‹Ñ‡Ð½Ñ‹Ð¹ Ð·Ð°Ð¿ÑƒÑ�Ðº - Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð²Ñ�ÐµÑ… Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¾Ð² ÑƒÑ�Ñ‚Ñ€Ð¾Ð¹Ñ�Ñ‚Ð² Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ðº Ð²Ñ�ÐµÑ… Ñ�Ð»ÑƒÐ¶Ð±", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 280, 10
     CONTROL "&Ð”Ð¸Ð°Ð³Ð½Ð¾Ñ�Ñ‚Ð¸Ñ‡ÐµÑ�ÐºÐ¸Ð¹ Ð·Ð°Ð¿ÑƒÑ�Ðº - Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ñ‹Ñ… Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¾Ð² Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ðº Ð¾Ñ�Ð½Ð¾Ð²Ð½Ñ‹Ñ… Ñ�Ð»ÑƒÐ¶Ð±", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 325, 10
-    CONTROL "&Ð’Ñ‹Ð±Ð¾Ñ€Ð¾Ñ‡Ð½Ñ‹Ð¹ Ð·Ð°Ð¿ÑƒÑ�Ðº:", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 100, 10
-    AUTOCHECKBOX "Ðž&Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 130, 10
-    AUTOCHECKBOX "&Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ‹Ðµ Ñ�Ð»ÑƒÐ¶Ð±Ñ‹", IDC_CBX_SYSTEM_SERVICE, 30, 95, 130, 10
-    AUTOCHECKBOX "Ð—&Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ñ‹ Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸", IDC_CBX_STARTUP_ITEM, 30, 110, 140, 10
+    CONTROL "&Ð’Ñ‹Ð±Ð¾Ñ€Ð¾Ñ‡Ð½Ñ‹Ð¹ Ð·Ð°Ð¿ÑƒÑ�Ðº:", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "Ðž&Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ‹Ðµ Ñ�Ð»ÑƒÐ¶Ð±Ñ‹", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Ð—&Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ñ‹ Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/fr-FR.rc
===================================================================
--- base/applications/msconfig/lang/fr-FR.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/fr-FR.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "SÃ©lection du mode de dÃ©marrage ", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "DÃ©marrage &normal - charge tous les pilotes et tous les services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 185, 10
+    CONTROL "DÃ©marrage &normal - charge tous les pilotes et tous les services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
     CONTROL "DÃ©marrage en mode &diagnostic - charge les pÃ©riphÃ©riques de base et les services seulement", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
-    CONTROL "DÃ©marrage &sÃ©lectif", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 75, 10
-    AUTOCHECKBOX "T&raiter le fichier System.ini", IDC_CBX_SYSTEM_INI, 30, 80, 100, 10
-    AUTOCHECKBOX "&Charger les Services SystÃ¨me", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10
-    AUTOCHECKBOX "Charger les Ã©lÃ©ments de dÃ©marrage", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "DÃ©marrage &sÃ©lectif", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "T&raiter le fichier System.ini", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Charger les Services SystÃ¨me", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Charger les Ã©lÃ©ments de dÃ©marrage", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/es-ES.rc
===================================================================
--- base/applications/msconfig/lang/es-ES.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/es-ES.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "SelecciÃ³n de Inicio ", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "Inicio &Normal - cargar todos los controladores de unidades y servicios", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 240, 10
-    CONTROL "Inicio de &Diagnostico - cargar sÃ³lo los controladores y servicios bÃ¡sicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 240, 10
-    CONTROL "Inicio S&electivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&rocesar archivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10
-    AUTOCHECKBOX "&Cargar Servicios del Sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 110, 10
-    AUTOCHECKBOX "C&argar elementos de Inicio", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10
+    CONTROL "Inicio &Normal - cargar todos los controladores de unidades y servicios", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "Inicio de &Diagnostico - cargar sÃ³lo los controladores y servicios bÃ¡sicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Inicio S&electivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&rocesar archivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Cargar Servicios del Sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "C&argar elementos de Inicio", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/sq-AL.rc
===================================================================
--- base/applications/msconfig/lang/sq-AL.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/sq-AL.rc	(copie de travail)
@@ -70,12 +70,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "PÃ«rzgjedhje Startupi", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal Startupi - ngarko te gjitha pajisjet dhe sherbimet", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostic Startup - ngarko pajisjet baze dhe vetem sherbimet", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "S&elective Startupi", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "Ngarko sherbimet e sistemit", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "Ngarko sendet e fillimit", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normal Startupi - ngarko te gjitha pajisjet dhe sherbimet", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostic Startup - ngarko pajisjet baze dhe vetem sherbimet", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "S&elective Startupi", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "Ngarko sherbimet e sistemit", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Ngarko sendet e fillimit", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/de-DE.rc
===================================================================
--- base/applications/msconfig/lang/de-DE.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/de-DE.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Systemstartauswahl", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normaler Systemstart - Alle GerÃ¤tetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 210, 10
-    CONTROL "&Diagnosesystemstart - Nur grundlegende GerÃ¤te und Dienste laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10
-    CONTROL "B&enutzerdefinierter Systemstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 120, 10
-    AUTOCHECKBOX "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10
-    AUTOCHECKBOX "&Systemdienste laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "S&ystemstartelemente laden", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10
+    CONTROL "&Normaler Systemstart - Alle GerÃ¤tetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnosesystemstart - Nur grundlegende GerÃ¤te und Dienste laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "B&enutzerdefinierter Systemstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Systemdienste laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "S&ystemstartelemente laden", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/cs-CZ.rc
===================================================================
--- base/applications/msconfig/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/cs-CZ.rc	(copie de travail)
@@ -72,12 +72,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "VÃ½bÄ›r spuÅ¡tÄ›nÃ­", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "Nor&mÃ¡lnÃ­ spuÅ¡tÄ›nÃ­ - naÄ�Ã­st vÅ¡echny ovladaÄ�e zaÅ™Ã­zenÃ­ a sluÅ¾by", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 215, 10
-    CONTROL "&DiagnostickÃ© spuÅ¡tÄ›nÃ­ - naÄ�Ã­st jen zÃ¡kladnÃ­ ovladaÄ�e zaÅ™Ã­zenÃ­ a sluÅ¾by", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 255, 10
-    CONTROL "&VÃ½bÄ›rovÃ© spuÅ¡tÄ›nÃ­", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 72, 10
-    AUTOCHECKBOX "&Zpracovat soubor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 115, 10
-    AUTOCHECKBOX "&NaÄ�Ã­st systÃ©movÃ© sluÅ¾by", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10
-    AUTOCHECKBOX "N&aÄ�Ã­st poloÅ¾ky Po spuÅ¡tÄ›nÃ­", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10
+    CONTROL "Nor&mÃ¡lnÃ­ spuÅ¡tÄ›nÃ­ - naÄ�Ã­st vÅ¡echny ovladaÄ�e zaÅ™Ã­zenÃ­ a sluÅ¾by", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&DiagnostickÃ© spuÅ¡tÄ›nÃ­ - naÄ�Ã­st jen zÃ¡kladnÃ­ ovladaÄ�e zaÅ™Ã­zenÃ­ a sluÅ¾by", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "&VÃ½bÄ›rovÃ© spuÅ¡tÄ›nÃ­", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&Zpracovat soubor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&NaÄ�Ã­st systÃ©movÃ© sluÅ¾by", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "N&aÄ�Ã­st poloÅ¾ky Po spuÅ¡tÄ›nÃ­", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/zh-CN.rc
===================================================================
--- base/applications/msconfig/lang/zh-CN.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/zh-CN.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "å�¯åŠ¨é€‰æ‹©", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "æ­£å¸¸å�¯åŠ¨ - åŠ è½½æ‰€æœ‰è®¾å¤‡é©±åŠ¨ç¨‹åº�å’Œæœ�åŠ¡(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "è¯Šæ–­å�¯åŠ¨ - ä»…åŠ è½½åŸºæœ¬è®¾å¤‡é©±åŠ¨ç¨‹åº�å’Œæœ�åŠ¡(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "æœ‰é€‰æ‹©çš„å�¯åŠ¨(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "å¤„ç�† SYSTEM.INI æ–‡ä»¶(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "åŠ è½½ç³»ç»Ÿæœ�åŠ¡(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "åŠ è½½å�¯åŠ¨é¡¹(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "æ­£å¸¸å�¯åŠ¨ - åŠ è½½æ‰€æœ‰è®¾å¤‡é©±åŠ¨ç¨‹åº�å’Œæœ�åŠ¡(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "è¯Šæ–­å�¯åŠ¨ - ä»…åŠ è½½åŸºæœ¬è®¾å¤‡é©±åŠ¨ç¨‹åº�å’Œæœ�åŠ¡(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "æœ‰é€‰æ‹©çš„å�¯åŠ¨(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "å¤„ç�† SYSTEM.INI æ–‡ä»¶(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "åŠ è½½ç³»ç»Ÿæœ�åŠ¡(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "åŠ è½½å�¯åŠ¨é¡¹(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/nl-NL.rc
===================================================================
--- base/applications/msconfig/lang/nl-NL.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/nl-NL.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Type opstartprocedure", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normaal opstarten - alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostisch opstarten - alleen elementaire stuurprogramma's en services in het geheugen laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "Se&lectief opstarten", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "&Het SYSTEM.INI-bestand verwerken", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "Systeemservices &in het geheugen laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "&Opstartonderdelen in het geheugen laden", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normaal opstarten - alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostisch opstarten - alleen elementaire stuurprogramma's en services in het geheugen laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Se&lectief opstarten", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&Het SYSTEM.INI-bestand verwerken", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "Systeemservices &in het geheugen laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "&Opstartonderdelen in het geheugen laden", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/uk-UA.rc
===================================================================
--- base/applications/msconfig/lang/uk-UA.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/uk-UA.rc	(copie de travail)
@@ -74,12 +74,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Ð’Ð°Ñ€Ñ–Ð°Ð½Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ�", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
-    CONTROL "&Ð—Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ� - Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ�Ñ– Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¸ Ñ– Ñ�Ð»ÑƒÐ¶Ð±Ð¸", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 232, 10
-    CONTROL "&Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ� - Ð·ÑƒÐ²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ñ– Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¸ Ñ– Ñ�Ð»ÑƒÐ¶Ð±Ð¸", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 275, 10
-    CONTROL "Ð’Ð¸&Ð±Ñ–Ñ€ÐºÐ¾Ð²Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ�", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 95, 10
-    AUTOCHECKBOX "ÐžÐ±&Ñ€Ð¾Ð±Ð»Ñ�Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10
-    AUTOCHECKBOX "Ð—Ð°&Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ– Ñ�Ð»ÑƒÐ¶Ð±Ð¸", IDC_CBX_SYSTEM_SERVICE, 30, 95, 122, 10
-    AUTOCHECKBOX "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð¸ &Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ�", IDC_CBX_STARTUP_ITEM, 30, 110, 175, 10
+    CONTROL "&Ð—Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ� - Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ�Ñ– Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¸ Ñ– Ñ�Ð»ÑƒÐ¶Ð±Ð¸", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ� - Ð·ÑƒÐ²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ñ– Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¸ Ñ– Ñ�Ð»ÑƒÐ¶Ð±Ð¸", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Ð’Ð¸&Ð±Ñ–Ñ€ÐºÐ¾Ð²Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ�", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "ÐžÐ±&Ñ€Ð¾Ð±Ð»Ñ�Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "Ð—Ð°&Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ– Ñ�Ð»ÑƒÐ¶Ð±Ð¸", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð¸ &Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ�", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/ko-KR.rc
===================================================================
--- base/applications/msconfig/lang/ko-KR.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/ko-KR.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "ì‚¬ìž‘ ì˜µì…˜", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "ë³´í†µ ì‹œìž‘(&N) - ëª¨ë“  ë“œë�¼ì�´ë²„ì™€ ì„œë¹„ìŠ¤ ë¡œë“œ", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "ì§„ë‹¨ ì‹œìž‘(&D) - ê¸°ë³¸ì � ë“œë�¼ì�´ë²„ì™€ ì„œë¹„ìŠ¤ë§Œ ë¡œë“œ", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "ì„ íƒ�ì � ì‹œìž‘(&S)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "SYSTEM.INI íŒŒì�¼ ì²˜ë¦¬(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "ì‹œìŠ¤í…œ ì„œë¹„ìŠ¤ ë¡œë“œ(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "ì‹œìž‘í”„ë¡œê·¸ëž¨ ë¡œë“œ(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "ë³´í†µ ì‹œìž‘(&N) - ëª¨ë“  ë“œë�¼ì�´ë²„ì™€ ì„œë¹„ìŠ¤ ë¡œë“œ", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "ì§„ë‹¨ ì‹œìž‘(&D) - ê¸°ë³¸ì � ë“œë�¼ì�´ë²„ì™€ ì„œë¹„ìŠ¤ë§Œ ë¡œë“œ", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "ì„ íƒ�ì � ì‹œìž‘(&S)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "SYSTEM.INI íŒŒì�¼ ì²˜ë¦¬(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "ì‹œìŠ¤í…œ ì„œë¹„ìŠ¤ ë¡œë“œ(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "ì‹œìž‘í”„ë¡œê·¸ëž¨ ë¡œë“œ(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/th-TH.rc
===================================================================
--- base/applications/msconfig/lang/th-TH.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/th-TH.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Startup Selection", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/pt-BR.rc
===================================================================
--- base/applications/msconfig/lang/pt-BR.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/pt-BR.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "SeleÃ§Ã£o de inicializaÃ§Ã£o", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&InicializaÃ§Ã£o normal - carregar todos os drivers de dispositivo e serviÃ§os", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "I&nicializaÃ§Ã£o de diagnÃ³stico - carregar apenas dispositivos e serviÃ§os bÃ¡sicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "Ini&cializaÃ§Ã£o seletiva", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "&Processar o arquivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "Carr&egar serviÃ§os do sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "Carregar i&tens de inicializaÃ§Ã£o", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&InicializaÃ§Ã£o normal - carregar todos os drivers de dispositivo e serviÃ§os", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "I&nicializaÃ§Ã£o de diagnÃ³stico - carregar apenas dispositivos e serviÃ§os bÃ¡sicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Ini&cializaÃ§Ã£o seletiva", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&Processar o arquivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "Carr&egar serviÃ§os do sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Carregar i&tens de inicializaÃ§Ã£o", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/pl-PL.rc
===================================================================
--- base/applications/msconfig/lang/pl-PL.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/pl-PL.rc	(copie de travail)
@@ -74,12 +74,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "WybÃ³r uruchamiania", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "Uruchamianie &normalne - zaÅ‚aduj wszystkie sterowniki urzÄ…dzeÅ„ i usÅ‚ugi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 238, 10
-    CONTROL "Uruchamianie &diagnostyczne - zaÅ‚aduj tylko podstawowe urzÄ…dzenia i usÅ‚ugi", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 253, 10
-    CONTROL "Uruchamianie &selektywne", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 95, 10
-    AUTOCHECKBOX "&Przetwarzaj plik SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 102, 10
-    AUTOCHECKBOX "ZaÅ‚aduj &usÅ‚ugi systemowe", IDC_CBX_SYSTEM_SERVICE, 30, 95, 95, 10
-    AUTOCHECKBOX "ZaÅ‚aduj &elementy startowe", IDC_CBX_STARTUP_ITEM, 30, 110, 98, 10
+    CONTROL "Uruchamianie &normalne - zaÅ‚aduj wszystkie sterowniki urzÄ…dzeÅ„ i usÅ‚ugi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "Uruchamianie &diagnostyczne - zaÅ‚aduj tylko podstawowe urzÄ…dzenia i usÅ‚ugi", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Uruchamianie &selektywne", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&Przetwarzaj plik SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "ZaÅ‚aduj &usÅ‚ugi systemowe", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "ZaÅ‚aduj &elementy startowe", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/hu-HU.rc
===================================================================
--- base/applications/msconfig/lang/hu-HU.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/hu-HU.rc	(copie de travail)
@@ -68,12 +68,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Startup Selection", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/id-ID.rc
===================================================================
--- base/applications/msconfig/lang/id-ID.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/id-ID.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Pilihan Startup", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal Startup - mengambil semua device drivers dan layanan", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostik Startup - mengambil hanya devices dan layanan dasar", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "S&elektif Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&roses File SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Ambil Layanan Sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "Amb&il Item Startup", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normal Startup - mengambil semua device drivers dan layanan", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostik Startup - mengambil hanya devices dan layanan dasar", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "S&elektif Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&roses File SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Ambil Layanan Sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Amb&il Item Startup", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/it-IT.rc
===================================================================
--- base/applications/msconfig/lang/it-IT.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/it-IT.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Selezione avvio", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
-    CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 205, 10
-    CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10
-    CONTROL "Avvio &selettivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 95, 10
+    CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Avvio &selettivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/no-NO.rc
===================================================================
--- base/applications/msconfig/lang/no-NO.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/no-NO.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Oppstarts valg", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal oppstart - last inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 236, 10
-    CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 236, 10
-    CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Last inn Systemtjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10
-    AUTOCHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10
+    CONTROL "&Normal oppstart - last inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Last inn Systemtjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/en-US.rc
===================================================================
--- base/applications/msconfig/lang/en-US.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/en-US.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Startup Selection", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/sk-SK.rc
===================================================================
--- base/applications/msconfig/lang/sk-SK.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/sk-SK.rc	(copie de travail)
@@ -70,12 +70,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "VÃ½ber spustenia", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "&NormÃ¡lne spustenie - naÄ�Ã­taÅ¥ vÅ¡etky ovlÃ¡daÄ�e zariadenÃ­ a sluÅ¾by", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 225, 10
-    CONTROL "&DiagnostickÃ© spustenie - naÄ�Ã­taÅ¥ iba zÃ¡kladnÃ© zariadenia a sluÅ¾by", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 225, 10
-    CONTROL "Sele&ktÃ­vne spustenie", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 85, 10
-    AUTOCHECKBOX "&SpracovaÅ¥ sÃºbor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10
-    AUTOCHECKBOX "NaÄ�Ã­taÅ¥ systÃ©&movÃ© sluÅ¾by", IDC_CBX_SYSTEM_SERVICE, 30, 95, 100, 10
-    AUTOCHECKBOX "N&aÄ�Ã­taÅ¥ poloÅ¾ky Po spustenÃ­", IDC_CBX_STARTUP_ITEM, 30, 110, 100, 10
+    CONTROL "&NormÃ¡lne spustenie - naÄ�Ã­taÅ¥ vÅ¡etky ovlÃ¡daÄ�e zariadenÃ­ a sluÅ¾by", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "&DiagnostickÃ© spustenie - naÄ�Ã­taÅ¥ iba zÃ¡kladnÃ© zariadenia a sluÅ¾by", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Sele&ktÃ­vne spustenie", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&SpracovaÅ¥ sÃºbor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "NaÄ�Ã­taÅ¥ systÃ©&movÃ© sluÅ¾by", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "N&aÄ�Ã­taÅ¥ poloÅ¾ky Po spustenÃ­", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/lang/ca-ES.rc
===================================================================
--- base/applications/msconfig/lang/ca-ES.rc	(rÃ©vision 61927)
+++ base/applications/msconfig/lang/ca-ES.rc	(copie de travail)
@@ -66,12 +66,12 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Seleccio d'arrencada", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
-    CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
-    CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
-    AUTOCHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
-    AUTOCHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
-    AUTOCHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+    CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
+    AUTOCHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
+    AUTOCHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
+    AUTOCHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
Index: base/applications/msconfig/msconfig.h
===================================================================
--- base/applications/msconfig/msconfig.h	(rÃ©vision 61927)
+++ base/applications/msconfig/msconfig.h	(copie de travail)
@@ -1 +1,3 @@
+#pragma once
+
 extern HINSTANCE hInst;
Index: base/applications/msconfig/precomp.h
===================================================================
--- base/applications/msconfig/precomp.h	(rÃ©vision 61927)
+++ base/applications/msconfig/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MSCONFIG_PCH_
+#define _MSCONFIG_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -18,3 +21,5 @@
 
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383
+
+#endif /* _MSCONFIG_PCH_ */
Index: base/applications/sc/sc.h
===================================================================
--- base/applications/sc/sc.h	(rÃ©vision 61927)
+++ base/applications/sc/sc.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SC_PCH_
+#define _SC_PCH_
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -32,3 +35,5 @@
 VOID DeleteUsage(VOID);
 VOID CreateUsage(VOID);
 VOID ControlUsage(VOID);
+
+#endif /* _SC_PCH_ */
Index: base/applications/sc/CMakeLists.txt
===================================================================
--- base/applications/sc/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/sc/CMakeLists.txt	(copie de travail)
@@ -10,11 +10,10 @@
     sc.c
     start.c
     usage.c
-    sc.rc)
+    sc.h)
 
-add_executable(sc ${SOURCE})
-
+add_executable(sc ${SOURCE} sc.rc)
 set_module_type(sc win32cui UNICODE)
 add_importlibs(sc advapi32 msvcrt kernel32)
-add_pch(sc sc.h)
+add_pch(sc sc.h SOURCE)
 add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all)
Index: base/applications/winhlp32/lang/Tr.rc
===================================================================
--- base/applications/winhlp32/lang/Tr.rc	(rÃ©vision 61927)
+++ base/applications/winhlp32/lang/Tr.rc	(copie de travail)
@@ -57,7 +57,7 @@
   MENUITEM "&Dizge Renklerini Kullan", MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "&YardÄ±m" {
-   MENUITEM "&YardÄ±m KonularÄ±",        MNID_HELP_HELPON
+   MENUITEM "&YardÄ±m Ä°Ã§in YardÄ±m",     MNID_HELP_HELPON
    MENUITEM "H&er Zaman Ãœstte",        MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
    MENUITEM "&HakkÄ±nda",               MNID_HELP_ABOUT
Index: base/applications/winhlp32/winhelp.h
===================================================================
--- base/applications/winhlp32/winhelp.h	(rÃ©vision 61927)
+++ base/applications/winhlp32/winhelp.h	(copie de travail)
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WINHELP_H_
+#define _WINHELP_H_
+
 #define MAX_LANGUAGE_NUMBER     255
 #define MAX_STRING_LEN          255
 
@@ -203,3 +206,5 @@
 
 /* Buttons */
 #define WH_FIRST_BUTTON     500
+
+#endif /* _WINHELP_H_ */
Index: base/applications/winhlp32/CMakeLists.txt
===================================================================
--- base/applications/winhlp32/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/winhlp32/CMakeLists.txt	(copie de travail)
@@ -12,17 +12,16 @@
     hlpfile.c
     macro.c
     macro.lex.yy.c
+    winhelp.c
+    winhelp.h)
+
+add_executable(winhlp32
+    ${SOURCE}
     string.c
-    winhelp.c)
+    rsrc.rc)
 
-add_executable(winhlp32 ${SOURCE} rsrc.rc)
 set_module_type(winhlp32 win32gui)
 target_link_libraries(winhlp32 wine)
 add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
+add_pch(winhlp32 winhelp.h SOURCE)
 add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)
-
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(winhlp32)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
Index: base/applications/taskmgr/CMakeLists.txt
===================================================================
--- base/applications/taskmgr/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/taskmgr/CMakeLists.txt	(copie de travail)
@@ -18,10 +18,10 @@
     trayicon.c
     taskmgr.c
     graphctl.c
-    taskmgr.rc)
+    precomp.h)
 
-add_executable(taskmgr ${SOURCE})
+add_executable(taskmgr ${SOURCE} taskmgr.rc)
 set_module_type(taskmgr win32gui UNICODE)
 add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
-add_pch(taskmgr precomp.h)
+add_pch(taskmgr precomp.h SOURCE)
 add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all)
Index: base/applications/taskmgr/lang/tr-TR.rc
===================================================================
--- base/applications/taskmgr/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/taskmgr/lang/tr-TR.rc	(copie de travail)
@@ -341,7 +341,7 @@
     ID_HELP_TOPICS "GÃ¶rev YÃ¶neticisi ile ilgili yardÄ±m konularÄ±nÄ± gÃ¶rÃ¼ntÃ¼ler."
     ID_HELP_ABOUT "GÃ¶rev YÃ¶neticisi ile ilgili bilgi gÃ¶rÃ¼ntÃ¼ler."
     ID_FILE_EXIT "GÃ¶rev YÃ¶neticisi'nden Ã§Ä±kar."
-    ID_OPTIONS_SHOW16BITTASKS "FarazÃ® DOS makinesi (ntvdm.exe) altÄ±nda Ã§alÄ±ÅŸan 16 ikillik uygulamalarÄ± da gÃ¶rÃ¼ntÃ¼ler."
+    ID_OPTIONS_SHOW16BITTASKS "FarazÃ® DOS makinesi (ntvdm.exe) altÄ±nda Ã§alÄ±ÅŸan 16 bitlik uygulamalarÄ± da gÃ¶rÃ¼ntÃ¼ler."
     ID_VIEW_SELECTCOLUMNS """Ä°ÅŸlemler"" sekmesinde hangi dikeÃ§lerin gÃ¶rÃ¼ntÃ¼lenip gÃ¶rÃ¼ntÃ¼lenmeyeceÄŸini belirler."
     ID_VIEW_SHOWKERNELTIMES "Ä°ÅŸlemci Ã§izgelerinde Ã§ekirdek zamanlarÄ±nÄ± gÃ¶sterir."
     ID_VIEW_CPUHISTORY_ONEGRAPHALL "Toplam CPU kullanÄ±mÄ±nÄ± tek Ã§izgede gÃ¶sterir."
Index: base/applications/mmc/precomp.h
===================================================================
--- base/applications/mmc/precomp.h	(rÃ©vision 61927)
+++ base/applications/mmc/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MMC_PCH_
+#define _MMC_PCH_
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -37,3 +40,5 @@
 extern HANDLE hAppHeap;
 extern HWND hwndMainConsole;
 extern HWND hwndMDIClient;
+
+#endif /* _MMC_PCH_ */
Index: base/applications/mmc/CMakeLists.txt
===================================================================
--- base/applications/mmc/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/mmc/CMakeLists.txt	(copie de travail)
@@ -3,9 +3,9 @@
     console.c
     misc.c
     mmc.c
-    mmc.rc)
+    precomp.h)
 
-add_executable(mmcclient ${SOURCE})
+add_executable(mmcclient ${SOURCE} mmc.rc)
 set_module_type(mmcclient win32gui UNICODE)
 add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32)
-add_pch(mmcclient precomp.h)
+add_pch(mmcclient precomp.h SOURCE)
Index: base/applications/sndrec32/CMakeLists.txt
===================================================================
--- base/applications/sndrec32/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/sndrec32/CMakeLists.txt	(copie de travail)
@@ -1,17 +1,19 @@
 
 set_cpp(WITH_RUNTIME)
 
-add_executable(sndrec32
+list(APPEND SOURCE
     audio_format.cpp
     audio_membuffer.cpp
-    audio_producer.cpp
-    audio_receiver.cpp
+    #audio_producer.cpp
+    #audio_receiver.cpp
     audio_resampler_acm.cpp
     audio_wavein.cpp
     audio_waveout.cpp
     sndrec32.cpp
-    rsrc.rc)
+    stdafx.h)
 
+add_executable(sndrec32 ${SOURCE} rsrc.rc)
 set_module_type(sndrec32 win32gui UNICODE)
 add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32)
+add_pch(sndrec32 stdafx.h SOURCE)
 add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all)
Index: base/applications/sndrec32/stdafx.h
===================================================================
--- base/applications/sndrec32/stdafx.h	(rÃ©vision 61927)
+++ base/applications/sndrec32/stdafx.h	(copie de travail)
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _SNDREC32_PCH_
+#define _SNDREC32_PCH_
 
 //#include "targetver.h"
 
@@ -16,3 +17,5 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
+
+#endif /* _SNDREC32_PCH_ */
Index: base/applications/sndrec32/lang/tr-TR.rc
===================================================================
--- base/applications/sndrec32/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/sndrec32/lang/tr-TR.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -27,35 +27,35 @@
         MENUITEM "&AÃ§...", ID_FILE_OPEN
         MENUITEM "&Kaydet", ID_FILE_SAVE, GRAYED
         MENUITEM "Ay&rÄ± Kaydet...", ID_FILE_SAVEAS, GRAYED
-        MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED
-        MENUITEM "Properties", ID_FILE_PROPERTIES
+        MENUITEM "Y&eniden YÃ¼kle...", ID_FILE_RESTORE, GRAYED
+        MENUITEM "&HusÃ»siyetler", ID_FILE_PROPERTIES
         MENUITEM SEPARATOR
         MENUITEM "&Ã‡Ä±kÄ±ÅŸ", ID_FILE_EXIT
     END
-    POPUP "&Edit"
+    POPUP "&DÃ¼zen"
     BEGIN
-        MENUITEM "&Copy", ID_EDIT_COPY
-        MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED
-        MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED
+        MENUITEM "&Ã‡oÄŸalt", ID_EDIT_COPY
+        MENUITEM "&Ekleyerek YapÄ±ÅŸtÄ±r", ID_EDIT_PASTE, GRAYED
+        MENUITEM "&KarÄ±ÅŸtÄ±rarak YapÄ±ÅŸtÄ±r", ID_EDIT_PASTEMIX, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Insert File...", ID_EDIT_INSERTFILE
-        MENUITEM "&Mix with File...", ID_EDIT_MIXFILE
+        MENUITEM "K&Ã¼tÃ¼k Ekle...", ID_EDIT_INSERTFILE
+        MENUITEM "KÃ¼&tÃ¼kle KarÄ±ÅŸtÄ±r...", ID_EDIT_MIXFILE
         MENUITEM SEPARATOR
-        MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED
-        MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED
+        MENUITEM "&Åžimdiki Konumun Ã–ncesini Sil",ID_EDIT_DELETEBEFORE, GRAYED
+        MENUITEM "Åž&imdiki Konumun SonrasÄ±nÄ± Sil",ID_EDIT_DELETEAFTER, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS
+        MENUITEM "&Ses HusÃ»sÃ®yetleri", ID_EDIT_AUDIOPROPS
     END
-    POPUP "Effect&s"
+    POPUP "&Etkiler"
     BEGIN
-        MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL
-        MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL
+        MENUITEM "&Sesi %25 ArttÄ±r", ID_EFFECTS_INCVOL
+        MENUITEM "S&esi DÃ¼ÅŸÃ¼r", ID_EFFECTS_DECVOL
         MENUITEM SEPARATOR
-        MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD
-        MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD
+        MENUITEM "&HÄ±zÄ± %100 ArttÄ±r", ID_EFFECTS_INCSPD
+        MENUITEM "H&Ä±zÄ± DÃ¼ÅŸÃ¼r", ID_EFFECTS_DECSPD
         MENUITEM SEPARATOR
-        MENUITEM "&Add Echo", ID_EFFECTS_ECHO
-        MENUITEM "&Reverse", ID_EFFECTS_REVERSE
+        MENUITEM "&YankÄ± Ekle", ID_EFFECTS_ECHO
+        MENUITEM "&Tersine Ã‡evir", ID_EFFECTS_REVERSE
     END
     POPUP "&YardÄ±m"
     BEGIN
@@ -74,7 +74,7 @@
     IDS_STRPOS "Konum: %.2f s"
     IDS_STRDUR "Uzunluk: %.2f s"
     IDS_STRBUF "Ara Bellek: %.2f KB"
-    IDS_STRFMT "%.1f kHz, %u ikillik"
+    IDS_STRFMT "%.1f kHz, %u bitlik"
     IDS_STRMONO "Tek Yollu"
     IDS_STRSTEREO "Ã‡ift Yollu"
     IDS_STRCHAN "%s"
Index: base/applications/cmdutils/CMakeLists.txt
===================================================================
--- base/applications/cmdutils/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/cmdutils/CMakeLists.txt	(copie de travail)
@@ -4,6 +4,7 @@
 add_subdirectory(help)
 add_subdirectory(hostname)
 add_subdirectory(lodctr)
+add_subdirectory(mode)
 add_subdirectory(more)
 add_subdirectory(reg)
 add_subdirectory(taskkill)
Index: base/applications/cmdutils/doskey/doskey.rc
===================================================================
--- base/applications/cmdutils/doskey/doskey.rc	(rÃ©vision 61927)
+++ base/applications/cmdutils/doskey/doskey.rc	(copie de travail)
@@ -2,7 +2,7 @@
 
 #include "doskey.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "W32 doskey command"
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Doskey Command"
 #define REACTOS_STR_INTERNAL_NAME     "doskey"
 #define REACTOS_STR_ORIGINAL_FILENAME "doskey.exe"
 #include <reactos/version.rc>
Index: base/applications/cmdutils/find/find.rc
===================================================================
--- base/applications/cmdutils/find/find.rc	(rÃ©vision 61927)
+++ base/applications/cmdutils/find/find.rc	(copie de travail)
@@ -2,7 +2,7 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "W32 find command"
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Find Command"
 #define REACTOS_STR_INTERNAL_NAME     "find"
 #define REACTOS_STR_ORIGINAL_FILENAME "find.exe"
 #include <reactos/version.rc>
Index: base/applications/cmdutils/more/CMakeLists.txt
===================================================================
--- base/applications/cmdutils/more/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/cmdutils/more/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,7 @@
 
 add_executable(more more.c more.rc)
 set_module_type(more win32cui)
+set_target_properties(more PROPERTIES SUFFIX ".com")
+
 add_importlibs(more user32 msvcrt kernel32)
 add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)
Index: base/applications/cmdutils/more/more.rc
===================================================================
--- base/applications/cmdutils/more/more.rc	(rÃ©vision 61927)
+++ base/applications/cmdutils/more/more.rc	(copie de travail)
@@ -2,9 +2,9 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "W32 more command"
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS More Command"
 #define REACTOS_STR_INTERNAL_NAME     "more"
-#define REACTOS_STR_ORIGINAL_FILENAME "more.exe"
+#define REACTOS_STR_ORIGINAL_FILENAME "more.com"
 #include <reactos/version.rc>
 
 /* UTF-8 */
Index: base/applications/cmdutils/xcopy/rsrc.rc
===================================================================
--- base/applications/cmdutils/xcopy/rsrc.rc	(rÃ©vision 61927)
+++ base/applications/cmdutils/xcopy/rsrc.rc	(copie de travail)
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-#define REACTOS_STR_FILE_DESCRIPTION  "xcopy command"
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Xcopy Command"
 #define REACTOS_STR_INTERNAL_NAME     "xcopy"
 #define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe"
 #include <reactos/version.rc>
Index: base/applications/cmdutils/help/help.c
===================================================================
--- base/applications/cmdutils/help/help.c	(rÃ©vision 61927)
+++ base/applications/cmdutils/help/help.c	(copie de travail)
@@ -25,7 +25,8 @@
     DWORD dwMode;
 
     /* Check whether the handle may be that of a console... */
-    if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE;
+    if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR)
+        return FALSE;
 
     /*
      * It may be. Perform another test... The idea comes from the
Index: base/applications/cmdutils/mode/CMakeLists.txt
===================================================================
--- base/applications/cmdutils/mode/CMakeLists.txt	(rÃ©vision 0)
+++ base/applications/cmdutils/mode/CMakeLists.txt	(rÃ©vision 62573)
@@ -0,0 +1,7 @@
+
+add_executable(mode mode.c mode.rc)
+set_module_type(mode win32cui UNICODE)
+set_target_properties(mode PROPERTIES SUFFIX ".com")
+
+add_importlibs(mode user32 msvcrt kernel32)
+add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

Modification de propriÃ©tÃ©s sur base/applications/cmdutils/mode/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/cmdutils/mode/mode.c
===================================================================
--- base/applications/cmdutils/mode/mode.c	(rÃ©vision 0)
+++ base/applications/cmdutils/mode/mode.c	(rÃ©vision 62573)
@@ -0,0 +1,551 @@
+/*
+ *  ReactOS mode console command
+ *
+ *  mode.c
+ *
+ *  Copyright (C) 2002  Robert Dickenson <robd@reactos.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <windows.h>
+#include <stdio.h>
+
+#define MAX_PORTNAME_LEN 20
+#define MAX_COMPORT_NUM  10
+#define MAX_COMPARAM_LEN 20
+
+#define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
+#define ASSERT(a)
+
+const WCHAR* const usage_strings[] =
+{
+    L"Device Status:     MODE [device] [/STATUS]",
+    L"Select code page:  MODE CON[:] CP SELECT=yyy",
+    L"Code page status:  MODE CON[:] CP [/STATUS]",
+    L"Display mode:      MODE CON[:] [COLS=c] [LINES=n]",
+    L"Typematic rate:    MODE CON[:] [RATE=r DELAY=d]",
+    L"Redirect printing: MODE LPTn[:]=COMm[:]",
+    L"Serial port:       MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n" \
+    L"                            [to=on|off] [xon=on|off] [odsr=on|off]\n"    \
+    L"                            [octs=on|off] [dtr=on|off|hs]\n"             \
+    L"                            [rts=on|off|hs|tg] [idsr=on|off]",
+};
+
+const WCHAR* const parity_strings[] =
+{
+    L"None",    // default
+    L"Odd",     // only symbol in this set to have a 'd' in it
+    L"Even",    // ... 'v' in it
+    L"Mark",    // ... 'm' in it
+    L"Space"    // ... 's' and/or a 'c' in it
+};
+
+const WCHAR* const control_strings[] = { L"OFF", L"ON", L"HANDSHAKE", L"TOGGLE" };
+
+const WCHAR* const stopbit_strings[] = { L"1", L"1.5", L"2" };
+
+
+int Usage()
+{
+    int i;
+
+    wprintf(L"\nConfigures system devices.\n\n");
+    for (i = 0; i < NUM_ELEMENTS(usage_strings); i++)
+    {
+        wprintf(L"%s\n", usage_strings[i]);
+    }
+    wprintf(L"\n");
+    return 0;
+}
+
+int QueryDevices()
+{
+    WCHAR buffer[20240];
+    int len;
+    WCHAR* ptr = buffer;
+
+    *ptr = L'\0';
+    if (QueryDosDeviceW(NULL, buffer, NUM_ELEMENTS(buffer)))
+    {
+        while (*ptr != L'\0')
+        {
+            len = wcslen(ptr);
+            if (wcsstr(ptr, L"COM"))
+            {
+                wprintf(L"    Found serial device - %s\n", ptr);
+            }
+            else if (wcsstr(ptr, L"PRN"))
+            {
+                wprintf(L"    Found printer device - %s\n", ptr);
+            }
+            else if (wcsstr(ptr, L"LPT"))
+            {
+                wprintf(L"    Found parallel device - %s\n", ptr);
+            }
+            else
+            {
+                // wprintf(L"    Found other device - %s\n", ptr);
+            }
+            ptr += (len+1);
+        }
+    }
+    else
+    {
+        wprintf(L"    ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError());
+    }
+    return 1;
+}
+
+int ShowParallelStatus(int nPortNum)
+{
+    WCHAR buffer[250];
+    WCHAR szPortName[MAX_PORTNAME_LEN];
+
+    swprintf(szPortName, L"LPT%d", nPortNum);
+    wprintf(L"\nStatus for device LPT%d:\n", nPortNum);
+    wprintf(L"-----------------------\n");
+    if (QueryDosDeviceW(szPortName, buffer, NUM_ELEMENTS(buffer)))
+    {
+        WCHAR* ptr = wcsrchr(buffer, L'\\');
+        if (ptr != NULL)
+        {
+            if (0 == wcscmp(szPortName, ++ptr))
+            {
+                wprintf(L"    Printer output is not being rerouted.\n");
+            }
+            else
+            {
+                wprintf(L"    Printer output is being rerouted to serial port %s\n", ptr);
+            }
+            return 0;
+        }
+        else
+        {
+            wprintf(L"    QueryDosDeviceW(%s) returned unrecognised form %s.\n", szPortName, buffer);
+        }
+    }
+    else
+    {
+        wprintf(L"    ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError());
+    }
+    return 1;
+}
+
+int ShowConsoleStatus()
+{
+    DWORD dwKbdDelay;
+    DWORD dwKbdSpeed;
+    CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo;
+    HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    wprintf(L"\nStatus for device CON:\n");
+    wprintf(L"-----------------------\n");
+    if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo))
+    {
+        wprintf(L"    Lines:          %d\n", ConsoleScreenBufferInfo.dwSize.Y);
+        wprintf(L"    Columns:        %d\n", ConsoleScreenBufferInfo.dwSize.X);
+    }
+    if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0))
+    {
+        wprintf(L"    Keyboard delay: %ld\n", dwKbdDelay);
+    }
+    if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0))
+    {
+        wprintf(L"    Keyboard rate:  %ld\n", dwKbdSpeed);
+    }
+    wprintf(L"    Code page:      %d\n", GetConsoleOutputCP());
+    return 0;
+}
+
+static
+BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite)
+{
+    BOOL result;
+    HANDLE hPort;
+    WCHAR szPortName[MAX_PORTNAME_LEN];
+
+    ASSERT(pDCB);
+    ASSERT(pCommTimeouts);
+
+    swprintf(szPortName, L"COM%d", nPortNum);
+    hPort = CreateFileW(szPortName,
+                        GENERIC_READ | GENERIC_WRITE,
+                        0,     // exclusive
+                        NULL,  // sec attr
+                        OPEN_EXISTING,
+                        0,     // no attributes
+                        NULL); // no template
+
+    if (hPort == INVALID_HANDLE_VALUE)
+    {
+        wprintf(L"Illegal device name - %s\n", szPortName);
+        wprintf(L"Last error = 0x%lx\n", GetLastError());
+        return FALSE;
+    }
+
+    result = bWrite ? SetCommState(hPort, pDCB)
+                    : GetCommState(hPort, pDCB);
+    if (!result)
+    {
+        wprintf(L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum);
+        CloseHandle(hPort);
+        return FALSE;
+    }
+
+    result = bWrite ? SetCommTimeouts(hPort, pCommTimeouts)
+                    : GetCommTimeouts(hPort, pCommTimeouts);
+    if (!result)
+    {
+        wprintf(L"Failed to %s Timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum);
+        CloseHandle(hPort);
+        return FALSE;
+    }
+    CloseHandle(hPort);
+    return TRUE;
+}
+
+int ShowSerialStatus(int nPortNum)
+{
+    DCB dcb;
+    COMMTIMEOUTS CommTimeouts;
+
+    if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE))
+    {
+        return 1;
+    }
+    if (dcb.Parity > NUM_ELEMENTS(parity_strings))
+    {
+        wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity);
+        dcb.Parity = 0;
+    }
+    if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings))
+    {
+        wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits);
+        dcb.StopBits = 0;
+    }
+    wprintf(L"\nStatus for device COM%d:\n", nPortNum);
+    wprintf(L"-----------------------\n");
+    wprintf(L"    Baud:            %ld\n", dcb.BaudRate);
+    wprintf(L"    Parity:          %s\n", parity_strings[dcb.Parity]);
+    wprintf(L"    Data Bits:       %d\n", dcb.ByteSize);
+    wprintf(L"    Stop Bits:       %s\n", stopbit_strings[dcb.StopBits]);
+    wprintf(L"    Timeout:         %s\n", CommTimeouts.ReadIntervalTimeout ? L"ON" : L"OFF");
+    wprintf(L"    XON/XOFF:        %s\n", dcb.fOutX           ? L"ON" : L"OFF");
+    wprintf(L"    CTS handshaking: %s\n", dcb.fOutxCtsFlow    ? L"ON" : L"OFF");
+    wprintf(L"    DSR handshaking: %s\n", dcb.fOutxDsrFlow    ? L"ON" : L"OFF");
+    wprintf(L"    DSR sensitivity: %s\n", dcb.fDsrSensitivity ? L"ON" : L"OFF");
+    wprintf(L"    DTR circuit:     %s\n", control_strings[dcb.fDtrControl]);
+    wprintf(L"    RTS circuit:     %s\n", control_strings[dcb.fRtsControl]);
+    return 0;
+}
+
+int SetParallelState(int nPortNum)
+{
+    WCHAR szPortName[MAX_PORTNAME_LEN];
+    WCHAR szTargetPath[MAX_PORTNAME_LEN];
+
+    swprintf(szPortName, L"LPT%d", nPortNum);
+    swprintf(szTargetPath, L"COM%d", nPortNum);
+    if (!DefineDosDeviceW(DDD_REMOVE_DEFINITION, szPortName, szTargetPath))
+    {
+        wprintf(L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError());
+    }
+    return 0;
+}
+
+/*
+    \??\COM1
+    \Device\NamedPipe\Spooler\LPT1
+BOOL DefineDosDevice(
+  DWORD dwFlags,         // options
+  LPCTSTR lpDeviceName,  // device name
+  LPCTSTR lpTargetPath   // path string
+);
+DWORD QueryDosDevice(
+  LPCTSTR lpDeviceName, // MS-DOS device name string
+  LPTSTR lpTargetPath,  // query results buffer
+  DWORD ucchMax         // maximum size of buffer
+);
+ */
+
+int SetConsoleState()
+{
+/*
+    "Select code page:  MODE CON[:] CP SELECT=yyy",
+    "Code page status:  MODE CON[:] CP [/STATUS]",
+    "Display mode:      MODE CON[:] [COLS=c] [LINES=n]",
+    "Typematic rate:    MODE CON[:] [RATE=r DELAY=d]",
+ */
+    return 0;
+}
+
+static
+int ExtractModeSerialParams(const WCHAR* param)
+{
+    if (wcsstr(param, L"OFF"))
+        return 0;
+    else if (wcsstr(param, L"ON"))
+        return 1;
+    else if (wcsstr(param, L"HS"))
+        return 2;
+    else if (wcsstr(param, L"TG"))
+        return 3;
+
+    return -1;
+}
+
+int SetSerialState(int nPortNum, int args, WCHAR *argv[])
+{
+    int arg;
+    int value;
+    DCB dcb;
+    COMMTIMEOUTS CommTimeouts;
+    WCHAR buf[MAX_COMPARAM_LEN+1];
+
+    if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE))
+    {
+        for (arg = 2; arg < args; arg++)
+        {
+            if (wcslen(argv[arg]) > MAX_COMPARAM_LEN)
+            {
+                wprintf(L"Invalid parameter (too long) - %s\n", argv[arg]);
+                return 1;
+            }
+            wcscpy(buf, argv[arg]);
+            _wcslwr(buf);
+            if (wcsstr(buf, L"baud="))
+            {
+                wscanf(buf+5, L"%lu", &dcb.BaudRate);
+            }
+            else if (wcsstr(buf, L"parity="))
+            {
+                if (wcschr(buf, L'D'))
+                    dcb.Parity = 1;
+                else if (wcschr(buf, L'V'))
+                    dcb.Parity = 2;
+                else if (wcschr(buf, L'M'))
+                    dcb.Parity = 3;
+                else if (wcschr(buf, L'S'))
+                    dcb.Parity = 4;
+                else
+                    dcb.Parity = 0;
+            }
+            else if (wcsstr(buf, L"data="))
+            {
+                wscanf(buf+5, L"%lu", &dcb.ByteSize);
+            }
+            else if (wcsstr(buf, L"stop="))
+            {
+                if (wcschr(buf, L'5'))
+                    dcb.StopBits = 1;
+                else if (wcschr(buf, L'2'))
+                    dcb.StopBits = 2;
+                else
+                    dcb.StopBits = 0;
+            }
+            else if (wcsstr(buf, L"to=")) // to=on|off
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else if (wcsstr(buf, L"xon=")) // xon=on|off
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                    dcb.fOutX = value;
+                    dcb.fInX = value;
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else if (wcsstr(buf, L"odsr=")) // odsr=on|off
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                    dcb.fOutxDsrFlow = value;
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else if (wcsstr(buf, L"octs=")) // octs=on|off
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                    dcb.fOutxCtsFlow = value;
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else if (wcsstr(buf, L"dtr=")) // dtr=on|off|hs
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                    dcb.fDtrControl = value;
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else if (wcsstr(buf, L"rts=")) // rts=on|off|hs|tg
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                    dcb.fRtsControl = value;
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else if (wcsstr(buf, L"idsr=")) // idsr=on|off
+            {
+                value = ExtractModeSerialParams(buf);
+                if (value != -1)
+                {
+                    dcb.fDsrSensitivity = value;
+                }
+                else
+                {
+                    goto invalid_serial_parameter;
+                }
+            }
+            else
+            {
+invalid_serial_parameter:;
+                wprintf(L"Invalid parameter - %s\n", buf);
+                return 1;
+            }
+        }
+        SerialPortQuery(nPortNum, &dcb, &CommTimeouts, TRUE);
+    }
+    return 0;
+}
+
+int find_portnum(const WCHAR* cmdverb)
+{
+    int portnum = -1;
+
+    if (cmdverb[3] >= L'0' && cmdverb[3] <= L'9')
+    {
+        portnum = cmdverb[3] - L'0';
+        if (cmdverb[4] >= L'0' && cmdverb[4] <= L'9')
+        {
+            portnum *= 10;
+            portnum += cmdverb[4] - L'0';
+        }
+    }
+    return portnum;
+}
+
+int wmain(int argc, WCHAR* argv[])
+{
+    int nPortNum;
+    WCHAR param1[MAX_COMPARAM_LEN+1];
+    WCHAR param2[MAX_COMPARAM_LEN+1];
+
+    if (argc > 1)
+    {
+        if (wcslen(argv[1]) > MAX_COMPARAM_LEN)
+        {
+            wprintf(L"Invalid parameter (too long) - %s\n", argv[1]);
+            return 1;
+        }
+        wcscpy(param1, argv[1]);
+        _wcslwr(param1);
+        if (argc > 2)
+        {
+            if (wcslen(argv[2]) > MAX_COMPARAM_LEN)
+            {
+                wprintf(L"Invalid parameter (too long) - %s\n", argv[2]);
+                return 1;
+            }
+            wcscpy(param2, argv[2]);
+            _wcslwr(param2);
+        }
+        else
+        {
+            param2[0] = L'\0';
+        }
+        if (wcsstr(param1, L"/?") || wcsstr(param1, L"-?"))
+        {
+            return Usage();
+        }
+        else if (wcsstr(param1, L"/status"))
+        {
+            goto show_status;
+        }
+        else if (wcsstr(param1, L"lpt"))
+        {
+            nPortNum = find_portnum(param1);
+            if (nPortNum != -1)
+                return ShowParallelStatus(nPortNum);
+        }
+        else if (wcsstr(param1, L"con"))
+        {
+            return ShowConsoleStatus();
+        }
+        else if (wcsstr(param1, L"com"))
+        {
+            nPortNum = find_portnum(param1);
+            if (nPortNum != -1)
+            {
+                if (param2[0] == L'\0' || wcsstr(param2, L"/status"))
+                {
+                    return ShowSerialStatus(nPortNum);
+                }
+                else
+                {
+                    return SetSerialState(nPortNum, argc, argv);
+                }
+            }
+        }
+        wprintf(L"Invalid parameter - %s\n", param1);
+        return 1;
+    }
+    else
+    {
+show_status:;
+
+        QueryDevices();
+/*
+        ShowParallelStatus(1);
+        for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++)
+        {
+            ShowSerialStatus(nPortNum + 1);
+        }
+        ShowConsoleStatus();
+ */
+    }
+    return 0;
+}

Modification de propriÃ©tÃ©s sur base/applications/cmdutils/mode/mode.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/cmdutils/mode/mode.rc
===================================================================
--- base/applications/cmdutils/mode/mode.rc	(rÃ©vision 0)
+++ base/applications/cmdutils/mode/mode.rc	(rÃ©vision 62573)
@@ -0,0 +1,5 @@
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Mode Utility"
+#define REACTOS_STR_INTERNAL_NAME       "mode"
+#define REACTOS_STR_ORIGINAL_FILENAME   "mode.com"
+#include <reactos/version.rc>

Modification de propriÃ©tÃ©s sur base/applications/cmdutils/mode/mode.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/cmdutils/mode
===================================================================
--- base/applications/cmdutils/mode	(rÃ©vision 0)
+++ base/applications/cmdutils/mode	(copie de travail)

Modification de propriÃ©tÃ©s sur base/applications/cmdutils/mode
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,7 ##
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln
Index: base/applications/mstsc/precomp.h
===================================================================
--- base/applications/mstsc/precomp.h	(rÃ©vision 61927)
+++ base/applications/mstsc/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MSTSC_PCH_
+#define _MSTSC_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -106,3 +109,5 @@
 VOID SaveAllSettings(PINFO pInfo);
 
 #endif /* __TODO_MSTSC_H */
+
+#endif /* _MSTSC_PCH_ */
Index: base/applications/mstsc/CMakeLists.txt
===================================================================
--- base/applications/mstsc/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/mstsc/CMakeLists.txt	(copie de travail)
@@ -19,10 +19,10 @@
     tcp.c
     uimain.c
     win32.c
-    rdc.rc)
+    precomp.h)
 
-add_executable(mstsc ${SOURCE})
+add_executable(mstsc ${SOURCE} rdc.rc)
 set_module_type(mstsc win32gui UNICODE)
 add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
-add_pch(mstsc precomp.h)
+add_pch(mstsc precomp.h SOURCE)
 add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all)
Index: base/applications/wordpad/lang/Tr.rc
===================================================================
--- base/applications/wordpad/lang/Tr.rc	(rÃ©vision 61927)
+++ base/applications/wordpad/lang/Tr.rc	(copie de travail)
@@ -83,7 +83,7 @@
         MENUITEM "&Ã–ÄŸe Ä°mi",            ID_BULLET
         MENUITEM "&Paragraf...",        ID_PARAFORMAT
         MENUITEM "&Sekme DuraklarÄ±...", ID_TABSTOPS
-        POPUP "&Arkaplan"
+        POPUP "&Arka Plan"
         BEGIN
             MENUITEM "&Dizge Rengi\tCtrl+1",    ID_BACK_1
             MENUITEM "&SarÄ±mtÄ±rak\tCtrl+2",     ID_BACK_2
@@ -207,11 +207,11 @@
 BEGIN
     STRING_ALL_FILES,                 "TÃ¼m KÃ¼tÃ¼kler (*.*)"
     STRING_TEXT_FILES_TXT,            "Metin Belgeleri (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT,    "Evrenlik DÃ¼zgÃ¼lÃ¼ Metin Belgeleri (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT,    "Evrenlik Kodlu Metin Belgeleri (*.txt)"
     STRING_RICHTEXT_FILES_RTF,        "GeliÅŸmiÅŸ Metin Belgeleri (*.rtf)"
     STRING_NEWFILE_RICHTEXT,          "GeliÅŸmiÅŸ Metin Belgesi"
     STRING_NEWFILE_TXT,               "Metin Belgesi"
-    STRING_NEWFILE_TXT_UNICODE,       "Evrenlik DÃ¼zgÃ¼lÃ¼ Metin Belgesi"
+    STRING_NEWFILE_TXT_UNICODE,       "Evrenlik Kodlu Metin Belgesi"
     STRING_PRINTER_FILES_PRN,         "YazÄ±cÄ± KÃ¼tÃ¼kleri (*.PRN)"
 END
 
Index: base/applications/dxdiag/CMakeLists.txt
===================================================================
--- base/applications/dxdiag/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/dxdiag/CMakeLists.txt	(copie de travail)
@@ -8,16 +8,16 @@
     network.c
     help.c
     dxdiag.c
-    dxdiag.rc
     ddtest.c
     d3dtest.c
     d3dtest7.c
     d3dtest8.c
-    d3dtest9.c)
+    d3dtest9.c
+    precomp.h)
 
-add_executable(dxdiag ${SOURCE})
+add_executable(dxdiag ${SOURCE} dxdiag.rc)
 set_module_type(dxdiag win32gui UNICODE)
 target_link_libraries(dxdiag dxguid)
 add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll)
-add_pch(dxdiag precomp.h)
+add_pch(dxdiag precomp.h SOURCE)
 add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all)
Index: base/applications/dxdiag/lang/tr-TR.rc
===================================================================
--- base/applications/dxdiag/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/dxdiag/lang/tr-TR.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* TRANSLATORS: 2012 - Arda TanrÄ±kulu (ardatan) (ardatanrikulu@gmail.com), 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATORS: 2012 - Arda TanrÄ±kulu (ardatan) (ardatanrikulu@gmail.com); 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -191,7 +191,7 @@
     IDS_DEVICE_MANUFACTURER "Ãœretici KimliÄŸi"
     IDS_DEVICE_PRODUCT "ÃœrÃ¼n KimliÄŸi"
     IDS_DEVICE_FORCEFEEDBACK "GÃ¼Ã§ DÃ¶nÃ¼tlÃ¼ SÃ¼rÃ¼cÃ¼sÃ¼"
-    IDS_NOT_APPLICABLE "n/a"
+    IDS_NOT_APPLICABLE "Uygulanamaz"
     IDS_OPTION_YES "Evet"
     IDS_DIRECTPLAY_COL_NAME1 "Ad"
     IDS_DIRECTPLAY_COL_NAME2 "DeÄŸer"
@@ -216,7 +216,7 @@
     IDS_DDFULLSCREEN_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± tÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte Ã§izmek iÃ§in kullanacak. TÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte devinen bir ak dikdÃ¶rtgen gÃ¶receksiniz. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?"
     IDS_DDFULLSCREEN_RESULT "TÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte devinen bir ak dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?"
     IDS_FORMAT_ADAPTER_MEM "%u MB"
-    IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u ikillik) (%uHz)"
+    IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bitlik) (%uHz)"
     IDS_OPTION_NO "HayÄ±r"
     IDS_D3DTEST_DESCRIPTION "React3D arayÃ¼z sÄ±namasÄ± baÅŸlatÄ±lacak. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?"
     IDS_D3DTEST_D3Dx "Bu sÄ±nama, donanÄ±m hÄ±zlandÄ±rmalÄ± React3D %u arayÃ¼zÃ¼nÃ¼ kullanacak."
Index: base/applications/fontview/CMakeLists.txt
===================================================================
--- base/applications/fontview/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/fontview/CMakeLists.txt	(copie de travail)
@@ -1,9 +1,11 @@
 
-add_executable(fontview
+list(APPEND SOURCE
     display.c
     fontview.c
-    fontview.rc)
+    precomp.h)
 
+add_executable(fontview ${SOURCE} fontview.rc)
 set_module_type(fontview win32gui)
 add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32)
+add_pch(fontview precomp.h SOURCE)
 add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all)
Index: base/applications/fontview/display.c
===================================================================
--- base/applications/fontview/display.c	(rÃ©vision 61927)
+++ base/applications/fontview/display.c	(copie de travail)
@@ -113,7 +113,7 @@
 	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
 	y += tm.tmHeight + 1;
 
-	swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')");
+	swprintf(szCaption, L"0123456789.:,;(\"~!@#$%%^&*')");
 	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
 	y += tm.tmHeight + 1;
 
Index: base/applications/sndvol32/CMakeLists.txt
===================================================================
--- base/applications/sndvol32/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/sndvol32/CMakeLists.txt	(copie de travail)
@@ -4,10 +4,10 @@
     misc.c
     mixer.c
     sndvol32.c
-    sndvol32.rc)
+    sndvol32.h)
 
-add_executable(sndvol32 ${SOURCE})
+add_executable(sndvol32 ${SOURCE} sndvol32.rc)
 set_module_type(sndvol32 win32gui UNICODE)
 add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll)
-add_pch(sndvol32 sndvol32.h)
+add_pch(sndvol32 sndvol32.h SOURCE)
 add_cd_file(TARGET sndvol32 DESTINATION reactos/system32 FOR all)
Index: base/applications/shutdown/CMakeLists.txt
===================================================================
--- base/applications/shutdown/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/shutdown/CMakeLists.txt	(copie de travail)
@@ -3,10 +3,10 @@
     gui.c
     misc.c
     shutdown.c
-    shutdown.rc)
+    precomp.h)
 
-add_executable(shutdown ${SOURCE})
+add_executable(shutdown ${SOURCE} shutdown.rc)
 set_module_type(shutdown win32cui UNICODE)
 add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32)
-add_pch(shutdown precomp.h)
+add_pch(shutdown precomp.h SOURCE)
 add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all)
Index: base/applications/mspaint/sizebox.c
===================================================================
--- base/applications/mspaint/sizebox.c	(rÃ©vision 61927)
+++ base/applications/mspaint/sizebox.c	(copie de travail)
@@ -9,6 +9,7 @@
 /* INCLUDES *********************************************************/
 
 #include "precomp.h"
+#include "sizebox.h"
 
 /* FUNCTIONS ********************************************************/
 
@@ -16,6 +17,26 @@
 short xOrig;
 short yOrig;
 
+void
+RegisterWclSizebox()
+{
+    WNDCLASSEX wclSizebox;
+    /* initializing and registering the window class for the size boxes */
+    wclSizebox.hInstance       = hProgInstance;
+    wclSizebox.lpszClassName   = _T("Sizebox");
+    wclSizebox.lpfnWndProc     = SizeboxWinProc;
+    wclSizebox.style           = CS_DBLCLKS;
+    wclSizebox.cbSize          = sizeof(WNDCLASSEX);
+    wclSizebox.hIcon           = NULL;
+    wclSizebox.hIconSm         = NULL;
+    wclSizebox.hCursor         = LoadCursor(NULL, IDC_ARROW);
+    wclSizebox.lpszMenuName    = NULL;
+    wclSizebox.cbClsExtra      = 0;
+    wclSizebox.cbWndExtra      = 0;
+    wclSizebox.hbrBackground   = GetSysColorBrush(COLOR_HIGHLIGHT);
+    RegisterClassEx (&wclSizebox);
+}
+
 LRESULT CALLBACK
 SizeboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
Index: base/applications/mspaint/selection.c
===================================================================
--- base/applications/mspaint/selection.c	(rÃ©vision 61927)
+++ base/applications/mspaint/selection.c	(copie de travail)
@@ -10,19 +10,96 @@
 
 #include "precomp.h"
 
+/* DEFINES **********************************************************/
+
+#define ACTION_MOVE                 0
+#define ACTION_RESIZE_TOP_LEFT      1
+#define ACTION_RESIZE_TOP           2
+#define ACTION_RESIZE_TOP_RIGHT     3
+#define ACTION_RESIZE_LEFT          4
+#define ACTION_RESIZE_RIGHT         5
+#define ACTION_RESIZE_BOTTOM_LEFT   6
+#define ACTION_RESIZE_BOTTOM        7
+#define ACTION_RESIZE_BOTTOM_RIGHT  8
+
 /* FUNCTIONS ********************************************************/
 
-LPCTSTR cursors[9] = { IDC_SIZEALL, IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW,
-    IDC_SIZEWE, IDC_SIZEWE, IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE
+LPCTSTR cursors[9] = { /* action to mouse cursor lookup table */
+    IDC_SIZEALL, 
+    
+    IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW,
+    IDC_SIZEWE,               IDC_SIZEWE,
+    IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE
 };
 
 BOOL moving = FALSE;
-int action = 0;
-short xPos;
-short yPos;
-short xFrac;
-short yFrac;
+int action = ACTION_MOVE;
+POINTS pos;
+POINTS frac;
+POINT delta;
 
+void
+RegisterWclSelection()
+{
+    WNDCLASSEX wclSelection;
+    /* initializing and registering the window class for the selection frame */
+    wclSelection.hInstance      = hProgInstance;
+    wclSelection.lpszClassName  = _T("Selection");
+    wclSelection.lpfnWndProc    = SelectionWinProc;
+    wclSelection.style          = CS_DBLCLKS;
+    wclSelection.cbSize         = sizeof(WNDCLASSEX);
+    wclSelection.hIcon          = NULL;
+    wclSelection.hIconSm        = NULL;
+    wclSelection.hCursor        = LoadCursor(NULL, IDC_SIZEALL);
+    wclSelection.lpszMenuName   = NULL;
+    wclSelection.cbClsExtra     = 0;
+    wclSelection.cbWndExtra     = 0;
+    wclSelection.hbrBackground  = NULL;
+    RegisterClassEx (&wclSelection);
+}
+
+BOOL
+ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, DWORD dwRop, COLORREF keyColor)
+{
+    HDC hTempDC;
+    HDC hTempDC2;
+    HBITMAP hTempBm;
+    HBRUSH hTempBrush;
+    HBITMAP hTempMask;
+    
+    hTempDC = CreateCompatibleDC(hdcSrc);
+    hTempDC2 = CreateCompatibleDC(hdcSrc);
+    hTempBm = CreateCompatibleBitmap(hTempDC, nWidth, nHeight);
+    SelectObject(hTempDC, hTempBm);
+    hTempBrush = CreateSolidBrush(keyColor);
+    SelectObject(hTempDC, hTempBrush);
+    BitBlt(hTempDC, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY);
+    PatBlt(hTempDC, 0, 0, nWidth, nHeight, PATINVERT);
+    hTempMask = CreateBitmap(nWidth, nHeight, 1, 1, NULL);
+    SelectObject(hTempDC2, hTempMask);
+    BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, 0, 0, SRCCOPY);
+    SelectObject(hTempDC, hbmMask);
+    BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, xMask, yMask, SRCAND);
+    MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, hTempMask, xMask, yMask, dwRop);
+    DeleteDC(hTempDC);
+    DeleteDC(hTempDC2);
+    DeleteObject(hTempBm);
+    DeleteObject(hTempBrush);
+    DeleteObject(hTempMask);
+    return TRUE;
+}
+
+void
+ForceRefreshSelectionContents()
+{
+    if (IsWindowVisible(hSelection))
+    {
+        SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0));
+        SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0));
+        SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0));
+    }
+}
+
 int
 identifyCorner(short x, short y, short w, short h)
 {
@@ -29,27 +106,27 @@
     if (y < 3)
     {
         if (x < 3)
-            return 1;
+            return ACTION_RESIZE_TOP_LEFT;
         if ((x < w / 2 + 2) && (x >= w / 2 - 1))
-            return 2;
+            return ACTION_RESIZE_TOP;
         if (x >= w - 3)
-            return 3;
+            return ACTION_RESIZE_TOP_RIGHT;
     }
     if ((y < h / 2 + 2) && (y >= h / 2 - 1))
     {
         if (x < 3)
-            return 4;
+            return ACTION_RESIZE_LEFT;
         if (x >= w - 3)
-            return 5;
+            return ACTION_RESIZE_RIGHT;
     }
     if (y >= h - 3)
     {
         if (x < 3)
-            return 6;
+            return ACTION_RESIZE_BOTTOM_LEFT;
         if ((x < w / 2 + 2) && (x >= w / 2 - 1))
-            return 7;
+            return ACTION_RESIZE_BOTTOM;
         if (x >= w - 3)
-            return 8;
+            return ACTION_RESIZE_BOTTOM_RIGHT;
     }
     return 0;
 }
@@ -65,125 +142,132 @@
             {
                 HDC hDC = GetDC(hwnd);
                 DefWindowProc(hwnd, message, wParam, lParam);
-                SelectionFrame(hDC, 1, 1, rectSel_dest[2] * zoom / 1000 + 5,
-                               rectSel_dest[3] * zoom / 1000 + 5);
+                SelectionFrame(hDC, 1, 1, RECT_WIDTH(rectSel_dest) * zoom / 1000 + 5,
+                               RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 5);
                 ReleaseDC(hwnd, hDC);
             }
             break;
         }
         case WM_LBUTTONDOWN:
-            xPos = GET_X_LPARAM(lParam);
-            yPos = GET_Y_LPARAM(lParam);
+            pos.x = GET_X_LPARAM(lParam);
+            pos.y = GET_Y_LPARAM(lParam);
+            delta.x = 0;
+            delta.y = 0;
             SetCapture(hwnd);
-            if (action != 0)
+            if (action != ACTION_MOVE)
                 SetCursor(LoadCursor(NULL, cursors[action]));
             moving = TRUE;
+            InvalidateRect(hScrlClient, NULL, TRUE);
             break;
         case WM_MOUSEMOVE:
             if (moving)
             {
                 TCHAR sizeStr[100];
-                int xDelta;
-                int yDelta;
+                POINT deltaUsed;
                 resetToU1();
-                xFrac += GET_X_LPARAM(lParam) - xPos;
-                yFrac += GET_Y_LPARAM(lParam) - yPos;
+                frac.x += GET_X_LPARAM(lParam) - pos.x;
+                frac.y += GET_Y_LPARAM(lParam) - pos.y;
+                delta.x += frac.x * 1000 / zoom;
+                delta.y += frac.y * 1000 / zoom;
                 if (zoom < 1000)
                 {
-                    xDelta = xFrac * 1000 / zoom;
-                    xFrac = 0;
-                    yDelta = yFrac * 1000 / zoom;
-                    yFrac = 0;
+                    frac.x = 0;
+                    frac.y = 0;
                 }
                 else
                 {
-                    xDelta = xFrac * 1000 / zoom;
-                    xFrac -= (xFrac * 1000 / zoom) * zoom / 1000;
-                    yDelta = yFrac * 1000 / zoom;
-                    yFrac -= (yFrac * 1000 / zoom) * zoom / 1000;
+                    frac.x -= (frac.x * 1000 / zoom) * zoom / 1000;
+                    frac.y -= (frac.y * 1000 / zoom) * zoom / 1000;
                 }
                 switch (action)
                 {
-                    case 0:
-                        rectSel_dest[0] += xDelta;
-                        rectSel_dest[1] += yDelta;
+                    case ACTION_MOVE:                /* move selection */
+                        deltaUsed.x = delta.x;
+                        deltaUsed.y = delta.y;
+                        OffsetRect(&rectSel_dest, deltaUsed.x, deltaUsed.y);
                         break;
-                    case 1:
-                        rectSel_dest[0] += xDelta;
-                        rectSel_dest[1] += yDelta;
-                        rectSel_dest[2] -= xDelta;
-                        rectSel_dest[3] -= yDelta;
+                    case ACTION_RESIZE_TOP_LEFT:     /* resize at upper left corner */
+                        deltaUsed.x = min(delta.x, RECT_WIDTH(rectSel_dest) - 1);
+                        deltaUsed.y = min(delta.y, RECT_HEIGHT(rectSel_dest) - 1);
+                        rectSel_dest.left += deltaUsed.x;
+                        rectSel_dest.top  += deltaUsed.y;
                         break;
-                    case 2:
-                        rectSel_dest[1] += yDelta;
-                        rectSel_dest[3] -= yDelta;
+                    case ACTION_RESIZE_TOP:          /* resize at top edge */
+                        deltaUsed.x = delta.x;
+                        deltaUsed.y = min(delta.y, RECT_HEIGHT(rectSel_dest) - 1);
+                        rectSel_dest.top += deltaUsed.y;
                         break;
-                    case 3:
-                        rectSel_dest[2] += xDelta;
-                        rectSel_dest[1] += yDelta;
+                    case ACTION_RESIZE_TOP_RIGHT:    /* resize at upper right corner */
+                        deltaUsed.x = max(delta.x, -(RECT_WIDTH(rectSel_dest) - 1));
+                        deltaUsed.y = min(delta.y, RECT_HEIGHT(rectSel_dest) - 1);
+                        rectSel_dest.top   += deltaUsed.y;
+                        rectSel_dest.right += deltaUsed.x;
                         break;
-                    case 4:
-                        rectSel_dest[0] += xDelta;
-                        rectSel_dest[2] -= xDelta;
+                    case ACTION_RESIZE_LEFT:         /* resize at left edge */
+                        deltaUsed.x = min(delta.x, RECT_WIDTH(rectSel_dest) - 1);
+                        deltaUsed.y = delta.y;
+                        rectSel_dest.left += deltaUsed.x;
                         break;
-                    case 5:
-                        rectSel_dest[2] += xDelta;
+                    case ACTION_RESIZE_RIGHT:        /* resize at right edge */
+                        deltaUsed.x = max(delta.x, -(RECT_WIDTH(rectSel_dest) - 1));
+                        deltaUsed.y = delta.y;
+                        rectSel_dest.right += deltaUsed.x;
                         break;
-                    case 6:
-                        rectSel_dest[0] += xDelta;
-                        rectSel_dest[2] -= xDelta;
-                        rectSel_dest[3] += yDelta;
+                    case ACTION_RESIZE_BOTTOM_LEFT:  /* resize at lower left corner */
+                        deltaUsed.x = min(delta.x, RECT_WIDTH(rectSel_dest) - 1);
+                        deltaUsed.y = max(delta.y, -(RECT_HEIGHT(rectSel_dest) - 1));
+                        rectSel_dest.left   += deltaUsed.x;
+                        rectSel_dest.bottom += deltaUsed.y;
                         break;
-                    case 7:
-                        rectSel_dest[3] += yDelta;
+                    case ACTION_RESIZE_BOTTOM:       /* resize at bottom edge */
+                        deltaUsed.x = delta.x;
+                        deltaUsed.y = max(delta.y, -(RECT_HEIGHT(rectSel_dest) - 1));
+                        rectSel_dest.bottom += deltaUsed.y;
                         break;
-                    case 8:
-                        rectSel_dest[2] += xDelta;
-                        rectSel_dest[3] += yDelta;
+                    case ACTION_RESIZE_BOTTOM_RIGHT: /* resize at lower right corner */
+                        deltaUsed.x = max(delta.x, -(RECT_WIDTH(rectSel_dest) - 1));
+                        deltaUsed.y = max(delta.y, -(RECT_HEIGHT(rectSel_dest) - 1));
+                        rectSel_dest.right  += deltaUsed.x;
+                        rectSel_dest.bottom += deltaUsed.y;
                         break;
                 }
+                delta.x -= deltaUsed.x;
+                delta.y -= deltaUsed.y;
 
-                _stprintf(sizeStr, _T("%d x %d"), rectSel_dest[2], rectSel_dest[3]);
+                _stprintf(sizeStr, _T("%d x %d"), RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest));
                 SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr);
 
-                if (action != 0)
-                    StretchBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY);
+                if (activeTool == TOOL_TEXT)
+                {
+                    Text(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, fgColor, bgColor, textToolText, hfontTextFont, transpBg);
+                }
                 else
-                if (transpBg == 0)
-                    MaskBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3],
-                            hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND));
-                else
                 {
-                    HBITMAP tempMask;
-                    HBRUSH oldBrush;
-                    HDC tempDC;
-                    tempMask = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL);
-                    oldBrush = SelectObject(hSelDC, CreateSolidBrush(bgColor));
-                    tempDC = CreateCompatibleDC(hSelDC);
-                    SelectObject(tempDC, tempMask);
-                    MaskBlt(tempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, hSelMask, 0, 0,
-                            MAKEROP4(NOTSRCCOPY, BLACKNESS));
-                    DeleteDC(tempDC);
-                    DeleteObject(SelectObject(hSelDC, oldBrush));
-
-                    MaskBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3],
-                            hSelDC, 0, 0, tempMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND));
-                    DeleteObject(tempMask);
+                    if (action != ACTION_MOVE)
+                        StretchBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY);
+                    else
+                    if (transpBg == 0)
+                        MaskBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest),
+                                hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND));
+                    else
+                    {
+                        ColorKeyedMaskBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest),
+                                          hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND), bgColor);
+                    }
                 }
                 InvalidateRect(hImageArea, NULL, FALSE);
-                xPos = GET_X_LPARAM(lParam);
-                yPos = GET_Y_LPARAM(lParam);
-                //SendMessage(hwnd, WM_PAINT, 0, 0);
+                pos.x = GET_X_LPARAM(lParam);
+                pos.y = GET_Y_LPARAM(lParam);
             }
             else
             {
-                int w = rectSel_dest[2] * zoom / 1000 + 6;
-                int h = rectSel_dest[3] * zoom / 1000 + 6;
-                xPos = GET_X_LPARAM(lParam);
-                yPos = GET_Y_LPARAM(lParam);
+                int w = RECT_WIDTH(rectSel_dest) * zoom / 1000 + 6;
+                int h = RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 6;
+                pos.x = GET_X_LPARAM(lParam);
+                pos.y = GET_Y_LPARAM(lParam);
                 SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL);
-                action = identifyCorner(xPos, yPos, w, h);
-                if (action != 0)
+                action = identifyCorner(pos.x, pos.y, w, h);
+                if (action != ACTION_MOVE)
                     SetCursor(LoadCursor(NULL, cursors[action]));
             }
             break;
@@ -192,27 +276,34 @@
             {
                 moving = FALSE;
                 ReleaseCapture();
-                if (action != 0)
+                if (action != ACTION_MOVE)
                 {
-                    HDC hTempDC;
-                    HBITMAP hTempBm;
-                    hTempDC = CreateCompatibleDC(hSelDC);
-                    hTempBm = CreateDIBWithProperties(rectSel_dest[2], rectSel_dest[3]);
-                    SelectObject(hTempDC, hTempBm);
-                    SelectObject(hSelDC, hSelBm);
-                    StretchBlt(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0,
-                               GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY);
-                    DeleteObject(hSelBm);
-                    hSelBm = hTempBm;
-                    hTempBm = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL);
-                    SelectObject(hTempDC, hTempBm);
-                    SelectObject(hSelDC, hSelMask);
-                    StretchBlt(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0,
-                               GetDIBWidth(hSelMask), GetDIBHeight(hSelMask), SRCCOPY);
-                    DeleteObject(hSelMask);
-                    hSelMask = hTempBm;
-                    SelectObject(hSelDC, hSelBm);
-                    DeleteDC(hTempDC);
+                    if (activeTool == TOOL_TEXT)
+                    {
+                        
+                    }
+                    else
+                    {
+                        HDC hTempDC;
+                        HBITMAP hTempBm;
+                        hTempDC = CreateCompatibleDC(hSelDC);
+                        hTempBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest));
+                        SelectObject(hTempDC, hTempBm);
+                        SelectObject(hSelDC, hSelBm);
+                        StretchBlt(hTempDC, 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0,
+                                   GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY);
+                        DeleteObject(hSelBm);
+                        hSelBm = hTempBm;
+                        hTempBm = CreateBitmap(RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), 1, 1, NULL);
+                        SelectObject(hTempDC, hTempBm);
+                        SelectObject(hSelDC, hSelMask);
+                        StretchBlt(hTempDC, 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0,
+                                   GetDIBWidth(hSelMask), GetDIBHeight(hSelMask), SRCCOPY);
+                        DeleteObject(hSelMask);
+                        hSelMask = hTempBm;
+                        SelectObject(hSelDC, hSelBm);
+                        DeleteDC(hTempDC);
+                    }
                 }
                 placeSelWin();
                 ShowWindow(hSelection, SW_HIDE);
Index: base/applications/mspaint/sizebox.h
===================================================================
--- base/applications/mspaint/sizebox.h	(rÃ©vision 61927)
+++ base/applications/mspaint/sizebox.h	(copie de travail)
@@ -6,4 +6,6 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
+void RegisterWclSizebox();
+
 LRESULT CALLBACK SizeboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
Index: base/applications/mspaint/mouse.c
===================================================================
--- base/applications/mspaint/mouse.c	(rÃ©vision 61927)
+++ base/applications/mspaint/mouse.c	(copie de travail)
@@ -15,8 +15,8 @@
 void
 placeSelWin()
 {
-    MoveWindow(hSelection, rectSel_dest[0] * zoom / 1000, rectSel_dest[1] * zoom / 1000,
-               rectSel_dest[2] * zoom / 1000 + 6, rectSel_dest[3] * zoom / 1000 + 6, TRUE);
+    MoveWindow(hSelection, rectSel_dest.left * zoom / 1000, rectSel_dest.top * zoom / 1000,
+               RECT_WIDTH(rectSel_dest) * zoom / 1000 + 6, RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 6, TRUE);
     BringWindowToTop(hSelection);
     InvalidateRect(hImageArea, NULL, FALSE);
 }
@@ -72,7 +72,6 @@
             ptStack[0].x = x;
             ptStack[0].y = y;
             break;
-        case TOOL_TEXT:
         case TOOL_LINE:
         case TOOL_RECT:
         case TOOL_ELLIPSE:
@@ -80,9 +79,11 @@
             newReversible();
             break;
         case TOOL_RECTSEL:
+        case TOOL_TEXT:
             newReversible();
             ShowWindow(hSelection, SW_HIDE);
-            rectSel_src[2] = rectSel_src[3] = 0;
+            rectSel_src.right = rectSel_src.left;
+            rectSel_src.bottom = rectSel_src.top;
             break;
         case TOOL_RUBBER:
             newReversible();
@@ -144,15 +145,16 @@
             Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE);
             break;
         case TOOL_RECTSEL:
+        case TOOL_TEXT:
         {
             POINT temp;
             resetToU1();
             temp.x = max(0, min(x, imgXRes));
             temp.y = max(0, min(y, imgYRes));
-            rectSel_dest[0] = rectSel_src[0] = min(start.x, temp.x);
-            rectSel_dest[1] = rectSel_src[1] = min(start.y, temp.y);
-            rectSel_dest[2] = rectSel_src[2] = max(start.x, temp.x) - min(start.x, temp.x);
-            rectSel_dest[3] = rectSel_src[3] = max(start.y, temp.y) - min(start.y, temp.y);
+            rectSel_dest.left = rectSel_src.left = min(start.x, temp.x);
+            rectSel_dest.top = rectSel_src.top = min(start.y, temp.y);
+            rectSel_dest.right = rectSel_src.right = max(start.x, temp.x);
+            rectSel_dest.bottom = rectSel_src.bottom = max(start.y, temp.y);
             RectSel(hdc, start.x, start.y, temp.x, temp.y);
             break;
         }
@@ -235,46 +237,46 @@
         {
             POINT *ptStackCopy;
             int i;
-            rectSel_src[0] = rectSel_src[1] = 0x7fffffff;
-            rectSel_src[2] = rectSel_src[3] = 0;
+            rectSel_src.left = rectSel_src.top = MAXLONG;
+            rectSel_src.right = rectSel_src.bottom = 0;
             for (i = 0; i <= ptSP; i++)
             {
-                if (ptStack[i].x < rectSel_src[0])
-                    rectSel_src[0] = ptStack[i].x;
-                if (ptStack[i].y < rectSel_src[1])
-                    rectSel_src[1] = ptStack[i].y;
-                if (ptStack[i].x > rectSel_src[2])
-                    rectSel_src[2] = ptStack[i].x;
-                if (ptStack[i].y > rectSel_src[3])
-                    rectSel_src[3] = ptStack[i].y;
+                if (ptStack[i].x < rectSel_src.left)
+                    rectSel_src.left = ptStack[i].x;
+                if (ptStack[i].y < rectSel_src.top)
+                    rectSel_src.top = ptStack[i].y;
+                if (ptStack[i].x > rectSel_src.right)
+                    rectSel_src.right = ptStack[i].x;
+                if (ptStack[i].y > rectSel_src.bottom)
+                    rectSel_src.bottom = ptStack[i].y;
             }
-            rectSel_src[2] += 1 - rectSel_src[0];
-            rectSel_src[3] += 1 - rectSel_src[1];
-            rectSel_dest[0] = rectSel_src[0];
-            rectSel_dest[1] = rectSel_src[1];
-            rectSel_dest[2] = rectSel_src[2];
-            rectSel_dest[3] = rectSel_src[3];
+            rectSel_src.right  += 1;
+            rectSel_src.bottom += 1;
+            rectSel_dest.left   = rectSel_src.left;
+            rectSel_dest.top    = rectSel_src.top;
+            rectSel_dest.right  = rectSel_src.right;
+            rectSel_dest.bottom = rectSel_src.bottom;
             if (ptSP != 0)
             {
                 DeleteObject(hSelMask);
-                hSelMask = CreateBitmap(rectSel_src[2], rectSel_src[3], 1, 1, NULL);
+                hSelMask = CreateBitmap(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 1, 1, NULL);
                 DeleteObject(SelectObject(hSelDC, hSelMask));
                 ptStackCopy = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * (ptSP + 1));
                 for (i = 0; i <= ptSP; i++)
                 {
-                    ptStackCopy[i].x = ptStack[i].x - rectSel_src[0];
-                    ptStackCopy[i].y = ptStack[i].y - rectSel_src[1];
+                    ptStackCopy[i].x = ptStack[i].x - rectSel_src.left;
+                    ptStackCopy[i].y = ptStack[i].y - rectSel_src.top;
                 }
                 Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE);
                 HeapFree(GetProcessHeap(), 0, ptStackCopy);
-                SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(rectSel_src[2], rectSel_src[3]));
+                SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src)));
                 resetToU1();
-                MaskBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0],
-                        rectSel_src[1], hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS));
+                MaskBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left,
+                        rectSel_src.top, hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS));
                 Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE);
                 newReversible();
 
-                MaskBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0,
+                MaskBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0,
                         0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND));
 
                 placeSelWin();
@@ -290,31 +292,39 @@
         }
         case TOOL_RECTSEL:
             resetToU1();
-            if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0))
+            if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0))
             {
                 DeleteObject(hSelMask);
-                hSelMask = CreateBitmap(rectSel_src[2], rectSel_src[3], 1, 1, NULL);
+                hSelMask = CreateBitmap(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 1, 1, NULL);
                 DeleteObject(SelectObject(hSelDC, hSelMask));
-                Rect(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], 0x00ffffff, 0x00ffffff, 1, 2);
-                SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(rectSel_src[2], rectSel_src[3]));
+                Rect(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 0x00ffffff, 0x00ffffff, 1, 2);
+                SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src)));
                 resetToU1();
-                BitBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0],
-                       rectSel_src[1], SRCCOPY);
-                Rect(hdc, rectSel_src[0], rectSel_src[1], rectSel_src[0] + rectSel_src[2],
-                     rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE);
+                BitBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left,
+                       rectSel_src.top, SRCCOPY);
+                Rect(hdc, rectSel_src.left, rectSel_src.top, rectSel_src.right,
+                     rectSel_src.bottom, bgColor, bgColor, 0, TRUE);
                 newReversible();
 
-                BitBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0,
+                BitBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0,
                        0, SRCCOPY);
 
                 placeSelWin();
                 ShowWindow(hSelection, SW_SHOW);
-                /* force refresh of selection contents */
-                SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0);
-                SendMessage(hSelection, WM_MOUSEMOVE, 0, 0);
-                SendMessage(hSelection, WM_LBUTTONUP, 0, 0);
+                ForceRefreshSelectionContents();
             }
             break;
+        case TOOL_TEXT:
+            resetToU1();
+            if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0))
+            {
+                newReversible();
+
+                placeSelWin();
+                ShowWindow(hSelection, SW_SHOW);
+                ForceRefreshSelectionContents();
+            }
+            break;
         case TOOL_RUBBER:
             Erase(hdc, last.x, last.y, x, y, bg, rubberRadius);
             break;
Index: base/applications/mspaint/selection.h
===================================================================
--- base/applications/mspaint/selection.h	(rÃ©vision 61927)
+++ base/applications/mspaint/selection.h	(copie de travail)
@@ -6,4 +6,8 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
+void RegisterWclSelection();
+
+void ForceRefreshSelectionContents();
+
 LRESULT CALLBACK SelectionWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
Index: base/applications/mspaint/CMakeLists.txt
===================================================================
--- base/applications/mspaint/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/mspaint/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-add_executable(mspaint
+list(APPEND SOURCE
     dialogs.c
     dib.c
     drawing.c
@@ -8,13 +8,16 @@
     mouse.c
     palette.c
     registry.c
+    scrollbox.c
     selection.c
     sizebox.c
+    textedit.c
     toolsettings.c
     winproc.c
-    rsrc.rc)
+    precomp.h)
 
+add_executable(mspaint ${SOURCE} rsrc.rc)
 set_module_type(mspaint win32gui UNICODE)
-add_pch(mspaint precomp.h)
 add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
+add_pch(mspaint precomp.h SOURCE)
 add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all)
Index: base/applications/mspaint/palette.c
===================================================================
--- base/applications/mspaint/palette.c	(rÃ©vision 61927)
+++ base/applications/mspaint/palette.c	(copie de travail)
@@ -9,9 +9,30 @@
 /* INCLUDES *********************************************************/
 
 #include "precomp.h"
+#include "palette.h"
 
 /* FUNCTIONS ********************************************************/
 
+void
+RegisterWclPal()
+{
+    WNDCLASSEX wclPal;
+    /* initializing and registering the window class used for the palette window */
+    wclPal.hInstance        = hProgInstance;
+    wclPal.lpszClassName    = _T("Palette");
+    wclPal.lpfnWndProc      = PalWinProc;
+    wclPal.style            = CS_DBLCLKS;
+    wclPal.cbSize           = sizeof(WNDCLASSEX);
+    wclPal.hIcon            = NULL;
+    wclPal.hIconSm          = NULL;
+    wclPal.hCursor          = LoadCursor(NULL, IDC_ARROW);
+    wclPal.lpszMenuName     = NULL;
+    wclPal.cbClsExtra       = 0;
+    wclPal.cbWndExtra       = 0;
+    wclPal.hbrBackground    = GetSysColorBrush(COLOR_BTNFACE);
+    RegisterClassEx (&wclPal);
+}
+
 LRESULT CALLBACK
 PalWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -67,6 +88,8 @@
             {
                 fgColor = palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14];
                 InvalidateRect(hwnd, NULL, FALSE);
+                if (activeTool == 10)
+                    ForceRefreshSelectionContents();
             }
             break;
         case WM_RBUTTONDOWN:
@@ -74,6 +97,8 @@
             {
                 bgColor = palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14];
                 InvalidateRect(hwnd, NULL, FALSE);
+                if (activeTool == 10)
+                    ForceRefreshSelectionContents();
             }
             break;
         case WM_LBUTTONDBLCLK:
@@ -84,6 +109,8 @@
                         choosecolor.rgbResult;
                     fgColor = choosecolor.rgbResult;
                     InvalidateRect(hwnd, NULL, FALSE);
+                    if (activeTool == 10)
+                        ForceRefreshSelectionContents();
                 }
             break;
         case WM_RBUTTONDBLCLK:
@@ -94,6 +121,8 @@
                         choosecolor.rgbResult;
                     bgColor = choosecolor.rgbResult;
                     InvalidateRect(hwnd, NULL, FALSE);
+                    if (activeTool == 10)
+                        ForceRefreshSelectionContents();
                 }
             break;
 
Index: base/applications/mspaint/lang/no-NO.rc
===================================================================
--- base/applications/mspaint/lang/no-NO.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/no-NO.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint for ReactOS"
-    IDS_INFOTEXT "Paint for ReactOS er nÃ¥ tilgjengelig under GNU Lesser General Public License (LGPL) versjon 3 (se http://www.gnu.org/home.nb.html)"
+    IDS_INFOTEXT "Paint for ReactOS er nÃ¥ tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)"
     IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?"
     IDS_DEFAULTFILENAME "Utennavn.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/it-IT.rc
===================================================================
--- base/applications/mspaint/lang/it-IT.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/it-IT.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint per ReactOS"
-    IDS_INFOTEXT "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?"
     IDS_DEFAULTFILENAME "SenzaNome.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/hu-HU.rc
===================================================================
--- base/applications/mspaint/lang/hu-HU.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/hu-HU.rc	(copie de travail)
@@ -178,7 +178,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "ReactOS Paint"
-    IDS_INFOTEXT "A ReactOS Paint a GNU Lesser General Public License (LGPL) 3-as verziÃ³ja alatt Ã©rhetÃµ el (lÃ¡sd www.gnu.org)"
+    IDS_INFOTEXT "A ReactOS Paint a GNU Lesser General Public License (LGPL) alatt Ã©rhetÃµ el (lÃ¡sd www.gnu.org)"
     IDS_SAVEPROMPTTEXT "KÃ­vÃ¡nja menteni %s vÃ¡ltozÃ¡sait?"
     IDS_DEFAULTFILENAME "NÃ©vtelen.bmp"
     IDS_MINIATURETITLE "MiniatÃºra"
Index: base/applications/mspaint/lang/en-US.rc
===================================================================
--- base/applications/mspaint/lang/en-US.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/en-US.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint for ReactOS"
-    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?"
     IDS_DEFAULTFILENAME "Unnamed.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/en-GB.rc
===================================================================
--- base/applications/mspaint/lang/en-GB.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/en-GB.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint for ReactOS"
-    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?"
     IDS_DEFAULTFILENAME "Unnamed.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/sk-SK.rc
===================================================================
--- base/applications/mspaint/lang/sk-SK.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/sk-SK.rc	(copie de travail)
@@ -187,7 +187,7 @@
     IDS_PROGRAMNAME "SkicÃ¡r"
     IDS_WINDOWTITLE "%s - SkicÃ¡r"
     IDS_INFOTITLE "SkicÃ¡r systÃ©mu ReactOS"
-    IDS_INFOTEXT "SkicÃ¡r systÃ©mu ReactOS je dostupnÃ½ za podmienok GNU Lesser General Public License (LGPL) verzia 3 (viÄ� www.gnu.org)"
+    IDS_INFOTEXT "SkicÃ¡r systÃ©mu ReactOS je dostupnÃ½ za podmienok GNU Lesser General Public License (LGPL, viÄ� www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Chcete uloÅ¾iÅ¥ vykonanÃ© zmeny do %s?"
     IDS_DEFAULTFILENAME "Bez nÃ¡zvu.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/sv-SE.rc
===================================================================
--- base/applications/mspaint/lang/sv-SE.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/sv-SE.rc	(copie de travail)
@@ -178,7 +178,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint fÃ¶r ReactOS"
-    IDS_INFOTEXT "Paint fÃ¶r ReactOS Ã¤r tillgÃ¤nglig under GNU Lesser General Public License (LGPL) version 3 (se www.gnu.org)"
+    IDS_INFOTEXT "Paint fÃ¶r ReactOS Ã¤r tillgÃ¤nglig under GNU Lesser General Public License (LGPL, se www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Vill du spara Ã¤ndringarna till %s?"
     IDS_DEFAULTFILENAME "NamnlÃ¶s.bmp"
     IDS_MINIATURETITLE "Miniatyr"
Index: base/applications/mspaint/lang/ro-RO.rc
===================================================================
--- base/applications/mspaint/lang/ro-RO.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/ro-RO.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Pictare"
     IDS_WINDOWTITLE "%s - Pictare"
     IDS_INFOTITLE "Pictare pentru ReactOS"
-    IDS_INFOTEXT "Pictare pentru ReactOS este disponibilÄƒ sub licenÈ›a GNU Lesser General Public versiunea 3 (vedeÈ›i www.gnu.org)"
+    IDS_INFOTEXT "Pictare pentru ReactOS este disponibilÄƒ sub licenÈ›a GNU Lesser General Public (vedeÈ›i www.gnu.org)"
     IDS_SAVEPROMPTTEXT "DoriÈ›i pÄƒstrarea modificÄƒrilor din %s?"
     IDS_DEFAULTFILENAME "FÄƒrÄƒNume.bmp"
     IDS_MINIATURETITLE "MiniaturÄƒ"
Index: base/applications/mspaint/lang/he-IL.rc
===================================================================
--- base/applications/mspaint/lang/he-IL.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/he-IL.rc	(copie de travail)
@@ -178,7 +178,7 @@
     IDS_PROGRAMNAME "×¦×™×™×¨"
     IDS_WINDOWTITLE "%s - ×¦×™×™×¨"
     IDS_INFOTITLE "×¦×™×™×¨ ×¢×‘×•×¨ ReactOS"
-    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "×”×�×� ×‘×¨×¦×•× ×š ×œ×©×ž×•×¨ ×�×ª ×”×©×™× ×•×™×™×� ×©×œ %s?"
     IDS_DEFAULTFILENAME "×œ×œ×� ×©×�.bmp"
     IDS_MINIATURETITLE "×ž×ž×•×–×¢×¨"
Index: base/applications/mspaint/lang/ja-JP.rc
===================================================================
--- base/applications/mspaint/lang/ja-JP.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/ja-JP.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "ãƒšã‚¤ãƒ³ãƒˆ"
     IDS_WINDOWTITLE "%s - ãƒšã‚¤ãƒ³ãƒˆ"
     IDS_INFOTITLE "ReactOS ãƒšã‚¤ãƒ³ãƒˆ"
-    IDS_INFOTEXT "ReactOS ãƒšã‚¤ãƒ³ãƒˆã�¯ GNU Lesser General Public License (LGPL) version 3 (è©³ç´°ã�¯ www.gnu.org)ã�®ä¸‹ã�§åˆ©ç”¨å�¯èƒ½ã�§ã�™ã€‚"
+    IDS_INFOTEXT "ReactOS ãƒšã‚¤ãƒ³ãƒˆã�¯ GNU Lesser General Public License (LGPL, è©³ç´°ã�¯ www.gnu.org)ã�®ä¸‹ã�§åˆ©ç”¨å�¯èƒ½ã�§ã�™ã€‚"
     IDS_SAVEPROMPTTEXT "%s ã�®å¤‰æ›´å†…å®¹ã‚’ä¿�å­˜ã�—ã�¾ã�™ã�‹?"
     IDS_DEFAULTFILENAME "ç„¡é¡Œ.bmp"
     IDS_MINIATURETITLE "ç¸®å°�å›³"
Index: base/applications/mspaint/lang/pt-PT.rc
===================================================================
--- base/applications/mspaint/lang/pt-PT.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/pt-PT.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint para ReactOS"
-    IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃ­vel sob a licenÃ§a GNU Lesser General Public License (LGPL) versÃ£o 3 (visite www.gnu.org)"
+    IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃ­vel sob a licenÃ§a GNU Lesser General Public License (LGPL, visite www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Pretende guardar as alteraÃ§Ãµes a %s?"
     IDS_DEFAULTFILENAME "Imagem.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/tr-TR.rc
===================================================================
--- base/applications/mspaint/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/tr-TR.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi"
     IDS_WINDOWTITLE "%s - GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi"
     IDS_INFOTITLE "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi"
-    IDS_INFOTEXT "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi, GNU KÄ±sÄ±tlÄ± UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n (LGPL) 3. sÃ¼rÃ¼mÃ¼yle ruhsatlÄ±dÄ±r. (bkz: www.gnu.org)"
+    IDS_INFOTEXT "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi, GNU KÄ±sÄ±tlÄ± UmÃ»mÃ® Kamu RuhsatÄ±'yla (LGPL'yle) ruhsatlÄ±dÄ±r. (bkz: www.gnu.org)"
     IDS_SAVEPROMPTTEXT "%s iÃ§in yapÄ±lan deÄŸiÅŸiklikler kaydedilsin mi?"
     IDS_DEFAULTFILENAME "AdsÄ±z.bmp"
     IDS_MINIATURETITLE "KÃ¼Ã§Ã¼ÄŸÃ¼"
@@ -206,8 +206,8 @@
     IDS_TOOLTIP14 "Ã‡okgen"
     IDS_TOOLTIP15 "SÃ¶bek"
     IDS_TOOLTIP16 "YuvarlatÄ±lmÄ±ÅŸ DikdÃ¶rtgen"
-    IDS_OPENFILTER "Ä°kil EÅŸlem GÃ¶rÃ¼ntÃ¼leri (*.bmp;*.dib)\1*.bmp;*.dib\1TÃ¼m KÃ¼tÃ¼kler (*.*)\1*.*\1"
-    IDS_SAVEFILTER "24 Ä°killik Ä°kil EÅŸlem GÃ¶rÃ¼ntÃ¼sÃ¼ (*.bmp;*.dib)\1*.bmp;*.dib\1"
+    IDS_OPENFILTER "Bit EÅŸlem GÃ¶rÃ¼ntÃ¼leri (*.bmp; *.dib)\1*.bmp;*.dib\1TÃ¼m KÃ¼tÃ¼kler (*.*)\1*.*\1"
+    IDS_SAVEFILTER "24 Bitlik Bit EÅŸlem GÃ¶rÃ¼ntÃ¼sÃ¼ (*.bmp; *.dib)\1*.bmp;*.dib\1"
     IDS_FILESIZE "%d Ã§oklu"
     IDS_PRINTRES "Her metrekarede %d x %d nokta"
     IDS_INTNUMBERS "Buraya yalnÄ±zca tamsayÄ± girilmelidir."
Index: base/applications/mspaint/lang/zh-TW.rc
===================================================================
--- base/applications/mspaint/lang/zh-TW.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/zh-TW.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "ç•«åœ–"
     IDS_WINDOWTITLE "%s - ç•«åœ–"
     IDS_INFOTITLE "ReactOS ç•«åœ–"
-    IDS_INFOTEXT "ReactOS ç•«åœ–æ˜¯åœ¨ GNU LGPL å�”è­°ç‰ˆæœ¬ 3 ä¸‹ç™¼ä½ˆçš„ (è©³è¦‹ www.gnu.org)"
+    IDS_INFOTEXT "ReactOS ç•«åœ–æ˜¯åœ¨ GNU LGPL ä¸‹ç™¼ä½ˆçš„ (è©³è¦‹ www.gnu.org)"
     IDS_SAVEPROMPTTEXT "æ‚¨æƒ³æŠŠæ”¹è®Šä¿�å­˜åˆ° %s å—Žï¼Ÿ"
     IDS_DEFAULTFILENAME "æœªå‘½å��.bmp"
     IDS_MINIATURETITLE "ç¸®åœ–"
Index: base/applications/mspaint/lang/ru-RU.rc
===================================================================
--- base/applications/mspaint/lang/ru-RU.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/ru-RU.rc	(copie de travail)
@@ -178,7 +178,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint Ð´Ð»Ñ� ReactOS"
-    IDS_INFOTEXT "Paint Ð´Ð»Ñ� ReactOS Ñ€Ð°Ñ�Ð¿Ñ€Ð¾Ñ�Ñ‚Ñ€Ð°Ð½Ñ�ÐµÑ‚Ñ�Ñ� Ð¿Ð¾Ð´ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ GNU Lesser General Public License (LGPL) Ð²ÐµÑ€Ñ�Ð¸Ð¸ 3 (Ñ�Ð¼. www.gnu.org)"
+    IDS_INFOTEXT "Paint Ð´Ð»Ñ� ReactOS Ñ€Ð°Ñ�Ð¿Ñ€Ð¾Ñ�Ñ‚Ñ€Ð°Ð½Ñ�ÐµÑ‚Ñ�Ñ� Ð¿Ð¾Ð´ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ GNU Lesser General Public License (LGPL, Ñ�Ð¼. www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ� Ð² %s?"
     IDS_DEFAULTFILENAME "Ð‘ÐµÐ·_Ð¸Ð¼ÐµÐ½Ð¸.bmp"
     IDS_MINIATURETITLE "Ð­Ñ�ÐºÐ¸Ð·"
Index: base/applications/mspaint/lang/es-ES.rc
===================================================================
--- base/applications/mspaint/lang/es-ES.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/es-ES.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint para ReactOS"
-    IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (ver www.gnu.org)"
+    IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Â¿Guardar cambios cambios a %s?"
     IDS_DEFAULTFILENAME "Sin titulo.bmp"
     IDS_MINIATURETITLE "Miniatura"
Index: base/applications/mspaint/lang/fr-FR.rc
===================================================================
--- base/applications/mspaint/lang/fr-FR.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/fr-FR.rc	(copie de travail)
@@ -178,7 +178,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint pour ReactOS"
-    IDS_INFOTEXT "Paint pour ReactOS est mise Ã  disposition sous la Licence publique gÃ©nÃ©rale limitÃ©e GNU (LGPL) version 3 (voir www.gnu.org)"
+    IDS_INFOTEXT "Paint pour ReactOS est mise Ã  disposition sous la Licence publique gÃ©nÃ©rale limitÃ©e GNU (LGPL, voir www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?"
     IDS_DEFAULTFILENAME "Sans titre.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/sq-AL.rc
===================================================================
--- base/applications/mspaint/lang/sq-AL.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/sq-AL.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint pÃ«r ReactOS"
-    IDS_INFOTEXT "Paint pÃ« ReactOS Ã«sht i disponueshem nÃ«n GNU Lesser General Public License (LGPL) versioni 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Paint pÃ« ReactOS Ã«sht i disponueshem nÃ«n GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "A doni tÃ« ruani ndryshimet tek %s?"
     IDS_DEFAULTFILENAME "Unnamed.bmp"
     IDS_MINIATURETITLE "MiniaturÃ«"
Index: base/applications/mspaint/lang/bg-BG.rc
===================================================================
--- base/applications/mspaint/lang/bg-BG.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/bg-BG.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Ð Ð¸Ñ�ÑƒÐ²Ð°Ð½Ðµ"
     IDS_WINDOWTITLE "%s - Ñ€Ð¸Ñ�ÑƒÐ²Ð°Ð½Ðµ"
     IDS_INFOTITLE "Ð Ð¸Ñ�ÑƒÐ²Ð°Ñ‡ (Paint) Ð·Ð° Ð ÐµÐ°ÐºÑ‚ÐžÐ¡"
-    IDS_INFOTEXT "Ð Ð¸Ñ�ÑƒÐ²Ð°Ñ‡ (Paint) Ð·Ð° Ð ÐµÐ°ÐºÑ‚ÐžÐ¡ Ðµ Ð´Ð¾Ñ�Ñ‚ÑŠÐ¿ÐµÐ½ Ð¿Ð¾Ð´ GNU Lesser General Public License (LGPL) Ð²ÐµÑ€Ñ�Ð¸Ñ� 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Ð Ð¸Ñ�ÑƒÐ²Ð°Ñ‡ (Paint) Ð·Ð° Ð ÐµÐ°ÐºÑ‚ÐžÐ¡ Ðµ Ð´Ð¾Ñ�Ñ‚ÑŠÐ¿ÐµÐ½ Ð¿Ð¾Ð´ GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Ð˜Ñ�ÐºÐ°Ñ‚Ðµ Ð»Ð¸ Ð´Ð° Ð·Ð°Ð¿Ð¸ÑˆÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð² %s?"
     IDS_DEFAULTFILENAME "Ð‘ÐµÐ· Ð¸Ð¼Ðµ.bmp"
     IDS_MINIATURETITLE "Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ð¹Ñ†Ðµ"
Index: base/applications/mspaint/lang/de-DE.rc
===================================================================
--- base/applications/mspaint/lang/de-DE.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/de-DE.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint fÃ¼r ReactOS"
-    IDS_INFOTEXT "Paint fÃ¼r ReactOS steht unter der GNU Lesser General Public License (LGPL) Version 3. (siehe www.gnu.org)"
+    IDS_INFOTEXT "Paint fÃ¼r ReactOS steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)"
     IDS_SAVEPROMPTTEXT "MÃ¶chten Sie die Ã„nderungen an %s speichern?"
     IDS_DEFAULTFILENAME "Unbenannt.bmp"
     IDS_MINIATURETITLE "Miniaturansicht"
Index: base/applications/mspaint/lang/eu-ES.rc
===================================================================
--- base/applications/mspaint/lang/eu-ES.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/eu-ES.rc	(copie de travail)
@@ -178,7 +178,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint para ReactOS"
-    IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (ver www.gnu.org)"
+    IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Â¿Guardar cambios cambios a %s?"
     IDS_DEFAULTFILENAME "Izegabea.bmp"
     IDS_MINIATURETITLE "Miniatura"
Index: base/applications/mspaint/lang/zh-CN.rc
===================================================================
--- base/applications/mspaint/lang/zh-CN.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/zh-CN.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "ç”»å›¾"
     IDS_WINDOWTITLE "%s - ç”»å›¾"
     IDS_INFOTITLE "ReactOS ç”»å›¾"
-    IDS_INFOTEXT "ReactOS ç”»å›¾æ˜¯åœ¨ GNU LGPL å��è®®ç‰ˆæœ¬ 3 ä¸‹å�‘å¸ƒçš„ (è¯¦è§� www.gnu.org)"
+    IDS_INFOTEXT "ReactOS ç”»å›¾æ˜¯åœ¨ GNU LGPL ä¸‹å�‘å¸ƒçš„ (è¯¦è§� www.gnu.org)"
     IDS_SAVEPROMPTTEXT "æ‚¨æƒ³æŠŠæ”¹å�˜ä¿�å­˜åˆ° %s å�—ï¼Ÿ"
     IDS_DEFAULTFILENAME "æœªå‘½å��.bmp"
     IDS_MINIATURETITLE "ç¼©ç•¥å›¾"
Index: base/applications/mspaint/lang/cs-CZ.rc
===================================================================
--- base/applications/mspaint/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/cs-CZ.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "MalovÃ¡nÃ­"
     IDS_WINDOWTITLE "%s - MalovÃ¡nÃ­"
     IDS_INFOTITLE "ReactOS MalovÃ¡nÃ­"
-    IDS_INFOTEXT "ReactOS MalovÃ¡nÃ­ je dostupnÃ© pod licencÃ­ GNU Lesser General Public License (LGPL) verze 3 (viz. www.gnu.org)"
+    IDS_INFOTEXT "ReactOS MalovÃ¡nÃ­ je dostupnÃ© pod licencÃ­ GNU Lesser General Public License (LGPL, viz. www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Chcete uloÅ¾it provedenÃ© zmÄ›ny v %s?"
     IDS_DEFAULTFILENAME "Bez nÃ¡zvu.bmp"
     IDS_MINIATURETITLE "Miniatura"
Index: base/applications/mspaint/lang/nl-NL.rc
===================================================================
--- base/applications/mspaint/lang/nl-NL.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/nl-NL.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint for ReactOS"
-    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)"
+    IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?"
     IDS_DEFAULTFILENAME "Naamloos.bmp"
     IDS_MINIATURETITLE "Miniature"
Index: base/applications/mspaint/lang/uk-UA.rc
===================================================================
--- base/applications/mspaint/lang/uk-UA.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/uk-UA.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint Ð´Ð»Ñ� ReactOS"
-    IDS_INFOTEXT "Paint Ð´Ð»Ñ� ReactOS Ð´Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð·Ð³Ñ–Ð´Ð½Ð¾ Ð· GNU Lesser General Public License (LGPL) Ð²ÐµÑ€Ñ�Ñ–Ñ— 3 (Ð´Ð¸Ð²Ñ–Ñ‚ÑŒÑ�Ñ� www.gnu.org)"
+    IDS_INFOTEXT "Paint Ð´Ð»Ñ� ReactOS Ð´Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð·Ð³Ñ–Ð´Ð½Ð¾ Ð· GNU Lesser General Public License (LGPL, Ð´Ð¸Ð²Ñ–Ñ‚ÑŒÑ�Ñ� www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð·Ð¼Ñ–Ð½Ð¸ Ð´Ð¾ %s?"
     IDS_DEFAULTFILENAME "Ð‘ÐµÐ·_Ñ–Ð¼ÐµÐ½Ñ–.bmp"
     IDS_MINIATURETITLE "ÐœÑ–Ð½Ñ–Ð°Ñ‚ÑŽÑ€Ð°"
Index: base/applications/mspaint/lang/pt-BR.rc
===================================================================
--- base/applications/mspaint/lang/pt-BR.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/pt-BR.rc	(copie de travail)
@@ -186,7 +186,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint para ReactOS"
-    IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃ­vel sob a licenÃ§a GNU Lesser General Public License (LGPL) versÃ£o 3 (visite www.gnu.org)"
+    IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃ­vel sob a licenÃ§a GNU Lesser General Public License (LGPL, visite www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Salvar as alteraÃ§Ãµes em %s?"
     IDS_DEFAULTFILENAME "Imagem.bmp"
     IDS_MINIATURETITLE "Miniatura"
Index: base/applications/mspaint/lang/pl-PL.rc
===================================================================
--- base/applications/mspaint/lang/pl-PL.rc	(rÃ©vision 61927)
+++ base/applications/mspaint/lang/pl-PL.rc	(copie de travail)
@@ -187,7 +187,7 @@
     IDS_PROGRAMNAME "Paint"
     IDS_WINDOWTITLE "%s - Paint"
     IDS_INFOTITLE "Paint dla ReactOS"
-    IDS_INFOTEXT "Paint dla ReactOS jest dostÄ™pny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)"
+    IDS_INFOTEXT "Paint dla ReactOS jest dostÄ™pny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)"
     IDS_SAVEPROMPTTEXT "Czy chcesz zapisaÄ‡ zmiany do %s?"
     IDS_DEFAULTFILENAME "bez tytuÅ‚u.bmp"
     IDS_MINIATURETITLE "Miniatura"
Index: base/applications/mspaint/palette.h
===================================================================
--- base/applications/mspaint/palette.h	(rÃ©vision 61927)
+++ base/applications/mspaint/palette.h	(copie de travail)
@@ -6,4 +6,6 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
+void RegisterWclPal();
+
 LRESULT CALLBACK PalWinProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
Index: base/applications/mspaint/precomp.h
===================================================================
--- base/applications/mspaint/precomp.h	(rÃ©vision 61927)
+++ base/applications/mspaint/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MSPAINT_H
+#define _MSPAINT_H
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -17,3 +20,6 @@
 #include "globalvar.h"
 #include "history.h"
 #include "mouse.h"
+#include "selection.h"
+
+#endif /* _MSPAINT_H */
Index: base/applications/mspaint/winproc.c
===================================================================
--- base/applications/mspaint/winproc.c	(rÃ©vision 61927)
+++ base/applications/mspaint/winproc.c	(copie de travail)
@@ -11,12 +11,34 @@
 
 #include "precomp.h"
 
+#include "winproc.h"
 #include "dialogs.h"
 #include "registry.h"
+#include "scrollbox.h"
 
 /* FUNCTIONS ********************************************************/
 
 void
+RegisterWclMain()
+{
+    WNDCLASSEX wclMain;
+    /* initializing and registering the window class used for the main window */
+    wclMain.hInstance         = hProgInstance;
+    wclMain.lpszClassName     = _T("MainWindow");
+    wclMain.lpfnWndProc       = MainWindowProcedure;
+    wclMain.style             = CS_DBLCLKS;
+    wclMain.cbSize            = sizeof(WNDCLASSEX);
+    wclMain.hIcon             = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON));
+    wclMain.hIconSm           = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON));
+    wclMain.hCursor           = LoadCursor(NULL, IDC_ARROW);
+    wclMain.lpszMenuName      = NULL;
+    wclMain.cbClsExtra        = 0;
+    wclMain.cbWndExtra        = 0;
+    wclMain.hbrBackground     = GetSysColorBrush(COLOR_BTNFACE);
+    RegisterClassEx (&wclMain);
+}
+
+void
 selectTool(int tool)
 {
     ShowWindow(hSelection, SW_HIDE);
@@ -23,7 +45,8 @@
     activeTool = tool;
     pointSP = 0;                // resets the point-buffer of the polygon and bezier functions
     InvalidateRect(hToolSettings, NULL, TRUE);
-    ShowWindow(hTrackbarZoom, (tool == 6) ? SW_SHOW : SW_HIDE);
+    ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE);
+    ShowWindow(hwndTextEdit, (tool == TOOL_TEXT) ? SW_SHOW : SW_HIDE);
 }
 
 void
@@ -44,15 +67,15 @@
     int tbPos = 0;
     int tempZoom = newZoom;
 
-    long clientRectScrollbox[4];
-    long clientRectImageArea[4];
+    RECT clientRectScrollbox;
+    RECT clientRectImageArea;
     int x, y, w, h;
-    GetClientRect(hScrollbox, (LPRECT) &clientRectScrollbox);
-    GetClientRect(hImageArea, (LPRECT) &clientRectImageArea);
-    w = clientRectImageArea[2] * clientRectScrollbox[2] / (clientRectImageArea[2] * newZoom / zoom);
-    h = clientRectImageArea[3] * clientRectScrollbox[3] / (clientRectImageArea[3] * newZoom / zoom);
-    x = max(0, min(clientRectImageArea[2] - w, mouseX - w / 2)) * newZoom / zoom;
-    y = max(0, min(clientRectImageArea[3] - h, mouseY - h / 2)) * newZoom / zoom;
+    GetClientRect(hScrollbox, &clientRectScrollbox);
+    GetClientRect(hImageArea, &clientRectImageArea);
+    w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * newZoom / zoom);
+    h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * newZoom / zoom);
+    x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / zoom;
+    y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / zoom;
 
     zoom = newZoom;
 
@@ -81,15 +104,15 @@
     LOGBRUSH logbrush;
     int rop;
 
-    long clientRectScrollbox[4];
-    long clientRectImageArea[4];
+    RECT clientRectScrollbox;
+    RECT clientRectImageArea;
     int x, y, w, h;
-    GetClientRect(hScrollbox, (LPRECT) &clientRectScrollbox);
-    GetClientRect(hImageArea, (LPRECT) &clientRectImageArea);
-    w = clientRectImageArea[2] * clientRectScrollbox[2] / (clientRectImageArea[2] * 2);
-    h = clientRectImageArea[3] * clientRectScrollbox[3] / (clientRectImageArea[3] * 2);
-    x = max(0, min(clientRectImageArea[2] - w, mouseX - w / 2));
-    y = max(0, min(clientRectImageArea[3] - h, mouseY - h / 2));
+    GetClientRect(hScrollbox, &clientRectScrollbox);
+    GetClientRect(hImageArea, &clientRectImageArea);
+    w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * 2);
+    h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * 2);
+    x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2));
+    y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2));
 
     hdc = GetDC(hImageArea);
     oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 0, 0));
@@ -179,6 +202,9 @@
 void
 InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window)
 {
+    HDC hTempDC;
+    HBITMAP hTempMask;
+
     HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL);
     SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0));
     SendMessage(window, WM_COMMAND, ID_RECTSEL, 0);
@@ -187,20 +213,28 @@
                                                          IMAGE_BITMAP, 0, 0,
                                                          LR_COPYRETURNORG)));
     newReversible();
-    rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0;
-    rectSel_dest[0] = rectSel_dest[1] = 0;
-    rectSel_dest[2] = GetDIBWidth(hSelBm);
-    rectSel_dest[3] = GetDIBHeight(hSelBm);
-    BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3],
-           hSelDC, 0, 0, SRCCOPY);
+    SetRectEmpty(&rectSel_src);
+    rectSel_dest.left = rectSel_dest.top = 0;
+    rectSel_dest.right = rectSel_dest.left + GetDIBWidth(hSelBm);
+    rectSel_dest.bottom = rectSel_dest.top + GetDIBHeight(hSelBm);
+
+    hTempDC = CreateCompatibleDC(hSelDC);
+    hTempMask = CreateBitmap(RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), 1, 1, NULL);
+    SelectObject(hTempDC, hTempMask);
+    Rect(hTempDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, 0x00ffffff, 0x00ffffff, 1, 1);
+    DeleteObject(hSelMask);
+    hSelMask = hTempMask;
+    DeleteDC(hTempDC);
+
     placeSelWin();
     ShowWindow(hSelection, SW_SHOW);
+    ForceRefreshSelectionContents();
 }
 
 BOOL drawing;
 
 LRESULT CALLBACK
-WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message)            /* handle the messages */
     {
@@ -266,100 +300,56 @@
             break;
 
         case WM_INITMENUPOPUP:
+        {
+            HMENU menu = GetMenu(hMainWnd);
+            BOOL trueSelection = (IsWindowVisible(hSelection) && ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL)));
             switch (lParam)
             {
-                case 0:
-                    if (isAFile)
-                    {
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERPLANE,
-                                       MF_ENABLED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERCENTERED,
-                                       MF_ENABLED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERSTRETCHED,
-                                       MF_ENABLED | MF_BYCOMMAND);
-                    }
-                    else
-                    {
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERPLANE,
-                                       MF_GRAYED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERCENTERED,
-                                       MF_GRAYED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERSTRETCHED,
-                                       MF_GRAYED | MF_BYCOMMAND);
-                    }
+                case 0: /* File menu */
+                    EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE,     ENABLED_IF(isAFile));
+                    EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED,  ENABLED_IF(isAFile));
+                    EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile));
                     break;
-                case 1:
-                    EnableMenuItem(GetMenu(hMainWnd), IDM_EDITUNDO,
-                                   (undoSteps > 0) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND));
-                    EnableMenuItem(GetMenu(hMainWnd), IDM_EDITREDO,
-                                   (redoSteps > 0) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND));
-                    if (IsWindowVisible(hSelection))
-                    {
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCUT, MF_ENABLED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPY, MF_ENABLED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITDELETESELECTION, MF_ENABLED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITINVERTSELECTION, MF_ENABLED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPYTO, MF_ENABLED | MF_BYCOMMAND);
-                    }
-                    else
-                    {
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCUT, MF_GRAYED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPY, MF_GRAYED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITDELETESELECTION, MF_GRAYED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITINVERTSELECTION, MF_GRAYED | MF_BYCOMMAND);
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPYTO, MF_GRAYED | MF_BYCOMMAND);
-                    }
+                case 1: /* Edit menu */
+                    EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(undoSteps > 0));
+                    EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(redoSteps > 0));
+                    EnableMenuItem(menu, IDM_EDITCUT,  ENABLED_IF(trueSelection));
+                    EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection));
+                    EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection));
+                    EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection));
+                    EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection));
                     OpenClipboard(hMainWnd);
-                    if (GetClipboardData(CF_BITMAP) != NULL)
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITPASTE, MF_ENABLED | MF_BYCOMMAND);
-                    else
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_EDITPASTE, MF_GRAYED | MF_BYCOMMAND);
+                    EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(GetClipboardData(CF_BITMAP) != NULL));
                     CloseClipboard();
                     break;
-                case 3:
-                    if (IsWindowVisible(hSelection))
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_IMAGECROP, MF_ENABLED | MF_BYCOMMAND);
-                    else
-                        EnableMenuItem(GetMenu(hMainWnd), IDM_IMAGECROP, MF_GRAYED | MF_BYCOMMAND);
-                    CheckMenuItem(GetMenu(hMainWnd), IDM_IMAGEDRAWOPAQUE, (transpBg == 0) ?
-                                  (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
+                case 2: /* View menu */
+                        CheckMenuItem(menu, IDM_VIEWTOOLBOX,      CHECKED_IF(IsWindowVisible(hToolBoxContainer)));
+                        CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(IsWindowVisible(hPalWin)));
+                        CheckMenuItem(menu, IDM_VIEWSTATUSBAR,    CHECKED_IF(IsWindowVisible(hStatusBar)));
+                        CheckMenuItem(menu, IDM_FORMATICONBAR,    CHECKED_IF(IsWindowVisible(hwndTextEdit)));
+                        EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(activeTool == TOOL_TEXT));
+
+                        CheckMenuItem(menu, IDM_VIEWSHOWGRID,      CHECKED_IF(showGrid));
+                        CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature));
                     break;
+                case 3: /* Image menu */
+                    EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(IsWindowVisible(hSelection)));
+                    CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(transpBg == 0));
+                    break;
             }
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWTOOLBOX,
-                          IsWindowVisible(hToolBoxContainer) ?
-                              (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWCOLORPALETTE,
-                          IsWindowVisible(hPalWin) ?
-                              (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSTATUSBAR,
-                          IsWindowVisible(hStatusBar) ?
-                              (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
 
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID,
-                          showGrid ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWMINIATURE,
-                          showMiniature ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
+            CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(zoom == 125));
+            CheckMenuItem(menu, IDM_VIEWZOOM25,  CHECKED_IF(zoom == 250));
+            CheckMenuItem(menu, IDM_VIEWZOOM50,  CHECKED_IF(zoom == 500));
+            CheckMenuItem(menu, IDM_VIEWZOOM100, CHECKED_IF(zoom == 1000));
+            CheckMenuItem(menu, IDM_VIEWZOOM200, CHECKED_IF(zoom == 2000));
+            CheckMenuItem(menu, IDM_VIEWZOOM400, CHECKED_IF(zoom == 4000));
+            CheckMenuItem(menu, IDM_VIEWZOOM800, CHECKED_IF(zoom == 8000));
 
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM125,
-                          (zoom == 125) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM25,
-                          (zoom == 250) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM50,
-                          (zoom == 500) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM100,
-                          (zoom == 1000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM200,
-                          (zoom == 2000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM400,
-                          (zoom == 4000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM800,
-                          (zoom == 8000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-
-            CheckMenuItem(GetMenu(hMainWnd), IDM_COLORSMODERNPALETTE,
-                          (selectedPalette == 1) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
-            CheckMenuItem(GetMenu(hMainWnd), IDM_COLORSOLDPALETTE,
-                          (selectedPalette == 2) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND));
+            CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(selectedPalette == 1));
+            CheckMenuItem(menu, IDM_COLORSOLDPALETTE,    CHECKED_IF(selectedPalette == 2));
             break;
+        }
 
         case WM_SIZE:
             if (hwnd == hMainWnd)
@@ -397,96 +387,12 @@
                            imgXRes * zoom / 1000 + 3,
                            imgYRes * zoom / 1000 + 3, 3, 3, TRUE);
             }
-            if ((hwnd == hImageArea) || (hwnd == hScrollbox))
+            if (hwnd == hImageArea)
             {
-                long clientRectScrollbox[4];
-                long clientRectImageArea[4];
-                SCROLLINFO si;
-                GetClientRect(hScrollbox, (LPRECT) &clientRectScrollbox);
-                GetClientRect(hImageArea, (LPRECT) &clientRectImageArea);
-                si.cbSize = sizeof(SCROLLINFO);
-                si.fMask  = SIF_PAGE | SIF_RANGE;
-                si.nMax   = clientRectImageArea[2] + 6 - 1;
-                si.nMin   = 0;
-                si.nPage  = clientRectScrollbox[2];
-                SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE);
-                GetClientRect(hScrollbox, (LPRECT) clientRectScrollbox);
-                si.nMax   = clientRectImageArea[3] + 6 - 1;
-                si.nPage  = clientRectScrollbox[3];
-                SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE);
-                MoveWindow(hScrlClient,
-                           -GetScrollPos(hScrollbox, SB_HORZ), -GetScrollPos(hScrollbox, SB_VERT),
-                           max(clientRectImageArea[2] + 6, clientRectScrollbox[2]),
-                           max(clientRectImageArea[3] + 6, clientRectScrollbox[3]), TRUE);
+                UpdateScrollbox();
             }
             break;
 
-        case WM_HSCROLL:
-            if (hwnd == hScrollbox)
-            {
-                SCROLLINFO si;
-                si.cbSize = sizeof(SCROLLINFO);
-                si.fMask = SIF_ALL;
-                GetScrollInfo(hScrollbox, SB_HORZ, &si);
-                switch (LOWORD(wParam))
-                {
-                    case SB_THUMBTRACK:
-                    case SB_THUMBPOSITION:
-                        si.nPos = HIWORD(wParam);
-                        break;
-                    case SB_LINELEFT:
-                        si.nPos -= 5;
-                        break;
-                    case SB_LINERIGHT:
-                        si.nPos += 5;
-                        break;
-                    case SB_PAGELEFT:
-                        si.nPos -= si.nPage;
-                        break;
-                    case SB_PAGERIGHT:
-                        si.nPos += si.nPage;
-                        break;
-                }
-                SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE);
-                MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ),
-                           -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6,
-                           imgYRes * zoom / 1000 + 6, TRUE);
-            }
-            break;
-
-        case WM_VSCROLL:
-            if (hwnd == hScrollbox)
-            {
-                SCROLLINFO si;
-                si.cbSize = sizeof(SCROLLINFO);
-                si.fMask = SIF_ALL;
-                GetScrollInfo(hScrollbox, SB_VERT, &si);
-                switch (LOWORD(wParam))
-                {
-                    case SB_THUMBTRACK:
-                    case SB_THUMBPOSITION:
-                        si.nPos = HIWORD(wParam);
-                        break;
-                    case SB_LINEUP:
-                        si.nPos -= 5;
-                        break;
-                    case SB_LINEDOWN:
-                        si.nPos += 5;
-                        break;
-                    case SB_PAGEUP:
-                        si.nPos -= si.nPage;
-                        break;
-                    case SB_PAGEDOWN:
-                        si.nPos += si.nPage;
-                        break;
-                }
-                SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE);
-                MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ),
-                           -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6,
-                           imgYRes * zoom / 1000 + 6, TRUE);
-            }
-            break;
-
         case WM_GETMINMAXINFO:
             if (hwnd == hMainWnd)
             {
@@ -894,8 +800,8 @@
                     if (activeTool == TOOL_RECTSEL)
                     {
                         newReversible();
-                        Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0],
-                             rectSel_dest[3] + rectSel_dest[1], bgColor, bgColor, 0, TRUE);
+                        Rect(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right,
+                             rectSel_dest.bottom, bgColor, bgColor, 0, TRUE);
                     }
                     if (activeTool == TOOL_FREESEL)
                     {
@@ -968,15 +874,12 @@
                             if (IsWindowVisible(hSelection))
                             {
                                 SelectObject(hSelDC, hSelMask);
-                                StretchBlt(hSelDC, rectSel_dest[2] - 1, 0, -rectSel_dest[2], rectSel_dest[3], hSelDC,
-                                           0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY);
+                                StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, 0, -RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC,
+                                           0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY);
                                 SelectObject(hSelDC, hSelBm);
-                                StretchBlt(hSelDC, rectSel_dest[2] - 1, 0, -rectSel_dest[2], rectSel_dest[3], hSelDC,
-                                           0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY);
-                                /* force refresh of selection contents, used also in case 2 and case 4 */
-                                SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0);
-                                SendMessage(hSelection, WM_MOUSEMOVE, 0, 0);
-                                SendMessage(hSelection, WM_LBUTTONUP, 0, 0);
+                                StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, 0, -RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC,
+                                           0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY);
+                                ForceRefreshSelectionContents();
                             }
                             else
                             {
@@ -990,14 +893,12 @@
                             if (IsWindowVisible(hSelection))
                             {
                                 SelectObject(hSelDC, hSelMask);
-                                StretchBlt(hSelDC, 0, rectSel_dest[3] - 1, rectSel_dest[2], -rectSel_dest[3], hSelDC,
-                                           0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY);
+                                StretchBlt(hSelDC, 0, RECT_HEIGHT(rectSel_dest) - 1, RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC,
+                                           0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY);
                                 SelectObject(hSelDC, hSelBm);
-                                StretchBlt(hSelDC, 0, rectSel_dest[3] - 1, rectSel_dest[2], -rectSel_dest[3], hSelDC,
-                                           0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY);
-                                SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0);
-                                SendMessage(hSelection, WM_MOUSEMOVE, 0, 0);
-                                SendMessage(hSelection, WM_LBUTTONUP, 0, 0);
+                                StretchBlt(hSelDC, 0, RECT_HEIGHT(rectSel_dest) - 1, RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC,
+                                           0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY);
+                                ForceRefreshSelectionContents();
                             }
                             else
                             {
@@ -1013,14 +914,12 @@
                             if (IsWindowVisible(hSelection))
                             {
                                 SelectObject(hSelDC, hSelMask);
-                                StretchBlt(hSelDC, rectSel_dest[2] - 1, rectSel_dest[3] - 1, -rectSel_dest[2], -rectSel_dest[3], hSelDC,
-                                           0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY);
+                                StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, RECT_HEIGHT(rectSel_dest) - 1, -RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC,
+                                           0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY);
                                 SelectObject(hSelDC, hSelBm);
-                                StretchBlt(hSelDC, rectSel_dest[2] - 1, rectSel_dest[3] - 1, -rectSel_dest[2], -rectSel_dest[3], hSelDC,
-                                           0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY);
-                                SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0);
-                                SendMessage(hSelection, WM_MOUSEMOVE, 0, 0);
-                                SendMessage(hSelection, WM_LBUTTONUP, 0, 0);
+                                StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, RECT_HEIGHT(rectSel_dest) - 1, -RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC,
+                                           0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY);
+                                ForceRefreshSelectionContents();
                             }
                             else
                             {
@@ -1075,6 +974,8 @@
                     ShowWindow(hStatusBar, IsWindowVisible(hStatusBar) ? SW_HIDE : SW_SHOW);
                     alignChildrenToMainWindow();
                     break;
+                case IDM_FORMATICONBAR:
+                    ShowWindow(hwndTextEdit, IsWindowVisible(hwndTextEdit) ? SW_HIDE : SW_SHOW);
 
                 case IDM_VIEWSHOWGRID:
                     showGrid = !showGrid;
Index: base/applications/mspaint/main.c
===================================================================
--- base/applications/mspaint/main.c	(rÃ©vision 61927)
+++ base/applications/mspaint/main.c	(copie de travail)
@@ -11,10 +11,12 @@
 #include "precomp.h"
 
 #include "winproc.h"
+#include "scrollbox.h"
 #include "palette.h"
 #include "toolsettings.h"
 #include "selection.h"
 #include "sizebox.h"
+#include "textedit.h"
 
 /* FUNCTIONS ********************************************************/
 
@@ -46,12 +48,18 @@
 int rubberRadius = 4;
 int transpBg = 0;
 int zoom = 1000;
-int rectSel_src[4];
-int rectSel_dest[4];
+RECT rectSel_src;
+RECT rectSel_dest;
 HWND hSelection;
 HWND hImageArea;
 HBITMAP hSelBm;
 HBITMAP hSelMask;
+LOGFONT lfTextFont;
+HFONT hfontTextFont;
+HWND hwndTextEdit;
+HWND hwndEditCtl;
+LPTSTR textToolText = NULL;
+int textToolTextMaxLen = 0;
 
 /* array holding palette colors; may be changed by the user during execution */
 int palColors[28];
@@ -132,12 +140,6 @@
     HWND hwnd;               /* This is the handle for our window */
     MSG messages;            /* Here messages to the application are saved */
     
-    WNDCLASSEX wclScroll;
-    WNDCLASSEX wincl;
-    WNDCLASSEX wclPal;
-    WNDCLASSEX wclSettings;
-    WNDCLASSEX wclSelection;
-    
     TCHAR progtitle[1000];
     TCHAR resstr[100];
     HMENU menu;
@@ -161,6 +163,23 @@
         0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff
     };
 
+    /* init font for text tool */
+    lfTextFont.lfHeight = 0;
+    lfTextFont.lfWidth = 0;
+    lfTextFont.lfEscapement = 0;
+    lfTextFont.lfOrientation = 0;
+    lfTextFont.lfWeight = FW_NORMAL;
+    lfTextFont.lfItalic = FALSE;
+    lfTextFont.lfUnderline = FALSE;
+    lfTextFont.lfStrikeOut = FALSE;
+    lfTextFont.lfCharSet = DEFAULT_CHARSET;
+    lfTextFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+    lfTextFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+    lfTextFont.lfQuality = DEFAULT_QUALITY;
+    lfTextFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
+    lstrcpy(lfTextFont.lfFaceName, _T(""));
+    hfontTextFont = CreateFontIndirect(&lfTextFont);
+
     /* init palette */
     selectedPalette = 1;
     CopyMemory(palColors, modernPalColors, sizeof(palColors));
@@ -167,99 +186,18 @@
 
     hProgInstance = hThisInstance;
 
-    /* Necessary */
+    /* initialize common controls library */
     InitCommonControls();
 
-    /* initializing and registering the window class used for the main window */
-    wincl.hInstance         = hThisInstance;
-    wincl.lpszClassName     = _T("WindowsApp");
-    wincl.lpfnWndProc       = WindowProcedure;
-    wincl.style             = CS_DBLCLKS;
-    wincl.cbSize            = sizeof(WNDCLASSEX);
-    wincl.hIcon             = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON));
-    wincl.hIconSm           = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON));
-    wincl.hCursor           = LoadCursor(NULL, IDC_ARROW);
-    wincl.lpszMenuName      = NULL;
-    wincl.cbClsExtra        = 0;
-    wincl.cbWndExtra        = 0;
-    wincl.hbrBackground     = GetSysColorBrush(COLOR_BTNFACE);
-    RegisterClassEx (&wincl);
+    /* register application defined window classes */
+    RegisterWclMain();
+    RegisterWclScrollbox();
+    RegisterWclPal();
+    RegisterWclSettings();
+    RegisterWclSelection();
+    RegisterWclSizebox();
+    RegisterWclTextEdit();
 
-    /* initializing and registering the window class used for the scroll box */
-    wclScroll.hInstance     = hThisInstance;
-    wclScroll.lpszClassName = _T("Scrollbox");
-    wclScroll.lpfnWndProc   = WindowProcedure;
-    wclScroll.style         = 0;
-    wclScroll.cbSize        = sizeof(WNDCLASSEX);
-    wclScroll.hIcon         = NULL;
-    wclScroll.hIconSm       = NULL;
-    wclScroll.hCursor       = LoadCursor(NULL, IDC_ARROW);
-    wclScroll.lpszMenuName  = NULL;
-    wclScroll.cbClsExtra    = 0;
-    wclScroll.cbWndExtra    = 0;
-    wclScroll.hbrBackground = GetSysColorBrush(COLOR_APPWORKSPACE);
-    RegisterClassEx (&wclScroll);
-
-    /* initializing and registering the window class used for the palette window */
-    wclPal.hInstance        = hThisInstance;
-    wclPal.lpszClassName    = _T("Palette");
-    wclPal.lpfnWndProc      = PalWinProc;
-    wclPal.style            = CS_DBLCLKS;
-    wclPal.cbSize           = sizeof(WNDCLASSEX);
-    wclPal.hIcon            = NULL;
-    wclPal.hIconSm          = NULL;
-    wclPal.hCursor          = LoadCursor(NULL, IDC_ARROW);
-    wclPal.lpszMenuName     = NULL;
-    wclPal.cbClsExtra       = 0;
-    wclPal.cbWndExtra       = 0;
-    wclPal.hbrBackground    = GetSysColorBrush(COLOR_BTNFACE);
-    RegisterClassEx (&wclPal);
-
-    /* initializing and registering the window class for the settings window */
-    wclSettings.hInstance       = hThisInstance;
-    wclSettings.lpszClassName   = _T("ToolSettings");
-    wclSettings.lpfnWndProc     = SettingsWinProc;
-    wclSettings.style           = CS_DBLCLKS;
-    wclSettings.cbSize          = sizeof(WNDCLASSEX);
-    wclSettings.hIcon           = NULL;
-    wclSettings.hIconSm         = NULL;
-    wclSettings.hCursor         = LoadCursor(NULL, IDC_ARROW);
-    wclSettings.lpszMenuName    = NULL;
-    wclSettings.cbClsExtra      = 0;
-    wclSettings.cbWndExtra      = 0;
-    wclSettings.hbrBackground   = GetSysColorBrush(COLOR_BTNFACE);
-    RegisterClassEx (&wclSettings);
-
-    /* initializing and registering the window class for the selection frame */
-    wclSelection.hInstance      = hThisInstance;
-    wclSelection.lpszClassName  = _T("Selection");
-    wclSelection.lpfnWndProc    = SelectionWinProc;
-    wclSelection.style          = CS_DBLCLKS;
-    wclSelection.cbSize         = sizeof(WNDCLASSEX);
-    wclSelection.hIcon          = NULL;
-    wclSelection.hIconSm        = NULL;
-    wclSelection.hCursor        = LoadCursor(NULL, IDC_SIZEALL);
-    wclSelection.lpszMenuName   = NULL;
-    wclSelection.cbClsExtra     = 0;
-    wclSelection.cbWndExtra     = 0;
-    wclSelection.hbrBackground  = NULL;
-    RegisterClassEx (&wclSelection);
-
-    /* initializing and registering the window class for the size boxes */
-    wclSettings.hInstance       = hThisInstance;
-    wclSettings.lpszClassName   = _T("Sizebox");
-    wclSettings.lpfnWndProc     = SizeboxWinProc;
-    wclSettings.style           = CS_DBLCLKS;
-    wclSettings.cbSize          = sizeof(WNDCLASSEX);
-    wclSettings.hIcon           = NULL;
-    wclSettings.hIconSm         = NULL;
-    wclSettings.hCursor         = LoadCursor(NULL, IDC_ARROW);
-    wclSettings.lpszMenuName    = NULL;
-    wclSettings.cbClsExtra      = 0;
-    wclSettings.cbWndExtra      = 0;
-    wclSettings.hbrBackground   = GetSysColorBrush(COLOR_HIGHLIGHT);
-    RegisterClassEx (&wclSettings);
-
     LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename));
     LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr));
     _stprintf(progtitle, resstr, filename);
@@ -267,12 +205,12 @@
     
     /* create main window */
     hwnd =
-        CreateWindowEx(0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544,
+        CreateWindowEx(0, _T("MainWindow"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544,
                        375, HWND_DESKTOP, NULL, hThisInstance, NULL);
     hMainWnd = hwnd;
 
     hwndMiniature =
-        CreateWindowEx(WS_EX_PALETTEWINDOW, _T("WindowsApp"), miniaturetitle,
+        CreateWindowEx(WS_EX_PALETTEWINDOW, _T("MainWindow"), miniaturetitle,
                        WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, 180, 200, 120, 100, hwnd,
                        NULL, hThisInstance, NULL);
 
@@ -297,7 +235,7 @@
                    hThisInstance, NULL);
 
     hToolBoxContainer =
-        CreateWindowEx(0, _T("WindowsApp"), _T(""), WS_CHILD | WS_VISIBLE, 2, 2, 52, 350, hwnd, NULL,
+        CreateWindowEx(0, _T("MainWindow"), _T(""), WS_CHILD | WS_VISIBLE, 2, 2, 52, 350, hwnd, NULL,
                        hThisInstance, NULL);
     /* creating the 16 bitmap radio buttons and setting the bitmap */
 
@@ -377,7 +315,7 @@
 
     /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */
     hImageArea =
-        CreateWindowEx(0, _T("Scrollbox"), _T(""), WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient,
+        CreateWindowEx(0, _T("MainWindow"), _T(""), WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient,
                        NULL, hThisInstance, NULL);
 
     hDC = GetDC(hImageArea);
@@ -490,6 +428,16 @@
     /* by moving the window, the things in WM_SIZE are done */
     MoveWindow(hwnd, 100, 100, 600, 450, TRUE);
 
+    /* creating the text editor window for the text tool */
+    hwndTextEdit =
+        CreateWindowEx(0, _T("TextEdit"), _T(""), WS_OVERLAPPEDWINDOW, 300, 0, 300,
+                       200, hwnd, NULL, hThisInstance, NULL);
+    /* creating the edit control within the editor window */
+    hwndEditCtl =
+        CreateWindowEx(WS_EX_CLIENTEDGE, _T("EDIT"), _T(""),
+                       WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL,
+                       0, 0, 100, 100, hwndTextEdit, NULL, hThisInstance, NULL);
+
     /* Make the window visible on the screen */
     ShowWindow (hwnd, nFunsterStil);
 
Index: base/applications/mspaint/winproc.h
===================================================================
--- base/applications/mspaint/winproc.h	(rÃ©vision 61927)
+++ base/applications/mspaint/winproc.h	(copie de travail)
@@ -7,4 +7,6 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
-LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+void RegisterWclMain();
+
+LRESULT CALLBACK MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
Index: base/applications/mspaint/drawing.c
===================================================================
--- base/applications/mspaint/drawing.c	(rÃ©vision 61927)
+++ base/applications/mspaint/drawing.c	(copie de travail)
@@ -258,3 +258,24 @@
     DeleteObject(SelectObject(hdc, oldBrush));
     DeleteObject(SelectObject(hdc, oldPen));
 }
+
+void
+Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style)
+{
+    HFONT oldFont;
+    RECT rect = {x1, y1, x2, y2};
+    COLORREF oldColor;
+    COLORREF oldBkColor;
+    int oldBkMode;
+    oldFont = SelectObject(hdc, font);
+    oldColor = SetTextColor(hdc, fg);
+    oldBkColor = SetBkColor(hdc, bg);
+    oldBkMode = SetBkMode(hdc, TRANSPARENT);
+    if (style == 0)
+        Rect(hdc, x1, y1, x2, y2, bg, bg, 1, 2);
+    DrawText(hdc, lpchText, -1, &rect, DT_EDITCONTROL);
+    SelectObject(hdc, oldFont);
+    SetTextColor(hdc, oldColor);
+    SetBkColor(hdc, oldBkColor);
+    SetBkMode(hdc, oldBkMode);
+}
Index: base/applications/mspaint/toolsettings.c
===================================================================
--- base/applications/mspaint/toolsettings.c	(rÃ©vision 61927)
+++ base/applications/mspaint/toolsettings.c	(copie de travail)
@@ -9,11 +9,31 @@
 /* INCLUDES *********************************************************/
 
 #include "precomp.h"
+#include "toolsettings.h"
 
 /* FUNCTIONS ********************************************************/
 
 extern void zoomTo(int, int, int);
 
+void RegisterWclSettings()
+{
+    WNDCLASSEX wclSettings;
+    /* initializing and registering the window class for the settings window */
+    wclSettings.hInstance       = hProgInstance;
+    wclSettings.lpszClassName   = _T("ToolSettings");
+    wclSettings.lpfnWndProc     = SettingsWinProc;
+    wclSettings.style           = CS_DBLCLKS;
+    wclSettings.cbSize          = sizeof(WNDCLASSEX);
+    wclSettings.hIcon           = NULL;
+    wclSettings.hIconSm         = NULL;
+    wclSettings.hCursor         = LoadCursor(NULL, IDC_ARROW);
+    wclSettings.lpszMenuName    = NULL;
+    wclSettings.cbClsExtra      = 0;
+    wclSettings.cbWndExtra      = 0;
+    wclSettings.hbrBackground   = GetSysColorBrush(COLOR_BTNFACE);
+    RegisterClassEx (&wclSettings);
+}
+
 LRESULT CALLBACK
 SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -183,6 +203,8 @@
                     {
                         transpBg = (y - 2) / 31;
                         InvalidateRect(hwnd, NULL, TRUE);
+
+                        ForceRefreshSelectionContents();
                     }
                     break;
                 case TOOL_RUBBER:
Index: base/applications/mspaint/drawing.h
===================================================================
--- base/applications/mspaint/drawing.h	(rÃ©vision 61927)
+++ base/applications/mspaint/drawing.h	(copie de travail)
@@ -31,3 +31,5 @@
 void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2);
 
 void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2);
+
+void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style);
Index: base/applications/mspaint/toolsettings.h
===================================================================
--- base/applications/mspaint/toolsettings.h	(rÃ©vision 61927)
+++ base/applications/mspaint/toolsettings.h	(copie de travail)
@@ -6,4 +6,6 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
+void RegisterWclSettings();
+
 LRESULT CALLBACK SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
Index: base/applications/mspaint/globalvar.h
===================================================================
--- base/applications/mspaint/globalvar.h	(rÃ©vision 61927)
+++ base/applications/mspaint/globalvar.h	(copie de travail)
@@ -48,12 +48,18 @@
 extern int rubberRadius;
 extern int transpBg;
 extern int zoom;
-extern int rectSel_src[4];
-extern int rectSel_dest[4];
+extern RECT rectSel_src;
+extern RECT rectSel_dest;
 extern HWND hSelection;
 extern HWND hImageArea;
 extern HBITMAP hSelBm;
 extern HBITMAP hSelMask;
+extern HWND hwndTextEdit;
+extern HWND hwndEditCtl;
+extern LOGFONT lfTextFont;
+extern HFONT hfontTextFont;
+extern LPTSTR textToolText;
+extern int textToolTextMaxLen;
 
 extern int palColors[28];
 extern int modernPalColors[28];
Index: base/applications/mspaint/definitions.h
===================================================================
--- base/applications/mspaint/definitions.h	(rÃ©vision 61927)
+++ base/applications/mspaint/definitions.h	(copie de travail)
@@ -14,6 +14,17 @@
 #define SIZEOF(a)  (sizeof(a) / sizeof((a)[0]))
 /* sizeof for string constants; equals max. number of characters */
 
+#define RECT_WIDTH(a)  ((a).right - (a).left)
+/* width of the rectangle defined by a RECT structure */
+
+#define RECT_HEIGHT(a)  ((a).bottom - (a).top)
+/* height of the rectangle defined by a RECT structure */
+
+#define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND))
+/* simplifies checking and unchecking menu items */
+#define ENABLED_IF(a) ((a) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND))
+/* simplifies enabling or graying menu items */
+
 #define IDI_APPICON 500
 
 #define IDB_TOOLBARICONS 510
Index: base/applications/mspaint/scrollbox.c
===================================================================
--- base/applications/mspaint/scrollbox.c	(rÃ©vision 0)
+++ base/applications/mspaint/scrollbox.c	(rÃ©vision 62573)
@@ -0,0 +1,142 @@
+/*
+ * PROJECT:     PAINT for ReactOS
+ * LICENSE:     LGPL
+ * FILE:        scrollbox.c
+ * PURPOSE:     Functionality surrounding the scroll box window class
+ * PROGRAMMERS: Benedikt Freisen
+ */
+
+/* INCLUDES *********************************************************/
+
+#include "precomp.h"
+#include "scrollbox.h"
+
+/* FUNCTIONS ********************************************************/
+
+void
+RegisterWclScrollbox()
+{
+    WNDCLASSEX wclScroll;
+    /* initializing and registering the window class used for the scroll box */
+    wclScroll.hInstance     = hProgInstance;
+    wclScroll.lpszClassName = _T("Scrollbox");
+    wclScroll.lpfnWndProc   = ScrollboxWinProc;
+    wclScroll.style         = 0;
+    wclScroll.cbSize        = sizeof(WNDCLASSEX);
+    wclScroll.hIcon         = NULL;
+    wclScroll.hIconSm       = NULL;
+    wclScroll.hCursor       = LoadCursor(NULL, IDC_ARROW);
+    wclScroll.lpszMenuName  = NULL;
+    wclScroll.cbClsExtra    = 0;
+    wclScroll.cbWndExtra    = 0;
+    wclScroll.hbrBackground = GetSysColorBrush(COLOR_APPWORKSPACE);
+    RegisterClassEx (&wclScroll);
+}
+
+void
+UpdateScrollbox()
+{
+    RECT clientRectScrollbox;
+    RECT clientRectImageArea;
+    SCROLLINFO si;
+    GetClientRect(hScrollbox, &clientRectScrollbox);
+    GetClientRect(hImageArea, &clientRectImageArea);
+    si.cbSize = sizeof(SCROLLINFO);
+    si.fMask  = SIF_PAGE | SIF_RANGE;
+    si.nMax   = clientRectImageArea.right + 6 - 1;
+    si.nMin   = 0;
+    si.nPage  = clientRectScrollbox.right;
+    SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE);
+    GetClientRect(hScrollbox, &clientRectScrollbox);
+    si.nMax   = clientRectImageArea.bottom + 6 - 1;
+    si.nPage  = clientRectScrollbox.bottom;
+    SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE);
+    MoveWindow(hScrlClient,
+               -GetScrollPos(hScrollbox, SB_HORZ), -GetScrollPos(hScrollbox, SB_VERT),
+               max(clientRectImageArea.right + 6, clientRectScrollbox.right),
+               max(clientRectImageArea.bottom + 6, clientRectScrollbox.bottom), TRUE);
+}
+
+LRESULT CALLBACK
+ScrollboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    switch (message)
+    {
+        case WM_SIZE:
+            if (hwnd == hScrollbox)
+            {
+                UpdateScrollbox();
+            }
+            break;
+        case WM_HSCROLL:
+            if (hwnd == hScrollbox)
+            {
+                SCROLLINFO si;
+                si.cbSize = sizeof(SCROLLINFO);
+                si.fMask = SIF_ALL;
+                GetScrollInfo(hScrollbox, SB_HORZ, &si);
+                switch (LOWORD(wParam))
+                {
+                    case SB_THUMBTRACK:
+                    case SB_THUMBPOSITION:
+                        si.nPos = HIWORD(wParam);
+                        break;
+                    case SB_LINELEFT:
+                        si.nPos -= 5;
+                        break;
+                    case SB_LINERIGHT:
+                        si.nPos += 5;
+                        break;
+                    case SB_PAGELEFT:
+                        si.nPos -= si.nPage;
+                        break;
+                    case SB_PAGERIGHT:
+                        si.nPos += si.nPage;
+                        break;
+                }
+                SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE);
+                MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ),
+                           -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6,
+                           imgYRes * zoom / 1000 + 6, TRUE);
+            }
+            break;
+
+        case WM_VSCROLL:
+            if (hwnd == hScrollbox)
+            {
+                SCROLLINFO si;
+                si.cbSize = sizeof(SCROLLINFO);
+                si.fMask = SIF_ALL;
+                GetScrollInfo(hScrollbox, SB_VERT, &si);
+                switch (LOWORD(wParam))
+                {
+                    case SB_THUMBTRACK:
+                    case SB_THUMBPOSITION:
+                        si.nPos = HIWORD(wParam);
+                        break;
+                    case SB_LINEUP:
+                        si.nPos -= 5;
+                        break;
+                    case SB_LINEDOWN:
+                        si.nPos += 5;
+                        break;
+                    case SB_PAGEUP:
+                        si.nPos -= si.nPage;
+                        break;
+                    case SB_PAGEDOWN:
+                        si.nPos += si.nPage;
+                        break;
+                }
+                SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE);
+                MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ),
+                           -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6,
+                           imgYRes * zoom / 1000 + 6, TRUE);
+            }
+            break;
+
+        default:
+            return DefWindowProc(hwnd, message, wParam, lParam);
+    }
+
+    return 0;
+}

Modification de propriÃ©tÃ©s sur base/applications/mspaint/scrollbox.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/mspaint/scrollbox.h
===================================================================
--- base/applications/mspaint/scrollbox.h	(rÃ©vision 0)
+++ base/applications/mspaint/scrollbox.h	(rÃ©vision 62573)
@@ -0,0 +1,13 @@
+/*
+ * PROJECT:     PAINT for ReactOS
+ * LICENSE:     LGPL
+ * FILE:        scrollbox.h
+ * PURPOSE:     Functionality surrounding the scroll box window class
+ * PROGRAMMERS: Benedikt Freisen
+ */
+
+void RegisterWclScrollbox();
+
+void UpdateScrollbox();
+
+LRESULT CALLBACK ScrollboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

Modification de propriÃ©tÃ©s sur base/applications/mspaint/scrollbox.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/mspaint/textedit.c
===================================================================
--- base/applications/mspaint/textedit.c	(rÃ©vision 0)
+++ base/applications/mspaint/textedit.c	(rÃ©vision 62573)
@@ -0,0 +1,70 @@
+/*
+ * PROJECT:     PAINT for ReactOS
+ * LICENSE:     LGPL
+ * FILE:        base/applications/paint/textedit.c
+ * PURPOSE:     Text editor and font chooser for the text tool
+ * PROGRAMMERS: Benedikt Freisen
+ */
+
+/* INCLUDES *********************************************************/
+
+#include "precomp.h"
+#include "textedit.h"
+
+/* FUNCTIONS ********************************************************/
+
+void
+RegisterWclTextEdit()
+{
+    WNDCLASSEX wclTextEdit;
+    /* initializing and registering the window class used for the text editor */
+    wclTextEdit.hInstance         = hProgInstance;
+    wclTextEdit.lpszClassName     = _T("TextEdit");
+    wclTextEdit.lpfnWndProc       = TextEditWinProc;
+    wclTextEdit.style             = CS_DBLCLKS;
+    wclTextEdit.cbSize            = sizeof(WNDCLASSEX);
+    wclTextEdit.hIcon             = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON));
+    wclTextEdit.hIconSm           = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON));
+    wclTextEdit.hCursor           = LoadCursor(NULL, IDC_ARROW);
+    wclTextEdit.lpszMenuName      = NULL;
+    wclTextEdit.cbClsExtra        = 0;
+    wclTextEdit.cbWndExtra        = 0;
+    wclTextEdit.hbrBackground     = GetSysColorBrush(COLOR_BTNFACE);
+    RegisterClassEx (&wclTextEdit);
+}
+
+LRESULT CALLBACK
+TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    switch (message)
+    {
+        case WM_SIZE:
+        {
+            RECT clientRect;
+            GetClientRect(hwnd, &clientRect);
+            MoveWindow(hwndEditCtl, clientRect.left, clientRect.top, RECT_WIDTH(clientRect), RECT_HEIGHT(clientRect), TRUE);
+            break;
+        }
+        case WM_CLOSE:
+            ShowWindow(hwnd, SW_HIDE);
+            break;
+        case WM_COMMAND:
+            switch(HIWORD(wParam))
+            {
+                case EN_UPDATE:
+                {
+                    HeapFree(GetProcessHeap(), 0, textToolText);
+                    textToolTextMaxLen = GetWindowTextLength(hwndEditCtl) + 1;
+                    textToolText = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(TCHAR) * textToolTextMaxLen);
+                    GetWindowText(hwndEditCtl, textToolText, textToolTextMaxLen);
+                    ForceRefreshSelectionContents();
+                    break;
+                }
+            }
+            break;
+        default:
+            return DefWindowProc(hwnd, message, wParam, lParam);
+    }
+    
+    return 0;
+}

Modification de propriÃ©tÃ©s sur base/applications/mspaint/textedit.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/mspaint/textedit.h
===================================================================
--- base/applications/mspaint/textedit.h	(rÃ©vision 0)
+++ base/applications/mspaint/textedit.h	(rÃ©vision 62573)
@@ -0,0 +1,11 @@
+/*
+ * PROJECT:     PAINT for ReactOS
+ * LICENSE:     LGPL
+ * FILE:        base/applications/paint/textedit.h
+ * PURPOSE:     Text editor and font chooser for the text tool
+ * PROGRAMMERS: Benedikt Freisen
+ */
+
+void RegisterWclTextEdit();
+
+LRESULT CALLBACK TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

Modification de propriÃ©tÃ©s sur base/applications/mspaint/textedit.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/charmap/CMakeLists.txt
===================================================================
--- base/applications/charmap/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/charmap/CMakeLists.txt	(copie de travail)
@@ -5,10 +5,10 @@
     lrgcell.c
     map.c
     settings.c
-    charmap.rc)
+    precomp.h)
 
-add_executable(charmap ${SOURCE})
+add_executable(charmap ${SOURCE} charmap.rc)
 set_module_type(charmap win32gui UNICODE)
 add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32)
-add_pch(charmap precomp.h)
+add_pch(charmap precomp.h SOURCE)
 add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)
Index: base/applications/charmap/lang/tr-TR.rc
===================================================================
--- base/applications/charmap/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/charmap/lang/tr-TR.rc	(copie de travail)
@@ -32,7 +32,7 @@
     PUSHBUTTON "Ara", IDC_BUTTON_SEARCH, 200, 44, 50, 14
     EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
     LTEXT "Ada GÃ¶re Ara:", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "Evrenlik DÃ¼zgÃ¼:", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "Evrenlik Kod:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
 
@@ -50,7 +50,7 @@
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼rdÃ¼r, yÃ¢ni bu yazÄ±lÄ±m Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±nladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n 2. sÃ¼rÃ¼mÃ¼ veyÃ¢ daha sonraki sÃ¼rÃ¼mleri altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi umuduyla daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r, ancak bilhassa SATILABÄ°LÄ°RLÄ°K ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUK aÃ§Ä±sÄ±ndan olmak Ã¼zere bu yazÄ±lÄ±mÄ±n hiÃ§bir gÃ¼vencesi yoktur. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retine de iye olmanÄ±z gerekir, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± A.Åž.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r; bu yazÄ±lÄ±mÄ±, Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±mladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n, 2. sÃ¼rÃ¼mÃ¼nÃ¼n ya da daha sonraki herhangi bir sÃ¼rÃ¼mÃ¼nÃ¼n (OrasÄ± size baÄŸlÄ±.) koÅŸullarÄ± altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLÄ°ÄžÄ°N ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN  demek istenilen garantisi bile. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retini almÄ±ÅŸ olmalÄ±sÄ±nÄ±z, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "&HakkÄ±nda"
     IDS_TITLE "Karakter EÅŸlem"
 END
Index: base/applications/logoff/CMakeLists.txt
===================================================================
--- base/applications/logoff/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/logoff/CMakeLists.txt	(copie de travail)
@@ -2,10 +2,10 @@
 list(APPEND SOURCE
     misc.c
     logoff.c
-    logoff.rc)
+    precomp.h)
 
-add_executable(logoff ${SOURCE})
+add_executable(logoff ${SOURCE} logoff.rc)
 set_module_type(logoff win32cui)
 add_importlibs(logoff advapi32 user32 msvcrt kernel32)
-add_pch(logoff precomp.h)
+add_pch(logoff precomp.h SOURCE)
 add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all)
Index: base/applications/regedit/lang/tr-TR.rc
===================================================================
--- base/applications/regedit/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/regedit/lang/tr-TR.rc	(copie de travail)
@@ -284,7 +284,7 @@
     ID_EDIT_NEW_KEY "Yeni bir dizin oluÅŸturur."
     ID_EDIT_NEW_STRINGVALUE "Yeni bir dizgi deÄŸeri oluÅŸturur."
     ID_EDIT_NEW_BINARYVALUE "Yeni bir ikili deÄŸer oluÅŸturur."
-    ID_EDIT_NEW_DWORDVALUE "Yeni bir 32 ikillik deÄŸer oluÅŸturur."
+    ID_EDIT_NEW_DWORDVALUE "Yeni bir 32 bitlik deÄŸer oluÅŸturur."
     ID_REGISTRY_IMPORTREGISTRYFILE "Uygun bir kÃ¼tÃ¼kten bilgiler alÄ±r."
     ID_REGISTRY_EXPORTREGISTRYFILE "DeÄŸer Defteri'nin tÃ¼mÃ¼nÃ¼ ya da bir bÃ¶lÃ¼mÃ¼nÃ¼ bir kÃ¼tÃ¼ÄŸe kaydeder."
     ID_REGISTRY_LOADHIVE "DeÄŸer Defteri'ne bir yÄ±ÄŸÄ±n yÃ¼kler."
@@ -347,7 +347,7 @@
     IDS_EXPORT_REG_FILE "DeÄŸer KÃ¼tÃ¼ÄŸÃ¼ne Ver"
     IDS_LOAD_HIVE "YÄ±ÄŸÄ±n YÃ¼kle"
     IDS_UNLOAD_HIVE "YÄ±ÄŸÄ±nÄ± KaldÄ±r"
-    IDS_INVALID_DWORD "(Bu 32 ikillik deÄŸer geÃ§ersizdir.)"
+    IDS_INVALID_DWORD "(Bu 32 bitlik deÄŸer geÃ§ersizdir.)"
 END
 
 STRINGTABLE
@@ -357,7 +357,7 @@
     IDS_FLT_REGFILES_FLT "*.reg"
     IDS_FLT_HIVFILES "YÄ±ÄŸÄ±n DosyalarÄ± (*.*)"
     IDS_FLT_HIVFILES_FLT "*.*"
-    IDS_FLT_REGEDIT4 "Pencereler 9x ve Pencereler NT 4.0 TÃ¼rÃ¼ndeki DeÄŸer KÃ¼tÃ¼kleri (*.reg)"
+    IDS_FLT_REGEDIT4 "Windows 9x ve Windows NT 4.0 TÃ¼rÃ¼ndeki DeÄŸer KÃ¼tÃ¼kleri (*.reg)"
     IDS_FLT_REGEDIT4_FLT "*.reg"
     IDS_FLT_ALLFILES "TÃ¼m KÃ¼tÃ¼kler (*.*)"
     IDS_FLT_ALLFILES_FLT "*.*"
Index: base/applications/regedit/CMakeLists.txt
===================================================================
--- base/applications/regedit/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/regedit/CMakeLists.txt	(copie de travail)
@@ -16,12 +16,12 @@
     security.c
     settings.c
     treeview.c
-    regedit.rc)
+    regedit.h)
 
-add_executable(regedit ${SOURCE})
+add_executable(regedit ${SOURCE} regedit.rc)
 set_module_type(regedit win32gui UNICODE)
 target_link_libraries(regedit uuid)
 add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32)
-add_pch(regedit regedit.h)
+add_pch(regedit regedit.h SOURCE)
 add_cd_file(TARGET regedit DESTINATION reactos FOR all)
 #add_subdirectory(clb)
Index: base/applications/rapps/rapps.h
===================================================================
--- base/applications/rapps/rapps.h	(rÃ©vision 61927)
+++ base/applications/rapps/rapps.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _RAPPS_H
+#define _RAPPS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -195,3 +198,5 @@
 extern HWND hTreeView;
 BOOL CreateTreeView(HWND hwnd);
 HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam);
+
+#endif /* _RAPPS_H */
Index: base/applications/rapps/CMakeLists.txt
===================================================================
--- base/applications/rapps/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/rapps/CMakeLists.txt	(copie de travail)
@@ -15,17 +15,13 @@
     toolbar.c
     treeview.c
     winmain.c
-    rapps.rc)
+    rapps.h)
 
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${REACTOS_BINARY_DIR}/include/reactos)
-
-add_executable(rapps ${SOURCE})
-add_pch(rapps rapps.h)
+add_executable(rapps ${SOURCE} rapps.rc)
 set_module_type(rapps win32gui UNICODE)
 target_link_libraries(rapps uuid)
 add_importlibs(rapps advapi32 comctl32 gdi32 urlmon wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll)
+add_pch(rapps rapps.h SOURCE)
 add_dependencies(rapps rappsmsg)
 add_message_headers(ANSI rappsmsg.mc)
 add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all)
Index: base/applications/rapps/lang/tr-TR.rc
===================================================================
--- base/applications/rapps/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/rapps/lang/tr-TR.rc	(copie de travail)
@@ -24,7 +24,7 @@
     END
     POPUP "Y&ardÄ±m"
     BEGIN
-        MENUITEM "&YardÄ±m KonularÄ±", ID_HELP, GRAYED
+        MENUITEM "&YardÄ±m", ID_HELP, GRAYED
         MENUITEM "&HakkÄ±nda", ID_ABOUT
     END
 END
Index: base/applications/rapps/rapps/7zip.txt
===================================================================
--- base/applications/rapps/rapps/7zip.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/7zip.txt	(copie de travail)
@@ -4,7 +4,7 @@
 Name = 7-Zip
 Version = 9.32a
 Licence = LGPL
-Description = Utility to create and open 7zip, zip, tar, rar and other archive files.
+Description = A file archiving utility with support for 7zip, zip, tar, rar and many other archive formats.
 Size = 1.1 MB
 Category = 12
 URLSite = http://www.7-zip.org/
@@ -12,34 +12,34 @@
 CDPath = none
 
 [Section.0407]
-Description = Tool zum Erstellen und Ã–ffnen von 7zip, zip, tar, rar und andrern Archiven.
+Description = Ein Dateiarchivierungswerkzeug zum Erstellen und Ã–ffnen von 7zip, zip, tar, rar und vielen anderen Archivformaten.
 
 [Section.040a]
-Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos.
+Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. (FIXME)
 
 [Section.040c]
-Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et autres archives.
+Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et autres archives. (FIXME)
 Size = 1,1 Mo
 
 [Section.0410]
-Description = UtilitÃ  per creare e aprire 7zip, zip, tar, rar e altri file archivio.
+Description = UtilitÃ  per creare e aprire 7zip, zip, tar, rar e altri file archivio. (FIXME)
 
 [Section.0413]
-Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden.
+Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME)
 
 [Section.0415]
-Description = NarzÄ™dzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych.
+Description = NarzÄ™dzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. (FIXME)
 
 [Section.0418]
-Description = Utilitar pentru crearea È™i deschiderea arhivelor 7zip, zip, tar, rar È™i altele.
+Description = Utilitar pentru crearea È™i deschiderea arhivelor 7zip, zip, tar, rar È™i altele. (FIXME)
 Size = 1,1 Mo
 
 [Section.041f]
-Description = 7z, zip, tar, rar ve diÄŸer birÃ§ok sÄ±kÄ±ÅŸtÄ±rma biÃ§imini destekleyen bir araÃ§.
+Description = 7zip, zip, tar, rar ve diÄŸer birÃ§ok tÃ¼rdeki belgelikleri destekleyen bir belgelikleme aracÄ±dÄ±r.
 Size = 1,1 MB
 
 [Section.0422]
-Description = Ð£Ñ‚Ð¸Ð»Ñ–Ñ‚Ð° Ð´Ð»Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ñ‚Ð° Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� 7zip, zip, tar, rar Ñ‚Ð° Ñ–Ð½ÑˆÐ¸Ñ… Ð°Ñ€Ñ…Ñ–Ð²Ð½Ð¸Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð².
+Description = Ð£Ñ‚Ð¸Ð»Ñ–Ñ‚Ð° Ð´Ð»Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ñ‚Ð° Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� 7zip, zip, tar, rar Ñ‚Ð° Ñ–Ð½ÑˆÐ¸Ñ… Ð°Ñ€Ñ…Ñ–Ð²Ð½Ð¸Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð². (FIXME)
 
 [Section.0813]
-Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden.
+Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME)
Index: base/applications/rapps/rapps/supertux.txt
===================================================================
--- base/applications/rapps/rapps/supertux.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/supertux.txt	(copie de travail)
@@ -8,7 +8,7 @@
 Size = 7.3 MB
 Category = 4
 URLSite = http://www.supertux.lethargik.org
-URLDownload = http://files1.freesoft.ru/rep/694851/supertux-0.1.3-setup.exe
+URLDownload = http://download.sourceforge.net/project/supertux.berlios/supertux-0.1.3-setup.exe
 CDPath = none
 
 [Section.0407]
Index: base/applications/rapps/rapps/alreader.txt
===================================================================
--- base/applications/rapps/rapps/alreader.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/alreader.txt	(copie de travail)
@@ -2,6 +2,7 @@
 
 [Section]
 Name = AlReader
+Version = 110502
 Description = A FB2 eBook Reader.
 URLSite = http://www.alreader.com
 Size = 4.6 MB
Index: base/applications/rapps/rapps/fira.txt
===================================================================
--- base/applications/rapps/rapps/fira.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/fira.txt	(copie de travail)
@@ -23,5 +23,5 @@
 [Section.041f]
 Name = Mozilla Fira YazÄ± TÃ¼rÃ¼
 Licence = Bilinmiyor
-Description = Mozilla Fira YazÄ± TÃ¼rÃ¼ Paketi, Mono ve Sans yazÄ± tÃ¼rlerini kapsar. ReactOS'un "Fonts" dizinine Ã§Ä±kartÄ±nÄ±z.
+Description = Mozilla Fira YazÄ± TÃ¼rÃ¼ Paketi, Mono ve Sans yazÄ± tÃ¼rlerini kapsar. ReactOS dizinine Ã§Ä±kartÄ±nÄ±z.
 Size = 543 KB
Index: base/applications/rapps/rapps/chromium.txt
===================================================================
--- base/applications/rapps/rapps/chromium.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/chromium.txt	(copie de travail)
@@ -8,7 +8,7 @@
 Size = 2.3 MB
 Category = 4
 URLSite = http://chromium-bsu.sourceforge.net
-URLDownload = http://files1.freesoft.ru/rep/701665/chromium-0.9.13.2.exe
+URLDownload = http://download.sourceforge.net/project/chromium-bsu/Chromium%20B.S.U.%20Win32%20binary/chromium-0.9.13.2.exe
 CDPath = none
 
 [Section.0407]
Index: base/applications/rapps/rapps/smplayer.txt
===================================================================
--- base/applications/rapps/rapps/smplayer.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/smplayer.txt	(copie de travail)
@@ -16,8 +16,8 @@
 URLSite = http://smplayer.sourceforge.net/de/info
 
 [Section.040a]
+Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia).
 URLSite = http://smplayer.sourceforge.net/es/info
-Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia).
 
 [Section.040c]
 Size = 16,98 Mo
@@ -30,8 +30,8 @@
 Description = Mediaspeler, grafische interface voor MPlayer.
 
 [Section.0415]
+Description = Graficzna nakÅ‚adka na MPlayer, otwarty odtwarzacz filmÃ³w.
 URLSite = http://smplayer.sourceforge.net/pl/info
-Description = Graficzna nakÅ‚adka na MPlayer, otwarty odtwarzacz filmÃ³w.
 
 [Section.0418]
 Description = Lector multimedia (interfaÈ›Äƒ pentru MPlayer).
@@ -43,8 +43,8 @@
 URLSite = http://smplayer.sourceforge.net/tr/info
 
 [Section.0422]
+Description = Ð“Ñ€Ð°Ñ„Ñ–Ñ‡Ð½Ð¸Ð¹ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ� Ð´Ð»Ñ� MPlayer (Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ñ–Ð¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑ”Ñ€).
 URLSite = http://smplayer.sourceforge.net/uk/info
-Description = Ð“Ñ€Ð°Ñ„Ñ–Ñ‡Ð½Ð¸Ð¹ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ� Ð´Ð»Ñ� MPlayer (Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ñ–Ð¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑ”Ñ€).
 
 [Section.0813]
 Description = Mediaspeler, grafische interface voor MPlayer.
Index: base/applications/rapps/rapps/zaz.txt
===================================================================
--- base/applications/rapps/rapps/zaz.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/zaz.txt	(copie de travail)
@@ -8,7 +8,7 @@
 Size = 21.0 MB
 Category = 4
 URLSite = http://zaz.sourceforge.net
-URLDownload = http://files1.freesoft.ru/rep/704321/Zaz-1.0.0-Setup.exe
+URLDownload = http://download.sourceforge.net/project/zaz/Zaz-1.0.0-Setup.exe
 CDPath = none
 
 [Section.0407]
Index: base/applications/rapps/rapps/rosbe.txt
===================================================================
--- base/applications/rapps/rapps/rosbe.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/rosbe.txt	(copie de travail)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = ReactOS Build Environment
-Version = 2.1
+Version = 2.1.1
 Licence = GPL
 Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.
-Size = 31.6 MB
+Size = 28.3 MB
 Category = 7
 URLSite = http://reactos.org/wiki/Build_Environment
-URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/i386/2.1/RosBE-2.1.exe
+URLDownload = http://downloads.sourceforge.net/reactos/RosBE-2.1.1.exe
 CDPath = none
 
 [Section.0405]
@@ -21,8 +21,8 @@
 Description = Te permite compilar el cÃ³digo de ReactOS. Para mÃ¡s instrucciones consulta la wiki de ReactOS.
 
 [Section.040c]
-Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instruction, reportez-vous au wiki ReactOS.
-Size = 31,6 Mo
+Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instructions, reportez-vous au wiki ReactOS.
+Size = 28,3 Mo
 
 [Section.0410]
 Description = Permette di compilare i sorgenti di ReactOS. Per maggiori informazioni consultare il Wiki di ReactOS.
@@ -35,12 +35,12 @@
 
 [Section.0418]
 Description = Permite compilarea surselor ReactOS. Pentru instrucÈ›iuni, consultaÈ›i wiki ReactOS.
-Size = 31,6 Mo
+Size = 28,3 Mo
 
 [Section.041f]
 Name = ReactOS Derleme OrtamÄ±
 Description = ReactOS Kaynak KodlarÄ±'nÄ± derlettirir. Daha Ã§ok aÃ§Ä±klama iÃ§in ReactOS Wiki'ye bakÄ±nÄ±z.
-Size = 31,6 MB
+Size = 28,3 MB
 
 [Section.0422]
 Description = Ð”Ð¾Ð·Ð²Ð¾Ð»Ñ�Ñ” Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ ReactOS Ð· Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ñ… ÐºÐ¾Ð´Ñ–Ð². Ð—Ð° Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ð¾ÑŽ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ”ÑŽ Ð´Ð¸Ð²Ñ–Ñ‚ÑŒÑ�Ñ� Ð² ReactOS Ð’Ñ–ÐºÑ–.
Index: base/applications/rapps/rapps/stamina.txt
===================================================================
--- base/applications/rapps/rapps/stamina.txt	(rÃ©vision 61927)
+++ base/applications/rapps/rapps/stamina.txt	(copie de travail)
@@ -2,7 +2,7 @@
 
 [Section]
 Name = Stamina 2.5
-Description = Free typing tutor.
+Description = Free typing tutor. To run this program, please install the Microsoft Visual C++ 6 Redistributable Package.
 URLSite = http://stamina.ru
 Size = 4.7 MB
 Category = 8
@@ -10,12 +10,12 @@
 CDPath = none
 
 [Section.0407]
-Description = Ein freies Schreiblernprogramm.
+Description = Ein freies Schreiblernprogramm. Um dieses Programm nutzen zu kÃ¶nnen, mÃ¼ssen Sie das Microsoft Visual C++ 6 Redistributable Package installieren.
 
 [Section.0418]
-Description = Tutor gratuit pentru dactilografiere.
+Description = Tutor gratuit pentru dactilografiere. (FIXME)
 Size = 4,7 Mo
 
 [Section.041f]
-Description = Ãœcretsiz bir dÃ¼ÄŸme takÄ±mÄ±nda yazma Ã¶ÄŸreticisi.
+Description = Ãœcretsiz bir dÃ¼ÄŸme takÄ±mÄ±nda yazma Ã¶ÄŸreticisi. YazÄ±lÄ±mÄ± Ã§alÄ±ÅŸtÄ±rmk iÃ§in MikroyazÄ±lÄ±m BasarÃ® C++ 6 Yeniden DaÄŸÄ±tÄ±labilir Paket'i kurunuz.
 Size = 4,7 MB
Index: base/applications/rapps/rapps/excelview.txt
===================================================================
--- base/applications/rapps/rapps/excelview.txt	(rÃ©vision 0)
+++ base/applications/rapps/rapps/excelview.txt	(rÃ©vision 62573)
@@ -0,0 +1,62 @@
+ï»¿; UTF-8
+
+[Section]
+Name = Excel Viewer
+Version = 2010
+Licence = Unknown
+Description = Microsoft Excel Viewer
+Size = 74.14 MB
+Category = 6
+URLSite = http://support.microsoft.com/kb/180071/
+URLDownload = http://download.microsoft.com/download/e/a/9/ea913c8b-51a7-41b7-8697-9f0d0a7274aa/ExcelViewer.exe
+CDPath = none
+
+[Section.0407]
+Licence = Unbekannt
+Size = 51.15 MB
+URLDownload = http://download.microsoft.com/download/F/8/8/F88CB355-ECAA-4B74-87D6-C05C81D215BF/ExcelViewer.exe
+
+[Section.040a]
+Licence = Desconocida
+Size = 51.11 MB
+URLDownload = http://download.microsoft.com/download/5/D/9/5D9E41A4-22CE-4497-BD7D-368883EF92F7/ExcelViewer.exe
+
+[Section.040c]
+Licence = Inconnue
+Size = 51,13 Mo
+URLDownload = http://download.microsoft.com/download/0/0/E/00EE9DCF-7BCA-4414-837E-BC3AA23DCC8D/ExcelViewer.exe
+
+[Section.0410]
+Licence = Sconosciuta
+Size = 51.1 MB
+URLDownload = http://download.microsoft.com/download/0/C/2/0C2ED9D9-6961-47F3-91E0-916E19F330E2/ExcelViewer.exe
+
+[Section.0413]
+Licence = Ongekend
+Size = 50.97 MB
+URLDownload = http://download.microsoft.com/download/C/C/6/CC663715-AB58-4CDE-90F1-5A8CF7472500/ExcelViewer.exe
+
+[Section.0415]
+Licence = Nieznana
+Size = 51.15 MB
+URLDownload = http://download.microsoft.com/download/5/B/A/5BAB0B5A-706D-444C-B90A-1D97DB4C43A8/ExcelViewer.exe
+
+[Section.0418]
+Licence = NecunoscutÄƒ
+Size = 51,14 Mo
+URLDownload = http://download.microsoft.com/download/D/D/2/DD28D077-97F3-47C0-9389-0B987918888B/ExcelViewer.exe
+
+[Section.041f]
+Licence = Bilinmiyor
+Size = 51.1 MB
+URLDownload = http://download.microsoft.com/download/8/5/D/85DCDD24-8237-4334-866D-417F74F37C47/ExcelViewer.exe
+
+[Section.0422]
+Licence = Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°
+Size = 51.15 MB
+URLDownload = http://download.microsoft.com/download/7/4/9/749A8D59-A2D5-4A64-99CF-5FF4DD7C5AC6/ExcelViewer.exe
+
+[Section.0813]
+Licence = Ongekend
+Size = 50.97 MB
+URLDownload = http://download.microsoft.com/download/C/C/6/CC663715-AB58-4CDE-90F1-5A8CF7472500/ExcelViewer.exe

Modification de propriÃ©tÃ©s sur base/applications/rapps/rapps/excelview.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/rapps/rapps/pptview.txt
===================================================================
--- base/applications/rapps/rapps/pptview.txt	(rÃ©vision 0)
+++ base/applications/rapps/rapps/pptview.txt	(rÃ©vision 62573)
@@ -0,0 +1,62 @@
+ï»¿; UTF-8
+
+[Section]
+Name = Powerpoint Viewer
+Version = 2010
+Licence = Unknown
+Description = Microsoft Powerpoint Viewer
+Size = 60.28 MB
+Category = 6
+URLSite = http://support.microsoft.com/kb/180071/
+URLDownload = http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+CDPath = none
+
+[Section.0407]
+Licence = Unbekannt
+Size = 60.43 MB
+URLDownload = http://download.microsoft.com/download/9/F/7/9F742C8F-8C70-4498-B4D1-539BE36A1077/PowerPointViewer.exe
+
+[Section.040a]
+Licence = Desconocida
+Size = 60.48 MB
+URLDownload = http://download.microsoft.com/download/C/1/A/C1AAD042-4407-4470-97CB-863B869F9EDF/PowerPointViewer.exe
+
+[Section.040c]
+Licence = Inconnue
+Size = 60,41 Mo
+URLDownload = http://download.microsoft.com/download/6/B/4/6B4CA627-C0CD-4B27-BE31-0B87AE10F46B/PowerPointViewer.exe
+
+[Section.0410]
+Licence = Sconosciuta
+Size = 60.38 MB
+URLDownload = http://download.microsoft.com/download/3/F/A/3FA9171A-B310-4F0D-A33A-B16827536FAE/PowerPointViewer.exe
+
+[Section.0413]
+Licence = Ongekend
+Size = 60.33 MB
+URLDownload = http://download.microsoft.com/download/9/A/8/9A89B545-E4F4-498C-B265-D74CBB89F4D9/PowerPointViewer.exe
+
+[Section.0415]
+Licence = Nieznana
+Size = 60.43 MB
+URLDownload = http://download.microsoft.com/download/9/E/4/9E4A5F9A-210D-44B7-ADA2-F47CE00541ED/PowerPointViewer.exe
+
+[Section.0418]
+Licence = NecunoscutÄƒ
+Size = 60,4 Mo
+URLDownload = http://download.microsoft.com/download/5/6/E/56E4DBA3-D725-43EA-B1E5-DC148022999C/PowerPointViewer.exe
+
+[Section.041f]
+Licence = Bilinmiyor
+Size = 60.4 MB
+URLDownload = http://download.microsoft.com/download/4/6/4/4641DACB-5DE8-4E3A-B8F4-39A1C73889D3/PowerPointViewer.exe
+
+[Section.0422]
+Licence = Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°
+Size = 60.52 MB
+URLDownload = http://download.microsoft.com/download/C/E/8/CE879E6E-D3F3-4234-A968-9651A3A85D98/PowerPointViewer.exe
+
+[Section.0813]
+Licence = Ongekend
+Size = 60.33 MB
+URLDownload = http://download.microsoft.com/download/9/A/8/9A89B545-E4F4-498C-B265-D74CBB89F4D9/PowerPointViewer.exe

Modification de propriÃ©tÃ©s sur base/applications/rapps/rapps/pptview.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/rapps/rapps/wordview.txt
===================================================================
--- base/applications/rapps/rapps/wordview.txt	(rÃ©vision 0)
+++ base/applications/rapps/rapps/wordview.txt	(rÃ©vision 62573)
@@ -0,0 +1,62 @@
+ï»¿; UTF-8
+
+[Section]
+Name = Word Viewer
+Version = 2010
+Licence = Unknown
+Description = Microsoft Word Viewer
+Size = 24.5 MB
+Category = 6
+URLSite = http://support.microsoft.com/kb/180071/
+URLDownload = http://download.microsoft.com/download/6/a/6/6a689355-b155-4fa7-ad8a-dfe150fe7ac6/wordview_en-us.exe
+CDPath = none
+
+[Section.0407]
+Licence = Unbekannt
+Size = 24.56 MB
+URLDownload = http://download.microsoft.com/download/d/4/b/d4b23f0e-c8b6-4383-878d-1a8184b7db56/wordview_de-de.exe
+
+[Section.040a]
+Licence = Desconocida
+Size = 24.53 MB
+URLDownload = http://download.microsoft.com/download/4/4/c/44c2d552-8b40-464f-8470-b4976d7ba60b/wordview_es-es.exe
+
+[Section.040c]
+Licence = Inconnue
+Size = 24,55 Mo
+URLDownload = http://download.microsoft.com/download/b/f/3/bf36c75d-2e93-4db1-ace2-1425e5219260/wordview_fr-fr.exe
+
+[Section.0410]
+Licence = Sconosciuta
+Size = 24.52 MB
+URLDownload = http://download.microsoft.com/download/f/8/e/f8e9dadd-70bd-4317-a7fe-25d7bfb54b71/wordview_it-it.exe
+
+[Section.0413]
+Licence = Ongekend
+Size = 24.54 MB
+URLDownload = http://download.microsoft.com/download/c/1/0/c10e009e-61e2-4b54-8d21-aff378679527/wordview_nl-nl.exe
+
+[Section.0415]
+Licence = Nieznana
+Size = 24.58 MB
+URLDownload = http://download.microsoft.com/download/c/e/1/ce1e1286-67a2-4069-a8c4-b3552f18dfa8/wordview_pl-pl.exe
+
+[Section.0418]
+Licence = NecunoscutÄƒ
+Size = 24,56 Mo
+URLDownload = http://download.microsoft.com/download/1/2/3/123d3dc8-6f3f-473f-ac1d-3e38969605e8/wordview_ro-ro.exe
+
+[Section.041f]
+Licence = Bilinmiyor
+Size = 24.55 MB
+URLDownload = http://download.microsoft.com/download/7/6/e/76efefb4-9575-4903-ac2a-180c280ab6c7/wordview_tr-tr.exe
+
+[Section.0422]
+Licence = Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°
+Size = 24.56 MB
+URLDownload = http://download.microsoft.com/download/2/b/d/2bd08f27-822b-4c20-936a-0f1d91cb9e69/wordview_uk-ua.exe
+
+[Section.0813]
+Licence = Ongekend
+Size = 24.54 MB
+URLDownload = http://download.microsoft.com/download/c/1/0/c10e009e-61e2-4b54-8d21-aff378679527/wordview_nl-nl.exe

Modification de propriÃ©tÃ©s sur base/applications/rapps/rapps/wordview.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/applications/mplay32/lang/ja-JP.rc
===================================================================
--- base/applications/mplay32/lang/ja-JP.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/ja-JP.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ReactOS ãƒžãƒ«ãƒ�ãƒ¡ãƒ‡ã‚£ã‚¢ ãƒ—ãƒ¬ãƒ¼ãƒ¤ãƒ¼"
     IDS_PLAY "å†�ç”Ÿ"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/tr-TR.rc
===================================================================
--- base/applications/mplay32/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/tr-TR.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -11,11 +11,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Ã‡Ä±kÄ±ÅŸ", IDM_EXIT
     END
-    POPUP "&Device"
+    POPUP "&AygÄ±t"
     BEGIN
-        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM "&HusÃ»siyetler", IDM_DEVPROPS
         MENUITEM SEPARATOR
-        MENUITEM "&Volume Control", IDM_VOLUMECTL
+        MENUITEM "&Ses DÃ¼zeyi Denetleyicisi", IDM_VOLUMECTL
     END
     POPUP "&YardÄ±m"
     BEGIN
@@ -35,5 +35,6 @@
     IDS_TOOLTIP_FORWARD "Bir Sonraki"
     IDS_APPTITLE "Ortam OynatÄ±cÄ±sÄ±"
     IDS_PLAY "Ã‡al"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "Bu yanlÄ±ÅŸlÄ±ÄŸÄ±n tanÄ±mÄ± yoktur."
+    IDS_UNKNOWNFILEEXT "Verilen kÃ¼tÃ¼k tÃ¼rÃ¼nden aygÄ±t tÃ¼rÃ¼ belirlenemiyor."
 END
Index: base/applications/mplay32/lang/zh-TW.rc
===================================================================
--- base/applications/mplay32/lang/zh-TW.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/zh-TW.rc	(copie de travail)
@@ -42,4 +42,5 @@
     IDS_APPTITLE "ReactOS å¤šåª’é«”æ’­æ”¾å™¨"
     IDS_PLAY "æ’­æ”¾"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/ru-RU.rc
===================================================================
--- base/applications/mplay32/lang/ru-RU.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/ru-RU.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ÐŸÑ€Ð¾Ð¸Ð³Ñ€Ñ‹Ð²Ð°Ñ‚ÐµÐ»ÑŒ ReactOS"
     IDS_PLAY "Ð’Ð¾Ñ�Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÑ�Ñ‚Ð¸"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/fr-FR.rc
===================================================================
--- base/applications/mplay32/lang/fr-FR.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/fr-FR.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Lire"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/es-ES.rc
===================================================================
--- base/applications/mplay32/lang/es-ES.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/es-ES.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "Reproductor Multimedia de ReactOS"
     IDS_PLAY "Reproducir"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/sq-AL.rc
===================================================================
--- base/applications/mplay32/lang/sq-AL.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/sq-AL.rc	(copie de travail)
@@ -38,4 +38,5 @@
     IDS_APPTITLE "Programi muzikor i ReactOS"
     IDS_PLAY "Fillo"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/de-DE.rc
===================================================================
--- base/applications/mplay32/lang/de-DE.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/de-DE.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Abspielen"
     IDS_DEFAULTMCIERRMSG "FÃ¼r diesen Fehler steht keine Beschreibung zur VerfÃ¼gung"
+    IDS_UNKNOWNFILEEXT "Kann keinen GerÃ¤tetyp aus der angegebenen Dateinamenerweiterung ermitteln."
 END
Index: base/applications/mplay32/lang/bg-BG.rc
===================================================================
--- base/applications/mplay32/lang/bg-BG.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/bg-BG.rc	(copie de travail)
@@ -38,4 +38,5 @@
     IDS_APPTITLE "ÐœÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸Ñ�Ñ‚ Ð²ÑŠÐ·Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ» Ð½Ð° Ð ÐµÐ°ÐºÑ‚ÐžÐ¡"
     IDS_PLAY "Ð’ÑŠÐ·Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/cs-CZ.rc
===================================================================
--- base/applications/mplay32/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/cs-CZ.rc	(copie de travail)
@@ -39,4 +39,5 @@
     IDS_APPTITLE "ReactOS PÅ™ehrÃ¡vaÄ� multimÃ©diÃ­"
     IDS_PLAY "PÅ™ehrÃ¡t"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/zh-CN.rc
===================================================================
--- base/applications/mplay32/lang/zh-CN.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/zh-CN.rc	(copie de travail)
@@ -36,4 +36,5 @@
     IDS_APPTITLE "ReactOS å¤šåª’ä½“æ’­æ”¾å™¨"
     IDS_PLAY "æ’­æ”¾"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/nl-NL.rc
===================================================================
--- base/applications/mplay32/lang/nl-NL.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/nl-NL.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Play"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/uk-UA.rc
===================================================================
--- base/applications/mplay32/lang/uk-UA.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/uk-UA.rc	(copie de travail)
@@ -42,4 +42,5 @@
     IDS_APPTITLE "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ñ‡ ReactOS"
     IDS_PLAY "Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/pl-PL.rc
===================================================================
--- base/applications/mplay32/lang/pl-PL.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/pl-PL.rc	(copie de travail)
@@ -41,4 +41,5 @@
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "OdtwÃ³rz"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/pt-BR.rc
===================================================================
--- base/applications/mplay32/lang/pt-BR.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/pt-BR.rc	(copie de travail)
@@ -36,4 +36,5 @@
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Executar"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/it-IT.rc
===================================================================
--- base/applications/mplay32/lang/it-IT.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/it-IT.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "Riproduttore multimediale ReactOS"
     IDS_PLAY "Riproduci"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/no-NO.rc
===================================================================
--- base/applications/mplay32/lang/no-NO.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/no-NO.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ReactOS Multimedia avspiller"
     IDS_PLAY "Spill"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/en-US.rc
===================================================================
--- base/applications/mplay32/lang/en-US.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/en-US.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Play"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/sk-SK.rc
===================================================================
--- base/applications/mplay32/lang/sk-SK.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/sk-SK.rc	(copie de travail)
@@ -39,4 +39,5 @@
     IDS_APPTITLE "MultimediÃ¡lny prehrÃ¡vaÄ� systÃ©mu ReactOS"
     IDS_PLAY "PrehraÅ¥"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/sv-SE.rc
===================================================================
--- base/applications/mplay32/lang/sv-SE.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/sv-SE.rc	(copie de travail)
@@ -41,4 +41,5 @@
     IDS_APPTITLE "ReactOS Multimediaspelare"
     IDS_PLAY "Play"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/he-IL.rc
===================================================================
--- base/applications/mplay32/lang/he-IL.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/he-IL.rc	(copie de travail)
@@ -34,4 +34,5 @@
     IDS_APPTITLE "× ×’×Ÿ ×”×ž×•×œ×˜×™×ž×“×™×” ×©×œ ReactOS"
     IDS_PLAY "× ×’×Ÿ"
     IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/lang/ro-RO.rc
===================================================================
--- base/applications/mplay32/lang/ro-RO.rc	(rÃ©vision 61927)
+++ base/applications/mplay32/lang/ro-RO.rc	(copie de travail)
@@ -40,4 +40,5 @@
     IDS_APPTITLE "Lector multimedia"
     IDS_PLAY "Lecturare"
     IDS_DEFAULTMCIERRMSG "Nu existÄƒ descriere pentru aceastÄƒ eroare"
+	IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END
Index: base/applications/mplay32/mplay32.c
===================================================================
--- base/applications/mplay32/mplay32.c	(rÃ©vision 61927)
+++ base/applications/mplay32/mplay32.c	(copie de travail)
@@ -216,7 +216,7 @@
 
     DisableMenuItems();
 
-    return TRUE;
+    return 0;
 }
 
 static DWORD
@@ -241,7 +241,6 @@
     dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen);
     if (dwError != 0)
     {
-        ShowMCIError(hwnd, dwError);
         return dwError;
     }
 
@@ -250,7 +249,6 @@
     dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus);
     if (dwError != 0)
     {
-        ShowMCIError(hwnd, dwError);
         return dwError;
     }
 
@@ -287,7 +285,7 @@
 
     EnableMenuItems();
 
-    return TRUE;
+    return 0;
 }
 
 static VOID
@@ -415,7 +413,7 @@
     dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric);
     if (dwError != 0)
     {
-        MessageBox(0, _T("Can't display the device properties!"), NULL, MB_OK);
+        ShowMCIError(hwnd, dwError);
     }
 }
 
@@ -448,7 +446,6 @@
     TCHAR szLocalFileName[MAX_PATH];
     TCHAR szDeviceName[MAX_PATH];
     DWORD dwSize;
-    BOOL IsSupported;
     MCIERROR mciError;
 
     if (lpFileName == NULL)
@@ -470,13 +467,23 @@
 
     dwSize = sizeof(szDeviceName) - 2;
     _tcsnset(szDeviceName, _T('\0'), dwSize / sizeof(TCHAR));
-    IsSupported = IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize);
 
-    if (IsSupported == TRUE)
+    if (!IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize))
     {
-        OpenMciDevice(hwnd, szDeviceName, szLocalFileName);
+        TCHAR szErrorMessage[256];
+
+        LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR));
+        MessageBox(hwnd, szErrorMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION);
+        return;
     }
 
+    mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName);
+    if (mciError != 0)
+    {
+        ShowMCIError(hwnd, mciError);
+        return;
+    }
+
     SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc);
 
     mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
@@ -540,7 +547,7 @@
             TCHAR droppedfile[MAX_PATH];
             
             drophandle = (HDROP)wParam;
-            DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile));
+            DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(TCHAR));
             DragFinish(drophandle);
             PlayFile(hwnd, droppedfile);
             break;
Index: base/applications/mplay32/resource.h
===================================================================
--- base/applications/mplay32/resource.h	(rÃ©vision 61927)
+++ base/applications/mplay32/resource.h	(copie de travail)
@@ -25,6 +25,7 @@
 #define IDS_ALL_TYPES_FILTER 108
 #define IDS_PLAY             109
 #define IDS_DEFAULTMCIERRMSG 110
+#define IDS_UNKNOWNFILEEXT   111
 
 /* Menu */
 #define IDR_MAINMENU 500
Index: base/applications/network/finger/precomp.h
===================================================================
--- base/applications/network/finger/precomp.h	(rÃ©vision 61927)
+++ base/applications/network/finger/precomp.h	(copie de travail)
@@ -1,8 +1,14 @@
+#ifndef _FINGER_PCH_
+#define _FINGER_PCH_
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #define WIN32_NO_STATUS
 #include <windef.h>
 #define _INC_WINDOWS
 #include <winsock2.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "err.h"
+
+#endif /* _FINGER_PCH_ */
Index: base/applications/network/finger/CMakeLists.txt
===================================================================
--- base/applications/network/finger/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/network/finger/CMakeLists.txt	(copie de travail)
@@ -1,14 +1,15 @@
 
 add_definitions(-D__USE_W32_SOCKETS)
 
-add_executable(finger 
+list(APPEND SOURCE
     finger.c
     err.c
     getopt.c
     net.c
-    finger.rc)
+    precomp.h)
 
+add_executable(finger ${SOURCE} finger.rc)
 set_module_type(finger win32cui)
-add_pch(finger precomp.h)
 add_importlibs(finger ws2_32 msvcrt kernel32)
+add_pch(finger precomp.h SOURCE)
 add_cd_file(TARGET finger DESTINATION reactos/system32 FOR all)
Index: base/applications/network/nslookup/CMakeLists.txt
===================================================================
--- base/applications/network/nslookup/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/network/nslookup/CMakeLists.txt	(copie de travail)
@@ -1,10 +1,11 @@
 
-add_executable(nslookup
+list(APPEND SOURCE
     nslookup.c
     utility.c
-    nslookup.rc)
+    nslookup.h)
 
-add_pch(nslookup nslookup.h)
+add_executable(nslookup ${SOURCE} nslookup.rc)
 set_module_type(nslookup win32cui)
 add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
+add_pch(nslookup nslookup.h SOURCE)
 add_cd_file(TARGET nslookup DESTINATION reactos/system32 FOR all)
Index: base/applications/network/nslookup/nslookup.h
===================================================================
--- base/applications/network/nslookup/nslookup.h	(rÃ©vision 61927)
+++ base/applications/network/nslookup/nslookup.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _NSLOOKUP_H
+#define _NSLOOKUP_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -111,3 +114,5 @@
 USHORT  TypeNametoTypeID( PCHAR TypeName );
 PCHAR   ClassIDtoClassName( USHORT ClassID );
 USHORT  ClassNametoClassID( PCHAR ClassName );
+
+#endif /* _NSLOOKUP_H */
Index: base/applications/network/net/net.h
===================================================================
--- base/applications/network/net/net.h	(rÃ©vision 61927)
+++ base/applications/network/net/net.h	(copie de travail)
@@ -1,13 +1,14 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS net command 
- * FILE:            
- * PURPOSE:         
- *
  * PROGRAMMERS:     Magnus Olsen (greatlord@reactos.org)
  */
 
+#ifndef _NET_PCH_
+#define _NET_PCH_
+
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winsvc.h>
@@ -22,3 +23,5 @@
 INT cmdPause(INT argc, WCHAR **argv);
 INT cmdStart(INT argc, WCHAR **argv);
 INT cmdStop(INT argc, WCHAR **argv);
+
+#endif /* _NET_PCH_ */
Index: base/applications/network/net/CMakeLists.txt
===================================================================
--- base/applications/network/net/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/network/net/CMakeLists.txt	(copie de travail)
@@ -8,11 +8,11 @@
     cmdHelpMsg.c
     cmdPause.c
     cmdContinue.c
-    help.c)
+    help.c
+    net.h)
 
 add_executable(net ${SOURCE})
-
 set_module_type(net win32cui UNICODE)
-add_pch(net net.h)
 add_importlibs(net advapi32 msvcrt kernel32)
+add_pch(net net.h SOURCE)
 add_cd_file(TARGET net DESTINATION reactos/system32 FOR all)
Index: base/applications/network/net/cmdHelpMsg.c
===================================================================
--- base/applications/network/net/cmdHelpMsg.c	(rÃ©vision 61927)
+++ base/applications/network/net/cmdHelpMsg.c	(copie de travail)
@@ -8,8 +8,9 @@
  */
 
 #include "net.h"
-#include "stdlib.h"
 
+#include <stdlib.h>
+
 INT cmdHelpMsg(INT argc, WCHAR **argv)
 {
     LPWSTR endptr;
Index: base/applications/network/ftp/CMakeLists.txt
===================================================================
--- base/applications/network/ftp/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/network/ftp/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 add_definitions(-Dlint)
 
-add_executable(ftp
+list(APPEND SOURCE
     cmds.c
     cmdtab.c
     domacro.c
@@ -9,11 +9,12 @@
     ftp.c
     main.c
     ruserpass.c
-    ftp.rc)
+    precomp.h)
 
+add_executable(ftp ${SOURCE} ftp.rc)
 set_module_type(ftp win32cui)
 add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32)
-add_pch(ftp precomp.h)
+add_pch(ftp precomp.h SOURCE)
 
 if(MSVC)
     target_link_libraries(ftp oldnames)
Index: base/applications/network/ftp/cmds.c
===================================================================
--- base/applications/network/ftp/cmds.c	(rÃ©vision 61927)
+++ base/applications/network/ftp/cmds.c	(copie de travail)
@@ -85,18 +85,11 @@
 	}
 	host = hookup(argv[1], portnum);
 	if (host) {
-#if defined(unix) && NBBY == 8
 		int overbose;
-#endif
 		connected = 1;
 		if (autologin)
 			(void) login(argv[1]);
 
-#if defined(unix) && NBBY == 8
-/*
- * this ifdef is to keep someone form "porting" this to an incompatible
- * system and not checking this out. This way they have to think about it.
- */
 		overbose = verbose;
 		if (debug == 0)
 			verbose = -1;
@@ -119,7 +112,7 @@
 				*cp = c;
 		}
 		if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) {
-			setbinary();
+			setbinary(0, NULL);
 			/* allbinary = 1; this violates the RFC */
 			if (overbose)
 			    printf("Using %s mode to transfer files.\n",
@@ -130,7 +123,6 @@
 "Remember to set tenex mode when transfering binary files from this machine.\n");
 		}
 		verbose = overbose;
-#endif /* unix */
 	}
 	(void) fflush(stdout);
 }
Index: base/applications/network/ftp/precomp.h
===================================================================
--- base/applications/network/ftp/precomp.h	(rÃ©vision 61927)
+++ base/applications/network/ftp/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _FTP_H
+#define _FTP_H
+
 #include <sys/stat.h>
 
 #ifndef _WIN32
@@ -27,3 +30,5 @@
 #include <stdlib.h>
 
 #include "ftp_var.h"
+
+#endif /* _FTP_H */
Index: base/applications/network/telnet/precomp.h
===================================================================
--- base/applications/network/telnet/precomp.h	(rÃ©vision 61927)
+++ base/applications/network/telnet/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _TELNET_PCH_
+#define _TELNET_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -27,3 +30,5 @@
 #include "src/tnclass.h"
 #include "src/tnmisc.h"
 #include "src/tncon.h"
+
+#endif /* _TELNET_PCH_ */
Index: base/applications/network/telnet/CMakeLists.txt
===================================================================
--- base/applications/network/telnet/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/network/telnet/CMakeLists.txt	(copie de travail)
@@ -3,7 +3,7 @@
 
 add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 
-add_executable(telnet
+list(APPEND SOURCE
     src/ansiprsr.cpp
     src/keytrans.cpp
     src/tcharmap.cpp
@@ -23,13 +23,14 @@
     src/tscript.cpp
     src/tscroll.cpp
     src/ttelhndl.cpp
-    telnet.rc)
+    precomp.h)
 
+if(NOT MSVC)
+    add_compile_flags_language("-Wno-narrowing" "CXX")
+endif()
+
+add_executable(telnet ${SOURCE} telnet.rc)
 set_module_type(telnet win32cui)
-add_pch(telnet src/precomp.h)
 add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll)
+add_pch(telnet precomp.h SOURCE)
 add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all)
-
-if(NOT MSVC)
-    add_compile_flags_language("-Wno-narrowing" "CXX")
-endif()
Index: base/applications/notepad/rsrc.rc
===================================================================
--- base/applications/notepad/rsrc.rc	(rÃ©vision 61927)
+++ base/applications/notepad/rsrc.rc	(copie de travail)
@@ -115,6 +115,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/sl-SI.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
@@ -124,9 +127,6 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
Index: base/applications/notepad/CMakeLists.txt
===================================================================
--- base/applications/notepad/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/notepad/CMakeLists.txt	(copie de travail)
@@ -4,10 +4,10 @@
     main.c
     settings.c
     text.c
-    rsrc.rc)
+    notepad.h)
 
-add_executable(notepad ${SOURCE})
+add_executable(notepad ${SOURCE} rsrc.rc)
 set_module_type(notepad win32gui UNICODE)
 add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32)
-add_pch(notepad notepad.h)
+add_pch(notepad notepad.h SOURCE)
 add_cd_file(TARGET notepad DESTINATION reactos/system32 FOR all)
Index: base/applications/notepad/notepad.h
===================================================================
--- base/applications/notepad/notepad.h	(rÃ©vision 61927)
+++ base/applications/notepad/notepad.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _NOTEPAD_H
+#define _NOTEPAD_H
+
 #ifndef STRSAFE_NO_DEPRECATE
 #define STRSAFE_NO_DEPRECATE
 #endif
@@ -16,3 +19,5 @@
 
 #include "main.h"
 #include "dialog.h"
+
+#endif /* _NOTEPAD_H */
Index: base/applications/notepad/lang/tr-TR.rc
===================================================================
--- base/applications/notepad/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/notepad/lang/tr-TR.rc	(copie de travail)
@@ -50,12 +50,12 @@
         MENUITEM "G&it...\tCtrl+G", CMD_GOTO
         MENUITEM SEPARATOR
         MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", CMD_SELECT_ALL
-        MENUITEM "&Åžimdiki ZamanÄ± Koy\tF5", CMD_TIME_DATE
+        MENUITEM "&Åžimdiki ZamÃ¢nÄ± Koy\tF5", CMD_TIME_DATE
     END
     POPUP "&BiÃ§im"
     BEGIN
-        MENUITEM "&YataÃ§ KaydÄ±r", CMD_WRAP
-        MENUITEM "Y&azÄ± TÃ¼rÃ¼...", CMD_FONT
+        MENUITEM "&Uzun YataÃ§larÄ± KaydÄ±r", CMD_WRAP
+        MENUITEM "&YazÄ± TÃ¼rÃ¼...", CMD_FONT
     END
     POPUP "&GÃ¶rÃ¼nÃ¼m"
     BEGIN
@@ -63,9 +63,9 @@
     END
     POPUP "&YardÄ±m"
     BEGIN
-        MENUITEM "&YardÄ±m KonularÄ±", CMD_HELP_CONTENTS
-        MENUITEM "Y&ardÄ±mda Ara", CMD_HELP_SEARCH
-        MENUITEM "Ya&rdÄ±m Ä°Ã§in YardÄ±m", CMD_HELP_ON_HELP
+        MENUITEM "&Ä°Ã§indekiler", CMD_HELP_CONTENTS
+        MENUITEM "&Ara", CMD_HELP_SEARCH
+        MENUITEM "&YardÄ±m Ä°Ã§in YardÄ±m", CMD_HELP_ON_HELP
         MENUITEM SEPARATOR
         MENUITEM "&Bilgi", CMD_ABOUT
         MENUITEM "&HakkÄ±nda", CMD_ABOUT_WINE
@@ -78,22 +78,22 @@
 FONT 8, "MS Shell Dlg"
 CAPTION "Sayfa YapÄ±sÄ±"
 BEGIN
-    LTEXT "Ãœst Bilgi:", 0x140, 10, 07, 40, 15
+    LTEXT "&Ãœst Bilgi:", 0x140, 10, 07, 40, 15
     EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Alt Bilgi:", 0x142, 10, 24, 40, 15
+    LTEXT "&Alt Bilgi:", 0x142, 10, 24, 40, 15
     EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
     GROUPBOX "KÄ±yÄ± PayÄ±:", 0x144, 10, 43, 160, 45
-    LTEXT "Sol:", 0x145, 20, 55, 30, 10, WS_CHILD
+    LTEXT "&Sol:", 0x145, 20, 55, 30, 10, WS_CHILD
     EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Ãœst:", 0x148, 20, 73, 30, 10, WS_CHILD
+    LTEXT "Ãœs&t:", 0x148, 20, 73, 30, 10, WS_CHILD
     EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "SaÄŸ:", 0x14B, 100, 55, 30, 10, WS_CHILD
+    LTEXT "Sa&ÄŸ:", 0x14B, 100, 55, 30, 10, WS_CHILD
     EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Alt:", 0x14E, 100, 73, 30, 10, WS_CHILD
+    LTEXT "A&lt:", 0x14E, 100, 73, 30, 10, WS_CHILD
     EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 180, 3, 40, 15, WS_TABSTOP
     PUSHBUTTON "Ä°ptal", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "YardÄ±m", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    PUSHBUTTON "&YardÄ±m", IDHELP, 180, 39, 40, 15, WS_TABSTOP
 END
 
 /* Dialog 'Encoding' */
@@ -125,9 +125,9 @@
 CAPTION "Metin DÃ¼zenleyicisi HakkÄ±nda"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Metin DÃ¼zenleyicisi - SÃ¼rÃ¼m: 1.0\r\nTelif HaklarÄ±: 1997,98 Marcel Baur (mbaur@g26.ethz.ch)\r\n               2000 Mike McCormack (Mike_McCormack@looksmart.com.au)\r\n               2002 Sylvain Petreolle (spetreolle@yahoo.fr)\r\n               2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39
+    CONTROL "Metin DÃ¼zenleyicisi - SÃ¼rÃ¼m: 1.0\r\nTelif HaklarÄ±:\r\n1997,98 - Marcel Baur (mbaur@g26.ethz.ch)\r\n2000 - Mike McCormack (Mike_McCormack@looksmart.com.au)\r\n2002 - Sylvain Petreolle (spetreolle@yahoo.fr)\r\n2002 - Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39
     CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11
-    DEFPUSHBUTTON "Tamam", IDOK, 114, 149, 44, 15, WS_GROUP
+    DEFPUSHBUTTON "Kapat", IDOK, 114, 149, 44, 15, WS_GROUP
     ICON IDI_NPICON, -1, 12, 9, 20, 30
     EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL
 END
@@ -134,7 +134,7 @@
 
 STRINGTABLE
 BEGIN
-    STRING_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼rdÃ¼r, yÃ¢ni bu yazÄ±lÄ±mÄ± Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±nladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n 2. sÃ¼rÃ¼mÃ¼ veyÃ¢ daha sonraki sÃ¼rÃ¼mleri altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bilhassa SATILABÄ°LÄ°RLÄ°K ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUK aÃ§Ä±sÄ±ndan olmak Ã¼zere bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retine de iye olmanÄ±z gerekir, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± A.Åž.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    STRING_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r; bu yazÄ±lÄ±mÄ±, Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±mladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n, 2. sÃ¼rÃ¼mÃ¼nÃ¼n ya da daha sonraki herhangi bir sÃ¼rÃ¼mÃ¼nÃ¼n (OrasÄ± size baÄŸlÄ±.) koÅŸullarÄ± altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLÄ°ÄžÄ°N ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN  demek istenilen garantisi bile. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retini almÄ±ÅŸ olmalÄ±sÄ±nÄ±z, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
@@ -152,18 +152,18 @@
     STRING_UNTITLED "AdsÄ±z"
     STRING_ALL_FILES "TÃ¼m KÃ¼tÃ¼kler (*.*)"
     STRING_TEXT_FILES_TXT "Metin Belgeleri (*.txt)"
-    STRING_TOOLARGE "%s kÃ¼tÃ¼ÄŸÃ¼ Metin DÃ¼zenleyicisi iÃ§in Ã§ok bÃ¼yÃ¼k. Bu kÃ¼tÃ¼ÄŸÃ¼ dÃ¼zenlemek iÃ§in baÅŸka bir dÃ¼zenleyici kullanÄ±nÄ±z."
-    STRING_NOTEXT "HiÃ§bir ÅŸey yazmadÄ±nÄ±z. BirÅŸeyler yazÄ±p yeniden deneyiniz."
+    STRING_TOOLARGE "%s kÃ¼tÃ¼ÄŸÃ¼ Metin DÃ¼zenleyicisi iÃ§in Ã§ok bÃ¼yÃ¼k. BaÅŸka bir dÃ¼zenleyici kullanÄ±nÄ±z."
+    STRING_NOTEXT "HiÃ§bir metin girmediniz. BirÅŸeyler yazÄ±p yeniden deneyiniz."
     STRING_DOESNOTEXIST "%s kÃ¼tÃ¼ÄŸÃ¼ yok. Yeni bir kÃ¼tÃ¼k oluÅŸturmak ister misiniz?"
-    STRING_NOTSAVED "%s kÃ¼tÃ¼ÄŸÃ¼ndeki metin deÄŸiÅŸtirilmiÅŸ. DeÄŸiÅŸiklikleri kaydetmek istiyor musunuz?"
-    STRING_NOTFOUND "%s kÃ¼tÃ¼ÄŸÃ¼ bulunamadÄ±."
-    STRING_OUT_OF_MEMORY "Bu iÅŸlemi bitirmek iÃ§in gereken bellek yetersiz. KullanÄ±labilen belleÄŸi arttÄ±rmak iÃ§in bir veyÃ¢ daha Ã§ok uygulamadan Ã§Ä±kÄ±p bu iÅŸlemi yeniden deneyiniz."
-    STRING_CANNOTFIND "%s kÃ¼tÃ¼ÄŸÃ¼ bulunamadÄ±."
+    STRING_NOTSAVED "%s kÃ¼tÃ¼ÄŸÃ¼ deÄŸiÅŸtirilmiÅŸ. DeÄŸiÅŸiklikleri kaydetmek ister misiniz?"
+    STRING_NOTFOUND "%s bulunamadÄ±."
+    STRING_OUT_OF_MEMORY "Bu iÅŸi bitirmek iÃ§in bellek yetersiz. KullanÄ±labilen belleÄŸi arttÄ±rmak iÃ§in bir ya da daha Ã§ok uygulama kapatÄ±nÄ±z."
+    STRING_CANNOTFIND "%s bulunamadÄ±."
     STRING_ANSI "ANSI"
-    STRING_UNICODE "Evrenlik DÃ¼zgÃ¼"
-    STRING_UNICODE_BE "Evrenlik DÃ¼zgÃ¼ (BÃ¼yÃ¼k Sonlu)"
+    STRING_UNICODE "Evrenlik Kod"
+    STRING_UNICODE_BE "Evrenlik Kod (BÃ¼yÃ¼k Sonlu)"
     STRING_UTF8 "UTF-8"
-    STRING_CRLF "Pencereler (CR + LF)"
+    STRING_CRLF "Windows (CR + LF)"
     STRING_LF "UNIX (LF)"
     STRING_CR "Mac (CR)"
     STRING_LINE_COLUMN "%d. YataÃ§, %d. DikeÃ§"
Index: base/applications/magnify/lang/tr-TR.rc
===================================================================
--- base/applications/magnify/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/magnify/lang/tr-TR.rc	(copie de travail)
@@ -10,7 +10,7 @@
 
 IDC_MAGNIFIER MENU
 BEGIN
-    POPUP "&SeÃ§ke"
+    POPUP "&KÃ¼tÃ¼k"
     BEGIN
         MENUITEM "&Ã‡Ä±kÄ±ÅŸ", IDM_EXIT
         MENUITEM "&SeÃ§enekler...", IDM_OPTIONS
@@ -53,7 +53,7 @@
             BS_AUTOCHECKBOX | WS_TABSTOP, 18, 54, 114, 10
     CONTROL "&Metin DÃ¼zenlemesini Ä°zle", IDC_FOLLOWTEXTEDITINGCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 18, 66, 114, 10
-    CONTROL "&Renkleri Ters Ã‡evir", IDC_INVERTCOLORSCHECK, "Button",
+    CONTROL "&Renkleri Evir", IDC_INVERTCOLORSCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 18, 102, 114, 10
     CONTROL "&Simge Durumunda BaÅŸlat", IDC_STARTMINIMIZEDCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 18, 114, 114, 10
@@ -68,8 +68,8 @@
 BEGIN
     DEFPUSHBUTTON "Tamam", IDOK, 193, 76, 50, 14
     ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20
-    LTEXT "BÃ¼yÃ¼teÃ§, hafif gÃ¶rme engelli kullanÄ±cÄ±larÄ±n en az Ã§aba harcamalarÄ± iÃ§in tasarlanmÄ±ÅŸtÄ±r. GÃ¶rme engelli bir Ã§ok kullanÄ±cÄ±, gÃ¼nlÃ¼k kullanÄ±m iÃ§in bu aracÄ± kullanmaya gereksinim duyacaktÄ±r.", IDC_STATIC, 36, 7, 207, 33
-    CONTROL "Bunu bir daha gÃ¶sterme.", IDC_SHOWWARNINGCHECK, "Button",
+    LTEXT "BÃ¼yÃ¼teÃ§, yeÄŸni gÃ¶rme bozukluÄŸu olan kullanÄ±cÄ±lara en yÃ¼ksek dÃ¼zeydeki iÅŸlevliliÄŸi saÄŸlamak iÃ§in tasarlanmÄ±ÅŸtÄ±r. GÃ¶rme bozukluÄŸu olan birÃ§ok kullanÄ±cÄ±, gÃ¼nlÃ¼k kullanÄ±m iÃ§in yÃ¼ksek iÅŸlevlikli bir bÃ¼yÃ¼tme aracÄ±na gereksinim duyacaktÄ±r.", IDC_STATIC, 36, 7, 207, 33
+    CONTROL "Bu iletiyi bir daha gÃ¶sterme.", IDC_SHOWWARNINGCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
Index: base/applications/magnify/magnifier.h
===================================================================
--- base/applications/magnify/magnifier.h	(rÃ©vision 61927)
+++ base/applications/magnify/magnifier.h	(copie de travail)
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _MAGNIFIER_H_
+#define _MAGNIFIER_H_
+
 #include <stdarg.h>
 #include <windef.h>
 
@@ -35,3 +38,5 @@
 
 void LoadSettings(void);
 void SaveSettings(void);
+
+#endif /* _MAGNIFIER_H_ */
Index: base/applications/magnify/CMakeLists.txt
===================================================================
--- base/applications/magnify/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/magnify/CMakeLists.txt	(copie de travail)
@@ -1,10 +1,11 @@
 
-add_executable(magnify
+list(APPEND SOURCE
     magnifier.c
     settings.c
-    magnify.rc)
+    magnifier.h)
 
-add_pch(magnify magnifier.h)
+add_executable(magnify ${SOURCE} magnify.rc)
 set_module_type(magnify win32gui)
 add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32)
+add_pch(magnify magnifier.h SOURCE)
 add_cd_file(TARGET magnify DESTINATION reactos/system32 FOR all)
Index: base/applications/magnify/magnify.rc
===================================================================
--- base/applications/magnify/magnify.rc	(rÃ©vision 61927)
+++ base/applications/magnify/magnify.rc	(copie de travail)
@@ -60,6 +60,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
@@ -66,9 +69,6 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: base/applications/games/solitaire/rsrc.rc
===================================================================
--- base/applications/games/solitaire/rsrc.rc	(rÃ©vision 61927)
+++ base/applications/games/solitaire/rsrc.rc	(copie de travail)
@@ -78,6 +78,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
@@ -87,9 +90,6 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: base/applications/games/solitaire/CMakeLists.txt
===================================================================
--- base/applications/games/solitaire/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/games/solitaire/CMakeLists.txt	(copie de travail)
@@ -3,14 +3,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
 
-add_executable(sol
+list(APPEND SOURCE
     solcreate.cpp
     solgame.cpp
     solitaire.cpp
-    rsrc.rc)
+    solitaire.h)
 
+add_executable(sol ${SOURCE} rsrc.rc)
 target_link_libraries(sol cardlib)
-add_pch(sol solitaire.h)
 set_module_type(sol win32gui UNICODE)
 add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32)
+add_pch(sol solitaire.h SOURCE)
 add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all)
Index: base/applications/games/solitaire/lang/tr-TR.rc
===================================================================
--- base/applications/games/solitaire/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/games/solitaire/lang/tr-TR.rc	(copie de travail)
@@ -16,7 +16,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "KÃ¢ÄŸÄ±tlar", -1, 7, 7, 90, 40
-    AUTORADIOBUTTON "T&ekli Ã‡ek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Tekli Ã‡ek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&ÃœÃ§lÃ¼ Ã‡ek", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
     AUTOCHECKBOX "&SÃ¼reyi GÃ¶ster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
     AUTOCHECKBOX "&Durum Ã‡ubuÄŸu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
@@ -25,7 +25,7 @@
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 186, 104
-CAPTION "Deste SeÃ§"
+CAPTION "KÃ¢ÄŸÄ±t ArkalÄ±ÄŸÄ± SeÃ§me"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -51,9 +51,9 @@
 BEGIN
     IDS_SOL_NAME "Solitaire"
     IDS_SOL_ABOUT "Solitaire, J Brown eliyle yapÄ±lmÄ±ÅŸtÄ±r.\n\nCardLib sÃ¼rÃ¼mÃ¼: 1.0"
-    IDS_SOL_QUIT "Bu oyundan Ã§Ä±kmak ister misiniz?"
+    IDS_SOL_QUIT "Bu oyundan Ã§Ä±kÄ±lsÄ±n mÄ±?"
     IDS_SOL_WIN "Tebrikler, kazandÄ±nÄ±z!"
-    IDS_SOL_DEAL "Tekrar daÄŸÄ±tÄ±lsÄ±n mÄ±?"
+    IDS_SOL_DEAL "Yine daÄŸÄ±tÄ±lsÄ±n mÄ±?"
 END
 
 /* Menus */
@@ -71,7 +71,7 @@
     END
     POPUP "&YardÄ±m"
     BEGIN
-        MENUITEM "&YardÄ±m KonularÄ±\tF1", IDM_HELP_CONTENTS
+        MENUITEM "&Ä°Ã§indekiler\tF1", IDM_HELP_CONTENTS
         MENUITEM "&HakkÄ±nda", IDM_HELP_ABOUT
     END
 END
Index: base/applications/games/solitaire/solitaire.h
===================================================================
--- base/applications/games/solitaire/solitaire.h	(rÃ©vision 61927)
+++ base/applications/games/solitaire/solitaire.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SOL_PCH_
+#define _SOL_PCH_
+
 #include <cardlib.h>
 
 extern CardWindow SolWnd;
@@ -52,3 +55,5 @@
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
+
+#endif /* _SOL_PCH_ */
Index: base/applications/games/spider/rsrc.rc
===================================================================
--- base/applications/games/spider/rsrc.rc	(rÃ©vision 61927)
+++ base/applications/games/spider/rsrc.rc	(copie de travail)
@@ -57,6 +57,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
@@ -63,9 +66,6 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: base/applications/games/spider/spider.h
===================================================================
--- base/applications/games/spider/spider.h	(rÃ©vision 61927)
+++ base/applications/games/spider/spider.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SPIDER_PCH_
+#define _SPIDER_PCH_
+
 #include <cardlib.h>
 
 #include "resource.h"
@@ -39,3 +42,5 @@
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
+
+#endif /* _SPIDER_PCH_ */
Index: base/applications/games/spider/CMakeLists.txt
===================================================================
--- base/applications/games/spider/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/games/spider/CMakeLists.txt	(copie de travail)
@@ -5,13 +5,14 @@
     ${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib
     ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_executable(spider
+list(APPEND SOURCE
     spider.cpp
     spigame.cpp
-    rsrc.rc)
+    spider.h)
 
+add_executable(spider ${SOURCE} rsrc.rc)
 target_link_libraries(spider cardlib)
-add_pch(spider spider.h)
+add_pch(spider spider.h SOURCE)
 set_module_type(spider win32gui UNICODE)
 add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all)
Index: base/applications/games/spider/lang/tr-TR.rc
===================================================================
--- base/applications/games/spider/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/games/spider/lang/tr-TR.rc	(copie de travail)
@@ -11,7 +11,7 @@
 /* Dialogs */
 
 IDD_CARDBACK DIALOGEX 6, 6, 186, 104
-CAPTION "Deste SeÃ§"
+CAPTION "KÃ¢ÄŸÄ±t ArkalÄ±ÄŸÄ± SeÃ§me"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -49,9 +49,9 @@
 BEGIN
     IDS_SPI_NAME "Ã–rÃ¼mcek Solitaire"
     IDS_SPI_ABOUT "Ã–rÃ¼mcek Solitaire, Gregor Schneider eliyle yapÄ±lmÄ±ÅŸtÄ±r.\n\nCardLib sÃ¼rÃ¼mÃ¼: 1.0"
-    IDS_SPI_QUIT "Bu oyundan Ã§Ä±kmak ister misiniz?"
+    IDS_SPI_QUIT "Bu oyundan Ã§Ä±kÄ±lsÄ±n mÄ±?"
     IDS_SPI_WIN "Tebrikler, kazandÄ±nÄ±z!"
-    IDS_SPI_DEAL "Tekrar daÄŸÄ±tÄ±lsÄ±n mÄ±?"
+    IDS_SPI_DEAL "Yine daÄŸÄ±tÄ±lsÄ±n mÄ±?"
 END
 
 /* Menus */
@@ -68,7 +68,7 @@
     END
     POPUP "&YardÄ±m"
     BEGIN
-        MENUITEM "&YardÄ±m KonularÄ±\tF1", IDM_HELP_CONTENTS
+        MENUITEM "&Ä°Ã§indekiler\tF1", IDM_HELP_CONTENTS
         MENUITEM "&HakkÄ±nda", IDM_HELP_ABOUT
     END
 END
Index: base/applications/games/winmine/lang/tr-TR.rc
===================================================================
--- base/applications/games/winmine/lang/tr-TR.rc	(rÃ©vision 61927)
+++ base/applications/games/winmine/lang/tr-TR.rc	(copie de travail)
@@ -5,22 +5,22 @@
 STRINGTABLE
 BEGIN
     IDS_APPNAME "MayÄ±n TarlasÄ±"
-    IDS_NOBODY "HiÃ§ kimse"
-    IDS_ABOUT "Bu oyun, Joshua Thielen eliyle, 2000 yÄ±lÄ±nda yapÄ±lmÄ±ÅŸtÄ±r."
+    IDS_NOBODY "HiÃ§ Kimse"
+    IDS_ABOUT "Telif HakkÄ±: 2000 - Joshua Thielen"
 END
 
 MENU_WINEMINE MENU
 BEGIN
-    POPUP "&Oyun"
+    POPUP "&SeÃ§enekler"
     BEGIN
         MENUITEM "&Yeni Oyun\tF2", IDM_NEW
         MENUITEM SEPARATOR
-        MENUITEM "Ä°&mleme", IDM_MARKQ
+        MENUITEM "&Soru Ä°miyle Ä°mleme", IDM_MARKQ
         MENUITEM SEPARATOR
-        MENUITEM "&BaÅŸlangÄ±Ã§", IDM_BEGINNER
-        MENUITEM "&Orta", IDM_ADVANCED
-        MENUITEM "&Ä°leri", IDM_EXPERT
-        MENUITEM "&DeÄŸiÅŸik...", IDM_CUSTOM
+        MENUITEM "&AcemÃ®", IDM_BEGINNER
+        MENUITEM "&GeliÅŸmiÅŸ", IDM_ADVANCED
+        MENUITEM "&Usta", IDM_EXPERT
+        MENUITEM "&HusÃ»sÃ®...", IDM_CUSTOM
         MENUITEM SEPARATOR
         MENUITEM "&Ã‡Ä±kÄ±ÅŸ\tAlt+X", IDM_EXIT
     END
@@ -37,9 +37,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "En KÄ±sa SÃ¼reler", -1, 10, 10, 140, 45
-    LTEXT "BaÅŸlangÄ±Ã§", -1, 20, 20, 40, 8
-    LTEXT "Orta", -1, 20, 30, 40, 8
-    LTEXT "Ä°leri", -1, 20, 40, 40, 8
+    LTEXT "AcemÃ®", -1, 20, 20, 40, 8
+    LTEXT "GeliÅŸmiÅŸ", -1, 20, 30, 40, 8
+    LTEXT "Usta", -1, 20, 40, 40, 8
     LTEXT "999", IDC_TIME1, 70, 20, 15, 8
     LTEXT "999", IDC_TIME2, 70, 30, 15, 8
     LTEXT "999", IDC_TIME3, 70, 40, 15, 8
@@ -54,7 +54,7 @@
 CAPTION "Tebrikler!"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "AdÄ±nÄ±zÄ± Giriniz:", -1, 10, 10, 150, 10
+    LTEXT "AdÄ±nÄ±zÄ± giriniz.", -1, 10, 10, 150, 10
     EDITTEXT IDC_EDITNAME, 25, 20, 110, 12
     DEFPUSHBUTTON "Tamam", IDOK, 60, 40, 40, 15
 END
@@ -61,7 +61,7 @@
 
 DLG_CUSTOM DIALOGEX 0, 0, 100, 100
 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "DeÄŸiÅŸik"
+CAPTION "HusÃ»sÃ®"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&YataÃ§ SayÄ±sÄ±:", -1, 5, 5, 30, 10
Index: base/applications/games/winmine/main.h
===================================================================
--- base/applications/games/winmine/main.h	(rÃ©vision 61927)
+++ base/applications/games/winmine/main.h	(copie de travail)
@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
+#ifndef _WINMINE_H_
+#define _WINMINE_H_
 
 #include <stdarg.h>
 
@@ -136,5 +137,4 @@
 
 INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
 
-
-/* end of header */
+#endif /* _WINMINE_H_ */
Index: base/applications/games/winmine/rsrc.rc
===================================================================
--- base/applications/games/winmine/rsrc.rc	(rÃ©vision 61927)
+++ base/applications/games/winmine/rsrc.rc	(copie de travail)
@@ -111,6 +111,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/sl-SI.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
@@ -117,9 +120,6 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: base/applications/games/winmine/CMakeLists.txt
===================================================================
--- base/applications/games/winmine/CMakeLists.txt	(rÃ©vision 61927)
+++ base/applications/games/winmine/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,14 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-add_executable(winmine
+list(APPEND SOURCE
     main.c
     dialog.c
-    rsrc.rc)
+    main.h)
 
+add_executable(winmine ${SOURCE} rsrc.rc)
 set_module_type(winmine win32gui)
 target_link_libraries(winmine wine)
 add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)
+add_pch(winmine main.h SOURCE)
 add_cd_file(TARGET winmine DESTINATION reactos/system32 FOR all)
Index: base/shell/explorer-new/precomp.h
===================================================================
--- base/shell/explorer-new/precomp.h	(rÃ©vision 61927)
+++ base/shell/explorer-new/precomp.h	(copie de travail)
@@ -23,6 +23,7 @@
 #include <shlguid_undoc.h>
 #include <uxtheme.h>
 #include <strsafe.h>
+#include <undocuser.h>
 
 #include "tmschema.h"
 #include "resource.h"
@@ -167,6 +168,15 @@
                        IN LPCTSTR lpValue);
 
 /*
+ *  rshell.c
+ */
+
+HRESULT
+CStartMenu_Constructor(
+    REFIID riid,
+    void **ppv);
+
+/*
  * traywnd.c
  */
 
Index: base/shell/explorer-new/startmnu.c
===================================================================
--- base/shell/explorer-new/startmnu.c	(rÃ©vision 61927)
+++ base/shell/explorer-new/startmnu.c	(copie de travail)
@@ -552,7 +552,15 @@
                                           TEXT("Advanced"),
                                           TEXT("StartMenuLogoff")));
 
-    /* FIXME: Favorites */
+    /* Favorites */
+    if (!GetExplorerRegValueSet(HKEY_CURRENT_USER,
+                                TEXT("Advanced"),
+                                TEXT("StartMenuFavorites")))
+    {
+        DeleteMenu(hMenu,
+                   IDM_FAVORITES,
+                   MF_BYCOMMAND);
+    }
 
     /* Documents */
     if (SHRestricted(REST_NORECENTDOCSMENU))
@@ -848,11 +856,15 @@
     if (pSms == NULL)
         return NULL;
 
+#if 0
     hr = CoCreateInstance(&CLSID_StartMenu,
                           NULL,
                           CLSCTX_INPROC_SERVER,
                           &IID_IMenuPopup,
                           (PVOID *)&pMp);
+#else
+    hr = CStartMenu_Constructor(&IID_IMenuPopup,(PVOID *)&pMp);
+#endif
     if (FAILED(hr))
     {
         DbgPrint("CoCreateInstance failed: %x\n", hr);
Index: base/shell/explorer-new/trayntfy.c
===================================================================
--- base/shell/explorer-new/trayntfy.c	(rÃ©vision 61927)
+++ base/shell/explorer-new/trayntfy.c	(copie de travail)
@@ -1717,6 +1717,8 @@
                 TrayNotifyWnd_UpdateTheme(This);
                 return 0;
             case WM_ERASEBKGND:
+                if (!This->TrayTheme)
+                    goto HandleDefaultMessage;
                 return TrayNotifyWnd_DrawBackground(hwnd,
                                                     uMsg,
                                                     wParam,
Index: base/shell/explorer-new/taskband.c
===================================================================
--- base/shell/explorer-new/taskband.c	(rÃ©vision 61927)
+++ base/shell/explorer-new/taskband.c	(copie de travail)
@@ -596,18 +596,15 @@
                                        IN HWND hWnd)
 {
     ITaskBandImpl *This = ITaskBandImpl_from_IWinEventHandler(iface);
-    HRESULT hRet = S_OK;
 
-    if (This->hWnd != hWnd ||
-        !IsChild(This->hWnd,
-                 hWnd))
+    if (This->hWnd == hWnd ||
+        IsChild(This->hWnd, hWnd))
     {
-        hRet = S_FALSE;
+        DbgPrint("ITaskBand::ContainsWindow(0x%p) returns S_OK\n", hWnd);
+        return S_OK;
     }
 
-    DbgPrint("ITaskBand::ContainsWindow(0x%p) returns %s\n", hWnd, hRet == S_OK ? "S_OK" : "S_FALSE");
-
-    return hRet;
+    return S_FALSE;
 }
 
 static const IWinEventHandlerVtbl IWinEventHandlerImpl_Vtbl =
Index: base/shell/explorer-new/traywnd.c
===================================================================
--- base/shell/explorer-new/traywnd.c	(rÃ©vision 61927)
+++ base/shell/explorer-new/traywnd.c	(copie de travail)
@@ -2072,6 +2072,45 @@
     CloseHandle(CreateThread(NULL, 0, RunFileDlgThread, This, 0, NULL));
 }
 
+static void PopupStartMenu(IN ITrayWindowImpl *This)
+{
+    if (This->StartMenuPopup != NULL)
+    {
+        POINTL pt;
+        RECTL rcExclude;
+        DWORD dwFlags = 0;
+
+        if (GetWindowRect(This->hwndStart,
+            (RECT*) &rcExclude))
+        {
+            switch (This->Position)
+            {
+            case ABE_BOTTOM:
+                pt.x = rcExclude.left;
+                pt.y = rcExclude.top;
+                dwFlags |= MPPF_BOTTOM;
+                break;
+            case ABE_TOP:
+            case ABE_LEFT:
+                pt.x = rcExclude.left;
+                pt.y = rcExclude.bottom;
+                dwFlags |= MPPF_TOP | MPPF_ALIGN_RIGHT;
+                break;
+            case ABE_RIGHT:
+                pt.x = rcExclude.right;
+                pt.y = rcExclude.bottom;
+                dwFlags |= MPPF_TOP | MPPF_ALIGN_LEFT;
+                break;
+            }
+
+            IMenuPopup_Popup(This->StartMenuPopup,
+                &pt,
+                &rcExclude,
+                dwFlags);
+        }
+    }
+}
+
 static LRESULT CALLBACK
 TrayWndProc(IN HWND hwnd,
             IN UINT uMsg,
@@ -2550,49 +2589,28 @@
                 break;
 
             case TWM_OPENSTARTMENU:
-                SendMessage(This->hWnd, WM_COMMAND, MAKEWPARAM(BN_CLICKED, IDC_STARTBTN), (LPARAM)This->hwndStart);
+            {
+                HWND hwndStartMenu;
+                HRESULT hr = IUnknown_GetWindow((IUnknown*)This->StartMenuPopup, &hwndStartMenu);
+                if (FAILED(hr))
+                    break;
+
+                if (IsWindowVisible(hwndStartMenu))
+                    SetWindowPos(hwndStartMenu, 0,0,0,0,0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
+                else
+                    SendMessage(This->hWnd, WM_COMMAND, MAKEWPARAM(BN_CLICKED, IDC_STARTBTN), (LPARAM)This->hwndStart);
+
                 break;
-
+            }
             case WM_COMMAND:
                 if ((HWND)lParam == This->hwndStart)
                 {
-                    if (This->StartMenuPopup != NULL)
-                    {
-                        POINTL pt;
-                        RECTL rcExclude;
-                        DWORD dwFlags = 0;
-
-                        if (GetWindowRect(This->hwndStart,
-                                          (RECT*)&rcExclude))
-                        {
-                            if (ITrayWindowImpl_IsPosHorizontal(This))
-                            {
-                                pt.x = rcExclude.left;
-                                pt.y = rcExclude.top;
-                                dwFlags |= MPPF_BOTTOM;
-                            }
-                            else
-                            {
-                                if (This->Position == ABE_LEFT)
-                                    pt.x = rcExclude.left;
-                                else
-                                    pt.x = rcExclude.right;
-
-                                pt.y = rcExclude.bottom;
-                                dwFlags |= MPPF_BOTTOM;
-                            }
-
-                            IMenuPopup_Popup(This->StartMenuPopup,
-                                             &pt,
-                                             &rcExclude,
-                                             dwFlags);
-                        }
-                    }
+                    PopupStartMenu(This);
                     break;
                 }
 
                 if (This->TrayBandSite == NULL ||
-                    !SUCCEEDED(ITrayBandSite_ProcessMessage(This->TrayBandSite,
+                    FAILED(ITrayBandSite_ProcessMessage(This->TrayBandSite,
                                                             hwnd,
                                                             uMsg,
                                                             wParam,
@@ -2603,6 +2621,10 @@
                     {
                         /* FIXME: Handle these commands as well */
                         case IDM_TASKBARANDSTARTMENU:
+
+                            ITrayWindowImpl_DisplayProperties(ITrayWindow_from_impl(This));
+                            break;
+
                         case IDM_SEARCH:
                         case IDM_HELPANDSUPPORT:
                             break;
Index: base/shell/explorer-new/CMakeLists.txt
===================================================================
--- base/shell/explorer-new/CMakeLists.txt	(rÃ©vision 61927)
+++ base/shell/explorer-new/CMakeLists.txt	(copie de travail)
@@ -1,4 +1,6 @@
 
+PROJECT(SHELL)
+
 add_definitions(-DWIN32)
 
 list(APPEND SOURCE
@@ -5,6 +7,7 @@
     desktop.c
     dragdrop.c
     explorer.c
+    rshell.c
     settings.c
     startmnu.c
     startup.c
@@ -14,12 +17,12 @@
     trayntfy.c
     trayprop.c
     traywnd.c
-    explorer.rc)
+    precomp.h)
 
-add_executable(explorer_new ${SOURCE})
-target_link_libraries(explorer_new uuid)
-set_module_type(explorer_new win32gui UNICODE)
-add_importlibs(explorer_new
+add_executable(explorer ${SOURCE} explorer.rc)
+target_link_libraries(explorer uuid)
+set_module_type(explorer win32gui UNICODE)
+add_importlibs(explorer
     advapi32
     gdi32
     user32
@@ -34,5 +37,5 @@
     msvcrt
     kernel32
     ntdll)
-add_pch(explorer_new precomp.h)
-add_cd_file(TARGET explorer_new DESTINATION reactos FOR all)
+add_pch(explorer precomp.h SOURCE)
+add_cd_file(TARGET explorer DESTINATION reactos FOR all)
Index: base/shell/explorer-new/taskswnd.c
===================================================================
--- base/shell/explorer-new/taskswnd.c	(rÃ©vision 61927)
+++ base/shell/explorer-new/taskswnd.c	(copie de travail)
@@ -1632,6 +1632,9 @@
             break;
 
         case HSHELL_TASKMAN:
+            PostMessage(ITrayWindow_GetHWND(This->Tray), TWM_OPENSTARTMENU,0, 0);
+            break;
+
         case HSHELL_LANGUAGE:
         case HSHELL_SYSMENU:
         case HSHELL_ENDTASK:
@@ -2123,6 +2126,24 @@
                 break;
 #endif
 
+            case WM_KLUDGEMINRECT:
+            {
+                PTASK_ITEM TaskItem = TaskSwitchWnd_FindTaskItem(This, (HWND)wParam);
+                if (TaskItem)
+                {
+                    RECT* prcMinRect = (RECT*)lParam;
+                    RECT rcItem, rcToolbar;
+                    SendMessageW(This->hWndToolbar,TB_GETITEMRECT, TaskItem->Index, (LPARAM)&rcItem);
+                    GetWindowRect(This->hWndToolbar, &rcToolbar);
+
+                    OffsetRect(&rcItem, rcToolbar.left, rcToolbar.top);
+
+                    *prcMinRect = rcItem;
+                    return TRUE;
+                }
+                return FALSE;
+            }
+
             default:
 /* HandleDefaultMessage: */
                 if (uMsg == This->ShellHookMsg && This->ShellHookMsg != 0)
Index: base/shell/explorer-new/explorer.c
===================================================================
--- base/shell/explorer-new/explorer.c	(rÃ©vision 61927)
+++ base/shell/explorer-new/explorer.c	(copie de travail)
@@ -381,6 +381,8 @@
     HANDLE hShellDesktop = NULL;
     BOOL CreateShellDesktop = FALSE;
 
+    DbgPrint("Explorer starting... Commandline: %S\n", lpCmdLine);
+
     if (RegOpenKey(HKEY_CURRENT_USER,
                    TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"),
                    &hkExplorer) != ERROR_SUCCESS)
@@ -442,10 +444,108 @@
     }
     else
     {
+        WCHAR root[MAX_PATH];
+        HMODULE hBrowseui;
+        HRESULT hr;
+        LPSHELLFOLDER pDesktopFolder = NULL;
+        LPITEMIDLIST pidlRoot = NULL;
+        typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14);
+        SH_OPEN_NEW_FRAME SHOpenNewFrame;
+
         /* A shell is already loaded. Parse the command line arguments
            and unless we need to do something specific simply display
            the desktop in a separate explorer window */
         /* FIXME */
+
+        /* Commandline switches:
+         *
+         * /n               Open a new window, even if an existing one still exists.
+         * /e               Start with the explorer sidebar shown.
+         * /root,<object>   Open a window for the given object path.
+         * /select,<object> Open a window with the given object selected.
+         */
+        
+        /* FIXME: Do it right */
+        WCHAR* tmp = wcsstr(lpCmdLine,L"/root,");
+        if (tmp)
+        {
+            WCHAR* tmp2;
+            
+            tmp += 6; // skip to beginning of path
+            tmp2 = wcschr(tmp, L',');
+
+            if (tmp2)
+            {
+                wcsncpy(root, tmp, tmp2 - tmp);
+            }
+            else
+            {
+                wcscpy(root, tmp);
+            }
+        }
+        else
+        {
+            wcscpy(root, lpCmdLine);
+        }
+
+        if (root[0] == L'"')
+        {
+            int len = wcslen(root) - 2;
+            wcsncpy(root, root + 1, len);
+            root[len] = 0;
+        }
+
+        if (wcslen(root) > 0)
+        {
+            LPITEMIDLIST  pidl;
+            ULONG         chEaten;
+            ULONG         dwAttributes;
+
+            if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder)))
+            {
+                hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder,
+                    NULL,
+                    NULL,
+                    root,
+                    &chEaten,
+                    &pidl,
+                    &dwAttributes);
+                if (SUCCEEDED(hr))
+                {
+                    pidlRoot = pidl;
+                    DbgPrint("Got PIDL for folder '%S'\n", root);
+                }
+            }
+        }
+
+        if (!pidlRoot)
+        {
+            DbgPrint("No folder, getting PIDL for My Computer.\n", root);
+            hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot);
+            if (FAILED(hr))
+                return 0;
+        }
+
+        DbgPrint("Trying to open browser window... \n");
+
+        hBrowseui = LoadLibraryW(L"browseui.dll");
+        if (!hBrowseui)
+        {
+            DbgPrint("Browseui not found.. \n");
+            return 0;
+        }
+
+        SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103);
+
+        hr = SHOpenNewFrame(pidlRoot, (IUnknown*)pDesktopFolder, 0, 0);
+        if (FAILED(hr))
+            return 0;
+
+        /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */
+        Sleep(1000);
+        ExitThread(0);
+
+        return 0;
     }
 
     if (Tray != NULL)
Index: base/shell/explorer-new/rshell.c
===================================================================
--- base/shell/explorer-new/rshell.c	(rÃ©vision 0)
+++ base/shell/explorer-new/rshell.c	(rÃ©vision 62573)
@@ -0,0 +1,162 @@
+/*
+ * ReactOS Explorer
+ *
+ * Copyright 2014 Giannis Adamopoulos
+ *
+ * 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "precomp.h"
+
+typedef HRESULT(*PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv);
+
+HRESULT
+CStartMenu_Constructor(
+    REFIID riid,
+    void **ppv)
+{
+    HINSTANCE hRShell = LoadLibraryW(L"rshell.dll");
+
+    if (hRShell)
+    {
+        PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(hRShell, "CStartMenu_Constructor");
+        if(func)
+        {
+            return func(riid, ppv);
+        }
+    }
+
+    return CoCreateInstance(&CLSID_StartMenu,
+                            NULL,
+                            CLSCTX_INPROC_SERVER,
+                            riid,
+                            ppv);   
+}
+
+typedef HANDLE(WINAPI *PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk);
+
+HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
+{
+    HINSTANCE hRShell = LoadLibraryW(L"rshell.dll");
+
+    if (hRShell)
+    {
+        PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(hRShell, "SHCreateDesktop");
+        if (func)
+        {
+            return func(ShellDesk);
+        }
+    }
+
+    hRShell = LoadLibraryW(L"shell32.dll");
+
+    if (hRShell)
+    {
+        PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(hRShell, "SHCreateDesktop");
+        if (func)
+        {
+            return func(ShellDesk);
+        }
+    }
+
+    return 0;
+}
+
+typedef BOOL(WINAPI *PSHDESKTOPMESSAGELOOP)(HANDLE hDesktop);
+
+BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop)
+{
+    HINSTANCE hRShell = LoadLibraryW(L"rshell.dll");
+
+    if (hRShell)
+    {
+        PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(hRShell, "SHDesktopMessageLoop");
+        if (func)
+        {
+            return func(hDesktop);
+        }
+    }
+
+    hRShell = LoadLibraryW(L"shell32.dll");
+
+    if (hRShell)
+    {
+        PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(hRShell, "SHDesktopMessageLoop");
+        if (func)
+        {
+            return func(hDesktop);
+        }
+    }
+
+    return FALSE;
+}
+
+typedef DWORD(WINAPI* PWINLIST_INIT)(void);
+
+DWORD WINAPI WinList_Init(void)
+{
+    HINSTANCE hRShell = LoadLibraryW(L"rshell.dll");
+
+    if (hRShell)
+    {
+        PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(hRShell, "WinList_Init");
+        if (func)
+        {
+            return func();
+        }
+    }
+
+    hRShell = LoadLibraryW(L"shdocvw.dll");
+
+    if (hRShell)
+    {
+        PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(hRShell, "WinList_Init");
+        if (func)
+        {
+            return func();
+        }
+    }
+
+    return 0;
+}
+
+typedef void (WINAPI *PSHELLDDEINIT)(BOOL bInit);
+
+void WINAPI ShellDDEInit(BOOL bInit)
+{
+    HINSTANCE hRShell = LoadLibraryW(L"rshell.dll");
+
+    if (hRShell)
+    {
+        PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(hRShell, "ShellDDEInit");
+        if (func)
+        {
+            func(bInit);
+            return;
+        }
+    }
+
+    hRShell = LoadLibraryW(L"shell32.dll");
+
+    if (hRShell)
+    {
+        PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(hRShell, "ShellDDEInit");
+        if (func)
+        {
+            func(bInit);
+            return;
+        }
+    }
+}
\ No newline at end of file

Modification de propriÃ©tÃ©s sur base/shell/explorer-new/rshell.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/CMakeLists.txt
===================================================================
--- base/shell/CMakeLists.txt	(rÃ©vision 61927)
+++ base/shell/CMakeLists.txt	(copie de travail)
@@ -2,3 +2,5 @@
 add_subdirectory(cmd)
 add_subdirectory(explorer)
 add_subdirectory(explorer-new)
+add_subdirectory(filebrowser)
+add_subdirectory(rshell)
Index: base/shell/explorer/CMakeLists.txt
===================================================================
--- base/shell/explorer/CMakeLists.txt	(rÃ©vision 61927)
+++ base/shell/explorer/CMakeLists.txt	(copie de travail)
@@ -7,7 +7,6 @@
     -DWIN32
     -D__WINDRES__)
 
-#add_pch(explorer precomp.h)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 list(APPEND SOURCE
@@ -31,9 +30,6 @@
     taskbar/desktopbar.cpp
     taskbar/startmenu.cpp
     taskbar/traynotify.cpp
-    precomp.cpp
-    explorer.rc
-    services/startup.c
     services/shellservices.cpp
     desktop/desktop.cpp
     explorer.cpp
@@ -43,18 +39,24 @@
     utility/utility.cpp
     utility/xmlstorage.cpp
     utility/window.cpp
-    utility/shellbrowserimpl.cpp) #    utility/shelltests.cpp
+    utility/shellbrowserimpl.cpp
+    precomp.h) #    utility/shelltests.cpp
 
-if(ARCH MATCHES i386)
-    list(APPEND SOURCE
-        i386-stub-win32.c)
+if(ARCH STREQUAL "i386")
+    list(APPEND I386_SOURCE i386-stub-win32.c)
 endif()
 
-add_executable(explorer ${SOURCE})
-target_link_libraries(explorer comsupp wine uuid)
-set_module_type(explorer win32gui UNICODE)
+add_executable(explorer_old
+    ${SOURCE}
+    ${I386_SOURCE}
+    services/startup.c
+    explorer.rc)
 
-add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll)
-add_dependencies(explorer psdk)
-add_cd_file(TARGET explorer DESTINATION reactos FOR all)
+target_link_libraries(explorer_old comsupp wine uuid)
+set_module_type(explorer_old win32gui UNICODE)
+
+add_importlibs(explorer_old advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll)
+add_pch(explorer_old precomp.h SOURCE)
+add_dependencies(explorer_old psdk)
+add_cd_file(TARGET explorer_old DESTINATION reactos FOR all)
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all)
Index: base/shell/explorer/precomp.h
===================================================================
--- base/shell/explorer/precomp.h	(rÃ©vision 61927)
+++ base/shell/explorer/precomp.h	(copie de travail)
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _EXPLORER_H
+#define _EXPLORER_H
 
  //
  // Explorer clone - precompiled header support
@@ -51,3 +53,5 @@
 #include "externals.h"
 
 #include "resource.h"
+
+#endif /* _EXPLORER_H */
Index: base/shell/cmd/CMakeLists.txt
===================================================================
--- base/shell/cmd/CMakeLists.txt	(rÃ©vision 61927)
+++ base/shell/cmd/CMakeLists.txt	(copie de travail)
@@ -65,11 +65,11 @@
     vol.c
     where.c
     window.c
-    cmd.rc)
+    precomp.h)
 
-add_executable(cmd ${SOURCE})
+add_executable(cmd ${SOURCE} cmd.rc)
 target_link_libraries(cmd wine)
 set_module_type(cmd win32cui UNICODE)
 add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
-add_pch(cmd precomp.h)
+add_pch(cmd precomp.h SOURCE)
 add_cd_file(TARGET cmd DESTINATION reactos/system32 FOR all)
Index: base/shell/cmd/lang/ru-RU.rc
===================================================================
--- base/shell/cmd/lang/ru-RU.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/ru-RU.rc	(copie de travail)
@@ -180,7 +180,7 @@
     STRING_DIR_HELP3 " Ð¢Ð¾Ð¼ Ð² ÑƒÑ�Ñ‚Ñ€Ð¾Ð¹Ñ�Ñ‚Ð²Ðµ %c Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð¼ÐµÑ‚ÐºÐ¸.\n"
     STRING_DIR_HELP4 " Ð¡ÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ñ‚Ð¾Ð¼Ð°: %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Ð’Ñ�ÐµÐ³Ð¾:\n%16i Ð¤Ð°Ð¹Ð»(Ð¾Ð²)% 14s Ð±Ð°Ð¹Ñ‚\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s Ð±Ð°Ð¹Ñ‚\n"
+    STRING_DIR_HELP6 "%16i Dir(s)% 15s Ð±Ð°Ð¹Ñ‚ Ñ�Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾\n"
     STRING_DIR_HELP7 "\n ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ of %s\n\n"
     STRING_DIR_HELP8 "%16i Ñ„Ð°Ð¹Ð»(Ð¾Ð²)% 14s Ð±Ð°Ð¹Ñ‚\n"
     STRING_DIRSTACK_HELP1 "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ñ�ÐµÑ‚ Ñ‚ÐµÐºÑƒÑ‰ÑƒÑŽ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑŽ Ð´Ð»Ñ� Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ POPD, Ð·Ð°Ñ‚ÐµÐ¼\n\
Index: base/shell/cmd/lang/es-ES.rc
===================================================================
--- base/shell/cmd/lang/es-ES.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/es-ES.rc	(copie de travail)
@@ -182,7 +182,7 @@
     STRING_DIR_HELP3 " El volumen en la unidad %c no tiene etiqueta.\n"
     STRING_DIR_HELP4 " El volumen Serial Number is %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Total de archivos mostrados:\n%16i archivo(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Directorio(s)% 15s bytes\n"
+    STRING_DIR_HELP6 "%16i Directorio(s)% 15s bytes libres\n"
     STRING_DIR_HELP7 "\n Directorio %s\n\n"
     STRING_DIR_HELP8 "%16i archivo(s)% 14s bytes\n"
     STRING_DIRSTACK_HELP1 "Almacena el directorio actual para usarlo por el comando, \n\
Index: base/shell/cmd/lang/fr-FR.rc
===================================================================
--- base/shell/cmd/lang/fr-FR.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/fr-FR.rc	(copie de travail)
@@ -192,7 +192,7 @@
     STRING_DIR_HELP3 " Le lecteur %c n'a pas de nom de volume\n"
     STRING_DIR_HELP4 " Le numÃ©ro de sÃ©rie du volume est %04X-%04X\n"
     STRING_DIR_HELP5 "\n   Total de fichiers listÃ©s :\n%16i Fichier(s)% 14s octets\n"
-    STRING_DIR_HELP6 "%16i Rep(s)% 15s octets\n"
+    STRING_DIR_HELP6 "%16i Rep(s)% 15s octets libres\n"
     STRING_DIR_HELP7 "\n RÃ©pertoire de %s\n\n"
     STRING_DIR_HELP8 "%16i Fichier(s)% 14s octets\n"
     STRING_DIRSTACK_HELP1 "Stocke le rÃ©pertoire courant pour utilisation avec la commande POPD,\n\
Index: base/shell/cmd/lang/pl-PL.rc
===================================================================
--- base/shell/cmd/lang/pl-PL.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/pl-PL.rc	(copie de travail)
@@ -187,7 +187,7 @@
     STRING_DIR_HELP3 " Wolumin w napÄ™dzie %c nie posiada etykiety.\n"
     STRING_DIR_HELP4 " Numer seryjny woluminu to: %04X-%04X\n"
     STRING_DIR_HELP5 "\n     OgÃ³Å‚em wyÅ›wietonych:\n%16i plik(Ã³w)% 14s bajtÃ³w\n"
-    STRING_DIR_HELP6 "%16i katalog(Ã³w)% 15s bajtÃ³w\n"
+    STRING_DIR_HELP6 "%16i katalog(Ã³w)% 15s bajtÃ³w wolne\n"
     STRING_DIR_HELP7 "\n katalog %s\n\n"
     STRING_DIR_HELP8 "%16i plik(Ã³w)% 14s bajtÃ³w\n"
     STRING_DIRSTACK_HELP1 "Przechowuje obecny katalog dla potrzeb komendy POPD, nastÄ™pnie\n\
Index: base/shell/cmd/lang/hu-HU.rc
===================================================================
--- base/shell/cmd/lang/hu-HU.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/hu-HU.rc	(copie de travail)
@@ -170,7 +170,7 @@
     STRING_DIR_HELP3 " A (%c) meghajtÃ³ban talÃ¡lhatÃ³ kÃ¶tetnek nincs cÃ­mkÃ©je.\n"
     STRING_DIR_HELP4 " A kÃ¶tet sorozatszÃ¡ma: %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Ã–sszes Ã¡llomÃ¡ny:\n%16i Ã�llomÃ¡ny(ok)% 14s bÃ¡jt\n"
-    STRING_DIR_HELP6 "%16i Mappa %15s bÃ¡jt"
+    STRING_DIR_HELP6 "%16i Mappa %15s bÃ¡jt szabad"
     STRING_DIR_HELP7 "\n %s tartalma\n\n"
     STRING_DIR_HELP8 "%16i Ã�llomÃ¡ny %14s bÃ¡jt\n"
     STRING_DIRSTACK_HELP1 "Megjegyzi az aktuÃ¡lis mappÃ¡t, majd Ã¡tvÃ¡lt egy mÃ¡asikra.\n\n\
Index: base/shell/cmd/lang/id-ID.rc
===================================================================
--- base/shell/cmd/lang/id-ID.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/id-ID.rc	(copie de travail)
@@ -181,7 +181,7 @@
     STRING_DIR_HELP3 " Volume di drive %c tidak berlabel.\n"
     STRING_DIR_HELP4 " Nomor Seri Volume adalah %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Total File Didaftar:\n%16i File% 14s byte\n"
-    STRING_DIR_HELP6 "%16i Dir% 15s byte\n"
+    STRING_DIR_HELP6 "%16i Dir% 15s byte tersisa\n"
     STRING_DIR_HELP7 "\n Direktori %s\n\n"
     STRING_DIR_HELP8 "%16i File% 14s byte\n"
     STRING_DIRSTACK_HELP1 "Menyimpan direktori sekarang untuk digunakan oleh perintah POPD, lalu\n\
Index: base/shell/cmd/lang/it-IT.rc
===================================================================
--- base/shell/cmd/lang/it-IT.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/it-IT.rc	(copie de travail)
@@ -178,7 +178,7 @@
     STRING_DIR_HELP3 " Il Volume nel disco %c non ha etichetta.\n"
     STRING_DIR_HELP4 " Il numero di serie del Volume Ã¨ %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Numero dei file elencati:\n%16i % 14s byte\n"
-    STRING_DIR_HELP6 "%16i Cartelle% 15s byte\n"
+    STRING_DIR_HELP6 "%16i Cartelle% 15s byte liberi\n"
     STRING_DIR_HELP7 "\n Cartelle di %s\n\n"
     STRING_DIR_HELP8 "%16i File% 14s byte\n"
     STRING_DIRSTACK_HELP1 "Salva la cartella corrente per l'uso con il comando POPD, poi\n\
Index: base/shell/cmd/lang/no-NO.rc
===================================================================
--- base/shell/cmd/lang/no-NO.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/no-NO.rc	(copie de travail)
@@ -179,7 +179,7 @@
     STRING_DIR_HELP3 " Volumet i stasjon %c er uten navn.\n"
     STRING_DIR_HELP4 " Volumserienummeret er %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Totalt filer listet:\n%16i fil(er)% 14s byte\n"
-    STRING_DIR_HELP6 "%16i mappe(r)% 15s byte\n"
+    STRING_DIR_HELP6 "%16i mappe(r)% 15s byte ledig\n"
     STRING_DIR_HELP7 "\n mappe av %s\n\n"
     STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n"
     STRING_DIRSTACK_HELP1 "Lagrer gjeldende mappe for bruk av POPD kommando, og\n\
Index: base/shell/cmd/lang/sv-SE.rc
===================================================================
--- base/shell/cmd/lang/sv-SE.rc	(rÃ©vision 61927)
+++ base/shell/cmd/lang/sv-SE.rc	(copie de travail)
@@ -179,7 +179,7 @@
     STRING_DIR_HELP3 " Volumet i enhet %c Ã¤r utan namn.\n"
     STRING_DIR_HELP4 " Volymens serienummer Ã¤r %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Totalt filer listet:\n%16i fil(Ã¤r)% 14s byte\n"
-    STRING_DIR_HELP6 "%16i mapp(ar)% 15s byte\n"
+    STRING_DIR_HELP6 "%16i mapp(ar)% 15s byte ledigt\n"
     STRING_DIR_HELP7 "\n mapp av %s\n\n"
     STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n"
     STRING_DIRSTACK_HELP1 "Sparar aktuell mapp for anvÃ¤ndning av POPD kommandot, och\n\
Index: base/shell/cmd/console.c
===================================================================
--- base/shell/cmd/console.c	(rÃ©vision 61927)
+++ base/shell/cmd/console.c	(copie de travail)
@@ -31,7 +31,8 @@
     DWORD dwMode;
 
     /* Check whether the handle may be that of a console... */
-    if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE;
+    if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR)
+        return FALSE;
 
     /*
      * It may be. Perform another test... The idea comes from the
Index: base/shell/filebrowser/CMakeLists.txt
===================================================================
--- base/shell/filebrowser/CMakeLists.txt	(rÃ©vision 0)
+++ base/shell/filebrowser/CMakeLists.txt	(rÃ©vision 62573)
@@ -0,0 +1,15 @@
+
+PROJECT(SHELL)
+
+list(APPEND SOURCE
+    filebrowser.c
+    filebrowser.rc)
+
+add_executable(filebrowser ${SOURCE})
+set_module_type(filebrowser win32gui UNICODE)
+add_importlibs(filebrowser
+    shell32
+    msvcrt
+    kernel32)
+
+add_cd_file(TARGET explorer DESTINATION reactos FOR all)

Modification de propriÃ©tÃ©s sur base/shell/filebrowser/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/filebrowser/browseui.sxs.manifest
===================================================================
--- base/shell/filebrowser/browseui.sxs.manifest	(rÃ©vision 0)
+++ base/shell/filebrowser/browseui.sxs.manifest	(rÃ©vision 62573)
@@ -0,0 +1,25 @@
+ï»¿<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+<assemblyIdentity
+    type="win32"
+    name="browseui.sxs"
+    version="6.0.2900.2180" />
+
+<file name="browseui.dll">
+
+    <comClass clsid="{0BE35200-8F91-11CE-9DE3-00AA004BB851}"/>
+    <comClass clsid="{00BB2765-6A77-11D0-A535-00C04FD7D062}"/>
+    <comClass clsid="{01E04581-4EEE-11d0-BFE9-00AA005B4383}"/>
+    <comClass clsid="{A08C11D2-A228-11d0-825B-00AA005B4383}"/>
+    <comClass clsid="{F61FFEC1-754F-11d0-80CA-00AA005B4383}"/>
+    <comClass clsid="{ECD4FC4D-521C-11D0-B792-00A0C90312E1}"/>
+    <comClass clsid="{ECD4FC4E-521C-11D0-B792-00A0C90312E1}"/>
+    <comClass clsid="{22BF0C20-6DA7-11D0-B373-00A0C9034938}"/>
+    <comClass clsid="{AF604EFE-8897-11D1-B944-00A0C90312E1}"/>
+    <comClass clsid="{EF8AD2D1-AE36-11D1-B2D2-006097DF8C11}"/>
+    <comClass clsid="{5E6AB780-7743-11CF-A12B-00AA004AE837}"/>
+    <comClass clsid="{AF4F6510-F982-11d0-8595-00AA004CD6D8}"/>
+</file>
+
+</assembly>

Modification de propriÃ©tÃ©s sur base/shell/filebrowser/browseui.sxs.manifest
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/filebrowser/filebrowser.c
===================================================================
--- base/shell/filebrowser/filebrowser.c	(rÃ©vision 0)
+++ base/shell/filebrowser/filebrowser.c	(rÃ©vision 62573)
@@ -0,0 +1,45 @@
+/*
+ * ReactOS Explorer
+ *
+ * Copyright 2014 Giannis Adamopoulos
+ *
+ * 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <tchar.h>
+#include <windows.h>
+#include <shobjidl.h>
+#include <shlobj.h>
+
+typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14);
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+    HMODULE hBrowseui = LoadLibraryW(L"browseui.dll");
+    if (hBrowseui)
+    {
+        SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103);
+        LPITEMIDLIST pidlDrives;
+        SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives);
+        SHOpenNewFrame((LPITEMIDLIST)pidlDrives, NULL, 0, 0);
+    }
+
+    /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process */
+    ExitThread(0);
+
+    return 0;
+}
+

Modification de propriÃ©tÃ©s sur base/shell/filebrowser/filebrowser.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/filebrowser/filebrowser.exe.manifest
===================================================================
--- base/shell/filebrowser/filebrowser.exe.manifest	(rÃ©vision 0)
+++ base/shell/filebrowser/filebrowser.exe.manifest	(rÃ©vision 62573)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="ReactOS.FileBrowser"
+    type="win32"
+/>
+<description>This is ReactOS File Browser</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
\ No newline at end of file

Modification de propriÃ©tÃ©s sur base/shell/filebrowser/filebrowser.exe.manifest
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/filebrowser/filebrowser.exe.regfree.manifest
===================================================================
--- base/shell/filebrowser/filebrowser.exe.regfree.manifest	(rÃ©vision 0)
+++ base/shell/filebrowser/filebrowser.exe.regfree.manifest	(rÃ©vision 62573)
@@ -0,0 +1,28 @@
+ï»¿<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+<assemblyIdentity
+  type="win32"
+  name="client"
+  version="1.0.0.0" />
+  <dependency>
+          <dependentAssembly>
+              <assemblyIdentity
+                  type="win32"
+                  name="browseui.sxs"
+                  version="6.0.2900.2180" />
+          </dependentAssembly>
+  </dependency>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>

Modification de propriÃ©tÃ©s sur base/shell/filebrowser/filebrowser.exe.regfree.manifest
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/filebrowser/filebrowser.rc
===================================================================
--- base/shell/filebrowser/filebrowser.rc	(rÃ©vision 0)
+++ base/shell/filebrowser/filebrowser.rc	(rÃ©vision 62573)
@@ -0,0 +1,9 @@
+#include <windef.h>
+#include <winuser.h>
+
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS File Browser"
+#define REACTOS_STR_INTERNAL_NAME     "filebrowser"
+#define REACTOS_STR_ORIGINAL_FILENAME "filebrowser.exe"
+#include <reactos/version.rc>
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

Modification de propriÃ©tÃ©s sur base/shell/filebrowser/filebrowser.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/filebrowser
===================================================================
--- base/shell/filebrowser	(rÃ©vision 0)
+++ base/shell/filebrowser	(copie de travail)

Modification de propriÃ©tÃ©s sur base/shell/filebrowser
___________________________________________________________________
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Index: base/shell/rshell/CDesktopBrowser.cpp
===================================================================
--- base/shell/rshell/CDesktopBrowser.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CDesktopBrowser.cpp	(rÃ©vision 62573)
@@ -0,0 +1,568 @@
+/*
+ * Shell Desktop
+ *
+ * Copyright 2008 Thomas Bluemel
+ *
+ * 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
+ */
+
+#include "precomp.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(desktop);
+
+BOOL WINAPI SetShellWindowEx(HWND, HWND);
+
+#define SHDESK_TAG 0x4b534544
+
+static const WCHAR szProgmanClassName [] = { 'P', 'r', 'o', 'g', 'm', 'a', 'n' };
+static const WCHAR szProgmanWindowName [] = {
+    'P', 'r', 'o', 'g', 'r', 'a', 'm', ' ', 'M', 'a', 'n', 'a', 'g', 'e', 'r'
+};
+
+class CDesktopBrowser :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IShellBrowser,
+    public ICommDlgBrowser,
+    public IServiceProvider
+{
+public:
+    DWORD Tag;
+private:
+    HWND hWnd;
+    HWND hWndShellView;
+    HWND hWndDesktopListView;
+    CComPtr<IShellDesktopTray>        ShellDesk;
+    CComPtr<IShellView>                DesktopView;
+    IShellBrowser *DefaultShellBrowser;
+    LPITEMIDLIST pidlDesktopDirectory;
+    LPITEMIDLIST pidlDesktop;
+public:
+    CDesktopBrowser();
+    ~CDesktopBrowser();
+    HRESULT Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx);
+    HWND FindDesktopListView();
+    BOOL CreateDeskWnd();
+    HWND DesktopGetWindowControl(IN UINT id);
+    static LRESULT CALLBACK ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam);
+    static BOOL MessageLoop();
+
+    // *** IOleWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // *** IShellBrowser methods ***
+    virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths);
+    virtual HRESULT STDMETHODCALLTYPE SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject);
+    virtual HRESULT STDMETHODCALLTYPE RemoveMenusSB(HMENU hmenuShared);
+    virtual HRESULT STDMETHODCALLTYPE SetStatusTextSB(LPCOLESTR pszStatusText);
+    virtual HRESULT STDMETHODCALLTYPE EnableModelessSB(BOOL fEnable);
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorSB(MSG *pmsg, WORD wID);
+    virtual HRESULT STDMETHODCALLTYPE BrowseObject(LPCITEMIDLIST pidl, UINT wFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetViewStateStream(DWORD grfMode, IStream **ppStrm);
+    virtual HRESULT STDMETHODCALLTYPE GetControlWindow(UINT id, HWND *lphwnd);
+    virtual HRESULT STDMETHODCALLTYPE SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret);
+    virtual HRESULT STDMETHODCALLTYPE QueryActiveShellView(struct IShellView **ppshv);
+    virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(struct IShellView *ppshv);
+    virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags);
+
+    // *** ICommDlgBrowser methods ***
+    virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand(struct IShellView *ppshv);
+    virtual HRESULT STDMETHODCALLTYPE OnStateChange(struct IShellView *ppshv, ULONG uChange);
+    virtual HRESULT STDMETHODCALLTYPE IncludeObject(struct IShellView *ppshv, LPCITEMIDLIST pidl);
+
+    // *** IServiceProvider methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    BEGIN_COM_MAP(CDesktopBrowser)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
+        COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser)
+        COM_INTERFACE_ENTRY_IID(IID_ICommDlgBrowser, ICommDlgBrowser)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+    END_COM_MAP()
+};
+
+CDesktopBrowser::CDesktopBrowser()
+{
+    Tag = SHDESK_TAG;
+    hWnd = NULL;
+    hWndShellView = NULL;
+    hWndDesktopListView = NULL;
+    DefaultShellBrowser = NULL;
+    pidlDesktopDirectory = NULL;
+    pidlDesktop = NULL;
+}
+
+CDesktopBrowser::~CDesktopBrowser()
+{
+    if (DesktopView.p != NULL)
+    {
+        if (hWndShellView != NULL)
+            DesktopView->DestroyViewWindow();
+
+        hWndShellView = NULL;
+        hWndDesktopListView = NULL;
+    }
+
+    if (pidlDesktopDirectory != NULL)
+    {
+        ILFree(pidlDesktopDirectory);
+        pidlDesktopDirectory = NULL;
+    }
+
+    if (pidlDesktop != NULL)
+    {
+        ILFree(pidlDesktop);
+        pidlDesktop = NULL;
+    }
+}
+
+HRESULT CDesktopBrowser::Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx)
+{
+    CComPtr<IShellFolder>    psfDesktopFolder;
+    CSFV                    csfv;
+    HRESULT                    hRet;
+
+    hWnd = hWndx;
+    ShellDesk = ShellDeskx;
+    ShellDesk->AddRef();
+
+    pidlDesktopDirectory = SHCloneSpecialIDList(hWnd, CSIDL_DESKTOPDIRECTORY, FALSE);
+    hRet = SHGetSpecialFolderLocation(hWnd, CSIDL_DESKTOP, &pidlDesktop);
+    if (FAILED(hRet))
+        return hRet;
+
+    hRet = SHGetDesktopFolder(&psfDesktopFolder);
+    if (FAILED(hRet))
+        return hRet;
+
+    ZeroMemory(&csfv, sizeof(csfv));
+    csfv.cbSize = sizeof(csfv);
+    csfv.pshf = psfDesktopFolder;
+    csfv.psvOuter = NULL;
+
+    hRet = SHCreateShellFolderViewEx(&csfv, &DesktopView);
+
+    return hRet;
+}
+
+static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
+{
+    IShellDesktopTray        *ShellDesk;
+    CComObject<CDesktopBrowser>        *pThis;
+    HRESULT                    hRet;
+
+    ShellDesk = static_cast<IShellDesktopTray *>(lpCreateStruct->lpCreateParams);
+    if (ShellDesk == NULL)
+    {
+        WARN("No IShellDesk interface provided!");
+        return NULL;
+    }
+
+    pThis = new CComObject<CDesktopBrowser>;
+    if (pThis == NULL)
+        return NULL;
+    pThis->AddRef();
+
+    hRet = pThis->Initialize(hWnd, ShellDesk);
+    if (FAILED(hRet))
+    {
+        pThis->Release();
+        return NULL;
+    }
+
+    return pThis;
+}
+
+HWND CDesktopBrowser::FindDesktopListView()
+{
+    return FindWindowExW(hWndShellView, NULL, WC_LISTVIEW, NULL);
+}
+
+BOOL CDesktopBrowser::CreateDeskWnd()
+{
+    FOLDERSETTINGS fs;
+    RECT rcClient;
+    HRESULT hRet;
+
+    if (!GetClientRect(hWnd, &rcClient))
+    {
+        return FALSE;
+    }
+
+    fs.ViewMode = FVM_ICON;
+    fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT;
+    hRet = DesktopView->CreateViewWindow(NULL, &fs, static_cast<IShellBrowser *>(this), &rcClient, &hWndShellView);
+    if (!SUCCEEDED(hRet))
+        return FALSE;
+
+    SetShellWindowEx(hWnd, FindDesktopListView());
+
+#if 1
+    /* A windows 8 specific hack */
+    ::ShowWindow(hWndShellView, SW_SHOW);
+    ::ShowWindow(FindDesktopListView(), SW_SHOW);
+#endif
+
+    return TRUE;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetWindow(HWND *phwnd)
+{
+    if (hWnd != NULL)
+    {
+        *phwnd = hWnd;
+        return S_OK;
+    }
+
+    *phwnd = NULL;
+    return E_UNEXPECTED;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::RemoveMenusSB(HMENU hmenuShared)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetStatusTextSB(LPCOLESTR lpszStatusText)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::EnableModelessSB(BOOL fEnable)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::TranslateAcceleratorSB(LPMSG lpmsg, WORD wID)
+{
+    return S_FALSE;
+}
+
+typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14);
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags)
+{
+    /* FIXME: Implement executing filebrowser.exe and somehow pass the pidl to it */
+
+    /* Returning failure here will make windows 7 and 8 to use the default file browser */
+    return E_FAIL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm)
+{
+    return E_NOTIMPL;
+}
+
+HWND CDesktopBrowser::DesktopGetWindowControl(IN UINT id)
+{
+    switch (id)
+    {
+    case FCW_TOOLBAR:
+    case FCW_STATUS:
+    case FCW_TREE:
+    case FCW_PROGRESS:
+        return NULL;
+
+    default:
+        return NULL;
+    }
+
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetControlWindow(UINT id, HWND *lphwnd)
+{
+    HWND hWnd;
+
+    hWnd = DesktopGetWindowControl(id);
+    if (hWnd != NULL)
+    {
+        *lphwnd = hWnd;
+        return S_OK;
+    }
+
+    *lphwnd = NULL;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret)
+{
+    HWND                        hWnd;
+
+    if (pret == NULL)
+        return E_POINTER;
+
+    hWnd = DesktopGetWindowControl(id);
+    if (hWnd != NULL)
+    {
+        *pret = SendMessageW(hWnd, uMsg, wParam, lParam);
+        return S_OK;
+    }
+
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryActiveShellView(IShellView **ppshv)
+{
+    *ppshv = DesktopView;
+    if (DesktopView != NULL)
+        DesktopView->AddRef();
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnViewWindowActive(IShellView *ppshv)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnDefaultCommand(IShellView *ppshv)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnStateChange(IShellView *ppshv, ULONG uChange)
+{
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::IncludeObject(IShellView *ppshv, LPCITEMIDLIST pidl)
+{
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryService(REFGUID guidService, REFIID riid, PVOID *ppv)
+{
+    /* FIXME - handle guidService */
+    return QueryInterface(riid, ppv);
+}
+
+BOOL CDesktopBrowser::MessageLoop()
+{
+    MSG Msg;
+    BOOL bRet;
+
+    while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0)
+    {
+        if (bRet != -1)
+        {
+            TranslateMessage(&Msg);
+            DispatchMessageW(&Msg);
+        }
+    }
+
+    return TRUE;
+}
+
+LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam)
+{
+    CDesktopBrowser *pThis = NULL;
+    LRESULT Ret = FALSE;
+
+    if (uMsg != WM_NCCREATE)
+    {
+        pThis = reinterpret_cast<CDesktopBrowser*>(GetWindowLongPtrW(hwnd, 0));
+        if (pThis == NULL)
+            goto DefMsgHandler;
+    }
+
+    if (pThis != NULL || uMsg == WM_NCCREATE)
+    {
+        switch (uMsg)
+        {
+        case WM_ERASEBKGND:
+            return (LRESULT) PaintDesktop(reinterpret_cast<HDC>(wParam));
+
+        case WM_GETISHELLBROWSER:
+            Ret = reinterpret_cast<LRESULT>(static_cast<IShellBrowser *>(pThis));
+            break;
+
+        case WM_SIZE:
+            if (wParam == SIZE_MINIMIZED)
+            {
+                /* Hey, we're the desktop!!! */
+                ShowWindow(hwnd,
+                    SW_RESTORE);
+            }
+            else
+            {
+                RECT rcDesktop;
+
+                rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
+                rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
+                rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+                rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+
+                /* FIXME: Update work area */
+            }
+            break;
+
+        case WM_SYSCOLORCHANGE:
+        case WM_SETTINGCHANGE:
+        {
+            if (uMsg == WM_SYSCOLORCHANGE || wParam == SPI_SETDESKWALLPAPER || wParam == 0)
+            {
+                if (pThis->hWndShellView != NULL)
+                {
+                    /* Forward the message */
+                    SendMessageW(pThis->hWndShellView,
+                        uMsg,
+                        wParam,
+                        lParam);
+                }
+            }
+            break;
+        }
+
+        case WM_CREATE:
+        {
+            pThis->ShellDesk->RegisterDesktopWindow(pThis->hWnd);
+
+            if (!pThis->CreateDeskWnd())
+                WARN("Could not create the desktop view control!\n");
+            break;
+        }
+
+        case WM_NCCREATE:
+        {
+            LPCREATESTRUCT CreateStruct = reinterpret_cast<LPCREATESTRUCT>(lParam);
+            pThis = SHDESK_Create(hwnd, CreateStruct);
+            if (pThis == NULL)
+            {
+                WARN("Failed to create desktop structure\n");
+                break;
+            }
+
+            SetWindowLongPtrW(hwnd,
+                0,
+                reinterpret_cast<LONG_PTR>(pThis));
+            Ret = TRUE;
+            break;
+        }
+
+        case WM_NCDESTROY:
+        {
+            pThis->Release();
+            break;
+        }
+
+        default:
+        DefMsgHandler :
+            Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);
+                      break;
+        }
+    }
+
+    return Ret;
+}
+
+static BOOL
+RegisterProgmanWindowClass(VOID)
+{
+    WNDCLASSW wcProgman;
+
+    wcProgman.style = CS_DBLCLKS;
+    wcProgman.lpfnWndProc = CDesktopBrowser::ProgmanWindowProc;
+    wcProgman.cbClsExtra = 0;
+    wcProgman.cbWndExtra = sizeof(CDesktopBrowser *);
+    wcProgman.hInstance = shell32_hInstance;
+    wcProgman.hIcon = NULL;
+    wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW);
+    wcProgman.hbrBackground = (HBRUSH) (COLOR_BACKGROUND + 1);
+    wcProgman.lpszMenuName = NULL;
+    wcProgman.lpszClassName = szProgmanClassName;
+
+    return RegisterClassW(&wcProgman) != 0;
+}
+
+
+/*************************************************************************
+ * SHCreateDesktop            [SHELL32.200]
+ *
+ */
+HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
+{
+    HWND hWndDesk;
+    RECT rcDesk;
+
+    if (ShellDesk == NULL)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return NULL;
+    }
+
+    if (RegisterProgmanWindowClass() == 0)
+    {
+        WARN("Failed to register the Progman window class!\n");
+        return NULL;
+    }
+
+    rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
+    rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
+    rcDesk.right = rcDesk.left + GetSystemMetrics(SM_CXVIRTUALSCREEN);
+    rcDesk.bottom = rcDesk.top + GetSystemMetrics(SM_CYVIRTUALSCREEN);
+
+    if (IsRectEmpty(&rcDesk))
+    {
+        rcDesk.left = rcDesk.top = 0;
+        rcDesk.right = GetSystemMetrics(SM_CXSCREEN);
+        rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN);
+    }
+
+    hWndDesk = CreateWindowExW(0, szProgmanClassName, szProgmanWindowName,
+        WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+        rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom,
+        NULL, NULL, shell32_hInstance, reinterpret_cast<LPVOID>(ShellDesk));
+    if (hWndDesk != NULL)
+        return (HANDLE) GetWindowLongPtrW(hWndDesk, 0);
+
+    return NULL;
+}
+
+/*************************************************************************
+ * SHCreateDesktop            [SHELL32.201]
+ *
+ */
+BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop)
+{
+    CDesktopBrowser *Desk = reinterpret_cast<CDesktopBrowser *>(hDesktop);
+
+    if (Desk == NULL || Desk->Tag != SHDESK_TAG)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    return Desk->MessageLoop();
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/CDesktopBrowser.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMakeLists.txt
===================================================================
--- base/shell/rshell/CMakeLists.txt	(rÃ©vision 0)
+++ base/shell/rshell/CMakeLists.txt	(rÃ©vision 62573)
@@ -0,0 +1,63 @@
+PROJECT(SHELL)
+
+set_cpp(WITH_RUNTIME)
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+
+spec2def(rshell.dll rshell.spec ADD_IMPORTLIB)
+
+list(APPEND SOURCE
+    CDesktopBrowser.cpp
+    CMenuBand.cpp
+    CMenuDeskBar.cpp
+    CMenuFocusManager.cpp
+    CMenuSite.cpp
+    CMenuToolbars.cpp
+    CMergedFolder.cpp
+    CStartMenu.cpp
+    misc.cpp
+    wraplog.cpp
+    logging/CMenuBandWrap.cpp
+    logging/CMenuDeskBarWrap.cpp
+    logging/CMenuSiteWrap.cpp
+    logging/CStartMenuSiteWrap.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/rshell.def)
+
+add_library(rshell SHARED ${SOURCE})
+
+set_module_type(rshell win32dll UNICODE)
+
+target_link_libraries(rshell
+    atlnew
+    uuid
+    wine)
+
+add_importlibs(rshell
+    shlwapi
+    shell32
+    gdi32
+    ole32
+    user32
+    msvcrt
+    kernel32
+    ntdll)
+
+add_cd_file(TARGET rshell DESTINATION reactos FOR all)
+
+add_custom_command(TARGET rshell POST_BUILD 
+  COMMAND "${CMAKE_COMMAND}" -E copy 
+     "$<TARGET_FILE:rshell>"
+     "$<TARGET_FILE_DIR:explorer>/$<TARGET_FILE_NAME:rshell>" 
+  COMMENT "Copying to output directory")
+
+add_custom_command(TARGET rshell POST_BUILD 
+  COMMAND "${CMAKE_COMMAND}" -E copy 
+     "$<TARGET_FILE:rshell>"
+     "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" 
+  COMMENT "Copying to output directory")
+
+add_custom_command(TARGET rshell POST_BUILD 
+  COMMAND "${CMAKE_COMMAND}" -E copy 
+     "$<TARGET_FILE:rshell>"
+     "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" 
+  COMMENT "Copying to output directory")

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuBand.cpp
===================================================================
--- base/shell/rshell/CMenuBand.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CMenuBand.cpp	(rÃ©vision 62573)
@@ -0,0 +1,1025 @@
+/*
+ * Shell Menu Band
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#include "precomp.h"
+#include <windowsx.h>
+#include <commoncontrols.h>
+#include <shlwapi_undoc.h>
+
+#include "CMenuBand.h"
+#include "CMenuToolbars.h"
+#include "CMenuFocusManager.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
+
+#undef UNIMPLEMENTED
+
+#define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__)
+
+extern "C"
+HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
+{
+    *ppv = NULL;
+
+    CMenuBand * site = new CComObject<CMenuBand>();
+
+    if (!site)
+        return E_OUTOFMEMORY;
+
+    HRESULT hr = site->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        site->Release();
+
+    return hr;
+}
+
+CMenuBand::CMenuBand() :
+    m_staticToolbar(NULL),
+    m_SFToolbar(NULL),
+    m_site(NULL),
+    m_psmc(NULL),
+    m_subMenuChild(NULL),
+    m_subMenuParent(NULL),
+    m_childBand(NULL),
+    m_parentBand(NULL),
+    m_hmenu(NULL),
+    m_menuOwner(NULL),
+    m_useBigIcons(FALSE),
+    m_topLevelWindow(NULL),
+    m_hotBar(NULL),
+    m_hotItem(-1),
+    m_trackingPopup(FALSE)
+{
+    m_focusManager = CMenuFocusManager::AcquireManager();
+}
+
+CMenuBand::~CMenuBand()
+{
+    CMenuFocusManager::ReleaseManager(m_focusManager);
+
+    if (m_staticToolbar)
+        delete m_staticToolbar;
+
+    if (m_SFToolbar)
+        delete m_SFToolbar;
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::Initialize(
+    IShellMenuCallback *psmc,
+    UINT uId,
+    UINT uIdAncestor,
+    DWORD dwFlags)
+{
+    if (m_psmc != psmc)
+        m_psmc = psmc;
+    m_uId = uId;
+    m_uIdAncestor = uIdAncestor;
+    m_dwFlags = dwFlags;
+
+    if (m_psmc)
+    {
+        _CallCB(SMC_CREATE, 0, reinterpret_cast<LPARAM>(&m_UserData));
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::GetMenuInfo(
+    IShellMenuCallback **ppsmc,
+    UINT *puId,
+    UINT *puIdAncestor,
+    DWORD *pdwFlags)
+{
+    if (!pdwFlags) // maybe?
+        return E_INVALIDARG;
+
+    if (ppsmc)
+        *ppsmc = m_psmc;
+
+    if (puId)
+        *puId = m_uId;
+
+    if (puIdAncestor)
+        *puIdAncestor = m_uIdAncestor;
+
+    *pdwFlags = m_dwFlags;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::SetMenu(
+    HMENU hmenu,
+    HWND hwnd,
+    DWORD dwFlags)
+{
+    DbgPrint("CMenuBand::SetMenu called, hmenu=%p; hwnd=%p, flags=%x\n", hmenu, hwnd, dwFlags);
+
+    BOOL created = FALSE;
+
+    if (m_staticToolbar == NULL)
+    {
+        m_staticToolbar = new CMenuStaticToolbar(this);
+        created = true;
+    }
+    m_hmenu = hmenu;
+    m_menuOwner = hwnd;
+
+    HRESULT hr = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_site)
+    {
+        HWND hwndParent;
+
+        hr = m_site->GetWindow(&hwndParent);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        if (created)
+        {
+            hr = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags);
+            if (FAILED_UNEXPECTEDLY(hr))
+                return hr;
+
+            hr = m_staticToolbar->FillToolbar();
+        }
+        else
+        {
+            hr = m_staticToolbar->FillToolbar(TRUE);
+        }
+    }
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::GetMenu(
+    HMENU *phmenu,
+    HWND *phwnd,
+    DWORD *pdwFlags)
+{
+    if (m_staticToolbar == NULL)
+        return E_FAIL;
+
+    return m_staticToolbar->GetMenu(phmenu, phwnd, pdwFlags);
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::SetSite(IUnknown *pUnkSite)
+{
+    HWND    hwndParent;
+    HRESULT hr;
+
+    m_site = NULL;
+
+    if (pUnkSite == NULL)
+        return S_OK;
+
+    hwndParent = NULL;
+    hr = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = m_site->GetWindow(&hwndParent);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (!::IsWindow(hwndParent))
+        return E_FAIL;
+
+    if (m_staticToolbar != NULL)
+    {
+        hr = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        hr = m_staticToolbar->FillToolbar();
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (m_SFToolbar != NULL)
+    {
+        hr = m_SFToolbar->CreateToolbar(hwndParent, m_dwFlags);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        hr = m_SFToolbar->FillToolbar();
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent));
+    if (hr != E_NOINTERFACE && FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    CComPtr<IOleWindow> pTopLevelWindow;
+    hr = IUnknown_QueryService(m_site, SID_STopLevelBrowser, IID_PPV_ARG(IOleWindow, &pTopLevelWindow));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return pTopLevelWindow->GetWindow(&m_topLevelWindow);
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::GetSite(REFIID riid, PVOID *ppvSite)
+{
+    if (m_site == NULL)
+        return E_FAIL;
+
+    return m_site->QueryInterface(riid, ppvSite);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(
+    HWND *phwnd)
+{
+    if (m_SFToolbar != NULL)
+        return m_SFToolbar->GetWindow(phwnd);
+
+    if (m_staticToolbar != NULL)
+        return m_staticToolbar->GetWindow(phwnd);
+
+    return E_FAIL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc)
+{
+    SIZE sizeStatic = { 0 };
+    SIZE sizeShlFld = { 0 };
+    HRESULT hr = S_OK;
+
+    if (m_staticToolbar != NULL)
+        hr = m_staticToolbar->GetIdealSize(sizeStatic);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_SFToolbar != NULL)
+        hr = m_SFToolbar->GetIdealSize(sizeShlFld);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_staticToolbar == NULL && m_SFToolbar == NULL)
+        return E_FAIL;
+
+    int sy = min(prc->bottom - prc->top, sizeStatic.cy + sizeShlFld.cy);
+
+    int syStatic = sizeStatic.cy;
+    int syShlFld = sy - syStatic;
+
+    if (m_SFToolbar)
+    {
+        m_SFToolbar->SetPosSize(
+            prc->left,
+            prc->top,
+            prc->right - prc->left,
+            syShlFld);
+    }
+    if (m_staticToolbar)
+    {
+        m_staticToolbar->SetPosSize(
+            prc->left,
+            prc->top + syShlFld,
+            prc->right - prc->left,
+            syStatic);
+    }
+
+    return S_OK;
+}
+HRESULT STDMETHODCALLTYPE  CMenuBand::GetBandInfo(
+    DWORD dwBandID,
+    DWORD dwViewMode,
+    DESKBANDINFO *pdbi)
+{
+    SIZE sizeStatic = { 0 };
+    SIZE sizeShlFld = { 0 };
+
+    HRESULT hr = S_OK;
+
+    if (m_staticToolbar != NULL)
+        hr = m_staticToolbar->GetIdealSize(sizeStatic);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_SFToolbar != NULL)
+        hr = m_SFToolbar->GetIdealSize(sizeShlFld);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_staticToolbar == NULL && m_SFToolbar == NULL)
+        return E_FAIL;
+
+    pdbi->ptMinSize.x = max(sizeStatic.cx, sizeShlFld.cx) + 20;
+    pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy;
+    pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx) + 20;
+    pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE  CMenuBand::ShowDW(BOOL fShow)
+{
+    HRESULT hr = S_OK;
+
+    if (m_staticToolbar != NULL)
+    {
+        hr = m_staticToolbar->ShowWindow(fShow);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (m_SFToolbar != NULL)
+    {
+        hr = m_SFToolbar->ShowWindow(fShow);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (fShow)
+    {
+        hr = _CallCB(SMC_INITMENU, 0, 0);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+    else if (m_parentBand)
+    {
+        m_parentBand->SetClient(NULL);
+    }
+
+    if (_IsPopup() == S_OK)
+    {
+        if (fShow)
+            hr = m_focusManager->PushMenuPopup(this);
+        else
+            hr = m_focusManager->PopMenuPopup(this);
+    }
+    else
+    {
+        if (fShow)
+            hr = m_focusManager->PushMenuBar(this);
+        else
+            hr = m_focusManager->PopMenuBar(this);
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved)
+{
+    ShowDW(FALSE);
+
+    if (m_staticToolbar != NULL)
+        return m_staticToolbar->Close();
+
+    if (m_SFToolbar != NULL)
+        return m_SFToolbar->Close();
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
+{
+    HRESULT hr;
+
+    if (m_subMenuParent)
+    {
+        hr = m_subMenuParent->SetSubMenu(this, fActivate);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (fActivate)
+    {
+        CComPtr<IOleWindow> pTopLevelWindow;
+        hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow));
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        hr = pTopLevelWindow->GetWindow(&m_topLevelWindow);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+    else
+    {
+        m_topLevelWindow = NULL;
+    }
+
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    if (!pguidCmdGroup)
+        return E_FAIL;
+
+    if (IsEqualGUID(*pguidCmdGroup, CLSID_MenuBand))
+    {
+        if (nCmdID == 16) // set (big) icon size
+        {
+            this->m_useBigIcons = nCmdexecopt == 2;
+            return S_OK;
+        }
+        else if (nCmdID == 19) // popup-related
+        {
+            return S_FALSE;
+        }
+
+        return S_FALSE;
+    }
+
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    if (IsEqualIID(guidService, SID_SMenuBandChild) ||
+        IsEqualIID(guidService, SID_SMenuBandBottom) ||
+        IsEqualIID(guidService, SID_SMenuBandBottomSelected))
+        return this->QueryInterface(riid, ppvObject);
+    WARN("Unknown service requested %s\n", wine_dbgstr_guid(&guidService));
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType)
+{
+    switch (dwSelectType)
+    {
+    case MPOS_CHILDTRACKING:
+        if (!m_subMenuParent)
+            break;
+        // TODO: Cancel timers?
+        return m_subMenuParent->OnSelect(dwSelectType);
+    case MPOS_SELECTLEFT:
+        if (m_subMenuChild)
+            m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
+        if (!m_subMenuParent)
+            break;
+        return m_subMenuParent->OnSelect(dwSelectType);
+    case MPOS_SELECTRIGHT:
+        if (!m_subMenuParent)
+            break;
+        return m_subMenuParent->OnSelect(dwSelectType);
+    case MPOS_EXECUTE:
+    case MPOS_FULLCANCEL:
+        if (m_subMenuChild)
+            m_subMenuChild->OnSelect(dwSelectType);
+        if (!m_subMenuParent)
+            break;
+        return m_subMenuParent->OnSelect(dwSelectType);
+    case MPOS_CANCELLEVEL:
+        if (m_subMenuChild)
+            m_subMenuChild->OnSelect(dwSelectType);
+        break;
+    }
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT CMenuBand::_SetChildBand(CMenuBand * child)
+{
+    m_childBand = child;
+    return S_OK;
+}
+
+HRESULT CMenuBand::_SetParentBand(CMenuBand * parent)
+{
+    m_parentBand = parent;
+    return S_OK;
+}
+
+HRESULT CMenuBand::_IsPopup()
+{
+    return m_subMenuParent ? S_OK : S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient)
+{
+    m_subMenuChild = NULL;
+
+    if (!punkClient)
+    {
+        if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(NULL, -1);
+        if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(NULL, -1);
+        return S_OK;
+    }
+    HRESULT hr = punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild));
+    m_trackingPopup = m_subMenuChild != NULL;
+    DbgPrint("Tracking: %d\n", m_trackingPopup);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient)
+{
+    // HACK, so I can test for a submenu in the DeskBar
+    if (ppunkClient)
+    {
+        if (m_subMenuChild)
+            *ppunkClient = m_subMenuChild;
+        else
+            *ppunkClient = NULL;
+    }
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg)
+{
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet)
+{
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags)
+{
+    if (m_SFToolbar == NULL)
+    {
+        m_SFToolbar = new CMenuSFToolbar(this);
+    }
+
+    HRESULT hr = m_SFToolbar->SetShellFolder(psf, pidlFolder, hKey, dwFlags);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_site)
+    {
+        HWND hwndParent;
+
+        hr = m_site->GetWindow(&hwndParent);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        hr = m_SFToolbar->CreateToolbar(hwndParent, m_dwFlags);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        hr = m_SFToolbar->FillToolbar();
+    }
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv)
+{
+    if (m_SFToolbar)
+        return m_SFToolbar->GetShellFolder(pdwFlags, ppidl, riid, ppv);
+    return E_FAIL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    *theResult = 0;
+
+    if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK)
+    {
+        return m_staticToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+    }
+
+    if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK)
+    {
+        return m_SFToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+    }
+
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd)
+{
+    if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK)
+        return S_OK;
+
+    if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK)
+        return S_OK;
+
+    return S_FALSE;
+}
+
+HRESULT CMenuBand::_CallCBWithItemId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    return _CallCB(uMsg, wParam, lParam, id);
+}
+
+HRESULT CMenuBand::_CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    return _CallCB(uMsg, wParam, lParam, 0, pidl);
+}
+
+HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id, LPITEMIDLIST pidl)
+{
+    if (!m_psmc)
+        return S_FALSE;
+
+    HWND hwnd;
+    GetWindow(&hwnd);
+
+    SMDATA smData = { 0 };
+    smData.punk = static_cast<IShellMenu2*>(this);
+    smData.uId = id;
+    smData.uIdParent = m_uId;
+    smData.uIdAncestor = m_uIdAncestor;
+    smData.hwnd = hwnd;
+    smData.pidlItem = pidl;
+    if (m_staticToolbar)
+    {
+        smData.hmenu = m_hmenu;
+    }
+    smData.pvUserData = NULL;
+    if (m_SFToolbar)
+        m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf));
+    HRESULT hr = m_psmc->CallbackSM(&smData, uMsg, wParam, lParam);
+    ILFree(smData.pidlFolder);
+    if (smData.psf)
+        smData.psf->Release();
+    return hr;
+}
+
+HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, RECT& rcExclude)
+{
+    TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude };
+
+    UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN;
+
+    m_trackingPopup = TRUE;
+    DbgPrint("Tracking: %d\n", m_trackingPopup);
+
+    m_focusManager->PushTrackedPopup(popup);
+    if (m_menuOwner)
+    {
+        ::TrackPopupMenuEx(popup, flags, x, y, m_menuOwner, &params);
+    }
+    else
+    {
+        ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params);
+    }
+    m_focusManager->PopTrackedPopup(popup);
+
+    m_trackingPopup = FALSE;
+    DbgPrint("Tracking: %d\n", m_trackingPopup);
+
+    return S_OK;
+}
+
+HRESULT CMenuBand::_GetTopLevelWindow(HWND*topLevel)
+{
+    *topLevel = m_topLevelWindow;
+    return S_OK;
+}
+
+HRESULT CMenuBand::_OnHotItemChanged(CMenuToolbarBase * tb, INT id)
+{
+    if (m_trackingPopup && id == -1)
+    {
+        return S_FALSE;
+    }
+    m_hotBar = tb;
+    m_hotItem = id;
+    if (m_staticToolbar) m_staticToolbar->OnHotItemChanged(tb, id);
+    if (m_SFToolbar) m_SFToolbar->OnHotItemChanged(tb, id);
+    return S_OK;
+}
+
+HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
+{
+    HRESULT hr;
+
+    if (!(m_dwFlags & SMINIT_VERTICAL))
+    {
+        if (changeType == MPOS_SELECTRIGHT)
+        {
+            SendMessageW(m_menuOwner, WM_CANCELMODE, 0, 0);
+            if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL))
+            {
+                DbgPrint("SF Toolbars in Horizontal menus is not implemented.\n");
+                return S_FALSE;
+            }
+            else if (m_staticToolbar && m_hotBar == m_staticToolbar)
+            {
+                hr = m_staticToolbar->ChangeHotItem(VK_DOWN);
+                if (hr == S_FALSE)
+                {
+                    if (m_SFToolbar)
+                        return m_SFToolbar->ChangeHotItem(VK_HOME);
+                    else
+                        return m_staticToolbar->ChangeHotItem(VK_HOME);
+                }
+                return hr;
+            }
+        }
+        else if (changeType == MPOS_SELECTLEFT)
+        {
+            SendMessageW(m_menuOwner, WM_CANCELMODE, 0, 0);
+            if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL))
+            {
+                hr = m_staticToolbar->ChangeHotItem(VK_UP);
+                if (hr == S_FALSE)
+                {
+                    if (m_SFToolbar)
+                        return m_SFToolbar->ChangeHotItem(VK_END);
+                    else
+                        return m_staticToolbar->ChangeHotItem(VK_END);
+                }
+                return hr;
+            }
+            else if (m_SFToolbar && m_hotBar == m_SFToolbar)
+            {
+                DbgPrint("SF Toolbars in Horizontal menus is not implemented.\n");
+                return S_FALSE;
+            }
+        }
+    }
+    else if (changeType == VK_DOWN)
+    {
+        if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL))
+        {
+            hr = m_SFToolbar->ChangeHotItem(VK_DOWN);
+            if (hr == S_FALSE)
+            {
+                if (m_staticToolbar)
+                    return m_staticToolbar->ChangeHotItem(VK_HOME);
+                else
+                    return m_SFToolbar->ChangeHotItem(VK_HOME);
+            }
+            return hr;
+        }
+        else if (m_staticToolbar && m_hotBar == m_staticToolbar)
+        {
+            hr = m_staticToolbar->ChangeHotItem(VK_DOWN);
+            if (hr == S_FALSE)
+            {
+                if (m_SFToolbar)
+                    return m_SFToolbar->ChangeHotItem(VK_HOME);
+                else
+                    return m_staticToolbar->ChangeHotItem(VK_HOME);
+            }
+            return hr;
+        }
+    }
+    else if (changeType == VK_UP)
+    {
+        if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL))
+        {
+            hr = m_staticToolbar->ChangeHotItem(VK_UP);
+            if (hr == S_FALSE)
+            {
+                if (m_SFToolbar)
+                    return m_SFToolbar->ChangeHotItem(VK_END);
+                else
+                    return m_staticToolbar->ChangeHotItem(VK_END);
+            }
+            return hr;
+        }
+        else if (m_SFToolbar && m_hotBar == m_SFToolbar)
+        {
+            hr = m_SFToolbar->ChangeHotItem(VK_UP);
+            if (hr == S_FALSE)
+            {
+                if (m_staticToolbar)
+                    return m_staticToolbar->ChangeHotItem(VK_END);
+                else
+                    return m_SFToolbar->ChangeHotItem(VK_END);
+            }
+            return hr;
+        }
+    }
+    else if (changeType == MPOS_SELECTLEFT)
+    {
+        if (m_subMenuChild)
+            m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
+        if (!m_subMenuParent)
+            return S_OK;
+        return m_subMenuParent->OnSelect(MPOS_CANCELLEVEL);
+    }
+    else if (changeType == MPOS_SELECTRIGHT)
+    {
+        if (m_hotBar && m_hotItem >= 0)
+        {
+            if (m_hotBar->PopupItem(m_hotItem) == S_OK)
+                return S_FALSE;
+        }
+        if (!m_subMenuParent)
+            return S_OK;
+        return m_subMenuParent->OnSelect(changeType);
+    }
+    else
+    {
+        if (!m_subMenuParent)
+            return S_OK;
+        return m_subMenuParent->OnSelect(changeType);
+    }
+    return S_OK;
+}
+
+HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude, CMenuToolbarBase * toolbar, INT item)
+{
+    if (m_subMenuChild)
+    {
+        HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(toolbar, item);
+    if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(toolbar, item);
+
+    m_subMenuChild = popup;
+    m_trackingPopup = popup != NULL;
+    DbgPrint("Tracking: %d\n", m_trackingPopup);
+
+    if (popup)
+    {
+        if (m_subMenuParent)
+            IUnknown_SetSite(popup, m_subMenuParent);
+        else
+            IUnknown_SetSite(popup, m_site);
+
+        popup->Popup(pAt, pExclude, MPPF_RIGHT);
+    }
+
+    return S_OK;
+}
+
+HRESULT CMenuBand::_DisableMouseTrack(BOOL bDisable)
+{
+    if (m_staticToolbar)
+        m_staticToolbar->DisableMouseTrack(bDisable);
+    if (m_SFToolbar)
+        m_SFToolbar->DisableMouseTrack(bDisable);
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetToolbar(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetMinWidth(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetNoBorder(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::SetTheme(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetTop(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetBottom(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetTracked(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetParentSite(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetState(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::DoDefaultAction(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::IsEmpty(THIS)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO()
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty()
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::Load(IStream *pStm)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::Save(IStream *pStm, BOOL fClearDirty)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetSizeMax(ULARGE_INTEGER *pcbSize)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::GetClassID(CLSID *pClassID)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+{
+    UNIMPLEMENTED;
+    return S_OK;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuBand.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuBand.h
===================================================================
--- base/shell/rshell/CMenuBand.h	(rÃ©vision 0)
+++ base/shell/rshell/CMenuBand.h	(rÃ©vision 62573)
@@ -0,0 +1,194 @@
+/*
+* Shell Menu Band
+*
+* Copyright 2014 David Quintana
+*
+* 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
+*/
+#pragma once
+
+class CMenuToolbarBase;
+class CMenuStaticToolbar;
+class CMenuSFToolbar;
+class CMenuFocusManager;
+
+class CMenuBand :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IDeskBand,
+    public IObjectWithSite,
+    public IInputObject,
+    public IPersistStream,
+    public IOleCommandTarget,
+    public IServiceProvider,
+    public IMenuPopup,
+    public IMenuBand,
+    public IShellMenu2,
+    public IWinEventHandler,
+    public IShellMenuAcc
+{
+private:
+    CMenuFocusManager  * m_focusManager;
+    CMenuStaticToolbar * m_staticToolbar;
+    CMenuSFToolbar     * m_SFToolbar;
+
+    CComPtr<IOleWindow>         m_site;
+    CComPtr<IShellMenuCallback> m_psmc;
+    CComPtr<IMenuPopup>         m_subMenuChild;
+    CComPtr<IMenuPopup>         m_subMenuParent;
+    CComPtr<CMenuBand>          m_childBand;
+    CComPtr<CMenuBand>          m_parentBand;
+
+    UINT  m_uId;
+    UINT  m_uIdAncestor;
+    DWORD m_dwFlags;
+    PVOID m_UserData;
+    HMENU m_hmenu;
+    HWND  m_menuOwner;
+
+    BOOL m_useBigIcons;
+    HWND m_topLevelWindow;
+
+    CMenuToolbarBase * m_hotBar;
+    INT                m_hotItem;
+    BOOL               m_trackingPopup;
+
+public:
+    CMenuBand();
+    ~CMenuBand();
+
+    DECLARE_NOT_AGGREGATABLE(CMenuBand)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(CMenuBand)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand)
+        COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand)
+        COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+        COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)
+        COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistStream)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+        COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2)
+        COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
+    END_COM_MAP()
+
+    // *** IDeskBand methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi);
+
+    // *** IDockingWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow);
+    virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved);
+    virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved);
+
+    // *** IOleWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // *** IObjectWithSite methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
+    virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite);
+
+    // *** IInputObject methods ***
+    virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg);
+    virtual HRESULT STDMETHODCALLTYPE HasFocusIO();
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
+
+    // *** IPersistStream methods ***
+    virtual HRESULT STDMETHODCALLTYPE IsDirty();
+    virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm);
+    virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty);
+    virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize);
+
+    // *** IPersist methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID);
+
+    // *** IOleCommandTarget methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    // *** IServiceProvider methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    // *** IMenuPopup methods ***
+    virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType);
+    virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet);
+
+    // *** IDeskBar methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient);
+    virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient);
+    virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc);
+
+    // *** IMenuBand methods ***
+    virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg);
+    virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet);
+
+    // *** IShellMenu methods ***
+    virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags);
+    virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv);
+    virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags);
+    virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd);
+    virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags);
+
+    // *** IWinEventHandler methods ***
+    virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+    virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd);
+
+    // *** IShellMenu2 methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS);
+
+    // *** IShellMenuAcc methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetTop(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetState(THIS);
+    virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS);
+    virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS);
+
+    HRESULT _CallCBWithItemId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    HRESULT _CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    HRESULT _TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, RECT& rcExclude);
+    HRESULT _GetTopLevelWindow(HWND*topLevel);
+    HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id);
+    HRESULT _MenuItemHotTrack(DWORD changeType);
+    HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude, CMenuToolbarBase * toolbar, INT item);
+    HRESULT _DisableMouseTrack(BOOL bDisable);
+    HRESULT _SetChildBand(CMenuBand * child);
+    HRESULT _SetParentBand(CMenuBand * parent);
+    HRESULT _IsPopup();
+
+    BOOL UseBigIcons()
+    {
+        return m_useBigIcons;
+    }
+
+private:
+    HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id = 0, LPITEMIDLIST pidl = NULL);
+};

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuBand.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuDeskBar.cpp
===================================================================
--- base/shell/rshell/CMenuDeskBar.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CMenuDeskBar.cpp	(rÃ©vision 62573)
@@ -0,0 +1,662 @@
+/*
+ * Shell Menu Desk Bar
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#include "precomp.h"
+#include <atlwin.h>
+#include <shlwapi_undoc.h>
+
+#include "CMenuDeskBar.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
+
+const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36 } };
+
+extern "C"
+HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
+{
+    *ppv = NULL;
+
+    CMenuDeskBar * deskbar = new CComObject<CMenuDeskBar>();
+
+    if (!deskbar)
+        return E_OUTOFMEMORY;
+
+    HRESULT hr = deskbar->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        deskbar->Release();
+
+    return hr;
+}
+
+CMenuDeskBar::CMenuDeskBar() :
+    m_Client(NULL),
+    m_Banner(NULL),
+    m_Shown(FALSE)
+{
+}
+
+CMenuDeskBar::~CMenuDeskBar()
+{
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS)
+{
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd)
+{
+    if (lphwnd == NULL)
+        return E_POINTER;
+    *lphwnd = m_hWnd;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus)
+{
+    CComPtr<IInputObjectSite> ios;
+
+    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return ios->OnFocusChangeIS(punkObj, fSetFocus);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds,
+    OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID,
+    DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    if (IsEqualIID(*pguidCmdGroup, CGID_MenuDeskBar))
+    {
+        switch (nCmdID)
+        {
+        case 2: // refresh
+            return S_OK;
+        case 3: // load complete
+            return S_OK;
+        case 4: // set font metrics
+            return S_OK;
+        }
+    }
+    if (IsEqualIID(*pguidCmdGroup, CGID_Explorer))
+    {
+    }
+    else if (IsEqualIID(*pguidCmdGroup, IID_IDeskBarClient))
+    {
+        switch (nCmdID)
+        {
+        case 0:
+            // hide current band
+            break;
+        case 2:
+            break;
+        case 3:
+            break;
+        }
+    }
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    if (IsEqualGUID(guidService, SID_SMenuPopup) ||
+        IsEqualGUID(guidService, SID_SMenuBandParent) ||
+        IsEqualGUID(guidService, SID_STopLevelBrowser))
+    {
+        return this->QueryInterface(riid, ppvObject);
+    }
+
+    if (IsEqualGUID(guidService, SID_SMenuBandBottom) ||
+        IsEqualGUID(guidService, SID_SMenuBandBottomSelected) ||
+        IsEqualGUID(guidService, SID_SMenuBandChild))
+    {
+        if (m_Client == NULL)
+            return E_NOINTERFACE;
+
+        return IUnknown_QueryService(m_Client, guidService, riid, ppvObject);
+    }
+
+
+    if (m_Site == NULL)
+        return E_NOINTERFACE;
+
+    return IUnknown_QueryService(m_Site, guidService, riid, ppvObject);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
+{
+    return IUnknown_UIActivateIO(m_Client, fActivate, lpMsg);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO()
+{
+    CComPtr<IInputObject> io;
+
+    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return io->HasFocusIO();
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg)
+{
+    CComPtr<IInputObject> io;
+
+    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return io->TranslateAcceleratorIO(lpMsg);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient)
+{
+    CComPtr<IDeskBarClient> pDeskBandClient;
+    HRESULT hr;
+
+    m_Client.Release();
+
+    if (punkClient == NULL)
+        return S_OK;
+
+    if (m_hWnd == NULL)
+    {
+        Create(NULL);
+    }
+
+    hr = punkClient->QueryInterface(IID_PPV_ARG(IUnknown, &m_Client));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pDeskBandClient));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return IUnknown_GetWindow(m_Client, &m_ClientWindow);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(IUnknown **ppunkClient)
+{
+    if (ppunkClient == NULL)
+        return E_POINTER;
+
+    if (!m_Client)
+        return E_FAIL;
+
+    return m_Client->QueryInterface(IID_PPV_ARG(IUnknown, ppunkClient));
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB(LPRECT prc)
+{
+    if (prc == NULL)
+        return E_POINTER;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite)
+{
+    // Windows closes the bar if this is called when the bar is shown
+
+    if (m_Shown)
+        _CloseBar();
+
+    m_Site = pUnkSite;
+
+    IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_SubMenuParent));
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, void **ppvSite)
+{
+    if (m_Site == NULL)
+        return E_FAIL;
+
+    return m_Site->QueryInterface(riid, ppvSite);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
+{
+    HRESULT hr;
+    CComPtr<IOleCommandTarget> oct;
+    CComPtr<IInputObject> io;
+    CComPtr<IDeskBand> band;
+    CComPtr<IDeskBarClient> dbc;
+
+    if (m_hWnd == NULL)
+        return E_FAIL;
+
+    hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    // Windows calls this, but it appears to be unimplemented?
+    hr = dbc->SetModeDBC(1);
+    // Allow it to fail with E_NOTIMPL.
+
+    // No clue about the arg, using anything != 0
+    hr = dbc->UIActivateDBC(TRUE);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    RECT rc = { 0 };
+    hr = dbc->GetSize(0, &rc);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    // Unknown meaning
+    const int CMD = 19;
+    const int CMD_EXEC_OPT = 0;
+
+    hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    ::AdjustWindowRect(&rc, ::GetWindowLong(m_hWnd, GWL_STYLE), FALSE);
+    ::OffsetRect(&rc, -rc.left, -rc.top);
+
+    if (m_Banner != NULL)
+    {
+        BITMAP bm;
+        ::GetObject(m_Banner, sizeof(bm), &bm);
+        rc.right += bm.bmWidth;
+    }
+
+    int x, y, cx, cy;
+
+    RECT rcWorkArea;
+    GetWindowRect(GetDesktopWindow(), &rcWorkArea);
+    int waHeight = rcWorkArea.bottom - rcWorkArea.top;
+
+    switch (dwFlags & 0xFF000000)
+    {
+    case MPPF_BOTTOM:
+        x = ppt->x;
+        cx = rc.right - rc.left;
+        y = ppt->y - rc.bottom;
+        cy = rc.bottom - rc.top;
+        break;
+    case MPPF_RIGHT:
+        x = ppt->x + rc.left;
+        cx = rc.right - rc.left;
+        y = ppt->y + rc.top;
+        cy = rc.bottom - rc.top;
+        break;
+    case MPPF_TOP | MPPF_ALIGN_LEFT:
+        x = ppt->x - rc.right;
+        cx = rc.right - rc.left;
+        y = ppt->y + rc.top;
+        cy = rc.bottom - rc.top;
+        break;
+    case MPPF_TOP | MPPF_ALIGN_RIGHT:
+        x = ppt->x;
+        cx = rc.right - rc.left;
+        y = ppt->y + rc.top;
+        cy = rc.bottom - rc.top;
+        break;
+    }
+
+    if (x + cx > rcWorkArea.right)
+    {
+        // FIXME: Works, but it's oversimplified.
+        x = prcExclude->left - cx;
+        dwFlags = (dwFlags & (~MPPF_TOP)) | MPPF_LEFT;
+    }
+
+    if (y < rcWorkArea.top)
+    {
+        y = rcWorkArea.top;
+    }
+
+    if (cy > waHeight)
+    {
+        cy = waHeight;
+    }
+
+    if (y + cy > rcWorkArea.bottom)
+    {
+        y = rcWorkArea.bottom - cy;
+    }
+
+    this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW | SWP_NOACTIVATE);
+
+    m_ShowFlags = dwFlags;
+    m_Shown = true;
+
+    // HACK: The bar needs to be notified of the size AFTER it is shown.
+    // Quick & dirty way of getting it done.
+    BOOL bHandled;
+    _OnSize(WM_SIZE, 0, 0, bHandled);
+
+    UIActivateIO(TRUE, NULL);
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(THIS_ DWORD iIcon)
+{
+    HRESULT hr;
+    m_IconSize = iIcon;
+
+    // Unknown meaning (set flags? set icon size?)
+    const int CMD = 16;
+    const int CMD_EXEC_OPT = iIcon ? 0 : 2; // seems to work
+
+    hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    BOOL bHandled;
+    _OnSize(WM_SIZE, 0, 0, bHandled);
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(THIS_ DWORD* piIcon)
+{
+    if (piIcon)
+        *piIcon = m_IconSize;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap)
+{
+    m_Banner = hBitmap;
+
+    BOOL bHandled;
+    _OnSize(WM_SIZE, 0, 0, bHandled);
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(THIS_ HBITMAP* phBitmap)
+{
+    if (phBitmap)
+        *phBitmap = m_Banner;
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
+{
+    // Called by the MenuBand to assign itself as the logical child of the DeskBar
+
+    if (fSet)
+    {
+        m_SubMenuChild = pmp;
+    }
+    else
+    {
+        if (m_SubMenuChild)
+        {
+            if (pmp == m_SubMenuChild)
+            {
+                m_SubMenuChild = NULL;
+            }
+        }
+    }
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType)
+{
+    /* As far as I can tell, the submenu hierarchy looks like this:
+     *
+     * The DeskBar's Child is the Band it contains.
+     * The DeskBar's Parent is the SID_SMenuPopup of the Site.
+     *
+     * The Band's Child is the IMenuPopup of the child submenu.
+     * The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar).
+     *
+     * When the DeskBar receives a selection event:
+     * If it requires closing the window, it will notify the Child (Band) using CancelLevel.
+     * If it has to spread upwards (everything but CancelLevel), it will notify the Parent.
+     *
+     * When the Band receives a selection event, this is where it gets fuzzy:
+     * In which cases does it call the Parent? Probably not CancelLevel.
+     * In which cases does it call the Child?
+     * How does it react to calls?
+     *
+     */
+
+    switch (dwSelectType)
+    {
+    case MPOS_EXECUTE:
+    case MPOS_FULLCANCEL:
+    case MPOS_CANCELLEVEL:
+
+        _CloseBar();
+
+        if (dwSelectType == MPOS_CANCELLEVEL)
+            return S_OK;
+
+    case MPOS_SELECTLEFT:
+    case MPOS_SELECTRIGHT:
+    case MPOS_CHILDTRACKING:
+        if (m_SubMenuParent)
+            return m_SubMenuParent->OnSelect(dwSelectType);
+        break;
+    }
+
+    return S_OK;
+}
+
+HRESULT CMenuDeskBar::_CloseBar()
+{
+    CComPtr<IDeskBarClient> dbc;
+    HRESULT hr;
+
+    m_Shown = false;
+
+    if (m_SubMenuChild)
+    {
+        hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = dbc->UIActivateDBC(FALSE);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE);
+
+    return UIActivateIO(FALSE, NULL);
+}
+
+BOOL CMenuDeskBar::_IsSubMenuParent(HWND hwnd)
+{
+    CComPtr<IMenuPopup> popup = m_SubMenuParent;
+
+    while (popup)
+    {
+        HRESULT hr;
+        CComPtr<IOleWindow> window;
+
+        hr = popup->QueryInterface(IID_PPV_ARG(IOleWindow, &window));
+        if (FAILED_UNEXPECTEDLY(hr))
+            return FALSE;
+
+        HWND parent;
+
+        hr = window->GetWindow(&parent);
+        if (SUCCEEDED(hr) && hwnd == parent)
+            return TRUE;
+
+        popup = NULL;
+        hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup));
+        if (FAILED(hr))
+            return FALSE;
+    }
+
+    return FALSE;
+}
+
+LRESULT CMenuDeskBar::_OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    if (m_Client)
+    {
+        RECT rc;
+
+        GetClientRect(&rc);
+
+        if (m_Banner != NULL)
+        {
+            BITMAP bm;
+            ::GetObject(m_Banner, sizeof(bm), &bm);
+            rc.left += bm.bmWidth;
+        }
+
+        ::SetWindowPos(m_ClientWindow, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0);
+    }
+
+    return 0;
+}
+
+LRESULT CMenuDeskBar::_OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    if (!m_Client)
+        return 0;
+
+    CComPtr<IWinEventHandler> winEventHandler;
+    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return 0;
+
+    if (winEventHandler)
+    {
+        LRESULT result;
+        hr = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return 0;
+        return result;
+    }
+
+    return 0;
+}
+
+LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    bHandled = FALSE;
+
+    if (m_Banner && !m_IconSize)
+    {
+        BITMAP bm;
+        PAINTSTRUCT ps;
+        HDC hdc = BeginPaint(&ps);
+
+        HDC hdcMem = ::CreateCompatibleDC(hdc);
+        HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_Banner);
+
+        ::GetObject(m_Banner, sizeof(bm), &bm);
+
+        RECT rc;
+        if (!GetClientRect(&rc))
+            WARN("GetClientRect failed\n");
+
+        const int bx = bm.bmWidth;
+        const int by = bm.bmHeight;
+        const int cy = rc.bottom;
+
+        TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight);
+
+        if (!::StretchBlt(hdc, 0, 0, bx, cy - by, hdcMem, 0, 0, bx, 1, SRCCOPY))
+            WARN("StretchBlt failed\n");
+
+        if (!::BitBlt(hdc, 0, cy - by, bx, by, hdcMem, 0, 0, SRCCOPY))
+            WARN("BitBlt failed\n");
+
+        ::SelectObject(hdcMem, hbmOld);
+        ::DeleteDC(hdcMem);
+
+        EndPaint(&ps);
+    }
+
+    return TRUE;
+}
+
+LRESULT CMenuDeskBar::_OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    // BUG in ReactOS: WM_ACTIVATE/WA_INACTIVE makes no sense with lParam==hWnd
+    if (LOWORD(wParam) != 0 || reinterpret_cast<HWND>(lParam) == m_hWnd)
+    {
+        return 0;
+    }
+
+    // HACK! I just want it to work !!!
+    CComPtr<IDeskBar> db;
+    HRESULT hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return 0;
+
+    CComPtr<IUnknown> punk;
+
+    hr = db->GetClient(&punk);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return 0;
+
+    if (!punk && m_Shown)
+    {
+        if (!_IsSubMenuParent(reinterpret_cast<HWND>(lParam)))
+        {
+            OnSelect(MPOS_FULLCANCEL);
+        }
+    }
+
+    return 0;
+}
+
+LRESULT CMenuDeskBar::_OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    return MA_NOACTIVATE;
+}
+
+LRESULT CMenuDeskBar::_OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    if (wParam == 0 && m_Shown)
+    {
+        OnSelect(MPOS_FULLCANCEL);
+    }
+    return 0;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuDeskBar.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuDeskBar.h
===================================================================
--- base/shell/rshell/CMenuDeskBar.h	(rÃ©vision 0)
+++ base/shell/rshell/CMenuDeskBar.h	(rÃ©vision 62573)
@@ -0,0 +1,137 @@
+/*
+* Shell Menu Desk Bar
+*
+* Copyright 2014 David Quintana
+*
+* 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
+*/
+#pragma once
+
+typedef CWinTraits<
+    WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+    WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW
+> CMenuWinTraits;
+
+class CMenuDeskBar :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public CWindowImpl<CMenuDeskBar, CWindow, CMenuWinTraits>,
+    public IOleCommandTarget,
+    public IServiceProvider,
+    public IInputObjectSite,
+    public IInputObject,
+    public IMenuPopup,
+    public IObjectWithSite,
+    public IBanneredBar,
+    public IInitializeObject
+{
+private:
+    CComPtr<IUnknown>   m_Site;
+    CComPtr<IUnknown>   m_Client;
+    CComPtr<IMenuPopup> m_SubMenuParent;
+    CComPtr<IMenuPopup> m_SubMenuChild;
+
+    HWND m_ClientWindow;
+
+    DWORD m_IconSize;
+    HBITMAP m_Banner;
+
+    BOOL  m_Shown;
+    DWORD m_ShowFlags;
+
+public:
+    CMenuDeskBar();
+    ~CMenuDeskBar();
+
+    DECLARE_NOT_AGGREGATABLE(CMenuDeskBar)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    DECLARE_WND_CLASS_EX(_T("BaseBar"), CS_SAVEBITS | CS_DROPSHADOW, COLOR_3DFACE)
+
+    BEGIN_MSG_MAP(CMenuDeskBar)
+        MESSAGE_HANDLER(WM_SIZE, _OnSize)
+        MESSAGE_HANDLER(WM_NOTIFY, _OnNotify)
+        MESSAGE_HANDLER(WM_PAINT, _OnPaint)
+        MESSAGE_HANDLER(WM_ACTIVATE, _OnActivate)
+        MESSAGE_HANDLER(WM_ACTIVATEAPP, _OnAppActivate)
+        MESSAGE_HANDLER(WM_MOUSEACTIVATE, _OnMouseActivate)
+    END_MSG_MAP()
+
+    BEGIN_COM_MAP(CMenuDeskBar)
+        COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+        COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar)
+        COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject)
+    END_COM_MAP()
+
+    // *** IMenuPopup methods ***
+    virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType);
+    virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet);
+
+    // *** IOleWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // *** IObjectWithSite methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
+    virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite);
+
+    // *** IBanneredBar methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetIconSize(DWORD iIcon);
+    virtual HRESULT STDMETHODCALLTYPE GetIconSize(DWORD* piIcon);
+    virtual HRESULT STDMETHODCALLTYPE SetBitmap(HBITMAP hBitmap);
+    virtual HRESULT STDMETHODCALLTYPE GetBitmap(HBITMAP* phBitmap);
+
+    // *** IInitializeObject methods ***
+    virtual HRESULT STDMETHODCALLTYPE Initialize(THIS);
+
+    // *** IOleCommandTarget methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    // *** IServiceProvider methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    // *** IInputObjectSite methods ***
+    virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus);
+
+    // *** IInputObject methods ***
+    virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL bActivating, LPMSG lpMsg);
+    virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS);
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
+
+    // *** IDeskBar methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient);
+    virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient);
+    virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc);
+
+private:
+    // message handlers
+    LRESULT _OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT _OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT _OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT _OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+
+    BOOL _IsSubMenuParent(HWND hwnd);
+    HRESULT _CloseBar();
+};

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuDeskBar.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuFocusManager.cpp
===================================================================
--- base/shell/rshell/CMenuFocusManager.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CMenuFocusManager.cpp	(rÃ©vision 62573)
@@ -0,0 +1,638 @@
+/*
+ * Shell Menu Band
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#include "precomp.h"
+#include <windowsx.h>
+#include <commoncontrols.h>
+#include <shlwapi_undoc.h>
+
+#include "CMenuFocusManager.h"
+#include "CMenuToolbars.h"
+#include "CMenuBand.h"
+
+#undef _ASSERT
+#define _ASSERT(x) DbgAssert(!!(x), __FILE__, __LINE__, #x)
+
+bool DbgAssert(bool x, const char * filename, int line, const char * expr)
+{
+    if (!x)
+    {
+        char szMsg[512];
+        const char *fname;
+
+        fname = strrchr(filename, '\\');
+        if (fname == NULL)
+        {
+            fname = strrchr(filename, '/');
+        }
+
+        if (fname == NULL)
+            fname = filename;
+        else
+            fname++;
+
+        sprintf(szMsg, "%s:%d: Assertion failed: %s\n", fname, line, expr);
+
+        OutputDebugStringA(szMsg);
+
+        __debugbreak();
+    }
+    return x;
+}
+
+WINE_DEFAULT_DEBUG_CHANNEL(CMenuFocus);
+
+DWORD CMenuFocusManager::TlsIndex = 0;
+
+CMenuFocusManager * CMenuFocusManager::GetManager()
+{
+    return reinterpret_cast<CMenuFocusManager *>(TlsGetValue(TlsIndex));
+}
+
+CMenuFocusManager * CMenuFocusManager::AcquireManager()
+{
+    CMenuFocusManager * obj = NULL;
+
+    if (!TlsIndex)
+    {
+        if ((TlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES)
+            return NULL;
+    }
+
+    obj = GetManager();
+
+    if (!obj)
+    {
+        obj = new CComObject<CMenuFocusManager>();
+        TlsSetValue(TlsIndex, obj);
+    }
+
+    obj->AddRef();
+
+    return obj;
+}
+
+void CMenuFocusManager::ReleaseManager(CMenuFocusManager * obj)
+{
+    if (!obj->Release())
+    {
+        TlsSetValue(TlsIndex, NULL);
+    }
+}
+
+LRESULT CALLBACK CMenuFocusManager::s_MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam)
+{
+    return GetManager()->MsgFilterHook(nCode, wParam, lParam);
+}
+
+LRESULT CALLBACK CMenuFocusManager::s_GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam)
+{
+    return GetManager()->GetMsgHook(nCode, wParam, lParam);
+}
+
+HRESULT CMenuFocusManager::PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu)
+{
+    if (m_bandCount >= MAX_RECURSE)
+        return E_OUTOFMEMORY;
+
+    m_bandStack[m_bandCount].type = type;
+    m_bandStack[m_bandCount].mb = mb;
+    m_bandStack[m_bandCount].hmenu = hmenu;
+    m_bandCount++;
+
+    return S_OK;
+}
+
+HRESULT CMenuFocusManager::PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu)
+{
+    if (pType)  *pType = NoEntry;
+    if (pMb)    *pMb = NULL;
+    if (pHmenu) *pHmenu = NULL;
+
+    if (m_bandCount <= 0)
+        return S_FALSE;
+
+    m_bandCount--;
+
+    if (pType)  *pType = m_bandStack[m_bandCount].type;
+    if (*pType == TrackedMenuEntry)
+    {
+        if (pHmenu) *pHmenu = m_bandStack[m_bandCount].hmenu;
+    }
+    else
+    {
+        if (pMb) *pMb = m_bandStack[m_bandCount].mb;
+    }
+    
+    return S_OK;
+}
+
+CMenuFocusManager::CMenuFocusManager() :
+    m_current(NULL),
+    m_parent(NULL),
+    m_hMsgFilterHook(NULL),
+    m_hGetMsgHook(NULL),
+    m_mouseTrackDisabled(FALSE),
+    m_lastMoveFlags(0),
+    m_lastMovePos(0),
+    m_captureHwnd(0),
+    m_bandCount(0)
+{
+    m_ptPrev.x = 0;
+    m_ptPrev.y = 0;
+    m_threadId = GetCurrentThreadId();
+}
+
+CMenuFocusManager::~CMenuFocusManager()
+{
+}
+
+void CMenuFocusManager::DisableMouseTrack(HWND parent, BOOL disableThis)
+{
+    BOOL bDisable = FALSE;
+    BOOL lastDisable = FALSE;
+
+    int i = m_bandCount;
+    while (--i >= 0)
+    {
+        StackEntry& entry = m_bandStack[i];
+
+        if (entry.type == MenuPopupEntry)
+        {
+            HWND hwnd;
+            HRESULT hr = entry.mb->_GetTopLevelWindow(&hwnd);
+            if (FAILED_UNEXPECTEDLY(hr))
+                break;
+
+            if (hwnd == parent)
+            {
+                lastDisable = disableThis;
+                entry.mb->_DisableMouseTrack(disableThis);
+                bDisable = TRUE;
+            }
+            else
+            {
+                lastDisable = bDisable;
+                entry.mb->_DisableMouseTrack(bDisable);
+            }
+        }
+        else
+        {
+            continue;
+        }
+    }
+    m_mouseTrackDisabled = lastDisable;
+}
+
+void CMenuFocusManager::SetCapture(HWND child)
+{
+    if (m_captureHwnd != child)
+    {
+        if (child)
+        {
+            ::SetCapture(child);
+            m_captureHwnd = child;
+            DbgPrint("MouseTrack is now capturing %p\n", child);
+        }
+        else
+        {
+            ::ReleaseCapture();
+            m_captureHwnd = NULL;
+            DbgPrint("MouseTrack is now off\n");
+        }
+
+    }
+}
+
+HRESULT CMenuFocusManager::IsTrackedWindow(HWND hWnd)
+{
+    int i = m_bandCount;
+    while (--i >= 0)
+    {
+        StackEntry& entry = m_bandStack[i];
+
+        if (entry.type == MenuPopupEntry)
+        {
+            HRESULT hr = entry.mb->IsWindowOwner(hWnd);
+            if (FAILED_UNEXPECTEDLY(hr))
+                return hr;
+            if (hr == S_OK)
+                return S_OK;
+        }
+    }
+
+    return S_FALSE;
+}
+
+LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
+{
+    HWND child;
+    POINT pt;
+    int iHitTestResult;
+
+    pt = msg->pt;
+
+    child = WindowFromPoint(pt);
+
+    if (!m_parent)
+        return TRUE;
+
+    if (m_parent->mb->IsWindowOwner(child) != S_OK)
+        return TRUE;
+
+    ScreenToClient(child, &msg->pt);
+
+    /* Don't do anything if the mouse has not been moved */
+    if (msg->pt.x == m_ptPrev.x && msg->pt.y == m_ptPrev.y)
+        return TRUE;
+
+    m_ptPrev = msg->pt;
+
+    iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &msg->pt);
+
+    /* Make sure that iHitTestResult is one of the menu items and that it is not the current menu item */
+    if (iHitTestResult >= 0)
+    {
+        HWND hwndToolbar = child;
+        if (SendMessage(hwndToolbar, WM_USER_ISTRACKEDITEM, iHitTestResult, 0))
+        {
+            DbgPrint("Hot item tracking detected a change...\n");
+            if (m_current->type == TrackedMenuEntry)
+                SendMessage(m_parent->hwnd, WM_CANCELMODE, 0, 0);
+            else
+                m_current->mb->_MenuItemHotTrack(MPOS_CANCELLEVEL);
+            PostMessage(hwndToolbar, WM_USER_CHANGETRACKEDITEM, iHitTestResult, iHitTestResult);
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+LRESULT CMenuFocusManager::MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam)
+{
+    if (nCode < 0)
+        return CallNextHookEx(m_hMsgFilterHook, nCode, wParam, lParam);
+
+    if (nCode == MSGF_MENU)
+    {
+        BOOL callNext = TRUE;
+        MSG* msg = reinterpret_cast<MSG*>(lParam);
+        
+        switch (msg->message)
+        {
+        case WM_MOUSEMOVE:
+            callNext = ProcessMouseMove(msg);
+            break;
+        }
+
+        if (!callNext)
+            return 0;
+    }
+
+    return CallNextHookEx(m_hMsgFilterHook, nCode, wParam, lParam);
+}
+
+LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam)
+{
+    if (nCode < 0)
+        return CallNextHookEx(m_hGetMsgHook, nCode, wParam, lParam);
+
+    LPARAM pos = (LPARAM) GetMessagePos();
+
+    if (nCode == HC_ACTION)
+    {
+        BOOL callNext = TRUE;
+        MSG* msg = reinterpret_cast<MSG*>(lParam);
+        
+        switch (msg->message)
+        {
+        case WM_CLOSE:
+            break;
+
+        case WM_NCLBUTTONDOWN:
+        case WM_LBUTTONDOWN:
+            if (m_current->type == MenuPopupEntry)
+            {
+                POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) };
+
+                HWND child = WindowFromPoint(pt);
+                HWND window = GetAncestor(child, GA_ROOT);
+               
+                if (IsTrackedWindow(window) != S_OK)
+                {
+                    m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL);
+                }
+            }
+            break;
+        case WM_MOUSEMOVE:
+            if ((m_parent && m_parent->type==MenuPopupEntry) || ProcessMouseMove(msg))
+            {
+                if (m_current->type == MenuPopupEntry)
+                {
+                    if (m_lastMoveFlags != wParam || m_lastMovePos != pos)
+                    {
+                        m_lastMoveFlags = wParam;
+                        m_lastMovePos = pos;
+
+                        POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) };
+
+                        HWND child = WindowFromPoint(pt);
+                        HWND window = GetAncestor(child, GA_ROOT);
+
+                        if (m_parent && m_parent->mb->IsWindowOwner(child) == S_OK)
+                        {
+                            DisableMouseTrack(window, FALSE);
+                        }
+                        else if (IsTrackedWindow(child) == S_OK)
+                        {
+                            DisableMouseTrack(window, FALSE);
+                            SetCapture(child);
+                        }
+                        else
+                        {
+                            DisableMouseTrack(NULL, FALSE);
+                            SetCapture(NULL);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                callNext = FALSE;
+            }
+            break;
+        case WM_SYSKEYDOWN:
+        case WM_KEYDOWN:
+            DisableMouseTrack(m_current->hwnd, TRUE);
+            switch (msg->wParam)
+            {
+            case VK_MENU:
+            case VK_LMENU:
+            case VK_RMENU:
+                m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL);
+                break;
+            case VK_LEFT:
+                m_current->mb->_MenuItemHotTrack(MPOS_SELECTLEFT);
+                break;
+            case VK_RIGHT:
+                m_current->mb->_MenuItemHotTrack(MPOS_SELECTRIGHT);
+                break;
+            case VK_UP:
+                m_current->mb->_MenuItemHotTrack(VK_UP);
+                break;
+            case VK_DOWN:
+                m_current->mb->_MenuItemHotTrack(VK_DOWN);
+                break;
+            }
+            break;
+        }
+
+        if (!callNext)
+            return 0;
+    }
+
+    return CallNextHookEx(m_hGetMsgHook, nCode, wParam, lParam);
+}
+
+HRESULT CMenuFocusManager::PlaceHooks()
+{
+    if (m_current->hmenu)
+    {
+        DbgPrint("Entering MSGFILTER hook...\n");
+        m_hMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, s_MsgFilterHook, NULL, m_threadId);
+    }
+    else
+    {
+        DbgPrint("Entering GETMESSAGE hook...\n");
+        m_hGetMsgHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId);
+    }
+    return S_OK;
+}
+
+HRESULT CMenuFocusManager::RemoveHooks()
+{
+    DbgPrint("Removing all hooks...\n");
+    if (m_hMsgFilterHook)
+        UnhookWindowsHookEx(m_hMsgFilterHook);
+    if (m_hGetMsgHook)
+        UnhookWindowsHookEx(m_hGetMsgHook);
+    m_hMsgFilterHook = NULL;
+    m_hGetMsgHook = NULL;
+    return S_OK;
+}
+
+HRESULT CMenuFocusManager::UpdateFocus()
+{
+    HRESULT hr;
+    StackEntry * old = m_current;
+
+    if (old)
+        SetCapture(NULL);
+
+    if (m_bandCount > 0)
+        m_current = &(m_bandStack[m_bandCount - 1]);
+    else
+        m_current = NULL;
+
+    if (m_current && m_current->type != TrackedMenuEntry)
+    {
+        hr = m_current->mb->_GetTopLevelWindow(&(m_current->hwnd));
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (m_bandCount >= 2)
+    {
+        m_parent = &(m_bandStack[m_bandCount - 2]);
+        _ASSERT(m_parent->type != TrackedMenuEntry);
+    }
+    else
+    {
+        m_parent = NULL;
+    }
+
+    if (old && (!m_current || old->type != m_current->type))
+    {
+        DisableMouseTrack(NULL, FALSE);
+
+        hr = RemoveHooks();
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if (m_current && (!old || old->type != m_current->type))
+    {
+        hr = PlaceHooks();
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    if ((m_current && m_current->type == MenuPopupEntry) &&
+        (!m_parent || m_parent->type == MenuBarEntry))
+    {
+        DisableMouseTrack(m_current->hwnd, FALSE);
+
+        // When the mouse moves, it should set itself to the proper band
+        SetCapture(m_current->hwnd);
+    }
+
+    _ASSERT(!m_parent || m_parent->type != TrackedMenuEntry);
+
+    return S_OK;
+}
+
+HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb)
+{
+    _ASSERT(m_bandCount == 0);
+
+    HRESULT hr = PushToArray(MenuBarEntry, mb, NULL);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return UpdateFocus();
+}
+
+HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb)
+{
+    _ASSERT(!m_current || m_current->type != TrackedMenuEntry);
+
+    HRESULT hr = PushToArray(MenuPopupEntry, mb, NULL);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = UpdateFocus();
+
+    if (m_parent && m_parent->type != TrackedMenuEntry)
+    {
+        m_parent->mb->_SetChildBand(mb);
+        mb->_SetParentBand(m_parent->mb);
+    }
+
+    return hr;
+}
+
+HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup)
+{
+    _ASSERT(m_bandCount > 0);
+    _ASSERT(!m_current || m_current->type != TrackedMenuEntry);
+
+    HRESULT hr = PushToArray(TrackedMenuEntry, NULL, popup);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return UpdateFocus();
+}
+
+HRESULT CMenuFocusManager::PopMenuBar(CMenuBand * mb)
+{
+    StackEntryType type;
+    CMenuBand * mbc;
+    HRESULT hr;
+
+    hr = PopFromArray(&type, &mbc, NULL);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        UpdateFocus();
+        return hr;
+    }
+
+    _ASSERT(type == MenuBarEntry);
+    if (type != MenuBarEntry)
+        return E_FAIL;
+
+    if (!mbc)
+        return E_FAIL;
+
+    mbc->_SetParentBand(NULL);
+
+    hr = UpdateFocus();
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_current)
+    {
+        _ASSERT(m_current->type != TrackedMenuEntry);
+        m_current->mb->_SetChildBand(NULL);
+    }
+
+    return S_OK;
+}
+
+HRESULT CMenuFocusManager::PopMenuPopup(CMenuBand * mb)
+{
+    StackEntryType type;
+    CMenuBand * mbc;
+    HRESULT hr;
+
+    hr = PopFromArray(&type, &mbc, NULL);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        UpdateFocus();
+        return hr;
+    }
+
+    _ASSERT(type == MenuPopupEntry);
+    if (type != MenuPopupEntry)
+        return E_FAIL;
+
+    if (!mbc)
+        return E_FAIL;
+
+    mbc->_SetParentBand(NULL);
+
+    hr = UpdateFocus();
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (m_current)
+    {
+        _ASSERT(m_current->type != TrackedMenuEntry);
+        m_current->mb->_SetChildBand(NULL);
+    }
+
+    return S_OK;
+}
+
+HRESULT CMenuFocusManager::PopTrackedPopup(HMENU popup)
+{
+    StackEntryType type;
+    HMENU hmenu;
+    HRESULT hr;
+
+    hr = PopFromArray(&type, NULL, &hmenu);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        UpdateFocus();
+        return hr;
+    }
+
+    _ASSERT(type == TrackedMenuEntry);
+    if (type != TrackedMenuEntry)
+        return E_FAIL;
+
+    if (hmenu != popup)
+        return E_FAIL;
+
+    hr = UpdateFocus();
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return S_OK;
+}
\ No newline at end of file

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuFocusManager.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuFocusManager.h
===================================================================
--- base/shell/rshell/CMenuFocusManager.h	(rÃ©vision 0)
+++ base/shell/rshell/CMenuFocusManager.h	(rÃ©vision 62573)
@@ -0,0 +1,113 @@
+/*
+* Shell Menu Band
+*
+* Copyright 2014 David Quintana
+*
+* 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
+*/
+#pragma once
+
+class CMenuBand;
+
+class CMenuFocusManager :
+    public CComCoClass<CMenuFocusManager>,
+    public CComObjectRootEx<CComMultiThreadModelNoCS>
+{
+private:
+    static DWORD TlsIndex;
+
+    static CMenuFocusManager * GetManager();
+
+    enum StackEntryType
+    {
+        NoEntry,
+        MenuBarEntry,
+        MenuPopupEntry,
+        TrackedMenuEntry
+    };
+
+    struct StackEntry
+    {
+        StackEntryType type;
+        CMenuBand *    mb;
+        HMENU          hmenu;
+        HWND           hwnd;
+    };
+
+public:
+    static CMenuFocusManager * AcquireManager();
+
+    static void ReleaseManager(CMenuFocusManager * obj);
+
+private:
+    static LRESULT CALLBACK s_MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam);
+    static LRESULT CALLBACK s_GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam);
+
+private:
+    StackEntry * m_current;
+    StackEntry * m_parent;
+
+    HHOOK m_hMsgFilterHook;
+    HHOOK m_hGetMsgHook;
+    DWORD m_threadId;
+
+    BOOL m_mouseTrackDisabled;
+
+    WPARAM m_lastMoveFlags;
+    LPARAM m_lastMovePos;
+
+    POINT m_ptPrev;
+
+    HWND m_captureHwnd;
+
+    // TODO: make dynamic
+#define MAX_RECURSE 20
+    StackEntry m_bandStack[MAX_RECURSE];
+    int m_bandCount;
+
+    HRESULT PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu);
+    HRESULT PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu);
+
+protected:
+    CMenuFocusManager();
+    ~CMenuFocusManager();
+
+public:
+
+    DECLARE_NOT_AGGREGATABLE(CMenuFocusManager)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+    BEGIN_COM_MAP(CMenuFocusManager)
+    END_COM_MAP()
+
+private:
+    LRESULT GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam);
+    LRESULT MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam);
+    HRESULT PlaceHooks();
+    HRESULT RemoveHooks();
+    HRESULT UpdateFocus();
+    HRESULT IsTrackedWindow(HWND hWnd);
+
+    void DisableMouseTrack(HWND parent, BOOL disableThis);
+    void SetCapture(HWND child);
+
+    LRESULT ProcessMouseMove(MSG* msg);
+public:
+    HRESULT PushMenuBar(CMenuBand * mb);
+    HRESULT PushMenuPopup(CMenuBand * mb);
+    HRESULT PushTrackedPopup(HMENU popup);
+    HRESULT PopMenuBar(CMenuBand * mb);
+    HRESULT PopMenuPopup(CMenuBand * mb);
+    HRESULT PopTrackedPopup(HMENU popup);
+};

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuFocusManager.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuSite.cpp
===================================================================
--- base/shell/rshell/CMenuSite.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CMenuSite.cpp	(rÃ©vision 62573)
@@ -0,0 +1,374 @@
+/*
+ * Shell Menu Site
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#include "precomp.h"
+#include <atlwin.h>
+#include <shlwapi_undoc.h>
+
+#include "CMenuSite.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(menusite);
+
+extern "C"
+HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
+{
+    *ppv = NULL;
+
+    CMenuSite * site = new CComObject<CMenuSite>();
+
+    if (!site)
+        return E_OUTOFMEMORY;
+
+    HRESULT hr = site->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        site->Release();
+
+    return hr;
+}
+
+CMenuSite::CMenuSite() :
+    m_DeskBarSite(NULL),
+    m_BandObject(NULL),
+    m_DeskBand(NULL),
+    m_WinEventHandler(NULL),
+    m_hWndBand(NULL)
+{
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::GetBandSiteInfo(BANDSITEINFO *pbsinfo)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::RemoveBand(DWORD dwBandID)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::SetBandSiteInfo(const BANDSITEINFO *pbsinfo)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::SetModeDBC(DWORD dwMode)
+{
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::TranslateAcceleratorIO(LPMSG lpMsg)
+{
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::HasFocusIO()
+{
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus)
+{
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk)
+{
+    HRESULT hr;
+
+#define TO_HRESULT(x) ((HRESULT)(S_OK+(x)))
+
+    CComPtr<IUnknown> pUnknown;
+
+    punk->QueryInterface(IID_PPV_ARG(IUnknown, &pUnknown));
+
+    if (pUnknown == m_BandObject)
+        return TO_HRESULT(0);
+
+    if (m_BandObject)
+    {
+        hr = IUnknown_SetSite(m_BandObject, NULL);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+    }
+
+    m_BandObject = NULL;
+    m_DeskBand = NULL;
+    m_WinEventHandler = NULL;
+    m_hWndBand = NULL;
+
+    if (!pUnknown)
+        return TO_HRESULT(0);
+
+    hr = pUnknown->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = pUnknown->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = IUnknown_SetSite(pUnknown, this->ToIUnknown());
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = IUnknown_GetWindow(pUnknown, &m_hWndBand);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    m_BandObject = pUnknown;
+
+    return TO_HRESULT(0);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::EnumBands(UINT uBand, DWORD* pdwBandID)
+{
+    if (uBand != 0)
+        return E_FAIL;
+
+    *pdwBandID = 0;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    return IUnknown_Exec(m_DeskBarSite, *pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv)
+{
+    if (dwBandID != 0 || m_BandObject == NULL)
+    {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    return m_BandObject->QueryInterface(riid, ppv);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::GetSize(DWORD dwWhich, LPRECT prc)
+{
+    memset(prc, 0, sizeof(*prc));
+
+    if (dwWhich != 0)
+        return S_OK;
+
+    if (m_DeskBand == NULL)
+        return S_OK;
+
+    DESKBANDINFO info = { 0 };
+    info.dwMask = DBIM_MAXSIZE;
+
+    m_DeskBand->GetBandInfo(0, 0, &info);
+
+    prc->right = info.ptMaxSize.x;
+    prc->bottom = info.ptMaxSize.y;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::GetWindow(HWND *phwnd)
+{
+    if (!IsWindow())
+        return E_FAIL;
+
+    *phwnd = m_hWnd;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::IsWindowOwner(HWND hWnd)
+{
+    if (hWnd == m_hWnd)
+        return S_OK;
+
+    if (!m_WinEventHandler)
+        return S_FALSE;
+
+    return m_WinEventHandler->IsWindowOwner(hWnd);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    if (!m_WinEventHandler)
+        return S_OK;
+
+    return m_WinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName)
+{
+    if (dwBandID != 0)
+        return E_FAIL;
+
+    if (!m_BandObject)
+    {
+        *ppstb = NULL;
+        return E_NOINTERFACE;
+    }
+
+    HRESULT hr = m_BandObject->QueryInterface(IID_PPV_ARG(IDeskBand, ppstb));
+
+    *pdwState = 1;
+
+    if (cchName > 0)
+        pszName[0] = 0;
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    *ppvObject = NULL;
+
+    if (IsEqualGUID(guidService, SID_SMenuBandBottom) ||
+        IsEqualGUID(guidService, SID_SMenuBandBottomSelected) ||
+        IsEqualGUID(guidService, SID_SMenuBandChild))
+    {
+        if (m_BandObject == NULL)
+            return E_NOINTERFACE;
+
+        return IUnknown_QueryService(m_BandObject, guidService, riid, ppvObject);
+    }
+
+    if (!m_DeskBarSite)
+        return E_NOINTERFACE;
+
+    return IUnknown_QueryService(m_DeskBarSite, guidService, riid, ppvObject);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+{
+    if (!m_DeskBarSite)
+        return E_FAIL;
+
+    return IUnknown_QueryStatus(m_DeskBarSite, *pguidCmdGroup, cCmds, prgCmds, pCmdText);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::SetDeskBarSite(IUnknown *punkSite)
+{
+    HRESULT hr;
+
+    CComPtr<IUnknown> protectThis(this->ToIUnknown());
+
+    if (punkSite)
+    {
+        HWND hWndSite;
+
+        m_DeskBarSite = NULL;
+
+        hr = IUnknown_GetWindow(punkSite, &hWndSite);
+
+        if (FAILED(hr) || !hWndSite)
+            return E_FAIL;
+
+        if (!m_hWnd)
+        {
+            Create(hWndSite, NULL, L"MenuSite");
+        }
+
+        m_DeskBarSite = punkSite;
+
+        return S_OK;
+    }
+
+    if (m_DeskBand)
+    {
+        m_DeskBand->CloseDW(0);
+    }
+
+    hr = IUnknown_SetSite(m_BandObject, NULL);
+
+    m_BandObject = NULL;
+    m_DeskBand = NULL;
+    m_WinEventHandler = NULL;
+    m_hWndBand = NULL;
+    m_hWnd = NULL;
+    m_DeskBarSite = NULL;
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateDBC(DWORD dwState)
+{
+    if (!m_DeskBand)
+        return S_OK;
+
+    return m_DeskBand->ShowDW(dwState != 0);
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
+{
+    if (lpMsg)
+        return E_FAIL;
+
+    return IUnknown_UIActivateIO(m_BandObject, fActivate, lpMsg);
+}
+
+BOOL CMenuSite::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId)
+{
+    HWND hWndTarget = NULL;
+    CComPtr<IUnknown> protectThis(this->ToIUnknown());
+
+    switch (uMsg)
+    {
+    case WM_SIZE:
+        if (m_BandObject)
+        {
+            CComPtr<IMenuPopup> pMenuPopup;
+            if (SUCCEEDED(m_BandObject->QueryInterface(IID_PPV_ARG(IMenuPopup, &pMenuPopup))))
+            {
+                RECT Rect = { 0 };
+                GetClientRect(&Rect);
+                Rect.right = Rect.right;
+                pMenuPopup->OnPosRectChangeDB(&Rect);
+            }
+        }
+        hWndTarget = hWnd;
+        lResult = 1;
+        break;
+    case WM_NOTIFY:
+        hWndTarget = reinterpret_cast<LPNMHDR>(lParam)->hwndFrom;
+        break;
+    case WM_COMMAND:
+        hWndTarget = (HWND) lParam;
+        break;
+    default:
+        return FALSE;
+    }
+
+    if (hWndTarget && m_WinEventHandler &&
+        m_WinEventHandler->IsWindowOwner(hWndTarget) == S_OK)
+    {
+        if (SUCCEEDED(m_WinEventHandler->OnWinEvent(hWndTarget, uMsg, wParam, lParam, &lResult)))
+            return TRUE;
+    }
+
+    return FALSE;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuSite.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuSite.h
===================================================================
--- base/shell/rshell/CMenuSite.h	(rÃ©vision 0)
+++ base/shell/rshell/CMenuSite.h	(rÃ©vision 62573)
@@ -0,0 +1,106 @@
+/*
+ * Shell Menu Site
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#pragma once
+
+class CMenuSite :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public CWindowImpl<CMenuSite, CWindow, CControlWinTraits>,
+    public IBandSite,
+    public IDeskBarClient,
+    public IOleCommandTarget,
+    public IInputObject,
+    public IInputObjectSite,
+    public IWinEventHandler,
+    public IServiceProvider
+{
+private:
+    CComPtr<IUnknown>         m_DeskBarSite;
+    CComPtr<IUnknown>         m_BandObject;
+    CComPtr<IDeskBand>        m_DeskBand;
+    CComPtr<IWinEventHandler> m_WinEventHandler;
+    HWND                      m_hWndBand;
+
+public:
+    CMenuSite();
+    ~CMenuSite() {}
+
+    DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_MENU)
+
+    DECLARE_NOT_AGGREGATABLE(CMenuSite)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+    BEGIN_COM_MAP(CMenuSite)
+        COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBarClient, IDeskBarClient)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite)
+        COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+    END_COM_MAP()
+
+    // IBandSite
+    virtual HRESULT STDMETHODCALLTYPE AddBand(IUnknown * punk);
+    virtual HRESULT STDMETHODCALLTYPE EnumBands(UINT uBand, DWORD* pdwBandID);
+    virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName);
+    virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv);
+
+    // IDeskBarClient
+    virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite);
+    virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc);
+    virtual HRESULT STDMETHODCALLTYPE UIActivateDBC(DWORD dwState);
+
+    // IOleWindow
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+
+    // IOleCommandTarget
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    // IInputObject
+    virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg);
+    virtual HRESULT STDMETHODCALLTYPE HasFocusIO();
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
+
+    // IInputObjectSite
+    virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus);
+
+    // IWinEventHandler
+    virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd);
+    virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+
+    // IServiceProvider
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+
+    // Using custom message map instead 
+    virtual BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId = 0);
+
+    // UNIMPLEMENTED
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+    virtual HRESULT STDMETHODCALLTYPE GetBandSiteInfo(BANDSITEINFO *pbsinfo);
+    virtual HRESULT STDMETHODCALLTYPE RemoveBand(DWORD dwBandID);
+    virtual HRESULT STDMETHODCALLTYPE SetBandSiteInfo(const BANDSITEINFO *pbsinfo);
+    virtual HRESULT STDMETHODCALLTYPE SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState);
+    virtual HRESULT STDMETHODCALLTYPE SetModeDBC(DWORD dwMode);
+
+private:
+    IUnknown * ToIUnknown() { return static_cast<IDeskBarClient*>(this); }
+};

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuSite.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuToolbars.cpp
===================================================================
--- base/shell/rshell/CMenuToolbars.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CMenuToolbars.cpp	(rÃ©vision 62573)
@@ -0,0 +1,1310 @@
+/*
+ * Shell Menu Band
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#include "precomp.h"
+#include <windowsx.h>
+#include <commoncontrols.h>
+#include <shlwapi_undoc.h>
+
+#include "CMenuBand.h"
+#include "CMenuToolbars.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(CMenuToolbars);
+
+extern "C"
+HRESULT WINAPI SHGetImageList(
+    _In_   int iImageList,
+    _In_   REFIID riid,
+    _Out_  void **ppv
+    );
+
+// FIXME: Enable if/when wine comctl supports this flag properly
+#define USE_TBSTYLE_EX_VERTICAL 0
+
+#define TIMERID_HOTTRACK 1
+#define SUBCLASS_ID_MENUBAND 1
+
+HRESULT CMenuToolbarBase::DisableMouseTrack(BOOL bDisable)
+{
+    m_disableMouseTrack = bDisable;
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    NMHDR * hdr;
+    NMPGCALCSIZE* csize;
+    SIZE tbs;
+
+    *theResult = 0;
+    switch (uMsg)
+    {
+    case WM_COMMAND:
+        return OnCommand(wParam, lParam, theResult);
+
+    case WM_NOTIFY:
+        hdr = reinterpret_cast<LPNMHDR>(lParam);
+        switch (hdr->code)
+        {
+        case TTN_GETDISPINFOA:
+        case TTN_GETDISPINFOW:
+            return S_OK;
+
+        case TBN_DELETINGBUTTON:
+            return OnDeletingButton(reinterpret_cast<LPNMTOOLBAR>(hdr));
+
+        case PGN_CALCSIZE:
+            csize = reinterpret_cast<LPNMPGCALCSIZE>(hdr);
+
+            GetIdealSize(tbs);
+            if (csize->dwFlag == PGF_CALCHEIGHT)
+            {
+                csize->iHeight = tbs.cy;
+            }
+            else if (csize->dwFlag == PGF_CALCWIDTH)
+            {
+                csize->iHeight = tbs.cx;
+            }
+            return S_OK;
+
+        case TBN_DROPDOWN:
+            return OnCommand(reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem, 0, theResult);
+
+        case TBN_HOTITEMCHANGE:
+            return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult);
+
+        case NM_RCLICK:
+            return OnContextMenu(reinterpret_cast<LPNMMOUSE>(hdr));
+
+        case NM_CUSTOMDRAW:
+            return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult);
+
+        case RBN_CHILDSIZE:
+            return S_OK;
+
+        case NM_RELEASEDCAPTURE:
+            break;
+
+        case NM_RDOWN:
+        case NM_LDOWN:
+            break;
+
+        case TBN_GETDISPINFO:
+            break;
+
+        case TBN_BEGINDRAG:
+        case TBN_ENDDRAG:
+            break;
+
+        case NM_TOOLTIPSCREATED:
+            break;
+
+        case TBN_GETINFOTIP:
+            // TODO: Get tooltip for item
+            break;
+
+        default:
+            DbgPrint("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom);
+            return S_OK;
+        }
+        return S_FALSE;
+    }
+
+    return S_FALSE;
+}
+
+HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult)
+{
+    RECT rc;
+    HDC hdc;
+    HBRUSH bgBrush;
+    HBRUSH hotBrush;
+    COLORREF clrText;
+    COLORREF clrTextHighlight;
+    bool isHot, isPopup;
+    TBBUTTONINFO btni;
+
+    switch (cdraw->nmcd.dwDrawStage)
+    {
+    case CDDS_PREPAINT:
+        if (m_toolbarFlags & SMINIT_VERTICAL)
+            *theResult = CDRF_NOTIFYITEMDRAW;
+        return S_OK;
+
+    case CDDS_ITEMPREPAINT:
+
+        clrText = GetSysColor(COLOR_MENUTEXT);
+        clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT);
+
+        bgBrush = GetSysColorBrush(COLOR_MENU);
+        hotBrush = GetSysColorBrush(m_useFlatMenus ? COLOR_MENUHILIGHT : COLOR_HIGHLIGHT);
+
+        rc = cdraw->nmcd.rc;
+        hdc = cdraw->nmcd.hdc;
+
+        isHot = m_hotBar == this && m_hotItem == static_cast<INT>(cdraw->nmcd.dwItemSpec);
+        isPopup = m_popupBar == this && m_popupItem == static_cast<INT>(cdraw->nmcd.dwItemSpec);
+
+        if (isHot || (m_hotItem < 0 && isPopup))
+        {
+            cdraw->nmcd.uItemState |= CDIS_HOT;
+        }
+        else
+        {
+            cdraw->nmcd.uItemState &= ~CDIS_HOT;
+        }
+
+        if (cdraw->nmcd.uItemState&CDIS_HOT)
+        {
+            FillRect(hdc, &rc, hotBrush);
+            SetTextColor(hdc, clrTextHighlight);
+            cdraw->clrText = clrTextHighlight;
+        }
+        else
+        {
+            FillRect(hdc, &rc, bgBrush);
+            SetTextColor(hdc, clrText);
+            cdraw->clrText = clrText;
+        }
+
+        cdraw->iListGap += 4;
+
+        *theResult = CDRF_NOTIFYPOSTPAINT | TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOOFFSET | TBCDRF_NOMARK | 0x00800000; // FIXME: the last bit is Vista+, for debugging only
+        return S_OK;
+
+    case CDDS_ITEMPOSTPAINT:
+        btni.cbSize = sizeof(btni);
+        btni.dwMask = TBIF_STYLE;
+        SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, cdraw->nmcd.dwItemSpec, reinterpret_cast<LPARAM>(&btni));
+        if (btni.fsStyle & BTNS_DROPDOWN)
+        {
+            SelectObject(cdraw->nmcd.hdc, m_marlett);
+            WCHAR text [] = L"8";
+            SetBkMode(cdraw->nmcd.hdc, TRANSPARENT);
+            RECT rc = cdraw->nmcd.rc;
+            rc.right += 1;
+            DrawTextEx(cdraw->nmcd.hdc, text, 1, &rc, DT_NOCLIP | DT_VCENTER | DT_RIGHT | DT_SINGLELINE, NULL);
+        }
+        *theResult = TRUE;
+        return S_OK;
+    }
+    return S_OK;
+}
+
+CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) :
+    m_hwnd(NULL),
+    m_useFlatMenus(FALSE),
+    m_SubclassOld(NULL),
+    m_disableMouseTrack(FALSE),
+    m_menuBand(menuBand),
+    m_hwndToolbar(NULL),
+    m_dwMenuFlags(0),
+    m_hasIdealSize(FALSE),
+    m_usePager(usePager),
+    m_hotItem(-1),
+    m_popupItem(-1),
+    m_isTracking(FALSE)
+{
+    m_marlett = CreateFont(
+        0, 0, 0, 0, 0, 0, 0, 0, DEFAULT_CHARSET,
+        OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+        DEFAULT_QUALITY, FF_DONTCARE, L"Marlett");
+}
+
+CMenuToolbarBase::~CMenuToolbarBase()
+{
+    DeleteObject(m_marlett);
+}
+
+HRESULT CMenuToolbarBase::IsWindowOwner(HWND hwnd)
+{
+    return (m_hwnd && m_hwnd == hwnd) ||
+        (m_hwndToolbar && m_hwndToolbar == hwnd) ? S_OK : S_FALSE;
+}
+
+void CMenuToolbarBase::InvalidateDraw()
+{
+    InvalidateRect(m_hwnd, NULL, FALSE);
+}
+
+HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow)
+{
+    ::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE);
+
+    UpdateImageLists();
+
+    SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0);
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::UpdateImageLists()
+{
+    if ((m_toolbarFlags & (SMINIT_TOPLEVEL | SMINIT_VERTICAL)) == SMINIT_TOPLEVEL) // not vertical.
+    {
+        /* Hide the placeholders for the button images */
+        SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0);
+        return S_OK;
+    }
+
+    int shiml;
+    if (m_menuBand->UseBigIcons())
+    {
+        shiml = SHIL_LARGE;
+        SendMessageW(m_hwndToolbar, TB_SETPADDING, 0, MAKELPARAM(4, 0));
+    }
+    else
+    {
+        shiml = SHIL_SMALL;
+        SendMessageW(m_hwndToolbar, TB_SETPADDING, 0, MAKELPARAM(4, 4));
+    }
+
+    IImageList * piml;
+    HRESULT hr = SHGetImageList(shiml, IID_PPV_ARG(IImageList, &piml));
+    if (SUCCEEDED(hr))
+    {
+        SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml));
+    }
+    else
+    {
+        SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, 0);
+    }
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::Close()
+{
+    DestroyWindow(m_hwndToolbar);
+    if (m_hwndToolbar != m_hwnd)
+        DestroyWindow(m_hwnd);
+    m_hwndToolbar = NULL;
+    m_hwnd = NULL;
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
+{
+    LONG tbStyles = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
+        TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_CUSTOMERASE |
+        CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP;
+    LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER;
+
+    if (dwFlags & SMINIT_VERTICAL)
+    {
+        tbStyles |= CCS_VERT;
+
+#if USE_TBSTYLE_EX_VERTICAL
+        // FIXME: Use when it works in ros (?)
+        tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW;
+#endif
+    }
+
+    m_toolbarFlags = dwFlags;
+
+    RECT rc;
+
+    if (!::GetClientRect(hwndParent, &rc) || (rc.left == rc.right) || (rc.top == rc.bottom))
+    {
+        rc.left = 0;
+        rc.top = 0;
+        rc.right = 1;
+        rc.bottom = 1;
+    }
+
+    HWND hwndToolbar = CreateWindowEx(
+        tbExStyles, TOOLBARCLASSNAMEW, NULL,
+        tbStyles, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
+        hwndParent, NULL, _AtlBaseModule.GetModuleInstance(), 0);
+
+    if (hwndToolbar == NULL)
+        return E_FAIL;
+
+    if (m_usePager)
+    {
+        LONG pgStyles = PGS_VERT | WS_CHILD | WS_VISIBLE;
+        LONG pgExStyles = 0;
+
+        HWND hwndPager = CreateWindowEx(
+            pgExStyles, WC_PAGESCROLLER, NULL,
+            pgStyles, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
+            hwndParent, NULL, _AtlBaseModule.GetModuleInstance(), 0);
+
+        ::SetParent(hwndToolbar, hwndPager);
+        ::SetParent(hwndPager, hwndParent);
+
+        SendMessage(hwndPager, PGM_SETCHILD, 0, reinterpret_cast<LPARAM>(hwndToolbar));
+        m_hwndToolbar = hwndToolbar;
+        m_hwnd = hwndPager;
+    }
+    else
+    {
+        ::SetParent(hwndToolbar, hwndParent);
+        m_hwndToolbar = hwndToolbar;
+        m_hwnd = hwndToolbar;
+    }
+
+    /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */
+    SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
+
+    SetWindowLongPtr(hwndToolbar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
+    m_SubclassOld = (WNDPROC) SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc));
+
+    UpdateImageLists();
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::GetIdealSize(SIZE& size)
+{
+    size.cx = size.cy = 0;
+
+    if (m_hwndToolbar && !m_hasIdealSize)
+    {
+        SendMessageW(m_hwndToolbar, TB_AUTOSIZE, 0, 0);
+        SendMessageW(m_hwndToolbar, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&m_idealSize));
+        m_hasIdealSize = TRUE;
+    }
+
+    size = m_idealSize;
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::SetPosSize(int x, int y, int cx, int cy)
+{
+    if (m_hwnd != m_hwndToolbar)
+    {
+        SetWindowPos(m_hwndToolbar, NULL, x, y, cx, m_idealSize.cy, 0);
+    }
+    SetWindowPos(m_hwnd, NULL, x, y, cx, cy, 0);
+    if (m_toolbarFlags & SMINIT_VERTICAL)
+    {
+        DWORD btnSize = SendMessage(m_hwndToolbar, TB_GETBUTTONSIZE, 0, 0);
+        SendMessage(m_hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(cx, HIWORD(btnSize)));
+    }
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::GetWindow(HWND *phwnd)
+{
+    if (!phwnd)
+        return E_FAIL;
+
+    *phwnd = m_hwnd;
+
+    return S_OK;
+}
+
+LRESULT CALLBACK CMenuToolbarBase::s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    CMenuToolbarBase * pthis = reinterpret_cast<CMenuToolbarBase *>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
+    return pthis->SubclassProc(hWnd, uMsg, wParam, lParam);
+}
+
+LRESULT CMenuToolbarBase::SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    LRESULT lr;
+
+    switch (uMsg)
+    {
+    case WM_USER_ISTRACKEDITEM:
+        m_SubclassOld(hWnd, uMsg, wParam, lParam);
+        return IsTrackedItem(wParam);
+    case WM_USER_CHANGETRACKEDITEM:
+        m_SubclassOld(hWnd, uMsg, wParam, lParam);
+        return ChangeTrackedItem(wParam);
+
+    case WM_COMMAND:
+        OnWinEvent(hWnd, uMsg, wParam, lParam, &lr);
+        break;
+    case WM_NOTIFY:
+        OnWinEvent(hWnd, uMsg, wParam, lParam, &lr);
+        break;
+    case WM_TIMER:
+        if (wParam == TIMERID_HOTTRACK)
+        {
+            KillTimer(hWnd, TIMERID_HOTTRACK);
+
+            DbgPrint("Closing previous submenu...\n");
+
+            m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL, NULL, -1);
+
+            DbgPrint("Opening new submenu...\n");
+
+            PopupItem(m_hotItem);
+        }
+    }
+
+    return m_SubclassOld(hWnd, uMsg, wParam, lParam);
+}
+
+HRESULT CMenuToolbarBase::OnHotItemChange(const NMTBHOTITEM * hot, LRESULT * theResult)
+{
+    if (m_disableMouseTrack && hot->dwFlags & HICF_MOUSE)
+    {
+        *theResult = 1;
+        return S_OK;
+    }
+
+    if (hot->dwFlags & HICF_LEAVING)
+    {
+        KillTimer(m_hwndToolbar, TIMERID_HOTTRACK);
+
+        if (m_menuBand->_OnHotItemChanged(NULL, -1) == S_FALSE)
+        {
+            *theResult = 1;
+        }
+        else
+        {
+            m_menuBand->_OnHotItemChanged(NULL, -1);
+            m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING);
+        }
+
+        return S_OK;
+    }
+
+    if (m_hotItem != hot->idNew)
+    {
+        if (hot->dwFlags & HICF_MOUSE &&
+            m_toolbarFlags & SMINIT_VERTICAL)
+        {
+            DWORD elapsed = 0;
+            SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0);
+            SetTimer(m_hwndToolbar, TIMERID_HOTTRACK, elapsed, NULL);
+        }
+
+        m_menuBand->_OnHotItemChanged(this, hot->idNew);
+        m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING);
+
+        if (m_isTracking && !(m_toolbarFlags & SMINIT_VERTICAL))
+        {
+            KillTimer(m_hwndToolbar, TIMERID_HOTTRACK);
+
+            m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL, NULL, -1);
+
+            PopupItem(m_hotItem);
+        }
+        return S_OK;
+    }
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::OnHotItemChanged(CMenuToolbarBase * toolbar, INT item)
+{
+    BOOL wasChecked = FALSE;
+    if (m_hotBar == this && !(m_toolbarFlags & SMINIT_VERTICAL))
+    {
+        wasChecked = SendMessage(m_hwndToolbar, TB_ISBUTTONCHECKED, m_hotItem, 0);
+        if (wasChecked)
+        {
+            SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_hotItem, FALSE);
+        }
+    }
+    m_hotBar = toolbar;
+    m_hotItem = item;
+    if (wasChecked && m_hotBar == this && !(m_toolbarFlags & SMINIT_VERTICAL))
+    {
+        SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_hotItem, TRUE);
+    }
+    InvalidateDraw();
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::OnPopupItemChanged(CMenuToolbarBase * toolbar, INT item)
+{
+    if (toolbar == NULL && m_popupBar == this)
+    {
+        SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_popupItem, FALSE);
+        m_isTracking = FALSE;
+        DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking);
+    }
+    m_popupBar = toolbar;
+    m_popupItem = item;
+    InvalidateDraw();
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::IsTrackedItem(INT index)
+{
+    TBBUTTON btn;
+
+    if (m_hotBar != this)
+        return S_FALSE;
+
+    SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
+
+    if (m_hotItem == btn.idCommand)
+        return S_OK;
+    return S_FALSE;
+}
+
+HRESULT CMenuToolbarBase::ChangeTrackedItem(INT index)
+{
+    TBBUTTON btn;
+    SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
+
+    DbgPrint("Changing tracked item to %d...\n", index);
+
+    if (m_hotItem != btn.idCommand)
+    {
+        m_isTracking = TRUE;
+        DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking);
+
+        SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0);
+    }
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, UINT index, IShellMenu* childShellMenu)
+{
+    IBandSite* pBandSite;
+    IDeskBar* pDeskBar;
+
+    HRESULT hr = 0;
+    RECT rc = { 0 };
+    RECT rcx = { 0 };
+
+    if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc)))
+        return E_FAIL;
+
+    GetWindowRect(m_hwnd, &rcx);
+
+    POINT a = { rc.left, rc.top };
+    POINT b = { rc.right, rc.bottom };
+    POINT c = { rcx.left, rcx.top };
+    POINT d = { rcx.right, rcx.bottom };
+
+    ClientToScreen(m_hwndToolbar, &a);
+    ClientToScreen(m_hwndToolbar, &b);
+    ClientToScreen(m_hwnd, &c);
+    ClientToScreen(m_hwnd, &d);
+
+    POINTL pt = { a.x, b.y };
+    RECTL rcl = { c.x, c.y, d.x, d.y };
+
+    if (m_toolbarFlags & SMINIT_VERTICAL)
+    {
+        pt.x = b.x - 3;
+        pt.y = a.y - 3;
+    }
+
+#if USE_SYSTEM_MENUSITE
+    hr = CoCreateInstance(CLSID_MenuBandSite,
+        NULL,
+        CLSCTX_INPROC_SERVER,
+        IID_PPV_ARG(IBandSite, &pBandSite));
+#else
+    hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite));
+#endif
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#if WRAP_MENUSITE
+    hr = CMenuSite_Wrapper(pBandSite, IID_PPV_ARG(IBandSite, &pBandSite));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+#if USE_SYSTEM_MENUDESKBAR
+    hr = CoCreateInstance(CLSID_MenuDeskBar,
+        NULL,
+        CLSCTX_INPROC_SERVER,
+        IID_PPV_ARG(IDeskBar, &pDeskBar));
+#else
+    hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar));
+#endif
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#if WRAP_MENUDESKBAR
+    hr = CMenuDeskBar_Wrapper(pDeskBar, IID_PPV_ARG(IDeskBar, &pDeskBar));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+    hr = pDeskBar->SetClient(pBandSite);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = pBandSite->AddBand(childShellMenu);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    CComPtr<IMenuPopup> popup;
+    hr = pDeskBar->QueryInterface(IID_PPV_ARG(IMenuPopup, &popup));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    m_isTracking = TRUE;
+    DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking);
+
+    m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl, this, uItem);
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, UINT index, HMENU menu)
+{
+    RECT rc = { 0 };
+    RECT rcx = { 0 };
+
+    if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc)))
+        return E_FAIL;
+
+    GetClientRect(m_hwndToolbar, &rcx);
+
+    POINT a = { rc.left, rc.top };
+    POINT b = { rc.right, rc.bottom };
+    POINT c = { rc.left, rc.top };
+    POINT d = { rc.right, rc.bottom };
+
+    ClientToScreen(m_hwndToolbar, &a);
+    ClientToScreen(m_hwndToolbar, &b);
+    ClientToScreen(m_hwndToolbar, &c);
+    ClientToScreen(m_hwndToolbar, &d);
+
+    POINT pt = { a.x, b.y };
+    RECT rcl = { c.x, c.y, d.x, d.y };
+
+    if (m_toolbarFlags & SMINIT_VERTICAL)
+    {
+        pt.x = b.x;
+        pt.y = a.y;
+    }
+
+    HMENU popup = GetSubMenu(menu, index);
+
+    m_isTracking = TRUE;
+    DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking);
+
+    m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, pt.x, pt.y, rcl);
+
+    SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, FALSE);
+
+    m_isTracking = FALSE;
+    DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking);
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::DoContextMenu(IContextMenu* contextMenu)
+{
+    HRESULT hr;
+    HMENU hPopup = CreatePopupMenu();
+
+    if (hPopup == NULL)
+        return E_FAIL;
+
+    hr = contextMenu->QueryContextMenu(hPopup, 0, 0, UINT_MAX, CMF_NORMAL);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        DestroyMenu(hPopup);
+        return hr;
+    }
+
+    DWORD dwPos = GetMessagePos();
+    UINT uCommand = ::TrackPopupMenu(hPopup, TPM_RETURNCMD, GET_X_LPARAM(dwPos), GET_Y_LPARAM(dwPos), 0, m_hwnd, NULL);
+    if (uCommand == 0)
+        return S_FALSE;
+
+    CMINVOKECOMMANDINFO cmi = { 0 };
+    cmi.cbSize = sizeof(cmi);
+    cmi.lpVerb = MAKEINTRESOURCEA(uCommand);
+    cmi.hwnd = m_hwnd;
+    hr = contextMenu->InvokeCommand(&cmi);
+
+    DestroyMenu(hPopup);
+    return hr;
+}
+
+HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    theResult = 0;
+
+    KillTimer(m_hwndToolbar, TIMERID_HOTTRACK);
+
+    if (PopupItem(wParam) == S_OK)
+        return S_FALSE;
+
+    HRESULT hr = m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return S_OK; // filter out a possible S_FALSE from here.
+}
+
+HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType)
+{
+    int prev = m_hotItem;
+    int index = -1;
+
+    if (dwSelectType != 0xFFFFFFFF)
+    {
+        int count = SendMessage(m_hwndToolbar, TB_BUTTONCOUNT, 0, 0);
+
+        if (m_hotItem >= 0)
+        {
+            TBBUTTONINFO info = { 0 };
+            info.cbSize = sizeof(TBBUTTONINFO);
+            info.dwMask = 0;
+            index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info));
+        }
+
+        if (dwSelectType == VK_HOME)
+        {
+            index = 0;
+            dwSelectType = VK_DOWN;
+        }
+        else if (dwSelectType == VK_END)
+        {
+            index = count - 1;
+            dwSelectType = VK_UP;
+        }
+        else if (index < 0)
+        {
+            if (dwSelectType == VK_UP)
+            {
+                index = count - 1;
+            }
+            else if (dwSelectType == VK_DOWN)
+            {
+                index = 0;
+            }
+        }
+        else
+        {
+            if (dwSelectType == VK_UP)
+            {
+                index--;
+            }
+            else if (dwSelectType == VK_DOWN)
+            {
+                index++;
+            }
+        }
+
+        TBBUTTON btn = { 0 };
+        while (index >= 0 && index < count)
+        {
+            DWORD res = SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
+            if (!res)
+                return E_FAIL;
+
+            if (btn.dwData)
+            {
+                if (prev != btn.idCommand)
+                {
+                    SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0);
+                }
+                return S_OK;
+            }
+
+            if (dwSelectType == VK_UP)
+            {
+                index--;
+            }
+            else if (dwSelectType == VK_DOWN)
+            {
+                index++;
+            }
+        }
+    }
+
+    if (prev != -1)
+    {
+        SendMessage(m_hwndToolbar, TB_SETHOTITEM, -1, 0);
+    }
+    return S_FALSE;
+}
+
+HRESULT CMenuToolbarBase::AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData, BOOL last)
+{
+    TBBUTTON tbb = { 0 };
+
+    tbb.fsState = TBSTATE_ENABLED;
+#if !USE_TBSTYLE_EX_VERTICAL
+    if (!last && (m_toolbarFlags & SMINIT_VERTICAL))
+        tbb.fsState |= TBSTATE_WRAP;
+#endif
+    tbb.fsStyle = 0;
+
+    if (hasSubMenu && (m_toolbarFlags & SMINIT_VERTICAL))
+        tbb.fsStyle |= BTNS_DROPDOWN;
+
+    if (!(m_toolbarFlags & SMINIT_VERTICAL))
+        tbb.fsStyle |= BTNS_AUTOSIZE | BTNS_CHECKGROUP;
+
+    tbb.iString = (INT_PTR) caption;
+    tbb.idCommand = commandId;
+
+    tbb.iBitmap = iconId;
+    tbb.dwData = buttonData;
+
+    if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)))
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::AddSeparator(BOOL last)
+{
+    TBBUTTON tbb = { 0 };
+
+    tbb.fsState = TBSTATE_ENABLED;
+#if !USE_TBSTYLE_EX_VERTICAL
+    if (!last && (m_toolbarFlags & SMINIT_VERTICAL))
+        tbb.fsState |= TBSTATE_WRAP;
+#endif
+    tbb.fsStyle = BTNS_SEP;
+    tbb.iBitmap = 0;
+
+    if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)))
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::AddPlaceholder()
+{
+    TBBUTTON tbb = { 0 };
+    PCWSTR MenuString = L"(Empty)";
+
+    tbb.fsState = 0;
+    tbb.fsStyle = 0;
+    tbb.iString = (INT_PTR) MenuString;
+    tbb.iBitmap = -1;
+
+    if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)))
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::GetDataFromId(INT uItem, INT* pIndex, DWORD_PTR* pData)
+{
+    TBBUTTONINFO info = { 0 };
+    DbgPrint("GetDataFromId %d\n", uItem);
+
+    info.cbSize = sizeof(TBBUTTONINFO);
+    info.dwMask = TBIF_COMMAND | TBIF_LPARAM;
+
+    int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info));
+    if (index < 0)
+        return E_FAIL;
+
+    if (pIndex)
+        *pIndex = index;
+
+    if (pData)
+        *pData = info.lParam;
+
+    DbgPrint("GetDataFromId ret: %d, %d, %x, %x\n", info.idCommand, index, info.lParam);
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::PopupItem(INT uItem)
+{
+    INT index;
+    DWORD_PTR dwData;
+
+    GetDataFromId(uItem, &index, &dwData);
+
+    if (!(m_toolbarFlags & SMINIT_VERTICAL))
+    {
+        SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0);
+        SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, TRUE);
+    }
+
+    HRESULT hr = InternalHasSubMenu(uItem, index, dwData);
+    if (hr != S_OK)
+        return hr;
+
+    return InternalPopupItem(uItem, index, dwData);
+}
+
+CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) :
+    CMenuToolbarBase(menuBand, FALSE),
+    m_hmenu(NULL)
+{
+}
+
+HRESULT  CMenuStaticToolbar::GetMenu(
+    _Out_opt_ HMENU *phmenu,
+    _Out_opt_ HWND *phwnd,
+    _Out_opt_ DWORD *pdwFlags)
+{
+    if (phmenu)
+        *phmenu = m_hmenu;
+    if (phwnd)
+        *phwnd = NULL;
+    if (pdwFlags)
+        *pdwFlags = m_dwMenuFlags;
+
+    return S_OK;
+}
+
+HRESULT  CMenuStaticToolbar::SetMenu(
+    HMENU hmenu,
+    HWND hwnd,
+    DWORD dwFlags)
+{
+    m_hmenu = hmenu;
+    m_dwMenuFlags = dwFlags;
+
+    return S_OK;
+}
+
+HRESULT CMenuStaticToolbar::FillToolbar(BOOL clearFirst)
+{
+    int i;
+    int ic = GetMenuItemCount(m_hmenu);
+
+    if (clearFirst)
+    {
+        while (SendMessage(m_hwndToolbar, TB_DELETEBUTTON, 0, 0))
+        {
+            // empty;
+        }
+    }
+
+    int count = 0;
+    for (i = 0; i < ic; i++)
+    {
+        BOOL last = i + 1 == ic;
+
+        MENUITEMINFOW info;
+
+        info.cbSize = sizeof(info);
+        info.dwTypeData = NULL;
+        info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID;
+
+        if (!GetMenuItemInfoW(m_hmenu, i, TRUE, &info))
+        {
+            DbgPrint("Error obtaining info for menu item at pos=%d\n", i);
+            continue;
+        }
+
+        count++;
+
+        if (info.fType & MFT_SEPARATOR)
+        {
+            AddSeparator(last);
+        }
+        else if (!(info.fType & MFT_BITMAP))
+        {
+
+            info.cch++;
+            info.dwTypeData = (PWSTR) HeapAlloc(GetProcessHeap(), 0, (info.cch + 1) * sizeof(WCHAR));
+
+            info.fMask = MIIM_STRING | MIIM_SUBMENU | MIIM_ID;
+            GetMenuItemInfoW(m_hmenu, i, TRUE, &info);
+
+            SMINFO * sminfo = new SMINFO();
+            sminfo->dwMask = SMIM_ICON | SMIM_FLAGS;
+            // FIXME: remove before deleting the toolbar or it will leak
+
+            HRESULT hr = m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo));
+            if (FAILED_UNEXPECTEDLY(hr))
+                return hr;
+
+            AddButton(info.wID, info.dwTypeData, info.hSubMenu != NULL, sminfo->iIcon, reinterpret_cast<DWORD_PTR>(sminfo), last);
+
+            HeapFree(GetProcessHeap(), 0, info.dwTypeData);
+        }
+    }
+
+    DbgPrint("Created toolbar with %d buttons.\n", count);
+
+    return S_OK;
+}
+
+HRESULT CMenuStaticToolbar::OnDeletingButton(const NMTOOLBAR * tb)
+{
+    delete reinterpret_cast<SMINFO*>(tb->tbButton.dwData);
+    return S_OK;
+}
+
+HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick)
+{
+    CComPtr<IContextMenu> contextMenu;
+    HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu));
+    if (hr != S_OK)
+        return hr;
+
+    return DoContextMenu(contextMenu);
+}
+
+HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    HRESULT hr;
+
+    if (m_isTracking)
+    {
+        return S_FALSE;
+    }
+
+    hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    // in case the clicked item has a submenu, we do not need to execute the item
+    if (hr == S_FALSE)
+    {
+        return hr;
+    }
+
+    return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0);
+}
+
+HRESULT CMenuStaticToolbar::InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData)
+{
+    SMINFO * nfo = reinterpret_cast<SMINFO*>(dwData);
+    if (!nfo)
+        return E_FAIL;
+
+    if (nfo->dwFlags&SMIF_TRACKPOPUP)
+    {
+        return PopupSubMenu(uItem, index, m_hmenu);
+    }
+    else
+    {
+        CComPtr<IShellMenu> shellMenu;
+        HRESULT hr = m_menuBand->_CallCBWithItemId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu));
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        return PopupSubMenu(uItem, index, shellMenu);
+    }
+}
+
+HRESULT CMenuStaticToolbar::InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData)
+{
+    return ::GetSubMenu(m_hmenu, index) ? S_OK : S_FALSE;
+}
+
+
+CMenuSFToolbar::CMenuSFToolbar(CMenuBand * menuBand) :
+    CMenuToolbarBase(menuBand, TRUE),
+    m_shellFolder(NULL),
+    m_idList(NULL),
+    m_hKey(NULL)
+{
+}
+
+CMenuSFToolbar::~CMenuSFToolbar()
+{
+}
+
+HRESULT CMenuSFToolbar::FillToolbar(BOOL clearFirst)
+{
+    HRESULT hr;
+    int i = 0;
+    PWSTR MenuString;
+
+    IEnumIDList * eidl;
+    m_shellFolder->EnumObjects(m_hwndToolbar, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl);
+
+    LPITEMIDLIST item = static_cast<LPITEMIDLIST>(CoTaskMemAlloc(sizeof(ITEMIDLIST)));
+    ULONG fetched;
+    hr = eidl->Next(1, &item, &fetched);
+    while (SUCCEEDED(hr) && fetched > 0)
+    {
+        INT index = 0;
+        INT indexOpen = 0;
+
+        STRRET sr = { STRRET_CSTR, { 0 } };
+
+        hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        StrRetToStr(&sr, NULL, &MenuString);
+
+        index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen);
+
+        LPCITEMIDLIST itemc = item;
+
+        SFGAOF attrs = SFGAO_FOLDER;
+        hr = m_shellFolder->GetAttributesOf(1, &itemc, &attrs);
+
+        DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(ILClone(item));
+        // FIXME: remove before deleting the toolbar or it will leak
+
+        // Fetch next item already, so we know if the current one is the last
+        hr = eidl->Next(1, &item, &fetched);
+
+        AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData, FAILED(hr) || fetched == 0);
+
+        CoTaskMemFree(MenuString);
+    }
+    CoTaskMemFree(item);
+
+    // If no items were added, show the "empty" placeholder
+    if (i == 0)
+    {
+        return AddPlaceholder();
+    }
+
+    DbgPrint("Created toolbar with %d buttons.\n", i);
+
+    return hr;
+}
+
+HRESULT CMenuSFToolbar::OnDeletingButton(const NMTOOLBAR * tb)
+{
+    ILFree(reinterpret_cast<LPITEMIDLIST>(tb->tbButton.dwData));
+    return S_OK;
+}
+
+HRESULT CMenuSFToolbar::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags)
+{
+    m_shellFolder = psf;
+    m_idList = ILClone(pidlFolder);
+    m_hKey = hKey;
+    m_dwMenuFlags = dwFlags;
+    return S_OK;
+}
+
+HRESULT CMenuSFToolbar::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv)
+{
+    HRESULT hr;
+
+    hr = m_shellFolder->QueryInterface(riid, ppv);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    if (pdwFlags)
+        *pdwFlags = m_dwMenuFlags;
+
+    if (ppidl)
+    {
+        LPITEMIDLIST pidl = NULL;
+
+        if (m_idList)
+        {
+            pidl = ILClone(m_idList);
+            if (!pidl)
+            {
+                (*(IUnknown**) ppv)->Release();
+                return E_FAIL;
+            }
+        }
+
+        *ppidl = pidl;
+    }
+
+    return hr;
+}
+
+HRESULT CMenuSFToolbar::OnContextMenu(NMMOUSE * rclick)
+{
+    HRESULT hr;
+    CComPtr<IContextMenu> contextMenu;
+    LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(rclick->dwItemData);
+
+    hr = m_shellFolder->GetUIObjectOf(m_hwndToolbar, 1, &pidl, IID_IContextMenu, NULL, reinterpret_cast<VOID **>(&contextMenu));
+    if (hr != S_OK)
+        return hr;
+
+    return DoContextMenu(contextMenu);
+}
+
+HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    HRESULT hr;
+    hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    // in case the clicked item has a submenu, we do not need to execute the item
+    if (hr == S_FALSE)
+    {
+        DbgPrint("CMenuToolbarBase::OnCommand told us to cancel.\n");
+        return hr;
+    }
+
+    DWORD_PTR data;
+    GetDataFromId(wParam, NULL, &data);
+
+    return m_menuBand->_CallCBWithItemPidl(reinterpret_cast<LPITEMIDLIST>(data), SMC_SFEXEC, 0, 0);
+}
+
+HRESULT CMenuSFToolbar::InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData)
+{
+    HRESULT hr;
+    UINT uId;
+    UINT uIdAncestor;
+    DWORD flags;
+    CComPtr<IShellMenuCallback> psmc;
+    CComPtr<IShellMenu> shellMenu;
+
+    LPITEMIDLIST pidl = reinterpret_cast<LPITEMIDLIST>(dwData);
+
+    if (!pidl)
+        return E_FAIL;
+
+#if USE_SYSTEM_MENUBAND
+    hr = CoCreateInstance(CLSID_MenuBand,
+        NULL,
+        CLSCTX_INPROC_SERVER,
+        IID_PPV_ARG(IShellMenu, &shellMenu));
+#else
+    hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &shellMenu));
+#endif
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#if WRAP_MENUBAND
+    hr = CMenuBand_Wrapper(shellMenu, IID_PPV_ARG(IShellMenu, &shellMenu));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+    m_menuBand->GetMenuInfo(&psmc, &uId, &uIdAncestor, &flags);
+
+    // FIXME: not sure what to use as uId/uIdAncestor here
+    hr = shellMenu->Initialize(psmc, 0, uId, SMINIT_VERTICAL);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    CComPtr<IShellFolder> childFolder;
+    hr = m_shellFolder->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &childFolder));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = shellMenu->SetShellFolder(childFolder, NULL, NULL, 0);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return PopupSubMenu(uItem, index, shellMenu);
+}
+
+HRESULT CMenuSFToolbar::InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData)
+{
+    HRESULT hr;
+    LPCITEMIDLIST pidl = reinterpret_cast<LPITEMIDLIST>(dwData);
+
+    SFGAOF attrs = SFGAO_FOLDER;
+    hr = m_shellFolder->GetAttributesOf(1, &pidl, &attrs);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return (attrs & SFGAO_FOLDER) ? S_OK : S_FALSE;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuToolbars.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMenuToolbars.h
===================================================================
--- base/shell/rshell/CMenuToolbars.h	(rÃ©vision 0)
+++ base/shell/rshell/CMenuToolbars.h	(rÃ©vision 62573)
@@ -0,0 +1,161 @@
+/*
+* Shell Menu Band
+*
+* Copyright 2014 David Quintana
+*
+* 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
+*/
+#pragma once
+
+class CMenuBand;
+class CMenuFocusManager;
+
+#define WM_USER_ISTRACKEDITEM (WM_APP+41)
+#define WM_USER_CHANGETRACKEDITEM (WM_APP+42)
+
+
+class CMenuToolbarBase
+{
+private:
+    HWND  m_hwnd;        // May be the pager
+    HFONT m_marlett;
+    BOOL  m_useFlatMenus;
+    WNDPROC m_SubclassOld;
+    BOOL m_disableMouseTrack;
+
+protected:
+    CMenuBand * m_menuBand;
+    HWND        m_hwndToolbar;
+    DWORD       m_dwMenuFlags;
+    BOOL        m_hasIdealSize;
+    SIZE        m_idealSize;
+    BOOL        m_usePager;
+    CMenuToolbarBase * m_hotBar;
+    INT                m_hotItem;
+    CMenuToolbarBase * m_popupBar;
+    INT                m_popupItem;
+
+    DWORD m_toolbarFlags;
+    BOOL m_isTracking;
+
+private:
+    static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+public:
+    CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager);
+    virtual ~CMenuToolbarBase();
+
+    HRESULT IsWindowOwner(HWND hwnd);
+    HRESULT CreateToolbar(HWND hwndParent, DWORD dwFlags);
+    HRESULT GetWindow(HWND *phwnd);
+    HRESULT ShowWindow(BOOL fShow);
+    HRESULT Close();
+
+    HRESULT OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+
+    HRESULT OnHotItemChanged(CMenuToolbarBase * toolbar, INT item);
+    HRESULT OnPopupItemChanged(CMenuToolbarBase * toolbar, INT item);
+
+    HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu);
+    HRESULT PopupSubMenu(UINT itemId, UINT index, HMENU menu);
+    HRESULT DoContextMenu(IContextMenu* contextMenu);
+
+    HRESULT ChangeHotItem(DWORD changeType);
+    HRESULT OnHotItemChange(const NMTBHOTITEM * hot, LRESULT * theResult);
+
+    HRESULT IsTrackedItem(INT index);
+    HRESULT ChangeTrackedItem(INT index);
+
+    HRESULT GetIdealSize(SIZE& size);
+    HRESULT SetPosSize(int x, int y, int cx, int cy);
+
+    void InvalidateDraw();
+
+    HRESULT DisableMouseTrack(BOOL bDisable);
+
+    virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0;
+    virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0;
+
+    HRESULT PopupItem(INT uItem);
+    HRESULT GetDataFromId(INT uItem, INT* pIndex, DWORD_PTR* pData);
+
+protected:
+    virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+
+    virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb) = 0;
+    virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData) = 0;
+    virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData) = 0;
+
+    LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+    HRESULT AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData, BOOL last);
+    HRESULT AddSeparator(BOOL last);
+    HRESULT AddPlaceholder();
+
+    HRESULT UpdateImageLists();
+
+private:
+    HRESULT OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult);
+};
+
+class CMenuStaticToolbar :
+    public CMenuToolbarBase
+{
+private:
+    HMENU m_hmenu;
+
+public:
+    CMenuStaticToolbar(CMenuBand *menuBand);
+    virtual ~CMenuStaticToolbar() {}
+
+    HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags);
+    HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags);
+
+    virtual HRESULT FillToolbar(BOOL clearFirst=FALSE);
+    virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+    virtual HRESULT OnContextMenu(NMMOUSE * rclick);
+
+protected:
+    virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb);
+
+    virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData);
+    virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData);
+};
+
+class CMenuSFToolbar :
+    public CMenuToolbarBase
+{
+private:
+    CComPtr<IShellFolder> m_shellFolder;
+    LPCITEMIDLIST  m_idList;
+    HKEY           m_hKey;
+
+public:
+    CMenuSFToolbar(CMenuBand *menuBand);
+    virtual ~CMenuSFToolbar();
+
+    HRESULT SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags);
+    HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv);
+
+    virtual HRESULT FillToolbar(BOOL clearFirst=FALSE);
+    virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+    virtual HRESULT OnContextMenu(NMMOUSE * rclick);
+
+protected:
+    virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb);
+
+    virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData);
+    virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData);
+};

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMenuToolbars.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMergedFolder.cpp
===================================================================
--- base/shell/rshell/CMergedFolder.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CMergedFolder.cpp	(rÃ©vision 62573)
@@ -0,0 +1,341 @@
+/*
+ * Shell Menu Site
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#include "precomp.h"
+#include <atlwin.h>
+#include <shlwapi_undoc.h>
+
+#include "CMergedFolder.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(CMergedFolder);
+
+class CEnumMergedFolder :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IEnumIDList
+{
+private:
+    CComPtr<IEnumIDList> m_UserLocal;
+    CComPtr<IEnumIDList> m_AllUSers;
+    BOOL m_FirstDone;
+
+public:
+    CEnumMergedFolder() : m_UserLocal(NULL), m_AllUSers(NULL), m_FirstDone(FALSE) {}
+    ~CEnumMergedFolder() {}
+
+    DECLARE_NOT_AGGREGATABLE(CEnumMergedFolder)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(CEnumMergedFolder)
+        COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList)
+    END_COM_MAP()
+
+    HRESULT Begin(HWND hwndOwner, SHCONTF flags, IShellFolder * userLocal, IShellFolder * allUSers)
+    {
+        HRESULT hr;
+        hr = userLocal->EnumObjects(hwndOwner, flags, &m_UserLocal);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+        hr = userLocal->EnumObjects(hwndOwner, flags, &m_AllUSers);
+        if (FAILED_UNEXPECTEDLY(hr))
+        {
+            m_UserLocal = NULL;
+            return hr;
+        }
+        m_FirstDone = FALSE;
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE Next(
+        ULONG celt,
+        LPITEMIDLIST *rgelt,
+        ULONG *pceltFetched)
+    {
+        HRESULT hr;
+
+        *pceltFetched = 0;
+
+        if (!m_FirstDone)
+        {
+            hr = m_UserLocal->Next(celt, rgelt, pceltFetched);
+            if (FAILED_UNEXPECTEDLY(hr))
+                return hr;
+            if (hr == S_FALSE)
+                m_FirstDone = true;
+            else if (celt < 2)
+                return hr;
+        }
+
+        DWORD offset = *pceltFetched;
+        if (*pceltFetched < celt)
+        {
+            rgelt += *pceltFetched;
+            celt = (celt - *pceltFetched);
+            *pceltFetched = 0;
+
+            hr = m_AllUSers->Next(celt, rgelt, pceltFetched);
+            if (FAILED_UNEXPECTEDLY(hr))
+                return hr;
+
+            *pceltFetched += offset;
+
+            return hr;
+        }
+
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE Skip(
+        ULONG celt)
+    {
+        UNIMPLEMENTED;
+        return E_NOTIMPL;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE Reset(
+        )
+    {
+        if (m_FirstDone)
+            m_AllUSers->Reset();
+        return m_UserLocal->Reset();
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE Clone(
+        IEnumIDList **ppenum)
+    {
+        UNIMPLEMENTED;
+        return E_NOTIMPL;
+    }
+};
+
+extern "C"
+HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv)
+{
+    *ppv = NULL;
+
+    CMergedFolder * fld = new CComObject<CMergedFolder>();
+
+    if (!fld)
+        return E_OUTOFMEMORY;
+
+    HRESULT hr;
+
+    hr = fld->_SetSources(userLocal, allUsers);
+
+    hr = fld->QueryInterface(riid, ppv);
+    if (FAILED_UNEXPECTEDLY(hr))
+        fld->Release();
+
+    return hr;
+}
+
+HRESULT CMergedFolder::_SetSources(IShellFolder* userLocal, IShellFolder* allUsers)
+{
+    m_UserLocal = userLocal;
+    m_AllUSers = allUsers;
+    return S_OK;
+}
+
+// IShellFolder
+HRESULT STDMETHODCALLTYPE CMergedFolder::ParseDisplayName(
+    HWND hwndOwner,
+    LPBC pbcReserved,
+    LPOLESTR lpszDisplayName,
+    ULONG *pchEaten,
+    LPITEMIDLIST *ppidl,
+    ULONG *pdwAttributes)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::EnumObjects(
+    HWND hwndOwner,
+    SHCONTF grfFlags,
+    IEnumIDList **ppenumIDList)
+{
+    CEnumMergedFolder * merged = new CComObject<CEnumMergedFolder>();
+    *ppenumIDList = merged;
+    return merged->Begin(hwndOwner, grfFlags, m_UserLocal, m_AllUSers);
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::BindToObject(
+    LPCITEMIDLIST pidl,
+    LPBC pbcReserved,
+    REFIID riid,
+    void **ppvOut)
+{
+    HRESULT hr;
+
+    hr = m_UserLocal->BindToObject(pidl, pbcReserved, riid, ppvOut);
+    if (SUCCEEDED(hr))
+        return hr;
+
+    hr = m_AllUSers->BindToObject(pidl, pbcReserved, riid, ppvOut);
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::BindToStorage(
+    LPCITEMIDLIST pidl,
+    LPBC pbcReserved,
+    REFIID riid,
+    void **ppvObj)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::CompareIDs(
+    LPARAM lParam,
+    LPCITEMIDLIST pidl1,
+    LPCITEMIDLIST pidl2)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::CreateViewObject(
+    HWND hwndOwner,
+    REFIID riid,
+    void **ppvOut)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetAttributesOf(
+    UINT cidl,
+    LPCITEMIDLIST *apidl,
+    SFGAOF *rgfInOut)
+{
+    HRESULT hr;
+
+    hr = m_UserLocal->GetAttributesOf(cidl, apidl, rgfInOut);
+    if (SUCCEEDED(hr))
+        return hr;
+
+    *rgfInOut = 0;
+    hr = m_AllUSers->GetAttributesOf(cidl, apidl, rgfInOut);
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetUIObjectOf(
+    HWND hwndOwner,
+    UINT cidl,
+    LPCITEMIDLIST *apidl,
+    REFIID riid,
+    UINT *prgfInOut,
+    void **ppvOut)
+{
+    HRESULT hr;
+
+    hr = m_UserLocal->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, ppvOut);
+    if (SUCCEEDED(hr))
+        return hr;
+
+    hr = m_AllUSers->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, ppvOut);
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetDisplayNameOf(
+    LPCITEMIDLIST pidl,
+    SHGDNF uFlags,
+    STRRET *lpName)
+{
+    HRESULT hr;
+
+    hr = m_UserLocal->GetDisplayNameOf(pidl, uFlags, lpName);
+    if (SUCCEEDED(hr))
+        return hr;
+
+    hr = m_AllUSers->GetDisplayNameOf(pidl, uFlags, lpName);
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::SetNameOf(
+    HWND hwnd,
+    LPCITEMIDLIST pidl,
+    LPCOLESTR lpszName,
+    SHGDNF uFlags,
+    LPITEMIDLIST *ppidlOut)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+// IShellFolder2
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetDefaultSearchGUID(
+    GUID *lpguid)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::EnumSearches(
+    IEnumExtraSearch **ppenum)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetDefaultColumn(
+    DWORD dwReserved,
+    ULONG *pSort,
+    ULONG *pDisplay)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetDefaultColumnState(
+    UINT iColumn,
+    SHCOLSTATEF *pcsFlags)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetDetailsEx(
+    LPCITEMIDLIST pidl,
+    const SHCOLUMNID *pscid,
+    VARIANT *pv)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::GetDetailsOf(
+    LPCITEMIDLIST pidl,
+    UINT iColumn,
+    SHELLDETAILS *psd)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CMergedFolder::MapColumnToSCID(
+    UINT iColumn,
+    SHCOLUMNID *pscid)
+{
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
+}
\ No newline at end of file

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMergedFolder.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CMergedFolder.h
===================================================================
--- base/shell/rshell/CMergedFolder.h	(rÃ©vision 0)
+++ base/shell/rshell/CMergedFolder.h	(rÃ©vision 62573)
@@ -0,0 +1,135 @@
+/*
+ * Shell Menu Site
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+#pragma once
+
+class CMergedFolder :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IShellFolder2
+{
+private:
+    CComPtr<IShellFolder> m_UserLocal;
+    CComPtr<IShellFolder> m_AllUSers;
+
+public:
+    CMergedFolder() {}
+    ~CMergedFolder() {}
+
+    HRESULT _SetSources(IShellFolder* userLocal, IShellFolder* allUSers);
+
+    DECLARE_NOT_AGGREGATABLE(CMergedFolder)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(CMergedFolder)
+        COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2)
+        COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder)
+    END_COM_MAP()
+
+    // IShellFolder
+    virtual HRESULT STDMETHODCALLTYPE ParseDisplayName(
+        HWND hwndOwner,
+        LPBC pbcReserved,
+        LPOLESTR lpszDisplayName,
+        ULONG *pchEaten,
+        LPITEMIDLIST *ppidl,
+        ULONG *pdwAttributes);
+
+    virtual HRESULT STDMETHODCALLTYPE EnumObjects(
+        HWND hwndOwner,
+        SHCONTF grfFlags,
+        IEnumIDList **ppenumIDList);
+
+    virtual HRESULT STDMETHODCALLTYPE BindToObject(
+        LPCITEMIDLIST pidl,
+        LPBC pbcReserved,
+        REFIID riid,
+        void **ppvOut);
+
+    virtual HRESULT STDMETHODCALLTYPE BindToStorage(
+        LPCITEMIDLIST pidl,
+        LPBC pbcReserved,
+        REFIID riid,
+        void **ppvObj);
+
+    virtual HRESULT STDMETHODCALLTYPE CompareIDs(
+        LPARAM lParam,
+        LPCITEMIDLIST pidl1,
+        LPCITEMIDLIST pidl2);
+
+    virtual HRESULT STDMETHODCALLTYPE CreateViewObject(
+        HWND hwndOwner,
+        REFIID riid,
+        void **ppvOut);
+
+    virtual HRESULT STDMETHODCALLTYPE GetAttributesOf(
+        UINT cidl,
+        LPCITEMIDLIST *apidl,
+        SFGAOF *rgfInOut);
+
+    virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf(
+        HWND hwndOwner,
+        UINT cidl,
+        LPCITEMIDLIST *apidl,
+        REFIID riid,
+        UINT *prgfInOut,
+        void **ppvOut);
+
+    virtual HRESULT STDMETHODCALLTYPE GetDisplayNameOf(
+        LPCITEMIDLIST pidl,
+        SHGDNF uFlags,
+        STRRET *lpName);
+
+    virtual HRESULT STDMETHODCALLTYPE SetNameOf(
+        HWND hwnd,
+        LPCITEMIDLIST pidl,
+        LPCOLESTR lpszName,
+        SHGDNF uFlags,
+        LPITEMIDLIST *ppidlOut);
+
+    // IShellFolder2
+    virtual HRESULT STDMETHODCALLTYPE GetDefaultSearchGUID(
+        GUID *lpguid);
+
+    virtual HRESULT STDMETHODCALLTYPE EnumSearches(
+        IEnumExtraSearch **ppenum);
+
+    virtual HRESULT STDMETHODCALLTYPE GetDefaultColumn(
+        DWORD dwReserved,
+        ULONG *pSort,
+        ULONG *pDisplay);
+
+    virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnState(
+        UINT iColumn,
+        SHCOLSTATEF *pcsFlags);
+
+    virtual HRESULT STDMETHODCALLTYPE GetDetailsEx(
+        LPCITEMIDLIST pidl,
+        const SHCOLUMNID *pscid,
+        VARIANT *pv);
+
+    virtual HRESULT STDMETHODCALLTYPE GetDetailsOf(
+        LPCITEMIDLIST pidl,
+        UINT iColumn,
+        SHELLDETAILS *psd);
+
+    virtual HRESULT STDMETHODCALLTYPE MapColumnToSCID(
+        UINT iColumn,
+        SHCOLUMNID *pscid);
+
+};

Modification de propriÃ©tÃ©s sur base/shell/rshell/CMergedFolder.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/CStartMenu.cpp
===================================================================
--- base/shell/rshell/CStartMenu.cpp	(rÃ©vision 0)
+++ base/shell/rshell/CStartMenu.cpp	(rÃ©vision 62573)
@@ -0,0 +1,393 @@
+/*
+ * ReactOS Explorer
+ *
+ * Copyright 2014 Giannis Adamopoulos
+ *
+ * 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "precomp.h"
+
+//#define TEST_TRACKPOPUPMENU_SUBMENUS
+
+
+/* NOTE: The following constants *MUST NOT* be changed because
+         they're hardcoded and need to be the exact values
+         in order to get the start menu to work! */
+#define IDM_RUN                     401
+#define IDM_LOGOFF                  402
+#define IDM_UNDOCKCOMPUTER          410
+#define IDM_TASKBARANDSTARTMENU     413
+#define IDM_LASTSTARTMENU_SEPARATOR 450
+#define IDM_DOCUMENTS               501
+#define IDM_HELPANDSUPPORT          503
+#define IDM_PROGRAMS                504
+#define IDM_CONTROLPANEL            505
+#define IDM_SHUTDOWN                506
+#define IDM_FAVORITES               507
+#define IDM_SETTINGS                508
+#define IDM_PRINTERSANDFAXES        510
+#define IDM_SEARCH                  520
+#define IDM_SYNCHRONIZE             553
+#define IDM_NETWORKCONNECTIONS      557
+#define IDM_DISCONNECT              5000
+#define IDM_SECURITY                5001
+
+/*
+ * TODO:
+ * 1. append the start menu contents from all users
+ * 2. implement the context menu for start menu entries (programs, control panel, network connetions, printers)
+ * 3. filter out programs folder from the shell folder part of the start menu
+ * 4. showing the programs start menu is SLOW compared to windows. this needs some investigation
+ */
+
+class CShellMenuCallback :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IShellMenuCallback
+{
+private:
+
+    HWND m_hwndTray;
+    CComPtr<IShellMenu> m_pShellMenu;
+    CComPtr<IBandSite> m_pBandSite;
+    CComPtr<IDeskBar> m_pDeskBar;
+    CComPtr<ITrayPriv> m_pTrayPriv;
+
+    HRESULT OnInitMenu()
+    {
+        HMENU hmenu;
+        HRESULT hr;
+
+        if (m_pTrayPriv.p)
+            return S_OK;
+
+        hr = IUnknown_GetSite(m_pDeskBar, IID_PPV_ARG(ITrayPriv, &m_pTrayPriv));
+        hr = IUnknown_GetWindow(m_pTrayPriv, &m_hwndTray);
+        hr = m_pTrayPriv->AppendMenuW(&hmenu);
+#ifndef TEST_TRACKPOPUPMENU_SUBMENUS
+        hr = m_pShellMenu->SetMenu(hmenu, NULL, SMSET_BOTTOM);
+#else
+        hr = m_pShellMenu->SetMenu(hmenu, m_hwndTray, SMSET_BOTTOM);
+#endif
+
+        return hr;
+    }
+
+    HRESULT OnGetInfo(LPSMDATA psmd, SMINFO *psminfo)
+    {
+        int iconIndex = 0;
+
+        switch (psmd->uId)
+        {
+            // Smaller "24x24" icons used for the start menu
+            // The bitmaps are still 32x32, but the image is centered
+        case IDM_FAVORITES: iconIndex = -322; break;
+        case IDM_SEARCH: iconIndex = -323; break;
+        case IDM_HELPANDSUPPORT: iconIndex = -324; break;
+        case IDM_LOGOFF: iconIndex = -325; break;
+        case IDM_PROGRAMS:  iconIndex = -326; break;
+        case IDM_DOCUMENTS: iconIndex = -327; break;
+        case IDM_RUN: iconIndex = -328; break;
+        case IDM_SHUTDOWN: iconIndex = -329; break;
+        case IDM_SETTINGS: iconIndex = -330; break;
+
+        case IDM_CONTROLPANEL: iconIndex = -22; break;
+        case IDM_NETWORKCONNECTIONS: iconIndex = -257; break;
+        case IDM_PRINTERSANDFAXES: iconIndex = -138; break;
+        case IDM_TASKBARANDSTARTMENU: iconIndex = -40; break;
+        //case IDM_SECURITY: iconIndex = -21; break;
+        //case IDM_SYNCHRONIZE: iconIndex = -21; break;
+        //case IDM_DISCONNECT: iconIndex = -21; break;
+        //case IDM_UNDOCKCOMPUTER: iconIndex = -21; break;
+        default:
+            return S_FALSE;
+        }
+
+        if (iconIndex)
+        {
+            if ((psminfo->dwMask & SMIM_TYPE) != 0)
+                psminfo->dwType = SMIT_STRING;
+            if ((psminfo->dwMask & SMIM_ICON) != 0)
+                psminfo->iIcon = Shell_GetCachedImageIndex(L"shell32.dll", iconIndex, FALSE);
+            if ((psminfo->dwMask & SMIM_FLAGS) != 0)
+                psminfo->dwFlags |= SMIF_ICON;
+#ifdef TEST_TRACKPOPUPMENU_SUBMENUS
+            if ((psminfo->dwMask & SMIM_FLAGS) != 0)
+                psminfo->dwFlags |= SMIF_TRACKPOPUP;
+#endif
+        }
+        else
+        {
+            if ((psminfo->dwMask & SMIM_TYPE) != 0)
+                psminfo->dwType = SMIT_SEPARATOR;
+        }
+        return S_OK;
+    }
+
+    HRESULT OnGetSubMenu(LPSMDATA psmd, REFIID iid, void ** pv)
+    {
+        HRESULT hr;
+        int csidl = 0;
+        IShellMenu *pShellMenu;
+
+        switch (psmd->uId)
+        {
+        case IDM_PROGRAMS:  csidl = CSIDL_PROGRAMS; break;
+        case IDM_FAVORITES: csidl = CSIDL_FAVORITES; break;
+        case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break;
+        }
+
+#if USE_SYSTEM_MENUBAND
+        hr = CoCreateInstance(CLSID_MenuBand,
+            NULL,
+            CLSCTX_INPROC_SERVER,
+            IID_PPV_ARG(IShellMenu, &pShellMenu));
+#else
+        hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu));
+#endif
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+#if WRAP_MENUBAND
+        hr = CMenuBand_Wrapper(pShellMenu, IID_PPV_ARG(IShellMenu, &pShellMenu));
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+#endif
+
+        hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL);
+
+        if (csidl)
+        {
+            LPITEMIDLIST pidlStartMenu;
+            IShellFolder *psfDestop, *psfStartMenu;
+
+            hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu);
+            hr = SHGetDesktopFolder(&psfDestop);
+            hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu));
+
+            hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0);
+        }
+        else
+        {
+            MENUITEMINFO mii;
+            mii.cbSize = sizeof(mii);
+            mii.fMask = MIIM_SUBMENU;
+            if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii))
+            {
+                hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM);
+            }
+        }
+        return pShellMenu->QueryInterface(iid, pv);
+    }
+
+    HRESULT OnGetContextMenu(LPSMDATA psmd, REFIID iid, void ** pv)
+    {
+        if (psmd->uId == IDM_PROGRAMS ||
+            psmd->uId == IDM_CONTROLPANEL ||
+            psmd->uId == IDM_NETWORKCONNECTIONS ||
+            psmd->uId == IDM_PRINTERSANDFAXES)
+        {
+            //UNIMPLEMENTED
+        }
+
+        return S_FALSE;
+    }
+
+    HRESULT OnGetObject(LPSMDATA psmd, REFIID iid, void ** pv)
+    {
+        if (IsEqualIID(iid, IID_IShellMenu))
+            return OnGetSubMenu(psmd, iid, pv);
+        else if (IsEqualIID(iid, IID_IContextMenu))
+            return OnGetContextMenu(psmd, iid, pv);
+
+        return S_FALSE;
+    }
+
+    HRESULT OnExec(LPSMDATA psmd)
+    {
+        if (psmd->uId == IDM_CONTROLPANEL)
+            ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, NULL, 1);
+        else if (psmd->uId == IDM_NETWORKCONNECTIONS)
+            ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL, NULL, 1);
+        else if (psmd->uId == IDM_PRINTERSANDFAXES)
+            ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, NULL, 1);
+        else
+            PostMessageW(m_hwndTray, WM_COMMAND, psmd->uId, 0);
+
+        return S_OK;
+    }
+
+public:
+
+    DECLARE_NOT_AGGREGATABLE(CShellMenuCallback)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+    BEGIN_COM_MAP(CShellMenuCallback)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenuCallback, IShellMenuCallback)
+    END_COM_MAP()
+
+    void Initialize(
+        IShellMenu* pShellMenu,
+        IBandSite* pBandSite,
+        IDeskBar* pDeskBar)
+    {
+        m_pShellMenu.Attach(pShellMenu);
+        m_pBandSite.Attach(pBandSite);
+        m_pDeskBar.Attach(pDeskBar);
+    }
+
+    ~CShellMenuCallback()
+    {
+        m_pShellMenu.Release();
+        m_pBandSite.Release();
+        m_pDeskBar.Release();
+    }
+
+    HRESULT STDMETHODCALLTYPE CallbackSM(
+        LPSMDATA psmd,
+        UINT uMsg,
+        WPARAM wParam,
+        LPARAM lParam)
+    {
+        switch (uMsg)
+        {
+        case SMC_INITMENU:
+            return OnInitMenu();
+        case SMC_GETINFO:
+            return OnGetInfo(psmd, reinterpret_cast<SMINFO*>(lParam));
+        case SMC_GETOBJECT:
+            return OnGetObject(psmd, *reinterpret_cast<IID *>(wParam), reinterpret_cast<void **>(lParam));
+        case SMC_EXEC:
+            return OnExec(psmd);
+        case SMC_SFEXEC:
+            m_pTrayPriv->Execute(psmd->psf, psmd->pidlItem);
+            break;
+        }
+
+        return S_FALSE;
+    }
+};
+
+extern "C"
+HRESULT WINAPI
+CStartMenu_Constructor(REFIID riid, void **ppv)
+{
+    IShellMenu* pShellMenu;
+    IBandSite* pBandSite;
+    IDeskBar* pDeskBar;
+
+    HRESULT hr;
+    IShellFolder *shellFolder;
+
+    LPITEMIDLIST pidlStartMenuUser;
+    IShellFolder *psfStartMenuUser;
+
+#if MERGE_FOLDERS
+    LPITEMIDLIST pidlStartMenuAll;
+    IShellFolder *psfStartMenuAll;
+#endif
+
+#if USE_SYSTEM_MENUBAND
+    hr = CoCreateInstance(CLSID_MenuBand,
+                          NULL,
+                          CLSCTX_INPROC_SERVER,
+                          IID_PPV_ARG(IShellMenu, &pShellMenu));
+#else
+    hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu));
+#endif
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#if WRAP_MENUBAND
+    hr = CMenuBand_Wrapper(pShellMenu, IID_PPV_ARG(IShellMenu, &pShellMenu));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+#if USE_SYSTEM_MENUSITE
+    hr = CoCreateInstance(CLSID_MenuBandSite,
+                          NULL,
+                          CLSCTX_INPROC_SERVER,
+                          IID_PPV_ARG(IBandSite, &pBandSite));
+#else
+    hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite));
+#endif
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#if WRAP_MENUSITE
+    hr = CMenuSite_Wrapper(pBandSite, IID_PPV_ARG(IBandSite, &pBandSite));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+#if USE_SYSTEM_MENUDESKBAR
+    hr = CoCreateInstance(CLSID_MenuDeskBar,
+                          NULL,
+                          CLSCTX_INPROC_SERVER,
+                          IID_PPV_ARG(IDeskBar, &pDeskBar));
+#else
+    hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar));
+#endif
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#if WRAP_MENUDESKBAR
+    hr = CMenuDeskBar_Wrapper(pDeskBar, IID_PPV_ARG(IDeskBar, &pDeskBar));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+    CComObject<CShellMenuCallback> *pCallback;
+    hr = CComObject<CShellMenuCallback>::CreateInstance(&pCallback);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+    pCallback->AddRef(); // CreateInstance returns object with 0 ref count */
+    pCallback->Initialize(pShellMenu, pBandSite, pDeskBar);
+
+    pShellMenu->Initialize(pCallback, (UINT)-1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = SHGetDesktopFolder(&shellFolder);
+
+    /* FIXME: Use CLSID_MergedFolder class and IID_IAugmentedShellFolder2 interface here */
+    /* CLSID_MergedFolder 26fdc864-be88-46e7-9235-032d8ea5162e */
+    /* IID_IAugmentedShellFolder2 8db3b3f4-6cfe-11d1-8ae9-00c04fd918d0 */
+    hr = SHGetFolderLocation(NULL, CSIDL_STARTMENU, 0, 0, &pidlStartMenuUser);
+    hr = shellFolder->BindToObject(pidlStartMenuUser, NULL, IID_IShellFolder, (void**) &psfStartMenuUser);
+
+#if MERGE_FOLDERS
+    hr = SHGetFolderLocation(NULL, CSIDL_COMMON_STARTMENU, 0, 0, &pidlStartMenuAll);
+    hr = shellFolder->BindToObject(pidlStartMenuAll, NULL, IID_IShellFolder, (void**) &psfStartMenuAll);
+
+    IShellFolder * psfMerged;
+    hr = CMergedFolder_Constructor(psfStartMenuUser, psfStartMenuAll, IID_PPV_ARG(IShellFolder, &psfMerged));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = pShellMenu->SetShellFolder(psfMerged, NULL, NULL, 0);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#else
+    hr = pShellMenu->SetShellFolder(psfStartMenuUser, NULL, NULL, 0);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+#endif
+
+    hr = pDeskBar->SetClient(pBandSite);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = pBandSite->AddBand(pShellMenu);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return pDeskBar->QueryInterface(riid, ppv);
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/CStartMenu.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/logging/CMenuBandWrap.cpp
===================================================================
--- base/shell/rshell/logging/CMenuBandWrap.cpp	(rÃ©vision 0)
+++ base/shell/rshell/logging/CMenuBandWrap.cpp	(rÃ©vision 62573)
@@ -0,0 +1,742 @@
+/*
+* Shell Menu Band
+*
+* Copyright 2014 David Quintana
+*
+* 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
+*/
+#include "precomp.h"
+#include "wraplog.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(CMenuBandWrap);
+
+class CMenuBandWrap :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IDeskBand,
+    public IObjectWithSite,
+    public IInputObject,
+    public IPersistStream,
+    public IOleCommandTarget,
+    public IServiceProvider,
+    public IMenuPopup,
+    public IMenuBand,
+    public IShellMenu2,
+    public IWinEventHandler,
+    public IShellMenuAcc
+{
+public:
+    CMenuBandWrap() {}
+    ~CMenuBandWrap();
+
+    HRESULT InitWrap(IShellMenu * shellMenu);
+
+private:
+    CComPtr<IDeskBand         > m_IDeskBand;
+    CComPtr<IDockingWindow    > m_IDockingWindow;
+    CComPtr<IOleWindow        > m_IOleWindow;
+    CComPtr<IObjectWithSite   > m_IObjectWithSite;
+    CComPtr<IInputObject      > m_IInputObject;
+    CComPtr<IPersistStream    > m_IPersistStream;
+    CComPtr<IPersist          > m_IPersist;
+    CComPtr<IOleCommandTarget > m_IOleCommandTarget;
+    CComPtr<IServiceProvider  > m_IServiceProvider;
+    CComPtr<IMenuPopup        > m_IMenuPopup;
+    CComPtr<IDeskBar          > m_IDeskBar;
+    CComPtr<IMenuBand         > m_IMenuBand;
+    CComPtr<IShellMenu2       > m_IShellMenu2;
+    CComPtr<IShellMenu        > m_IShellMenu;
+    CComPtr<IWinEventHandler  > m_IWinEventHandler;
+    CComPtr<IShellMenuAcc     > m_IShellMenuAcc;
+
+    IUnknown * m_site;
+    
+public:
+
+    // *** IDeskBand methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi);
+
+    // *** IDockingWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow);
+    virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved);
+    virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved);
+
+    // *** IOleWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // *** IObjectWithSite methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
+    virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite);
+
+    // *** IInputObject methods ***
+    virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg);
+    virtual HRESULT STDMETHODCALLTYPE HasFocusIO();
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
+
+    // *** IPersistStream methods ***
+    virtual HRESULT STDMETHODCALLTYPE IsDirty();
+    virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm);
+    virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty);
+    virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize);
+
+    // *** IPersist methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID);
+
+    // *** IOleCommandTarget methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    // *** IServiceProvider methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    // *** IMenuPopup methods ***
+    virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType);
+    virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet);
+
+    // *** IDeskBar methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient);
+    virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient);
+    virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc);
+
+    // *** IMenuBand methods ***
+    virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg);
+    virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet);
+
+    // *** IShellMenu methods ***
+    virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags);
+    virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv);
+    virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags);
+    virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd);
+    virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags);
+
+    // *** IWinEventHandler methods ***
+    virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+    virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd);
+
+    // *** IShellMenu2 methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS);
+    virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS);
+
+    // *** IShellMenuAcc methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetTop(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS);
+    virtual HRESULT STDMETHODCALLTYPE GetState(THIS);
+    virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS);
+    virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS);
+
+    DECLARE_NOT_AGGREGATABLE(CMenuBandWrap)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(CMenuBandWrap)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand)
+        COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand)
+        COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+        COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)
+        COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistStream)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+        COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2)
+        COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler)
+        COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
+    END_COM_MAP()
+};
+
+extern "C"
+HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv)
+{
+    HRESULT hr;
+
+    *ppv = NULL;
+
+    CMenuBandWrap * site = new CComObject<CMenuBandWrap>();
+
+    if (!site)
+        return E_OUTOFMEMORY;
+
+    hr = site->InitWrap(shellMenu);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        site->Release();
+        return hr;
+    }
+
+    hr = site->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        site->Release();
+
+    return hr;
+}
+
+HRESULT CMenuBandWrap::InitWrap(IShellMenu * shellMenu)
+{
+    HRESULT hr;
+
+    WrapLogOpen();
+
+    m_IShellMenu = shellMenu;
+
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IDeskBand, &m_IDeskBand));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IDockingWindow, &m_IDockingWindow));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IPersistStream, &m_IPersistStream));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IPersist, &m_IPersist));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IDeskBar, &m_IDeskBar));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IMenuBand, &m_IMenuBand));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IShellMenu2, &m_IShellMenu2));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = shellMenu->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_IWinEventHandler));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    //hr = shellMenu->QueryInterface(IID_PPV_ARG(IShellMenuAcc, &m_IShellMenuAcc));
+    m_IShellMenuAcc = NULL;
+    return hr;
+}
+
+CMenuBandWrap::~CMenuBandWrap()
+{
+    WrapLogClose();
+}
+
+
+// *** IShellMenu2 methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetSubMenu(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetSubMenu()\n", this);
+    HRESULT hr = m_IShellMenu2->GetSubMenu();
+    WrapLogExit("CMenuBandWrap::GetSubMenu()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetToolbar(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetToolbar()\n", this);
+    HRESULT hr = m_IShellMenu2->SetToolbar();
+    WrapLogExit("CMenuBandWrap::SetToolbar()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetMinWidth(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetMinWidth()\n", this);
+    HRESULT hr = m_IShellMenu2->SetMinWidth();
+    WrapLogExit("CMenuBandWrap::SetMinWidth()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetNoBorder(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetNoBorder()\n", this);
+    HRESULT hr = m_IShellMenu2->SetNoBorder();
+    WrapLogExit("CMenuBandWrap::SetNoBorder()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetTheme(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetTheme()\n", this);
+    HRESULT hr = m_IShellMenu2->SetTheme();
+    WrapLogExit("CMenuBandWrap::SetTheme()", hr);
+    return hr;
+}
+
+
+// *** IShellMenuAcc methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetTop(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetTop()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetTop();
+    WrapLogExit("CMenuBandWrap::GetTop()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetBottom(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetBottom();
+    WrapLogExit("CMenuBandWrap::GetBottom()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetTracked(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetBottom();
+    WrapLogExit("CMenuBandWrap::GetBottom()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetParentSite(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetBottom();
+    WrapLogExit("CMenuBandWrap::GetBottom()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetState(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetBottom();
+    WrapLogExit("CMenuBandWrap::GetBottom()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::DoDefaultAction(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetBottom();
+    WrapLogExit("CMenuBandWrap::GetBottom()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::IsEmpty(THIS)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this);
+    HRESULT hr = m_IShellMenuAcc->GetBottom();
+    WrapLogExit("CMenuBandWrap::GetBottom()", hr);
+    return hr;
+}
+
+// *** IDeskBand methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetBandInfo(DWORD dwBandID=%d, DWORD dwViewMode=%d, DESKBANDINFO *pdbi=%p)\n", this, dwBandID, dwViewMode, pdbi);
+    HRESULT hr = m_IDeskBand->GetBandInfo(dwBandID, dwViewMode, pdbi);
+    WrapLogExit("CMenuBandWrap::GetBandInfo()", hr);
+    return hr;
+}
+
+// *** IDockingWindow methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::ShowDW(BOOL fShow)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::ShowDW(BOOL fShow=%d)\n", this, fShow);
+    HRESULT hr = m_IDockingWindow->ShowDW(fShow);
+    WrapLogExit("CMenuBandWrap::ShowDW()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::CloseDW(DWORD dwReserved)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::CloseDW(DWORD dwReserved=%d)\n", this, dwReserved);
+    HRESULT hr = m_IDockingWindow->CloseDW(dwReserved);
+    WrapLogExit("CMenuBandWrap::CloseDW()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::ResizeBorderDW(LPCRECT prcBorder=%p, IUnknown *punkToolbarSite=%p, BOOL fReserved=%d)\n", this, prcBorder, punkToolbarSite, fReserved);
+    if (prcBorder) WrapLogPre("*prcBorder=%s\n", Wrap(*prcBorder));
+    HRESULT hr = m_IDockingWindow->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved);
+    if (prcBorder) WrapLogPost("*prcBorder=%s\n", Wrap(*prcBorder));
+    WrapLogExit("CMenuBandWrap::ResizeBorderDW()", hr);
+    return hr;
+}
+
+// *** IOleWindow methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetWindow(HWND *phwnd)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd);
+    HRESULT hr = m_IOleWindow->GetWindow(phwnd);
+    if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd);
+    WrapLogExit("CMenuBandWrap::GetWindow()", hr);
+    return hr;
+}
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode);
+    HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode);
+    WrapLogExit("CMenuBandWrap::ContextSensitiveHelp()", hr);
+    return hr;
+}
+
+// *** IWinEventHandler methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    //WrapLogEnter("CMenuBandWrap<%p>::OnWinEvent(HWND hWnd=%p, UINT uMsg=%u, WPARAM wParam=%08x, LPARAM lParam=%08x, LRESULT *theResult=%p)\n", this, hWnd, uMsg, wParam, lParam, theResult);
+    HRESULT hr = m_IWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+    //WrapLogExit("CMenuBandWrap::OnWinEvent()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::IsWindowOwner(HWND hWnd)
+{
+    //WrapLogEnter("CMenuBandWrap<%p>::IsWindowOwner(HWND hWnd=%08x)\n", this, hWnd);
+    HRESULT hr = m_IWinEventHandler->IsWindowOwner(hWnd);
+    //WrapLogExit("CMenuBandWrap::IsWindowOwner()", hr);
+    return hr;
+}
+
+// *** IObjectWithSite methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetSite(IUnknown *pUnkSite)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite);
+    HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite);
+    WrapLogExit("CMenuBandWrap::SetSite()", hr);
+    m_site = pUnkSite;
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetSite(REFIID riid, PVOID *ppvSite)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetSite(REFIID riid=%s, PVOID *ppvSite=%p)\n", this, Wrap(riid), ppvSite);
+    HRESULT hr = m_IObjectWithSite->GetSite(riid, ppvSite);
+    if (ppvSite) WrapLogPost("*ppvSite=%p\n", *ppvSite);
+    WrapLogExit("CMenuBandWrap::GetSite()", hr);
+    return hr;
+}
+
+// *** IInputObject methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::UIActivateIO(BOOL fActivate=%d, LPMSG lpMsg=%p)\n", this, fActivate, lpMsg);
+    HRESULT hr = m_IInputObject->UIActivateIO(fActivate, lpMsg);
+    WrapLogExit("CMenuBandWrap::UIActivateIO()", hr);
+
+    HRESULT hrt;
+    CComPtr<IMenuPopup> pmp;
+
+    hrt = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp));
+    if (FAILED(hrt))
+        return hr;
+
+    hrt = pmp->SetSubMenu(this, fActivate);
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::HasFocusIO()
+{
+    WrapLogEnter("CMenuBandWrap<%p>::HasFocusIO()\n", this);
+    HRESULT hr = m_IInputObject->HasFocusIO();
+    WrapLogExit("CMenuBandWrap::HasFocusIO()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::TranslateAcceleratorIO(LPMSG lpMsg)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg);
+    if (lpMsg) WrapLogPre("*lpMsg=%s\n", Wrap(*lpMsg));
+    HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg);
+    WrapLogExit("CMenuBandWrap::TranslateAcceleratorIO()", hr);
+    return hr;
+}
+
+// *** IPersistStream methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::IsDirty()
+{
+    WrapLogEnter("CMenuBandWrap<%p>::IsDirty()\n", this);
+    HRESULT hr = m_IPersistStream->IsDirty();
+    WrapLogExit("CMenuBandWrap::IsDirty()", hr);
+    return hr;
+}
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::Load(IStream *pStm)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::Load(IStream *pStm=%p)\n", this, pStm);
+    HRESULT hr = m_IPersistStream->Load(pStm);
+    WrapLogExit("CMenuBandWrap::Load()", hr);
+    return hr;
+}
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::Save(IStream *pStm, BOOL fClearDirty)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::Save(IStream *pStm=%p, BOOL fClearDirty=%d)\n", this, pStm, fClearDirty);
+    HRESULT hr = m_IPersistStream->Save(pStm, fClearDirty);
+    WrapLogExit("CMenuBandWrap::Save()", hr);
+    return hr;
+}
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetSizeMax(ULARGE_INTEGER *pcbSize)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetSizeMax(ULARGE_INTEGER *pcbSize=%p)\n", this, pcbSize);
+    HRESULT hr = m_IPersistStream->GetSizeMax(pcbSize);
+    WrapLogExit("CMenuBandWrap::GetSizeMax()", hr);
+    return hr;
+}
+
+// *** IPersist methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetClassID(CLSID *pClassID)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetClassID(CLSID *pClassID=%p)\n", this, pClassID);
+    HRESULT hr = m_IPersist->GetClassID(pClassID);
+    if (pClassID) WrapLogPost("*pClassID=%s\n", Wrap(*pClassID));
+    WrapLogExit("CMenuBandWrap::GetClassID()", hr);
+    return hr;
+}
+
+// *** IOleCommandTarget methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    WrapLogExit("CMenuBandWrap::QueryStatus()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    if (pguidCmdGroup) WrapLogPre("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    WrapLogExit("CMenuBandWrap::Exec()", hr);
+    return hr;
+}
+
+// *** IServiceProvider methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject);
+
+    if (IsEqualIID(guidService, SID_SMenuBandChild))
+    {
+        WrapLogPre("SID is SID_SMenuBandChild. Using QueryInterface of self instead of wrapped object.\n");
+        HRESULT hr = this->QueryInterface(riid, ppvObject);
+        if (SUCCEEDED(hr))
+        {
+            if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+            WrapLogExit("CMenuBandWrap::QueryService()", hr);
+            return hr;
+        }
+        else
+        {
+            WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n");
+        }
+    }
+    else if (IsEqualIID(guidService, SID_SMenuBandBottom))
+    {
+        WrapLogPre("SID is SID_SMenuBandBottom. Using QueryInterface of self instead of wrapped object.\n");
+        HRESULT hr = this->QueryInterface(riid, ppvObject);
+        if (SUCCEEDED(hr))
+        {
+            if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+            WrapLogExit("CMenuBandWrap::QueryService()", hr);
+            return hr;
+        }
+        else
+        {
+            WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n");
+        }
+    }
+    else if (IsEqualIID(guidService, SID_SMenuBandBottomSelected))
+    {
+        WrapLogPre("SID is SID_SMenuBandBottomSelected. Using QueryInterface of self instead of wrapped object.\n");
+        HRESULT hr = this->QueryInterface(riid, ppvObject);
+        if (SUCCEEDED(hr))
+        {
+            if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+            WrapLogExit("CMenuBandWrap::QueryService()", hr);
+            return hr;
+        }
+        else
+        {
+            WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n");
+        }
+    }
+    else
+    {
+        WrapLogPre("SID not identified.\n");
+    }
+    HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject);
+    if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+    WrapLogExit("CMenuBandWrap::QueryService()", hr);
+    return hr;
+}
+
+
+// *** IMenuPopup methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::Popup(POINTL *ppt=%p, RECTL *prcExclude=%p, MP_POPUPFLAGS dwFlags=%08x)\n", this, ppt, prcExclude, dwFlags);
+    HRESULT hr = m_IMenuPopup->Popup(ppt, prcExclude, dwFlags);
+    WrapLogExit("CMenuBandWrap::Popup()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::OnSelect(DWORD dwSelectType)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType);
+    HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType);
+    WrapLogExit("CMenuBandWrap::OnSelect()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet);
+    HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet);
+    WrapLogExit("CMenuBandWrap::SetSubMenu()", hr);
+    return hr;
+}
+
+
+// *** IDeskBar methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetClient(IUnknown *punkClient)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient);
+    HRESULT hr = m_IDeskBar->SetClient(punkClient);
+    WrapLogExit("CMenuBandWrap::SetClient()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetClient(IUnknown **ppunkClient)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient);
+    HRESULT hr = m_IDeskBar->GetClient(ppunkClient);
+    if (ppunkClient) WrapLogPost("*ppunkClient=%p\n", *ppunkClient);
+    WrapLogExit("CMenuBandWrap::GetClient()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::OnPosRectChangeDB(RECT *prc)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc);
+    HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc);
+    if (prc) WrapLogPost("*prc=%s\n", Wrap(*prc));
+    WrapLogExit("CMenuBandWrap::OnPosRectChangeDB()", hr);
+    return hr;
+}
+
+
+// *** IMenuBand methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::IsMenuMessage(MSG *pmsg)
+{
+    //WrapLogEnter("CMenuBandWrap<%p>::IsMenuMessage(MSG *pmsg=%p)\n", this, pmsg);
+    HRESULT hr = m_IMenuBand->IsMenuMessage(pmsg);
+    //WrapLogExit("CMenuBandWrap::IsMenuMessage()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet)
+{
+    //WrapLogEnter("CMenuBandWrap<%p>::TranslateMenuMessage(MSG *pmsg=%p, LRESULT *plRet=%p)\n", this, pmsg, plRet);
+    HRESULT hr = m_IMenuBand->TranslateMenuMessage(pmsg, plRet);
+    //WrapLogExit("CMenuBandWrap::TranslateMenuMessage(*plRet=%d) = %08x\n", *plRet, hr);
+    return hr;
+}
+
+// *** IShellMenu methods ***
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::Initialize(IShellMenuCallback *psmc=%p, UINT uId=%u, UINT uIdAncestor=%u, DWORD dwFlags=%08x)\n", this, psmc, uId, uIdAncestor, dwFlags);
+    HRESULT hr = m_IShellMenu->Initialize(psmc, uId, uIdAncestor, dwFlags);
+    WrapLogExit("CMenuBandWrap::Initialize()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetMenuInfo(IShellMenuCallback **ppsmc=%p, UINT *puId=%p, UINT *puIdAncestor=%p, DWORD *pdwFlags=%p)\n", this, ppsmc, puId, puIdAncestor, pdwFlags);
+    HRESULT hr = m_IShellMenu->GetMenuInfo(ppsmc, puId, puIdAncestor, pdwFlags);
+    if (ppsmc) WrapLogPost("*ppsmc=%p\n", *ppsmc);
+    if (puId) WrapLogPost("*puId=%u\n", *puId);
+    if (puIdAncestor) WrapLogPost("*puIdAncestor=%u\n", *puIdAncestor);
+    if (pdwFlags) WrapLogPost("*pdwFlags=%08x\n", *pdwFlags);
+    WrapLogExit("CMenuBandWrap::GetMenuInfo()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetShellFolder(IShellFolder *psf=%p, LPCITEMIDLIST pidlFolder=%p, HKEY hKey=%p, DWORD dwFlags=%08x)\n", this, psf, pidlFolder, hKey, dwFlags);
+    HRESULT hr = m_IShellMenu->SetShellFolder(psf, pidlFolder, hKey, dwFlags);
+    WrapLogExit("CMenuBandWrap::SetShellFolder()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetShellFolder(DWORD *pdwFlags=%p, LPITEMIDLIST *ppidl=%p, REFIID riid=%s, void **ppv=%p)\n", this, pdwFlags, ppidl, Wrap(riid), ppv);
+    HRESULT hr = m_IShellMenu->GetShellFolder(pdwFlags, ppidl, riid, ppv);
+    if (pdwFlags) WrapLogPost("*pdwFlags=%08x\n", *pdwFlags);
+    if (ppidl) WrapLogPost("*ppidl=%p\n", *ppidl);
+    if (ppv) WrapLogPost("*ppv=%p\n", *ppv);
+    WrapLogExit("CMenuBandWrap::GetShellFolder()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetMenu(HMENU hmenu=%p, HWND hwnd=%p, DWORD dwFlags=%08x)\n", this, hmenu, hwnd, dwFlags);
+    HRESULT hr = m_IShellMenu->SetMenu(hmenu, hwnd, dwFlags);
+    WrapLogExit("CMenuBandWrap::SetMenu()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetMenu(HMENU *phmenu=%p, HWND *phwnd=%p, DWORD *pdwFlags=%p)\n", this, phmenu, phwnd, pdwFlags);
+    HRESULT hr = m_IShellMenu->GetMenu(phmenu, phwnd, pdwFlags);
+    if (phmenu) WrapLogPost("*phmenu=%p\n", *phmenu);
+    if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd);
+    if (pdwFlags) WrapLogPost("*pdwFlags=%08x\n", *pdwFlags);
+    WrapLogExit("CMenuBandWrap::GetMenu()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::InvalidateItem(LPSMDATA psmd, DWORD dwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::InvalidateItem(LPSMDATA psmd=%p, DWORD dwFlags=%08x)\n", this, psmd, dwFlags);
+    HRESULT hr = m_IShellMenu->InvalidateItem(psmd, dwFlags);
+    WrapLogExit("CMenuBandWrap::InvalidateItem()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetState(LPSMDATA psmd)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::GetState(LPSMDATA psmd=%p)\n", this, psmd);
+    HRESULT hr = m_IShellMenu->GetState(psmd);
+    WrapLogExit("CMenuBandWrap::GetState()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuBandWrap::SetMenuToolbar(IUnknown *punk, DWORD dwFlags)
+{
+    WrapLogEnter("CMenuBandWrap<%p>::SetMenuToolbar(IUnknown *punk=%p, DWORD dwFlags=%08x)\n", this, punk, dwFlags);
+    HRESULT hr = m_IShellMenu->SetMenuToolbar(punk, dwFlags);
+    WrapLogExit("CMenuBandWrap::SetMenuToolbar()", hr);
+    return hr;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/logging/CMenuBandWrap.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/logging/CMenuDeskBarWrap.cpp
===================================================================
--- base/shell/rshell/logging/CMenuDeskBarWrap.cpp	(rÃ©vision 0)
+++ base/shell/rshell/logging/CMenuDeskBarWrap.cpp	(rÃ©vision 62573)
@@ -0,0 +1,439 @@
+/*
+* Shell Menu Desk Bar
+*
+* Copyright 2014 David Quintana
+*
+* 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
+*/
+#include "precomp.h"
+#include "wraplog.h"
+
+class CMenuDeskBarWrap :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IOleCommandTarget,
+    public IServiceProvider,
+    public IInputObjectSite,
+    public IInputObject,
+    public IMenuPopup,
+    public IObjectWithSite,
+    public IBanneredBar,
+    public IInitializeObject
+{
+public:
+    CMenuDeskBarWrap() {}
+    ~CMenuDeskBarWrap();
+
+    HRESULT InitWrap(IDeskBar * shellMenu);
+
+private:
+    CComPtr<IMenuPopup        > m_IMenuPopup;
+    CComPtr<IOleCommandTarget > m_IOleCommandTarget;
+    CComPtr<IServiceProvider  > m_IServiceProvider;
+    CComPtr<IDeskBar          > m_IDeskBar;
+    CComPtr<IOleWindow        > m_IOleWindow;
+    CComPtr<IInputObjectSite  > m_IInputObjectSite;
+    CComPtr<IInputObject      > m_IInputObject;
+    CComPtr<IObjectWithSite   > m_IObjectWithSite;
+    CComPtr<IBanneredBar      > m_IBanneredBar;
+    CComPtr<IInitializeObject > m_IInitializeObject;
+
+public:
+    // *** IMenuPopup methods ***
+    virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags);
+    virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType);
+    virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet);
+
+    // *** IOleWindow methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // *** IObjectWithSite methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
+    virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite);
+
+    // *** IBanneredBar methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetIconSize(DWORD iIcon);
+    virtual HRESULT STDMETHODCALLTYPE GetIconSize(DWORD* piIcon);
+    virtual HRESULT STDMETHODCALLTYPE SetBitmap(HBITMAP hBitmap);
+    virtual HRESULT STDMETHODCALLTYPE GetBitmap(HBITMAP* phBitmap);
+
+    // *** IInitializeObject methods ***
+    virtual HRESULT STDMETHODCALLTYPE Initialize(THIS);
+
+    // *** IOleCommandTarget methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    // *** IServiceProvider methods ***
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    // *** IInputObjectSite methods ***
+    virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus);
+
+    // *** IInputObject methods ***
+    virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL bActivating, LPMSG lpMsg);
+    virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS);
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
+
+    // *** IDeskBar methods ***
+    virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient);
+    virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient);
+    virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc);
+
+    DECLARE_NOT_AGGREGATABLE(CMenuDeskBarWrap)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(CMenuDeskBarWrap)
+        COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup)
+        COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+        COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar)
+        COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject)
+    END_COM_MAP()
+};
+
+extern "C"
+HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv)
+{
+    HRESULT hr;
+
+    *ppv = NULL;
+
+    CMenuDeskBarWrap * bar = new CComObject<CMenuDeskBarWrap>();
+    if (!bar)
+        return E_OUTOFMEMORY;
+
+    hr = bar->InitWrap(deskBar);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        bar->Release();
+        return hr;
+    }
+
+    hr = bar->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        bar->Release();
+
+    return hr;
+}
+
+HRESULT CMenuDeskBarWrap::InitWrap(IDeskBar * deskBar)
+{
+    HRESULT hr;
+
+    WrapLogOpen();
+
+    m_IDeskBar = deskBar;
+
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IBanneredBar, &m_IBanneredBar));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = deskBar->QueryInterface(IID_PPV_ARG(IInitializeObject, &m_IInitializeObject));
+    return hr;
+}
+
+CMenuDeskBarWrap::~CMenuDeskBarWrap()
+{
+    WrapLogClose();
+}
+
+// *** IMenuPopup methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::Popup(POINTL *ppt=%p, RECTL *prcExclude=%p, MP_POPUPFLAGS dwFlags=%08x)\n", this, ppt, prcExclude, dwFlags);
+    HRESULT hr = m_IMenuPopup->Popup(ppt, prcExclude, dwFlags);
+    WrapLogExit("CMenuDeskBarWrap::Popup()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::OnSelect(DWORD dwSelectType)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType);
+    HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType);
+    WrapLogExit("CMenuDeskBarWrap::OnSelect()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet);
+    HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet);
+    WrapLogExit("CMenuDeskBarWrap::SetSubMenu()", hr);
+    return hr;
+}
+
+// *** IOleWindow methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::GetWindow(HWND *phwnd)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd);
+    HRESULT hr = m_IOleWindow->GetWindow(phwnd);
+    if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd);
+    WrapLogExit("CMenuDeskBarWrap::GetWindow()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode);
+    HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode);
+    WrapLogExit("CMenuDeskBarWrap::ContextSensitiveHelp()", hr);
+    return hr;
+}
+
+// *** IObjectWithSite methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::SetSite(IUnknown *pUnkSite)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite);
+
+#if WRAP_TRAYPRIV
+    CComPtr<ITrayPriv> inTp;
+    HRESULT hr2 = pUnkSite->QueryInterface(IID_PPV_ARG(ITrayPriv, &inTp));
+    if (SUCCEEDED(hr2))
+    {
+        ITrayPriv * outTp;
+        hr2 = CStartMenuSite_Wrapper(inTp, IID_PPV_ARG(ITrayPriv, &outTp));
+        if (SUCCEEDED(hr2))
+        {
+            pUnkSite = outTp;
+        }
+        else
+        {
+            outTp->Release();
+        }
+    }
+#endif
+    HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite);
+    WrapLogExit("CMenuDeskBarWrap::SetSite()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::GetSite(REFIID riid, PVOID *ppvSite)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::GetSite(REFIID riid=%s, PVOID *ppvSite=%p)\n", this, Wrap(riid), ppvSite);
+    HRESULT hr = m_IObjectWithSite->GetSite(riid, ppvSite);
+    if (ppvSite) WrapLogPost("*ppvSite=%p\n", *ppvSite);
+    WrapLogExit("CMenuDeskBarWrap::GetSite()", hr);
+    return hr;
+}
+
+// *** IBanneredBar methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::SetIconSize(DWORD iIcon)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::SetIconSize(DWORD iIcon=%d)\n", this, iIcon);
+    HRESULT hr = m_IBanneredBar->SetIconSize(iIcon);
+    WrapLogExit("CMenuDeskBarWrap::SetIconSize()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::GetIconSize(DWORD* piIcon)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::GetIconSize(DWORD* piIcon=%p)\n", this, piIcon);
+    HRESULT hr = m_IBanneredBar->GetIconSize(piIcon);
+    if (piIcon) WrapLogPost("*piIcon=%d\n", *piIcon);
+    WrapLogExit("CMenuDeskBarWrap::GetIconSize()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::SetBitmap(HBITMAP hBitmap)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::SetBitmap(HBITMAP hBitmap=%p)\n", this, hBitmap);
+    HRESULT hr = m_IBanneredBar->SetBitmap(hBitmap);
+    WrapLogExit("CMenuDeskBarWrap::SetBitmap()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::GetBitmap(HBITMAP* phBitmap)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::GetBitmap(HBITMAP* phBitmap=%p)\n", this, phBitmap);
+    HRESULT hr = m_IBanneredBar->GetBitmap(phBitmap);
+    if (phBitmap) WrapLogPost("*phBitmap=%p\n", *phBitmap);
+    WrapLogExit("CMenuDeskBarWrap::GetBitmap()", hr);
+    return hr;
+}
+
+
+// *** IInitializeObject methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::Initialize(THIS)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::Initialize()\n", this);
+    HRESULT hr = m_IInitializeObject->Initialize();
+    WrapLogExit("CMenuDeskBarWrap::Initialize()", hr);
+    return hr;
+}
+
+// *** IOleCommandTarget methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    WrapLogExit("CMenuDeskBarWrap::QueryStatus()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    WrapLogExit("CMenuDeskBarWrap::Exec()", hr);
+    return hr;
+}
+
+// *** IServiceProvider methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject);
+
+    if (IsEqualIID(guidService, SID_SMenuPopup))
+    {
+        WrapLogPre("SID is SID_SMenuPopup. Using QueryInterface of self instead of wrapped object.\n");
+        HRESULT hr = this->QueryInterface(riid, ppvObject);
+        if (SUCCEEDED(hr))
+        {
+            if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+            WrapLogExit("CMenuDeskBarWrap::QueryService()", hr);
+            return hr;
+        }
+        else
+        {
+            WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n");
+        }
+    }
+    else if (IsEqualIID(guidService, SID_SMenuBandParent))
+    {
+        WrapLogPre("SID is SID_SMenuBandParent. Using QueryInterface of self instead of wrapped object.\n");
+        HRESULT hr = this->QueryInterface(riid, ppvObject);
+        if (SUCCEEDED(hr))
+        {
+            if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+            WrapLogExit("CMenuDeskBarWrap::QueryService()", hr);
+            return hr;
+        }
+        else
+        {
+            WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n");
+        }
+    }
+    else if (IsEqualIID(guidService, SID_STopLevelBrowser))
+    {
+        WrapLogPre("SID is SID_STopLevelBrowser. Using QueryInterface of self instead of wrapped object.\n");
+        HRESULT hr = this->QueryInterface(riid, ppvObject);
+        if (SUCCEEDED(hr))
+        {
+            if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+            WrapLogExit("CMenuDeskBarWrap::QueryService()", hr);
+            return hr;
+        }
+        else
+        {
+            WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n");
+        }
+    }
+    else
+    {
+        WrapLogPre("SID not identified. Calling wrapped object's QueryService.\n");
+    }
+    HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject);
+    if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+    WrapLogExit("CMenuDeskBarWrap::QueryService()", hr);
+    return hr;
+}
+
+// *** IInputObjectSite methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::OnFocusChangeIS(LPUNKNOWN lpUnknown=%p, BOOL bFocus=%d)\n", this, lpUnknown, bFocus);
+    HRESULT hr = m_IInputObjectSite->OnFocusChangeIS(lpUnknown, bFocus);
+    WrapLogExit("CMenuDeskBarWrap::OnFocusChangeIS()", hr);
+    return hr;
+}
+
+// *** IInputObject methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::UIActivateIO(BOOL bActivating, LPMSG lpMsg)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::UIActivateIO(BOOL bActivating=%d, LPMSG lpMsg=%p)\n", this, bActivating, lpMsg);
+    HRESULT hr = m_IInputObject->UIActivateIO(bActivating, lpMsg);
+    WrapLogExit("CMenuDeskBarWrap::UIActivateIO()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::HasFocusIO(THIS)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::HasFocusIO()\n", this);
+    HRESULT hr = m_IInputObject->HasFocusIO();
+    WrapLogExit("CMenuDeskBarWrap::HasFocusIO()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::TranslateAcceleratorIO(LPMSG lpMsg)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg);
+    if (lpMsg) WrapLogPre("*lpMsg=%s\n", Wrap(*lpMsg));
+    HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg);
+    WrapLogExit("CMenuDeskBarWrap::TranslateAcceleratorIO()", hr);
+    return hr;
+}
+
+// *** IDeskBar methods ***
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::SetClient(IUnknown *punkClient)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient);
+    HRESULT hr = m_IDeskBar->SetClient(punkClient);
+    WrapLogExit("CMenuDeskBarWrap::SetClient()", hr);
+
+    CComPtr<IDeskBarClient> dbc;
+    punkClient->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
+    dbc->SetDeskBarSite(static_cast<IDeskBar*>(this));
+
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::GetClient(IUnknown **ppunkClient)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient);
+    HRESULT hr = m_IDeskBar->GetClient(ppunkClient);
+    if (ppunkClient) WrapLogPost("*ppunkClient=%p\n", *ppunkClient);
+    WrapLogExit("CMenuDeskBarWrap::GetClient()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::OnPosRectChangeDB(LPRECT prc)
+{
+    WrapLogEnter("CMenuDeskBarWrap<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc);
+    HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc);
+    if (prc) WrapLogPost("*prc=%s\n", Wrap(*prc));
+    WrapLogExit("CMenuDeskBarWrap::OnPosRectChangeDB()", hr);
+    return hr;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/logging/CMenuDeskBarWrap.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/logging/CMenuSiteWrap.cpp
===================================================================
--- base/shell/rshell/logging/CMenuSiteWrap.cpp	(rÃ©vision 0)
+++ base/shell/rshell/logging/CMenuSiteWrap.cpp	(rÃ©vision 62573)
@@ -0,0 +1,364 @@
+/*
+ * Shell Menu Site
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+
+#include "precomp.h"
+#include "wraplog.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(menusite);
+
+class CMenuSiteWrap :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IBandSite,
+    public IDeskBarClient,
+    public IOleCommandTarget,
+    public IInputObject,
+    public IInputObjectSite,
+    public IWinEventHandler,
+    public IServiceProvider
+{
+public:
+    CMenuSiteWrap() {}
+    ~CMenuSiteWrap();
+
+    HRESULT InitWrap(IBandSite * bandSite);
+
+private:
+    CComPtr<IBandSite        > m_IBandSite;
+    CComPtr<IDeskBarClient   > m_IDeskBarClient;
+    CComPtr<IOleWindow       > m_IOleWindow;
+    CComPtr<IOleCommandTarget> m_IOleCommandTarget;
+    CComPtr<IInputObject     > m_IInputObject;
+    CComPtr<IInputObjectSite > m_IInputObjectSite;
+    CComPtr<IWinEventHandler > m_IWinEventHandler;
+    CComPtr<IServiceProvider > m_IServiceProvider;
+
+public:
+    // IBandSite
+    virtual HRESULT STDMETHODCALLTYPE AddBand(IUnknown * punk);
+    virtual HRESULT STDMETHODCALLTYPE EnumBands(UINT uBand, DWORD* pdwBandID);
+    virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName);
+    virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv);
+    virtual HRESULT STDMETHODCALLTYPE GetBandSiteInfo(BANDSITEINFO *pbsinfo);
+    virtual HRESULT STDMETHODCALLTYPE RemoveBand(DWORD dwBandID);
+    virtual HRESULT STDMETHODCALLTYPE SetBandSiteInfo(const BANDSITEINFO *pbsinfo);
+    virtual HRESULT STDMETHODCALLTYPE SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState);
+
+    // IDeskBarClient
+    virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite);
+    virtual HRESULT STDMETHODCALLTYPE SetModeDBC(DWORD dwMode);
+    virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc);
+    virtual HRESULT STDMETHODCALLTYPE UIActivateDBC(DWORD dwState);
+
+    // IOleWindow
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // IOleCommandTarget
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    // IInputObject
+    virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg);
+    virtual HRESULT STDMETHODCALLTYPE HasFocusIO();
+    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
+
+    // IInputObjectSite
+    virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus);
+
+    // IWinEventHandler
+    virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd);
+    virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult);
+
+    // IServiceProvider
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    DECLARE_NOT_AGGREGATABLE(CMenuSiteWrap)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+    BEGIN_COM_MAP(CMenuSiteWrap)
+        COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite)
+        COM_INTERFACE_ENTRY_IID(IID_IDeskBarClient, IDeskBarClient)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+        COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite)
+        COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+    END_COM_MAP()
+};
+
+extern "C"
+HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv)
+{
+    HRESULT hr;
+
+    *ppv = NULL;
+
+    CMenuSiteWrap * site = new CComObject<CMenuSiteWrap>();
+
+    if (!site)
+        return E_OUTOFMEMORY;
+
+    hr = site->InitWrap(bandSite);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        site->Release();
+        return hr;
+    }
+
+    hr = site->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        site->Release();
+
+    return hr;
+}
+
+HRESULT CMenuSiteWrap::InitWrap(IBandSite * bandSite)
+{
+    HRESULT hr;
+
+    WrapLogOpen();
+
+    m_IBandSite = bandSite;
+
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IDeskBarClient, &m_IDeskBarClient));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_IWinEventHandler));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
+    return hr;
+}
+
+CMenuSiteWrap::~CMenuSiteWrap()
+{
+    WrapLogClose();
+}
+
+// IBandSite
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::AddBand(IUnknown * punk)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::AddBand(IUnknown * punk=%p)\n", this, punk);
+    HRESULT hr = m_IBandSite->AddBand(punk);
+    WrapLogExit("CMenuSiteWrap::AddBand()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::EnumBands(UINT uBand, DWORD* pdwBandID)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::EnumBands(UINT uBand=%u, DWORD* pdwBandID=%p)\n", this, uBand, pdwBandID);
+    HRESULT hr = m_IBandSite->EnumBands(uBand, pdwBandID);
+    if (pdwBandID) WrapLogPost("*pdwBandID=%d\n", *pdwBandID);
+    WrapLogExit("CMenuSiteWrap::EnumBands()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::QueryBand(DWORD dwBandID=%d, IDeskBand **ppstb=%p, DWORD *pdwState=%p, LPWSTR pszName=%p, int cchName=%d)\n", this, dwBandID, ppstb, pdwState, pszName, cchName);
+    HRESULT hr = m_IBandSite->QueryBand(dwBandID, ppstb, pdwState, pszName, cchName);
+    if (ppstb) WrapLogPost("*ppstb=%p\n", *ppstb);
+    if (pdwState) WrapLogPost("*pdwState=%d\n", *pdwState);
+    WrapLogExit("CMenuSiteWrap::QueryBand()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::GetBandObject(DWORD dwBandID=%d, REFIID riid=%s, VOID **ppv=%p)\n", this, dwBandID, Wrap(riid), ppv);
+    HRESULT hr = m_IBandSite->GetBandObject(dwBandID, riid, ppv);
+    if (ppv) WrapLogPost("*ppv=%p\n", *ppv);
+    WrapLogExit("CMenuSiteWrap::GetBandObject()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::GetBandSiteInfo(BANDSITEINFO *pbsinfo)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::GetBandSiteInfo(BANDSITEINFO *pbsinfo=%p)\n", this, pbsinfo);
+    HRESULT hr = m_IBandSite->GetBandSiteInfo(pbsinfo);
+    if (pbsinfo) WrapLogPost("*pbsinfo=%s\n", Wrap(*pbsinfo));
+    WrapLogExit("CMenuSiteWrap::GetBandSiteInfo()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::RemoveBand(DWORD dwBandID)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::RemoveBand(DWORD dwBandID=%d)\n", this, dwBandID);
+    HRESULT hr = m_IBandSite->RemoveBand(dwBandID);
+    WrapLogExit("CMenuSiteWrap::RemoveBand()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::SetBandSiteInfo(const BANDSITEINFO *pbsinfo)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::SetBandSiteInfo(const BANDSITEINFO *pbsinfo=%p)\n", this, pbsinfo);
+    //if (phwnd) WrapLogPost("*pbsinfo=%s\n", Wrap(*pbsinfo));
+    HRESULT hr = m_IBandSite->SetBandSiteInfo(pbsinfo);
+    WrapLogExit("CMenuSiteWrap::SetBandSiteInfo()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::SetBandState(DWORD dwBandID=%d, DWORD dwMask=%08x, DWORD dwState=%d)\n", this, dwBandID, dwMask, dwState);
+    HRESULT hr = m_IBandSite->SetBandState(dwBandID, dwMask, dwState);
+    WrapLogExit("CMenuSiteWrap::SetBandState()", hr);
+    return hr;
+}
+
+// *** IDeskBarClient ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::SetDeskBarSite(IUnknown *punkSite)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::SetDeskBarSite(IUnknown *punkSite=%p)\n", this, punkSite);
+    HRESULT hr = m_IDeskBarClient->SetDeskBarSite(punkSite);
+    WrapLogExit("CMenuSiteWrap::SetDeskBarSite()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::SetModeDBC(DWORD dwMode)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::SetModeDBC(DWORD dwMode=%d)\n", this, dwMode);
+    HRESULT hr = m_IDeskBarClient->SetModeDBC(dwMode);
+    WrapLogExit("CMenuSiteWrap::SetModeDBC()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::GetSize(DWORD dwWhich, LPRECT prc)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::GetSize(DWORD dwWhich=%d, LPRECT prc=%p)\n", this, dwWhich, prc);
+    HRESULT hr = m_IDeskBarClient->GetSize(dwWhich, prc);
+    if (prc) WrapLogPost("*prc=%s\n", Wrap(*prc));
+    WrapLogExit("CMenuSiteWrap::GetSize()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::UIActivateDBC(DWORD dwState)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::UIActivateDBC(DWORD dwState=%d)\n", this, dwState);
+    HRESULT hr = m_IDeskBarClient->UIActivateDBC(dwState);
+    WrapLogExit("CMenuSiteWrap::UIActivateDBC()", hr);
+    return hr;
+}
+
+// *** IOleWindow methods ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::GetWindow(HWND *phwnd)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd);
+    HRESULT hr = m_IOleWindow->GetWindow(phwnd);
+    if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd);
+    WrapLogExit("CMenuSiteWrap::GetWindow()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode);
+    HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode);
+    WrapLogExit("CMenuSiteWrap::ContextSensitiveHelp()", hr);
+    return hr;
+}
+
+// *** IOleCommandTarget methods ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    WrapLogExit("CMenuSiteWrap::QueryStatus()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    if (pguidCmdGroup) WrapLogPre("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    WrapLogExit("CMenuSiteWrap::Exec()", hr);
+    return hr;
+}
+
+// *** IInputObject methods ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::UIActivateIO(BOOL fActivate=%d, LPMSG lpMsg=%p)\n", this, fActivate, lpMsg);
+    HRESULT hr = m_IInputObject->UIActivateIO(fActivate, lpMsg);
+    WrapLogExit("CMenuSiteWrap::UIActivateIO()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::HasFocusIO()
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::HasFocusIO()\n", this);
+    HRESULT hr = m_IInputObject->HasFocusIO();
+    WrapLogExit("CMenuSiteWrap::HasFocusIO()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::TranslateAcceleratorIO(LPMSG lpMsg)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg);
+    if (lpMsg) WrapLogPre("*lpMsg=%s\n", Wrap(*lpMsg));
+    HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg);
+    WrapLogExit("CMenuSiteWrap::TranslateAcceleratorIO()", hr);
+    return hr;
+}
+
+// *** IInputObjectSite methods ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::OnFocusChangeIS(LPUNKNOWN lpUnknown=%p, BOOL bFocus=%d)\n", this, lpUnknown, bFocus);
+    HRESULT hr = m_IInputObjectSite->OnFocusChangeIS(lpUnknown, bFocus);
+    WrapLogExit("CMenuSiteWrap::OnFocusChangeIS()", hr);
+    return hr;
+}
+
+// *** IWinEventHandler methods ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
+{
+    //WrapLogEnter("CMenuSiteWrap<%p>::OnWinEvent(HWND hWnd=%p, UINT uMsg=%u, WPARAM wParam=%08x, LPARAM lParam=%08x, LRESULT *theResult=%p)\n", this, hWnd, uMsg, wParam, lParam, theResult);
+    HRESULT hr = m_IWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+    //WrapLogExit("CMenuSiteWrap::OnWinEvent()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::IsWindowOwner(HWND hWnd)
+{
+    //WrapLogEnter("CMenuSiteWrap<%p>::IsWindowOwner(HWND hWnd=%08x)\n", this, hWnd);
+    HRESULT hr = m_IWinEventHandler->IsWindowOwner(hWnd);
+    //WrapLogExit("CMenuSiteWrap::IsWindowOwner()", hr);
+    return hr;
+}
+
+// *** IServiceProvider methods ***
+HRESULT STDMETHODCALLTYPE CMenuSiteWrap::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    WrapLogEnter("CMenuSiteWrap<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject);
+    HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject);
+    if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+    WrapLogExit("CMenuSiteWrap::QueryService()", hr);
+    return hr;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/logging/CMenuSiteWrap.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/logging/CStartMenuSiteWrap.cpp
===================================================================
--- base/shell/rshell/logging/CStartMenuSiteWrap.cpp	(rÃ©vision 0)
+++ base/shell/rshell/logging/CStartMenuSiteWrap.cpp	(rÃ©vision 62573)
@@ -0,0 +1,190 @@
+/*
+ * Shell Menu Site
+ *
+ * Copyright 2014 David Quintana
+ *
+ * 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
+ */
+
+#include "precomp.h"
+#include "wraplog.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(menusite);
+
+class CStartMenuSiteWrap :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IServiceProvider,
+    public ITrayPriv,
+    public IOleWindow,
+    public IOleCommandTarget
+{
+public:
+    CStartMenuSiteWrap() {}
+    ~CStartMenuSiteWrap();
+
+    HRESULT InitWrap(ITrayPriv * bandSite);
+
+private:
+    CComPtr<IServiceProvider > m_IServiceProvider;
+    CComPtr<ITrayPriv        > m_ITrayPriv;
+    CComPtr<IOleWindow       > m_IOleWindow;
+    CComPtr<IOleCommandTarget> m_IOleCommandTarget;
+
+public:
+    // IServiceProvider
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
+
+    // ITrayPriv
+    virtual HRESULT STDMETHODCALLTYPE Execute(THIS_ IShellFolder*, LPCITEMIDLIST);
+    virtual HRESULT STDMETHODCALLTYPE Unknown(THIS_ PVOID, PVOID, PVOID, PVOID);
+    virtual HRESULT STDMETHODCALLTYPE AppendMenu(THIS_ HMENU*);
+
+    // IOleWindow
+    virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+    // IOleCommandTarget
+    virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
+    virtual HRESULT STDMETHODCALLTYPE Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+    DECLARE_NOT_AGGREGATABLE(CStartMenuSiteWrap)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+    BEGIN_COM_MAP(CStartMenuSiteWrap)
+        COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+        COM_INTERFACE_ENTRY_IID(IID_ITrayPriv, ITrayPriv)
+        COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
+        COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+    END_COM_MAP()
+};
+
+extern "C"
+HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv)
+{
+    HRESULT hr;
+
+    *ppv = NULL;
+
+    CStartMenuSiteWrap * site = new CComObject<CStartMenuSiteWrap>();
+
+    if (!site)
+        return E_OUTOFMEMORY;
+
+    hr = site->InitWrap(trayPriv);
+    if (FAILED_UNEXPECTEDLY(hr))
+    {
+        site->Release();
+        return hr;
+    }
+
+    hr = site->QueryInterface(riid, ppv);
+
+    if (FAILED_UNEXPECTEDLY(hr))
+        site->Release();
+
+    return hr;
+}
+
+HRESULT CStartMenuSiteWrap::InitWrap(ITrayPriv * bandSite)
+{
+    HRESULT hr;
+
+    WrapLogOpen();
+
+    m_ITrayPriv = bandSite;
+
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
+    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+    hr = bandSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
+    return hr;
+}
+
+CStartMenuSiteWrap::~CStartMenuSiteWrap()
+{
+    WrapLogClose();
+}
+
+// *** IServiceProvider methods ***
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject);
+    HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject);
+    if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject);
+    WrapLogExit("CStartMenuSiteWrap::QueryService()", hr);
+    return hr;
+}
+
+// *** ITrayPriv methods ***
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::Execute(IShellFolder* psf, LPCITEMIDLIST pidl)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::Execute(IShellFolder* psf=%p, LPCITEMIDLIST pidl=%p)\n", this, psf, pidl);
+    HRESULT hr = m_ITrayPriv->Execute(psf, pidl);
+    WrapLogExit("CStartMenuSiteWrap::Execute()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::Unknown(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::Unknown(PVOID unk1=%p, PVOID unk2=%p, PVOID unk3=%p, PVOID unk4=%p)\n", this, unk1, unk2, unk3, unk4);
+    HRESULT hr = m_ITrayPriv->Unknown(unk1, unk2, unk3, unk4);
+    WrapLogExit("CStartMenuSiteWrap::Unknown()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::AppendMenu(HMENU * phmenu)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::AppendMenu(HMENU * phmenu=%p)\n", this, phmenu);
+    HRESULT hr = m_ITrayPriv->AppendMenu(phmenu);
+    WrapLogExit("CStartMenuSiteWrap::AppendMenu()", hr);
+    return hr;
+}
+
+// *** IOleWindow methods ***
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::GetWindow(HWND *phwnd)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd);
+    HRESULT hr = m_IOleWindow->GetWindow(phwnd);
+    if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd);
+    WrapLogExit("CStartMenuSiteWrap::GetWindow()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::ContextSensitiveHelp(BOOL fEnterMode)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode);
+    HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode);
+    WrapLogExit("CStartMenuSiteWrap::ContextSensitiveHelp()", hr);
+    return hr;
+}
+
+// *** IOleCommandTarget methods ***
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
+    if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    WrapLogExit("CStartMenuSiteWrap::QueryStatus()", hr);
+    return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CStartMenuSiteWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+{
+    WrapLogEnter("CStartMenuSiteWrap<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    if (pguidCmdGroup) WrapLogPre("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
+    HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
+    WrapLogExit("CStartMenuSiteWrap::Exec()", hr);
+    return hr;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/logging/CStartMenuSiteWrap.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/logging
===================================================================
--- base/shell/rshell/logging	(rÃ©vision 0)
+++ base/shell/rshell/logging	(copie de travail)

Modification de propriÃ©tÃ©s sur base/shell/rshell/logging
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: base/shell/rshell/misc.cpp
===================================================================
--- base/shell/rshell/misc.cpp	(rÃ©vision 0)
+++ base/shell/rshell/misc.cpp	(rÃ©vision 62573)
@@ -0,0 +1,60 @@
+/*
+ * ReactOS Explorer
+ *
+ * Copyright 2014 Giannis Adamopoulos
+ *
+ * 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "precomp.h"
+
+DWORD WINAPI WinList_Init(void)
+{
+    /* do something here (perhaps we may want to add our own implementation fo win8) */
+    return 0;
+}
+
+void *operator new (size_t, void *buf)
+{
+    return buf;
+}
+
+class CRShellModule : public CComModule
+{
+public:
+};
+
+CRShellModule                               gModule;
+CAtlWinModule                               gWinModule;
+
+STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad)
+{
+    if (dwReason == DLL_PROCESS_ATTACH)
+    {
+        /* HACK - the global constructors don't run, so I placement new them here */
+        new (&gModule) CRShellModule;
+        new (&gWinModule) CAtlWinModule;
+        new (&_AtlBaseModule) CAtlBaseModule;
+        new (&_AtlComModule) CAtlComModule;
+
+        gModule.Init(NULL, hInstance, NULL);
+        DisableThreadLibraryCalls(hInstance);
+    }
+    else if (dwReason == DLL_PROCESS_DETACH)
+    {
+        gModule.Term();
+    }
+    return TRUE;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/misc.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/precomp.h
===================================================================
--- base/shell/rshell/precomp.h	(rÃ©vision 0)
+++ base/shell/rshell/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,93 @@
+
+#define USE_SYSTEM_MENUDESKBAR 0
+#define USE_SYSTEM_MENUSITE 0
+#define USE_SYSTEM_MENUBAND 0
+
+#define WRAP_MENUDESKBAR 0
+#define WRAP_MENUSITE 0
+#define WRAP_MENUBAND 0
+#define WRAP_TRAYPRIV 0
+
+#define MERGE_FOLDERS 0
+
+#include <stdio.h>
+#include <tchar.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <wincon.h>
+#include <shellapi.h>
+#include <shlobj.h>
+#include <shlobj_undoc.h>
+#include <shlwapi.h>
+#include <shlguid_undoc.h>
+#include <uxtheme.h>
+#include <strsafe.h>
+
+#include <atlbase.h>
+#include <atlcom.h>
+#include <wine/debug.h>
+
+#define shell32_hInstance 0
+#define SMC_EXEC 4
+extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc);
+
+
+extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv);
+extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv);
+extern "C" HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv);
+
+static __inline ULONG
+Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
+{
+    char szMsg[512];
+    char *szMsgStart;
+    const char *fname;
+    va_list vl;
+    ULONG uRet;
+
+    fname = strrchr(filename, '\\');
+    if (fname == NULL)
+    {
+        fname = strrchr(filename, '/');
+    }
+
+    if (fname == NULL)
+        fname = filename;
+    else
+        fname++;
+
+    szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line);
+
+    va_start(vl, lpFormat);
+    uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl);
+    va_end(vl);
+
+    OutputDebugStringA(szMsg);
+
+    return uRet;
+}
+
+#define DbgPrint(fmt, ...) \
+    Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
+
+#if 1
+#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (DbgPrint("Unexpected failure %08x.\n", hr), TRUE))
+#else
+#define FAILED_UNEXPECTEDLY(hr) FAILED(hr)
+#endif

Modification de propriÃ©tÃ©s sur base/shell/rshell/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/rshell.spec
===================================================================
--- base/shell/rshell/rshell.spec	(rÃ©vision 0)
+++ base/shell/rshell/rshell.spec	(rÃ©vision 62573)
@@ -0,0 +1,7 @@
+@   stdcall CStartMenu_Constructor(ptr ptr)
+@   stdcall CMenuDeskBar_Constructor(ptr ptr);
+@   stdcall CMenuSite_Constructor(ptr ptr);
+@   stdcall CMenuBand_Constructor(ptr ptr);
+@   stdcall SHDesktopMessageLoop(ptr)
+@   stdcall SHCreateDesktop(ptr)
+@   stdcall WinList_Init()
\ No newline at end of file

Modification de propriÃ©tÃ©s sur base/shell/rshell/rshell.spec
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/wraplog.cpp
===================================================================
--- base/shell/rshell/wraplog.cpp	(rÃ©vision 0)
+++ base/shell/rshell/wraplog.cpp	(rÃ©vision 62573)
@@ -0,0 +1,159 @@
+#include "precomp.h"
+#include "wraplog.h"
+#include <stdio.h>
+
+static INT openCount = 0;
+static INT callLevel;
+static FILE*log;
+
+static INT nTemps;
+static CHAR strTemp[10][256];
+
+void WrapLogOpen()
+{
+    if (openCount == 0)
+    {
+        log = fopen("C:\\RShellWrap.log", "w");
+        nTemps = 0;
+        callLevel = 0;
+    }
+    openCount++;
+}
+
+void WrapLogClose()
+{
+    openCount--;
+    if (openCount == 0)
+    {
+        fclose(log);
+        log = NULL;
+    }
+}
+
+void __cdecl WrapLogPrint(_Printf_format_string_ const char* msg, ...)
+{
+    va_list args;
+    for (int i = 0; i < callLevel; i++)
+        fputs("  ", log);
+    va_start(args, msg);
+    vfprintf(log, msg, args);
+    va_end(args);
+    fflush(log);
+    nTemps = 0;
+}
+
+void __cdecl WrapLogPre(_Printf_format_string_ const char* msg, ...)
+{
+    va_list args;
+    for (int i = 0; i < callLevel; i++)
+        fputs("  ", log);
+    fputs("pre: ", log);
+    va_start(args, msg);
+    vfprintf(log, msg, args);
+    va_end(args);
+    fflush(log);
+    nTemps = 0;
+}
+
+void __cdecl WrapLogPost(_Printf_format_string_ const char* msg, ...)
+{
+    va_list args;
+    for (int i = 0; i < callLevel; i++)
+        fputs("  ", log);
+    fputs("post: ", log);
+    va_start(args, msg);
+    vfprintf(log, msg, args);
+    va_end(args);
+    fflush(log);
+    nTemps = 0;
+}
+
+void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...)
+{
+    va_list args;
+    for (int i = 0; i < callLevel; i++)
+        fputs("  ", log);
+    fputs("CALL ", log);
+    va_start(args, msg);
+    vfprintf(log, msg, args);
+    va_end(args);
+    fflush(log);
+    callLevel++;
+    nTemps = 0;
+}
+
+void __cdecl WrapLogExit(const char* msg, HRESULT code)
+{
+    //if (FAILED(code))
+    //    WrapLogPrint("RETURN %s = %08x\n", msg, code);
+    //else if (code == S_OK)
+    //    WrapLogPrint("RETURN %s = S_OK\n", msg);
+    //else if (code == S_FALSE)
+    //    WrapLogPrint("RETURN %s = S_FALSE\n", msg);
+    //else
+    //    WrapLogPrint("RETURN %s = %d\n", msg, code);
+    if (FAILED(code))
+        WrapLogPrint("RETURN %08x\n", code);
+    else if (code == S_OK)
+        WrapLogPrint("RETURN S_OK\n");
+    else if (code == S_FALSE)
+        WrapLogPrint("RETURN S_FALSE\n");
+    else
+        WrapLogPrint("RETURN %d\n", code);
+    callLevel--;
+}
+
+template <class T>
+LPSTR Wrap(const T& value);
+
+template <>
+LPSTR Wrap<GUID>(REFGUID guid)
+{
+    LPSTR cStr = strTemp[nTemps++];
+    StringCchPrintfA(cStr, _countof(strTemp[0]),
+        "{%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}",
+        guid.Data1, guid.Data2, guid.Data3,
+        guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
+        guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
+    return cStr;
+}
+
+template <>
+LPSTR Wrap<RECT>(const RECT& rect)
+{
+    LPSTR cStr = strTemp[nTemps++];
+    StringCchPrintfA(cStr, _countof(strTemp[0]),
+        "{L: %d, T: %d, R: %d, B: %d}",
+        rect.left, rect.top, rect.right, rect.bottom);
+    return cStr;
+}
+
+template <>
+LPSTR Wrap<OLECMD>(const OLECMD& cmd)
+{
+    LPSTR cStr = strTemp[nTemps++];
+    StringCchPrintfA(cStr, _countof(strTemp[0]),
+        "{ID: %d, F: %d}",
+        cmd.cmdID, cmd.cmdf);
+    return cStr;
+}
+
+template <>
+LPSTR Wrap<MSG>(const MSG& msg)
+{
+    LPSTR cStr = strTemp[nTemps++];
+    StringCchPrintfA(cStr, _countof(strTemp[0]),
+        "{HWND: %d, Code: %d, W: %p, L: %p, T: %d, P.X: %d, P.Y: %d}",
+        msg.hwnd, msg.message, msg.wParam, msg.lParam, msg.time, msg.pt.x, msg.pt.y);
+    return cStr;
+}
+
+template <>
+LPSTR Wrap<BANDSITEINFO>(const BANDSITEINFO& bsi)
+{
+    LPSTR cStr = strTemp[nTemps++];
+    StringCchPrintfA(cStr, _countof(strTemp[0]),
+        "{dwMask: %08x, dwState: %08x, dwStyle: %08x}",
+        bsi.dwMask, bsi.dwState, bsi.dwStyle);
+    return cStr;
+}

Modification de propriÃ©tÃ©s sur base/shell/rshell/wraplog.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell/wraplog.h
===================================================================
--- base/shell/rshell/wraplog.h	(rÃ©vision 0)
+++ base/shell/rshell/wraplog.h	(rÃ©vision 62573)
@@ -0,0 +1,11 @@
+#pragma once
+
+void WrapLogOpen();
+void WrapLogClose();
+void __cdecl WrapLogPre(_Printf_format_string_ const char* msg, ...);
+void __cdecl WrapLogPost(_Printf_format_string_ const char* msg, ...);
+void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...);
+void __cdecl WrapLogExit(const char* msg, HRESULT code);
+
+template <class T>
+LPSTR Wrap(const T& value);

Modification de propriÃ©tÃ©s sur base/shell/rshell/wraplog.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: base/shell/rshell
===================================================================
--- base/shell/rshell	(rÃ©vision 0)
+++ base/shell/rshell	(copie de travail)

Modification de propriÃ©tÃ©s sur base/shell/rshell
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: dll/CMakeLists.txt
===================================================================
--- dll/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/CMakeLists.txt	(copie de travail)
@@ -3,7 +3,7 @@
 add_subdirectory(cpl)
 add_subdirectory(directx)
 add_subdirectory(keyboard)
+add_subdirectory(ntdll)
 add_subdirectory(opengl)
-add_subdirectory(ntdll)
 add_subdirectory(shellext)
 add_subdirectory(win32)
Index: dll/ntdll/ldr/ldrapi.c
===================================================================
--- dll/ntdll/ldr/ldrapi.c	(rÃ©vision 61927)
+++ dll/ntdll/ldr/ldrapi.c	(copie de travail)
@@ -307,6 +307,7 @@
  */
 NTSTATUS
 NTAPI
+DECLSPEC_HOTPATCH
 LdrLoadDll(IN PWSTR SearchPath OPTIONAL,
            IN PULONG DllCharacteristics OPTIONAL,
            IN PUNICODE_STRING DllName,
Index: dll/ntdll/ldr/ldrutils.c
===================================================================
--- dll/ntdll/ldr/ldrutils.c	(rÃ©vision 61927)
+++ dll/ntdll/ldr/ldrutils.c	(copie de travail)
@@ -1320,7 +1320,7 @@
         ImageBase = (ULONG_PTR)NtHeaders->OptionalHeader.ImageBase;
         ImageEnd = ImageBase + ViewSize;
 
-        DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%lu -> %p)\n", DllName, ImageBase, ViewBase);
+        DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%p -> %p)\n", DllName, (PVOID)ImageBase, ViewBase);
 
         /* Scan all the modules */
         ListHead = &Peb->Ldr->InLoadOrderModuleList;
Index: dll/ntdll/include/ntdll.h
===================================================================
--- dll/ntdll/include/ntdll.h	(rÃ©vision 61927)
+++ dll/ntdll/include/ntdll.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _NTDLL_H
+#define _NTDLL_H
+
 /* INCLUDES ******************************************************************/
 
 /* We're a core NT DLL, we don't import syscalls */
@@ -46,4 +49,4 @@
 /* PSEH */
 #include <pseh/pseh2.h>
 
-/* EOF */
+#endif /* _NTDLL_H */
Index: dll/ntdll/CMakeLists.txt
===================================================================
--- dll/ntdll/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/ntdll/CMakeLists.txt	(copie de travail)
@@ -22,8 +22,7 @@
     ldr/ldrutils.c
     rtl/libsupp.c
     rtl/version.c
-    def/ntdll.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
+    include/ntdll.h)
 
 if(ARCH STREQUAL "i386")
     list(APPEND ASM_SOURCE dispatch/i386/dispatch.S)
@@ -36,9 +35,14 @@
 endif()
 
 add_asm_files(ntdll_asm ${ASM_SOURCE})
-add_library(ntdll SHARED ${SOURCE} ${ntdll_asm})
 
-set_module_type(ntdll win32dll ENTRYPOINT 0)
+add_library(ntdll SHARED
+    ${SOURCE}
+    ${ntdll_asm}
+    def/ntdll.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
+
+set_module_type(ntdll win32dll HOTPATCHABLE ENTRYPOINT 0)
 #############################################
 ## HACK FOR MSVC COMPILATION WITH win32dll ##
 set_subsystem(ntdll console)
@@ -55,7 +59,7 @@
                       uuid
                       ${PSEH_LIB})
 
-add_pch(ntdll include/ntdll.h)
+add_pch(ntdll include/ntdll.h SOURCE)
 add_dependencies(ntdll ntstatus asm)
 
 add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all)
Index: dll/cpl/timedate/CMakeLists.txt
===================================================================
--- dll/cpl/timedate/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/timedate/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 spec2def(timedate.cpl timedate.spec)
 
-add_library(timedate SHARED
+list(APPEND SOURCE
     clock.c
     dateandtime.c
     internettime.c
@@ -9,6 +9,10 @@
     ntpclient.c
     timedate.c
     timezone.c
+    timedate.h)
+
+add_library(timedate SHARED
+    ${SOURCE}
     timedate.rc
     ${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
 
@@ -24,5 +28,5 @@
     msvcrt
     kernel32)
 
-add_pch(timedate timedate.h)
+add_pch(timedate timedate.h SOURCE)
 add_cd_file(TARGET timedate DESTINATION reactos/system32 FOR all)
Index: dll/cpl/timedate/timedate.rc
===================================================================
--- dll/cpl/timedate/timedate.rc	(rÃ©vision 61927)
+++ dll/cpl/timedate/timedate.rc	(copie de travail)
@@ -62,6 +62,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/cpl/timedate/lang/tr-TR.rc
===================================================================
--- dll/cpl/timedate/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/timedate/lang/tr-TR.rc	(copie de travail)
@@ -54,6 +54,6 @@
     IDS_TIMEZONEUNKNOWN "Bilinmeyen"
     IDS_INETTIMESUCSYNC "Zaman, %s.%s:%s ile baÅŸarÄ±yla eÅŸlendi."
     IDS_INETTIMENEXTSYNC "Bir Dahaki EÅŸleme: %s.%s"
-    IDS_INETTIMESYNCING "ReactOS, zamÃ¢nÄ± %s ile eÅŸlerken lÃ¼tfen bekleyiniz."
+    IDS_INETTIMESYNCING "ReactOS, zamÃ¢nÄ± %s ile eÅŸlerken bekleyiniz."
     IDS_INETTIMEERROR "ReactOS, zamÃ¢nÄ± %s ile eÅŸlerken bir yanlÄ±ÅŸlÄ±k oldu."
 END
Index: dll/cpl/timedate/lang/sq-AL.rc
===================================================================
--- dll/cpl/timedate/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/timedate/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,61 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Data && Ora"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "&Data", -1, 4, 2, 122, 125
+    COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT IDC_YEARTEXT, 65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
+            UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12
+    CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 11, 37, 108, 80, WS_EX_CLIENTEDGE
+    GROUPBOX "&Ora", -1, 132, 2, 113, 125
+    CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12
+    LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11
+    CONTROL "", IDC_CLOCKWND, "ClockWndClass", WS_CHILD | WS_VISIBLE, 138, 12, 102, 89
+END
+
+IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ora me ZonÃ«"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE
+    AUTOCHECKBOX "Adapto automatikisht orÃ«n pÃ«r ndryshimet Ditore",
+                 IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP
+END
+
+IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ora Internetit"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    AUTOCHECKBOX "Automatikisht sinkronizohu me njÃ« server kohÃ«n e Internetit",
+                 IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    LTEXT "Server:", IDC_SERVERTEXT, 34, 22, 28, 13
+    PUSHBUTTON "Azhorno tani", IDC_UPDATEBUTTON, 187, 22, 49, 14
+    LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23
+    LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12
+    LTEXT "Sinkronizimi mund tÃ« ndodhÃ« vetÃ«m kur kompjuteri juaj Ã«shtÃ« i lidhur nÃ« internet.", -1, 12, 114, 225, 25
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Data/Ora"
+    IDS_CPLDESCRIPTION "Ndryshon datÃ«n, orÃ«n dhe orÃ«n e informacionit sÃ« zonÃ«s."
+    IDS_TIMEZONETEXT "Ora zonÃ«s aktuale: %s"
+    IDS_TIMEZONEINVALID "Invalide"
+    IDS_TIMEZONEUNKNOWN "i'panjohur"
+    IDS_INETTIMESUCSYNC "Ora Ã«shtÃ« e sinkronizuar me sukses me %s nÃ« %s nÃ« %s"
+    IDS_INETTIMENEXTSYNC "Sinkronizimi tjetÃ«r: %s nÃ« %s"
+    IDS_INETTIMESYNCING "Ju lutem prisni ndÃ«rkohÃ« qÃ« ReactOS sinkronizon orÃ«n me %s"
+    IDS_INETTIMEERROR "NjÃ« gabim ndodhi gjatÃ« sinkronizimit tÃ« ReactOS me %s"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/timedate/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/timedate/timedate.h
===================================================================
--- dll/cpl/timedate/timedate.h	(rÃ©vision 61927)
+++ dll/cpl/timedate/timedate.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _TIMEDATE_H
+#define _TIMEDATE_H
+
 #include <stdarg.h>
 
 #define _INC_WINDOWS
@@ -118,4 +121,4 @@
 BOOL RegisterMonthCalControl(IN HINSTANCE hInstance);
 VOID UnregisterMonthCalControl(IN HINSTANCE hInstance);
 
-/* EOF */
+#endif /* _TIMEDATE_H */
Index: dll/cpl/inetcpl/inetcpl.rc
===================================================================
--- dll/cpl/inetcpl/inetcpl.rc	(rÃ©vision 61927)
+++ dll/cpl/inetcpl/inetcpl.rc	(copie de travail)
@@ -66,6 +66,9 @@
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SR_SP
     #include "lang/Sr.rc"
 #endif
Index: dll/cpl/inetcpl/lang/ru-RU.rc
===================================================================
--- dll/cpl/inetcpl/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/inetcpl/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * Russian resources for the Internet control panel applet
  *
  * Copyright 2011 Alexander Lakhin
@@ -104,13 +104,13 @@
 
 STRINGTABLE
 BEGIN
-    IDS_CPL_NAME        "Internet Settings"
-    IDS_CPL_INFO        "Configure Wine Internet Browser and related settings"
-    IDS_SEC_SETTINGS    "Security settings for zone: "
-    IDS_SEC_LEVEL0      "Custom"
-    IDS_SEC_LEVEL1      "Very Low"
-    IDS_SEC_LEVEL2      "Low"
-    IDS_SEC_LEVEL3      "Medium"
-    IDS_SEC_LEVEL4      "Increased"
-    IDS_SEC_LEVEL5      "High"
+    IDS_CPL_NAME        "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð�Ð°Ñ�Ñ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+    IDS_CPL_INFO        "Ð�Ð°Ñ�Ñ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Wine Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð‘Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð¸ Ð½Ð°Ñ�Ñ‚Ñ€Ð¾Ð¹ÐºÐ¸, Ñ�Ð²Ñ�Ð·Ð°Ð½Ð½Ñ‹Ðµ Ñ�"
+    IDS_SEC_SETTINGS    "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ�Ð½Ð¾Ñ�Ñ‚Ð¸ Ñ�Ñ‚Ð¾Ð¹ Ð·Ð¾Ð½Ñ‹: "
+    IDS_SEC_LEVEL0      "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑ�ÐºÐ¸Ðµ"
+    IDS_SEC_LEVEL1      "ÐžÑ‡ÐµÐ½ÑŒ Ð�Ð¸Ð·ÐºÐ°Ñ�"
+    IDS_SEC_LEVEL2      "Ð�Ð¸Ð·ÐºÐ°Ñ�"
+    IDS_SEC_LEVEL3      "Ð¡Ñ€ÐµÐ´Ð½Ñ�Ñ�"
+    IDS_SEC_LEVEL4      "Ð£Ð²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð½Ð°Ñ�"
+    IDS_SEC_LEVEL5      "Ð’Ñ‹Ñ�Ð¾ÐºÐ°Ñ�"
 END
Index: dll/cpl/inetcpl/lang/sq-AL.rc
===================================================================
--- dll/cpl/inetcpl/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/inetcpl/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,116 @@
+/*
+ * English resources for the Internet control panel applet
+ *
+ * Copyright 2010 Detlef Riekenberg
+ *
+ * Translation: Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ *
+ * 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
+ *
+ */
+
+#include "inetcpl.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+/* "General" propsheet */
+IDD_GENERAL DIALOG  0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "General"
+BEGIN
+
+    GROUPBOX    " Faqja ShtÃ«pi ", IDC_STATIC, 4, 4, 312, 52
+    LTEXT       "Ju mund tÃ« zgjidhni adresÃ«n qÃ« do tÃ« pÃ«rdoret si faqja juaj shtÃ«pi.",
+                IDC_STATIC, 58, 10, 252, 10
+    EDITTEXT    IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    PUSHBUTTON  "&Faqja e tanishme", IDC_HOME_CURRENT, 58, 36, 80, 14
+    PUSHBUTTON  "&Faqja e parazgjedhur", IDC_HOME_DEFAULT, 144, 36, 80, 14
+    PUSHBUTTON  "&Faqja bosh", IDC_HOME_BLANK, 230, 36, 80, 14
+    GROUPBOX    " Historia Shfletimit ", IDC_STATIC, 4, 60, 312, 46
+    LTEXT       "You can delete cached pages, cookies and other data.",
+                IDC_STATIC, 58, 72, 252, 10
+    PUSHBUTTON  "Fshi &dokumentat...", IDC_HISTORY_DELETE, 144, 86, 80, 14
+    PUSHBUTTON  "&Konfigurime...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14
+
+END
+
+/* "Delete browsing history" dialog */
+IDD_DELETE_HISTORY DIALOG  0, 0, 250, 250
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Fshi historine e Shfletimit"
+BEGIN
+
+    AUTOCHECKBOX   "Dokumentat tÃ« pÃ«rkohshÃ«m tÃ« internetit\nKopje Kafazit te faqeveweb, imazhe dhe certifikata.",
+                    IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX   "Rekorded\nDokumentat e ruajtur nÃ« kompjuterin tuaj nga faqet e internetit, e cila ruan gjÃ«ra si parapÃ«lqimet e pÃ«rdoruesit dhe informacionet e identifikimit.",
+                    IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX   "Historia\nLista e faqet e internetit qÃ« keni pÃ«rdorur.",
+                    IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX   "Nga infot\nPÃ«rdoruesit dhe informacione tÃ« tjera qÃ« kanÃ« hyrÃ« nÃ« forma.",
+                    IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX   "FjalÃ«kalime\nFjalÃ«kalime tÃ« ruajtura qÃ« kanÃ« hyrÃ« nÃ« forma.",
+                    IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE
+    DEFPUSHBUTTON  "Anulo", IDCANCEL, 185, 230, 60, 15, WS_GROUP
+    PUSHBUTTON     "Fshi", IDOK, 120, 230, 60, 15, WS_GROUP
+
+END
+
+/* "Security" propsheet */
+IDD_SECURITY DIALOG  0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Siguria"
+BEGIN
+
+    CONTROL     "Listview", IDC_SEC_LISTVIEW, "SysListView32",
+                LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL,
+                4, 4, 312, 58
+    LTEXT       "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20
+    GROUPBOX    "", IDC_SEC_GROUP, 4, 88, 312, 126
+    CONTROL     "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32",
+                TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100
+    LTEXT       "", IDC_SEC_LEVEL, 48, 102, 180, 12
+    LTEXT       "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80
+END
+
+/* "Content" propsheet */
+IDD_CONTENT DIALOG  0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "PÃ«rmbajtje"
+BEGIN
+
+    GROUPBOX    " Certifikata ", IDC_STATIC, 4, 4, 312, 50
+    LTEXT       "Certifikatat janÃ« pÃ«rdorur pÃ«r identifikimin tuaj personale dhe pÃ«r tÃ« identifikuar autoritetet certifikuese dhe botuesit.",
+                IDC_STATIC, 58, 14, 252, 18
+    PUSHBUTTON  "Certifikata...", IDC_CERT, 146, 34, 80, 14
+    PUSHBUTTON	"Botuesit...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
+
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPL_NAME        "Konfigurimet Internet"
+    IDS_CPL_INFO        "Konfiguro Wine Internet Browser dhe konfigurimet e pÃ«rbashkta"
+    IDS_SEC_SETTINGS    "Konfigurimi sigurise pÃ«r zona: "
+    IDS_SEC_LEVEL0      "Me'porosi"
+    IDS_SEC_LEVEL1      "ShumÃ« PoshtÃ«"
+    IDS_SEC_LEVEL2      "PoshtÃ«"
+    IDS_SEC_LEVEL3      "MesatarÃ«"
+    IDS_SEC_LEVEL4      "Rritje"
+    IDS_SEC_LEVEL5      "Lart"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/inetcpl/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/inetcpl/CMakeLists.txt
===================================================================
--- dll/cpl/inetcpl/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/inetcpl/CMakeLists.txt	(copie de travail)
@@ -7,12 +7,17 @@
     content.c
     general.c
     security.c
+    inetcpl.h)
+
+add_library(inetcpl SHARED
+    ${SOURCE}
+    inetcpl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/inetcpl_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inetcpl.def)
 
-add_library(inetcpl SHARED ${SOURCE} inetcpl.rc)
 set_module_type(inetcpl cpl UNICODE)
 target_link_libraries(inetcpl wine)
 add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll)
 add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32)
+add_pch(inetcpl inetcpl.h SOURCE)
 add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all)
Index: dll/cpl/sysdm/CMakeLists.txt
===================================================================
--- dll/cpl/sysdm/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/sysdm/CMakeLists.txt	(copie de travail)
@@ -12,10 +12,13 @@
     sysdm.c
     userprofile.c
     virtmem.c
+    precomp.h)
+
+add_library(sysdm SHARED
+    ${SOURCE}
     sysdm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
 
-add_library(sysdm SHARED ${SOURCE})
 set_module_type(sysdm cpl UNICODE)
 
 add_importlibs(sysdm
@@ -33,5 +36,5 @@
     kernel32
     ntdll)
 
-add_pch(sysdm precomp.h)
+add_pch(sysdm precomp.h SOURCE)
 add_cd_file(TARGET sysdm DESTINATION reactos/system32 FOR all)
Index: dll/cpl/sysdm/lang/bg-BG.rc
===================================================================
--- dll/cpl/sysdm/lang/bg-BG.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/bg-BG.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ� Ð·Ð° Ð²ÐµÑ€Ñ�Ð¸Ñ�Ñ‚Ð°", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Ð”Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð½Ðµ ÐºÐ°Ñ‚Ð¾ Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ°", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Ð”Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð½Ðµ ÐºÐ°Ñ‚Ð¾ Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ°", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "Ð ÐµÐ°ÐºÑ‚ÐžÐ¡ Ðµ Ñ�Ð³Ð»Ð¾Ð±ÐµÐ½ ÐºÐ°Ñ‚Ð¾ Ñ�ÑŠÑ€Ð²ÑŠÑ€Ð½Ð° Ð Ð£ Ð¸ Ñ�Ðµ Ð´Ð¾ÐºÐ»Ð°Ð´Ð²Ð° ÐºÐ°Ñ‚Ð¾ Ñ‚Ð°ÐºÐ°Ð²Ð°. ÐžÑ‚Ð¼ÐµÑ‚Ð½ÐµÑ‚Ðµ Ñ‚Ð¾Ð²Ð° Ð¿Ð¾Ð»Ðµ, Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ñ�Ð°Ð¼Ð¾ Ð·Ð° Ñ‚Ð¾Ð²Ð° Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "Ð”Ð¾Ð±Ñ€Ðµ", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/de-DE.rc
===================================================================
--- dll/cpl/sysdm/lang/de-DE.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/de-DE.rc	(copie de travail)
@@ -75,7 +75,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Versionsinfo", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Als Workstation identifizieren", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 110, 10
+    CONTROL "Als Workstation identifizieren", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS ist als Serversystem konzipiert worden und identifiziert sich auch als solches. Diese Einstellung Ã¤ndert das Verhalten fÃ¼r Anwendungen.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/zh-CN.rc
===================================================================
--- dll/cpl/sysdm/lang/zh-CN.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/zh-CN.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/cs-CZ.rc
===================================================================
--- dll/cpl/sysdm/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/cs-CZ.rc	(copie de travail)
@@ -71,7 +71,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Informace o verzi", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "HlÃ¡sit se jako pracovnÃ­ stanice", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "HlÃ¡sit se jako pracovnÃ­ stanice", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS je vytvoÅ™en jako serverovÃ½ OS a jako takovÃ½ se i hlÃ¡sÃ­. Po zaÅ¡krtnutÃ­ tohoto polÃ­Ä�ka se pro aplikace toto chovÃ¡nÃ­ zmÄ›nÃ­.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/da-DK.rc
===================================================================
--- dll/cpl/sysdm/lang/da-DK.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/da-DK.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/nl-NL.rc
===================================================================
--- dll/cpl/sysdm/lang/nl-NL.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/nl-NL.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/uk-UA.rc
===================================================================
--- dll/cpl/sysdm/lang/uk-UA.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/uk-UA.rc	(copie de travail)
@@ -74,7 +74,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ� Ð¿Ñ€Ð¾ Ð²ÐµÑ€Ñ�Ñ–ÑŽ", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "ÐŸÐ¾Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ñ�Ðº Ñ€Ð¾Ð±Ð¾Ñ‡Ñƒ Ñ�Ñ‚Ð°Ð½Ñ†Ñ–ÑŽ", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 118, 10
+    CONTROL "ÐŸÐ¾Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ñ�Ðº Ñ€Ð¾Ð±Ð¾Ñ‡Ñƒ Ñ�Ñ‚Ð°Ð½Ñ†Ñ–ÑŽ", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS Ð¿Ð¾Ð²ÑƒÐ´Ð¾Ð²Ð°Ð½Ð° Ñ�Ðº Ñ�ÐµÑ€Ð²ÐµÑ€Ð½Ð° ÐžÐ¡, Ñ– Ñ‚Ð°Ðº Ñ�Ð°Ð¼Ð¾ Ð¿Ñ€Ð¾ Ñ�ÐµÐ±Ðµ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»Ñ�Ñ”. ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¿Ñ€Ð°Ð¿Ð¾Ñ€ÐµÑ†ÑŒ, Ñ‰Ð¾Ð± Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ñ†Ðµ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ� Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/pl-PL.rc
===================================================================
--- dll/cpl/sysdm/lang/pl-PL.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/pl-PL.rc	(copie de travail)
@@ -75,7 +75,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Informowanie o wersji", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "ZgÅ‚aszaj jako stacjÄ™ roboczÄ…", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 110, 10
+    CONTROL "ZgÅ‚aszaj jako stacjÄ™ roboczÄ…", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS jest zbudowany w oparciu o wersjÄ™ serwerowÄ…. Zaznacz pole, aby ReactOS zgÅ‚aszaÅ‚ siÄ™ aplikacjom jako stacja robocza.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/no-NO.rc
===================================================================
--- dll/cpl/sysdm/lang/no-NO.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/no-NO.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/it-IT.rc
===================================================================
--- dll/cpl/sysdm/lang/it-IT.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/it-IT.rc	(copie de travail)
@@ -1,4 +1,4 @@
-ï»¿LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Informazioni sulla versione", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Notifica come Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Notifica come Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS Ã¨ compilato come server ed Ã¨ notificato come tale. Non per questa applicazione.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/id-ID.rc
===================================================================
--- dll/cpl/sysdm/lang/id-ID.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/id-ID.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/hu-HU.rc
===================================================================
--- dll/cpl/sysdm/lang/hu-HU.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/hu-HU.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/en-US.rc
===================================================================
--- dll/cpl/sysdm/lang/en-US.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/en-US.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/sk-SK.rc
===================================================================
--- dll/cpl/sysdm/lang/sk-SK.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/sk-SK.rc	(copie de travail)
@@ -74,7 +74,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/sv-SE.rc
===================================================================
--- dll/cpl/sysdm/lang/sv-SE.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/sv-SE.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/ro-RO.rc
===================================================================
--- dll/cpl/sysdm/lang/ro-RO.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/ro-RO.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "InformaÈ›ii versiune", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Solicit &autoraportarea sistemului ca staÈ›ie de lucru", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 170, 10
+    CONTROL "Solicit &autoraportarea sistemului ca staÈ›ie de lucru", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS este construit ca sistem server È™i se raporteazÄƒ ca atare. BifaÈ›i aceastÄƒ cÄƒsuÈ›Äƒ pentru a dedica sistemul exclusiv aplicaÈ›iilor.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "ÃŽ&nchide", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/he-IL.rc
===================================================================
--- dll/cpl/sysdm/lang/he-IL.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/he-IL.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "×ž×™×“×¢ ×’×¨×¡×”", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "×“×•×•×— ×›×ª×—× ×ª ×¢×‘×•×“×”", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "×“×•×•×— ×›×ª×—× ×ª ×¢×‘×•×“×”", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "×�×™×©×•×¨", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/ja-JP.rc
===================================================================
--- dll/cpl/sysdm/lang/ja-JP.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/ja-JP.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
     GROUPBOX "ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "ãƒ¯ãƒ¼ã‚¯ã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã�¨ã�—ã�¦ã�µã‚‹ã�¾ã�†", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "ãƒ¯ãƒ¼ã‚¯ã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã�¨ã�—ã�¦ã�µã‚‹ã�¾ã�†", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS ã�¯ã‚µãƒ¼ãƒ� OS ã�¨ã�—ã�¦ãƒ“ãƒ«ãƒ‰ã�•ã‚Œã�¦ã�„ã‚‹ã�Ÿã‚�ã€�ã‚µãƒ¼ãƒ�ã�¨ã�—ã�¦ã�µã‚‹ã�¾ã�„ã�¾ã�™ã€‚ã�“ã‚Œã‚’å¤‰æ›´ã�™ã‚‹ã�«ã�¯ã�“ã�®ãƒœãƒƒã‚¯ã‚¹ã�«ãƒ�ã‚§ãƒƒã‚¯ã�—ã�¦ã��ã� ã�•ã�„ã€‚ã�Ÿã� ã�—ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã�«å¯¾ã�—ã�¦ã�®ã�¿æœ‰åŠ¹ã�§ã�™ã€‚", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/el-GR.rc
===================================================================
--- dll/cpl/sysdm/lang/el-GR.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/el-GR.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/tr-TR.rc
===================================================================
--- dll/cpl/sysdm/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/tr-TR.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "SÃ¼rÃ¼m Bilgisi",IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Ä°ÅŸ Ä°stasyonu Olarak Bildir", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Ä°ÅŸ Ä°stasyonu Olarak Bildir", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS, sunucu iÅŸletim dizgesi olarak yapÄ±lmÄ±ÅŸtÄ±r ve Ã¶yle bildirilir. Bunu, bu kutucuÄŸu imleyerek yalnÄ±zca uygulamalar iÃ§in deÄŸiÅŸtirebilirsiniz.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "Tamam", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/ru-RU.rc
===================================================================
--- dll/cpl/sysdm/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -62,11 +62,11 @@
 
 IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "System Settings"
+CAPTION "Ð¡Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ‹Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
@@ -100,15 +100,15 @@
 
 IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Copy Profile"
+CAPTION "ÐšÐ¾Ð¿Ð¸Ñ� ÐŸÑ€Ð¾Ñ„Ð¸Ð»Ñ�"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "From:", IDC_STATIC, 5, 10, 20, 8
+    LTEXT "Ð¸Ð·:", IDC_STATIC, 5, 10, 20, 8
     LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10
-    LTEXT "To:", IDC_STATIC, 5, 30, 20, 8
+    LTEXT "Ð²:", IDC_STATIC, 5, 30, 20, 8
     EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12
-    DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14
+    DEFPUSHBUTTON "&ÐžÐš", IDOK, 199, 9, 50, 14
+    PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 199, 30, 50, 14
 END
 
 IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52
@@ -270,10 +270,10 @@
     IDS_USERPROFILE_TYPE "Ð¢Ð¸Ð¿"
     IDS_USERPROFILE_STATUS "Ð¡Ð¾Ñ�Ñ‚Ð¾Ñ�Ð½Ð¸Ðµ"
     IDS_USERPROFILE_MODIFIED "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½"
-    IDS_MESSAGEBOXTITLE "System control panel applet"
-    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
-    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
-    IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive."
-    IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive."
+    IDS_MESSAGEBOXTITLE "ÐŸÐ°Ð½ÐµÐ»ÑŒ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ� Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ‹"
+    IDS_WARNINITIALSIZE "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¸Ñ�Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ñ„Ð°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸."
+    IDS_WARNMAXIMUMSIZE "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ� Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð¼Ð°ÐºÑ�Ð¸Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸."
+    IDS_WARNINITIALRANGE "Ð�Ð°Ñ‡Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð½Ðµ Ð¼ÐµÐ½ÑŒÑˆÐµ, Ñ‡ÐµÐ¼ 2 ÐœÐ‘ Ð¸ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°Ñ‚ÑŒ Ñ�Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑ�Ñ‚Ð° Ð½Ð° Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¼ Ð´Ð¸Ñ�ÐºÐµ."
+    IDS_WARNMAXIMUMRANGE "ÐœÐ°ÐºÑ�Ð¸Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð½Ðµ Ð¼ÐµÐ½ÑŒÑˆÐµ, Ñ‡ÐµÐ¼ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°Ñ‚ÑŒ Ñ�Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑ�Ñ‚Ð° Ð½Ð° Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¼ Ð´Ð¸Ñ�ÐºÐµ."
     IDS_DEVS "\nÐšÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\n\nÐšÐ¾Ð¾Ñ€Ð´Ð¸Ð½Ð°Ñ‚Ð¾Ñ€ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð°\n\nÐ�Ð»ÐµÐºÑ�ÐµÐ¹ Ð‘Ñ€Ð°Ð³Ð¸Ð½\n\nÐšÐ¾Ð»Ð»ÐµÐºÑ‚Ð¸Ð² Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ¾Ð²\n\nÐ�Ð»ÐµÐºÑ�ÐµÐ¹ Ð‘Ñ€Ð°Ð³Ð¸Ð½\nÐ­Ð½Ð´Ñ€ÑŽ Ð“Ñ€Ð¸Ð½Ð²ÑƒÐ´\nÐ�Ð½Ð´Ñ€ÐµÐ¹ ÐšÐ¾Ñ€Ð¾Ñ‚Ð°ÐµÐ²\nÐ�Ñ€Ñ‚ Ð™ÐµÑ€ÐºÑ�\nÐšÑ€Ð¸Ñ�Ñ‚Ð¾Ñ„ Ñ„Ð¾Ð½ Ð’Ð¸Ñ‚Ñ‚Ð¸Ñ…\nÐšÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ”Ð°Ð½Ð¸Ñ�Ð»ÑŒ Ð Ð°Ð¹Ð¼ÐµÑ€\nÐ”Ð¼Ð¸Ñ‚Ñ€Ð¸Ð¹ Ð§Ð°Ð¿Ñ‹ÑˆÐµÐ²\nÐ­Ñ€Ð¸Ðº ÐšÐ¾Ð»ÑŒ\nÐ“ÐµÐ´ ÐœÑ‘Ñ€Ñ„Ð¸\nÐ“Ñ€ÐµÐ³Ð¾Ñ€ Ð‘Ñ€ÑŽÐ½Ð¼Ð°Ñ€\nÐ­Ñ€Ð²Ðµ ÐŸÐ¾Ñ�Ñ�Ð¸Ð½Ð¾\nÐ”Ð¶ÐµÐ¹Ð¼Ñ� Ð¢Ñ�Ð±Ð¾Ñ€\nÐ”Ð¶ÐµÑ„Ñ„Ñ€Ð¸ ÐœÐ¾Ñ€Ð»Ð°Ð½\nÐ™Ð¾Ñ…Ð°Ð½Ð½ÐµÑ� Ð�Ð½Ð´ÐµÑ€Ð²Ð°Ð»ÑŒÐ´\nKJK::Ð“Ð¸Ð¿ÐµÑ€Ð¸Ð¾Ð½\nÐœÐ°Ð°Ñ€Ñ‚ÐµÐ½ Ð‘Ð¾Ñ�Ð¼Ð°\nÐœÐ°Ð³Ð½ÑƒÑ� ÐžÐ»Ñ�ÐµÐ½\nÐœÐ°Ñ€Ðº ÐŸÐ¸ÑƒÐ»Ð°Ñ…Ñ�\nÐœÐ°Ñ‚Ñ‚Ð¸Ð°Ñ� ÐšÑƒÐ¿Ñ„ÐµÑ€\nÐœÐ°Ð¹Ðº Ð�Ð¾Ñ€Ð´ÐµÐ»Ð»\nÐŸÐ¸Ñ‚ÐµÑ€ Ð’Ð°Ñ€Ð´\nÐŸÑŒÐµÑ€ Ð¨Ð²ÐµÐ¹Ñ†ÐµÑ€\nÐ¡Ð°Ð²ÐµÐ»Ð¸Ð¹ Ð¢Ñ€ÐµÑ‚ÑŒÑ�ÐºÐ¾Ð²\nÐ¡Ñ‚ÐµÑ„Ð°Ð½ Ð“Ð¸Ð½Ñ�Ð±ÐµÑ€Ð³\nÐ¡Ð¸Ð»ÑŒÐ²ÐµÐ¹Ð½ ÐŸÐµÑ‚Ñ€ÐµÐ¾Ð»ÑŒ\nÐ¢Ð¾Ð¼Ð°Ñ� Ð‘Ð»ÑŽÐ¼ÐµÐ»ÑŒ\nÐ¢Ð¸Ð¼Ð¾ ÐšÑ€Ð¾Ð¹Ñ†ÐµÑ€\n\nÐ�Ð»ÐµÐºÑ� Ð˜Ð¾Ð½ÐµÑ�ÐºÑƒ\nÐ¤Ð¸Ð»Ð¸Ð¿ Ð�Ð°Ð²Ð°Ñ€Ð°\nÐ“ÑƒÐ½Ð½Ð°Ñ€ Ð”Ð°Ð»Ñ�Ð½ÐµÑ�\nÐœÐ°Ñ€Ñ‚Ð¸Ð½ Ð¤ÑƒÐºÑ�\nÐ Ð¾Ð¹Ñ� ÐœÐ¸Ñ‚Ñ‡ÐµÐ»Ð» III\nÐ‘Ñ€Ñ�Ð½Ð´Ð¾Ð½ Ð¢Ñ‘Ñ€Ð½ÐµÑ€\nÐ‘Ñ€Ð°Ð¹Ð°Ð½ ÐŸÐ°Ð»Ð¼ÐµÑ€\nÐšÐ°Ñ�Ð¿ÐµÑ€ Ð¥Ð¾Ñ€Ð½Ñ�Ñ‚Ñ€ÑƒÐ¿\nÐ”Ñ�Ð²Ð¸Ð´ Ð’ÐµÐ»Ñ‡\nÐ­Ð¼Ð°Ð½ÑƒÑ�Ð»ÑŒ Ð�Ð»Ð¸Ð±ÐµÑ€Ñ‚Ð¸\nÐ“Ðµ Ð²Ð°Ð½ Ð“ÐµÐ»ÑŒÐ´Ð¾Ñ€Ð¿\nÐ“Ñ€ÐµÐ³Ð¾Ñ€ Ð�Ð½Ð¸Ñ‡\nÐ”Ð¶ÐµÐ¹Ñ�Ð¾Ð½ Ð¤Ð¸Ð»Ð±Ð¸\nÐ™ÐµÐ½Ñ� ÐšÐ¾Ð»Ð»Ð¸Ð½\nÐœÐ¸Ñ…Ð°Ñ�Ð»ÑŒ Ð’Ð¸Ñ€Ñ‚\nÐ�Ð°Ñ‚Ð°Ð½ Ð’ÑƒÐ´Ñ�\nÐ Ð¾Ð±ÐµÑ€Ñ‚ Ð”Ð¸ÐºÐµÐ½Ñ�Ð¾Ð½\nÐ ÐµÐºÑ� Ð”Ð¶Ð¾Ð»Ð»Ð¸Ñ„Ñ„\nVizzini\n\nÐ ÐµÐ»Ð¸Ð·-Ð¸Ð½Ð¶ÐµÐ½ÐµÑ€Ñ‹\n\nÐšÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¦Ð·Ñ‹Ð»Ñ�Ð½ Ð“ÑƒÐ¾\n\nÐ Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ° Ð²ÐµÐ±-Ñ�Ð°Ð¹Ñ‚Ð°\n\nÐšÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¯Ð½ Ð‘Ð»ÑƒÐ¼ÐºÐ²Ð¸Ñ�Ñ‚ ÐšÐ¸Ð½Ð°Ð½Ð´ÐµÑ€\nÐšÐ»ÐµÐ¼ÐµÐ½Ñ� Ð¤Ñ€Ð¸Ð´Ð»\nÐ¦Ð·Ñ‹Ð»Ñ�Ð½ Ð“ÑƒÐ¾\n\nÐ“Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑ�ÐºÐ¸Ð¹ Ð´Ð¸Ð·Ð°Ð¹Ð½\n\nMindflyer\nWierd_W\n\nÐ‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ð½Ð¾Ñ�Ñ‚Ð¸\n\nÐ²Ñ�ÐµÐ¼ ÑƒÑ‡Ð°Ñ�Ñ‚Ð½Ð¸ÐºÐ°Ð¼ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð°\nÐšÐ¾Ð¼Ð°Ð½Ð´Ðµ Wine\n\n"
 END
Index: dll/cpl/sysdm/lang/es-ES.rc
===================================================================
--- dll/cpl/sysdm/lang/es-ES.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/es-ES.rc	(copie de travail)
@@ -68,7 +68,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "InformaciÃ³n de la VersiÃ³n ", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Informar como EstaciÃ³n de trabajo", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Informar como EstaciÃ³n de trabajo", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS estÃ¡ diseÃ±ado como un Sistema Operativo servidor e informa como tal. Seleccione esta casilla para cambiar esto para aplicaciones.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "Aceptar", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/fr-FR.rc
===================================================================
--- dll/cpl/sysdm/lang/fr-FR.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/lang/fr-FR.rc	(copie de travail)
@@ -66,7 +66,7 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73
-    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10
     LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41
     PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
 END
Index: dll/cpl/sysdm/lang/sq-AL.rc
===================================================================
--- dll/cpl/sysdm/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/sysdm/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,279 @@
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistemi:", IDC_STATIC, 4, 132, 32, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9
+    LTEXT "Versioni", IDC_STATIC, 10, 153, 25, 9
+    LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9
+    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9
+    LTEXT "MakinÃ«:", IDC_STATIC, 124, 132, 34, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9
+    CONTROL "Vizitoni <A HREF=""http://www.reactos.org/"">Faqeb ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10
+    PUSHBUTTON "Shiko &licencÃ«s...", IDC_LICENCE, 170, 199, 78, 13
+END
+
+IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PjesÃ« Elektronike"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Menagjues PjesÃ«ve", IDC_STATIC, 6, 7, 244, 61
+    ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON
+    PUSHBUTTON "&Menagjues PjesÃ«ve...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15
+    LTEXT "Menagjues PjesÃ«ve liston tÃ« gjitha pajisjet elektronike tÃ« instaluara nÃ« kompjuterin tuaj. PÃ«rdorimi managjuesit pjesÃ«ve pÃ«r tÃ« ndryshuar vetitÃ« e Ã§do pajisje.", IDC_STATIC, 42, 18, 204, 24
+    GROUPBOX "Megjistari PjesÃ«ve Elektronike", IDC_STATIC, 6, 79, 244, 61
+    ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON
+    LTEXT "Magjistari pjesÃ«ve elektronike ju ndihmon pÃ«r tÃ« instaluar, Ã‡'instaluar, Riparuar, Heq, Nxjerr, dhe konfiguruar pjesÃ«r elektronike tuaja.", IDC_STATIC, 42, 90, 204, 24
+    PUSHBUTTON "Magjistari PjesÃ«ve elektronike...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15
+    GROUPBOX "Profile PjesÃ«ve Elektronike", IDC_STATIC, 6, 149, 244, 61
+    ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON
+    LTEXT "Profilet e pjesÃ«ve elektronike ofrojnÃ« njÃ« mÃ«nyrÃ« pÃ«r ju pÃ«r tÃ« krijuar dhe ruajtur konfigurime tÃ« ndryshme pjesÃ«sh.", IDC_STATIC, 42, 160, 204, 24
+    PUSHBUTTON "Profile PjesÃ«ve Elektronike...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15
+END
+
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Avancuar"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Privilegjet Administratorit janÃ« tÃ« nevojshme pÃ«r shumicÃ«n e kÃ«tyre konfigurimeve.", IDC_STATIC, 12, 5, 236, 8
+    GROUPBOX "Performanca", IDC_STATIC, 6, 18, 244, 50
+    LTEXT "Opsionet e performancÃ«s kontrollojnÃ« se si programet pÃ«rdorin memorien, e cila ndikon nÃ« shpejtÃ«sinÃ« e kompjuterit tuaj.", IDC_STATIC, 16, 29, 228, 17
+    PUSHBUTTON "CilÃ«simet", IDC_PERFOR, 194, 48, 50, 15
+    GROUPBOX "Profili PÃ«rdoruesit", IDC_STATIC, 6, 75, 244, 48
+    LTEXT "CilÃ«simet e Desktop-it nÃ« lidhje me hyrjen tuaj", IDC_STATIC, 16, 88, 228, 20
+    PUSHBUTTON "CilÃ«simet", IDC_USERPROFILE, 194, 103, 50, 15
+    GROUPBOX "Fillim dhe RimÃ«kÃ«mbje", IDC_STATIC, 6, 131, 244, 52
+    LTEXT "Opsionet e Fillimit dhe shÃ«rimit udhÃ«zojnÃ« kompjuterin tuaj se si tÃ« filloi dhe Ã§farÃ« tÃ« bÃ«jÃ«, nÃ«se gabimet e shkaktojn kompjuterin tuaj pÃ«r tÃ« ndaluar.", IDC_STATIC, 16, 144, 228, 19
+    PUSHBUTTON "CilÃ«simet", IDC_STAREC, 194, 162, 50, 15
+    PUSHBUTTON "CilÃ«sime Sistemi", IDC_SYSSETTINGS, 2, 192, 80, 15
+    PUSHBUTTON "Mjedis VariablÃ«l", IDC_ENVVAR, 85, 192, 80, 15
+    PUSHBUTTON "Raporto Gabimet", IDC_ERRORREPORT, 170, 192, 80, 15
+END
+
+IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "CilÃ«simet Sistemit"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    GROUPBOX "Versioni Info", IDC_STATIC, 6, 3, 210, 73
+    CONTROL "Raporto si StacionPune", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10
+    LTEXT "ReactOS Ã«shtÃ« ndÃ«rtuar si njÃ« server OS dhe raporton si tÃ« tillÃ«. Kontrolloni kÃ«tÃ« kuti pÃ«r tÃ« ndryshuar vetÃ«m kÃ«tÃ« program.", IDC_STATIC, 15, 15, 183, 41
+    PUSHBUTTON "OK", IDOK, 166, 83, 50, 14
+END
+
+IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Profile PjesÃ« Elektronike"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON
+    LTEXT "Ju mund tÃ« krijoni profile tÃ« pjesÃ«ve elektronike pÃ«r konfigurime tÃ« ndryshme. NÃ« fillim, ju mund tÃ« zgjidhni profilin qÃ« dÃ«shironi tÃ« pÃ«rdorni.", IDC_STATIC, 46, 11, 188, 25
+    LTEXT "Profil i'DisponushÃ«m PjesÃ«sh Elektronike:", IDC_STATIC, 8, 41, 120, 8
+    LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY
+    PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED
+    PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED
+    PUSHBUTTON "&Karaktiristsikat", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Kopjo", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Emero", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Fshi", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED
+    GROUPBOX "PÃ«rzgjedhje Profil PjesÃ«sh Elektronike ", IDC_STATIC, 7, 130, 240, 75
+    LTEXT "Kur ReactOS fillon:", IDC_STATIC, 14, 142, 210, 8
+    AUTORADIOBUTTON "&Prisni deri sa unÃ« tÃ« pÃ«rzgjedhur njÃ« profil pjesÃ«sh elektronike", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP
+    AUTORADIOBUTTON "&Zgjidhni profilin e parÃ« tÃ« listuar nÃ« qoftÃ« se unÃ« nuk zgjedh njÃ« profil nÃ«", IDC_HRDPROFSELECT, 14, 173, 190, 8
+    LTEXT "sekonda", IDC_STATIC, 65, 187, 35, 8
+    EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12
+    CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10
+    DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 197, 213, 50, 14
+END
+
+IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Kopjo Profilin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Nga:", IDC_STATIC, 5, 10, 20, 8
+    LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10
+    LTEXT "Tek:", IDC_STATIC, 5, 30, 20, 8
+    EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12
+    DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 199, 30, 50, 14
+END
+
+IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "RiemÃ«rto Profilin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Nga:", IDC_STATIC, 5, 10, 20, 8
+    LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10
+    LTEXT "Tek:", IDC_STATIC, 5, 30, 20, 8
+    EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12
+    DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 199, 30, 50, 14
+END
+
+IDD_USERPROFILE DIALOGEX 0, 0, 256, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Profili PÃ«rdoruesit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON
+    LTEXT "Profilet e pÃ«rdoruesve pÃ«rmbajnÃ« parametrat e desktop-it dhe informacione tÃ« tjera nÃ« lidhje me hyrjen tuaj. NjÃ« profil i ndryshÃ«m mund tÃ« krijohet nÃ« Ã§do kompjuter qÃ« ju pÃ«rdorni, ose ju mund tÃ« zgjidhni njÃ« profil kryesorÃ« qÃ« Ã«shtÃ« i njÃ«jtÃ« nÃ« Ã§do kompjuter qÃ« ju pÃ«rdorni.", IDC_STATIC, 40, 11, 211, 35
+    LTEXT "Profilet e ruajtura nÃ« kÃ«tÃ« kompjuter:", IDC_STATIC, 16, 51, 204, 9
+    CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+            LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "Ndrysho Tipin", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13
+    PUSHBUTTON "Fshi", IDC_USERPROFILE_DELETE, 145, 156, 50, 13
+    PUSHBUTTON "Kopjo tek", IDC_USERPROFILE_COPY, 200, 156, 50, 13
+    CONTROL "PÃ«r tÃ« krijuar llogarive tÃ« reja pÃ«rdoruesi, hapni<A>Llogaria PÃ«rdoruesit</A> nÃ« Panelin e Kontrollit.",
+            IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18
+    DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13
+    PUSHBUTTON "Anulo", IDCANCEL, 196, 200, 54, 13
+END
+
+IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Fillimi dhe ShÃ«rimi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Fillimi Sistemit", IDC_STATIC, 7, 12, 238, 95
+    LTEXT "&Sistemi Operativ ParapÃ«rzgjedhur:", IDC_STATIC, 14, 26, 100, 8
+    COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Koha pÃ«r tÃ« shfaqur listÃ«n e sistemeve operative:", IDC_STRECLIST, 14, 56, 160, 8
+    EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER
+    CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT |
+            UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13
+    LTEXT "sek.", IDC_STATIC, 223, 56, 18, 8
+    AUTOCHECKBOX "Koha pÃ«r tÃ« shfaqur opsionet e shÃ«rimit tÃ« ekranit kur duhen:", IDC_STRRECREC, 14, 70, 170, 8
+    EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER
+    CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT |
+            UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13
+    LTEXT "sek.", IDC_STATIC, 223, 70, 18, 8
+    LTEXT "PÃ«r tÃ« modifikuar opsionet e dokumentacionit fillestarÃ« manualisht, klikoni modifiko.", IDC_STATIC, 14, 89, 187, 8
+    PUSHBUTTON "&Modifiko", IDC_STRRECEDIT, 188, 87, 50, 14
+    GROUPBOX "Sistemi DÃ«shtoi", IDC_STATIC, 7, 111, 238, 140
+    AUTOCHECKBOX "&Shkruaj njÃ« even tek shÃ«nimet e sistemit", IDC_STRRECWRITEEVENT, 14, 124, 148, 10
+    AUTOCHECKBOX "DÃ«rgo njÃ« alarm admi&nistrativ", IDC_STRRECSENDALERT, 14, 138, 148, 10
+    AUTOCHECKBOX "Rifillo Automatikisht", IDC_STRRECRESTART, 14, 152, 145, 10
+    GROUPBOX "Shkruaj informacionet e rregullimit", IDC_STATIC, 12, 167, 227, 76
+    COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST
+    LTEXT "Hedh &dokumentat:", IDC_STATIC, 17, 202, 150, 8
+    EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12
+    AUTOCHECKBOX "&Mbishkruaj njÃ« dokument ekzistues", IDC_STRRECOVERWRITE, 17, 228, 125, 10
+    DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 195, 259, 50, 14
+END
+
+IDD_VIRTMEM DIALOGEX 6, 6, 223, 248
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Memoria Virtuale"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Driveri  [Etiketa Volumit]", IDC_STATIC, 12, 5, 96, 9
+    LTEXT "MadhÃ«sia faqes dokumentit(MB)", IDC_STATIC, 115, 5, 96, 9
+    LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS
+    GROUPBOX "MadhÃ«sia faqes dokumentit pÃ«r driverin e zgjedhur", IDC_DRIVEGROUP, 10, 70, 204, 104
+    LTEXT "Driveri:", IDC_STATIC, 20, 80, 20, 8
+    LTEXT "", IDC_DRIVE, 88, 81, 100, 9
+    LTEXT "HapÃ«sirÃ« â€‹â€‹nÃ« dispozicion:", IDC_STATIC, 20, 92, 56, 9
+    LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9
+    LTEXT "&MadhÃ«sia fillestare (MB):", -1, 22, 118, 75, 9
+    LTEXT "MadhÃ«sia maksimale (MB):", -1, 22, 131, 75, 9
+    AUTORADIOBUTTON "&Masa Personalizuar", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP
+    AUTORADIOBUTTON "Menaxhues Mase S&istemi", IDC_SYSMANSIZE, 20, 145, 88, 9
+    AUTORADIOBUTTON "&Ska faqe dokumenti", IDC_NOPAGEFILE, 20, 158, 78, 9
+    EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE
+    EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE
+    PUSHBUTTON "Vendos", IDC_SET, 158, 155, 50, 13
+    GROUPBOX "Masa dokumentin komplete pÃ«r tÃ« gjithÃ« drive-at", IDC_TOTALGROUP, 10, 177, 204, 46
+    LTEXT "Minimumi lejuar:", IDC_STATIC, 18, 188, 58, 9
+    LTEXT "", IDC_MINIMUM, 88, 188, 100, 9
+    LTEXT "Rekomanduar:", IDC_STATIC, 18, 199, 52, 9
+    LTEXT "", IDC_RECOMMENDED, 88, 199, 100, 9
+    LTEXT "Aktualisht ndarÃ«:", IDC_STATIC, 18, 210, 66, 9
+    LTEXT "", IDC_CURRENT, 88, 210, 100, 9
+    DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13
+    PUSHBUTTON "Anulo", IDCANCEL, 168, 232, 48, 13
+END
+
+IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "VariabÃ«l Mjedisi"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "VariabÃ«l PÃ«rdoruesi", IDC_STATIC, 7, 12, 238, 100
+    CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS |
+            LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&E're...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14
+    PUSHBUTTON "&Modifiko...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14
+    PUSHBUTTON "&Fshi", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14
+    GROUPBOX "VariablÃ« Sistemi", IDC_STATIC, 7, 116, 238, 100
+    CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS |
+            LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE
+    PUSHBUTTON "E're...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14
+    PUSHBUTTON "Modifiko...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14
+    PUSHBUTTON "Fshi", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP
+    PUSHBUTTON "Anulo", IDCANCEL, 195, 224, 50, 14
+END
+
+IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Modifiko VariablÃ«"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "&Emrat VariablÃ«:", IDC_STATIC, 7, 14, 50, 8
+    EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL
+    LTEXT "&Vlera VariablÃ«:", IDC_STATIC, 7, 32, 50, 8
+    EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 170, 50, 50, 14
+END
+
+IDD_LICENCE DIALOGEX 6, 5, 267, 159
+CAPTION "LiÃ§ensÃ«"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+BEGIN
+    EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE
+    DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLSYSTEMNAME "Sistemi"
+    IDS_CPLSYSTEMDESCRIPTION "Shih informacionin nÃ« lidhje me kompjuterin tuaj dhe ndrysho sistemin dhe konfigurimin e pjesÃ«ve elektronike tÃ« ndryshme."
+    IDS_MEGABYTE "MB e RAM"
+    IDS_GIGABYTE "GB e RAM"
+    IDS_TERABYTE "TB e RAM"
+    IDS_PETABYTE "PB e RAM"
+    IDS_VARIABLE "VariablÃ«"
+    IDS_VALUE "Vlera"
+    IDS_NO_DUMP "(AsnjÃ«)"
+    IDS_MINI_DUMP "Minidump(64KB)"
+    IDS_KERNEL_DUMP "Hedh BÃ«rthamÃ«n"
+    IDS_FULL_DUMP "Hedh Komplet"
+    IDS_USERPROFILE_NAME "Emri"
+    IDS_USERPROFILE_SIZE "Masa"
+    IDS_USERPROFILE_TYPE "Tipi"
+    IDS_USERPROFILE_STATUS "GjÃ«ndje"
+    IDS_USERPROFILE_MODIFIED "Modifikuar"
+    IDS_MESSAGEBOXTITLE "Sistemi i kontrollit panelit programeve"
+    IDS_WARNINITIALSIZE "Futni njÃ« vlerÃ« numerike pÃ«r madhÃ«sinÃ« fillestare e faqeve tÃ« dokumentave."
+    IDS_WARNMAXIMUMSIZE "Futni njÃ« vlerÃ« numerike pÃ«r madhÃ«sinÃ« maksimale e faqeve tÃ« dokumentave."
+    IDS_WARNINITIALRANGE "MadhÃ«sia fillestare e faqes sÃ« dokumentit nuk duhet tÃ« jetÃ« mÃ« e vogÃ«l se 2 MB dhe nuk duhet tÃ« kalojÃ« hapÃ«sirÃ«n nÃ« dispozicion nÃ« driver-in e pÃ«rzgjedhur."
+    IDS_WARNMAXIMUMRANGE "MadhÃ«sia maksimale e faqes sÃ« dokumenit nuk duhet tÃ« jetÃ« mÃ« e vogÃ«l se madhÃ«sia e saj fillestare dhe nuk duhet tÃ« kalojÃ« hapÃ«sirÃ«n nÃ« dispozicion nÃ« driver-in e pÃ«rzgjedhur."
+    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/sysdm/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/sysdm/sysdm.rc
===================================================================
--- dll/cpl/sysdm/sysdm.rc	(rÃ©vision 61927)
+++ dll/cpl/sysdm/sysdm.rc	(copie de travail)
@@ -84,6 +84,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/cpl/input/input.h
===================================================================
--- dll/cpl/input/input.h	(rÃ©vision 61927)
+++ dll/cpl/input/input.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _INPUT_H
+#define _INPUT_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -70,4 +73,4 @@
 
 void ShowLastWin32Error(HWND hWndOwner);
 
-/* EOF */
+#endif /* _INPUT_H */
Index: dll/cpl/input/CMakeLists.txt
===================================================================
--- dll/cpl/input/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/input/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 spec2def(input.dll input.spec)
 
-add_library(input SHARED
+list(APPEND SOURCE
     input.c
     settings.c
     advsettings.c
@@ -8,6 +8,10 @@
     keysettings.c
     add.c
     changekeyseq.c
+    input.h)
+
+add_library(input SHARED
+    ${SOURCE}
     input.rc
     ${CMAKE_CURRENT_BINARY_DIR}/input.def)
 
@@ -21,5 +25,5 @@
     gdi32
     kernel32)
 
-add_pch(input input.h)
+add_pch(input input.h SOURCE)
 add_cd_file(TARGET input DESTINATION reactos/system32 FOR all)
Index: dll/cpl/input/lang/uk-UA.rc
===================================================================
--- dll/cpl/input/lang/uk-UA.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/uk-UA.rc	(copie de travail)
@@ -29,7 +29,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/pl-PL.rc
===================================================================
--- dll/cpl/input/lang/pl-PL.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/pl-PL.rc	(copie de travail)
@@ -29,7 +29,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Konfiguracja Systemu", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&WyÅ‚Ä…cz zaawansowane usÅ‚ugi tekstowe", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&WyÅ‚Ä…cz zaawansowane usÅ‚ugi tekstowe", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Zaznacz tÄ… opcjÄ™ by wyÅ‚Ä…czyÄ‡ zaawansowane usÅ‚ugi tesktowe we wszystkich programach.\nNie jest to zalecane dla uÅ¼ytkownikÃ³w z Dalekiego Wschodu, jako Å¼e zamyka to pasek jÄ™zykÃ³w.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/it-IT.rc
===================================================================
--- dll/cpl/input/lang/it-IT.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/it-IT.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Configurazione di sistema", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Disabilita i servizi avanzati per il testo", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Disabilita i servizi avanzati per il testo", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Questa abilitazione toglie i servizi avanzati per il testo da tutti i programmi.\nSconsigliata agli utenti dell'Asia dell'est perchÃ¨ verrÃ  disabilitata la barra delle lingue.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/no-NO.rc
===================================================================
--- dll/cpl/input/lang/no-NO.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/no-NO.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/en-US.rc
===================================================================
--- dll/cpl/input/lang/en-US.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/en-US.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/sk-SK.rc
===================================================================
--- dll/cpl/input/lang/sk-SK.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/sk-SK.rc	(copie de travail)
@@ -26,7 +26,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/he-IL.rc
===================================================================
--- dll/cpl/input/lang/he-IL.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/he-IL.rc	(copie de travail)
@@ -23,7 +23,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "×”×’×“×¨×ª ×ž×¢×¨×›×ª", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "×›×‘×” ×©×™×¨×•×ª×™ ×˜×¡×§×¡ ×ž×ª×§×ž×™×�", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "×›×‘×” ×©×™×¨×•×ª×™ ×˜×¡×§×¡ ×ž×ª×§×ž×™×�", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/ro-RO.rc
===================================================================
--- dll/cpl/input/lang/ro-RO.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/ro-RO.rc	(copie de travail)
@@ -23,7 +23,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "ConfiguraÈ›ie de sistem", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&DezactiveazÄƒ serviciile avansate de text", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&DezactiveazÄƒ serviciile avansate de text", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "SelectaÈ›i aceastÄƒ bifÄƒ pentru a dezactiva serviciile avansate de text Ã®n toate programele.\nAceasta nu se recomandÄƒ pentru utilizatorii de limbi est-asiatice, deoarece va duce la Ã®nchiderea barei de limbi.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/el-GR.rc
===================================================================
--- dll/cpl/input/lang/el-GR.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/el-GR.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/tr-TR.rc
===================================================================
--- dll/cpl/input/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/tr-TR.rc	(copie de travail)
@@ -23,7 +23,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Dizge YapÄ±landÄ±rmasÄ±", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&GeliÅŸmiÅŸ Metin Hizmetlerini Kapat", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&GeliÅŸmiÅŸ Metin Hizmetlerini Kapat", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "TÃ¼m Ã§izeylemlerdeki geliÅŸmiÅŸ metin hizmetlerini kapatmak iÃ§in bu kutucuÄŸu seÃ§iniz.\nBu ayar, dil Ã§ubuÄŸunuu kapatacaÄŸÄ±ndan DoÄŸu Asya kulanÄ±cÄ±larÄ± iÃ§in Ã¶nerilmez.", -1, 14, 40, 230, 35
 END
 
@@ -136,7 +136,7 @@
     IDS_CANADIAN_FRENCH_LEGACY_LAYOUT "Kanada FransÄ±zcasÄ± (Eski)"
     IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT "Kanada Ã‡ok Dilli Ã–lÃ§Ã¼n"
     IDS_CANTONESE_PHONETIC_LAYOUT "Kanton LehÃ§esi Tam Seslik"
-    IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT "Ã‡ince (BayaÄŸÄ±laÅŸtÄ±rÄ±lmÄ±ÅŸ) - MikroyazÄ±lÄ±m Pinyin IME 3.0"
+    IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT "Ã‡ince (BayaÄŸÄ±laÅŸtÄ±rÄ±lmÄ±ÅŸ) - Microsoft Pinyin IME 3.0"
     IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT "Ã‡ince (BayaÄŸÄ±laÅŸtÄ±rÄ±lmÄ±ÅŸ) - NeiMa"
     IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT "Ã‡ince (BayaÄŸÄ±laÅŸtÄ±rÄ±lmÄ±ÅŸ) - KuanPin"
     IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT "Ã‡ince (BayaÄŸÄ±laÅŸtÄ±rÄ±lmÄ±ÅŸ) - ÅžuangPin"
@@ -144,7 +144,7 @@
     IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT "Ã‡ince (BayaÄŸÄ±laÅŸtÄ±rÄ±lmÄ±ÅŸ) - ZengMa"
     IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT "Ã‡ince (Geleneklik) - HÃ¢rflik ve SayÄ±lÄ±k"
     IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT "Ã‡ince (Geleneklik) - DÃ¼zen"
-    IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT "Ã‡ince (Geleneklik) - Big5 DÃ¼zgÃ¼sÃ¼"
+    IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT "Ã‡ince (Geleneklik) - Big5 Kodu"
     IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT "Ã‡ince (Geleneklik) - Ã‡angJi"
     IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT "Ã‡ince (Geleneklik) - DaYi"
     IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT "Ã‡ince (Geleneklik) - Yeni Ã‡angJi"
@@ -151,7 +151,7 @@
     IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT "Ã‡ince (Geleneklik) - Yeni Tam Seslik"
     IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT "Ã‡ince (Geleneklik) - Tam Seslik"
     IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT "Ã‡ince (Geleneklik) - Ã‡abuk"
-    IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT "Ã‡ince (Geleneklik) - Evrenlik DÃ¼zgÃ¼lÃ¼k"
+    IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT "Ã‡ince (Geleneklik) - Evrenlik Kodluk"
     IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT "Ã‡ince (Geleneklik) - ABD DÃ¼ÄŸme TakÄ±mÄ±"
     IDS_CROATIAN_LAYOUT "HÄ±rvatÃ§a"
     IDS_CZECH_LAYOUT "Ã‡ekÃ§e"
Index: dll/cpl/input/lang/ru-RU.rc
===================================================================
--- dll/cpl/input/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -17,12 +17,12 @@
 
 IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Advanced Settings"
+CAPTION "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
-    LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
+    GROUPBOX "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ� Ð¡Ð¸Ñ�Ñ‚ÐµÐ¼Ñ‹", -1, 7, 7, 240, 70
+    AUTOCHECKBOX "&Ð’Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ñ‚ÐµÐºÑ�Ñ‚Ð¾Ð²Ñ‹Ðµ Ñ�Ð»ÑƒÐ¶Ð±Ñ‹", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
+    LTEXT "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ñ�Ñ‚Ð¾Ñ‚ Ñ„Ð»Ð°Ð¶Ð¾Ðº, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ñ‚ÐµÐºÑ�Ñ‚Ð¾Ð²Ñ‹Ðµ Ñ�Ð»ÑƒÐ¶Ð±Ñ‹ Ð²Ð¾ Ð²Ñ�ÐµÑ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ….\nÐ­Ñ‚Ð¾ Ð½Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚Ñ�Ñ� Ð´Ð»Ñ� Ð’Ð¾Ñ�Ñ‚Ð¾Ñ‡Ð½Ð¾-Ð°Ð·Ð¸Ð°Ñ‚Ñ�ÐºÐ¸Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, Ð¿Ð¾Ñ‚Ð¾Ð¼Ñƒ Ñ‡Ñ‚Ð¾ Ñ�Ñ‚Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÐµÑ‚ Ñ�Ð·Ñ‹ÐºÐ¾Ð²ÑƒÑŽ Ð¿Ð°Ð½ÐµÐ»ÑŒ.", -1, 14, 40, 230, 35
 END
 
 IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163
Index: dll/cpl/input/lang/es-ES.rc
===================================================================
--- dll/cpl/input/lang/es-ES.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/es-ES.rc	(copie de travail)
@@ -23,7 +23,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/fr-FR.rc
===================================================================
--- dll/cpl/input/lang/fr-FR.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/fr-FR.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Configuration du systÃ¨me", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "ArrÃªter les services de texte a&vancÃ©s", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "ArrÃªter les services de texte a&vancÃ©s", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "SÃ©lectionnez cette case Ã  cocher pour dÃ©sactiver les services de texte avancÃ©s dans tous les programmes.\nCeci n'est pas recommandÃ© aux utilisateurs d'Asie de l'Est, car cette opÃ©ration ferme la Barre de langue.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/bg-BG.rc
===================================================================
--- dll/cpl/input/lang/bg-BG.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/bg-BG.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/de-DE.rc
===================================================================
--- dll/cpl/input/lang/de-DE.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/de-DE.rc	(copie de travail)
@@ -21,7 +21,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Konfiguration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Erweiterte &Textdienste deaktivieren", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Erweiterte &Textdienste deaktivieren", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "AuswÃ¤hlen, um die erweiterte SprachunterstÃ¼tzung in allen Programmen zu deaktivieren.\nNicht empfohlen fÃ¼r ostasiatische Benutzer, da die Sprachleiste hierdurch geschlossen wird.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/zh-CN.rc
===================================================================
--- dll/cpl/input/lang/zh-CN.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/zh-CN.rc	(copie de travail)
@@ -23,7 +23,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/cs-CZ.rc
===================================================================
--- dll/cpl/input/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ dll/cpl/input/lang/cs-CZ.rc	(copie de travail)
@@ -26,7 +26,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "System Configuration", -1, 7, 7, 240, 70
-    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12
     LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35
 END
 
Index: dll/cpl/input/lang/sq-AL.rc
===================================================================
--- dll/cpl/input/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/input/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,255 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "CilÃ«simet"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni shÃ«rbimet qÃ« ju dÃ«shironi pÃ«r Ã§do gjuhÃ« tÃ« dhÃ«nash treguar nÃ« listÃ«.\nPÃ«rdor Shto dhe Hiq butonat pÃ«r tÃ« modifikuar kÃ«tÃ« listÃ«.", -1, 9, 6, 238, 25
+    CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101
+    PUSHBUTTON "&Vendos Parazgjedhur", IDC_SET_DEFAULT, 101, 159, 144, 14
+    PUSHBUTTON "Sh&to...", IDC_ADD_BUTTON, 27, 142, 70, 14
+    PUSHBUTTON "&Hiq...", IDC_REMOVE_BUTTON, 101, 142, 70, 14
+    PUSHBUTTON "&Karakteristikat...", IDC_PROP_BUTTON, 175, 142, 70, 14
+    GROUPBOX "Preferenca", -1, 7, 185, 240, 36
+    PUSHBUTTON "&Ã‡eles cilÃ«simesh...", IDC_KEY_SET_BTN, 14, 198, 110, 14
+END
+
+IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "CilÃ«simet Avancume"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Konfigurimet Sistemit", -1, 7, 7, 240, 70
+    AUTOCHECKBOX "&Fik shÃ«rbimet e avancuara tekstit", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12
+    LTEXT "Zgjidhni kÃ«tÃ« kuti kontrolli pÃ«r tÃ« fikur shÃ«rbimet e avancuara me tekst nÃ« tÃ« gjitha programet.\nKjo nuk Ã«shtÃ« e rekomanduar pÃ«r pÃ«rdoruesit e AzisÃ« Lindore pÃ«r shkak se kjo e mbyll tabelen e gjuhÃ«s.", -1, 14, 40, 230, 35
+END
+
+IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "CilÃ«simet e Avancume Butonave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Fik Shkronja T'mÃ«dha", -1, 7, 7, 258, 26
+    AUTORADIOBUTTON "Shtyp butonin CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP
+    AUTORADIOBUTTON "Shtyp butonin  SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP
+    GROUPBOX "Butona tme kombimin pÃ«r gjuhÃ«t", -1, 7, 37, 258, 95
+    LTEXT "Veprim", -1, 14, 47, 60, 9
+    RTEXT "&Sekuence butonash", -1, 177, 47, 79, 9
+    CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&Ndrysho sekuencen e butonave...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP
+    DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 146, 140, 70, 14
+END
+
+IDD_ADD DIALOGEX 20, 20, 227, 90
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Shto gjuhÃ«n hyrese"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Gjuha hyrese:", -1, 7, 7, 61, 10
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 36, 110, 10
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 169, 68, 50, 14
+END
+
+IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Ndrysoho Sekuencen Butonave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "", -1, 9, 5, 155, 110
+    AUTOCHECKBOX "&Ndrysho gjuhÃ«n hyrese", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12
+    LTEXT "NdÃ«rrim", -1, 73, 37, 27, 12
+    CTEXT "+", -1, 62, 37, 8, 9
+    AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11
+    AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12
+    AUTOCHECKBOX "Ndrysho paraqitjen tastieres", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12
+    LTEXT "NdÃ«rrim", -1, 74, 87, 27, 12
+    CTEXT "+", -1, 63, 87, 8, 9
+    AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11
+    AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12
+    DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 172, 27, 50, 14
+END
+
+IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Karakteristikat e gjuhÃ«s HyrÃ«se"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Gjuha hyrese:", -1, 7, 7, 61, 8
+    LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
+    LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 21, 110, 10
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 169, 53, 52, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLSYSTEMNAME "ShÃ«rbimet Tekst dhe Gjuha hyrese"
+    IDS_CPLSYSTEMDESCRIPTION "Modifikon cilÃ«simet pÃ«r futjen e tekstit tÃ« gjuhÃ«ve."
+    IDS_KEYBOARD "Tastiera"
+    IDS_NONE "(AsnjÃ«)"
+    IDS_UNKNOWN "(P'njohur)"
+    IDS_RESTART "A doni tÃ« rinisni kompjuterin tuaj tani?"
+    IDS_WHATS_THIS "Ã‡farÃ« Ã«shtÃ« kjo?"
+    IDS_LANGUAGE "GjuhÃ«"
+    IDS_LAYOUT "Paraqitja Tastieres"
+    IDS_REM_QUESTION "A doni tÃ« hiqni paraqitjen e tastieres sÃ« zgjedhur?"
+    IDS_CONFIRMATION "VÃ«rtetim"
+    IDS_LAYOUT_EXISTS "Kjo paraqitje tashmÃ« ekziston."
+    IDS_LAYOUT_EXISTS2 "Kjo paraqitje tashmÃ« ekziston dhe nuk mund tÃ« shtohet."
+    IDS_CTRL_SHIFT "Ctrl+Shift"
+    IDS_LEFT_ALT_SHIFT "Left Alt+Shift"
+    IDS_SWITCH_BET_INLANG "NdÃ«rro ndÃ«r gjuhÃ«t hyrese"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ALBANIAN_LAYOUT "Shqiptare"
+    IDS_ARABIC_101_LAYOUT "Arabe (101)"
+    IDS_ARABIC_102_LAYOUT "Arabe (102)"
+    IDS_ARABIC_102_AZERTY_LAYOUT "Arabe (102) AZERTY"
+    IDS_ARMENIAN_EASTERN_LAYOUT "Armene Lindore"
+    IDS_ARMENIAN_WESTERN_LAYOUT "Armene Perendimore"
+    IDS_ASSAMESE_LAYOUT "Assamese"
+    IDS_AZERI_CYRILLIC_LAYOUT "Azeri Cyrillic"
+    IDS_AZERI_LATIN_LAYOUT "Azeri Latin"
+    IDS_BELARUSIAN_LAYOUT "Bjelloruse"
+    IDS_BELGIAN_COMMA_LAYOUT "Belge (Comma)"
+    IDS_BELGIAN_FRENCH_LAYOUT "Belge French"
+    IDS_BELGIAN_LAYOUT "Belge (Period)"
+    IDS_BENGALI_LAYOUT "Bengali"
+    IDS_BULGARIAN_LAYOUT "Bullgare"
+    IDS_BULGARIAN_BDS_LAYOUT "Bullgare BDS 5237-1978"
+    IDS_BULGARIAN_LATIN_LAYOUT "Bullgare (Latin)"
+    IDS_BULGARIAN_PHONETIC_BDS_LAYOUT "Bullgare Phonetic (BDS 5237-1978)"
+    IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT "Bullgare Phonetic (Classic)"
+    IDS_BURMESE_LAYOUT "Burmese"
+    IDS_CANADIAN_FRENCH_LAYOUT "Kanadeze French"
+    IDS_CANADIAN_FRENCH_LEGACY_LAYOUT "Kanadeze French (Legacy)"
+    IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT "Kanadeze Standart ShumÃ«gjuhÃ«sor"
+    IDS_CANTONESE_PHONETIC_LAYOUT "Kantonese Phonetic"
+    IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT "Kineze (e'thjeshtÃ«suar) - Microsoft Pinyin IME 3.0"
+    IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT "Kineze (e'thjeshtÃ«suar) - NeiMa"
+    IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT "Kineze (e'thjeshtÃ«suar) - QuanPin"
+    IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT "Kineze (e'thjeshtÃ«suar) - ShuangPin"
+    IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT "Kineze(e'thjeshtÃ«suar) - US Keyboard"
+    IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT "Kineze (e'thjeshtÃ«suar) - ZhengMa"
+    IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT "Kineze (Tradicionale) - Alphanumeric"
+    IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT "Kineze (Tradicionale) - Array"
+    IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT "Kineze (Tradicionale) - Big5 Code"
+    IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT "Kineze (Tradicionale) - ChangJie"
+    IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT "Kineze (Tradicionale) - DaYi"
+    IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT "Kineze (Tradicionale) - New ChangJie"
+    IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT "Kineze (Tradicionale) - New Phonetic"
+    IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT "Kineze (Tradicionale) - Phonetic"
+    IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT "Kineze (Tradicionale) - Quick"
+    IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT "Kineze (Tradicionale) - Unicode"
+    IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT "Kineze (Tradicionale) - US Keyboard"
+    IDS_CROATIAN_LAYOUT "Kroate"
+    IDS_CZECH_LAYOUT "Czech"
+    IDS_CZECH_PROGRAMMERS_LAYOUT "Czech Programmers"
+    IDS_CZECH_QWERTY_LAYOUT "Czech (QWERTY)"
+    IDS_DANISH_LAYOUT "Danish"
+    IDS_DEVANAGARI_INSCRIPT_LAYOUT "Devanagari - INSCRIPT"
+    IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic"
+    IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter"
+    IDS_DUTCH_LAYOUT "Hollandeze"
+    IDS_ESTONIAN_LAYOUT "Estoni"
+    IDS_FAEROESE_LAYOUT "Faeroese"
+    IDS_FARSI_LAYOUT "Farsi"
+    IDS_FINNISH_LAYOUT "Finnish"
+    IDS_FRENCH_LAYOUT "Franceze"
+    IDS_GAELIC_LAYOUT "Gaelic"
+    IDS_GEORGIAN_LAYOUT "Georgjiane"
+    IDS_GERMAN_LAYOUT "Gjermane"
+    IDS_GERMAN_DE_ERGO_LAYOUT "Gjermane (de_ergo)"
+    IDS_GERMAN_IBM_LAYOUT "Gjermane (IBM)"
+    IDS_GERMAN_NEO_11_LAYOUT "Gjermane (NEO-1.1)"
+    IDS_GERMAN_RISTOME_LAYOUT "Gjermane (RISTOME)"
+    IDS_GREEK_LAYOUT "Greke"
+    IDS_GREEK_220_LAYOUT "Greke (220)"
+    IDS_GREEK_220_LATIN_LAYOUT "Greke (220) Latin"
+    IDS_GREEK_319_LAYOUT "Greke (319)"
+    IDS_GREEK_319_LATIN_LAYOUT "Greke (319) Latin"
+    IDS_GREEK_LATIN_LAYOUT "Greke Latine"
+    IDS_GREEK_POLYTONIC_LAYOUT "Greke Polytonic"
+    IDS_GUJARATI_LAYOUT "Gujarati"
+    IDS_HEBREW_LAYOUT "Hebre"
+    IDS_HINDI_TRADITIONAL_LAYOUT "Hindi Tradicionale"
+    IDS_HUNGARIAN_LAYOUT "Hungareze"
+    IDS_HUNGARIAN_101_KEY_LAYOUT "Hungareze 101-key"
+    IDS_ICELANDIC_LAYOUT "Icelandic"
+    IDS_IRISH_LAYOUT "Irlandeze"
+    IDS_ITALIAN_LAYOUT "Italiane"
+    IDS_ITALIAN_142_LAYOUT "Italiane (142)"
+    IDS_JAPANESE_LAYOUT "Japoneze"
+    IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT "Japanese Input System (MS-IME2002)"
+    IDS_KANNADA_LAYOUT "Kanada"
+    IDS_KAZAKH_LAYOUT "Kazakh"
+    IDS_KOREAN_LAYOUT "Koreane"
+    IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT "Koreane Input System (MS-IME2002)"
+    IDS_KYRGYZ_CYRILLIC_LAYOUT "Kyrgyz Cyrillic"
+    IDS_LATIN_AMERICAN_LAYOUT "Latino Amerikane"
+    IDS_LATVIAN_LAYOUT "Latvian"
+    IDS_LATVIAN_QWERTY_LAYOUT "Latvian (QWERTY)"
+    IDS_LITHUANIAN_LAYOUT "Lithuaneze"
+    IDS_LITHUANIAN_IBM_LAYOUT "Lithuaneze IBM"
+    IDS_FYRO_MACEDONIAN_LAYOUT "FYRO Maqedonase"
+    IDS_MALAYALAM_LAYOUT "Malayalam"
+    IDS_MARATHI_LAYOUT "Marathi"
+    IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Cyrillic"
+    IDS_NORWEGIAN_LAYOUT "Norwegjeze"
+    IDS_ORIYA_LAYOUT "Oriya"
+    IDS_POLISH_214_LAYOUT "Polake (214)"
+    IDS_POLISH_LAYOUT "Polake (Programmers)"
+    IDS_PORTUGUESE_LAYOUT "Portuguze"
+    IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugeze (Brazilian ABNT)"
+    IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugeze (Brazilian ABNT2)"
+    IDS_PUNJABI_LAYOUT "Punjabi"
+    IDS_ROMANIAN_LAYOUT "Romane"
+    IDS_RUSSIAN_LAYOUT "Ruse"
+    IDS_RUSSIAN_TYPEWRITER_LAYOUT "Ruse (Typewriter)"
+    IDS_SERBIAN_CYRILLIC_LAYOUT "Serbe (Cyrillic)"
+    IDS_SERBIAN_LATIN_LAYOUT "Serbe (Latin)"
+    IDS_SLOVAK_LAYOUT "Slovake"
+    IDS_SLOVAK_QWERTY_LAYOUT "Slovake (QWERTY)"
+    IDS_SLOVENIAN_LAYOUT "Slovene"
+    IDS_SPANISH_LAYOUT "Spanjolle"
+    IDS_SPANISH_VARIANTION_LAYOUT "Spanjolle Variation"
+    IDS_SWEDISH_LAYOUT "Suedeze"
+    IDS_SWISS_FRENCH_LAYOUT "Swiss French"
+    IDS_SWISS_GERMAN_LAYOUT "Swiss German"
+    IDS_SYRIAC_LAYOUT "Syriac"
+    IDS_SYRIAC_PHONETIC_LAYOUT "Syriac Phonetic"
+    IDS_TAMIL_LAYOUT "Tamil"
+    IDS_TATAR_LAYOUT "Tatar"
+    IDS_TELUGU_LAYOUT "Telugu"
+    IDS_THAI_KEDMANEE_LAYOUT "Thai Kedmanee"
+    IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT "Thai Kedmanee (non-ShiftLock)"
+    IDS_THAI_PATTACHOTE_LAYOUT "Thai Pattachote"
+    IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT "Thai Pattachote (non-ShiftLock)"
+    IDS_TURKISH_F_LAYOUT "Turke F"
+    IDS_TURKISH_Q_LAYOUT "Turke Q"
+    IDS_UKRAINIAN_LAYOUT "Ukrainian"
+    IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)"
+    IDS_UNITED_KINGDOM_LAYOUT "United Kingdom"
+    IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak"
+    IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand"
+    IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand"
+    IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International"
+    IDS_URDU_LAYOUT "Urdu"
+    IDS_US_LAYOUT "US"
+    IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT "US English Table for IBM Arabic 238_L"
+    IDS_UZBEK_CYRILLIC_LAYOUT "Uzbek Cyrillic"
+    IDS_VIETNAMESE_LAYOUT "Vietnamese"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/input/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/input/input.rc
===================================================================
--- dll/cpl/input/input.rc	(rÃ©vision 61927)
+++ dll/cpl/input/input.rc	(copie de travail)
@@ -61,6 +61,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/cpl/joy/lang/sq-AL.rc
===================================================================
--- dll/cpl/joy/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/joy/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,88 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Kontrollues LojÃ«s"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20
+    LTEXT "KÃ«to rregullime do ju ndihmojnÃ« tÃ« konfiguroni kontrolluesit e lojÃ«s tÃ« instaluar nÃ« kompjuterin tuaj.", -1, 33, 7, 214, 20, NOT WS_GROUP
+    GROUPBOX "Kontrollues LojÃ«s tÃ« I&nstaluar", -1, 7, 34, 238, 117
+    CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80
+    PUSHBUTTON "&Shto...", IDC_ADD_BUTTON, 35, 129, 65, 14
+    PUSHBUTTON "&Hiq", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED
+    PUSHBUTTON "&Karakteristikat", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED
+    PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14
+    PUSHBUTTON "&Kontrollo...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14
+    PUSHBUTTON "OK", IDOK, 195, 185, 50, 14
+END
+
+IDD_ADD DIALOGEX 0, 0, 265, 200
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Shto Kontrollues LojÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
+    LTEXT "Zgjidh njÃ« kontrollues lojÃ« nga lista e meposhtme, dhe pastaj kliko OK. NÃ«se kontrollues juaj i lojÃ«s nuk paraqitet nÃ« listÃ«, kliko variante.", -1, 35, 7, 210, 33
+    LTEXT "&Kontrollues LojÃ«:", -1, 8, 45, 126, 8
+    LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
+    AUTOCHECKBOX "&Aktivizo rudders dhe pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
+    LTEXT "&Porti lojÃ«rave:", -1, 7, 134, 38, 8, NOT WS_VISIBLE
+    COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
+    PUSHBUTTON "&Variante...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
+    CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
+    DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 208, 179, 50, 14
+END
+
+IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Variantet Kontrolluesve LojÃ«s"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Karakteristika tÃ« veÃ§anta", -1, 7, 7, 245, 52
+    AUTORADIOBUTTON "&LevÃ«", IDC_JOYSTICK_RADIO, 17, 23, 55, 10
+    AUTORADIOBUTTON "&PendÃ« fluturimi ose shkop fluturimi", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10
+    AUTORADIOBUTTON "&Pad Loje", IDC_GAME_PAD_RADIO, 17, 40, 65, 10
+    AUTORADIOBUTTON "&Kontrollues Gare makine", IDC_RACE_CAR_RADIO, 147, 40, 93, 10
+    GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP
+    COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    AUTORADIOBUTTON "Rudder/Pedals", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Z Axis", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
+    GROUPBOX "&Butona", -1, 137, 67, 116, 44
+    COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
+    AUTOCHECKBOX "PÃ«rfshij njÃ« &pika e kontrollit vÃ«shgues", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
+    LTEXT "Emri K&ontrolluesit:", -1, 7, 139, 200, 9
+    EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
+    DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 203, 150, 50, 14
+END
+
+IDD_ADVANCED DIALOGEX 0, 0, 220, 86
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Rregullime tÃ« Avancuara"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20
+    DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 163, 65, 50, 14
+    LTEXT "Zgjidhni pajisjen qÃ« dÃ«shironi tÃ« pÃ«rdorni me programet mÃ« tÃ« vjetÃ«r.", -1, 7, 7, 208, 10
+    LTEXT "&Pajisja e preferuar:", -1, 34, 24, 70, 10
+    COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLSYSTEMNAME "Kontrolluesve LojÃ«s"
+    IDS_CPLSYSTEMDESCRIPTION "Shtoni, hiqni, dhe konfiguroni pajisjet elektronike kontrolluese tÃ« lojÃ«rave tÃ« tilla si levÃ« dhe pad-loje."
+    IDS_CONTROLLER "Kontrollues"
+    IDS_STATUS "Gjendje"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/joy/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/joy/joy.rc
===================================================================
--- dll/cpl/joy/joy.rc	(rÃ©vision 61927)
+++ dll/cpl/joy/joy.rc	(copie de travail)
@@ -45,6 +45,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
Index: dll/cpl/access/access.rc
===================================================================
--- dll/cpl/access/access.rc	(rÃ©vision 61927)
+++ dll/cpl/access/access.rc	(copie de travail)
@@ -80,6 +80,9 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/cpl/access/access.h
===================================================================
--- dll/cpl/access/access.h	(rÃ©vision 61927)
+++ dll/cpl/access/access.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _ACCESS_H
+#define _ACCESS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -68,4 +71,4 @@
 INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-/* EOF */
+#endif /* _ACCESS_H */
Index: dll/cpl/access/mouse.c
===================================================================
--- dll/cpl/access/mouse.c	(rÃ©vision 61927)
+++ dll/cpl/access/mouse.c	(copie de travail)
@@ -50,7 +50,7 @@
             /* Set the thumb */
             SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK, TBM_SETPOS, TRUE, i);
 
-            /* Set the number of ticks for the accelleration trackbar */
+            /* Set the number of ticks for the acceleration trackbar */
             SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_ACCEL_TRACK, TBM_SETRANGE,
                                TRUE, MAKELONG(0, ACCELTICKS - 1));
 
Index: dll/cpl/access/CMakeLists.txt
===================================================================
--- dll/cpl/access/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/access/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 spec2def(access.cpl access.spec)
 
-add_library(access SHARED
+list(APPEND SOURCE
     access.c
     display.c
     general.c
@@ -8,10 +8,14 @@
     keyboard.c
     mouse.c
     sound.c
+    access.h)
+
+add_library(access SHARED
+    ${SOURCE}
     access.rc
     ${CMAKE_CURRENT_BINARY_DIR}/access.def)
 
 set_module_type(access cpl UNICODE)
 add_importlibs(access user32 gdi32 advapi32 comctl32 msvcrt kernel32)
-add_pch(access access.h)
+add_pch(access access.h SOURCE)
 add_cd_file(TARGET access DESTINATION reactos/system32 FOR all)
Index: dll/cpl/access/lang/sq-AL.rc
===================================================================
--- dll/cpl/access/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/access/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,295 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+ * DATE OF TR:  29-11-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Tastiera"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "StickyKeys", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "PÃ«rdor StickyKeys nese doni te perdorni Shift, Ctrl, ose Alt key duke shtypur nje Ã§eles me rradhe.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "&Perdor StickyKeys", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    PUSHBUTTON "Konfigurime", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14
+    GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2
+    LTEXT "Perdp FilterKeys nese doni Reactos te injorohe ose perserise keystrokes, ose te ngadalsoje kohen e perseritjes.",
+          -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    PUSHBUTTON "Konfigurime", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14
+    GROUPBOX "ToggleKeys", -1, PROPSHEETPADDING(1), LABELLINE(16) + 3, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "Perdor ToggleKeys nese doni te degjoni tone gjate shtypjes se Caps Lock, Num Lock, dhe Scroll Lock.",
+          -1, PROPSHEETPADDING(2), LABELLINE(18) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    AUTOCHECKBOX "Perdor &ToggleKeys", IDC_TOGGLE_BOX, PROPSHEETPADDING(2), LABELLINE(20) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    PUSHBUTTON "Konfigurime", IDC_TOGGLE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(20) + 2, PROPSHEETPADDING(15), 14
+    AUTOCHECKBOX "Shfaq ndihme shtese me tastiere ne program", IDC_KEYBOARD_EXTRA,
+                 PROPSHEETPADDING(1), LABELLINE(23) + 3, PROPSHEETWIDTH - PROPSHEETPADDING(2), 14
+END
+
+IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "ZÃ«"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "SoundSentry", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1)
+    LTEXT "Perdor SoundSentry nese doni qe Reactos te gjeneroj gabime vizuale kur sistemi juaj jep nje zÃ«.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor &SoundSentry", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14
+    LTEXT "Perdor gabimet e metejshme:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1)
+    COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "ShowSounds", -1, PROPSHEETPADDING(1), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2
+    LTEXT "Perdor ShowSounds ti thuash programit te shfaq rregjistrimin per shkrim dhe ze qe bejne.",
+          -1, PROPSHEETPADDING(2), LABELLINE(14) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Use S&howSounds", IDC_SSHOW_BOX, PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+END
+
+IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ekrani"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Kontrast i lartÃ«", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "PÃ«rdoreni kÃ«tÃ« mundÃ«si nÃ«se doni Reactos tÃ« pÃ«rdorni ngjyrat dhe gÃ«rmat projektuar pÃ«r leximin e lehtÃ«.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor kontrast te larte", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    PUSHBUTTON "Konfigurime", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14
+    GROUPBOX "Opsione Kursor", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(13)
+    LTEXT "PÃ«rdorni bare udhÃ« pÃ«r tÃ« modifikuar shpejtÃ«sinÃ« e kursorit dhe gjerÃ«sia e saj.",
+          -1, PROPSHEETPADDING(2), LABELLINE(9) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    CTEXT "Shpejtesi klikimi:", -1, PROPSHEETPADDING(2), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1)
+    LTEXT "Asnje", -1, PROPSHEETPADDING(3), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1)
+    LTEXT "Shpejte", -1, PROPSHEETWIDTH - PROPSHEETPADDING(9), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1)
+    CONTROL "", IDC_CURSOR_BLINK_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,
+            PROPSHEETPADDING(10), LABELLINE(14), PROPSHEETWIDTH - PROPSHEETPADDING(20), LABELLINE(2)
+    CTEXT "GjerÃ«ris e kursorit:", -1, PROPSHEETPADDING(2), LABELLINE(17), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1)
+    LTEXT "NgushtÃ«", -1, PROPSHEETPADDING(3), LABELLINE(18) + 7, PROPSHEETPADDING(6), LABELLINE(1)
+    LTEXT "GjerÃ«", -1, PROPSHEETWIDTH - PROPSHEETPADDING(9), LABELLINE(18) + 7, PROPSHEETPADDING(6), LABELLINE(1)
+    CONTROL "", IDC_CURSOR_WIDTH_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,
+            PROPSHEETPADDING(10), LABELLINE(18) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(20), LABELLINE(2)
+    LTEXT "", IDC_CURSOR_WIDTH_TEXT, PROPSHEETPADDING(3), LABELLINE(16), PROPSHEETPADDING(4), LABELLINE(1) + 5
+END
+
+IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Miu"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "MouseKeys", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "PÃ«rdoreni kÃ«tÃ« mundÃ«si nÃ«se doni pÃ«r tÃ« kontrolluar treguesin me tastiera numerike tÃ« tastierÃ«s tuaj.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor &MouseKeys", IDC_MOUSE_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    PUSHBUTTON "Konfigurime", IDC_MOUSE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14
+END
+
+IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Reseto Automatikisht", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5)
+    AUTOCHECKBOX "Fik karakteristika tÃ« aksesueshmÃ«risÃ« pas pushimit pÃ«r:",
+                 IDC_RESET_BOX, PROPSHEETPADDING(2), LABELLINE(2) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Njoftim", -1, PROPSHEETPADDING(1), LABELLINE(7) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5)
+    AUTOCHECKBOX "DÃ«rgo mesazh paralajmÃ«rim kur kthyer njÃ« funksion nÃ«", IDC_NOTIFICATION_MESSAGE,
+                 PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    AUTOCHECKBOX "BÃ«ni njÃ« tingull kur duke e kthyer njÃ« tipar ose Ã§aktivizuar", IDC_NOTIFICATION_SOUND,
+                 PROPSHEETPADDING(2), LABELLINE(10) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    GROUPBOX "PjesÃ« SerialKey", -1, PROPSHEETPADDING(1), LABELLINE(13) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5)
+    LTEXT "Pjeset SerialKey lejojnÃ« karakteristika alternative pÃ«r tastierÃ«n dhe miun.",
+          -1, PROPSHEETPADDING(2), LABELLINE(14) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    AUTOCHECKBOX "Suport &SerialKey devices", IDC_SERIAL_BOX, PROPSHEETPADDING(2), LABELLINE(16) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    PUSHBUTTON "Konfigurime", IDC_SERIAL_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(16) - 4, PROPSHEETPADDING(15), 14
+    GROUPBOX "Opsione Administrative", -1, PROPSHEETPADDING(1), LABELLINE(19) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5)
+    AUTOCHECKBOX "Aplikoni tÃ« gjitha parametrat pÃ«r l&ogon desktop", IDC_ADMIN_LOGON_BOX,
+                 PROPSHEETPADDING(2), LABELLINE(20) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    AUTOCHECKBOX "Aplikoni tÃ« gjitha parametrat tÃ« & defaults pÃ«r pÃ«rdoruesit e rinj", IDC_ADMIN_USERS_BOX,
+                 PROPSHEETPADDING(2), LABELLINE(22) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+END
+
+IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurimet Sticky Keys"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Keys", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "Shtypni SHIFT-Key 5 here qe te aktivizoni tiparet Sticky Keys.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "A&ktivizo sticky keys", IDC_STICKY_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    GROUPBOX "Opsione", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1)
+    AUTOCHECKBOX "&Shtypni Ã§elesin modifikues dy herÃ« pÃ«r tÃ« kyÃ§ur", IDC_STICKY_LOCK_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    AUTOCHECKBOX "Kthejeni StickyKeys off nÃ«se dy Ã§elÃ«sat janÃ« tÃ« shtypur nÃ« tÃ« njÃ«jtÃ«n kohÃ«", IDC_STICKY_UNLOCK_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(12), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    GROUPBOX "Njoftim", -1, PROPSHEETPADDING(1), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1)
+    AUTOCHECKBOX "BÃ«ni tinguj kur Ã§elÃ«si modifikues Ã«shtÃ« i shtypur", IDC_STICKY_SOUND_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    AUTOCHECKBOX "&Shfaq statusin e StickyKeys ne ekran", IDC_STICKY_STATUS_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(18), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Filtro Konfigurim Ã‡elesat"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Keyboard shortcut", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "Menyra e shpejt per FilterKeys Ã«shtÃ«:  \nShtyp down <Right Shift> per tete sekonda.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdorim i shortcut", IDC_FILTER_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14
+    GROUPBOX "Opsione te filtruara", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(8) + 5
+    AUTORADIOBUTTON "ShpÃ«rfill taste tÃ« pÃ«rsÃ«ritura", IDC_FILTER_BOUNCE_RADIO,
+                    PROPSHEETPADDING(2), LABELLINE(9) + 7, PROPSHEETPADDING(20), LABELLINE(1), WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "ShpÃ«rfill taste tÃ« shpejtÃ« dhe ngadalÃ«so normÃ«n e pÃ«rsÃ«ritur", IDC_FILTER_REPEAT_RADIO,
+                    PROPSHEETPADDING(2), LABELLINE(11) + 5, PROPSHEETPADDING(20), LABELLINE(2), BS_TOP | BS_MULTILINE
+    PUSHBUTTON "Konfigurime", IDC_FILTER_BOUNCE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(9) + 5, PROPSHEETPADDING(15), 14, WS_GROUP
+    PUSHBUTTON "Konfigurime", IDC_FILTER_REPEAT_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(11) + 5, PROPSHEETPADDING(15), 14, WS_GROUP
+    LTEXT "Kliko kÃ«tu dhe shkruani kÃ«tu pÃ«r tÃ« testuar parametrat:", -1, PROPSHEETPADDING(2), LABELLINE(14) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1)
+    EDITTEXT IDC_FILTER_TEST_EDIT, PROPSHEETPADDING(2), LABELLINE(15) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14, WS_GROUP | ES_AUTOHSCROLL
+    GROUPBOX "Njoftim", -1, PROPSHEETPADDING(1), LABELLINE(17) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + 3
+    AUTOCHECKBOX "Beep kur Ã§elÃ«sat u shtypen apo u pranuan", IDC_FILTER_SOUND_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(19), PROPSHEETWIDTH - PROPSHEETPADDING(4), 10
+    AUTOCHECKBOX "Shfaq statusin FilterKey nÃ« ekran", IDC_FILTER_STATUS_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(20) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(4), 10
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurime Toggle Keys"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Keyboard shortcut", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "Menyra e shpejt per ToggleKeys Ã«shtÃ«: \nShtyp down <Num Lock> per pese sekonda.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor &shortcut", IDC_TOGGLE_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurime i Kontrastit te Larte"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Keyboard shortcut", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "Menyra e shpejte per High Contrast Ã«shtÃ«:  \nShtyp <Left Alt+Left Shift+Print Screen>.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor shortcut", IDC_CONTRAST_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    GROUPBOX "Skema e lart e ngjyrave te kontrastit", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1)
+    LTEXT "Skema e ngjyrave aktuale:", -1, PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1)
+    COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6),
+             CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurimi i Ã‡elesave te Miut"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Keyboard shortcut", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1)
+    LTEXT "Menyra e shpejte per Mouse Keys Ã«shtÃ«:  \nShtyp <Left Alt+Left Shift+Num Lock>.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3)
+    AUTOCHECKBOX "Perdor shortcut", IDC_MOUSEKEYS_ACTIVATE_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    GROUPBOX "Shpejtesia e treguesit", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(9)
+    LTEXT "Shpejtesi e Larte:", -1, PROPSHEETPADDING(2), LABELLINE(10) + 4, PROPSHEETPADDING(8), LABELLINE(1)
+    LTEXT "Ulet", -1, PROPSHEETPADDING(11), LABELLINE(10) + 4, PROPSHEETPADDING(3), LABELLINE(1)
+    CONTROL "", IDC_MOUSEKEYS_SPEED_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,
+            PROPSHEETPADDING(15), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(22), LABELLINE(2)
+    LTEXT "Larte", -1, PROPSHEETWIDTH - PROPSHEETPADDING(7), LABELLINE(10) + 4, PROPSHEETPADDING(3), LABELLINE(1)
+    LTEXT "PÃ«rshpejtim:", -1, PROPSHEETPADDING(2), LABELLINE(13) + 4, PROPSHEETPADDING(8), LABELLINE(1)
+    LTEXT "Ngadal", -1, PROPSHEETPADDING(11), LABELLINE(13) + 4, PROPSHEETPADDING(3), LABELLINE(1)
+    CONTROL "", IDC_MOUSEKEYS_ACCEL_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,
+            PROPSHEETPADDING(15), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(22), LABELLINE(2)
+    LTEXT "Shpejt", -1, PROPSHEETWIDTH - PROPSHEETPADDING(7), LABELLINE(13) + 4, PROPSHEETPADDING(3), LABELLINE(1)
+    AUTOCHECKBOX "Mbaj te shtypur Ctrl tÃ« shepjtoni dhe Shift tÃ« ngadalsoni", IDC_MOUSEKEYS_SPEED_CHECK,
+                 PROPSHEETPADDING(2), LABELLINE(16), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    LTEXT "Perdor MouseKeys kur NumLock Ã«shtÃ«:", -1, PROPSHEETPADDING(1), LABELLINE(18) + 7, PROPSHEETPADDING(20), LABELLINE(1)
+    AUTORADIOBUTTON "O&n", IDC_MOUSEKEYS_ON_RADIO, PROPSHEETWIDTH - PROPSHEETPADDING(14), LABELLINE(18) + 7, PROPSHEETPADDING(5), LABELLINE(1)
+    AUTORADIOBUTTON "Of&f", IDC_MOUSEKEYS_OFF_RADIO, PROPSHEETWIDTH - PROPSHEETPADDING(8), LABELLINE(18) + 7, PROPSHEETPADDING(5), LABELLINE(1)
+    AUTOCHECKBOX "&Shfaq statusin e MouseKey ne ekran", IDC_MOUSEKEYS_STATUS_CHECK,
+                 PROPSHEETPADDING(1), LABELLINE(20) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurime te Avancuara FilterKeys"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Bounce Keys", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5)
+    LTEXT "ShpÃ«rfill taste tÃ« pÃ«rsÃ«ritura mÃ« shpejt se:", -1, PROPSHEETPADDING(2), LABELLINE(2) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    LTEXT "ZonÃ« prove:", -1, PROPSHEETPADDING(1), LABELLINE(7) + 3, PROPSHEETPADDING(8), LABELLINE(1)
+    EDITTEXT IDC_BOUNCE_TEST_EDIT, PROPSHEETPADDING(10), LABELLINE(7), PROPSHEETWIDTH - PROPSHEETPADDING(11), 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurime te Avancuara FilterKeys"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "PÃ«rsÃ«riteni Ã‡elesin", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(12)
+    LTEXT "Mbishkruaj konfigurimet nÃ« panelin e kontrollit te tastieres:",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    AUTORADIOBUTTON "Jo perseritje tastiere", IDC_REPEAT_NOREPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(3) + 3, 78, LABELLINE(1), WS_GROUP
+    AUTORADIOBUTTON "Ngadalso normat e pÃ«rsÃ«ritjes se tastieres", IDC_REPEAT_REPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(4) + 7, 131, LABELLINE(1)
+    LTEXT "pÃ«rsÃ«ritje vonesÃ«:", -1, PROPSHEETPADDING(4), LABELLINE(6) + 4, PROPSHEETPADDING(10), LABELLINE(1)
+    COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(6), LABELLINE(6),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    LTEXT "ShkallÃ« PÃ«rsÃ«ritje:", -1, PROPSHEETPADDING(4), LABELLINE(9) + 6, PROPSHEETPADDING(10), LABELLINE(1)
+    COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10) + 8, PROPSHEETWIDTH - PROPSHEETPADDING(6), LABELLINE(7),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Ã‡eles Ngadalte", -1, PROPSHEETPADDING(1), LABELLINE(14), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + 4
+    LTEXT "Ã‡elesi duhet tÃ« mbahet poshtÃ« pÃ«r:", -1, PROPSHEETPADDING(2), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1)
+    COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16) + 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(8),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    LTEXT "ZonÃ« Prove:", -1, PROPSHEETPADDING(1), LABELLINE(20), PROPSHEETPADDING(8), LABELLINE(1)
+    EDITTEXT IDC_REPEAT_TEST_EDIT, PROPSHEETPADDING(10), LABELLINE(19) + 7, PROPSHEETWIDTH - PROPSHEETPADDING(11), 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurime SerialKeys"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Ã‡elesa Serial", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10)
+    LTEXT "Zgjidhni portin ku ju lidheni dispozitivin alternativ tÃ« dhÃ«na.",
+          -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    LTEXT "&Serial port:", -1, PROPSHEETPADDING(2), LABELLINE(3) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4) + 7, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    LTEXT "Shkalla Baud:", -1, PROPSHEETPADDING(2), LABELLINE(7), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2)
+    COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(8),
+             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLSYSTEMNAME "Mundesi"
+    IDS_CPLSYSTEMDESCRIPTION "Ndryshon karakteristika tÃ« aksesueshmÃ«risÃ« pÃ«r kompjuterin tuaj."
+    IDS_SENTRY_NONE "[Asnje]"
+    IDS_SENTRY_TITLE "Pastro panelin"
+    IDS_SENTRY_WINDOW "Pastro dritaren aktive"
+    IDS_SENTRY_DISPLAY "Pastro desktop"
+    IDS_SECONDS "Seconda"
+    IDS_MINUTES "Minuta"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/access/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/console/CMakeLists.txt
===================================================================
--- dll/cpl/console/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/console/CMakeLists.txt	(copie de travail)
@@ -11,11 +11,13 @@
     font.c
     layout.c
     colors.c
+    console.h)
+
+add_library(console SHARED
+    ${SOURCE}
     console.rc
     ${CMAKE_CURRENT_BINARY_DIR}/console.def)
 
-add_library(console SHARED ${SOURCE})
-
 set_module_type(console win32dll UNICODE)
 
 add_importlibs(console
@@ -26,5 +28,5 @@
     kernel32
     ntdll)
 
-add_pch(console console.h)
+add_pch(console console.h SOURCE)
 add_cd_file(TARGET console DESTINATION reactos/system32 FOR all)
Index: dll/cpl/console/lang/sq-AL.rc
===================================================================
--- dll/cpl/console/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/console/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,158 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+ * DATE OF TR:  04-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Opsione"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Masa Kursorit", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    CONTROL "Vogel", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
+    CONTROL "&Mesem", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
+    CONTROL "Madhe", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
+    GROUPBOX "Shfaq Opsione", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    CONTROL "Dritare", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
+    CONTROL "Monitor Plote", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
+    GROUPBOX "Historiku Komandave", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Buffer Masa:", -1, 14, 101, 70, 12
+    EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
+    LTEXT "&Numri i Buffers:", -1, 14, 124, 70, 12
+    EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
+    CHECKBOX "Hiq Duplikimet e Vjetra", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Modifiko Opsione", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    CHECKBOX "MÃ«nyra e shpejt Modifikimi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    CHECKBOX "MÃ«nyr Futje", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Font"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Dritare Preview:", -1, 10, 10, 94, 10
+    LTEXT "MasÃ«:", -1, 180, 10, 36, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
+    LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+    LTEXT "&Font:", -1, 10, 105, 33, 10
+    CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+    GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
+    LTEXT "Ã‡do krarakter Ã«shtÃ«:", -1, 124, 166, 75, 10
+    LTEXT "pixeli ekranit i gjerÃ«\npixel ekranit i gjatÃ«", -1, 136, 180, 101, 20
+    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
+    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+END
+
+IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Pamja"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Dritare Preview:", -1, 8, 6, 95, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
+    GROUPBOX "Masa e Ekranit Buffer", -1, 130, 12, 115, 50
+    LTEXT "GjerÃ«:", -1, 140, 28, 40, 10
+    LTEXT "GjatÃ«:", -1, 140, 46, 39, 10
+    EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
+            UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
+    EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
+            UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
+    GROUPBOX "Masa Dritares", -1, 130, 65, 115, 47
+    LTEXT "&GjerÃ«:", -1, 140, 78, 39, 10
+    LTEXT "&GjatÃ«:", -1, 140, 95, 37, 10
+    EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
+            UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
+    EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
+            UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
+    GROUPBOX "Pozicioni Dritares", -1, 130, 116, 115, 64
+    LTEXT "&Majtas:", -1, 140, 132, 38, 10
+    LTEXT "&Lart:", -1, 140, 149, 40, 10
+    EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
+            UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
+    EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
+            UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
+    CHECKBOX "Lejo sistemin e &pozicionimit dritares", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+END
+
+IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Ngjyra"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Monitori &Teksti", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10
+    CONTROL "Monitori &Sfond", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
+    CONTROL "&Popup Texkst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
+    CONTROL "Pop&up Sfondi", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
+    GROUPBOX "PÃ«rzgjidh ngjyrat e komponenteve", -1, 105, 6, 140, 60
+    LTEXT "&Kuq:", -1, 135, 18, 30, 10
+    EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
+    LTEXT "&Jeshil:", -1, 135, 34, 30, 10
+    EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
+    LTEXT "&Blu:", -1, 135, 50, 30, 10
+    EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
+    CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
+    CONTROL "", IDC_STATIC_COLOR1, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR2, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR3, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR4, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR5, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR6, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR7, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR8, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR9, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR10, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR11, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR12, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR13, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR14, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR15, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
+    CONTROL "", IDC_STATIC_COLOR16, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
+    GROUPBOX "Preview (monitor)", -1, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
+    GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+END
+
+IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "Apliko Konfigurimet"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "&Apliko Konfigurimet vetem tek dritarja aktuale", IDC_RADIO_APPLY_CURRENT,
+            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
+    CONTROL "&Ruaj Konfigurimet per dritaret e te ardhmes me te njejtin emer", IDC_RADIO_APPLY_ALL,
+            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
+    PUSHBUTTON "Anulo", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Console"
+    IDS_CPLDESCRIPTION "Konfigurim i parametrave te konsole."
+    IDS_APPLY_SHORTCUT_ALL "Modifiko &shkurtimi qe filloj kete dritare"
+    IDS_RASTERFONTS "Raster Fonts"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/console/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/console/console.c
===================================================================
--- dll/cpl/console/console.c	(rÃ©vision 61927)
+++ dll/cpl/console/console.c	(copie de travail)
@@ -111,7 +111,7 @@
     /* Adapted for holding GUI terminal information */
     pConInfo->TerminalInfo.Size = sizeof(GUI_CONSOLE_INFO);
     GuiInfo = pConInfo->TerminalInfo.TermInfo = (PGUI_CONSOLE_INFO)(pConInfo + 1);
-    wcsncpy(GuiInfo->FaceName, L"Fixedsys", LF_FACESIZE); // HACK: !!
+    wcsncpy(GuiInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !!
     // GuiInfo->FaceName[0] = L'\0';
     GuiInfo->FontFamily = FF_DONTCARE;
     GuiInfo->FontSize = 0;
Index: dll/cpl/console/console.rc
===================================================================
--- dll/cpl/console/console.rc	(rÃ©vision 61927)
+++ dll/cpl/console/console.rc	(copie de travail)
@@ -69,6 +69,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/cpl/console/console.h
===================================================================
--- dll/cpl/console/console.h	(rÃ©vision 61927)
+++ dll/cpl/console/console.h	(copie de travail)
@@ -1,10 +1,11 @@
 #ifndef CONSOLE_H__
 #define CONSOLE_H__
 
-#define WIN32_NO_STATUS
 #include <limits.h> // just for UINT_MAX in layout.c
 #include <tchar.h>
 
+#define WIN32_NO_STATUS
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
Index: dll/cpl/intl/intl.rc
===================================================================
--- dll/cpl/intl/intl.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/intl.rc	(copie de travail)
@@ -56,6 +56,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/cpl/intl/CMakeLists.txt
===================================================================
--- dll/cpl/intl/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/intl/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,7 @@
 
 spec2def(intl.cpl intl.spec)
 
-add_library(intl SHARED
+list(APPEND SOURCE
     currency.c
     date.c
     generalp.c
@@ -14,6 +14,10 @@
     languages.c
     advanced.c
     sort.c
+    intl.h)
+
+add_library(intl SHARED
+    ${SOURCE}
     intl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/intl.def)
 
@@ -29,5 +33,5 @@
     kernel32
     ntdll)
 
-add_pch(intl intl.h)
+add_pch(intl intl.h SOURCE)
 add_cd_file(TARGET intl DESTINATION reactos/system32 FOR all)
Index: dll/cpl/intl/lang/ru-RU.rc
===================================================================
--- dll/cpl/intl/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -196,15 +196,16 @@
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR "ÐžÑˆÐ¸Ð±ÐºÐ°"
+    IDS_ERROR_SYMBOL_SEPARATE "ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»ÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð´Ð°Ñ‚Ñ‹ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð¼Ð²Ð¾Ð»(Ñ‹)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð´Ð°Ñ‚Ñ‹ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð¼Ð²Ð¾Ð»(Ñ‹)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "Ð”Ð»Ð¸Ð½Ð½Ñ‹Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð´Ð°Ñ‚Ñ‹ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð¼Ð²Ð¾Ð»(Ñ‹)"
+    IDS_ERROR_OEM_CODE_PAGE "Ð’Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¿Ñ€Ð¸ Ñ‡Ñ‚ÐµÐ½Ð¸Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹ OEM"
+    IDS_ERROR_ANSI_CODE_PAGE "Ð’Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¿Ñ€Ð¸ Ñ‡Ñ‚ÐµÐ½Ð¸Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹ ANSI"
+    IDS_ERROR_INT_KEY_REG "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ� ÐºÐ»ÑŽÑ‡Ð°: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ� ÐºÐ»ÑŽÑ‡Ð°: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ� ÐºÐ»ÑŽÑ‡Ð°: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ� ÐºÐ»ÑŽÑ‡Ð°: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Ð�Ðµ ÑƒÐ´Ð°ÐµÑ‚Ñ�Ñ� Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ input.dll"
 END
+
Index: dll/cpl/intl/lang/es-ES.rc
===================================================================
--- dll/cpl/intl/lang/es-ES.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/es-ES.rc	(copie de travail)
@@ -197,14 +197,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/fr-FR.rc
===================================================================
--- dll/cpl/intl/lang/fr-FR.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/fr-FR.rc	(copie de travail)
@@ -197,14 +197,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/bg-BG.rc
===================================================================
--- dll/cpl/intl/lang/bg-BG.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/bg-BG.rc	(copie de travail)
@@ -195,14 +195,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/de-DE.rc
===================================================================
--- dll/cpl/intl/lang/de-DE.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/de-DE.rc	(copie de travail)
@@ -194,15 +194,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR "Fehler"
+    IDS_ERROR_SYMBOL_SEPARATE "Das eingegebene kurze Datumstrennzeichen enthÃ¤lt falsche Symbole"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "Das eingegebene kurze Datumsformat enthÃ¤lt falsche Symbole"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "Das eingegebene lange Datumsformat enthÃ¤lt falsche Symbole"
+    IDS_ERROR_OEM_CODE_PAGE "Die OEM-Codepage konnte nicht gelesen werden"
+    IDS_ERROR_ANSI_CODE_PAGE "Die ANSI-Codepage konnte nicht gelesen werden"
+    IDS_ERROR_INT_KEY_REG "Der SchlÃ¼ssel HKCU\\Control Panel\\International konnte nicht geÃ¶ffnet werden"
+    IDS_ERROR_DEF_INT_KEY_REG "Der SchlÃ¼ssel HKU\\.DEFAULT\\Control Panel\\International konnte nicht geÃ¶ffnet werden"
+    IDS_ERROR_NLS_KEY_REG "Der SchlÃ¼ssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language konnte nicht geÃ¶ffnet werden"
+    IDS_ERROR_NLS_CODE_REG "Der SchlÃ¼ssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage konnte nicht geÃ¶ffnet werden"
+    IDS_ERROR_INPUT_DLL "input.dll konnte nicht geladen werden"
 END
Index: dll/cpl/intl/lang/cs-CZ.rc
===================================================================
--- dll/cpl/intl/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/cs-CZ.rc	(copie de travail)
@@ -200,14 +200,14 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
Index: dll/cpl/intl/lang/zh-CN.rc
===================================================================
--- dll/cpl/intl/lang/zh-CN.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/zh-CN.rc	(copie de travail)
@@ -199,14 +199,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/uk-UA.rc
===================================================================
--- dll/cpl/intl/lang/uk-UA.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/uk-UA.rc	(copie de travail)
@@ -203,14 +203,14 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
Index: dll/cpl/intl/lang/pl-PL.rc
===================================================================
--- dll/cpl/intl/lang/pl-PL.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/pl-PL.rc	(copie de travail)
@@ -203,14 +203,14 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
Index: dll/cpl/intl/lang/it-IT.rc
===================================================================
--- dll/cpl/intl/lang/it-IT.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/it-IT.rc	(copie de travail)
@@ -197,14 +197,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/no-NO.rc
===================================================================
--- dll/cpl/intl/lang/no-NO.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/no-NO.rc	(copie de travail)
@@ -195,14 +195,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/en-US.rc
===================================================================
--- dll/cpl/intl/lang/en-US.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/en-US.rc	(copie de travail)
@@ -195,14 +195,14 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
Index: dll/cpl/intl/lang/sk-SK.rc
===================================================================
--- dll/cpl/intl/lang/sk-SK.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/sk-SK.rc	(copie de travail)
@@ -201,14 +201,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/he-IL.rc
===================================================================
--- dll/cpl/intl/lang/he-IL.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/he-IL.rc	(copie de travail)
@@ -197,14 +197,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/ro-RO.rc
===================================================================
--- dll/cpl/intl/lang/ro-RO.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/ro-RO.rc	(copie de travail)
@@ -197,14 +197,15 @@
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
 END
+
Index: dll/cpl/intl/lang/tr-TR.rc
===================================================================
--- dll/cpl/intl/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/intl/lang/tr-TR.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -47,11 +47,11 @@
 CAPTION "GeliÅŸmiÅŸ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Evrenlik DÃ¼zgÃ¼lÃ¼ Olmayan Ã‡izeylemler Ä°Ã§in Dil", -1, 5, 5, 234, 90
+    GROUPBOX "Evrenlik Kodlu Olmayan Ã‡izeylemler Ä°Ã§in Dil", -1, 5, 5, 234, 90
     COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT "Bu dizge ayÃ¢rÄ±, Evrenlik DÃ¼zgÃ¼lÃ¼ olmayan Ã§izeylemlerin seÃ§kelerinin ve iletiÅŸim kutularÄ±nÄ±n kendi dillerinde gÃ¶rÃ¼ntÃ¼lenmesini etkinleÅŸtirir. Bu ayar, Evrenlik DÃ¼zgÃ¼lÃ¼ Ã§izeylemleri etkilemez ve bu ayar, bu bilgisayardaki tÃ¼m kullanÄ±cÄ±larÄ± etkiler.", -1, 14, 18, 223, 33
-    LTEXT "Kullanmak istediÄŸiniz Evrenlik DÃ¼zgÃ¼lÃ¼ olmayan Ã§izeylemlerin dil sÃ¼rÃ¼mlerini karÅŸÄ±laÅŸtÄ±rmak iÃ§in bir dil seÃ§iniz:", -1, 14, 55, 223, 18
-    GROUPBOX "DÃ¼zgÃ¼ SayfasÄ± DÃ¶nÃ¼ÅŸtÃ¼rme Ã‡izelgesi", -1, 5, 101, 234, 88
+    LTEXT "Bu dizge ayÃ¢rÄ±, Evrenlik Kodlu olmayan Ã§izeylemlerin seÃ§kelerinin ve iletiÅŸim kutularÄ±nÄ±n kendi dillerinde gÃ¶rÃ¼ntÃ¼lenmesini etkinleÅŸtirir. Bu ayar, Evrenlik Kodlu Ã§izeylemleri etkilemez ve bu ayar, bu bilgisayardaki tÃ¼m kullanÄ±cÄ±larÄ± etkiler.", -1, 14, 18, 223, 33
+    LTEXT "Kullanmak istediÄŸiniz Evrenlik Kodlu olmayan Ã§izeylemlerin dil sÃ¼rÃ¼mlerini karÅŸÄ±laÅŸtÄ±rmak iÃ§in bir dil seÃ§iniz:", -1, 14, 55, 223, 18
+    GROUPBOX "Kod SayfasÄ± DÃ¶nÃ¼ÅŸtÃ¼rme Ã‡izelgesi", -1, 5, 101, 234, 88
     CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
     GROUPBOX "Ã–ntanÄ±mlÄ± KullanÄ±cÄ± HesÃ¢bÄ± AyarlarÄ±", -1, 5, 193, 234, 30
     CHECKBOX "Bu KullanÄ±cÄ±nÄ±n TÃ¼m AyarlarÄ±nÄ± Ã–ntanÄ±mlÄ± Olarak Ayarla", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
@@ -196,15 +196,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR "Error"
-    IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol"
-    IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol"
-    IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page"
-    IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page"
-    IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key"
-    IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key"
-    IDS_ERROR_INPUT_DLL "Can't start input.dll"
+    IDS_ERROR "YanlÄ±ÅŸlÄ±k"
+    IDS_ERROR_SYMBOL_SEPARATE "Girilen kÄ±sa tÃ¢rih ayÄ±racÄ± yanlÄ±ÅŸ simge(ler) iÃ§eriyor."
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "Girilen kÄ±sa tÃ¢rih biÃ§imi yanlÄ±ÅŸ simge(ler) iÃ§eriyor."
+    IDS_ERROR_SYMBOL_FORMAT_LONG "Girilen uzun tÃ¢rih biÃ§imi yanlÄ±ÅŸ simge(ler) iÃ§eriyor."
+    IDS_ERROR_OEM_CODE_PAGE "OEM kod sayfasÄ±nÄ±n okunmasÄ±nda sorun var."
+    IDS_ERROR_ANSI_CODE_PAGE "ANSI kod sayfasÄ±nÄ±n okunmasÄ±nda sorun var."
+    IDS_ERROR_INT_KEY_REG "HKCU\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var."
+    IDS_ERROR_DEF_INT_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var."
+    IDS_ERROR_NLS_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var."
+    IDS_ERROR_NLS_CODE_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var."
+    IDS_ERROR_INPUT_DLL "input.dll baÅŸlatÄ±lamÄ±yor."
 END
Index: dll/cpl/intl/lang/sq-AL.rc
===================================================================
--- dll/cpl/intl/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/intl/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,197 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Alternativa Rajonale"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Standarte dhe formatet", -1, 5, 5, 234, 162
+    LTEXT "Ky opsion ndikon se si disa programe format numrash, monedhat, datat, dhe koha.", -1, 14, 17, 220, 25
+    LTEXT "PÃ«rzgjidhni njÃ« objekt qÃ« tÃ« shkojÃ« me pronat e saj, ose kliko modifiko pÃ«r tÃ« zgjedhur vetÃ« formatet tuaja:", -1, 14, 37, 220, 22
+    COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    PUSHBUTTON "Modifik&o...", IDC_SETUP_BUTTON, 178, 56, 52, 13
+    LTEXT "Shembuj", -1, 14, 73, 70, 10
+    LTEXT "Numer:", -1, 16, 86, 48, 10
+    LTEXT "Monetar:", -1, 16, 101, 48, 10
+    LTEXT "Ora:", -1, 16, 116, 48, 10
+    LTEXT "Data e shkurtÃ«r:", -1, 16, 131, 48, 10
+    LTEXT "Data e gjatÃ«:", -1, 16, 146, 48, 10
+    EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    GROUPBOX "Pozita gjeografike", -1, 5, 172, 234, 55
+    LTEXT "Vendosni vendndodhjen tuaj nÃ« mÃ«nyrÃ« qÃ« disa shÃ«rbime mund tÃ« furnizojnÃ« me informacione lokale, pÃ«r shembull, raportet lajme dhe moti.", -1, 14, 184, 210, 24
+    COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT
+END
+
+IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "GjuhÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "GjuhÃ« teksti hyrese dhe shÃ«rbimet", -1, 5, 5, 234, 52
+    LTEXT "PÃ«r tÃ« parÃ« ose tÃ« ndryshuar gjuhÃ«n ose tekstin dhe mÃ«nyrÃ«n hyrese tÃ« shtypit ""Detaje...""", -1, 12, 15, 220, 18
+    PUSHBUTTON "De&taje...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
+    GROUPBOX "MbÃ«shtetje GjuhÃ« shtesÃ«", -1, 5, 62, 234, 82
+    LTEXT "Shumica e gjuhÃ«ve janÃ« instaluar me parazgjedhje. PÃ«r tÃ« instaluar gjuhÃ« shtesÃ«, zgjidhni kutinÃ« e pÃ«rshtatshme, kontrolloni mÃ« poshtÃ«.", -1, 12, 72, 220, 18
+    CHECKBOX "I&nstalo dokumenta pÃ«r skripta komplekse dhe gjuhÃ«t djathtÃ« nÃ« tÃ« majtÃ«", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
+    CHECKBOX "In&stalo dokumentat pÃ«r gjuhÃ«t e AzisÃ« Lindore", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
+END
+
+IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Avancuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "GjuhÃ« pÃ«r programe jo-Unicode", -1, 5, 5, 234, 90
+    COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT
+    LTEXT "Ky sistem mundÃ«son vendosjen programet jo-Unicode pÃ«r tÃ« shfaqur menutÃ« dhe dialogun nÃ« gjuhÃ«n e tyre amtare. Kjo nuk ndikon programe Unicode, por kjo vlen pÃ«r tÃ« gjithÃ« pÃ«rdoruesit e kÃ«tij kompjuteri.", -1, 14, 18, 223, 33
+    LTEXT "Zgjidhni njÃ« gjuhÃ« qÃ« tÃ« pÃ«rputhet me Versionin e gjuhÃ«s sÃ« programeve jo-Unicode qÃ« ju doni tÃ« pÃ«rdorni pÃ«rdorni:", -1, 14, 55, 223, 18
+    GROUPBOX "Tabela konvertimit dhe kodet e faqeve ", -1, 5, 101, 234, 88
+    CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
+    GROUPBOX "Konfigurimi llogarise pÃ«rdoruesit parazgjedhur", -1, 5, 193, 234, 30
+    CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
+END
+
+IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Numrat"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "ShÃ«mbuj modeli", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE
+    LTEXT "Pozitive:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "Simboli &Decimal:", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "Nr. i digi&tal pas decimalit:", -1, 8, 83, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "ShifÃ« &grupimi simboli:", -1, 8, 100, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "Sh&ifÃ«r grupimi:", -1, 8, 117, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "ShenjÃ« simboli N&egative:", -1, 8, 134, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "Number &formati negative:", -1, 8, 149, 100, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "Shfaq &zerot kryesore:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Listo ndarÃ«sit:", -1, 8, 181, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Matja Sistemit:", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "MonedhÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "ShÃ«mbuj modeli", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE
+    LTEXT "Pozitive:", -1, 13, 21, 27, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "Negative:", -1, 120, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "Simboli MonetarÃ«:", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Sasia Pozitive:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Sasia Negative:", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "NdarÃ«si &Decimal:", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Numri i shifrave i pjesshÃ«m:", -1, 10, 128, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Grupimi simboleve:", -1, 10, 156, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    LTEXT "Grupim Sh&ifrash:", -1, 10, 173, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ora"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "ShÃ«mbuj modeli", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE
+    LTEXT "ShÃ«mbuj Kohe:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "Formati &Ores:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "NdarÃ«si &orÃ«s:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "Simbolet A&M:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "Simbolet &PM:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP
+    COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE
+    LTEXT "ShÃ«nim Format kohe\n\n\
+o = orÃ«    m = minuta    s = seconda    t = am ose pm\n\n\
+o = 12 orÃ«   O = 24 orÃ«\n\
+oo, mm, ss = zero kryesore   o, m, s = ska zero kryesore", -1, 13, 150, 214, 50, WS_CHILD | WS_VISIBLE | WS_GROUP
+END
+
+IDD_DATEPAGE DIALOGEX 0, 0, 246, 234
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Data"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Kalendari", -1, 7, 7, 230, 74
+    LTEXT "NÃ«se viti Ã«shtÃ« shkruar si dy shifra, atÃ«herÃ« supozojmÃ« se Ã«shtÃ« njÃ« vit nÃ« mes tÃ«:", -1, 13, 18, 215, 8
+    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED
+    LTEXT "shto", -1, 55, 32, 17, 8
+    EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
+    CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12
+    LTEXT "Tipi Kalendarit:", -1, 13, 48, 56, 10
+    COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    LTEXT "Kalendari musliman:", -1, 13, 65, 60, 12
+    COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Format shkurtÃ«r date", -1, 7, 83, 230, 81
+    LTEXT "ShÃ«mbull:", -1, 13, 95, 63, 10
+    EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "ShÃ«mbull - lexo djathtas nÃ« tÃ« masjtÃ«:", -1, 13, 109, 60, 16
+    EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED
+    LTEXT "Format shkurtÃ«r:", -1, 13, 131, 60, 10
+    COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Komponente ndarÃ«s date:", -1, 13, 148, 113, 10
+    COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    GROUPBOX "Format gjatÃ« date", -1, 7, 167, 230, 64
+    LTEXT "ShÃ«mbull:", -1, 13, 179, 61, 10
+    EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "ShÃ«mbull - lexo djathtas nÃ« tÃ« masjtÃ«:", -1, 13, 193, 61, 16
+    EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED
+    LTEXT "Format gjatÃ«:", -1, 13, 215, 60, 10
+    COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+END
+
+IDD_SORTPAGE DIALOGEX 0, 0, 246, 234
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Klasifikim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Klasifikim", -1, 7, 7, 230, 74
+    LTEXT "Metodat e klasifikimit pÃ«rcaktojnÃ« rendin klasifikues tÃ« karaktereve, fjalÃ«, dokumenta dhe dosjet.", -1, 14, 17, 220, 25
+    LTEXT "PÃ«rzgjidhni njÃ« mÃ«nyrÃ« pÃ«r klasifikim e gjuhÃ«s tuaj:", -1, 14, 37, 220, 22
+    COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CUSTOMIZE_TITLE "Rregullo Alternativat Rajonale"
+    IDS_SPAIN "Spanjisht (Spain)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Alternativat Rajonale"
+    IDS_CPLDESCRIPTION "Zgjidhni gjuhÃ«n dhe formatin e numrave, monedhat, orÃ«n dhe datÃ«n."
+END

Modification de propriÃ©tÃ©s sur dll/cpl/intl/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/intl/intl.h
===================================================================
--- dll/cpl/intl/intl.h	(rÃ©vision 61927)
+++ dll/cpl/intl/intl.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _INTL_H
+#define _INTL_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -114,4 +117,4 @@
 /* kblayouts.c */
 VOID AddNewKbLayoutsByLcid(LCID Lcid);
 
-/* EOF */
+#endif /* _INTL_H */
Index: dll/cpl/mmsys/mmsys.rc
===================================================================
--- dll/cpl/mmsys/mmsys.rc	(rÃ©vision 61927)
+++ dll/cpl/mmsys/mmsys.rc	(copie de travail)
@@ -102,6 +102,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
Index: dll/cpl/mmsys/CMakeLists.txt
===================================================================
--- dll/cpl/mmsys/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/mmsys/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,16 @@
 
 spec2def(mmsys.cpl mmsys.spec)
 
-add_library(mmsys SHARED
+list(APPEND SOURCE
     mmsys.c
     sounds.c
     volume.c
     audio.c
     voice.c
+    mmsys.h)
+
+add_library(mmsys SHARED
+    ${SOURCE}
     mmsys.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
 
@@ -27,5 +31,5 @@
     kernel32
     comdlg32)
 
-add_pch(mmsys mmsys.h)
+add_pch(mmsys mmsys.h SOURCE)
 add_cd_file(TARGET mmsys DESTINATION reactos/system32 FOR all)
Index: dll/cpl/mmsys/mmsys.h
===================================================================
--- dll/cpl/mmsys/mmsys.h	(rÃ©vision 61927)
+++ dll/cpl/mmsys/mmsys.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MMSYS_H
+#define _MMSYS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -79,4 +82,4 @@
              WPARAM wParam,
              LPARAM lParam);
 
-/* EOF */
+#endif /* _MMSYS_H */
Index: dll/cpl/mmsys/lang/ru-RU.rc
===================================================================
--- dll/cpl/mmsys/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/mmsys/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_VOLUME DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -170,7 +170,7 @@
     LTEXT "Ð­Ñ‚Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð²Ð¾Ñ�Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð·Ð²ÑƒÐº Ð¿Ð¾ÐºÐ° Ñ�Ð»ÑƒÐ¶Ð±Ð° Ð·Ð²ÑƒÐºÐ° ReactOS Ð½Ðµ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°.", 10245, 60, 25, 150, 40
     AUTOCHECKBOX "&Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð—Ð²ÑƒÐº ReactOS", 10253, 60, 68, 150, 9
     LTEXT "ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ�", 10246, 58, 87, 150, 9
-    LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40
+    LTEXT "1. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ�Ñ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ñ�Ñ‚Ñƒ Ñ�Ð»ÑƒÐ¶Ð±Ñƒ. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð²Ð¾ÑˆÐ»Ð¸ Ð² Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ�Ñ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°, Ð²Ð°Ð¼ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð²Ð²ÐµÑ�Ñ‚Ð¸ Ð¸Ð¼Ñ� Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ�Ñ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°.", 10247, 60, 100, 150, 40
     LTEXT "2. ÐŸÐ¾Ñ�Ð»Ðµ Ñ‚Ð¾Ð³Ð¾, ÐºÐ°Ðº Ð²Ñ‹ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ Ð—Ð²ÑƒÐº ReactOS, Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€.", 10248, 60, 140, 150, 40
 END
 
@@ -223,9 +223,9 @@
 BEGIN
     GROUPBOX "Ð—Ð²ÑƒÐº ReactOS", 10259, 7, 5, 213, 192
     ICON 4394, 10257, 25, 25, 20, 20
-    LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50
+    LTEXT "ReactOS Ñ�ÐµÑ€Ð²Ð¸Ñ� Audio Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½. ÐžÐ´Ð½Ð°ÐºÐ¾, Ð·Ð²ÑƒÐº Ð¼Ð¾Ð¶ÐµÑ‚ Ð½Ðµ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð¾Ð»Ð¶Ð½Ñ‹Ð¼ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼, Ð¿Ð¾ÐºÐ° Ð²Ñ‹ Ð½Ðµ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ ReactOS. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ñ�ÐµÐ¹Ñ‡Ð°Ñ�, Ñ�Ð½Ð°Ñ‡Ð°Ð»Ð° Ñ�Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¸ Ð·Ð°ÐºÑ€Ð¾Ð¹Ñ‚Ðµ Ð²Ñ�Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹.", 10261, 60, 25, 150, 50
     LTEXT "Ð”Ð»Ñ� Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ ReactOS Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ""OK"".", 10262, 60, 75, 150, 20
-    LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40
+    LTEXT "Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐžÑ‚Ð¼ÐµÐ½Ð°, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ ReactOS Ð¿Ð¾Ð·Ð¶Ðµ.", 10263, 60, 100, 150, 40
 END
 
 STRINGTABLE
Index: dll/cpl/mmsys/lang/tr-TR.rc
===================================================================
--- dll/cpl/mmsys/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/mmsys/lang/tr-TR.rc	(copie de travail)
@@ -251,7 +251,7 @@
     5837 "Yeni E-Posta Bildirimi"
     5838 "Gezinmeyi BaÅŸlatma"
     5839 "Ã‡izeylem AÃ§ma"
-    5840 "YazdÄ±rma TamamlandÄ±"
+    5840 "YazdÄ±rma Bitirildi"
     5841 "AÅŸaÄŸÄ± Geri Getirme"
     5842 "YukarÄ± Geri Getirme"
     5843 "YÄ±ldÄ±z Ä°mi"
Index: dll/cpl/mmsys/lang/sq-AL.rc
===================================================================
--- dll/cpl/mmsys/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/mmsys/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,271 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_VOLUME DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Volumi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32
+    LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20
+    GROUPBOX "Volumi PjesÃ«s", -1, 7, 30, 230, 100
+    CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32
+    CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14
+    LTEXT "PoshtÃ«", -1, 62, 66, 30, 9
+    LTEXT "Lart", -1, 195, 66, 30, 9
+    CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10
+    CHECKBOX "Vendos &ikonen volumit nÃ« tabele", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10
+    PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BTN, 150, 105, 75, 15
+    GROUPBOX "Konfigurimi Boxeve", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70
+    LTEXT "PÃ«rdor konfigurimet e mÃ«poshtme pÃ«r tÃ« ndryshuar volumin individual to boxeve dhe konfigurimet tÃ« tjera.", -1, 70, 155, 150, 36
+    PUSHBUTTON "&Volumi boxeve...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
+    PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
+END
+
+IDD_SOUNDS DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "ZÃ«ri"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NjÃ« skemÃ« zÃ«ri Ã«shtÃ« njÃ« nderim zÃ«rash qÃ« aplikohen nÃ« evente nÃ« programet e ReactOS. Mund tÃ« zgjidhni njÃ« skemÃ« ekzistuese ose tÃ« ruani njÃ« qÃ« keni modifikuar.", -1, 8, 7, 230, 30
+    LTEXT "S&kema zÃ«ri:", -1, 8, 42, 150, 9
+    COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Ruaj Si...", IDC_SAVEAS_BTN, 134, 70, 50, 15
+    PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 188, 70, 50, 15
+    LTEXT "PÃ«r tÃ« ndryshuar zÃ«rin, klikoni njÃ« ngjarje programi nÃ« listÃ«n e mÃ«poshtme dhe pastaj pÃ«rzgjidhni njÃ« tingull pÃ«r tÃ« aplikuar. Ju mund tÃ« ruani ndryshimet si njÃ« skemÃ« tÃ« re.", -1, 8, 90, 230, 27
+    LTEXT "Evente &Programi:", -1, 8, 118, 150, 9
+    CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE
+    LTEXT "&ZÃ«ri:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
+    PUSHBUTTON "&Shfleto...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
+END
+
+IDD_AUDIO DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Audio"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "RidÃ«gjim zÃ«ri", -1, 7, 7, 230, 60
+    ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32
+    LTEXT "&Pajisje parazgjedhur:", -1, 50, 20, 80, 9
+    COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST
+    PUSHBUTTON "&Volumi...", IDC_VOLUME1_BTN, 85, 47, 70, 15
+    PUSHBUTTON "Ava&cuar...", IDC_ADV2_BTN, 160, 47, 70, 15
+    GROUPBOX "Regjistrim zÃ«ri", -1, 7, 75, 230, 60
+    ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32
+    LTEXT "Pajisje parazgjedhur:", -1, 50, 88, 80, 9
+    COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST
+    PUSHBUTTON "V&olumi...", IDC_VOLUME2_BTN, 85, 115, 70, 15
+    PUSHBUTTON "Avan&cuar...", IDC_ADV1_BTN, 160, 115, 70, 15
+    GROUPBOX "RidÃ«gjo musik MIDI", -1, 7, 145, 230, 60
+    ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32
+    LTEXT "Pajisje parazgjedhur:", -1, 50, 158, 80, 9
+    COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST
+    PUSHBUTTON "Volu&mi...", IDC_VOLUME3_BTN, 85, 185, 70, 15
+    PUSHBUTTON "Rr&eth...", IDC_ADV3_BTN, 160, 185, 70, 15
+    CHECKBOX "&PÃ«rdor vetem Pajisje parazgjedhur", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10
+END
+
+IDD_VOICE DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "ZÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "KÃ«to konfigurime kontrollojne volumin dhe opsione tÃ« avancuara pÃ«r ridÃ«gjimin e zÃ«rit ose pajisjes regjistrimi qÃ« keni zgjedhur.", -1, 8, 7, 230, 40
+    GROUPBOX "Ridegjim zÃ«ri", -1, 7, 37, 230, 60
+    ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32
+    LTEXT "&Pajisje parazgjedhur:", -1, 50, 50, 80, 9
+    COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST
+    PUSHBUTTON "&Volumi...", IDC_VOLUME4_BTN, 85, 77, 70, 15
+    PUSHBUTTON "Ava&ncuar...", IDC_ADV4_BTN, 160, 77, 70, 15
+    GROUPBOX "Regjistrim zÃ«ri", -1, 7, 105, 230, 60
+    ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32
+    LTEXT "Pajisje parazgjedhur:", -1, 50, 118, 80, 9
+    COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST
+    PUSHBUTTON "V&olumi...", IDC_VOLUME5_BTN, 85, 145, 70, 15
+    PUSHBUTTON "Avan&cuar...", IDC_ADV5_BTN, 160, 145, 70, 15
+    PUSHBUTTON "&Testo pajisjet...", IDC_TEST_HARDWARE, 160, 175, 70, 15
+END
+
+IDD_HARDWARE DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PjesÃ« Elektronike"
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Ruaj SkemÃ«n Si"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Ruaj kÃ«tÃ« skemÃ« si:", -1, 7, 7, 212, 9
+    EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 157, 36, 60, 14
+END
+
+IDD_SPEAKERS DIALOG 0, 0, 257, 204
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Box"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 4379, -1, 7, 8, 20, 20
+    LTEXT "Zgjidhni konfigurimin e boxeve qÃ« Ã«shtÃ« konfigurimi mÃ« i pÃ«rafÃ«rt ju keni nÃ« kompjuterin tuaj.", -1, 36, 8, 215, 27
+    CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT
+    LTEXT "Konfigurimi boxeve:", 8502, 53, 169, 55, 10
+    COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Performanca"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "KÃ«to konfigurime kontrollojnÃ« se si ReactOS luan audio. Ata mund tÃ« ju ndihmojnÃ« lidhur me problemet audio.", 8492, 34, 7, 218, 23
+    GROUPBOX "RidÃ«gjin Audio", 8494, 7, 32, 243, 152
+    ICON 4379, 8512, 8, 8, 20, 20
+    LTEXT "&PÃ«rshpejtim Pjeset elektronike:", 8495, 13, 56, 111, 14
+    CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18
+    LTEXT "&CilÃ«si tÃ« normÃ«s te ndÃ«rrimit:", 8496, 13, 123, 103, 14
+    CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18
+    PUSHBUTTON "&Kthe Parazgjedhjen", 5400, 7, 191, 110, 14
+    LTEXT "Asnje", 8497, 128, 56, 21, 10
+    LTEXT "Plot", 8498, 214, 56, 21, 9
+    LTEXT "Mire", 8499, 128, 123, 21, 10
+    LTEXT "MÃ« i'miri", 8500, 214, 123, 23, 9
+    LTEXT "Ky varg pÃ«rshkruan vendosjen e pajisjeve elektronike pÃ«r tÃ« kapur pajisjes", 5399, 13, 145, 227, 21
+    LTEXT "Ky varg pÃ«rshkruan vendosjen e pajisjeve elektronike pÃ«r tÃ« kapur pajisjes", 5398, 13, 78, 227, 22
+END
+
+IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Performanca"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "KÃ«to konfigurime kontrollojnÃ« se si ReactOS luan audio. Ata mund tÃ« ju ndihmojnÃ« lidhur me problemet audio.", 8492, 34, 7, 217, 20
+    GROUPBOX "Audio recording", 8494, 7, 29, 242, 122
+    ICON 4380, 8512, 8, 7, 20, 20
+    LTEXT "&PÃ«rshpejtim Pjeset elektronike:", 8495, 13, 46, 103, 9
+    CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18
+    LTEXT "&CilÃ«si tÃ« normÃ«s te ndÃ«rrimit:", 8496, 13, 103, 103, 9
+    CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18
+    PUSHBUTTON "&Kthe Parazgjedhjen", 5400, 9, 158, 110, 14
+    LTEXT "Asnje", 8497, 125, 46, 24, 10
+    LTEXT "Plot", 8498, 217, 46, 19, 9
+    LTEXT "Mire", 8499, 125, 103, 24, 10
+    LTEXT "MÃ« i'miri", 8500, 217, 103, 19, 9
+    LTEXT "Ky varg pÃ«rshkruan vendosjen e pajisjeve elektronike pÃ«r tÃ« kapur pajisjes", 5399, 13, 125, 222, 21
+    LTEXT "Ky varg pÃ«rshkruan vendosjen e pajisjeve elektronike pÃ«r tÃ« kapur pajisjes", 5398, 13, 68, 218, 24
+END
+
+IDD_SETUP1 DIALOG 0, 0, 227, 206
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "NdÃ«rtimi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192
+    ICON 4393, 10241, 26, 26, 20, 20
+    LTEXT "Ky kompjuter nuk mund tÃ« luajÃ« audio sepse shÃ«rbimi ReactOS Audio nuk Ã«shtÃ« i aktivizuar.", 10245, 60, 25, 150, 40
+    AUTOCHECKBOX "&Aktivizo ReactOS Audio", 10253, 60, 68, 150, 9
+    LTEXT "ShÃ«nime", 10246, 58, 87, 150, 11
+    LTEXT "1. Ju duhet tÃ« jeni njÃ« administrator pÃ«r tÃ« mundÃ«suar kÃ«tÃ« shÃ«rbim. NÃ«se ju nuk jeni tÃ« regjistruar si administrator, ju do tÃ« kÃ«rkohet pÃ«r njÃ« emÃ«r administratori dhe fjalÃ«kalimin.", 10247, 60, 100, 150, 40
+    LTEXT "2. Pasi ta aktivizoni ReactOS Audio ju do tÃ« duhet tÃ« rifilloni kompjuterin.", 10248, 60, 140, 150, 40
+END
+
+IDD_MULTICHANNEL DIALOG 0, 0, 227, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Shum Kanale"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PÃ«rshkrimi shkon kÃ«tu.", 9506, 8, 4, 212, 24
+    LTEXT "Posht", 9473, 65, 31, 14, 8
+    LTEXT "", 9472, 5, 31, 55, 8
+    CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17
+    LTEXT "Lart", 9474, 202, 31, 17, 8
+    LTEXT "Posht", 9477, 65, 50, 14, 8
+    LTEXT "", 9476, 5, 50, 55, 8
+    CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17
+    LTEXT "Lart", 9478, 202, 50, 17, 8
+    LTEXT "Posht", 9481, 65, 69, 14, 8
+    LTEXT "", 9480, 5, 69, 55, 8
+    CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17
+    LTEXT "Lart", 9482, 202, 69, 17, 8
+    LTEXT "Posht", 9485, 65, 88, 14, 8
+    LTEXT "", 9484, 5, 88, 55, 8
+    CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17
+    LTEXT "Lart", 9486, 202, 88, 17, 8
+    LTEXT "Posht", 9489, 65, 107, 14, 8
+    LTEXT "", 9488, 5, 107, 55, 8
+    CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17
+    LTEXT "Lart", 9490, 202, 107, 17, 8
+    LTEXT "Posht", 9493, 65, 126, 14, 8
+    LTEXT "", 9492, 5, 126, 55, 8
+    CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17
+    LTEXT "Lart", 9494, 202, 126, 17, 8
+    LTEXT "Posht", 9497, 65, 145, 14, 8
+    LTEXT "", 9496, 5, 145, 55, 8
+    CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17
+    LTEXT "Lart", 9498, 202, 145, 17, 8
+    LTEXT "Posht", 9501, 65, 164, 14, 8
+    LTEXT "", 9500, 5, 164, 55, 8
+    CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17
+    LTEXT "Lart", 9502, 202, 164, 17, 8
+    AUTOCHECKBOX "&Leviz tÃ« gjitha treguesit e rrÃ«shqitje nÃ« tÃ« njÃ«jtÃ«n kohÃ«", 9504, 5, 185, 216, 9
+    PUSHBUTTON "Kthe &Parazgjedhjen", 9505, 110, 199, 110, 14
+END
+
+IDD_SETUP2 DIALOG 0, 0, 227, 206
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "NdÃ«rtimi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192
+    ICON 4394, 10257, 25, 25, 20, 20
+    LTEXT "ShÃ«rbimi ReactOS Audio Ã«shtÃ« aktivizuar tani. MegjithatÃ«, audio mund tÃ« mos funksionojnÃ« siÃ§ duhet para se ta rinisni ReactOS. NÃ«se ju doni tÃ« rinisni tani, sÃ« pari ruani punÃ«n tuaj dhe mbyllni tÃ« gjitha programet.", 10261, 60, 25, 150, 50
+    LTEXT "PÃ«r tÃ« rifilluar ReactOS, klikoni OK.", 10262, 60, 75, 150, 20
+    LTEXT "NÃ«se Anulo, ju do tÃ« duhet tÃ« rifilloni mÃ« vonÃ« ReactOS Audio qÃ« tÃ« funksionojnÃ« siÃ§ duhet.", 10263, 60, 100, 150, 40
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "ZÃ«ri dhe Pjeset Audio"
+    IDS_CPLDESCRIPTION "Ndryshon skema e zÃ«rit pÃ«r kompjuterin tuaj, ose konfiguron cilÃ«simet pÃ«r boxet tuaja dhe pajisjet e regjistrimit."
+    IDS_NO_SOUND "(Asnje)"
+    IDS_NO_DEVICES "Ska Pajisje"
+    5825 "Gabim programi"
+    5826 "Mbyll programin"
+    5827 "Alarm Baterie Kritike"
+    5828 "Lidh Pajisjen"
+    5829 "Shkeput Pajisjen"
+    5830 "Pajisja SÃ«shtoj nÃ« Lidhje"
+    5831 "Zbraz Koshin"
+    5832 "Alarm Baterie Ulet"
+    5833 "Shto maksimum"
+    5834 "Komanda Menus"
+    5835 "Menu popup"
+    5836 "Minimizo"
+    5837 "Njoftim i ri Mail"
+    5838 "Fillo Navigatorin"
+    5839 "Hap programin"
+    5840 "Printim Mbaroj"
+    5841 "Rikthe Poshte"
+    5842 "Rikthe Lart"
+    5843 "Asterisk"
+    5844 "ZÃ«ri parazgjedhur"
+    5845 "Thirrje"
+    5846 "Dil ReactOS"
+    5847 "Ndalim Kritik"
+    5848 "Njoftimi i Sistemit"
+    5849 "Pyetje"
+    5850 "Fillo ReactOS"
+    5851 "Fillo Menune"
+    5852 "Dil ReactOS"
+    5853 "Hyr ReactOS"
+    5854 "ReactOS Explorer"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/mmsys/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/appwiz/CMakeLists.txt
===================================================================
--- dll/cpl/appwiz/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/appwiz/CMakeLists.txt	(copie de travail)
@@ -8,10 +8,14 @@
 
 spec2def(appwiz.cpl appwiz.spec)
 
-add_library(appwiz SHARED
+list(APPEND SOURCE
     addons.c
     appwiz.c
     createlink.c
+    appwiz.h)
+
+add_library(appwiz SHARED
+    ${SOURCE}
     appwiz.rc
     ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def)
 
@@ -19,5 +23,5 @@
 target_link_libraries(appwiz uuid wine)
 add_importlibs(appwiz urlmon ole32 comctl32 advapi32 shell32 user32 msvcrt kernel32 ntdll)
 add_delay_importlibs(appwiz msi)
-add_pch(appwiz appwiz.h)
+add_pch(appwiz appwiz.h SOURCE)
 add_cd_file(TARGET appwiz DESTINATION reactos/system32 FOR all)
Index: dll/cpl/appwiz/appwiz.h
===================================================================
--- dll/cpl/appwiz/appwiz.h	(rÃ©vision 61927)
+++ dll/cpl/appwiz/appwiz.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _APPWIZ_H
+#define _APPWIZ_H
+
 #include <config.h>
 #include <wine/port.h>
 
@@ -82,4 +85,4 @@
     return ret;
 }
 
-/* EOF */
+#endif /* _APPWIZ_H */
Index: dll/cpl/appwiz/lang/ru-RU.rc
===================================================================
--- dll/cpl/appwiz/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/appwiz/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -51,19 +51,19 @@
 
 STRINGTABLE
 BEGIN
-    IDS_DOWNLOADING     "Downloading..."
-    IDS_INSTALLING      "Installing..."
-    IDS_INVALID_SHA     "Unexpected checksum of downloaded file. Aborting installation of corrupted file."
+    IDS_DOWNLOADING     "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°..."
+    IDS_INSTALLING      "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ°..."
+    IDS_INVALID_SHA     "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¾Ð¹ Ñ�ÑƒÐ¼Ð¼Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°. ÐŸÑ€ÐµÑ€Ñ‹Ð²Ð°Ð½Ð¸Ðµ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°."
 END
 
 ID_DWL_GECKO_DIALOG DIALOG  0, 0, 260, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Wine Gecko Installer"
+CAPTION "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ñ‰Ð¸Ðº Wine Gecko"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.",
+    CONTROL "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð½Ð°Ð¹Ñ‚Ð¸ Wine Gecko Ð¿Ð°ÐºÐµÑ‚, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ Ð´Ð»Ñ� Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ñ� Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ HTML, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾. ReactOS Ð¼Ð¾Ð¶ÐµÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑ�ÐºÐ¸ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð¸ ÑƒÑ�Ñ‚Ð°Ð½Ð°Ð²Ð¸Ñ‚ÑŒ ÐµÐµ Ð´Ð»Ñ� Ð²Ð°Ñ�.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
 END
Index: dll/cpl/appwiz/lang/sq-AL.rc
===================================================================
--- dll/cpl/appwiz/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/appwiz/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,73 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+ * DATE OF TR:  04-12-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Krijo link"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Text1", -1, 115, 15, 160, 24
+    LTEXT "Text2", -1, 115, 35, 160, 17
+END
+
+IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Krijo link"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Text1",-1,10,0,225,40
+    LTEXT "Text2",-1,10,40,120,20
+    LTEXT "Text3",-1,10,55,120,20
+END
+
+IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Krijo Shortcut"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Ky magjistar ju ndihmon pÃ«r tÃ« krijuar shkurtesat pÃ«r tÃ« lokale ose\nprograme networku, dokumenta, dosje, kompjutra, ose adresa\nInterneti.", -1, 120, 15, 200, 30
+    LTEXT "Shkruaj vendndodhjen e sendit:", -1, 120, 50, 120, 10
+    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT
+    PUSHBUTTON "Shfleto...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
+    LTEXT "Klikoni Next pÃ«r tÃ« vazhduar.", -1, 120, 97, 162, 10
+END
+
+IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Zgjidh njÃ« titull pÃ«r Programin"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Shkruaj nje emer per kete shortcut:", -1, 120, 15, 150, 10
+    EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT
+    LTEXT "Kliko Finish per te krijuar njÃ« shortcut.", -1, 118, 97, 178, 17
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLSYSTEMNAME "Shto/Hiq Programe"
+    IDS_CPLSYSTEMDESCRIPTION "NdÃ«rton programe dhe krijon shortcute."
+    IDS_CREATE_SHORTCUT "Krijo Shortcut"
+    IDS_ERROR_NOT_FOUND "Dokumenti %s nuk u gjend."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DOWNLOADING     "Shkarkim..."
+    IDS_INSTALLING      "Instalim..."
+    IDS_INVALID_SHA     "Kontroll i papritur ne shkarkimin e skedarit. Duke lÃ«nÃ« instalimin e dokumentave tÃ« korruptuar."
+END
+
+ID_DWL_GECKO_DIALOG DIALOG  0, 0, 260, 95
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instaluesi Wine Gecko"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "ReactOS nuk mund tÃ« gjej njÃ« paketÃ« Wine Gecko e cila Ã«shtÃ« e nevojshme pÃ«r aplikimet e ngulura HTML tÃ« funksionoj nÃ« rregull. ReactOS mund ta shkarkoje automatikisht dhe ta instalojÃ« pÃ«r ju.",
+          ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
+    CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12
+    DEFPUSHBUTTON "&Instalo", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+END

Modification de propriÃ©tÃ©s sur dll/cpl/appwiz/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/appwiz/createlink.c
===================================================================
--- dll/cpl/appwiz/createlink.c	(rÃ©vision 61927)
+++ dll/cpl/appwiz/createlink.c	(copie de travail)
@@ -391,23 +391,8 @@
     return TRUE;
 }
 
-
 LONG
 CALLBACK
-NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
-{
-    WCHAR szFile[MAX_PATH];
-
-    if (MultiByteToWideChar(CP_ACP, 0, (LPSTR) lParam1, -1, szFile, MAX_PATH))
-    {
-        return ShowCreateShortcutWizard(hwndCPl, szFile);
-    }
-    return -1;
-}
-
-
-LONG
-CALLBACK
 NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
     return ShowCreateShortcutWizard(hwndCPl, (LPWSTR) lParam1);
Index: dll/cpl/appwiz/appwiz.spec
===================================================================
--- dll/cpl/appwiz/appwiz.spec	(rÃ©vision 61927)
+++ dll/cpl/appwiz/appwiz.spec	(copie de travail)
@@ -1,4 +1,4 @@
 @ stdcall CPlApplet(ptr long ptr ptr)
-@ stdcall NewLinkHere(ptr long ptr ptr)
+@ stdcall NewLinkHere(ptr long ptr ptr) NewLinkHereA
 @ stdcall NewLinkHereA(ptr long ptr ptr)
 @ stdcall NewLinkHereW(ptr long ptr ptr)
\ No newline at end of file
Index: dll/cpl/appwiz/rsrc.rc
===================================================================
--- dll/cpl/appwiz/rsrc.rc	(rÃ©vision 61927)
+++ dll/cpl/appwiz/rsrc.rc	(copie de travail)
@@ -52,6 +52,9 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/cpl/powercfg/CMakeLists.txt
===================================================================
--- dll/cpl/powercfg/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/powercfg/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,16 @@
 
 spec2def(powercfg.cpl powercfg.spec)
 
-add_library(powercfg SHARED
+list(APPEND SOURCE
     powercfg.c
     powershemes.c
     alarms.c
     advanced.c
     hibernate.c
+    powercfg.h)
+
+add_library(powercfg SHARED
+    ${SOURCE}
     powercfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
 
@@ -22,5 +26,5 @@
     kernel32
     ntdll)
 
-add_pch(powercfg powercfg.h)
+add_pch(powercfg powercfg.h SOURCE)
 add_cd_file(TARGET powercfg DESTINATION reactos/system32 FOR all)
Index: dll/cpl/powercfg/powercfg.rc
===================================================================
--- dll/cpl/powercfg/powercfg.rc	(rÃ©vision 61927)
+++ dll/cpl/powercfg/powercfg.rc	(copie de travail)
@@ -59,6 +59,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif
Index: dll/cpl/powercfg/lang/tr-TR.rc
===================================================================
--- dll/cpl/powercfg/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/powercfg/lang/tr-TR.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -121,7 +121,7 @@
     IDS_PowerActionHibernate "AnÄ±kta Beklet"
     IDS_PowerActionShutdown "Kapat"
     IDS_PowerActionRestart "Yeniden BaÅŸlat"
-    IDS_PowerActionShutdownOff "Kapat ve Turn the Power Off"
+    IDS_PowerActionShutdownOff "Kapat ve GÃ¼cÃ¼ Kes"
     IDS_PowerActionWarmEject "Ne YapÄ±lacaÄŸÄ±nÄ± Sor"
     IDS_PowerActionNone2 "Yok"
     IDS_TIMEOUT1 "1 DakÃ®ka Sonra"
Index: dll/cpl/powercfg/lang/ru-RU.rc
===================================================================
--- dll/cpl/powercfg/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/powercfg/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-/* Russian translation by Andrey Korotaev (unC0Rr@gmail.com) */
+ï»¿/* Russian translation by Andrey Korotaev (unC0Rr@gmail.com) */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
@@ -140,6 +140,6 @@
     IDS_TIMEOUT14 "Ñ‡ÐµÑ€ÐµÐ· 4 Ñ‡Ð°Ñ�Ð°"
     IDS_TIMEOUT15 "Ñ‡ÐµÑ€ÐµÐ· 5 Ñ‡Ð°Ñ�Ð¾Ð²"
     IDS_TIMEOUT16 "Ð½Ð¸ÐºÐ¾Ð³Ð´Ð°"
-    IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
-    IDS_DEL_SCHEME_TITLE "Delete Scheme"
+    IDS_DEL_SCHEME "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ�Ñ…ÐµÐ¼Ñƒ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ�?"
+    IDS_DEL_SCHEME_TITLE "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¡Ñ…ÐµÐ¼Ñƒ"
 END
Index: dll/cpl/powercfg/lang/sq-AL.rc
===================================================================
--- dll/cpl/powercfg/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/powercfg/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,148 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Skema e EnergjisÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Zgjidhni skemÃ«n energjisÃ« me parametrat mÃ« tÃ« pÃ«rshtatshme pÃ«r kÃ«tÃ« kompjuter. Vini re se ndryshimet e parametrave te mÃ« poshtÃ«m do tÃ« ndryshojÃ« skemÃ«n e zgjedhur.", -1, 37, 6, 209, 36
+    GROUPBOX "Skema e EnergjisÃ«", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Ruaj Si...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "i panjohur", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Kur kompjuteri Ã«shtÃ« i:", IDC_SAT, 12, 109, 60, 12
+    LTEXT "Hyrese nÃ«", IDC_SAC, 123, 110, 45, 15
+    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
+    LTEXT "Punon nÃ« bateri", IDC_SDC, 195, 110, 45, 15
+    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
+    LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi gatishmÃ«risÃ«:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &hibernates:", IDC_HYBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Alarme"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Alarm tÃ« ulÃ«t bateri", -1, 6, 7, 239, 104
+    CONTROL "Aktivizo alarmin e ulÃ«t baterie kur niveli i energjisÃ« arrin:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15
+    LTEXT "i panjohur", IDC_ALARMVALUE1, 209, 20, 33, 10
+    LTEXT "0%", -1, 28, 43, 15, 10
+    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
+    LTEXT "100%", -1, 214, 43, 25, 10
+    PUSHBUTTON "Veprim Alar&mi...", -1, 17, 69, 70, 14, WS_DISABLED
+    LTEXT "Njoftim:", -1, 95, 71, 57, 10
+    LTEXT "i panjohur", IDC_ALARMMSG1, 154, 71, 84, 10
+    LTEXT "Veprim:", -1, 95, 83, 55, 10
+    LTEXT "i panjohur", IDC_ALARMAKTION1, 154, 83, 84, 10
+    LTEXT "Run Program:", -1, 95, 95, 55, 10
+    LTEXT "i panjohur", IDC_ALARMPROG1, 154, 95, 84, 10
+    GROUPBOX "Alarm Kritik baterie", -1, 6, 120, 239, 106
+    CONTROL "Aktivizo alarmin kritik baterie kur niveli i energjisÃ« arrin:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15
+    LTEXT "i panjohur", IDC_ALARMVALUE2, 209, 133, 33, 10
+    LTEXT "0%", -1, 28, 154, 15, 10
+    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
+    LTEXT "100%", -1, 214, 154, 25, 10
+    PUSHBUTTON "Veprim Alar&mi...", -1, 17, 183, 70, 14, WS_DISABLED
+    LTEXT "Njoftim:", -1, 95, 185, 50, 10
+    LTEXT "i panjohur", IDC_ALARMMSG2, 154, 185, 84, 10
+    LTEXT "Veprim:", -1, 95, 198, 45, 10
+    LTEXT "i panjohur", IDC_ALARMAKTION2, 154, 198, 84, 10
+    LTEXT "Ekzekuto Programin:", -1, 95, 211, 50, 10
+    LTEXT "i panjohur", IDC_ALARMPROG2, 154, 211, 84, 10
+END
+
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Advancuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
+    LTEXT "Zgjidhni cilÃ«simet e ruaj-energjinÃ« qÃ« ju doni tÃ« pÃ«rdorni.", -1, 37, 6, 207, 20
+    GROUPBOX "Alternativa", -1, 6, 30, 240, 65
+    CONTROL "GjithmonÃ« shfaq ikonÃ«n nÃ« taskbar", IDC_SYSTRAYBATTERYMETER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 43, 220, 10
+    CONTROL "Shfaq pÃ«r fjalÃ«kalimin kur kompjuteri rifillon nga gatishmÃ«ria", IDC_PASSWORDLOGON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 60, 220, 10
+    CONTROL "&Dim ekranin kur punon nÃ« bateri", IDC_VIDEODIMDISPLAY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 78, 220, 10
+    GROUPBOX "Butonat e Energjise", -1, 6, 101, 240, 127
+    LTEXT "&Kur e mbyllni kapakun e kompjuterit tim portativ:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Kur unÃ« shtypni butonin e energjise nÃ« kompjuterin tim:", IDC_SPOWERBUTTON, 15, 153, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Kur unÃ« shtypni butonin flej nÃ« kompjuterin tim:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Hibernate"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
+    LTEXT "Kur kompjuteri juaj hibernates, ajo ruan Ã§do gjÃ« qÃ« ajo ka nÃ« kujtesÃ«n e nÃ« diskun tuaj tÃ« vÃ«shtirÃ« dhe pastaj mbyllet. Kur kompjuteri juaj vjen nga letargjia, ajo kthehet nÃ« gjendjen e mÃ«parshme. ", -1, 37, 6, 210, 35
+    GROUPBOX "Hibernate", -1, 6, 41, 240, 32
+    CONTROL "MundÃ«so &hibernation", IDC_HIBERNATEFILE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 55, 210, 10
+    GROUPBOX "HapÃ«sirÃ« â€‹â€‹nÃ« disk pÃ«r letargji", -1, 6, 80, 240, 76
+    LTEXT "Hapsira LirÃ« n'disk:", -1, 15, 95, 140, 10
+    LTEXT "i panjohur", IDC_FREESPACE, 160, 95, 80, 10
+    LTEXT "HapÃ«sirÃ« â€‹â€‹nÃ« disk tÃ« nevojshme pÃ«r hibernate:", -1, 15, 115, 140, 10
+    LTEXT "i panjohur", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+    LTEXT "Ju duhet tÃ« lironi njÃ« hapÃ«sirÃ« â€‹â€‹nÃ« disk para se kompjuteri juaj mund tÃ« hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME_1 "Opsionet e energjisÃ«"
+    IDS_CPLDESCRIPTION_1 "Konfiguro parametrat e kursimit tÃ« energjisÃ« pÃ«r kompjuterin tuaj."
+    IDS_PROCENT "%i%%"
+    IDS_SOUND "ZÃ«ri"
+    IDS_TEXT "Teksti"
+    IDS_CONFIG1 "Konfigurimet pÃ«r %1 skema energjise"
+    IDS_CONFIG2 "Konfigurimet Avancuara pÃ«r %1"
+    IDS_SIZEBYTS "%i bytes"
+    IDS_SIZEMB "%i MB"
+    IDS_NOACTION "Mos bÃ«j gjÃ«"
+    IDS_PowerActionNone1 "AsnjÃ« veprim"
+    IDS_PowerActionUnknown "i panjohur"
+    IDS_PowerActionSleep "NÃ« pritje"
+    IDS_PowerActionHibernate "Hibernate"
+    IDS_PowerActionShutdown "Fik"
+    IDS_PowerActionRestart "Rifillo"
+    IDS_PowerActionShutdownOff "Fik dhe hiq energjine"
+    IDS_PowerActionWarmEject "Me pyet Ã§fare te bej"
+    IDS_PowerActionNone2 "Asnje"
+    IDS_TIMEOUT1 "Pas 1 min"
+    IDS_TIMEOUT2 "Pas 2 mins"
+    IDS_TIMEOUT3 "Pas 3 mins"
+    IDS_TIMEOUT4 "Pas 5 mins"
+    IDS_TIMEOUT5 "Pas 10 mins"
+    IDS_TIMEOUT6 "Pas 15 mins"
+    IDS_TIMEOUT7 "Pas 20 mins"
+    IDS_TIMEOUT8 "Pas 25 mins"
+    IDS_TIMEOUT9 "Pas 30 mins"
+    IDS_TIMEOUT10 "Pas 45 mins"
+    IDS_TIMEOUT11 "Pas 1 hour"
+    IDS_TIMEOUT12 "Pas 2 hours"
+    IDS_TIMEOUT13 "Pas 3 hours"
+    IDS_TIMEOUT14 "Pas 4 hours"
+    IDS_TIMEOUT15 "Pas 5 hours"
+    IDS_TIMEOUT16 "KurrÃ«"
+    IDS_DEL_SCHEME "Jeni te sigurte qe doni te fshini skemÃ«n energjise?"
+    IDS_DEL_SCHEME_TITLE "Fshij Skemen"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/powercfg/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/powercfg/powercfg.h
===================================================================
--- dll/cpl/powercfg/powercfg.h	(rÃ©vision 61927)
+++ dll/cpl/powercfg/powercfg.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _POWERCFG_H
+#define _POWERCFG_H
+
 #include <stdarg.h>
 
 #define _INC_WINDOWS
@@ -34,4 +37,4 @@
 INT_PTR CALLBACK AdvancedDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK HibernateDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-/* EOF */
+#endif /* _POWERCFG_H */
Index: dll/cpl/hdwwiz/hdwwiz.rc
===================================================================
--- dll/cpl/hdwwiz/hdwwiz.rc	(rÃ©vision 61927)
+++ dll/cpl/hdwwiz/hdwwiz.rc	(copie de travail)
@@ -67,6 +67,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+	#include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif
Index: dll/cpl/hdwwiz/lang/tr-TR.rc
===================================================================
--- dll/cpl/hdwwiz/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/hdwwiz/lang/tr-TR.rc	(copie de travail)
@@ -139,7 +139,7 @@
 BEGIN
     IDS_CPLNAME "DonanÄ±m Ekle"
     IDS_CPLDESCRIPTION "Bilgisayara donanÄ±m ekler."
-    IDS_SEARCHTITLE "YardÄ±mcÄ±, donanÄ±mÄ± ararken lÃ¼tfen bekleyiniz..."
+    IDS_SEARCHTITLE "YardÄ±mcÄ±, donanÄ±mÄ± ararken bekleyiniz..."
     IDS_SEARCHTEXT "YardÄ±mcÄ±, az Ã¶nce bilgisayara baÄŸlanan ancak daha kurulmayan donanÄ±m iÃ§in arÄ±yor."
     IDS_ISCONNECTED "DonanÄ±m baÄŸlÄ± mÄ±?"
     IDS_PROBELISTTITLE "AÅŸaÄŸÄ±daki donanÄ±m, bilgisayarda Ã¶nceden kurulu."
Index: dll/cpl/hdwwiz/lang/sq-AL.rc
===================================================================
--- dll/cpl/hdwwiz/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/hdwwiz/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,151 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+ * DATE OF TR:  04-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_STARTPAGE DIALOG 0, 0, 317, 186
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Mire se erdhet te Shto Hardware Magjistari", IDC_FINISHTITLE, 114, 8, 203, 24
+    LTEXT "Ky magjistar ju ndihmon ju:", -1, 114, 40, 182, 8
+    LTEXT "1) Instalo software pÃ«r suportin e hardware tuaj ne kompjuter.", -1, 121, 56, 184, 16
+    LTEXT "2) Zgjidh probleme qe mund te keni me hardwarin tuaj.", -1, 121, 78, 185, 16
+    ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20
+    LTEXT "NÃ«se hardware juaj erdhi me CD-ne e instalimit, Ã«shtÃ« e rekomanduar qÃ« ju tÃ« klikoni Anulo pÃ«r tÃ« mbyllur kÃ«tÃ« magjistar dhe tÃ« pÃ«rdorni CD-ne e prodhuesit tÃ« instaloni kÃ«tÃ« hardware.", 503, 150, 106, 155, 50
+    LTEXT "PÃ«r TÃ« vazhduar, kliko Next.", -1, 114, 166, 193, 8
+END
+
+IDD_SEARCHPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32
+    ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20
+END
+
+IDD_ISCONNECTEDPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "A keni lidhur kÃ«tÃ« hardware nÃ« kompjuterin tuaj?", -1, 20, 11, 275, 8
+    AUTORADIOBUTTON "&Po, UnÃ« kam lidhur tashmÃ« hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP
+    AUTORADIOBUTTON "&Jo, UnÃ« nuk e kam shtuar hardware ende", IDC_NOTCONNECTED, 29, 35, 266, 8
+END
+
+IDD_PROBELISTPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Nga lista e meposhtme, pÃ«rzgjidhni njÃ« pajisje hardware instaluar, pastaj klikoni Next pÃ«r tÃ« kontrolluar konfigurimet ose tÃ« troubleshoot njÃ« problem qe ju mund tÃ« keni.", -1, 21, 8, 275, 22
+    LTEXT "PÃ«r tÃ« shtuar hardware qe nuk Ã«shtÃ« ne listÃ«, kliko ""Shto pjese hardware te re.""", -1, 21, 32, 275, 24
+    LTEXT "Hardware i Instaluar:", -1, 21, 62, 140, 8
+    CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66
+END
+
+IDD_SELECTWAYPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Magjistari mund tÃ« kÃ«rkoje pÃ«r kompjutera te tjere dhe automatikisht te instaloje atÃ« per ty. Ose, nÃ« qoftÃ« se ju e dini saktÃ«sisht se cili Ã«shtÃ« modeli i hardwarit ju dÃ«shironi tÃ« instaloni, ju mund tÃ« zgjidhni atÃ« nga lista.", -1, 21, 8, 280, 24
+    LTEXT "Ã‡farÃ« doni magjistar pÃ«r tÃ« bÃ«rÃ«?", -1, 23, 40, 275, 8
+    AUTORADIOBUTTON "&KÃ«rkoni pÃ«r dhe instaloni hardware automatikisht (Rekomandoj)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP
+    AUTORADIOBUTTON "Instalo hardware qÃ« unÃ« pÃ«rzgjedh manualisht nga njÃ« listÃ« (PÃ«rparuar)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP
+END
+
+IDD_DETECTEDHWPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40
+    LTEXT "Zbuluar hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8
+    CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70
+END
+
+IDD_HWTYPESPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NÃ«se ju nuk e shihni kategorinÃ« hardware qÃ« ju dÃ«shironi, klikoni Trego tÃ« gjitha pajisjet.", IDC_STATUSTEXT, 21, 9, 275, 18
+    LTEXT "ZakonshÃ«m &hardware tipet:", IDC_HWTYPESTEXT, 21, 31, 180, 8
+    CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92
+END
+
+IDD_PROGRESSPAGE DIALOG 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ajo mund tÃ« marrÃ« disa minuta pÃ«r tÃ« kÃ«rkuar pÃ«r hardware.", -1, 21, 8, 275, 15
+    LTEXT "Progresi total:", IDC_TPROGRESSTEXT, 21, 25, 275, 8
+    CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14
+    LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX
+    CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8
+END
+
+IDD_FINISHPAGE DIALOG 0, 0, 317, 186
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kompletim i shto magjistarit Hardware", IDC_FINISHTITLE, 114, 8, 203, 24
+    LTEXT "Ju keni pÃ«rfunduar me sukses shtimin e Hardwarit nepermjet magjistarit.", -1, 114, 32, 193, 19
+    LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92
+    LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8
+END
+
+IDD_ISFOUNDPAGE DIALOG 0, 0, 317, 186
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kompletimi i shtimit te Hardware me magjistare", IDC_FINISHTITLE, 114, 8, 203, 24
+    LTEXT "Magjistar gjetur hardware e mÃ«poshtme lidhur me kompjuterin tuaj:", -1, 114, 32, 193, 19
+    LTEXT "PÃ«r tÃ« mbyllur kete magjistare, kliko Finish.", -1, 114, 166, 132, 8
+    CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78
+END
+
+IDD_HWSTATUSPAGE DIALOG 0, 0, 317, 186
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kompletimi i shtimit te Hardware me magjistare", IDC_FINISHTITLE, 114, 8, 195, 28
+    LTEXT "KÃ«tu Ã«shtÃ« statusi aktual i hardware keni zgjedhur:", -1, 114, 40, 193, 19
+    EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "PÃ«r tÃ« nisur njÃ« ekspert qÃ« mund tÃ« ju ndihmojÃ« tÃ« zgjidhur Ã§do problem qÃ« mund tÃ« ketÃ«, klikoni Finish.", -1, 114, 136, 193, 16
+    LTEXT "PÃ«r tÃ« dal nga magjistari, kliko Anulo.", IDC_STATUSTEXT, 114, 166, 132, 8
+END
+
+IDD_NOTCONNECTEDPAGE DIALOG 0, 0, 317, 186
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Hardware Magjistari"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Nuk mund tÃ« vazhdohet Shtimi i Hardware me Magjistare", IDC_FINISHTITLE, 114, 8, 203, 28
+    LTEXT "PÃ«r tÃ« vazhduar, lidhÃ« kÃ«tÃ« hardware nÃ« kompjuterin tuaj.", -1, 114, 40, 193, 16
+    AUTOCHECKBOX "&Fik kompjuterin kur unÃ« klikoj Finish nÃ« mÃ«nyrÃ« qÃ« unÃ« mund tÃ« hap kompjuterin dhe tÃ« lidhe hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE
+    LTEXT "NÃ« shumicÃ«n e rasteve ReactOS automatikisht do tÃ« instalojÃ« hardwarin tuaj, pasi ju lidhni atÃ«. NÃ«se ReactOS nuk e ka gjetur atÃ«, ju mund tÃ« rihapni kÃ«tÃ« magjistar pÃ«r tÃ« instaluar software mbÃ«shtetÃ«s.", -1, 114, 98, 193, 32
+    LTEXT "PÃ«r tÃ« mbyllur kÃ«tÃ« magjistar, kliko Finish.", IDC_STATUSTEXT, 114, 166, 193, 8
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Shto hardware"
+    IDS_CPLDESCRIPTION "Shto hardware nÃ« kompjutrin tuaj."
+    IDS_SEARCHTITLE "Ju lutem prisni ndÃ«rkohÃ« kÃ«rkon magjistari..."
+    IDS_SEARCHTEXT "Ky magjistar Ã«shtÃ« nÃ« kÃ«rkim pÃ«r hardware qÃ« Ã«shtÃ« lidhur me kompjuterin tuaj kohÃ«t e fundit, por ende nuk Ã«shtÃ« instaluar."
+    IDS_ISCONNECTED "A Ã«shtÃ« lidhur hardwari?"
+    IDS_PROBELISTTITLE "Hardware mÃ«poshtÃ«m Ã«shtÃ« tashmÃ« i instaluar nÃ« kompjuterin tuaj"
+    IDS_ADDNEWDEVICE "Shto njÃ« pajisje tÃ« re hardware"
+    IDS_SELECTWAYTITLE "Magjistar mund tÃ« ju ndihmojÃ« tÃ« instaloni pajisje tÃ« tjera"
+    IDS_HDTYPESTITLE "Nga lista e meposhtme, zgjidhni llojin e pajisjeve qe jeni duke instaluar"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/hdwwiz/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/wined3dcfg/CMakeLists.txt
===================================================================
--- dll/cpl/wined3dcfg/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/wined3dcfg/CMakeLists.txt	(copie de travail)
@@ -1,9 +1,13 @@
 
 spec2def(wined3dcfg.cpl wined3dcfg.spec)
 
-add_library(wined3dcfg SHARED
+list(APPEND SOURCE
     wined3dcfg.c
     general.c
+    wined3dcfg.h)
+
+add_library(wined3dcfg SHARED
+    ${SOURCE}
     wined3dcfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def)
 
@@ -16,5 +20,5 @@
     advapi32
     kernel32)
 
-add_pch(wined3dcfg wined3dcfg.h)
+add_pch(wined3dcfg wined3dcfg.h SOURCE)
 add_cd_file(TARGET wined3dcfg DESTINATION reactos/system32 FOR all)
Index: dll/cpl/wined3dcfg/wined3dcfg.rc
===================================================================
--- dll/cpl/wined3dcfg/wined3dcfg.rc	(rÃ©vision 61927)
+++ dll/cpl/wined3dcfg/wined3dcfg.rc	(copie de travail)
@@ -36,6 +36,9 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/cpl/wined3dcfg/lang/sq-AL.rc
===================================================================
--- dll/cpl/wined3dcfg/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/wined3dcfg/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,30 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20
+    GROUPBOX "StrehÃ«", -1, 5, 35, 230, 65
+    AUTOCHECKBOX "MundÃ«so &GLSL", IDC_GLSL, 15, 50, 150, 10
+    AUTOCHECKBOX "MundÃ«so &pixel StrehÃ«", IDC_PIXELSHADERS, 15, 65, 150, 10
+    AUTOCHECKBOX "MundÃ«so &Vertex StrehÃ«", IDC_VERTEXSHADERS, 15, 80, 150, 10
+    GROUPBOX "PÃ«rpunim", -1, 5, 110, 230, 85
+    AUTOCHECKBOX "Detyro shumÃ«shembuj", IDC_MULTISAMPLING, 15, 125, 150, 10
+    AUTOCHECKBOX "Detyro urdhÃ«r vizatim i rreptÃ«", IDC_STRICTDRAWORDERING, 15, 140, 150, 10
+    LTEXT "StrehÃ« jashekrani:", -1, 15, 157, 80, 10
+    COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+    LTEXT "Streho mbylljen objektivit:", -1, 15, 175, 72, 10, SS_LEFT
+    COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "WineD3D"
+    IDS_CPLDESCRIPTION "Konfiguro WineD3D kohen e punÃ«s."
+END

Modification de propriÃ©tÃ©s sur dll/cpl/wined3dcfg/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/wined3dcfg/wined3dcfg.h
===================================================================
--- dll/cpl/wined3dcfg/wined3dcfg.h	(rÃ©vision 61927)
+++ dll/cpl/wined3dcfg/wined3dcfg.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _WINED3DCFG_PCH_
+#define _WINED3DCFG_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -36,3 +39,5 @@
 #define KEY_LOCKING               L"RenderTargetLockMode"
 
 INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+#endif /* _WINED3DCFG_PCH_ */
Index: dll/cpl/telephon/lang/sq-AL.rc
===================================================================
--- dll/cpl/telephon/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/telephon/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,11 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE 
+BEGIN
+    IDS_CPLSYSTEMNAME "Opsionet e Telefonit dhe Modemit"
+    IDS_CPLSYSTEMDESCRIPTION "Konfiguro rregullat tuaja pÃ«r tÃ« formuar numrin nÃ« telefon dhe cilÃ«simet e modemit."
+END

Modification de propriÃ©tÃ©s sur dll/cpl/telephon/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/telephon/telephon.rc
===================================================================
--- dll/cpl/telephon/telephon.rc	(rÃ©vision 61927)
+++ dll/cpl/telephon/telephon.rc	(copie de travail)
@@ -60,6 +60,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/cpl/usrmgr/usrmgr.h
===================================================================
--- dll/cpl/usrmgr/usrmgr.h	(rÃ©vision 61927)
+++ dll/cpl/usrmgr/usrmgr.h	(copie de travail)
@@ -1,5 +1,9 @@
+#ifndef _USRMGR_H
+#define _USRMGR_H
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
-#include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
@@ -43,3 +47,5 @@
 /* userprops.c */
 BOOL
 UserProperties(HWND hwndDlg);
+
+#endif /* _USRMGR_H */
Index: dll/cpl/usrmgr/misc.c
===================================================================
--- dll/cpl/usrmgr/misc.c	(rÃ©vision 61927)
+++ dll/cpl/usrmgr/misc.c	(copie de travail)
@@ -9,7 +9,6 @@
 
 #include "usrmgr.h"
 
-
 VOID
 DebugPrintf(LPTSTR szFormat, ...)
 {
Index: dll/cpl/usrmgr/CMakeLists.txt
===================================================================
--- dll/cpl/usrmgr/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/usrmgr/CMakeLists.txt	(copie de travail)
@@ -3,7 +3,7 @@
 
 spec2def(usrmgr.cpl usrmgr.spec)
 
-add_library(usrmgr SHARED
+list(APPEND SOURCE
     extra.c
     groupprops.c
     groups.c
@@ -11,6 +11,10 @@
     userprops.c
     users.c
     usrmgr.c
+    usrmgr.h)
+
+add_library(usrmgr SHARED
+    ${SOURCE}
     usrmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
 
@@ -26,5 +30,5 @@
     kernel32
     ntdll)
 
-add_pch(usrmgr usrmgr.h)
+add_pch(usrmgr usrmgr.h SOURCE)
 add_cd_file(TARGET usrmgr DESTINATION reactos/system32 FOR all)
Index: dll/cpl/usrmgr/lang/ru-RU.rc
===================================================================
--- dll/cpl/usrmgr/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/cpl/usrmgr/lang/ru-RU.rc	(copie de travail)
@@ -1,4 +1,4 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 /*
  * Attention Translators:
@@ -14,11 +14,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL |
             LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE
-    PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
-    PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
-    PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
-    PUSHBUTTON "Reset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
+    PUSHBUTTON "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ...", IDC_USERS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ", IDC_USERS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Ð¡Ð²Ð¾Ð¸Ñ�Ñ‚Ð²Ð°", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+    AUTOCHECKBOX "Ð¢Ñ€ÐµÐ±ÑƒÐµÑ‚Ñ�Ñ� Ð¸Ð¼Ñ� Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ� Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ‹.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    PUSHBUTTON "Ð¡Ð±Ñ€Ð¾Ñ�Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
 IDD_GROUPS DIALOGEX 0, 0, 252, 223
@@ -28,9 +28,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL |
             LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE
-    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
-    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
-    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
+    PUSHBUTTON "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Ð¡Ð²Ð¾Ð¸Ñ�Ñ‚Ð²Ð°", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 IDD_EXTRA DIALOGEX 0, 0, 252, 223
Index: dll/cpl/usrmgr/users.c
===================================================================
--- dll/cpl/usrmgr/users.c	(rÃ©vision 61927)
+++ dll/cpl/usrmgr/users.c	(copie de travail)
@@ -16,7 +16,6 @@
 
 #include "usrmgr.h"
 
-
 typedef struct _USER_DATA
 {
     HMENU hPopupMenu;
Index: dll/cpl/main/main.rc
===================================================================
--- dll/cpl/main/main.rc	(rÃ©vision 61927)
+++ dll/cpl/main/main.rc	(copie de travail)
@@ -70,6 +70,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
Index: dll/cpl/main/main.h
===================================================================
--- dll/cpl/main/main.h	(rÃ©vision 61927)
+++ dll/cpl/main/main.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MAIN_H
+#define _MAIN_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -61,4 +64,4 @@
 LONG APIENTRY
 MouseApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
-/* EOF */
+#endif /* _MAIN_H */
Index: dll/cpl/main/CMakeLists.txt
===================================================================
--- dll/cpl/main/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/main/CMakeLists.txt	(copie de travail)
@@ -1,10 +1,14 @@
 
 spec2def(main.cpl main.spec)
 
-add_library(main SHARED
+list(APPEND SOURCE
     keyboard.c
     main.c
     mouse.c
+    main.h)
+
+add_library(main SHARED
+    ${SOURCE}
     main.rc
     ${CMAKE_CURRENT_BINARY_DIR}/main.def)
 
@@ -22,5 +26,5 @@
     gdi32
     kernel32)
 
-add_pch(main main.h)
+add_pch(main main.h SOURCE)
 add_cd_file(TARGET main DESTINATION reactos/system32 FOR all)
Index: dll/cpl/main/lang/tr-TR.rc
===================================================================
--- dll/cpl/main/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/main/lang/tr-TR.rc	(copie de travail)
@@ -66,7 +66,7 @@
     GROUPBOX "TÄ±klama Kilidi", -1, 5, 150, 236, 70
     CHECKBOX "&TÄ±klama Kilidi'ni AÃ§", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20
     PUSHBUTTON "&Ayarlar...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14
-    LTEXT "FÃ¢re dÃ¼ÄŸmesine basÄ±lÄ± tutmadan sÃ¼rÃ¼klemeyi ve seÃ§meyi etkinleÅŸtirir. Kilitlemek iÃ§in kÄ±saca fÃ¢re dÃ¼ÄŸmesine basÄ±nÄ±z. BÄ±rakmak iÃ§in fÃ¢re dÃ¼ÄŸmesine tekrar basÄ±nÄ±z.", -1, 10, 180, 224, 30
+    LTEXT "FÃ¢re dÃ¼ÄŸmesine basÄ±lÄ± tutmadan sÃ¼rÃ¼klemeyi ve seÃ§meyi etkinleÅŸtirir. Kilitlemek iÃ§in kÄ±saca fÃ¢re dÃ¼ÄŸmesine basÄ±nÄ±z. BÄ±rakmak iÃ§in fÃ¢re dÃ¼ÄŸmesine yine basÄ±nÄ±z.", -1, 10, 180, 224, 30
 END
 
 IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228
Index: dll/cpl/main/lang/sq-AL.rc
===================================================================
--- dll/cpl/main/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/main/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,175 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "ShpejtÃ«si"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "PÃ«rsÃ«ritje karakteri", -1, 5, 5, 236, 135
+    ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15
+    LTEXT "PÃ«rsÃ«rit &vonesÃ«:", -1, 40, 18, 100, 10
+    LTEXT "GjatÃ«", -1, 40, 33, 20, 10
+    LTEXT "ShkurtÃ«r", -1, 200, 33, 20, 10
+    CONTROL "", IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17
+    ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15
+    LTEXT "&Shkalla PÃ«rsÃ«ritjes:", -1, 40, 70, 100, 10
+    LTEXT "NgadalÃ«", -1, 40, 85, 20, 10
+    LTEXT "Shpejt", -1, 200, 85, 20, 10
+    CONTROL "", IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17
+    LTEXT "Kliko kÃ«tu dhe mbani tÃ« shtypur njÃ« buton pÃ«r tÃ« &testuar normÃ«n e pÃ«rsÃ«ritjes:", -1, 15, 105, 216, 10
+    EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP
+    GROUPBOX "Indikues &normÃ« levizje:", -1, 5, 145, 236, 50
+    LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8
+    LTEXT "AsnjÃ«", -1, 40, 165, 25, 10
+    LTEXT "Shpejt", -1, 200, 165, 30, 10
+    CONTROL "", IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17
+END
+
+IDD_HARDWARE DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PjesÃ« Elektronike"
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_CLICK_LOCK DIALOGEX 0, 0, 240, 78
+STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
+CAPTION "Kliko blloko"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ShkurtÃ«r", -1, 50, 35, 27, 10
+    LTEXT "GjatÃ«", -1, 157, 35, 27, 10
+    CONTROL "", IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17
+    PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
+    PUSHBUTTON "&Anulo", IDCANCEL, 174, 59, 60, 14
+    LTEXT "&Rregullo se sa kohÃ« ju duhet tÃ« mbani tÃ« shtypur njÃ« buton tÃ« miut para klikimi juaj Ã«shtÃ« mbyllur", -1, 37, 5, 200, 27
+    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+END
+
+IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Butona"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Konfigurimi Butonave", -1, 5, 5, 236, 70
+    CHECKBOX "&NdÃ«rro butonat fillore dhe ato dytesor", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10
+    CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE
+    LTEXT "Zgjidh kÃ«tÃ« kuti pÃ«r tÃ« bÃ«rÃ« tÃ« djathtÃ«n e miut pÃ«r pÃ«rdorimin e funksioneve primare tÃ« tilla si zgjedhjen dhe zvarritje.", -1, 10, 36, 156, 30
+    GROUPBOX "ShpejtÃ«sia e dy-klikimeve", -1, 5, 78, 236, 70
+    LTEXT "Kliko-dy here dosjen pÃ«r tÃ« testuar parametrat tuaj. NÃ« rast se dosja nuk hapet ose mbyllet, provoni duke pÃ«rdorur njÃ« parameter mÃ« tÃ« ngadaltÃ«.", -1, 10, 90, 156, 28
+    LTEXT "Shpejtesi:   Ngadale", -1, 10, 123, 50, 10
+    LTEXT "Shpejt", -1, 136, 123, 24, 10
+    CONTROL "", IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17
+    CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE
+    GROUPBOX "KlikoMbyll", -1, 5, 150, 236, 70
+    CHECKBOX "&Ndez KlikoMbyll", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20
+    PUSHBUTTON "&Parametra...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14
+    LTEXT "Ju mundÃ«son pÃ«r tÃ« nxjerrÃ« nÃ« pah ose terhiq pa mbajtur butonin e miut. PÃ«r tÃ« vendosur, shtypni pÃ«r pak kohÃ« butonin e miut. PÃ«r tÃ« liruar, klikoni butonin e miut pÃ«rsÃ«ri.", -1, 10, 180, 224, 30
+END
+
+IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Tregues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "SkemÃ«", -1, 5, 5, 181, 45
+    COMBOBOX IDC_COMBO_CURSOR_SCHEME, 12, 15, 167, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Ruaj Si...", IDC_BUTTON_SAVEAS_SCHEME, 65, 31, 60, 14
+    PUSHBUTTON "&Fshi", IDC_BUTTON_DELETE_SCHEME, 128, 31, 50, 14
+    CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE
+    LTEXT "&Rregullo", -1, 5, 57, 60, 10
+    LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY
+    CHECKBOX "&Aktivizo hijen treguesit", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10
+    PUSHBUTTON "PÃ«rdor parazgjedhur", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14
+    PUSHBUTTON "&Shfleto...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14
+END
+
+IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53
+STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
+CAPTION "Ruaj SkemÃ«n"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ruaj skemÃ«n e ketij treguesi si:", -1, 5, 5, 181, 10
+    EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
+    PUSHBUTTON "&OK", IDOK, 63, 35, 60, 14
+    PUSHBUTTON "&Anulo", IDCANCEL, 126, 35, 60, 14
+END
+
+IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Alternativa Traguesi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "LÃ«vizje", -1, 5, 5, 236, 60
+    LTEXT "Zgjedh shpejtÃ«sine e treguesit:", -1, 52, 15, 110, 10
+    LTEXT "Ngadal", -1, 60, 30, 20, 10
+    CONTROL "", IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17
+    LTEXT "Shpejt", -1, 170, 30, 20, 10
+    ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 18, 20, 32, 32
+    CHECKBOX "&Rrit SaktÃ«sin Treguesit", IDC_CHECK_POINTER_PRECISION, 52, 50, 140, 10
+    GROUPBOX "Kalo nÃ«", -1, 5, 70, 236, 40
+    CHECKBOX "Automatikisht lÃ«viz treguesin nÃ« butonin e prezgjedhur nÃ« njÃ« kuti dialogu",
+             IDC_CHECK_SNAP_TO, 52, 84, 183, 20, BS_MULTILINE | BS_TOP
+    ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 18, 83, 15, 15
+    GROUPBOX "DukshmÃ«ria", -1, 5, 115, 236, 95
+    CHECKBOX "&Shfaq shtigjet e treguesit:", IDC_CHECK_POINTER_TRAIL, 52, 128, 125, 10
+    LTEXT "Shkurt", IDC_TEXT_TRAIL_SHORT, 54, 143, 25, 10
+    LTEXT "GjatÃ«", IDC_TEXT_TRAIL_LONG, 157, 143, 30, 10
+    ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15
+    CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17
+    CHECKBOX "&Hide treguesin ndÃ«rsa shkruani", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10
+    ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15
+    CHECKBOX "&Trego vendndodhjen e treguesit kur shtypni butonin CTRL",
+             IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP
+    ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15
+END
+
+IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "RrotÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Rrotullo", -1, 5, 5, 236, 80
+    ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
+    LTEXT "Rolltullo rrotÃ«n njÃ« pikÃ« tÃ« lÃ«viz", -1, 60, 15, 150, 10
+    RADIOBUTTON "Vijimi dhe numri i vijave nÃ« njÃ« kohÃ«:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
+    RADIOBUTTON "&NjÃ« ekran nÃ« njÃ« kohÃ«", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
+    EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+    CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME_1 "Miu"
+    IDS_CPLDESCRIPTION_1 "Ndryshon parametrat e miut."
+    IDS_CPLNAME_2 "Tastiera"
+    IDS_CPLDESCRIPTION_2 "Ndryshon parametrat e tastieres."
+    IDS_ARROW "Zgjidhni normal"
+    IDS_HELP "Zgjidhni ndihmÃ«"
+    IDS_APPSTARTING "Duke punuar nÃ« mbrapaskenÃ«"
+    IDS_WAIT "i'ZÃ«nÃ«"
+    IDS_CROSSHAIR "Zgjidh Precision"
+    IDS_IBEAM "Zgjidhni tekstin"
+    IDS_NWPEN "shkrim dore"
+    IDS_NO "i'padisponushem"
+    IDS_SIZENS "Formati Vertikal"
+    IDS_SIZEWE "Formati Horizontal"
+    IDS_SIZENWSE "Format Diagonal 1"
+    IDS_SIZENESW "Format Diagonal 2"
+    IDS_SIZEALL "Leviz"
+    IDS_UPARROW "Zgjidhhje Alternative"
+    IDS_HAND "Zgjidh linkun"
+    IDS_NONE "(AsnjÃ«)"
+    IDS_SYSTEM_SCHEME "(Skema Sistemit)"
+    IDS_BROWSE_FILTER "Treguesi (*.ani, *.cur)\0*.ani;*.cur\0Treguesi animuar (*.ani)\0*.ani\0Treguesi statik (*.cur)\0*.cur\0T'gjith Dokumentat\0*.*\0\0"
+    IDS_BROWSE_TITLE "Shfleto"
+    IDS_REMOVE_TITLE "Konfirmo heqja skemes treguesit"
+    IDS_REMOVE_TEXT "Jeni te sigurte qe doni te hiqni skemÃ«n treguesit '%s'?"
+    IDS_OVERWRITE_TITLE "Konfirmo skemen prishÃ«se tÃ« treguesit"
+    IDS_OVERWRITE_TEXT "Emri Skemes treguese qÃ« keni zgjedhur Ã«shtÃ« tashmÃ« nÃ« pÃ«rdorim. A doni tÃ« prishni skemÃ«n ekzistuese tÃ« treguesit?"
+    IDS_ANIMATE_CURSOR "Tregues Animuar"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/main/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/desk/lang/tr-TR.rc
===================================================================
--- dll/cpl/desk/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/cpl/desk/lang/tr-TR.rc	(copie de travail)
@@ -4,7 +4,7 @@
 
 IDD_BACKGROUND DIALOGEX 0, 0, 246, 204
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "ArkagÃ¶rÃ¼nÃ¼m"
+CAPTION "Arka Plan"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0
@@ -245,7 +245,7 @@
     IDS_ELEMENT_14 "Edilgin SeÃ§ke Ã–ÄŸeleri"
     IDS_ELEMENT_15 "Ä°leti"
     IDS_ELEMENT_16 "KaydÄ±rma Ã‡ubuklarÄ± Denetimleri"
-    IDS_ELEMENT_17 "Uygulama ArkagÃ¶rÃ¼nÃ¼mÃ¼"
+    IDS_ELEMENT_17 "Uygulama Arka PlanÄ±"
     IDS_ELEMENT_18 "KÃ¼Ã§Ã¼k BaÅŸlÄ±k Ã‡ubuÄŸu"
     IDS_ELEMENT_19 "Simge AralÄ±ÄŸÄ± (Yatay)"
     IDS_ELEMENT_20 "Simge AralÄ±ÄŸÄ± (Dikey)"
Index: dll/cpl/desk/lang/sq-AL.rc
===================================================================
--- dll/cpl/desk/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/desk/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,263 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+ * DATE OF TR:  04-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_BACKGROUND DIALOGEX 0, 0, 246, 204
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Sfond"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_BACKGROUND_PREVIEW, "Statik", SS_OWNERDRAW, 70, 10, 105, 80, 0
+    CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+            LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78
+    LTEXT "Zgjidhni njÃ« imazh pÃ«r t'u pÃ«rdorur si sfond tuaj desktop", IDC_STATIC, 8, 103, 230, 9
+    PUSHBUTTON "&Shfleto...", IDC_BROWSE_BUTTON, 188, 114, 55, 15
+    PUSHBUTTON "&Ngjyra...", IDC_COLOR_BUTTON, 188, 177, 55, 15
+    LTEXT "Vendosje", IDC_STATIC, 188, 138, 55, 9
+    COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Screensaver"
+FONT 8, "MS Shell Dlg", 0, 0
+BEGIN
+    CONTROL "", IDC_SCREENS_PREVIEW, "Statik", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE
+    GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52
+    COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "CilÃ«sime%t", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
+    PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 103, 50, 13
+    LTEXT "Prit", IDC_WAITTEXT, 14, 125, 20, 9
+    EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP
+    CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
+    LTEXT "minuta", IDC_MINTEXT, 70, 125, 26, 9
+    CONTROL "Pyet pÃ«r fjalÃ«kalim kur tÃ« rinisÃ«", IDC_SCREENS_USEPASSCHK, "button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    GROUPBOX "&Karakteristika Ruajtja e EnergjisÃ« tÃ« monitoruar", IDC_SCREENS_DUMMY2, 6, 155, 232, 41
+    LTEXT "PÃ«r tÃ« rregulluar parametrat Energjise tÃ« monitoruar tuaj, klikoni mbi cilÃ«sime energjisÃ«.", IDC_STATIC, 14, 166, 146, 27
+    PUSHBUTTON "Energji...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13
+END
+
+IDD_APPEARANCE DIALOGEX 0, 0, 246, 234
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Dukje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
+    LTEXT "Stili Vizual", IDC_STATIC, 7, 130, 104, 9
+    COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST |
+             CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Skema Ngjyrave", IDC_STATIC, 7, 160, 104, 9
+    COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST |
+             CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Masa", IDC_STATIC, 7, 190, 104, 9
+    COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST |
+             CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Efekte...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
+    PUSHBUTTON "PÃ«rparuar...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15
+END
+
+IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
+CAPTION "Shfaqje e Avancuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
+    LTEXT "Elemente", 8, 5, 160, 50, 9
+    COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST |
+             CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Masa", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9
+    EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP
+    CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP |
+            UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13
+    LTEXT "&1st Ngjyra", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9
+    CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP
+    LTEXT "&2nd Ngjyra", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9
+    CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP
+    LTEXT "Font", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9
+    COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN |
+             CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Masa Font", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
+    LTEXT "Ngjyra", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9
+    CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP
+    AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE
+    AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE
+    PUSHBUTTON "Anulo", IDCANCEL, 191, 220, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
+END
+
+IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
+CAPTION "Efekte"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "&PÃ«rdorni efektin e mÃ«poshtme tranzicionit pÃ«r menutÃ« dhe ndihmesa",
+            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19
+    COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST |
+             CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP
+    CONTROL "PÃ«rdor metodÃ«n e mÃ«poshtme pÃ«r tÃ« zbutÃ« skajet e fonts ekran", IDC_EFFAPPEARANCE_SMOOTHING,
+            "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19
+    COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST |
+             CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    CONTROL "PÃ«rdor ikona tÃ« mÃ«dha", IDC_EFFAPPEARANCE_LARGEICONS, "button",
+            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
+    CONTROL "Shfaq hije poshte menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
+            "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19
+    CONTROL "Shfaq &pÃ«rmbajtjen dritare ndÃ«rsa zvarritet", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
+            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
+    CONTROL "Fsheh gÃ«rma tÃ« nÃ«nvizuara pÃ«r kÃ«rkimin e tastierÃ«s deri sa tÃ« shtypni butonin Alt",
+            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19
+    PUSHBUTTON "Anulo", IDCANCEL, 226, 165, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
+END
+
+IDD_SETTINGS DIALOGEX 0, 0, 246, 204
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "CilÃ«simet"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Terheq monitorimin e ikonave tÃ« pÃ«rputhet me marrÃ«veshje fizike tÃ« vÃ«zhguesit tuaj.", -1, 3, 3, 240, 20
+    CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
+            WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
+    LTEXT "&Ekran", 1820, 3, 107, 70, 9
+    LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9
+    GROUPBOX "&Zona ekranit", 1818, 3, 127, 115, 43
+    CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17
+    LTEXT "Pak", 1815, 9, 137, 25, 9, NOT WS_GROUP
+    LTEXT "ShumÃ«", 1816, 93, 137, 25, 9, NOT WS_GROUP
+    LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER
+    GROUPBOX "&Ngjyra", 1817, 125, 127, 115, 43
+    COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL "", IDC_SETTINGS_SPECTRUM, "Statik", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9
+    PUSHBUTTON "PÃ«rparuar...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 14
+END
+
+IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Ekran", -1, 7, 6, 237, 56, WS_GROUP
+    LTEXT "Font Masa", -1, 14, 20, 222, 9
+    COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
+    GROUPBOX "PajtueshmÃ«ri", -1, 7, 67, 237, 97
+    LTEXT "Disa programe veprojÃ« nÃ« mÃ«nyrÃ« tÃ« paligjshme nÃ« qoftÃ« se ju nuk e rinisni kompjuterin tuaj, pasi ju tÃ« ndryshoni parametrat e ngjyrave.\n\nPasi keni ndryshuar parametrat e ngjyrave", -1, 12, 78, 228, 34
+    AUTORADIOBUTTON "&Rifillo kompjuterin para se tÃ« aplikoni vetit e reja ngjyra.", IDC_RESTART_RB, 14, 116, 228, 10
+    AUTORADIOBUTTON "Apliko parametrat e ngjyrave te reja par rifilluar sistemit.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
+    AUTORADIOBUTTON "Pyet para se te aplikosh parametrat e ngjyrave te reja.", IDC_ASKME_RB, 14, 146, 228, 10
+END
+
+IDR_PREVIEW_MENU MENU
+BEGIN
+    MENUITEM "Normale", ID_MENU_NORMAL
+    MENUITEM "Ndaluar", ID_MENU_DISABLED
+    MENUITEM "PÃ«rzgjedhur", ID_MENU_SELECTED
+END
+
+IDM_MONITOR_MENU MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Bashkangjitur", ID_MENU_ATTACHED
+        MENUITEM "&Primar", ID_MENU_PRIMARY
+        MENUITEM SEPARATOR
+        MENUITEM "&Identifiko", ID_MENU_IDENTIFY
+        MENUITEM "Konfigurime", ID_MENU_PROPERTIES
+    END
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SLIDEEFFECT "Efekt rrÃ«shqitje"
+    IDS_FADEEFFECT "Efekt zbehet"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STANDARDEFFECT "Standart"
+    IDS_CLEARTYPEEFFECT "Tip Paster"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_MULTIPLEMONITORS "(Multiple Monitors)"
+    IDS_UNKNOWNMONITOR "(Unknown Monitor)"
+    IDS_ADVANCEDTITLEFMT "%s dhe %s"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Ekran"
+    IDS_CPLDESCRIPTION "Rregullon ekranin e desktop dhe screen saver."
+    IDS_NONE "(Asnje)"
+    IDS_CENTER "Qender"
+    IDS_STRETCH "Streq"
+    IDS_TILE "Tile"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_COLOR_4BIT "16 Ngjyra"
+    IDS_COLOR_8BIT "256 Ngjyra"
+    IDS_COLOR_16BIT "Ngjyra Larta (16 Bit)"
+    IDS_COLOR_24BIT "Ngjyra Verteta (24 Bit)"
+    IDS_COLOR_32BIT "Ngjyra Verteta (32 Bit)"
+    IDS_PIXEL "%lux%lu Pixel"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0"
+    IDS_SUPPORTED_EXT "*.bmp;*.dib"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_INACTWIN "Dritare Inaktive"
+    IDS_ACTWIN "Dritare Aktive"
+    IDS_WINTEXT "Dritare Teksti"
+    IDS_MESSBOX "Kuti Mesazhi"
+    IDS_MESSTEXT "Tekst Mesazhi"
+    IDS_BUTTEXT "OK"
+    IDS_CLASSIC_THEME "Theme Klasike"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ELEMENT_1 "Desktop"
+    IDS_ELEMENT_2 "Titull i dritares inaktive"
+    IDS_ELEMENT_3 "Skaj i dritares inaktive"
+    IDS_ELEMENT_4 "Titull i dritares aktive"
+    IDS_ELEMENT_5 "Skaj i dritares aktive"
+    IDS_ELEMENT_6 "Menu"
+    IDS_ELEMENT_7 "Artikuj tÃ« pÃ«rzgjedhur"
+    IDS_ELEMENT_8 "Dritare"
+    IDS_ELEMENT_9 "Scrollbars"
+    IDS_ELEMENT_10 "3D objekte"
+    IDS_ELEMENT_11 "Palette titulli"
+    IDS_ELEMENT_12 "Titulli Symboli"
+    IDS_ELEMENT_13 "Captionbar"
+    IDS_ELEMENT_14 "Elementet Ã§aktivizuar menu"
+    IDS_ELEMENT_15 "Dialog"
+    IDS_ELEMENT_16 "Kontrolli Scrollbar"
+    IDS_ELEMENT_17 "Sfondi Aplikacioneve"
+    IDS_ELEMENT_18 "Captionbar vogel"
+    IDS_ELEMENT_19 "Simboli distanca (horizontale)"
+    IDS_ELEMENT_20 "Simboli distanca (vertikale)"
+    IDS_ELEMENT_21 "Info e shpejt"
+    IDS_ELEMENT_22 "Simboli"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DISPLAY_SETTINGS "Konfigurimi i Ekranit"
+    IDS_APPLY_FAILED "Deshtoj ne apilimin e konfigurimit..."
+    IDS_APPLY_NEEDS_RESTART "Ju duhet te rifilloni sistemin tuaj qe te aplikoni ndryshimet."
+END

Modification de propriÃ©tÃ©s sur dll/cpl/desk/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/cpl/desk/classinst.c
===================================================================
--- dll/cpl/desk/classinst.c	(rÃ©vision 61927)
+++ dll/cpl/desk/classinst.c	(copie de travail)
@@ -211,6 +211,15 @@
         DPRINT("SetupInstallFromInfSection() failed with error 0x%lx\n", rc);
         goto cleanup;
     }
+    /* Add Device Description string */
+    rc = RegSetValueEx(hDeviceSubKey, _T("Device Description"), 0,
+        REG_SZ, (const BYTE*)DriverInfoData.Description,
+        (_tcslen(DriverInfoData.Description) + 1) * sizeof(TCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueEx() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
 
     /* FIXME: install OpenGLSoftwareSettings section */
 
Index: dll/cpl/desk/desk.rc
===================================================================
--- dll/cpl/desk/desk.rc	(rÃ©vision 61927)
+++ dll/cpl/desk/desk.rc	(copie de travail)
@@ -80,6 +80,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/cpl/desk/desk.h
===================================================================
--- dll/cpl/desk/desk.h	(rÃ©vision 61927)
+++ dll/cpl/desk/desk.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _DESK_H
+#define _DESK_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -126,3 +129,4 @@
                   IN DWORD Flags,
                   IN LPCWSTR pszDirectory  OPTIONAL);
 
+#endif /* _DESK_H */
Index: dll/cpl/desk/CMakeLists.txt
===================================================================
--- dll/cpl/desk/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/cpl/desk/CMakeLists.txt	(copie de travail)
@@ -1,9 +1,8 @@
 
 add_definitions(-D_WIN32)
-
 spec2def(desk.cpl desk.spec)
 
-add_library(desk SHARED
+list(APPEND SOURCE
     advmon.c
     appearance.c
     background.c
@@ -19,10 +18,14 @@
     settings.c
     monslctl.c
     general.c
-    desk.rc
     draw.c
     theme.c
     muireg.c
+    desk.h)
+
+add_library(desk SHARED
+    ${SOURCE}
+    desk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/desk.def)
 
 set_module_type(desk cpl UNICODE)
@@ -43,5 +46,5 @@
     kernel32
     ntdll)
 
-add_pch(desk desk.h)
+add_pch(desk desk.h SOURCE)
 add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all)
Index: dll/cpl/liccpa/liccpa.rc
===================================================================
--- dll/cpl/liccpa/liccpa.rc	(rÃ©vision 61927)
+++ dll/cpl/liccpa/liccpa.rc	(copie de travail)
@@ -54,6 +54,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
Index: dll/cpl/liccpa/lang/sq-AL.rc
===================================================================
--- dll/cpl/liccpa/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/cpl/liccpa/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,31 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGE1 DIALOGEX 20, 40, 315, 104
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
+CAPTION "Zgjidhni MÃ«nyren Licencimit"
+FONT 8, "Helv"
+BEGIN
+    CONTROL "MÃ«nyra Licencimit Klientit", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94
+    CONTROL "Per PjesÃ« ose Per PÃ«rdorues", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12
+    CONTROL "Per Server. Numri i lidhjeve nÃ« harmoni:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9
+    CONTROL "Produkti:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8
+    CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12
+    CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14
+    CONTROL "Anulo", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14
+    CONTROL "NdihmÃ«", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14
+    CONTROL "PÃ«rsÃ«ritje...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14
+    CONTROL "Shto Licensen", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15
+    CONTROL "Hiq Licensen", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16
+    CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME_1 "Menaxher License"
+    IDS_CPLDESCRIPTION_1 "Menaxher License"
+    IDS_REACTOS "ReactOS - ProgramFalas"
+END

Modification de propriÃ©tÃ©s sur dll/cpl/liccpa/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/directx/wine/dsound/dsound_private.h
===================================================================
--- dll/directx/wine/dsound/dsound_private.h	(rÃ©vision 61927)
+++ dll/directx/wine/dsound/dsound_private.h	(copie de travail)
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _DSOUND_PRIVATE_H_
+#define _DSOUND_PRIVATE_H_
+
 #include <wine/config.h>
 
 #include <assert.h>
@@ -290,3 +293,5 @@
 UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) DECLSPEC_HIDDEN;
 HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
         LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN;
+
+#endif /* _DSOUND_PRIVATE_H_ */
Index: dll/directx/wine/wined3d/CMakeLists.txt
===================================================================
--- dll/directx/wine/wined3d/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/wined3d/CMakeLists.txt	(copie de travail)
@@ -37,11 +37,15 @@
     view.c
     volume.c
     wined3d_main.c
+    wined3d_private.h)
+
+add_library(wined3d SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
 
-add_library(wined3d SHARED ${SOURCE} version.rc)
 set_module_type(wined3d win32dll)
 target_link_libraries(wined3d wine)
 add_importlibs(wined3d user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll)
-add_pch(wined3d wined3d_private.h)
+add_pch(wined3d wined3d_private.h SOURCE)
 add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/dplayx/CMakeLists.txt
===================================================================
--- dll/directx/wine/dplayx/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/dplayx/CMakeLists.txt	(copie de travail)
@@ -17,10 +17,15 @@
     dplobby.c
     lobbysp.c
     name_server.c
+    dplayx_global.h)
+
+add_library(dplayx SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def)
 
-add_library(dplayx SHARED ${SOURCE} version.rc)
 set_module_type(dplayx win32dll)
 target_link_libraries(dplayx dxguid uuid wine)
 add_importlibs(dplayx winmm ole32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(dplayx dplayx_global.h SOURCE)
 add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/d3d8/CMakeLists.txt
===================================================================
--- dll/directx/wine/d3d8/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/d3d8/CMakeLists.txt	(copie de travail)
@@ -18,13 +18,16 @@
     texture.c
     vertexdeclaration.c
     volume.c
+    d3d8_private.h)
+
+add_library(d3d8 SHARED
+    ${SOURCE}
     guid.c
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
 
-add_library(d3d8 SHARED ${SOURCE})
-set_module_type(d3d8 win32dll UNICODE)
+set_module_type(d3d8 win32dll UNICODE HOTPATCHABLE)
 target_link_libraries(d3d8 uuid wine)
 add_importlibs(d3d8 wined3d msvcrt kernel32 ntdll)
-add_pch(d3d8 d3d8_private.h)
+add_pch(d3d8 d3d8_private.h SOURCE)
 add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/d3d9/CMakeLists.txt
===================================================================
--- dll/directx/wine/d3d9/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/d3d9/CMakeLists.txt	(copie de travail)
@@ -20,14 +20,17 @@
     texture.c
     vertexdeclaration.c
     volume.c
+    d3d9_private.h)
+
+add_library(d3d9 SHARED
+    ${SOURCE}
     guid.c
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
 
-add_library(d3d9 SHARED ${SOURCE})
-set_module_type(d3d9 win32dll UNICODE)
+set_module_type(d3d9 win32dll UNICODE HOTPATCHABLE)
 target_link_libraries(d3d9 wine)
 add_importlibs(d3d9 wined3d msvcrt kernel32 ntdll)
-add_pch(d3d9 d3d9_private.h)
+add_pch(d3d9 d3d9_private.h SOURCE)
 add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/d3dx9_36/CMakeLists.txt
===================================================================
--- dll/directx/wine/d3dx9_36/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/d3dx9_36/CMakeLists.txt	(copie de travail)
@@ -21,13 +21,18 @@
     util.c
     volume.c
     xfile.c
+    d3dx9_36_private.h)
+
+add_library(d3dx9_36 SHARED
+    ${SOURCE}
     guid.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def)
 
-add_library(d3dx9_36 SHARED ${SOURCE} version.rc)
 set_module_type(d3dx9_36 win32dll)
 add_dependencies(d3dx9_36 d3d_idl_headers)
 target_link_libraries(d3dx9_36 dxguid wine)
 add_importlibs(d3dx9_36 d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll)
+add_pch(d3dx9_36 d3dx9_36_private.h SOURCE)
 add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/dinput/CMakeLists.txt
===================================================================
--- dll/directx/wine/dinput/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/dinput/CMakeLists.txt	(copie de travail)
@@ -5,7 +5,6 @@
 
 list(APPEND SOURCE
     config.c
-    data_formats.c
     device.c
     dinput_main.c
     effect_linuxinput.c
@@ -15,12 +14,18 @@
     joystick_osx.c
     keyboard.c
     mouse.c
+    dinput_private.h)
+
+add_library(dinput SHARED
+    ${SOURCE}
+    data_formats.c
+    dinput.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dinput.def)
 
-add_library(dinput SHARED ${SOURCE} dinput.rc)
 add_library(dinput_data_formats data_formats.c)
 add_dependencies(dinput_data_formats psdk)
-set_module_type(dinput win32dll)
+set_module_type(dinput win32dll HOTPATCHABLE)
 target_link_libraries(dinput dxguid uuid wine)
 add_importlibs(dinput comctl32 ole32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(dinput dinput_private.h SOURCE)
 add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/devenum/devenum_private.h
===================================================================
--- dll/directx/wine/devenum/devenum_private.h	(rÃ©vision 61927)
+++ dll/directx/wine/devenum/devenum_private.h	(copie de travail)
@@ -22,6 +22,9 @@
  * - Private file where devenum globals are declared
  */
 
+#ifndef __WINE_DEVENUM_H
+#define __WINE_DEVENUM_H
+
 #ifndef RC_INVOKED
 #include <stdarg.h>
 #endif
@@ -91,3 +94,5 @@
 extern const WCHAR clsid_keyname[6];
 extern const WCHAR wszInstanceKeyName[];
 #define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR))
+
+#endif /* __WINE_DEVENUM_H */
Index: dll/directx/wine/devenum/CMakeLists.txt
===================================================================
--- dll/directx/wine/devenum/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/devenum/CMakeLists.txt	(copie de travail)
@@ -12,12 +12,16 @@
     factory.c
     mediacatenum.c
     parsedisplayname.c
+    devenum_private.h)
+
+add_library(devenum SHARED
+    ${SOURCE}
+    devenum.rc
     ${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
 
-add_library(devenum SHARED ${SOURCE} devenum.rc)
 set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs)
 set_module_type(devenum win32dll UNICODE)
 target_link_libraries(devenum strmiids uuid wine)
 add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll)
-add_pch(devenum devenum_private.h)
+add_pch(devenum devenum_private.h SOURCE)
 add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/qedit/CMakeLists.txt
===================================================================
--- dll/directx/wine/qedit/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/qedit/CMakeLists.txt	(copie de travail)
@@ -7,11 +7,15 @@
     main.c
     mediadet.c
     samplegrabber.c
+    qedit_private.h)
+
+add_library(qedit SHARED
+    ${SOURCE}
+    qedit.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qedit.def)
 
-add_library(qedit SHARED ${SOURCE} qedit.rc)
 set_module_type(qedit win32dll)
 target_link_libraries(qedit strmiids uuid wine)
 add_importlibs(qedit ole32 oleaut32 msvcrt kernel32 ntdll)
-add_pch(qedit qedit_private.h)
+add_pch(qedit qedit_private.h SOURCE)
 add_cd_file(TARGET qedit DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/amstream/CMakeLists.txt
===================================================================
--- dll/directx/wine/amstream/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/amstream/CMakeLists.txt	(copie de travail)
@@ -12,10 +12,15 @@
     main.c
     mediastream.c
     mediastreamfilter.c
+    amstream_private.h)
+
+add_library(amstream SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/amstream.def)
 
-add_library(amstream SHARED ${SOURCE} version.rc)
 set_module_type(amstream win32dll)
 target_link_libraries(amstream strmbase strmiids uuid wine)
 add_importlibs(amstream ole32 msvcrt kernel32 ntdll)
+add_pch(amstream amstream_private.h SOURCE)
 add_cd_file(TARGET amstream DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/d3dcompiler_43/CMakeLists.txt
===================================================================
--- dll/directx/wine/d3dcompiler_43/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/d3dcompiler_43/CMakeLists.txt	(copie de travail)
@@ -19,12 +19,17 @@
     hlsl.yy.c
     reflection.c
     utils.c
-    ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c
+    d3dcompiler_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c)
+
+add_library(d3dcompiler_43 SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def)
 
-add_library(d3dcompiler_43 SHARED ${SOURCE} version.rc)
 set_module_type(d3dcompiler_43 win32dll)
 target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp)
 add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll)
 add_dependencies(d3dcompiler_43 d3d_idl_headers)
+add_pch(d3dcompiler_43 d3dcompiler_private.h SOURCE)
 add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/dxdiagn/CMakeLists.txt
===================================================================
--- dll/directx/wine/dxdiagn/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/dxdiagn/CMakeLists.txt	(copie de travail)
@@ -2,19 +2,23 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(dxdiagn.dll dxdiagn.spec)
+add_idl_headers(dxdiagn_idlheader fil_data.idl)
 
 list(APPEND SOURCE
     container.c
     dxdiag_main.c
     provider.c
+    dxdiag_private.h)
+
+add_library(dxdiagn SHARED
+    ${SOURCE}
     guid.c
+    dxdiagn.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
 
-add_idl_headers(dxdiagn_idlheader fil_data.idl)
-add_library(dxdiagn SHARED ${SOURCE} dxdiagn.rc)
 set_module_type(dxdiagn win32dll)
 target_link_libraries(dxdiagn strmiids dxguid uuid wine)
 add_dependencies(dxdiagn dxdiagn_idlheader)
 add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 msvcrt kernel32 ntdll)
-add_pch(dxdiagn dxdiag_private.h)
+add_pch(dxdiagn dxdiag_private.h SOURCE)
 add_cd_file(TARGET dxdiagn DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/msdmo/CMakeLists.txt
===================================================================
--- dll/directx/wine/msdmo/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/msdmo/CMakeLists.txt	(copie de travail)
@@ -6,11 +6,16 @@
 list(APPEND SOURCE
     dmoreg.c
     dmort.c
+    precomp.h)
+
+add_library(msdmo SHARED
+    ${SOURCE}
     stubs.c
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def)
 
-add_library(msdmo SHARED ${SOURCE} rsrc.rc)
 set_module_type(msdmo win32dll)
 target_link_libraries(msdmo uuid wine mediaobj_guid)
 add_importlibs(msdmo user32 advapi32 ole32 msvcrt kernel32 ntdll)
+add_pch(msdmo precomp.h SOURCE)
 add_cd_file(TARGET msdmo DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/dmusic/CMakeLists.txt
===================================================================
--- dll/directx/wine/dmusic/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/dmusic/CMakeLists.txt	(copie de travail)
@@ -12,11 +12,15 @@
     download.c
     instrument.c
     port.c
+    dmusic_private.h)
+
+add_library(dmusic SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
 
-add_library(dmusic SHARED ${SOURCE} version.rc)
 set_module_type(dmusic win32dll)
 target_link_libraries(dmusic dxguid uuid wine)
 add_importlibs(dmusic ole32 advapi32 winmm msvcrt kernel32 ntdll)
-add_pch(dmusic dmusic_private.h)
+add_pch(dmusic dmusic_private.h SOURCE)
 add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/dxgi/CMakeLists.txt
===================================================================
--- dll/directx/wine/dxgi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/dxgi/CMakeLists.txt	(copie de travail)
@@ -13,12 +13,17 @@
     surface.c
     swapchain.c
     utils.c
+    dxgi_private.h)
+
+add_library(dxgi SHARED
+    ${SOURCE}
     guid.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dxgi.def)
 
-add_library(dxgi SHARED ${SOURCE} version.rc)
 set_module_type(dxgi win32dll)
 target_link_libraries(dxgi uuid dxgi_uuids wine)
 add_importlibs(dxgi wined3d msvcrt kernel32 ntdll)
 add_dependencies(dxgi wineheaders)
+add_pch(dxgi dxgi_private.h SOURCE)
 add_cd_file(TARGET dxgi DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/dinput8/CMakeLists.txt
===================================================================
--- dll/directx/wine/dinput8/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/dinput8/CMakeLists.txt	(copie de travail)
@@ -8,7 +8,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)
 
 add_library(dinput8 SHARED ${SOURCE} version.rc)
-set_module_type(dinput8 win32dll)
+set_module_type(dinput8 win32dll HOTPATCHABLE)
 target_link_libraries(dinput8 dxguid uuid wine)
 add_importlibs(dinput8 ole32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/ddraw/CMakeLists.txt
===================================================================
--- dll/directx/wine/ddraw/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/ddraw/CMakeLists.txt	(copie de travail)
@@ -20,8 +20,8 @@
     utils.c
     vertexbuffer.c
     viewport.c
-    ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
+    ddraw_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c)
 
 if(MSVC)
     # FIXME: http://www.cmake.org/Bug/view.php?id=12998
@@ -29,10 +29,14 @@
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
 endif()
 
-add_library(ddraw SHARED ${SOURCE} ddraw.rc)
-set_module_type(ddraw win32dll)
+add_library(ddraw SHARED
+    ${SOURCE}
+    ddraw.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
+
+set_module_type(ddraw win32dll HOTPATCHABLE)
 target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB})
 add_importlibs(ddraw advapi32 gdi32 user32 wined3d msvcrt kernel32 ntdll)
 add_dependencies(ddraw wineheaders)
-add_pch(ddraw ddraw_private.h)
+add_pch(ddraw ddraw_private.h SOURCE)
 add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/quartz/CMakeLists.txt
===================================================================
--- dll/directx/wine/quartz/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/quartz/CMakeLists.txt	(copie de travail)
@@ -35,12 +35,15 @@
     videorenderer.c
     vmr9.c
     waveparser.c
+    quartz_private.h)
+
+add_library(quartz SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c
-    ${CMAKE_CURRENT_BINARY_DIR}/quartz.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/quartz.def
+    version.rc)
 
-add_library(quartz SHARED ${SOURCE} version.rc)
-
 add_idl_headers(quartz_idlheader fil_data.idl)
 
 add_typelib(control_tlb.idl)
@@ -56,5 +59,5 @@
 target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB})
 add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(quartz dxsdk quartz_idlheader stdole2)
-add_pch(quartz quartz_private.h)
+add_pch(quartz quartz_private.h SOURCE)
 add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all)
Index: dll/directx/wine/d3dxof/CMakeLists.txt
===================================================================
--- dll/directx/wine/d3dxof/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/directx/wine/d3dxof/CMakeLists.txt	(copie de travail)
@@ -7,12 +7,17 @@
 list(APPEND SOURCE
     d3dxof.c
     main.c
+    parsing.c
+    d3dxof_private.h)
+
+add_library(d3dxof SHARED
+    ${SOURCE}
     mszip.c
-    parsing.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3dxof.def)
 
-add_library(d3dxof SHARED ${SOURCE} version.rc)
 set_module_type(d3dxof win32dll)
 target_link_libraries(d3dxof dxguid uuid wine)
 add_importlibs(d3dxof msvcrt kernel32 ntdll)
+add_pch(d3dxof d3dxof_private.h SOURCE)
 add_cd_file(TARGET d3dxof DESTINATION reactos/system32 FOR all)
Index: dll/win32/shimgvw/lang/sq-AL.rc
===================================================================
--- dll/win32/shimgvw/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/shimgvw/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,21 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_APPTITLE "ReactOS VÃ«zhguesi i Fotove dhe Faxit"
+    IDS_SETASDESKBG "Vendos si Sfond Desktopi"
+    IDS_PREVIEW "Shikim Paraprak"
+    /* Tooltips */
+    IDS_TOOLTIP_NEXT_PIC "Fotoja TjetÃ«r"
+    IDS_TOOLTIP_PREV_PIC "Fotoja MÃ«parshme"
+    IDS_TOOLTIP_ZOOM_IN "Zoom BrÃ«nda (+)"
+    IDS_TOOLTIP_ZOOM_OUT "Zoom JashtÃ« (-)"
+    IDS_TOOLTIP_ROT_CLOCKW "Rrotullo KrahAkrepave (Ctrl+K)"
+    IDS_TOOLTIP_ROT_COUNCW "Rrotullo kundÃ«rKrahAkrepave (Ctrl+L)"
+    IDS_TOOLTIP_PRINT "Printo (Ctrl+P)"
+    IDS_TOOLTIP_SAVEAS "Ruaj Si... (Ctrl+S)"
+END

Modification de propriÃ©tÃ©s sur dll/win32/shimgvw/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/shimgvw/shimgvw.rc
===================================================================
--- dll/win32/shimgvw/shimgvw.rc	(rÃ©vision 61927)
+++ dll/win32/shimgvw/shimgvw.rc	(copie de travail)
@@ -64,6 +64,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/kernel32/wine/timezone.c
===================================================================
--- dll/win32/kernel32/wine/timezone.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/wine/timezone.c	(copie de travail)
@@ -120,7 +120,7 @@
 DWORD
 TIME_CompTimeZoneID( const TIME_ZONE_INFORMATION *pTZinfo, FILETIME *lpFileTime, BOOL islocal )
 {
-    int ret;
+    int ret, year;
     BOOL beforeStandardDate, afterDaylightDate;
     DWORD retval = TIME_ZONE_ID_INVALID;
     LONGLONG llTime = 0; /* initialized to prevent gcc complaining */
@@ -145,20 +145,29 @@
 
         if (!islocal) {
             FILETIME2LL( lpFileTime, llTime );
-            llTime -= ( pTZinfo->Bias + pTZinfo->DaylightBias )
-                * (LONGLONG)TICKSPERMIN;
+            llTime -= pTZinfo->Bias * (LONGLONG)TICKSPERMIN;
             LL2FILETIME( llTime, &ftTemp)
             lpFileTime = &ftTemp;
         }
 
         FileTimeToSystemTime(lpFileTime, &SysTime);
+        year = SysTime.wYear;
+
+        if (!islocal) {
+            llTime -= pTZinfo->DaylightBias * (LONGLONG)TICKSPERMIN;
+            LL2FILETIME( llTime, &ftTemp)
+            FileTimeToSystemTime(lpFileTime, &SysTime);
+        }
         
-         /* check for daylight savings */
-        ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate);
-        if (ret == -2)
-          return TIME_ZONE_ID_INVALID;
+        /* check for daylight savings */
+        if(year == SysTime.wYear) {
+            ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate);
+            if (ret == -2)
+                return TIME_ZONE_ID_INVALID;
 
-        beforeStandardDate = ret < 0;
+            beforeStandardDate = ret < 0;
+        } else
+            beforeStandardDate = SysTime.wYear < year;
 
         if (!islocal) {
             llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias )
@@ -167,11 +176,14 @@
             FileTimeToSystemTime(lpFileTime, &SysTime);
         }
 
-        ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate);
-        if (ret == -2)
-          return TIME_ZONE_ID_INVALID;
+        if(year == SysTime.wYear) {
+            ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate);
+            if (ret == -2)
+                return TIME_ZONE_ID_INVALID;
 
-        afterDaylightDate = ret >= 0;
+            afterDaylightDate = ret >= 0;
+        } else
+            afterDaylightDate = SysTime.wYear > year;
 
         retval = TIME_ZONE_ID_STANDARD;
         if( pTZinfo->DaylightDate.wMonth <  pTZinfo->StandardDate.wMonth ) {
Index: dll/win32/kernel32/winnls/lang/sq-AL.rc
===================================================================
--- dll/win32/kernel32/winnls/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/kernel32/winnls/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,163 @@
+#pragma code_page(1252)
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    /* Names of code pages */
+    1250 "1250  (ANSI - Europe Qendrore)"
+    1251 "1251  (ANSI - Cyrillic)"
+    1252 "1252  (ANSI - Latine I)"
+    1253 "1253  (ANSI - Greeke)"
+    1254 "1254  (ANSI - Turke)"
+    1255 "1255  (ANSI - Hebre)"
+    1256 "1256  (ANSI - Arabike)"
+    1257 "1257  (ANSI - Baltike)"
+    1258 "1258  (ANSI/OEM - Viet Nam)"
+    874  "874   (ANSI/OEM - Tailande)"
+    932  "932   (ANSI/OEM - Japanese Shift-JIS)"
+    936  "936   (ANSI/OEM - Kineze thjeshtuar GBK)"
+    949  "949   (ANSI/OEM - Koreane)"
+    950  "950   (ANSI/OEM - Tradicionale Kineze Big5)"
+
+    437  "437   (OEM - Amerikane)"
+    737  "737   (OEM - Greeke 437G)"
+    775  "775   (OEM - Baltike)"
+    850  "850   (OEM - Shumegjuhe Latine I)"
+    852  "852   (OEM - Latine II)"
+    855  "855   (OEM - Cyrillik)"
+    857  "857   (OEM - Turke)"
+    858  "858   (OEM - Shumegjuhe Latine I + Euro)"
+    860  "860   (OEM - Portugeze)"
+    861  "861   (OEM - Icelandik)"
+    862  "862   (OEM - Hebre)"
+    863  "863   (OEM - Kadaseze Frangjisht)"
+    864  "864   (OEM - Arabike)"
+    865  "865   (OEM - Nordike)"
+    866  "866   (OEM - Ruse)"
+    869  "869   (OEM - Greeke Moderne)"
+
+    10000 "10000 (MAC - Romane)"
+    10001 "10001 (MAC - Japoneze)"
+    10002 "10002 (MAC - Tradicionale Kineze Big5)"
+    10003 "10003 (MAC - Koreane)"
+    10004 "10004 (MAC - Arabike)"
+    10005 "10005 (MAC - Hebre)"
+    10006 "10006 (MAC - Greeke I)"
+    10007 "10007 (MAC - Cyrillik)"
+    10008 "10008 (MAC - Kineze thjeshtuar GB 2312)"
+    10010 "10010 (MAC - Rumune)"
+    10017 "10017 (MAC - Ukraine)"
+    10021 "10021 (MAC - Tailand)"
+    10029 "10029 (MAC - Latine II)"
+    10079 "10079 (MAC - Icelandic)"
+    10081 "10081 (MAC - Turke)"
+    10082 "10082 (MAC - Kroate)"
+
+    65000 "65000 (UTF-7)"
+    65001 "65001 (UTF-8)"
+
+    3700  "37    (IBM EBCDIC - U.S./Kanada)" /* FIXME */
+    1026  "1026  (IBM EBCDIC - Turke (Latin-5))"
+    1047  "1047  (IBM EBCDIC - Latin-1/Sistem i hapur)"
+    1140  "1140  (IBM EBCDIC - U.S./Kanada (37 + Euro))"
+    1141  "1141  (IBM EBCDIC - Gjermani (20273 + Euro))"
+    1142  "1142  (IBM EBCDIC - Danimark/Norvegji (20277 + Euro))"
+    1143  "1143  (IBM EBCDIC - Finland/Suedi (20278 + Euro))"
+    1144  "1144  (IBM EBCDIC - Itali (20280 + Euro))"
+    1145  "1145  (IBM EBCDIC - Amerika Latin/Spanja (20284 + Euro))"
+    1146  "1146  (IBM EBCDIC - Anglia (20285 + Euro))"
+    1147  "1147  (IBM EBCDIC - France (20297 + Euro))"
+    1148  "1148  (IBM EBCDIC - Internacionale (500 + Euro))"
+    1149  "1149  (IBM EBCDIC - Icelandic (20871 + Euro))"
+    20273 "20273 (IBM EBCDIC - Gjermani)"
+    20277 "20277 (IBM EBCDIC - Danimarke/Norvegji)"
+    20278 "20278 (IBM EBCDIC - Finland/Suedi)"
+    20280 "20280 (IBM EBCDIC - Itali)"
+    20284 "20284 (IBM EBCDIC - Amerika Latine/Spanja)"
+    20285 "20285 (IBM EBCDIC - Angli)"
+    20290 "20290 (IBM EBCDIC - Japanese Katakana Zgjatur)"
+    20297 "20297 (IBM EBCDIC - France)"
+    20420 "20420 (IBM EBCDIC - Arabik)"
+    20423 "20423 (IBM EBCDIC - Greeke)"
+    20424 "20424 (IBM EBCDIC - Hebre)"
+    20833 "20833 (IBM EBCDIC - Koreane Zgjatur)"
+    20838 "20838 (IBM EBCDIC - Thai)"
+    20871 "20871 (IBM EBCDIC - Icelandic)"
+    20880 "20880 (IBM EBCDIC - Cyrillic (Ruse))"
+    20905 "20905 (IBM EBCDIC - Turke)"
+    20924 "20924 (IBM EBCDIC - Latin-1/Open System (1047 + Euro))"
+    21025 "21025 (IBM EBCDIC - Cyrillic (Serbe, Bullgare))"
+    500   "500   (IBM EBCDIC - Internacionale)"
+    870   "870   (IBM EBCDIC - Shumegjuhe/ROECE (Latin-2))"
+    875   "875   (IBM EBCDIC - Moderne Greeke)"
+
+    20269 "20269 (ISO 6937 Aksent pa boshllek)"
+    28591 "28591 (ISO 8859-1 Latine I)"
+    28592 "28592 (ISO 8859-2 Europe Qendrore)"
+    28593 "28593 (ISO 8859-3 Latine 3)"
+    28594 "28594 (ISO 8859-4 Baltik)"
+    28595 "28595 (ISO 8859-5 Cyrillik)"
+    28596 "28596 (ISO 8859-6 Arabik)"
+    28597 "28597 (ISO 8859-7 Greeke)"
+    28598 "28598 (ISO 8859-8 Hebrew: Liste Vizuale)"
+    28599 "28599 (ISO 8859-9 Latine 5)"
+    28605 "28605 (ISO 8859-15 Latine 9)"
+    38598 "38598 (ISO 8859-8 Hebrew: Liste Logjike)"
+
+    20105 "20105 (IA5 IRV Alfabet Internacional No.5)"
+    20106 "20106 (IA5 Gjerman)"
+    20107 "20107 (IA5 Suedi)"
+    20108 "20108 (IA5 Norvegji)"
+
+    1361  "1361  (Korean - Johab)"
+    20000 "20000 (CNS - Taiwan)"
+    20001 "20001 (TCA - Taiwan)"
+    20002 "20002 (Eten - Taiwan)"
+    20003 "20003 (IBM5550 - Taiwan)"
+    20004 "20004 (TeleText - Taiwan)"
+    20005 "20005 (Wang - Taiwan)"
+    20127 "20127 (US-ASCII)"
+    20261 "20261 (T.61)"
+    20866 "20866 (Rus - KOI8)"
+    21027 "21027 (Ext Alpha Lowercase)"
+    21866 "21866 (Ukrainiane - KOI8-U)"
+    708   "708   (Arabik - ASMO)"
+    720   "720   (Arabik - Transparent ASMO)"
+    20932 "20932 (JIS X 0208-1990 & 0212-1990)"
+    20936 "20936 (Kineze Thjeshtuar GB2312)"
+    20949 "20949 (Korean Wansung)"
+
+    57002 "57002 (ISCII Devanagari)"
+    57003 "57003 (ISCII Bengali)"
+    57004 "57004 (ISCII Tamil)"
+    57005 "57005 (ISCII Telugu)"
+    57006 "57006 (ISCII Assamese)"
+    57007 "57007 (ISCII Oriya)"
+    57008 "57008 (ISCII Kannada)"
+    57009 "57009 (ISCII Malayalam)"
+    57010 "57010 (ISCII Gujarati)"
+    57011 "57011 (ISCII Gurmukhi)"
+
+    50930 "50930 (IBM EBCDIC - Japoneze (Katakana) Zgjatur dhe Japanese)"
+    50931 "50931 (IBM EBCDIC - US/Kanada dhe Japoni)"
+    50933 "50933 (IBM EBCDIC - Korean Zgjatur dhe Korean)"
+    50935 "50935 (IBM EBCDIC - Kineze e thjeshtuar)"
+    50937 "50937 (IBM EBCDIC - US/Kanada dhe Kineze Tradicionale)"
+    50939 "50939 (IBM EBCDIC - Japoneze (Latine) Zgjatur dhe Japoneze)"
+
+    50220 "50220 (ISO-2022 Japoneze pa halfwidth Katakana)"
+    50221 "50221 (ISO-2022 Japoneze me halfwidth Katakana)"
+    50222 "50222 (ISO-2022 Japoneze JIS X 0201-1989)"
+    50225 "50225 (ISO-2022 Koreane)"
+    50227 "50227 (ISO-2022 Kineze Thjeshtuar)"
+    50229 "50229 (ISO-2022 Kineze Tradicionale)"
+
+    51932 "51932 (EUC-Japoneze)"
+    51936 "51936 (EUC-Kineze Thjeshtuar)"
+    51949 "51949 (EUC-Koreane)"
+    51950 "51950 (EUC-Kineze Tradicionale)"
+
+    52936 "52936 (HZ-GB2312 Kineze Thjeshtuar)"
+    54936 "54936 (GB18030 Kineze Thjeshtesuar)"
+END

Modification de propriÃ©tÃ©s sur dll/win32/kernel32/winnls/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/kernel32/winnls/string/format_msg.c
===================================================================
--- dll/win32/kernel32/winnls/string/format_msg.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/winnls/string/format_msg.c	(copie de travail)
@@ -115,7 +115,7 @@
                               DWORD flags, struct format_args *args,
                               LPWSTR *result )
 {
-    static const WCHAR fmt_lu[] = {'%','l','u',0};
+    static const WCHAR fmt_u[] = {'%','u',0};
     WCHAR *wstring = NULL, *p, fmt[256];
     ULONG_PTR arg;
     int size;
@@ -155,7 +155,7 @@
     {
         if (*format == '*')
         {
-            p += sprintfW( p, fmt_lu, get_arg( insert, flags, args ));
+            p += sprintfW( p, fmt_u, get_arg( insert, flags, args ));
             insert = -1;
             format++;
         }
@@ -168,7 +168,7 @@
         *p++ = *format++;
         if (*format == '*')
         {
-            p += sprintfW( p, fmt_lu, get_arg( insert, flags, args ));
+            p += sprintfW( p, fmt_u, get_arg( insert, flags, args ));
             insert = -1;
             format++;
         }
@@ -198,7 +198,7 @@
              (unicode_caller && format[0] == 'C') ||
              (!unicode_caller && format[0] == 'c'))
     {
-        char ch = (char)arg;
+        char ch = arg;
         wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) );
         MultiByteToWideChar( CP_ACP, 0, &ch, 1, wstring, 1 );
         wstring[1] = 0;
@@ -249,6 +249,68 @@
     return format;
 }
 
+struct _format_message_data
+{
+    LPWSTR formatted;
+    DWORD size;
+    LPWSTR t;
+    LPWSTR space;
+    BOOL inspace;
+    DWORD width, w;
+};
+
+static void format_add_char(struct _format_message_data *fmd, WCHAR c)
+{
+    *fmd->t++ = c;
+    if (fmd->width && fmd->width != FORMAT_MESSAGE_MAX_WIDTH_MASK)
+    {
+        switch (c) {
+        case '\r':
+        case '\n':
+            fmd->space = NULL;
+            fmd->inspace = FALSE;
+            fmd->w = 0;
+            break;
+        case ' ':
+            if (!fmd->inspace)
+                fmd->space = fmd->t - 1;
+            fmd->inspace = TRUE;
+            fmd->w++;
+            break;
+        default:
+            fmd->inspace = FALSE;
+            fmd->w++;
+        }
+        if (fmd->w == fmd->width) {
+            LPWSTR notspace;
+            if (fmd->space) {
+                notspace = fmd->space;
+                while (*notspace == ' ' && notspace != fmd->t)
+                    notspace++;
+            } else
+                notspace = fmd->space = fmd->t;
+            fmd->w = fmd->t - notspace;
+            memmove(fmd->space+2, notspace, fmd->w * sizeof(*fmd->t));
+            *fmd->space++ = '\r';
+            *fmd->space++ = '\n';
+            fmd->t = fmd->space + fmd->w;
+            fmd->space = NULL;
+            fmd->inspace = FALSE;
+        }
+    }
+    if ((DWORD)(fmd->t - fmd->formatted) == fmd->size) {
+        DWORD_PTR ispace = fmd->space - fmd->formatted;
+        /* Allocate two extra characters so we can insert a '\r\n' in
+         * the middle of a word.
+         */
+        fmd->formatted = HeapReAlloc(GetProcessHeap(), 0, fmd->formatted, (fmd->size * 2 + 2) * sizeof(WCHAR));
+        fmd->t = fmd->formatted + fmd->size;
+        if (fmd->space)
+            fmd->space = fmd->formatted + ispace;
+        fmd->size *= 2;
+    }
+}
+
 /**********************************************************************
  *	format_message    (internal)
  */
@@ -255,25 +317,17 @@
 static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr,
                               struct format_args *format_args )
 {
-    LPWSTR target,t;
-    DWORD talloced;
+    struct _format_message_data fmd;
     LPCWSTR f;
-    DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
     BOOL eos = FALSE;
-    WCHAR ch;
 
-    target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) );
-    talloced = 100;
+    fmd.size = 100;
+    fmd.formatted = fmd.t = HeapAlloc( GetProcessHeap(), 0, (fmd.size + 2) * sizeof(WCHAR) );
 
-#define ADD_TO_T(c)  do {\
-    *t++=c;\
-    if ((DWORD)(t-target) == talloced) {\
-        target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\
-        t = target+talloced;\
-        talloced*=2;\
-    } \
-} while (0)
-
+    fmd.width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
+    fmd.w = 0;
+    fmd.inspace = FALSE;
+    fmd.space = NULL;
     f = fmtstr;
     while (*f && !eos) {
         if (*f=='%') {
@@ -290,7 +344,7 @@
                         (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list))
                 {
                     SetLastError(ERROR_INVALID_PARAMETER);
-                    HeapFree(GetProcessHeap(), 0, target);
+                    HeapFree(GetProcessHeap(), 0, fmd.formatted);
                     return NULL;
                 }
                 insertnr = *f-'0';
@@ -307,20 +361,20 @@
                     break;
                 }
                 f = format_insert( unicode_caller, insertnr, f, dwFlags, format_args, &str );
-                for (x = str; *x; x++) ADD_TO_T(*x);
+                for (x = str; *x; x++) format_add_char(&fmd, *x);
                 HeapFree( GetProcessHeap(), 0, str );
                 break;
             case 'n':
-                ADD_TO_T('\r');
-                ADD_TO_T('\n');
+                format_add_char(&fmd, '\r');
+                format_add_char(&fmd, '\n');
                 f++;
                 break;
             case 'r':
-                ADD_TO_T('\r');
+                format_add_char(&fmd, '\r');
                 f++;
                 break;
             case 't':
-                ADD_TO_T('\t');
+                format_add_char(&fmd, '\t');
                 f++;
                 break;
             case '0':
@@ -329,53 +383,51 @@
                 break;
             case '\0':
                 SetLastError(ERROR_INVALID_PARAMETER);
-                HeapFree(GetProcessHeap(), 0, target);
+                HeapFree(GetProcessHeap(), 0, fmd.formatted);
                 return NULL;
             ignore_inserts:
             default:
                 if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS)
-                    ADD_TO_T('%');
-                ADD_TO_T(*f++);
+                    format_add_char(&fmd, '%');
+                format_add_char(&fmd, *f++);
                 break;
             }
         } else {
-            ch = *f;
+            WCHAR ch = *f;
             f++;
             if (ch == '\r') {
                 if (*f == '\n')
                     f++;
-                if(width)
-                    ADD_TO_T(' ');
+                if(fmd.width)
+                    format_add_char(&fmd, ' ');
                 else
                 {
-                    ADD_TO_T('\r');
-                    ADD_TO_T('\n');
+                    format_add_char(&fmd, '\r');
+                    format_add_char(&fmd, '\n');
                 }
             } else {
                 if (ch == '\n')
                 {
-                    if(width)
-                        ADD_TO_T(' ');
+                    if(fmd.width)
+                        format_add_char(&fmd, ' ');
                     else
                     {
-                        ADD_TO_T('\r');
-                        ADD_TO_T('\n');
+                        format_add_char(&fmd, '\r');
+                        format_add_char(&fmd, '\n');
                     }
                 }
                 else
-                    ADD_TO_T(ch);
+                    format_add_char(&fmd, ch);
             }
         }
     }
-    *t = '\0';
+    *fmd.t = '\0';
 
-    return target;
+    return fmd.formatted;
 }
-#undef ADD_TO_T
 
 /***********************************************************************
  *           FormatMessageA   (KERNEL32.@)
- * FIXME: missing wrap,
  */
 DWORD WINAPI FormatMessageA(
 	DWORD	dwFlags,
@@ -391,7 +443,6 @@
     LPWSTR	target;
     DWORD	destlength;
     LPWSTR	from;
-    DWORD	width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
 
     TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n",
           dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
@@ -420,8 +471,6 @@
         format_args.last = 0;
     }
 
-    if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK)
-        FIXME("line wrapping (%u) not supported.\n", width);
     from = NULL;
     if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
     {
@@ -432,9 +481,9 @@
     else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM))
     {
         if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)
-            from = load_message( (HMODULE)lpSource, dwMessageId, (WORD)dwLanguageId );
+            from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId );
         if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM))
-            from = load_message( kernel32_handle, dwMessageId, (WORD)dwLanguageId );
+            from = load_message( kernel32_handle, dwMessageId, dwLanguageId );
         if (!from) return 0;
     }
     else
@@ -497,7 +546,6 @@
     LPWSTR target;
     DWORD talloced;
     LPWSTR from;
-    DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
 
     TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n",
           dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
@@ -524,8 +572,6 @@
         format_args.last = 0;
     }
 
-    if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK)
-        FIXME("line wrapping not supported.\n");
     from = NULL;
     if (dwFlags & FORMAT_MESSAGE_FROM_STRING) {
         from = HeapAlloc( GetProcessHeap(), 0, (strlenW(lpSource) + 1) *
@@ -535,9 +581,9 @@
     else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM))
     {
         if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)
-            from = load_message( (HMODULE)lpSource, dwMessageId, (WORD)dwLanguageId );
+            from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId );
         if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM))
-            from = load_message( kernel32_handle, dwMessageId, (WORD)dwLanguageId );
+            from = load_message( kernel32_handle, dwMessageId, dwLanguageId );
         if (!from) return 0;
     }
     else
Index: dll/win32/kernel32/winnls/string/lang.c
===================================================================
--- dll/win32/kernel32/winnls/string/lang.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/winnls/string/lang.c	(copie de travail)
@@ -1767,13 +1767,13 @@
  *           str1 is less than, equal to or greater than str2 respectively.
  *  Failure: FALSE. Use GetLastError() to determine the cause.
  */
-INT WINAPI CompareStringA(LCID lcid, DWORD style,
+INT WINAPI CompareStringA(LCID lcid, DWORD flags,
                           LPCSTR str1, INT len1, LPCSTR str2, INT len2)
 {
     WCHAR *buf1W = NtCurrentTeb()->StaticUnicodeBuffer;
     WCHAR *buf2W = buf1W + 130;
     LPWSTR str1W, str2W;
-    INT len1W, len2W, ret;
+    INT len1W = 0, len2W = 0, ret;
     UINT locale_cp = CP_ACP;
 
     if (!str1 || !str2)
@@ -1784,39 +1784,56 @@
     if (len1 < 0) len1 = strlen(str1);
     if (len2 < 0) len2 = strlen(str2);
 
-    if (!(style & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid );
+    if (!(flags & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid );
 
-    len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130);
-    if (len1W)
-        str1W = buf1W;
-    else
+    if (len1)
     {
-        len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, NULL, 0);
-        str1W = HeapAlloc(GetProcessHeap(), 0, len1W * sizeof(WCHAR));
-        if (!str1W)
+        if (len1 <= 130) len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130);
+        if (len1W)
+            str1W = buf1W;
+        else
         {
-            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-            return 0;
+            len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, NULL, 0);
+            str1W = HeapAlloc(GetProcessHeap(), 0, len1W * sizeof(WCHAR));
+            if (!str1W)
+            {
+                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                return 0;
+            }
+            MultiByteToWideChar(locale_cp, 0, str1, len1, str1W, len1W);
         }
-        MultiByteToWideChar(locale_cp, 0, str1, len1, str1W, len1W);
     }
-    len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130);
-    if (len2W)
-        str2W = buf2W;
     else
     {
-        len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, NULL, 0);
-        str2W = HeapAlloc(GetProcessHeap(), 0, len2W * sizeof(WCHAR));
-        if (!str2W)
+        len1W = 0;
+        str1W = buf1W;
+    }
+
+    if (len2)
+    {
+        if (len2 <= 130) len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130);
+        if (len2W)
+            str2W = buf2W;
+        else
         {
-            if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W);
-            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-            return 0;
+            len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, NULL, 0);
+            str2W = HeapAlloc(GetProcessHeap(), 0, len2W * sizeof(WCHAR));
+            if (!str2W)
+            {
+                if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W);
+                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                return 0;
+            }
+            MultiByteToWideChar(locale_cp, 0, str2, len2, str2W, len2W);
         }
-        MultiByteToWideChar(locale_cp, 0, str2, len2, str2W, len2W);
     }
+    else
+    {
+        len2W = 0;
+        str2W = buf2W;
+    }
 
-    ret = CompareStringW(lcid, style, str1W, len1W, str2W, len2W);
+    ret = CompareStringW(lcid, flags, str1W, len1W, str2W, len2W);
 
     if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W);
     if (str2W != buf2W) HeapFree(GetProcessHeap(), 0, str2W);
Index: dll/win32/kernel32/CMakeLists.txt
===================================================================
--- dll/win32/kernel32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/kernel32/CMakeLists.txt	(copie de travail)
@@ -80,8 +80,7 @@
     winnls/string/lstring.c
     winnls/string/nls.c
     winnls/string/sortkey.c
-    kernel32.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)
+    k32.h)
 
 if(ARCH STREQUAL "i386")
     list(APPEND ASM_SOURCE
@@ -94,9 +93,13 @@
 endif()
 
 add_asm_files(kernel32_asm ${ASM_SOURCE})
-add_library(kernel32 SHARED ${SOURCE} ${kernel32_asm})
+add_library(kernel32 SHARED
+    ${SOURCE}
+    ${kernel32_asm}
+    kernel32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)
 
-set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12)
+set_module_type(kernel32 win32dll HOTPATCHABLE ENTRYPOINT DllMain 12)
 #############################################
 ## HACK FOR MSVC COMPILATION WITH win32dll ##
 set_subsystem(kernel32 console)
@@ -105,6 +108,6 @@
 target_link_libraries(kernel32 wine chkstk ${PSEH_LIB})
 
 add_importlibs(kernel32 ntdll)
-add_pch(kernel32 k32.h)
+add_pch(kernel32 k32.h SOURCE)
 add_dependencies(kernel32 psdk errcodes asm)
 add_cd_file(TARGET kernel32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/kernel32/client/proc.c
===================================================================
--- dll/win32/kernel32/client/proc.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/proc.c	(copie de travail)
@@ -673,9 +673,8 @@
     if (lpEnvironment)
     {
         /* Find the environment size */
-        while ((ScanChar[0]) || (ScanChar[1])) ++ScanChar;
-        ScanChar += (2 * sizeof(UNICODE_NULL));
-        EnviroSize = (ULONG_PTR)ScanChar - (ULONG_PTR)lpEnvironment;
+        while (*ScanChar++) while (*ScanChar++);
+        EnviroSize = (ULONG)((ULONG_PTR)ScanChar - (ULONG_PTR)lpEnvironment);
 
         /* Allocate and Initialize new Environment Block */
         Size = EnviroSize;
@@ -4606,6 +4605,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 CreateProcessW(LPCWSTR lpApplicationName,
                LPWSTR lpCommandLine,
                LPSECURITY_ATTRIBUTES lpProcessAttributes,
@@ -4774,6 +4774,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 CreateProcessA(LPCSTR lpApplicationName,
                LPSTR lpCommandLine,
                LPSECURITY_ATTRIBUTES lpProcessAttributes,
Index: dll/win32/kernel32/client/thread.c
===================================================================
--- dll/win32/kernel32/client/thread.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/thread.c	(copie de travail)
@@ -131,6 +131,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateThread(IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
              IN DWORD dwStackSize,
              IN LPTHREAD_START_ROUTINE lpStartAddress,
Index: dll/win32/kernel32/client/console/console.c
===================================================================
--- dll/win32/kernel32/client/console/console.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/console/console.c	(copie de travail)
@@ -252,17 +252,18 @@
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_MENUCONTROL MenuControlRequest = &ApiMessage.Data.MenuControlRequest;
 
-    MenuControlRequest->OutputHandle = hConsoleOutput;
-    MenuControlRequest->dwCmdIdLow   = dwCmdIdLow;
-    MenuControlRequest->dwCmdIdHigh  = dwCmdIdHigh;
-    MenuControlRequest->hMenu        = NULL;
+    MenuControlRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    MenuControlRequest->OutputHandle  = hConsoleOutput;
+    MenuControlRequest->CmdIdLow      = dwCmdIdLow;
+    MenuControlRequest->CmdIdHigh     = dwCmdIdHigh;
+    MenuControlRequest->MenuHandle    = NULL;
 
     CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                         NULL,
                         CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepMenuControl),
-                        sizeof(CONSOLE_MENUCONTROL));
+                        sizeof(*MenuControlRequest));
 
-    return MenuControlRequest->hMenu;
+    return MenuControlRequest->MenuHandle;
 }
 
 
@@ -314,7 +315,6 @@
 WINAPI
 GetConsoleDisplayMode(LPDWORD lpModeFlags)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_GETDISPLAYMODE GetDisplayModeRequest = &ApiMessage.Data.GetDisplayModeRequest;
 
@@ -324,19 +324,19 @@
         return FALSE;
     }
 
-    // GetDisplayModeRequest->OutputHandle = hConsoleOutput;
+    GetDisplayModeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetDisplayMode),
-                                 sizeof(CONSOLE_GETDISPLAYMODE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetDisplayMode),
+                        sizeof(*GetDisplayModeRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
-    *lpModeFlags = GetDisplayModeRequest->DisplayMode;
+    *lpModeFlags = GetDisplayModeRequest->DisplayMode; // ModeFlags
     return TRUE;
 }
 
@@ -378,33 +378,34 @@
 BOOL
 WINAPI
 GetConsoleHardwareState(HANDLE hConsoleOutput,
-                        DWORD Flags,
+                        PDWORD Flags,
                         PDWORD State)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest;
 
     DPRINT1("GetConsoleHardwareState(%lu, 0x%p) UNIMPLEMENTED!\n", Flags, State);
 
-    if (State == NULL)
+    if (Flags == NULL || State == NULL)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
 
-    HardwareStateRequest->OutputHandle = hConsoleOutput;
+    HardwareStateRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    HardwareStateRequest->OutputHandle  = hConsoleOutput;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetHardwareState),
-                                 sizeof(CONSOLE_GETSETHWSTATE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetHardwareState),
+                        sizeof(*HardwareStateRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
+    *Flags = HardwareStateRequest->Flags;
     *State = HardwareStateRequest->State;
     return TRUE;
 }
@@ -458,7 +459,6 @@
 InvalidateConsoleDIBits(IN HANDLE hConsoleOutput,
                         IN PSMALL_RECT lpRect)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_INVALIDATEDIBITS InvalidateDIBitsRequest = &ApiMessage.Data.InvalidateDIBitsRequest;
 
@@ -468,16 +468,17 @@
         return FALSE;
     }
 
-    InvalidateDIBitsRequest->OutputHandle = hConsoleOutput;
-    InvalidateDIBitsRequest->Region       = *lpRect;
+    InvalidateDIBitsRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    InvalidateDIBitsRequest->OutputHandle  = hConsoleOutput;
+    InvalidateDIBitsRequest->Region        = *lpRect;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepInvalidateBitMapRect),
-                                 sizeof(CONSOLE_INVALIDATEDIBITS));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepInvalidateBitMapRect),
+                        sizeof(*InvalidateDIBitsRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -546,23 +547,23 @@
  */
 BOOL
 WINAPI
-SetConsoleCursor(HANDLE hConsoleOutput,
+SetConsoleCursor(HANDLE  hConsoleOutput,
                  HCURSOR hCursor)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_SETCURSOR SetCursorRequest = &ApiMessage.Data.SetCursorRequest;
 
-    SetCursorRequest->OutputHandle = hConsoleOutput;
-    SetCursorRequest->hCursor      = hCursor;
+    SetCursorRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    SetCursorRequest->OutputHandle  = hConsoleOutput;
+    SetCursorRequest->CursorHandle  = hCursor;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursor),
-                                 sizeof(CONSOLE_SETCURSOR));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursor),
+                        sizeof(*SetCursorRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -576,25 +577,26 @@
 BOOL
 WINAPI
 SetConsoleDisplayMode(HANDLE hConsoleOutput,
-                      DWORD dwFlags,
+                      DWORD  dwFlags, // dwModeFlags
                       PCOORD lpNewScreenBufferDimensions)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_SETDISPLAYMODE SetDisplayModeRequest = &ApiMessage.Data.SetDisplayModeRequest;
 
-    SetDisplayModeRequest->OutputHandle = hConsoleOutput;
-    SetDisplayModeRequest->DisplayMode  = dwFlags;
-    SetDisplayModeRequest->NewSBDim.X   = 0;
-    SetDisplayModeRequest->NewSBDim.Y   = 0;
+    SetDisplayModeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    SetDisplayModeRequest->OutputHandle  = hConsoleOutput;
+    SetDisplayModeRequest->DisplayMode   = dwFlags; // ModeFlags ; dwModeFlags
+    SetDisplayModeRequest->NewSBDim.X    = 0;
+    SetDisplayModeRequest->NewSBDim.Y    = 0;
+    /* SetDisplayModeRequest->EventHandle; */
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetDisplayMode),
-                                 sizeof(CONSOLE_SETDISPLAYMODE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetDisplayMode),
+                        sizeof(*SetDisplayModeRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -628,22 +630,23 @@
                         DWORD Flags,
                         DWORD State)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest;
 
     DPRINT1("SetConsoleHardwareState(%lu, %lu) UNIMPLEMENTED!\n", Flags, State);
 
-    HardwareStateRequest->OutputHandle = hConsoleOutput;
-    HardwareStateRequest->State = State;
+    HardwareStateRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    HardwareStateRequest->OutputHandle  = hConsoleOutput;
+    HardwareStateRequest->Flags         = Flags;
+    HardwareStateRequest->State         = State;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetHardwareState),
-                                 sizeof(CONSOLE_GETSETHWSTATE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetHardwareState),
+                        sizeof(*HardwareStateRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -690,19 +693,19 @@
 WINAPI
 SetConsoleMenuClose(BOOL bEnable)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_SETMENUCLOSE SetMenuCloseRequest = &ApiMessage.Data.SetMenuCloseRequest;
 
-    SetMenuCloseRequest->Enable = bEnable;
+    SetMenuCloseRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    SetMenuCloseRequest->Enable        = bEnable;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetMenuClose),
-                                 sizeof(CONSOLE_SETMENUCLOSE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetMenuClose),
+                        sizeof(*SetMenuCloseRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -721,21 +724,21 @@
                   HPALETTE hPalette,
                   UINT dwUsage)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_SETPALETTE SetPaletteRequest = &ApiMessage.Data.SetPaletteRequest;
 
+    SetPaletteRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
     SetPaletteRequest->OutputHandle  = hConsoleOutput;
     SetPaletteRequest->PaletteHandle = hPalette;
     SetPaletteRequest->Usage         = dwUsage;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetPalette),
-                                 sizeof(CONSOLE_SETPALETTE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetPalette),
+                        sizeof(*SetPaletteRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -754,14 +757,15 @@
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_SHOWCURSOR ShowCursorRequest = &ApiMessage.Data.ShowCursorRequest;
 
-    ShowCursorRequest->OutputHandle = hConsoleOutput;
-    ShowCursorRequest->Show         = bShow;
-    ShowCursorRequest->RefCount     = 0;
+    ShowCursorRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    ShowCursorRequest->OutputHandle  = hConsoleOutput;
+    ShowCursorRequest->Show          = bShow;
+    ShowCursorRequest->RefCount      = 0;
 
     CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                         NULL,
                         CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepShowCursor),
-                        sizeof(CONSOLE_SHOWCURSOR));
+                        sizeof(*ShowCursorRequest));
 
     return ShowCursorRequest->RefCount;
 }
@@ -771,10 +775,10 @@
  * FUNCTION: Checks whether the given handle is a valid console handle.
  *
  * ARGUMENTS:
- *      Handle - Handle to be checked
+ *      hIoHandle - Handle to be checked.
  *
  * RETURNS:
- *      TRUE: Handle is a valid console handle
+ *      TRUE : Handle is a valid console handle.
  *      FALSE: Handle is not a valid console handle.
  *
  * STATUS: Officially undocumented
@@ -783,24 +787,29 @@
  */
 BOOL
 WINAPI
-VerifyConsoleIoHandle(HANDLE Handle)
+VerifyConsoleIoHandle(HANDLE hIoHandle)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_VERIFYHANDLE VerifyHandleRequest = &ApiMessage.Data.VerifyHandleRequest;
 
-    ApiMessage.Data.VerifyHandleRequest.ConsoleHandle = Handle;
+    VerifyHandleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    VerifyHandleRequest->Handle        = hIoHandle;
+    VerifyHandleRequest->IsValid       = FALSE;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepVerifyIoHandle),
-                                 sizeof(CONSOLE_VERIFYHANDLE));
-    if (!NT_SUCCESS(Status))
+    /* If the process is not attached to a console, return invalid handle */
+    if (VerifyHandleRequest->ConsoleHandle == NULL) return FALSE;
+
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepVerifyIoHandle),
+                        sizeof(*VerifyHandleRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
-    return TRUE;
+    return VerifyHandleRequest->IsValid;
 }
 
 
@@ -809,20 +818,21 @@
  */
 BOOL
 WINAPI
-CloseConsoleHandle(HANDLE Handle)
+CloseConsoleHandle(HANDLE hHandle)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_CLOSEHANDLE CloseHandleRequest = &ApiMessage.Data.CloseHandleRequest;
 
-    ApiMessage.Data.CloseHandleRequest.ConsoleHandle = Handle;
+    CloseHandleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    CloseHandleRequest->Handle        = hHandle;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepCloseHandle),
-                                 sizeof(CONSOLE_CLOSEHANDLE));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepCloseHandle),
+                        sizeof(*CloseHandleRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
@@ -848,21 +858,27 @@
  */
 {
     PRTL_USER_PROCESS_PARAMETERS Ppb = NtCurrentPeb()->ProcessParameters;
+    HANDLE Handle = INVALID_HANDLE_VALUE;
 
     switch (nStdHandle)
     {
         case STD_INPUT_HANDLE:
-            return Ppb->StandardInput;
+            Handle = Ppb->StandardInput;
+            break;
 
         case STD_OUTPUT_HANDLE:
-            return Ppb->StandardOutput;
+            Handle = Ppb->StandardOutput;
+            break;
 
         case STD_ERROR_HANDLE:
-            return Ppb->StandardError;
+            Handle = Ppb->StandardError;
+            break;
     }
 
-    SetLastError(ERROR_INVALID_HANDLE);
-    return INVALID_HANDLE_VALUE;
+    /* If the returned handle is invalid, set last error */
+    if (Handle == INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE);
+
+    return Handle;
 }
 
 
@@ -871,7 +887,7 @@
  */
 BOOL
 WINAPI
-SetStdHandle(DWORD nStdHandle,
+SetStdHandle(DWORD  nStdHandle,
              HANDLE hHandle)
 /*
  * FUNCTION: Set the handle for the standard input, standard output or
@@ -886,7 +902,7 @@
 {
     PRTL_USER_PROCESS_PARAMETERS Ppb = NtCurrentPeb()->ProcessParameters;
 
-    /* no need to check if hHandle == INVALID_HANDLE_VALUE */
+    /* No need to check if hHandle == INVALID_HANDLE_VALUE */
 
     switch (nStdHandle)
     {
@@ -903,7 +919,7 @@
             return TRUE;
     }
 
-    /* Windows for whatever reason sets the last error to ERROR_INVALID_HANDLE here */
+    /* nStdHandle was invalid, bail out */
     SetLastError(ERROR_INVALID_HANDLE);
     return FALSE;
 }
@@ -1021,8 +1037,8 @@
 GetConsoleScreenBufferInfo(HANDLE hConsoleOutput,
                            PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_GETSCREENBUFFERINFO ScreenBufferInfoRequest = &ApiMessage.Data.ScreenBufferInfoRequest;
 
     if (lpConsoleScreenBufferInfo == NULL)
     {
@@ -1030,19 +1046,27 @@
         return FALSE;
     }
 
-    ApiMessage.Data.ScreenBufferInfoRequest.OutputHandle = hConsoleOutput;
+    ScreenBufferInfoRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    ScreenBufferInfoRequest->OutputHandle  = hConsoleOutput;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetScreenBufferInfo),
-                                 sizeof(CONSOLE_GETSCREENBUFFERINFO));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetScreenBufferInfo),
+                        sizeof(*ScreenBufferInfoRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
-    *lpConsoleScreenBufferInfo = ApiMessage.Data.ScreenBufferInfoRequest.Info;
+    lpConsoleScreenBufferInfo->dwSize              = ScreenBufferInfoRequest->ScreenBufferSize;
+    lpConsoleScreenBufferInfo->dwCursorPosition    = ScreenBufferInfoRequest->CursorPosition;
+    lpConsoleScreenBufferInfo->wAttributes         = ScreenBufferInfoRequest->Attributes;
+    lpConsoleScreenBufferInfo->srWindow.Left       = ScreenBufferInfoRequest->ViewOrigin.X;
+    lpConsoleScreenBufferInfo->srWindow.Top        = ScreenBufferInfoRequest->ViewOrigin.Y;
+    lpConsoleScreenBufferInfo->srWindow.Right      = ScreenBufferInfoRequest->ViewOrigin.X + ScreenBufferInfoRequest->ViewSize.X - 1;
+    lpConsoleScreenBufferInfo->srWindow.Bottom     = ScreenBufferInfoRequest->ViewOrigin.Y + ScreenBufferInfoRequest->ViewSize.Y - 1;
+    lpConsoleScreenBufferInfo->dwMaximumWindowSize = ScreenBufferInfoRequest->MaximumViewSize;
 
     return TRUE;
 }
@@ -1932,21 +1956,24 @@
 WINAPI
 GetConsoleCP(VOID)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest = &ApiMessage.Data.GetConsoleCPRequest;
 
     /* Get the Input Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP  = TRUE;
-    ApiMessage.Data.ConsoleCPRequest.CodePage = 0;
+    GetConsoleCPRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    GetConsoleCPRequest->OutputCP      = FALSE;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
-                                 sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
+                        sizeof(*GetConsoleCPRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
+    {
+        BaseSetLastNTError(ApiMessage.Status);
+        return 0;
+    }
 
-    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
-
-    return ApiMessage.Data.ConsoleCPRequest.CodePage;
+    return GetConsoleCPRequest->CodePage;
 }
 
 
@@ -1959,21 +1986,26 @@
 WINAPI
 SetConsoleCP(UINT wCodePageID)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest = &ApiMessage.Data.SetConsoleCPRequest;
 
     /* Set the Input Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP  = TRUE;
-    ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID;
+    SetConsoleCPRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    SetConsoleCPRequest->CodePage      = wCodePageID;
+    SetConsoleCPRequest->OutputCP      = FALSE;
+    /* SetConsoleCPRequest->EventHandle; */
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
-                                 sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
+                        sizeof(*SetConsoleCPRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
+    {
+        BaseSetLastNTError(ApiMessage.Status);
+        return FALSE;
+    }
 
-    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
-
-    return NT_SUCCESS(Status);
+    return TRUE;
 }
 
 
@@ -1986,21 +2018,24 @@
 WINAPI
 GetConsoleOutputCP(VOID)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest = &ApiMessage.Data.GetConsoleCPRequest;
 
     /* Get the Output Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP  = FALSE;
-    ApiMessage.Data.ConsoleCPRequest.CodePage = 0;
+    GetConsoleCPRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    GetConsoleCPRequest->OutputCP      = TRUE;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
-                                 sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
+                        sizeof(*GetConsoleCPRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
+    {
+        BaseSetLastNTError(ApiMessage.Status);
+        return 0;
+    }
 
-    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
-
-    return ApiMessage.Data.ConsoleCPRequest.CodePage;
+    return GetConsoleCPRequest->CodePage;
 }
 
 
@@ -2013,21 +2048,26 @@
 WINAPI
 SetConsoleOutputCP(UINT wCodePageID)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest = &ApiMessage.Data.SetConsoleCPRequest;
 
     /* Set the Output Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP  = FALSE;
-    ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID;
+    SetConsoleCPRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    SetConsoleCPRequest->CodePage      = wCodePageID;
+    SetConsoleCPRequest->OutputCP      = TRUE;
+    /* SetConsoleCPRequest->EventHandle; */
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
-                                 sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
+                        sizeof(*SetConsoleCPRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
+    {
+        BaseSetLastNTError(ApiMessage.Status);
+        return FALSE;
+    }
 
-    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
-
-    return NT_SUCCESS(Status);
+    return TRUE;
 }
 
 
@@ -2041,11 +2081,10 @@
 GetConsoleProcessList(LPDWORD lpdwProcessList,
                       DWORD dwProcessCount)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
     PCONSOLE_GETPROCESSLIST GetProcessListRequest = &ApiMessage.Data.GetProcessListRequest;
     PCSR_CAPTURE_BUFFER CaptureBuffer;
-    ULONG nProcesses;
+    ULONG nProcesses = 0;
 
     if (lpdwProcessList == NULL || dwProcessCount == 0)
     {
@@ -2058,30 +2097,30 @@
     {
         DPRINT1("CsrAllocateCaptureBuffer failed!\n");
         SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        return FALSE;
+        return 0;
     }
 
-    GetProcessListRequest->nMaxIds = dwProcessCount;
+    GetProcessListRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    GetProcessListRequest->ProcessCount  = dwProcessCount;
 
     CsrAllocateMessagePointer(CaptureBuffer,
                               dwProcessCount * sizeof(DWORD),
-                              (PVOID*)&GetProcessListRequest->pProcessIds);
+                              (PVOID*)&GetProcessListRequest->ProcessIdsList);
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 CaptureBuffer,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetProcessList),
-                                 sizeof(CONSOLE_GETPROCESSLIST));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        CaptureBuffer,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetProcessList),
+                        sizeof(*GetProcessListRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError (Status);
-        nProcesses = 0;
+        BaseSetLastNTError(ApiMessage.Status);
     }
     else
     {
-        nProcesses = GetProcessListRequest->nProcessIdsTotal;
+        nProcesses = GetProcessListRequest->ProcessCount;
         if (dwProcessCount >= nProcesses)
         {
-            memcpy(lpdwProcessList, GetProcessListRequest->pProcessIds, nProcesses * sizeof(DWORD));
+            memcpy(lpdwProcessList, GetProcessListRequest->ProcessIdsList, nProcesses * sizeof(DWORD));
         }
     }
 
@@ -2099,8 +2138,8 @@
 WINAPI
 GetConsoleSelectionInfo(PCONSOLE_SELECTION_INFO lpConsoleSelectionInfo)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_GETSELECTIONINFO GetSelectionInfoRequest = &ApiMessage.Data.GetSelectionInfoRequest;
 
     if (lpConsoleSelectionInfo == NULL)
     {
@@ -2108,17 +2147,19 @@
         return FALSE;
     }
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetSelectionInfo),
-                                 sizeof(CONSOLE_GETSELECTIONINFO));
-    if (!NT_SUCCESS(Status))
+    GetSelectionInfoRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetSelectionInfo),
+                        sizeof(*GetSelectionInfoRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
-    *lpConsoleSelectionInfo = ApiMessage.Data.GetSelectionInfoRequest.Info;
+    *lpConsoleSelectionInfo = GetSelectionInfoRequest->Info;
     return TRUE;
 }
 
@@ -2183,20 +2224,22 @@
 WINAPI
 GetConsoleWindow(VOID)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_GETWINDOW GetWindowRequest = &ApiMessage.Data.GetWindowRequest;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleWindow),
-                                 sizeof(CONSOLE_GETWINDOW));
-    if (!NT_SUCCESS(Status))
+    GetWindowRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleWindow),
+                        sizeof(*GetWindowRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return (HWND)NULL;
     }
 
-    return ApiMessage.Data.GetWindowRequest.WindowHandle;
+    return GetWindowRequest->WindowHandle;
 }
 
 
@@ -2207,24 +2250,25 @@
  */
 BOOL
 WINAPI
-SetConsoleIcon(HICON hicon)
+SetConsoleIcon(HICON hIcon)
 {
-    NTSTATUS Status;
     CONSOLE_API_MESSAGE ApiMessage;
+    PCONSOLE_SETICON SetIconRequest = &ApiMessage.Data.SetIconRequest;
 
-    ApiMessage.Data.SetIconRequest.WindowIcon = hicon;
+    SetIconRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    SetIconRequest->IconHandle    = hIcon;
 
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetIcon),
-                                 sizeof(CONSOLE_SETICON));
-    if (!NT_SUCCESS(Status))
+    CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                        NULL,
+                        CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetIcon),
+                        sizeof(*SetIconRequest));
+    if (!NT_SUCCESS(ApiMessage.Status))
     {
-        BaseSetLastNTError(Status);
+        BaseSetLastNTError(ApiMessage.Status);
         return FALSE;
     }
 
-    return NT_SUCCESS(Status);
+    return TRUE;
 }
 
 
Index: dll/win32/kernel32/client/synch.c
===================================================================
--- dll/win32/kernel32/client/synch.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/synch.c	(copie de travail)
@@ -426,6 +426,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateSemaphoreA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes  OPTIONAL,
                  IN LONG lInitialCount,
                  IN LONG lMaximumCount,
@@ -439,6 +440,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateSemaphoreW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes  OPTIONAL,
                  IN LONG lInitialCount,
                  IN LONG lMaximumCount,
@@ -456,6 +458,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 OpenSemaphoreA(IN DWORD dwDesiredAccess,
                IN BOOL bInheritHandle,
                IN LPCSTR lpName)
@@ -468,6 +471,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 OpenSemaphoreW(IN DWORD dwDesiredAccess,
                IN BOOL bInheritHandle,
                IN LPCWSTR lpName)
@@ -480,6 +484,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReleaseSemaphore(IN HANDLE hSemaphore,
                  IN LONG lReleaseCount,
                  IN LPLONG lpPreviousCount)
@@ -500,6 +505,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateMutexA(IN LPSECURITY_ATTRIBUTES lpMutexAttributes  OPTIONAL,
              IN BOOL bInitialOwner,
              IN LPCSTR lpName  OPTIONAL)
@@ -512,6 +518,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateMutexW(IN LPSECURITY_ATTRIBUTES lpMutexAttributes  OPTIONAL,
              IN BOOL bInitialOwner,
              IN LPCWSTR lpName  OPTIONAL)
@@ -527,6 +534,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 OpenMutexA(IN DWORD dwDesiredAccess,
            IN BOOL bInheritHandle,
            IN LPCSTR lpName)
@@ -539,6 +547,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 OpenMutexW(IN DWORD dwDesiredAccess,
            IN BOOL bInheritHandle,
            IN LPCWSTR lpName)
@@ -551,6 +560,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReleaseMutex(IN HANDLE hMutex)
 {
     NTSTATUS Status;
@@ -569,6 +579,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateEventA(IN LPSECURITY_ATTRIBUTES lpEventAttributes  OPTIONAL,
              IN BOOL bManualReset,
              IN BOOL bInitialState,
@@ -582,6 +593,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 CreateEventW(IN LPSECURITY_ATTRIBUTES lpEventAttributes  OPTIONAL,
              IN BOOL bManualReset,
              IN BOOL bInitialState,
@@ -599,6 +611,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 OpenEventA(IN DWORD dwDesiredAccess,
            IN BOOL bInheritHandle,
            IN LPCSTR lpName)
@@ -611,6 +624,7 @@
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 OpenEventW(IN DWORD dwDesiredAccess,
            IN BOOL bInheritHandle,
            IN LPCWSTR lpName)
@@ -623,6 +637,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 PulseEvent(IN HANDLE hEvent)
 {
     NTSTATUS Status;
@@ -641,6 +656,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ResetEvent(IN HANDLE hEvent)
 {
     NTSTATUS Status;
@@ -659,6 +675,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetEvent(IN HANDLE hEvent)
 {
     NTSTATUS Status;
@@ -715,6 +732,7 @@
  */
 VOID
 WINAPI
+DECLSPEC_HOTPATCH
 Sleep(IN DWORD dwMilliseconds)
 {
     /* Call the new API */
Index: dll/win32/kernel32/client/loader.c
===================================================================
--- dll/win32/kernel32/client/loader.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/loader.c	(copie de travail)
@@ -107,6 +107,7 @@
  */
 HINSTANCE
 WINAPI
+DECLSPEC_HOTPATCH
 LoadLibraryA(LPCSTR lpLibFileName)
 {
     LPSTR PathBuffer;
@@ -152,6 +153,7 @@
  */
 HINSTANCE
 WINAPI
+DECLSPEC_HOTPATCH
 LoadLibraryExA(LPCSTR lpLibFileName,
                HANDLE hFile,
                DWORD dwFlags)
@@ -171,6 +173,7 @@
  */
 HINSTANCE
 WINAPI
+DECLSPEC_HOTPATCH
 LoadLibraryW(LPCWSTR lpLibFileName)
 {
     /* Call Ex version of the API */
@@ -279,6 +282,7 @@
  */
 HINSTANCE
 WINAPI
+DECLSPEC_HOTPATCH
 LoadLibraryExW(LPCWSTR lpLibFileName,
                HANDLE hFile,
                DWORD dwFlags)
@@ -447,7 +451,10 @@
 /*
  * @implemented
  */
-BOOL WINAPI FreeLibrary(HINSTANCE hLibModule)
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
+FreeLibrary(HINSTANCE hLibModule)
 {
     NTSTATUS Status;
     PIMAGE_NT_HEADERS NtHeaders;
@@ -806,6 +813,7 @@
  */
 HMODULE
 WINAPI
+DECLSPEC_HOTPATCH
 GetModuleHandleA(LPCSTR lpModuleName)
 {
     PUNICODE_STRING ModuleNameW;
Index: dll/win32/kernel32/client/file/disk.c
===================================================================
--- dll/win32/kernel32/client/file/disk.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/file/disk.c	(copie de travail)
@@ -35,32 +35,32 @@
 GetLogicalDriveStringsA(IN DWORD nBufferLength,
                         IN LPSTR lpBuffer)
 {
-   DWORD drive, count;
-   DWORD dwDriveMap;
-   LPSTR p;
+    DWORD drive, count;
+    DWORD dwDriveMap;
+    LPSTR p;
 
-   dwDriveMap = GetLogicalDrives();
+    dwDriveMap = GetLogicalDrives();
 
-   for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++)
-     {
-	if (dwDriveMap & (1<<drive))
-	   count++;
-     }
+    for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++)
+    {
+        if (dwDriveMap & (1<<drive))
+            count++;
+    }
 
 
-   if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1);
+    if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1);
 
-	p = lpBuffer;
+    p = lpBuffer;
 
-	for (drive = 0; drive < MAX_DOS_DRIVES; drive++)
-	  if (dwDriveMap & (1<<drive))
-	  {
-	     *p++ = 'A' + (UCHAR)drive;
-	     *p++ = ':';
-	     *p++ = '\\';
-	     *p++ = '\0';
-	  }
-	*p = '\0';
+    for (drive = 0; drive < MAX_DOS_DRIVES; drive++)
+        if (dwDriveMap & (1<<drive))
+        {
+            *p++ = 'A' + (UCHAR)drive;
+            *p++ = ':';
+            *p++ = '\\';
+            *p++ = '\0';
+        }
+    *p = '\0';
 
     return (count * 4);
 }
@@ -74,17 +74,17 @@
 GetLogicalDriveStringsW(IN DWORD nBufferLength,
                         IN LPWSTR lpBuffer)
 {
-   DWORD drive, count;
-   DWORD dwDriveMap;
-   LPWSTR p;
+    DWORD drive, count;
+    DWORD dwDriveMap;
+    LPWSTR p;
 
-   dwDriveMap = GetLogicalDrives();
+    dwDriveMap = GetLogicalDrives();
 
-   for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++)
-     {
-	if (dwDriveMap & (1<<drive))
-	   count++;
-     }
+    for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++)
+    {
+        if (dwDriveMap & (1<<drive))
+            count++;
+    }
 
     if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1);
 
@@ -110,24 +110,24 @@
 WINAPI
 GetLogicalDrives(VOID)
 {
-	NTSTATUS Status;
-	PROCESS_DEVICEMAP_INFORMATION ProcessDeviceMapInfo;
+    NTSTATUS Status;
+    PROCESS_DEVICEMAP_INFORMATION ProcessDeviceMapInfo;
 
-	/* Get the Device Map for this Process */
-	Status = NtQueryInformationProcess(NtCurrentProcess(),
-					   ProcessDeviceMap,
-					   &ProcessDeviceMapInfo,
-					   sizeof(ProcessDeviceMapInfo),
-					   NULL);
+    /* Get the Device Map for this Process */
+    Status = NtQueryInformationProcess(NtCurrentProcess(),
+                                       ProcessDeviceMap,
+                                       &ProcessDeviceMapInfo,
+                                       sizeof(ProcessDeviceMapInfo),
+                                       NULL);
 
-	/* Return the Drive Map */
-	if (!NT_SUCCESS(Status))
-	{
-		BaseSetLastNTError(Status);
-		return 0;
-	}
+    /* Return the Drive Map */
+    if (!NT_SUCCESS(Status))
+    {
+        BaseSetLastNTError(Status);
+        return 0;
+    }
 
-        return ProcessDeviceMapInfo.Query.DriveMap;
+    return ProcessDeviceMapInfo.Query.DriveMap;
 }
 
 /*
@@ -141,19 +141,19 @@
                   OUT LPDWORD lpNumberOfFreeClusters,
                   OUT LPDWORD lpTotalNumberOfClusters)
 {
-   PWCHAR RootPathNameW=NULL;
+    PWCHAR RootPathNameW=NULL;
 
-   if (lpRootPathName)
-   {
-      if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE)))
-         return FALSE;
-   }
+    if (lpRootPathName)
+    {
+        if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE)))
+            return FALSE;
+    }
 
-	return GetDiskFreeSpaceW (RootPathNameW,
-	                            lpSectorsPerCluster,
-	                            lpBytesPerSector,
-	                            lpNumberOfFreeClusters,
-	                            lpTotalNumberOfClusters);
+    return GetDiskFreeSpaceW (RootPathNameW,
+                              lpSectorsPerCluster,
+                              lpBytesPerSector,
+                              lpNumberOfFreeClusters,
+                              lpTotalNumberOfClusters);
 }
 
 /*
@@ -183,11 +183,11 @@
     }
     RootPathName[3] = 0;
 
-  hFile = InternalOpenDirW(RootPathName, FALSE);
-  if (INVALID_HANDLE_VALUE == hFile)
+    hFile = InternalOpenDirW(RootPathName, FALSE);
+    if (INVALID_HANDLE_VALUE == hFile)
     {
-      SetLastError(ERROR_PATH_NOT_FOUND);
-      return FALSE;
+        SetLastError(ERROR_PATH_NOT_FOUND);
+        return FALSE;
     }
 
     errCode = NtQueryVolumeInformationFile(hFile,
@@ -225,18 +225,18 @@
                     OUT PULARGE_INTEGER lpTotalNumberOfBytes,
                     OUT PULARGE_INTEGER lpTotalNumberOfFreeBytes)
 {
-   PWCHAR DirectoryNameW=NULL;
+    PWCHAR DirectoryNameW=NULL;
 
-	if (lpDirectoryName)
-	{
-      if (!(DirectoryNameW = FilenameA2W(lpDirectoryName, FALSE)))
-         return FALSE;
-	}
+    if (lpDirectoryName)
+    {
+        if (!(DirectoryNameW = FilenameA2W(lpDirectoryName, FALSE)))
+            return FALSE;
+    }
 
-   return GetDiskFreeSpaceExW (DirectoryNameW ,
-	                              lpFreeBytesAvailableToCaller,
-	                              lpTotalNumberOfBytes,
-	                              lpTotalNumberOfFreeBytes);
+    return GetDiskFreeSpaceExW (DirectoryNameW ,
+                                lpFreeBytesAvailableToCaller,
+                                lpTotalNumberOfBytes,
+                                lpTotalNumberOfFreeBytes);
 }
 
 /*
@@ -358,12 +358,15 @@
 WINAPI
 GetDriveTypeA(IN LPCSTR lpRootPathName)
 {
-   PWCHAR RootPathNameW;
+    PWCHAR RootPathNameW;
 
-   if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE)))
-      return DRIVE_UNKNOWN;
+    if (!lpRootPathName)
+        return GetDriveTypeW(NULL);
 
-   return GetDriveTypeW(RootPathNameW);
+    if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE)))
+        return DRIVE_UNKNOWN;
+
+    return GetDriveTypeW(RootPathNameW);
 }
 
 /*
@@ -373,52 +376,70 @@
 WINAPI
 GetDriveTypeW(IN LPCWSTR lpRootPathName)
 {
-	FILE_FS_DEVICE_INFORMATION FileFsDevice;
-	IO_STATUS_BLOCK IoStatusBlock;
+    FILE_FS_DEVICE_INFORMATION FileFsDevice;
+    IO_STATUS_BLOCK IoStatusBlock;
+    HANDLE hFile;
+    NTSTATUS errCode;
 
-	HANDLE hFile;
-	NTSTATUS errCode;
+    if (!lpRootPathName)
+    {
+        /* If NULL is passed, use current directory path */
+        DWORD BufferSize = GetCurrentDirectoryW(0, NULL);
+        LPWSTR CurrentDir = HeapAlloc(GetProcessHeap(), 0, BufferSize * sizeof(WCHAR));
+        if (!CurrentDir)
+            return DRIVE_UNKNOWN;
+        if (!GetCurrentDirectoryW(BufferSize, CurrentDir))
+        {
+            HeapFree(GetProcessHeap(), 0, CurrentDir);
+            return DRIVE_UNKNOWN;
+        }
+        hFile = InternalOpenDirW(CurrentDir, FALSE);
+        HeapFree(GetProcessHeap(), 0, CurrentDir);
+    }
+    else
+    {
+        hFile = InternalOpenDirW(lpRootPathName, FALSE);
+    }
 
-	hFile = InternalOpenDirW(lpRootPathName, FALSE);
-	if (hFile == INVALID_HANDLE_VALUE)
-	{
-	    return DRIVE_NO_ROOT_DIR;	/* According to WINE regression tests */
-	}
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        return DRIVE_NO_ROOT_DIR;	/* According to WINE regression tests */
+    }
 
-	errCode = NtQueryVolumeInformationFile (hFile,
-	                                        &IoStatusBlock,
-	                                        &FileFsDevice,
-	                                        sizeof(FILE_FS_DEVICE_INFORMATION),
-	                                        FileFsDeviceInformation);
-	if (!NT_SUCCESS(errCode))
-	{
-		CloseHandle(hFile);
-		BaseSetLastNTError (errCode);
-		return 0;
-	}
-	CloseHandle(hFile);
+    errCode = NtQueryVolumeInformationFile (hFile,
+                                            &IoStatusBlock,
+                                            &FileFsDevice,
+                                            sizeof(FILE_FS_DEVICE_INFORMATION),
+                                            FileFsDeviceInformation);
+    if (!NT_SUCCESS(errCode))
+    {
+        CloseHandle(hFile);
+        BaseSetLastNTError (errCode);
+        return 0;
+    }
+    CloseHandle(hFile);
 
-        switch (FileFsDevice.DeviceType)
-        {
-		case FILE_DEVICE_CD_ROM:
-		case FILE_DEVICE_CD_ROM_FILE_SYSTEM:
-			return DRIVE_CDROM;
-	        case FILE_DEVICE_VIRTUAL_DISK:
-	        	return DRIVE_RAMDISK;
-	        case FILE_DEVICE_NETWORK_FILE_SYSTEM:
-	        	return DRIVE_REMOTE;
-	        case FILE_DEVICE_DISK:
-	        case FILE_DEVICE_DISK_FILE_SYSTEM:
-			if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE)
-				return DRIVE_REMOTE;
-			if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA)
-				return DRIVE_REMOVABLE;
-			return DRIVE_FIXED;
-        }
+    switch (FileFsDevice.DeviceType)
+    {
+    case FILE_DEVICE_CD_ROM:
+    case FILE_DEVICE_CD_ROM_FILE_SYSTEM:
+        return DRIVE_CDROM;
+    case FILE_DEVICE_VIRTUAL_DISK:
+        return DRIVE_RAMDISK;
+    case FILE_DEVICE_NETWORK_FILE_SYSTEM:
+        return DRIVE_REMOTE;
+    case FILE_DEVICE_DISK:
+    case FILE_DEVICE_DISK_FILE_SYSTEM:
+        if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE)
+            return DRIVE_REMOTE;
+        if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA)
+            return DRIVE_REMOVABLE;
+        return DRIVE_FIXED;
+    }
 
-        ERR("Returning DRIVE_UNKNOWN for device type %lu\n", FileFsDevice.DeviceType);
+    ERR("Returning DRIVE_UNKNOWN for device type %lu\n", FileFsDevice.DeviceType);
 
-	return DRIVE_UNKNOWN;
+    return DRIVE_UNKNOWN;
 }
 
 /* EOF */
Index: dll/win32/kernel32/client/file/volume.c
===================================================================
--- dll/win32/kernel32/client/file/volume.c	(rÃ©vision 61927)
+++ dll/win32/kernel32/client/file/volume.c	(copie de travail)
@@ -552,6 +552,12 @@
     DWORD ErrorCode;
     BOOL Result = FALSE;
 
+    if (!lpszFileName || !lpszVolumePathName || !cchBufferLength)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    
     if (!(PathLength = GetFullPathNameW(lpszFileName, 0, NULL, NULL)))
     {
         return Result;
@@ -668,7 +674,7 @@
         if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) ret = FALSE;
     }
 
-    HeapFree( GetProcessHeap(), 0, buffer );
+    RtlFreeHeap(RtlGetProcessHeap(), 0, buffer);
     return ret;
 }
 
Index: dll/win32/secur32/precomp.h
===================================================================
--- dll/win32/secur32/precomp.h	(rÃ©vision 61927)
+++ dll/win32/secur32/precomp.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _SECUR32_PCH_
+#define _SECUR32_PCH_
+
 #include <stdarg.h>
 
 /* SDK/DDK/NDK Headers. */
@@ -19,3 +22,5 @@
 
 #include <secext.h>
 #include <security.h>
+
+#endif /* _SECUR32_PCH_ */
Index: dll/win32/secur32/CMakeLists.txt
===================================================================
--- dll/win32/secur32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/secur32/CMakeLists.txt	(copie de travail)
@@ -8,20 +8,21 @@
     dllmain.c
     secext.c
     sspi.c
+    stubs.c
+    precomp.h)
+
+add_library(secur32 SHARED
+    ${SOURCE}
     secur32.rc
-    stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/secur32.def
-)
+    ${CMAKE_CURRENT_BINARY_DIR}/secur32.def)
 
-add_library(secur32 SHARED ${SOURCE})
-
 set_module_type(secur32 win32dll)
 
 target_link_libraries(secur32 lsalib)
 
 add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll)
-add_pch(secur32 precomp.h)
+add_pch(secur32 precomp.h SOURCE)
 
 add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/ws2_32_new/inc/ws2_32.h
===================================================================
--- dll/win32/ws2_32_new/inc/ws2_32.h	(rÃ©vision 61927)
+++ dll/win32/ws2_32_new/inc/ws2_32.h	(copie de travail)
@@ -5,6 +5,9 @@
  * PURPOSE:     WinSock 2.2 Main Header
  */
 
+#ifndef _WS2_32_NEW_PCH_
+#define _WS2_32_NEW_PCH_
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -37,3 +40,5 @@
 
 /* Internal headers */
 #include "ws2_32p.h"
+
+#endif /* _WS2_32_NEW_PCH_ */
Index: dll/win32/ws2_32_new/CMakeLists.txt
===================================================================
--- dll/win32/ws2_32_new/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/ws2_32_new/CMakeLists.txt	(copie de travail)
@@ -44,12 +44,15 @@
     src/sputil.c
     src/startup.c
     src/wsautil.c
+    inc/ws2_32.h)
+
+add_library(ws2_32_new SHARED
+    ${SOURCE}
     ws2_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def)
 
-add_library(ws2_32_new SHARED ${SOURCE})
 set_module_type(ws2_32_new win32dll)
 add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll)
-add_pch(ws2_32_new inc/ws2_32.h)
+add_pch(ws2_32_new inc/ws2_32.h SOURCE)
 target_link_libraries(ws2_32_new wine)
 add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all)
Index: dll/win32/ws2_32_new/src/startup.c
===================================================================
--- dll/win32/ws2_32_new/src/startup.c	(rÃ©vision 61927)
+++ dll/win32/ws2_32_new/src/startup.c	(copie de travail)
@@ -160,12 +160,12 @@
             break;
     }
 
-    /* Return the Version Requsted, unless error */
+    /* Return the Version Requested, unless error */
     lpWSAData->wVersion = VersionReturned;
 
     /* We support Winsock 2.2 */
     lpWSAData->wHighVersion = MAKEWORD(2,2);
-    lstrcpy(lpWSAData->szDescription, "WinSock 2.2");
+    lstrcpy(lpWSAData->szDescription, "WinSock 2.0");
     lstrcpy(lpWSAData->szSystemStatus, "Running");
 
     /* 
@@ -183,7 +183,7 @@
         lpWSAData->iMaxUdpDg = 0;
     }
 
-    /* Enter the startup syncronization lock */
+    /* Enter the startup synchronization lock */
     WsStartupLock();
 
     /* Now setup all our objects */
Index: dll/win32/ws2_32_new/src/dllmain.c
===================================================================
--- dll/win32/ws2_32_new/src/dllmain.c	(rÃ©vision 61927)
+++ dll/win32/ws2_32_new/src/dllmain.c	(copie de travail)
@@ -44,13 +44,13 @@
 
             /* TLS Allocation */
             if (GlobalTlsIndex == TLS_OUT_OF_INDEXES)
-			{
-				GlobalTlsIndex = TlsAlloc();
-				if (GlobalTlsIndex == TLS_OUT_OF_INDEXES)
-				{
-					return FALSE;
-				}
-			}
+            {
+                GlobalTlsIndex = TlsAlloc();
+                if (GlobalTlsIndex == TLS_OUT_OF_INDEXES)
+                {
+                    return FALSE;
+                }
+            }
 
             /* Initialize some critical sections */
             WsCreateStartupSynchronization();
Index: dll/win32/cards/cards.c
===================================================================
--- dll/win32/cards/cards.c	(rÃ©vision 61927)
+++ dll/win32/cards/cards.c	(copie de travail)
@@ -1,7 +1,7 @@
 /*
- *  ReactOS Cards
+ * ReactOS Cards
  *
- *  Copyright (C) 2003  Filip Navara <xnavara@volny.org>
+ * Copyright (C) 2003  Filip Navara <xnavara@volny.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,8 +33,8 @@
  */
 BOOL WINAPI WEP(DWORD Unknown)
 {
-	UNREFERENCED_PARAMETER(Unknown);
-	return TRUE;
+    UNREFERENCED_PARAMETER(Unknown);
+    return TRUE;
 }
 
 /*
@@ -45,15 +45,15 @@
     DWORD dwIndex;
 
     /* Report card width and height to user */
-	*Width = CARD_WIDTH;
-	*Height = CARD_HEIGHT;
+    *Width = CARD_WIDTH;
+    *Height = CARD_HEIGHT;
 
-	/* Load images */
-	for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; ++dwIndex)
-		g_CardBitmaps[dwIndex] =
-			(HBITMAP)LoadBitmapA(g_hModule, MAKEINTRESOURCEA(dwIndex + 1));
+    /* Load images */
+    for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; ++dwIndex)
+        g_CardBitmaps[dwIndex] =
+            (HBITMAP)LoadBitmapA(g_hModule, MAKEINTRESOURCEA(dwIndex + 1));
 
-	return TRUE;
+    return TRUE;
 }
 
 /*
@@ -64,8 +64,8 @@
     DWORD dwIndex;
 
     /* Unload images */
-	for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++)
-		DeleteObject(g_CardBitmaps[dwIndex]);
+    for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++)
+        DeleteObject(g_CardBitmaps[dwIndex]);
 }
 
 /*
@@ -73,7 +73,7 @@
  */
 BOOL WINAPI cdtDraw(HDC hdc, INT x, INT y, INT card, INT type, COLORREF color)
 {
-	return cdtDrawExt(hdc, x, y, CARD_WIDTH, CARD_HEIGHT, card, type, color);
+    return cdtDrawExt(hdc, x, y, CARD_WIDTH, CARD_HEIGHT, card, type, color);
 }
 
 /*
@@ -81,30 +81,31 @@
  */
 static __inline VOID BltCard(HDC hdc, INT x, INT y, INT dx, INT dy, HDC hdcCard, DWORD dwRasterOp, BOOL bStretch)
 {
-	if (bStretch)
-	{
-		StretchBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, CARD_WIDTH, CARD_HEIGHT, dwRasterOp);
-	} else
-	{
-		BitBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, dwRasterOp);
+    if (bStretch)
+    {
+        StretchBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, CARD_WIDTH, CARD_HEIGHT, dwRasterOp);
+    }
+    else
+    {
+        BitBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, dwRasterOp);
 /*
  * This is need when using Microsoft images, because they use two-color red/white images for
  * red cards and thus needs fix-up of the edge to black color.
  */
 #if 0
-		if (ISREDCARD(card))
-		{
-			PatBlt(hdc, x, y + 2, 1, dy - 4, BLACKNESS);
-			PatBlt(hdc, x + dx - 1, y + 2, 1, dy - 4, BLACKNESS);
-			PatBlt(hdc, x + 2, y, dx - 4, 1, BLACKNESS);
-			PatBlt(hdc, x + 2, y + dy - 1, dx - 4, 1, BLACKNESS);
-	   		SetPixel(hdc, x + 1, y + 1, 0);
-	   		SetPixel(hdc, x + dx - 2, y + 1, 0);
-   			SetPixel(hdc, x + 1, y + dy - 2, 0);
-   			SetPixel(hdc, x + dx - 2, y + dy - 2, 0);
-		}
+        if (ISREDCARD(card))
+        {
+            PatBlt(hdc, x, y + 2, 1, dy - 4, BLACKNESS);
+            PatBlt(hdc, x + dx - 1, y + 2, 1, dy - 4, BLACKNESS);
+            PatBlt(hdc, x + 2, y, dx - 4, 1, BLACKNESS);
+            PatBlt(hdc, x + 2, y + dy - 1, dx - 4, 1, BLACKNESS);
+            SetPixel(hdc, x + 1, y + 1, 0);
+            SetPixel(hdc, x + dx - 2, y + 1, 0);
+            SetPixel(hdc, x + 1, y + dy - 2, 0);
+            SetPixel(hdc, x + dx - 2, y + dy - 2, 0);
+        }
 #endif
-	}
+    }
 }
 
 /*
@@ -122,106 +123,110 @@
  */
 BOOL WINAPI cdtDrawExt(HDC hdc, INT x, INT y, INT dx, INT dy, INT card, INT type, COLORREF color)
 {
-	HDC hdcCard;
-	DWORD dwRasterOp = SRCCOPY, OldBkColor;
-	BOOL bSaveEdges = TRUE;
-	BOOL bStretch = FALSE;
+    DWORD dwRasterOp = SRCCOPY;
+    BOOL bSaveEdges = TRUE;
+    BOOL bStretch = FALSE;
 
-	if (type & ectSAVEEDGESMASK)
-	{
-		type &= ~ectSAVEEDGESMASK;
-		bSaveEdges = FALSE;
-	}
+    if (type & ectSAVEEDGESMASK)
+    {
+        type &= ~ectSAVEEDGESMASK;
+        bSaveEdges = FALSE;
+    }
 
-	if (dx != CARD_WIDTH || dy != CARD_HEIGHT)
-	{
-		bStretch = TRUE;
-		bSaveEdges = FALSE;
-	}
+    if (dx != CARD_WIDTH || dy != CARD_HEIGHT)
+    {
+        bStretch = TRUE;
+        bSaveEdges = FALSE;
+    }
 
-	switch (type)
-	{
-		case ectINVERTED:
-			dwRasterOp = NOTSRCCOPY;
-		case ectFACES:
-			card = (card % 4) * 13 + (card / 4);
-			break;
-		case ectBACKS:
-			--card;
-			break;
-		case ectEMPTYNOBG:
-			dwRasterOp = SRCAND;
-		case ectEMPTY:
-			card = 52;
-			break;
-		case ectERASE:
-			break;
-		case ectREDX:
-			card = 66;
-			break;
-		case ectGREENO:
-			card = 67;
-			break;
-		default:
-			return FALSE;
-	}
+    switch (type)
+    {
+        case ectINVERTED:
+            dwRasterOp = NOTSRCCOPY;
+        case ectFACES:
+            card = (card % 4) * 13 + (card / 4);
+            break;
+        case ectBACKS:
+            --card;
+            break;
+        case ectEMPTYNOBG:
+            dwRasterOp = SRCAND;
+        case ectEMPTY:
+            card = 52;
+            break;
+        case ectERASE:
+            break;
+        case ectREDX:
+            card = 66;
+            break;
+        case ectGREENO:
+            card = 67;
+            break;
+        default:
+            return FALSE;
+    }
 
-	if (type == ectEMPTY || type == ectERASE)
-	{
-	    POINT pPoint;
-	    HBRUSH hBrush;
+    if (type == ectEMPTY || type == ectERASE)
+    {
+        POINT pPoint;
+        HBRUSH hBrush, hOldBrush;
 
-	    hBrush = CreateSolidBrush(color);
-	   	GetDCOrgEx(hdc, &pPoint);
-		SetBrushOrgEx(hdc, pPoint.x, pPoint.y, 0);
-		SelectObject(hdc, hBrush);
-		PatBlt(hdc, x, y, dx, dy, PATCOPY);
-	}
-	if (type != ectERASE)
-	{
-	   	hdcCard = CreateCompatibleDC(hdc);
-	   	SelectObject(hdcCard, g_CardBitmaps[card]);
-		OldBkColor = SetBkColor(hdc, (type == ectFACES) ? 0xFFFFFF : color);
-		if (bSaveEdges)
-		{
-	   		COLORREF SavedPixels[12];
-	   		SavedPixels[0] = GetPixel(hdc, x, y);
-   			SavedPixels[1] = GetPixel(hdc, x + 1, y);
-	   		SavedPixels[2] = GetPixel(hdc, x, y + 1);
-	   		SavedPixels[3] = GetPixel(hdc, x + dx - 1, y);
-   			SavedPixels[4] = GetPixel(hdc, x + dx - 2, y);
-	   		SavedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1);
-	   		SavedPixels[6] = GetPixel(hdc, x, y + dy - 1);
-   			SavedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1);
-	   		SavedPixels[8] = GetPixel(hdc, x, y + dy - 2);
-	   		SavedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1);
-   			SavedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1);
-   			SavedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2);
+        hBrush = CreateSolidBrush(color);
+        GetDCOrgEx(hdc, &pPoint);
+        SetBrushOrgEx(hdc, pPoint.x, pPoint.y, 0);
+        hOldBrush = SelectObject(hdc, hBrush);
+        PatBlt(hdc, x, y, dx, dy, PATCOPY);
+        SelectObject(hdc, hOldBrush);
+        DeleteObject(hBrush);
+    }
+    if (type != ectERASE)
+    {
+        HDC hdcCard;
+        COLORREF OldBkColor;
 
-   			BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch);
+        hdcCard = CreateCompatibleDC(hdc);
+        SelectObject(hdcCard, g_CardBitmaps[card]);
+        OldBkColor = SetBkColor(hdc, (type == ectFACES) ? 0xFFFFFF : color);
+        if (bSaveEdges)
+        {
+            COLORREF SavedPixels[12];
+            SavedPixels[0]  = GetPixel(hdc, x, y);
+            SavedPixels[1]  = GetPixel(hdc, x + 1, y);
+            SavedPixels[2]  = GetPixel(hdc, x, y + 1);
+            SavedPixels[3]  = GetPixel(hdc, x + dx - 1, y);
+            SavedPixels[4]  = GetPixel(hdc, x + dx - 2, y);
+            SavedPixels[5]  = GetPixel(hdc, x + dx - 1, y + 1);
+            SavedPixels[6]  = GetPixel(hdc, x, y + dy - 1);
+            SavedPixels[7]  = GetPixel(hdc, x + 1, y + dy - 1);
+            SavedPixels[8]  = GetPixel(hdc, x, y + dy - 2);
+            SavedPixels[9]  = GetPixel(hdc, x + dx - 1, y + dy - 1);
+            SavedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1);
+            SavedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2);
 
-   			SetPixel(hdc, x, y, SavedPixels[0]);
-   			SetPixel(hdc, x + 1, y, SavedPixels[1]);
-   			SetPixel(hdc, x, y + 1, SavedPixels[2]);
-	   		SetPixel(hdc, x + dx - 1, y, SavedPixels[3]);
-   			SetPixel(hdc, x + dx - 2, y, SavedPixels[4]);
-   			SetPixel(hdc, x + dx - 1, y + 1, SavedPixels[5]);
-	   		SetPixel(hdc, x, y + dy - 1, SavedPixels[6]);
-   			SetPixel(hdc, x + 1, y + dy - 1, SavedPixels[7]);
-   			SetPixel(hdc, x, y + dy - 2, SavedPixels[8]);
-	   		SetPixel(hdc, x + dx - 1, y + dy - 1, SavedPixels[9]);
-   			SetPixel(hdc, x + dx - 2, y + dy - 1, SavedPixels[10]);
-   			SetPixel(hdc, x + dx - 1, y + dy - 2, SavedPixels[11]);
-   		}
-   		else
-   		{
-   			BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch);
-   		}
-		SetBkColor(hdc, OldBkColor);
-		DeleteDC(hdcCard);
-	}
+            BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch);
 
-	return TRUE;
+            SetPixel(hdc, x, y, SavedPixels[0]);
+            SetPixel(hdc, x + 1, y, SavedPixels[1]);
+            SetPixel(hdc, x, y + 1, SavedPixels[2]);
+            SetPixel(hdc, x + dx - 1, y, SavedPixels[3]);
+            SetPixel(hdc, x + dx - 2, y, SavedPixels[4]);
+            SetPixel(hdc, x + dx - 1, y + 1, SavedPixels[5]);
+            SetPixel(hdc, x, y + dy - 1, SavedPixels[6]);
+            SetPixel(hdc, x + 1, y + dy - 1, SavedPixels[7]);
+            SetPixel(hdc, x, y + dy - 2, SavedPixels[8]);
+            SetPixel(hdc, x + dx - 1, y + dy - 1, SavedPixels[9]);
+            SetPixel(hdc, x + dx - 2, y + dy - 1, SavedPixels[10]);
+            SetPixel(hdc, x + dx - 1, y + dy - 2, SavedPixels[11]);
+        }
+        else
+        {
+            BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch);
+        }
+        SetBkColor(hdc, OldBkColor);
+        DeleteDC(hdcCard);
+    }
+
+    return TRUE;
 }
 
 
@@ -232,19 +237,20 @@
  */
 BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame)
 {
-	UNREFERENCED_PARAMETER(frame);
-	UNREFERENCED_PARAMETER(y);
-	UNREFERENCED_PARAMETER(x);
-	UNREFERENCED_PARAMETER(cardback);
-	UNREFERENCED_PARAMETER(hdc);
-	return TRUE;
+    UNREFERENCED_PARAMETER(frame);
+    UNREFERENCED_PARAMETER(y);
+    UNREFERENCED_PARAMETER(x);
+    UNREFERENCED_PARAMETER(cardback);
+    UNREFERENCED_PARAMETER(hdc);
+    return TRUE;
 }
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-	UNREFERENCED_PARAMETER(lpvReserved);
-	if (fdwReason == DLL_PROCESS_ATTACH)
-		g_hModule = hinstDLL;
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-	return TRUE;
+    if (fdwReason == DLL_PROCESS_ATTACH)
+        g_hModule = hinstDLL;
+
+    return TRUE;
 }
Index: dll/win32/cards/cards.h
===================================================================
--- dll/win32/cards/cards.h	(rÃ©vision 61927)
+++ dll/win32/cards/cards.h	(copie de travail)
@@ -1,7 +1,7 @@
 /*
- *  ReactOS Cards
+ * ReactOS Cards
  *
- *  Copyright (C) 2003  Filip Navara <xnavara@volny.org>
+ * Copyright (C) 2003  Filip Navara <xnavara@volny.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,29 +28,29 @@
  * FreeCard +
  * Joker
  */
-#define MAX_CARD_BITMAPS	68
+#define MAX_CARD_BITMAPS    68
 
-#define ectFACES			0
-#define ectBACKS			1
-#define ectINVERTED			2
-#define ectEMPTY			3
-#define ectERASE			4
-#define ectEMPTYNOBG		5
-#define ectREDX				6
-#define ectGREENO			7
-#define ectSAVEEDGESMASK	0x80000000
+#define ectFACES            0
+#define ectBACKS            1
+#define ectINVERTED         2
+#define ectEMPTY            3
+#define ectERASE            4
+#define ectEMPTYNOBG        5
+#define ectREDX             6
+#define ectGREENO           7
+#define ectSAVEEDGESMASK    0x80000000
 
 #if defined(CARDSTYLE_DEFAULT)
-#	define CARD_WIDTH		72	// The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX
-#	define CARD_HEIGHT		96
+#   define CARD_WIDTH       72  // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX
+#   define CARD_HEIGHT      96
 #elif defined(CARDSTYLE_BAVARIAN)
-#	define CARD_WIDTH		110
-#	define CARD_HEIGHT		198
+#   define CARD_WIDTH       110
+#   define CARD_HEIGHT      198
 #else
-#	error No or unsupported cardstyle defined
+#   error No or unsupported cardstyle defined
 #endif
 
-#define ISREDCARD(x)	(x >= 13 && x <= 39)
+#define ISREDCARD(x)    (x >= 13 && x <= 39)
 
 BOOL WINAPI cdtInit(int *width, int *height);
 BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int type, DWORD color);
Index: dll/win32/syssetup/precomp.h
===================================================================
--- dll/win32/syssetup/precomp.h	(rÃ©vision 61927)
+++ dll/win32/syssetup/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SYSSETUP_PCH_
+#define _SYSSETUP_PCH_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -17,3 +20,5 @@
 
 #include "globals.h"
 #include "resource.h"
+
+#endif /* _SYSSETUP_PCH_ */
Index: dll/win32/syssetup/CMakeLists.txt
===================================================================
--- dll/win32/syssetup/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/syssetup/CMakeLists.txt	(copie de travail)
@@ -8,12 +8,15 @@
     logfile.c
     security.c
     wizard.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/syssetup_stubs.c)
+
+add_library(syssetup SHARED
+    ${SOURCE}
     syssetup.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/syssetup_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def)
 
-add_library(syssetup SHARED ${SOURCE})
-add_pch(syssetup precomp.h)
+add_pch(syssetup precomp.h SOURCE)
 set_module_type(syssetup win32dll UNICODE)
 target_link_libraries(syssetup uuid wine ${PSEH_LIB})
 
Index: dll/win32/syssetup/lang/sq-AL.rc
===================================================================
--- dll/win32/syssetup/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/syssetup/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2004 Filip Navara
+ * Copyright (C) 2004 Eric Kohl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "MirÃ« se vini nÃ« Magjistari NdÃ«rtues i ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24
+    LTEXT "Ky magjistar instalon ReactOS nÃ« kompjuterin tuaj. Magjistari ka nevojÃ« pÃ«r tÃ« mbledhur disa informacione nÃ« lidhje me ju dhe kompjuterin tuaj pÃ«r tÃ« ndÃ«rtuat ReactOS si duhet.", IDC_STATIC, 115, 40, 195, 100
+    LTEXT "Klikoni TjetÃ«r pÃ«r tÃ« vazhduar me NdÃ«rtimin.", IDC_STATIC, 115, 169, 195, 17
+END
+
+IDD_ACKPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Zhvilluesit e ReactOS dÃ«shirojnÃ« tÃ« vlerÃ«sojÃ« projektet e mÃ«poshtme Burim i Hapur, (pjesÃ«ve tÃ«) tÃ« cilave u pÃ«rdorÃ«n pÃ«r tÃ« krijuar ReactOS:", IDC_STATIC, 15, 7, 286, 19
+    LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+    LTEXT "ReactOS publikohet nÃ«n lejen GPL, kÃ«shtu qÃ« nÃ«se doni tÃ« ripÃ«rdorni ose rishpÃ«rndani (pjesÃ«ve tÃ«) atÃ« qÃ« ju duhet tÃ« respektojnÃ« GPL", IDC_STATIC, 15, 110, 227, 19
+    PUSHBUTTON "&VÃ«zhgo GPL...", IDC_VIEWGPL, 251, 110, 50, 19
+    LTEXT "Klikoni TjetÃ«r pÃ«r tÃ« vazhduar me NdÃ«rtimin.", IDC_STATIC, 15, 136, 195, 17
+END
+
+IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20
+    LTEXT "Shkruani emrin tuaj tÃ« plotÃ« dhe emrin e kompanisÃ« tuaj ose organizatÃ«s.", IDC_STATIC, 54, 7, 242, 21
+    LTEXT "Emri:", IDC_STATIC, 54, 37, 44, 8
+    EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Organizata:", IDC_STATIC, 54, 57, 44, 8
+    EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
+END
+
+IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20
+    LTEXT "Shkruani njÃ« emÃ«r pÃ«r kompjuterin tuaj qÃ« Ã«shtÃ« 15 karaktere ose mÃ« pak. NÃ«se ju jeni nÃ« njÃ« rrjet, emri kompjuterit tuaj duhet tÃ« jetÃ« unik.", IDC_STATIC, 54, 7, 250, 24
+    LTEXT "Emri &Kompjuterit:", IDC_STATIC, 54, 38, 75, 8
+    EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE
+    ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20
+    LTEXT "NdÃ«rtuesi do tÃ« krijojÃ« njÃ« llogari pÃ«rdoruesi nÃ« kompjuterin tuaj tÃ« quajtur Administrator. Ju mund tÃ« pÃ«rdorni kÃ«tÃ« llogari nÃ« qoftÃ« se keni nevojÃ« pÃ«r akses tÃ« plotÃ« nÃ« kompjuterin tuaj.", IDC_STATIC, 54, 57, 250, 25
+    LTEXT "Shkruani njÃ« fjalÃ«kalim Administratori qÃ« Ã«shtÃ« 14 karaktere ose mÃ« pak.", IDC_STATIC, 54, 87, 250, 8
+    LTEXT "FjalÃ«kalimi &Administratorit:", IDC_STATIC, 54, 104, 105, 8
+    EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
+    LTEXT "K&onfirmo FjalÃ«kalimin:", IDC_STATIC, 54, 123, 105, 8
+    EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
+END
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
+    LTEXT "Sistemi vendorÃ« duhet tÃ« pÃ«rputhet me gjuhÃ«n e aplikacioneve qÃ« dÃ«shironi tÃ« pÃ«rdorni. PÃ«rdoruesi vendorÃ« kontrollon se si duket numrat, monedhat, dhe datat.", IDC_STATIC, 53, 7, 253, 20
+    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "PÃ«r tÃ« ndryshuar parametrat e sistemit ose pÃ«rdoruesit vendorÃ«, kliko Ndrysho.", IDC_STATIC, 53, 60, 196, 8
+    PUSHBUTTON "&Ndrysho...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
+    LTEXT "Paraqitja TastierÃ«s kontrollon karakteret qÃ« shfaqen kur ju shkruani.", IDC_STATIC, 53, 86, 253, 8
+    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "PÃ«r tÃ« ndryshuar paraqitje tastieres, kliko Ndrysho.", IDC_STATIC, 53, 126, 184, 8
+    PUSHBUTTON "Ndrysho...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
+END
+
+IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20
+    LTEXT "Data dhe Ora:", IDC_STATIC, 53, 7, 253, 8
+    CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14
+    CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14
+    LTEXT "ZonÃ«Kohore:", IDC_STATIC, 53, 42, 253, 8
+    COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+    AUTOCHECKBOX "Adaptohen automatikisht orÃ«n pÃ«r ditÃ«n me diell dhe ruaj ndryshimet", IDC_AUTODAYLIGHT, 53, 124, 201, 10
+END
+
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NdÃ«rto ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20
+    LTEXT "", IDC_ITEM, 53, 29, 253, 20
+    CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8
+END
+
+IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Kompletimi i NdÃ«rtuesit ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kompletimi i Magjistarit NdÃ«rtues tÃ« ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24
+    LTEXT "Ju keni pÃ«rfunduar me sukses NdÃ«rtuesin e ReactOS.\n\nKur ju klikoni Mbaro, kompjuteri juaj do tÃ« rifillojÃ«.", IDC_STATIC, 115, 40, 195, 100
+    CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12
+    LTEXT "NÃ«se ka njÃ« CD nÃ« drive, hiqni atÃ«. Pastaj, pÃ«r tÃ« rinisur kompjuterin tuaj, klikoni Mbaroj.", IDC_STATIC, 115, 169, 195, 17
+END
+
+IDD_GPL DIALOGEX 0, 0, 333, 230
+STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "GNU Licensa e PÃ«rgjithshme Publike"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
+END
+
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Ju Lutem prisni..."
+FONT 8, "MS Shell Dlg 2", 400, 0, 1
+BEGIN
+    LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ACKTITLE "Falenderime"
+    IDS_ACKSUBTITLE "Supet e ReactOS qÃ«ndrojnÃ« mbi licencÃ«n dhe informacionet"
+    IDS_OWNERTITLE "Personalizoni Softwarin tuaj"
+    IDS_OWNERSUBTITLE "NdÃ«rtuesi pÃ«rdor kÃ«tÃ« informacion nÃ« lidhje me veten tuaj pÃ«r tÃ« personalizuar ReactOS."
+    IDS_COMPUTERTITLE "Emri Kompjuterit dhe FjalÃ«kalimi Administratorit"
+    IDS_COMPUTERSUBTITLE "Ju duhet tÃ« siguroni njÃ« emÃ«r dhe njÃ« FjalÃ«kalim Administratori pÃ«r kompjuterin tuaj."
+    IDS_LOCALETITLE "CilÃ«simet Rajonale"
+    IDS_LOCALESUBTITLE "Ju mund ta rregulloje ReactOS pÃ«r rajone dhe gjuhÃ« tÃ« ndryshme."
+    IDS_DATETIMETITLE "Data dhe Ora"
+    IDS_DATETIMESUBTITLE "Vendos datÃ«n e saktÃ« dhe orÃ«n pÃ«r kompjuterin tuaj."
+    IDS_PROCESSTITLE "Regjistrimi Komponenteve"
+    IDS_PROCESSSUBTITLE "Ju Lutem prisni..."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_REACTOS_SETUP "NdÃ«rtuesi ReactOS"
+    IDS_UNKNOWN_ERROR "gabim i panjohur"
+    IDS_REGISTERING_COMPONENTS "Regjistrimi Komponenteve..."
+    IDS_LOADLIBRARY_FAILED "LoadLibrary dÃ«shtoj: "
+    IDS_GETPROCADDR_FAILED "GetProcAddr dÃ«shtoj: "
+    IDS_REGSVR_FAILED "DllRegisterServer dÃ«shtoj: "
+    IDS_DLLINSTALL_FAILED "DllInstall dÃ«shtoj: "
+    IDS_TIMEOUT "Timeout gjatÃ« regjistrimit"
+    IDS_REASON_UNKNOWN ""
+END
+
+STRINGTABLE
+BEGIN
+    IDS_WZD_NAME "NdÃ«rtimi nuk mund tÃ« vazhdojÃ« deri sa tÃ« shkruani emrin tuaj."
+    IDS_WZD_SETCOMPUTERNAME "NdÃ«rtuesi dÃ«shtoj pÃ«r tÃ« vendosur emrin e kompjuterit."
+    IDS_WZD_COMPUTERNAME "NdÃ«rtuesi nuk mund tÃ« vazhdojÃ« deri sa tÃ« shkruani emrin e kompjuterit tuaj."
+    IDS_WZD_PASSWORDEMPTY "Ju duhet tÃ« fusni njÃ« fjalÃ«kalim !"
+    IDS_WZD_PASSWORDMATCH "FjalÃ«kalimet qÃ« shkruat nuk pÃ«rputhet. Ju lutem shkruani fjalÃ«kalimin e dÃ«shiruar pÃ«rsÃ«ri."
+    IDS_WZD_PASSWORDCHAR "FjalÃ«kalimi qÃ« dhatÃ« pÃ«rmban shenja tÃ« pavlefshme. Ju lutemi shkruani njÃ« fjalÃ«kalim tÃ« qartÃ«."
+    IDS_WZD_LOCALTIME "NdÃ«rtuesi nuk ishte nÃ« gjendje pÃ«r tÃ« vendosur kohÃ«n lokale."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALL_DEV "Instalimi Pajisjeve..."
+END

Modification de propriÃ©tÃ©s sur dll/win32/syssetup/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/syssetup/logfile.c
===================================================================
--- dll/win32/syssetup/logfile.c	(rÃ©vision 61927)
+++ dll/win32/syssetup/logfile.c	(copie de travail)
@@ -97,6 +97,8 @@
     DWORD dwMessageSize;
     DWORD dwWritten;
     CHAR Buffer[6];
+    CHAR TimeBuffer[30];
+    SYSTEMTIME stTime;
 
     /* Get the severity code string */
     switch (dwSeverity)
@@ -148,6 +150,28 @@
                    NULL,
                    FILE_END);
 
+    /* Write Time/Date */
+    GetLocalTime(&stTime);
+
+    snprintf(TimeBuffer, sizeof(TimeBuffer),
+             "%02d/%02d/%02d %02d:%02d:%02d.%03d",
+             stTime.wMonth,
+             stTime.wDay,
+             stTime.wYear,
+             stTime.wHour,
+             stTime.wMinute,
+             stTime.wSecond,
+             stTime.wMilliseconds);
+
+    WriteFile(hLogFile,
+              TimeBuffer,
+              strlen(TimeBuffer),
+              &dwWritten,
+              NULL);
+
+    /* Write comma */
+    WriteFile(hLogFile, ",", 1, &dwWritten, NULL);
+
     /* Write file name */
     WriteFile(hLogFile,
               lpFileName,
Index: dll/win32/syssetup/syssetup.rc
===================================================================
--- dll/win32/syssetup/syssetup.rc	(rÃ©vision 61927)
+++ dll/win32/syssetup/syssetup.rc	(copie de travail)
@@ -98,6 +98,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/win32/fmifs/precomp.h
===================================================================
--- dll/win32/fmifs/precomp.h	(rÃ©vision 61927)
+++ dll/win32/fmifs/precomp.h	(copie de travail)
@@ -8,6 +8,9 @@
  *                  Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#ifndef _FMIFS_PCH_
+#define _FMIFS_PCH_
+
 /* INCLUDES ******************************************************************/
 
 #define WIN32_NO_STATUS
@@ -43,4 +46,4 @@
 GetProvider(
 	IN PWCHAR FileSytem);
 
-/* EOF */
+#endif /* _FMIFS_PCH_ */
Index: dll/win32/fmifs/CMakeLists.txt
===================================================================
--- dll/win32/fmifs/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/fmifs/CMakeLists.txt	(copie de travail)
@@ -10,14 +10,17 @@
     init.c
     media.c
     query.c
+    precomp.h)
+
+add_library(fmifs SHARED
+    ${SOURCE}
     fmifs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
-add_library(fmifs SHARED ${SOURCE})
 set_module_type(fmifs win32dll ENTRYPOINT InitializeFmIfs 12)
 add_importlibs(fmifs kernel32 ntdll)
-add_pch(fmifs precomp.h)
+add_pch(fmifs precomp.h SOURCE)
 add_dependencies(fmifs psdk)
 add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/cabinet/CMakeLists.txt
===================================================================
--- dll/win32/cabinet/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/cabinet/CMakeLists.txt	(copie de travail)
@@ -13,16 +13,18 @@
     cabinet_main.c
     fci.c
     fdi.c
+    cabinet.h)
+
+add_library(cabinet SHARED
+    ${SOURCE}
     stubs.c
     cabinet.rc
     ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def)
 
-add_library(cabinet SHARED ${SOURCE})
-
 set_module_type(cabinet win32dll)
 target_link_libraries(cabinet wine zlib)
 add_importlibs(cabinet msvcrt kernel32 ntdll)
 
-add_pch(cabinet cabinet.h)
+add_pch(cabinet cabinet.h SOURCE)
 add_dependencies(cabinet psdk)
 add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)
Index: dll/win32/smdll/precomp.h
===================================================================
--- dll/win32/smdll/precomp.h	(rÃ©vision 61927)
+++ dll/win32/smdll/precomp.h	(copie de travail)
@@ -1,5 +1,10 @@
+#ifndef _SMDLL_PCH_
+#define _SMDLL_PCH_
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
 #include <windef.h>
+
+#endif /* _SMDLL_PCH_ */
Index: dll/win32/smdll/CMakeLists.txt
===================================================================
--- dll/win32/smdll/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/smdll/CMakeLists.txt	(copie de travail)
@@ -6,15 +6,17 @@
 list(APPEND SOURCE
     dllmain.c
     query.c
+    precomp.h)
+
+add_library(smdll SHARED
+    ${SOURCE}
     smdll.rc
     ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
 
-add_library(smdll SHARED ${SOURCE})
-
 target_link_libraries(smdll smlib)
 set_module_type(smdll nativedll ENTRYPOINT DllMainCRTStartup 12)
 add_importlibs(smdll ntdll)
-add_pch(smdll precomp.h)
+add_pch(smdll precomp.h SOURCE)
 add_dependencies(smdll psdk)
 add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/msctf/CMakeLists.txt
===================================================================
--- dll/win32/msctf/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msctf/CMakeLists.txt	(copie de travail)
@@ -17,11 +17,16 @@
     msctf.c
     range.c
     threadmgr.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c
+    msctf_internal.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c)
+
+add_library(msctf SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
 
-add_library(msctf SHARED ${SOURCE} version.rc)
 set_module_type(msctf win32dll)
 target_link_libraries(msctf uuid wine)
 add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(msctf msctf_internal.h SOURCE)
 add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all)
Index: dll/win32/ws2_32/misc/dllmain.c
===================================================================
--- dll/win32/ws2_32/misc/dllmain.c	(rÃ©vision 61927)
+++ dll/win32/ws2_32/misc/dllmain.c	(copie de travail)
@@ -55,7 +55,8 @@
 WSAStartup(IN  WORD wVersionRequested,
            OUT LPWSADATA lpWSAData)
 {
-    BYTE Low, High;
+    WORD VersionReturned = 0;
+    DWORD ErrorCode = ERROR_SUCCESS;
 
     WS_DbgPrint(MAX_TRACE, ("WSAStartup of ws2_32.dll\n"));
 
@@ -65,55 +66,74 @@
     if (lpWSAData == NULL)
         return WSAEFAULT;
 
-    Low = LOBYTE(wVersionRequested);
-    High  = HIBYTE(wVersionRequested);
+    /* Check which version is being requested */
+    switch (LOBYTE(wVersionRequested))
+    {
+        case 0:
 
-    if (Low < 1)
-    {
-        WS_DbgPrint(MAX_TRACE, ("Bad winsock version requested, %d,%d", Low, High));
-        return WSAVERNOTSUPPORTED;
+            /* We don't support this unknown version */
+            ErrorCode = WSAVERNOTSUPPORTED;
+            break;
+
+        case 1:
+            /* We support only 1.0 and 1.1 */
+            if (HIBYTE(wVersionRequested) == 0)
+            {
+                /* Caller wants 1.0, return it */
+                VersionReturned = wVersionRequested;
+            }
+            else
+            {
+                /* The only other version we support is 1.1 */
+                VersionReturned = MAKEWORD(1, 1);
+            }
+            break;
+
+        case 2:
+            /* We support only 2.0, 2.1 and 2.2 */
+            if (HIBYTE(wVersionRequested) <= 2)
+            {
+                /* Caller wants 2.0-2.2, return it */
+                VersionReturned = MAKEWORD(2, HIBYTE(wVersionRequested));
+            }
+            else
+            {
+                /* The highest version we support is 2.2 */
+                VersionReturned = MAKEWORD(2, 2);
+            }
+            break;
+
+        default:
+
+            /* Return 2.2 */
+            VersionReturned = MAKEWORD(2, 2);;
+            break;
     }
 
-    if (Low == 1)
+    /* Return the Version Requested, unless error */
+    lpWSAData->wVersion = VersionReturned;
+
+    lpWSAData->wHighVersion = MAKEWORD(2,2);
+    lstrcpyA(lpWSAData->szDescription, "WinSock 2.0");
+    lstrcpyA(lpWSAData->szSystemStatus, "Running");
+
+    if (LOBYTE(wVersionRequested) == 1)
     {
-        if (High == 0)
-        {
-            lpWSAData->wVersion = wVersionRequested;
-        }
-        else
-        {
-            lpWSAData->wVersion = MAKEWORD(1, 1);
-        }
-    }
-    else if (Low == 2)
-    {
-        if (High <= 2)
-        {
-            lpWSAData->wVersion = MAKEWORD(2, High);
-        }
-        else
-        {
-            lpWSAData->wVersion = MAKEWORD(2, 2);
-        }
-    }
+        lpWSAData->iMaxSockets = 32767;
+        lpWSAData->iMaxUdpDg = 65467;
+    } 
     else
     {
-        lpWSAData->wVersion = MAKEWORD(2, 2);
+        lpWSAData->iMaxSockets = 0;
+        lpWSAData->iMaxUdpDg = 0;
     }
-
-    lpWSAData->wVersion     = wVersionRequested;
-    lpWSAData->wHighVersion = MAKEWORD(2,2);
-    lstrcpyA(lpWSAData->szDescription, "WinSock 2.2");
-    lstrcpyA(lpWSAData->szSystemStatus, "Running");
-    lpWSAData->iMaxSockets  = 0;
-    lpWSAData->iMaxUdpDg    = 0;
-    lpWSAData->lpVendorInfo = NULL;
-
+    
     /*FIXME: increment internal counter */
 
-    WSASETINITIALIZED;
+    if (ErrorCode == ERROR_SUCCESS)
+        WSASETINITIALIZED;
 
-    return NO_ERROR;
+    return ErrorCode;
 }
 
 
Index: dll/win32/ws2_32/misc/ns.c
===================================================================
--- dll/win32/ws2_32/misc/ns.c	(rÃ©vision 61927)
+++ dll/win32/ws2_32/misc/ns.c	(copie de travail)
@@ -861,7 +861,7 @@
 
     p = NtCurrentTeb()->WinSockData;
 
-    if( !p )
+    if (!p || !WSAINITIALIZED)
     {
         WSASetLastError( WSANOTINITIALISED );
         return NULL;
@@ -1130,7 +1130,7 @@
     DWORD ReadSize = 0;
     PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
 
-    if( !p )
+    if (!p || !WSAINITIALIZED)
     {
         WSASetLastError( WSANOTINITIALISED );
         return NULL;
@@ -1314,7 +1314,7 @@
     DWORD ReadSize = 0, ValidData = 0;
     PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
 
-    if( !p )
+    if( !p || !WSAINITIALIZED)
     {
         WSASetLastError( WSANOTINITIALISED );
         return NULL;
@@ -1496,7 +1496,7 @@
 
     p = (PCHAR)cp;
 
-    if (!p)
+    if (!p || !WSAINITIALIZED)
     {
         WSASetLastError(WSAEFAULT);
         return INADDR_NONE;
Index: dll/win32/ws2_32/CMakeLists.txt
===================================================================
--- dll/win32/ws2_32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/ws2_32/CMakeLists.txt	(copie de travail)
@@ -17,15 +17,18 @@
     misc/sndrcv.c
     misc/stubs.c
     misc/upcall.c
+    include/ws2_32.h)
+
+add_library(ws2_32 SHARED
+    ${SOURCE}
     misc/async.c
     ws2_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
 
-add_library(ws2_32 SHARED ${SOURCE})
 set_module_type(ws2_32 win32dll UNICODE)
 target_link_libraries(ws2_32 wine)
 add_delay_importlibs(ws2_32 user32)
 add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll)
-add_pch(ws2_32 include/ws2_32.h)
+add_pch(ws2_32 include/ws2_32.h SOURCE)
 add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/rsaenh/CMakeLists.txt
===================================================================
--- dll/win32/rsaenh/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/rsaenh/CMakeLists.txt	(copie de travail)
@@ -15,11 +15,15 @@
     rsa.c
     rsaenh.c
     sha2.c
+    tomcrypt.h)
+
+add_library(rsaenh SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
 
-add_library(rsaenh SHARED ${SOURCE} rsrc.rc)
 set_module_type(rsaenh win32dll)
 target_link_libraries(rsaenh wine)
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
-add_pch(rsaenh tomcrypt.h)
+add_pch(rsaenh tomcrypt.h SOURCE)
 add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)
Index: dll/win32/msrle32/lang/msrle_Sq.rc
===================================================================
--- dll/win32/msrle32/lang/msrle_Sq.rc	(rÃ©vision 0)
+++ dll/win32/msrle32/lang/msrle_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,32 @@
+/*
+ * English resource file for MS-RLE
+ *
+ * Copyright 2002 Michael GÃ¼nnewig
+ *
+ * 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
+ */
+
+#include "msrle_private.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+	IDS_NAME	"WINE-MS-RLE"
+	IDS_DESCRIPTION	"Wine MS-RLE video Kodek"
+	IDS_ABOUT       "Wine MS-RLE video Kodek\nCopyright 2002 nga Michael GÃ¼nnewig"
+}

Modification de propriÃ©tÃ©s sur dll/win32/msrle32/lang/msrle_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/msrle32/rsrc.rc
===================================================================
--- dll/win32/msrle32/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/msrle32/rsrc.rc	(copie de travail)
@@ -1,7 +1,7 @@
 /*
  * Top level resource file for MS-RLE
  *
- * Copyright 2002 Michael Günnewig
+ * Copyright 2002 Michael GÃ¼nnewig
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -67,9 +67,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/msrle_Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/msrle_Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DE_DE
@@ -99,6 +96,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/msrle_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/msrle_Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/msrle_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/msrle_Uk.rc"
 #endif
Index: dll/win32/oleaut32/CMakeLists.txt
===================================================================
--- dll/win32/oleaut32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/oleaut32/CMakeLists.txt	(copie de travail)
@@ -33,6 +33,15 @@
     varformat.c
     variant.c
     vartype.c
+    precomp.h)
+
+if(MSVC)
+    add_asm_files(oleaut32_asm msvc.S)
+endif()
+
+add_library(oleaut32 SHARED
+    ${SOURCE}
+    ${oleaut32_asm}
     oleaut32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
@@ -40,11 +49,6 @@
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def)
 
-if(MSVC)
-    add_asm_files(oleaut32_asm msvc.S)
-endif()
-
-add_library(oleaut32 SHARED ${SOURCE} ${oleaut32_asm})
 add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl)
 add_dependencies(oleaut32 oleaut32_idlheader)
 set_module_type(oleaut32 win32dll)
@@ -51,4 +55,5 @@
 target_link_libraries(oleaut32 wine wineldr uuid ${PSEH_LIB})
 add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs)
 add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(oleaut32 precomp.h SOURCE)
 add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/oleaut32/lang/oleaut32_Sq.rc
===================================================================
--- dll/win32/oleaut32/lang/oleaut32_Sq.rc	(rÃ©vision 0)
+++ dll/win32/oleaut32/lang/oleaut32_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,31 @@
+/*
+ * English resources for oleaut32
+ *
+ * Copyright 2003 Jon Griffiths
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+  IDS_TRUE  "VÃ«rtetÃ«"
+  IDS_FALSE "RremÃ«"
+  IDS_YES   "Po"
+  IDS_NO    "Jo"
+  IDS_ON    "Ndezur"
+  IDS_OFF   "Fikur"
+}

Modification de propriÃ©tÃ©s sur dll/win32/oleaut32/lang/oleaut32_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/oleaut32/oleaut32.rc
===================================================================
--- dll/win32/oleaut32/oleaut32.rc	(rÃ©vision 61927)
+++ dll/win32/oleaut32/oleaut32.rc	(copie de travail)
@@ -96,6 +96,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/oleaut32_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/oleaut32_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/oleaut32_Uk.rc"
 #endif
Index: dll/win32/mmdevapi/mmdevapi.h
===================================================================
--- dll/win32/mmdevapi/mmdevapi.h	(rÃ©vision 61927)
+++ dll/win32/mmdevapi/mmdevapi.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _MMDEVAPI_H_
+#define _MMDEVAPI_H_
+
 #include <wine/config.h>
 #include <wine/port.h>
 
@@ -97,3 +100,5 @@
 extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN;
 
 extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;
+
+#endif /* _MMDEVAPI_H_ */
Index: dll/win32/mmdevapi/CMakeLists.txt
===================================================================
--- dll/win32/mmdevapi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mmdevapi/CMakeLists.txt	(copie de travail)
@@ -10,12 +10,17 @@
     audiovolume.c
     devenum.c
     main.c
+    mmdevapi.h
+    ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c)
+
+add_library(mmdevapi SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c
+    mmdevapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi.def)
 
-add_library(mmdevapi SHARED ${SOURCE} mmdevapi.rc)
 set_module_type(mmdevapi win32dll)
 target_link_libraries(mmdevapi uuid wine)
 add_importlibs(mmdevapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(mmdevapi mmdevapi.h SOURCE)
 add_cd_file(TARGET mmdevapi DESTINATION reactos/system32 FOR all)
Index: dll/win32/tapi32/precomp.h
===================================================================
--- dll/win32/tapi32/precomp.h	(rÃ©vision 61927)
+++ dll/win32/tapi32/precomp.h	(copie de travail)
@@ -1,7 +1,7 @@
 #ifndef _TAPI32_PCH_
 #define _TAPI32_PCH_
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
Index: dll/win32/tapi32/CMakeLists.txt
===================================================================
--- dll/win32/tapi32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/tapi32/CMakeLists.txt	(copie de travail)
@@ -8,11 +8,15 @@
     internal.c
     line.c
     phone.c
-    ${CMAKE_CURRENT_BINARY_DIR}/tapi32_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/tapi32_stubs.c)
+
+add_library(tapi32 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
 
-add_library(tapi32 SHARED ${SOURCE})
 set_module_type(tapi32 win32dll)
 target_link_libraries(tapi32 wine)
 add_importlibs(tapi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(tapi32 precomp.h SOURCE)
 add_cd_file(TARGET tapi32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/netid/lang/sq-AL.rc
===================================================================
--- dll/win32/netid/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/netid/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,84 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Emri Kompjuterit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
+    LTEXT "ReactOS pÃ«rdor informacionin e mÃ«poshtÃ«m pÃ«r tÃ« identifikuar kompjuterin tuaj nÃ« rrjet.", IDC_STATIC, 40, 5, 204, 20
+    LTEXT "PÃ«rshkrimi Kompjuterit:", IDC_STATIC, 6, 40, 90, 9
+    EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "Emri plotÃ« kompjuterit:", IDC_STATIC, 6, 68, 85, 9
+    EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "GrupPune:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9
+    EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "PÃ«r tÃ« pÃ«rdorur Magjistarin Rrjetit Identifikues pÃ«r t'u futur nÃ« njÃ« domain dhe pÃ«r tÃ« krijuar njÃ« pÃ«rdorues lokal, klikoni ""ID Rrjetit"".", IDC_STATIC, 6, 113, 172, 24
+    PUSHBUTTON "&ID Rrjetit...", IDC_NETWORK_ID, 190, 114, 58, 15
+    LTEXT "PÃ«r tÃ« riemÃ«rtuar kÃ«tÃ« kompjuter apo tÃ« bashkohet me njÃ« domain, klikoni ""Ndrysho"".", IDC_STATIC, 6, 149, 170, 17
+    PUSHBUTTON "&Ndrysho...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
+    LTEXT "ShÃ«nim: VetÃ«m AdministratorÃ«t mund tÃ« ndryshojnÃ« identifikimin e kÃ«tij kompjuteri.", IDC_STATIC, 6, 179, 300, 9
+END
+
+IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Emri Kompjuterit Ndryshon"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "(mesazhi shkon kÃ«tu)", 1017, 7, 5, 218, 30
+    LTEXT "&Emri kompjuterit:", -1, 7, 41, 219, 8
+    EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT
+    LTEXT "Emri plotÃ« kompjuterit:", 1016, 7, 72, 218, 10
+    EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    PUSHBUTTON "&M'shumÃ«...", 1003, 150, 102, 75, 14
+    GROUPBOX "AnÃ«tarÃ« i", 1018, 7, 119, 219, 73
+    AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP
+    AUTORADIOBUTTON "&GrupPune:", 1004, 17, 161, 191, 10
+    EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP
+    PUSHBUTTON "&Gjej domain tim", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED
+    EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT
+    DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 176, 203, 50, 14
+END
+
+IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "DNS prapashtesÃ« dhe NetBIOS emri kompjuterit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Prapashtesa priamre e DNS'sÃ« tÃ« kÃ«tij kompjuterit:", -1, 7, 5, 253, 8
+    EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL
+    AUTOCHECKBOX "&Ndrysho prapashtesÃ«m primare DNS'sÃ« kur antarÃ«simi i domain-it ndryshon", 115, 11, 39, 250, 10
+    LTEXT "&NetBIOS emri kompjuterit:", -1, 7, 57, 148, 8
+    EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY
+    DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14
+    PUSHBUTTON "Anulo", 2, 209, 104, 50, 14
+    LTEXT "Ky emÃ«r Ã«shtÃ« pÃ«rdorur pÃ«r ndÃ«rveprim me kompjutera tÃ« vjetÃ«r dhe shÃ«rbimet.", 13, 7, 88, 253, 8
+END
+
+STRINGTABLE
+BEGIN
+    1 "* panjohur *"
+    2 "GRUPPUNE"
+    3 "Gabimi nÃ« vijim ndodhi duke u pÃ«rpjekur pÃ«r tÃ« lexuar informacionin e anÃ«tarÃ«simit tÃ« domain-it:"
+    4 "Emri Kompjuterit Ndryshon"
+    5 "GrupPune:"
+    6 "Domain:"
+    22 "MirÃ«sivine tek %1 grupipunÃ«s."
+    23 "MirÃ«sivine tek %1 domain."
+    24 "Ju duhet tÃ« rinisni kÃ«tÃ« kompjuter qÃ« ndryshimet tÃ« hyjnÃ« nÃ« fuqi."
+    25 "Ju mund tÃ« ndryshoni emrin dhe anÃ«tarÃ«simin e kÃ«tij kompjuteri. Ndryshimet mund tÃ« ndikojnÃ« nÃ« hyrjet e burimeve nÃ« rrjet."
+    1021 "Shenime: VetÃ«m AdministratorÃ«t mund tÃ« ndryshojnÃ« identifikimin e kÃ«tij kompjuteri."
+    1022 "Shenim: Identifikimi i kompjuterit nuk mund tÃ« ndryshohet sepse:"
+    1030 "Emri i ri kompjuterik ""%s"" pÃ«rmban karaktere tÃ« cilat nuk janÃ« tÃ« lejuara. KarakterÃ«t tÃ« cilat nuk janÃ« tÃ« lejuar pÃ«rfshijnÃ« ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    /* Windows allows using these characters, although it displays a warning message.
+       Forbidding the use of these characters means incompatibility with Windows. */
+    3210 "&Detaje >>"
+    3220 "<< &Detaje"
+    4000 "Informacion"
+    4001 "Nuk mund tÃ« vihet njÃ« emÃ«r i ri kompjuterik!"
+END

Modification de propriÃ©tÃ©s sur dll/win32/netid/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/netid/netid.rc
===================================================================
--- dll/win32/netid/netid.rc	(rÃ©vision 61927)
+++ dll/win32/netid/netid.rc	(copie de travail)
@@ -66,6 +66,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/msacm32/msacm.rc
===================================================================
--- dll/win32/msacm32/msacm.rc	(rÃ©vision 61927)
+++ dll/win32/msacm32/msacm.rc	(copie de travail)
@@ -94,6 +94,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/msacm_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/msacm_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/msacm_Uk.rc"
 #endif
Index: dll/win32/msacm32/CMakeLists.txt
===================================================================
--- dll/win32/msacm32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msacm32/CMakeLists.txt	(copie de travail)
@@ -10,13 +10,17 @@
     msacm32_main.c
     pcmconverter.c
     stream.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c
+    wineacm.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
+
+add_library(msacm32 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
 
-add_library(msacm32 SHARED ${SOURCE})
 set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
 target_link_libraries(msacm32 wine)
 add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
+add_pch(msacm32 wineacm.h SOURCE)
 add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
 
 add_subdirectory(msacm32.drv)
Index: dll/win32/msacm32/lang/msacm_Sq.rc
===================================================================
--- dll/win32/msacm32/lang/msacm_Sq.rc	(rÃ©vision 0)
+++ dll/win32/msacm32/lang/msacm_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,51 @@
+/*
+ * English resource file for MS ACM
+ *
+ * Copyright 2000 Eric Pouech
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "PÃ«rzgjedhja ZÃ«rit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+
+    LTEXT           "&Emri:", -1, 5, 5, 115, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60,
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+
+    PUSHBUTTON      "&Ruaj Si...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
+    PUSHBUTTON      "&Hiq", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
+
+    LTEXT           "&Formati:", -1, 5, 41, 44, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60,
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT           "&Atributet:", -1, 5, 59, 44, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    DEFPUSHBUTTON   "OK", IDOK, 48, 80, 40, 14
+    PUSHBUTTON      "Anulo", IDCANCEL, 92, 80, 40, 14
+    PUSHBUTTON      "&NdihmÃ«", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
+
+END

Modification de propriÃ©tÃ©s sur dll/win32/msacm32/lang/msacm_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/dbghelp/CMakeLists.txt
===================================================================
--- dll/win32/dbghelp/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/dbghelp/CMakeLists.txt	(copie de travail)
@@ -69,16 +69,19 @@
         storage.c
         symbol.c
         type.c
-        ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c
+        dbghelp_private.h
+        ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c)
+
+    add_library(dbghelp SHARED
+        ${SOURCE}
+        version.rc
         ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def)
 
-    add_library(dbghelp SHARED ${SOURCE} version.rc)
-
     set_module_type(dbghelp win32dll)
     target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames zlib)
     add_delay_importlibs(dbghelp version)
     add_importlibs(dbghelp psapi msvcrt kernel32 ntdll)
-    add_pch(dbghelp dbghelp_private.h)
+    add_pch(dbghelp dbghelp_private.h SOURCE)
     add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all)
 
 endif()
Index: dll/win32/dbghelp/dbghelp_private.h
===================================================================
--- dll/win32/dbghelp/dbghelp_private.h	(rÃ©vision 61927)
+++ dll/win32/dbghelp/dbghelp_private.h	(copie de travail)
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _DBGHELP_PRIVATE_H_
+#define _DBGHELP_PRIVATE_H_
+
 #include <config.h>
 
 #include <assert.h>
@@ -842,3 +845,5 @@
                                      const char* name) DECLSPEC_HIDDEN;
 
 #include "image_private.h"
+
+#endif /* _DBGHELP_PRIVATE_H_ */
Index: dll/win32/msports/lang/sq-AL.rc
===================================================================
--- dll/win32/msports/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/msports/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,32 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_SERIALSETTINGS DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "CilÃ«simet Portit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    RTEXT "B&its per sekonda:", -1, 74, 19, 62, 8, WS_GROUP
+    COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST
+    RTEXT "&Data bits:", -1, 74, 40, 62, 8
+    COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST
+    RTEXT "&Barayi:", -1, 74, 61, 62, 8
+    COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST
+    RTEXT "&Ndalo bits:", -1, 74, 82, 62, 8
+    COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST
+    RTEXT "&Kontrolli i rrjedhjes:", -1, 74, 102, 62, 8
+    COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&PÃ«rparuar...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP
+    PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP
+END
+
+IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "CilÃ«simet Portit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    RTEXT "TESTO", -1, 74, 19, 62, 8, WS_GROUP
+END

Modification de propriÃ©tÃ©s sur dll/win32/msports/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/msports/msports.rc
===================================================================
--- dll/win32/msports/msports.rc	(rÃ©vision 61927)
+++ dll/win32/msports/msports.rc	(copie de travail)
@@ -30,6 +30,9 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/msports/precomp.h
===================================================================
--- dll/win32/msports/precomp.h	(rÃ©vision 61927)
+++ dll/win32/msports/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MSPORTS_PCH_
+#define _MSPORTS_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -17,3 +20,5 @@
 #include "resource.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msports);
+
+#endif /* _MSPORTS_PCH_ */
Index: dll/win32/msports/CMakeLists.txt
===================================================================
--- dll/win32/msports/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msports/CMakeLists.txt	(copie de travail)
@@ -8,14 +8,17 @@
     msports.c
     parallel.c
     serial.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c)
+
+add_library(msports SHARED
+    ${SOURCE}
     msports.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msports.def)
 
-add_library(msports SHARED ${SOURCE})
 set_module_type(msports win32dll UNICODE)
 target_link_libraries(msports wine)
 add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll)
-add_pch(msports precomp.h)
+add_pch(msports precomp.h SOURCE)
 add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/ieframe/CMakeLists.txt
===================================================================
--- dll/win32/ieframe/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/ieframe/CMakeLists.txt	(copie de travail)
@@ -23,11 +23,14 @@
     urlhist.c
     view.c
     webbrowser.c
-    ${CMAKE_CURRENT_BINARY_DIR}/ieframe_stubs.c
+    ieframe.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ieframe_stubs.c)
+
+add_library(ieframe SHARED
+    ${SOURCE}
+    ieframe.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ieframe.def)
 
-add_library(ieframe SHARED ${SOURCE} ieframe.rc)
-
 add_typelib(ieframe_v1.idl)
 
 list(APPEND ieframe_rc_deps
@@ -43,4 +46,5 @@
 set_module_type(ieframe win32dll)
 target_link_libraries(ieframe uuid wine)
 add_importlibs(ieframe urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(ieframe ieframe.h SOURCE)
 add_cd_file(TARGET ieframe DESTINATION reactos/system32 FOR all)
Index: dll/win32/ieframe/ieframe.h
===================================================================
--- dll/win32/ieframe/ieframe.h	(rÃ©vision 61927)
+++ dll/win32/ieframe/ieframe.h	(copie de travail)
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _IEFRAME_H_
+#define _IEFRAME_H_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -400,3 +403,5 @@
         WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, 0, 0);
     return ret;
 }
+
+#endif /* _IEFRAME_H_ */
Index: dll/win32/hhctrl.ocx/lang/Tr.rc
===================================================================
--- dll/win32/hhctrl.ocx/lang/Tr.rc	(rÃ©vision 61927)
+++ dll/win32/hhctrl.ocx/lang/Tr.rc	(copie de travail)
@@ -2,7 +2,7 @@
  * HTML Help resources
  * Turkish Language Support
  *
- * Copyright 2006 Fatih Aþýcý
+ * Copyrights: 2006 - Fatih AÅŸÄ±cÄ± (fasici@linux-sevenler.org), 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,24 +23,24 @@
 
 STRINGTABLE
 BEGIN
-    IDS_CONTENTS     "&Ýçerik"
-    IDS_INDEX        "Di&zin"
+    IDS_CONTENTS     "&Ä°Ã§indekiler"
+    IDS_INDEX        "&Dizin"
     IDS_SEARCH       "&Ara"
-    IDS_FAVORITES    "&Sýk Kullanýlanlar"
+    IDS_FAVORITES    "&Yer Ä°mleri"
 END
 
 STRINGTABLE
 BEGIN
-    IDTB_EXPAND      "Göster"
+    IDTB_EXPAND      "GÃ¶ster"
     IDTB_CONTRACT    "Gizle"
     IDTB_STOP        "Dur"
     IDTB_REFRESH     "Yenile"
     IDTB_BACK        "Geri"
     IDTB_HOME        "Ev"
-    IDTB_SYNC        "Eþitle"
-    IDTB_PRINT       "Yazdýr"
-    IDTB_OPTIONS     "Seçenekler"
-    IDTB_FORWARD     "Ýleri"
+    IDTB_SYNC        "EÅŸitle"
+    IDTB_PRINT       "YazdÄ±r"
+    IDTB_OPTIONS     "SeÃ§enekler"
+    IDTB_FORWARD     "Ä°leri"
     IDTB_NOTES       "IDTB_NOTES"
     IDTB_BROWSE_FWD  "IDTB_BROWSE_FWD"
     IDTB_BROWSE_BACK "IDT_BROWSE_BACK"
@@ -51,8 +51,8 @@
     IDTB_FAVORITES   "IDTB_FAVORITES"
     IDTB_JUMP1       "Jump1"
     IDTB_JUMP2       "Jump2"
-    IDTB_CUSTOMIZE   "Özelleþtir"
-    IDTB_ZOOM        "Yaklaþtýr"
+    IDTB_CUSTOMIZE   "HusÃ»sileÅŸtir"
+    IDTB_ZOOM        "YakÄ±nlaÅŸtÄ±r"
     IDTB_TOC_NEXT    "IDTB_TOC_NEXT"
     IDTB_TOC_PREV    "IDTB_TOC_PREV"
 END
Index: dll/win32/hhctrl.ocx/lang/Sq.rc
===================================================================
--- dll/win32/hhctrl.ocx/lang/Sq.rc	(rÃ©vision 0)
+++ dll/win32/hhctrl.ocx/lang/Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,71 @@
+/*
+ * HTML Help resources
+ * English Language Support
+ *
+ * Copyright 2005 James Hawkins
+ * Translation: Ardit Dani (Albanian Translation Support File)
+ *
+ * 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
+ */
+
+#include "resource.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_CONTENTS     "PÃ«rmbajtja"
+    IDS_INDEX        "I&ndex"
+    IDS_SEARCH       "Kerko"
+    IDS_FAVORITES    "Favor&ite"
+END
+
+STRINGTABLE
+BEGIN
+    IDTB_EXPAND      "Shfaq"
+    IDTB_CONTRACT    "Fshi"
+    IDTB_STOP        "Stop"
+    IDTB_REFRESH     "Rifresko"
+    IDTB_BACK        "Mbrapa"
+    IDTB_HOME        "Shpi"
+    IDTB_SYNC        "Synk"
+    IDTB_PRINT       "Printo"
+    IDTB_OPTIONS     "opsione"
+    IDTB_FORWARD     "Perpara"
+    IDTB_NOTES       "IDTB_SHENIME"
+    IDTB_BROWSE_FWD  "IDTB_BROWSE_FWD"
+    IDTB_BROWSE_BACK "IDT_BROWSE_MBRAPA"
+    IDTB_CONTENTS    "IDTB_PERMBAJTJE"
+    IDTB_INDEX       "IDTB_INDEX"
+    IDTB_SEARCH      "IDTB_KERKO"
+    IDTB_HISTORY     "IDTB_HISTORI"
+    IDTB_FAVORITES   "IDTB_FAVORITE"
+    IDTB_JUMP1       "Jump1"
+    IDTB_JUMP2       "Jump2"
+    IDTB_CUSTOMIZE   "Modifiko"
+    IDTB_ZOOM        "Zoom"
+    IDTB_TOC_NEXT    "IDTB_TOC_NEXT"
+    IDTB_TOC_PREV    "IDTB_TOC_PREV"
+END
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_CONTENTS     "PÃ«rmbajtja"
+    IDS_INDEX        "I&ndex"
+    IDS_SEARCH       "Kerko"
+    IDS_FAVORITES    "Favour&ite"
+END

Modification de propriÃ©tÃ©s sur dll/win32/hhctrl.ocx/lang/Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/hhctrl.ocx/hhctrl.rc
===================================================================
--- dll/win32/hhctrl.ocx/hhctrl.rc	(rÃ©vision 61927)
+++ dll/win32/hhctrl.ocx/hhctrl.rc	(copie de travail)
@@ -57,9 +57,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DE_DE
@@ -95,6 +92,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/Si.rc"
 #endif
+#ifdef LANGAUGE_SQ_AL
+    #include "lang/Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/Uk.rc"
 #endif
Index: dll/win32/hhctrl.ocx/CMakeLists.txt
===================================================================
--- dll/win32/hhctrl.ocx/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/hhctrl.ocx/CMakeLists.txt	(copie de travail)
@@ -6,7 +6,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(hhctrl.ocx hhctrl.ocx.spec)
 
-add_library(hhctrl SHARED
+list(APPEND SOURCE
     chm.c
     content.c
     help.c
@@ -15,6 +15,10 @@
     search.c
     stream.c
     webbrowser.c
+    hhctrl.h)
+
+add_library(hhctrl SHARED
+    ${SOURCE}
     guid.c
     hhctrl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def)
@@ -34,5 +38,5 @@
 target_link_libraries(hhctrl uuid wine)
 add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll)
 add_dependencies(hhctrl wineheaders)
-add_pch(hhctrl hhctrl.h)
+add_pch(hhctrl hhctrl.h SOURCE)
 add_cd_file(TARGET hhctrl DESTINATION reactos/system32 FOR all)
Index: dll/win32/shdocvw/CMakeLists.txt
===================================================================
--- dll/win32/shdocvw/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/shdocvw/CMakeLists.txt	(copie de travail)
@@ -9,12 +9,17 @@
 list(APPEND SOURCE
     shdocvw_main.c
     shlinstobj.c
-    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
+    shdocvw.h
+    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c)
 
 add_typelib(shdocvw_v1.idl)
 set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb)
-add_library(shdocvw SHARED ${SOURCE} shdocvw.rc)
+
+add_library(shdocvw SHARED
+    ${SOURCE}
+    shdocvw.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
+
 set_module_type(shdocvw win32dll)
 target_link_libraries(shdocvw uuid wine)
 add_delay_importlibs(shdocvw ole32 oleaut32 ieframe)
@@ -21,5 +26,5 @@
 add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll)
 # shdocvw_v1.tlb needs stdole2.tlb
 add_dependencies(shdocvw stdole2)
-add_pch(shdocvw shdocvw.h)
+add_pch(shdocvw shdocvw.h SOURCE)
 add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)
Index: dll/win32/wininet/rsrc.rc
===================================================================
--- dll/win32/wininet/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/wininet/rsrc.rc	(copie de travail)
@@ -115,6 +115,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/wininet_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/wininet_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/wininet_Uk.rc"
 #endif
Index: dll/win32/wininet/CMakeLists.txt
===================================================================
--- dll/win32/wininet/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wininet/CMakeLists.txt	(copie de travail)
@@ -20,12 +20,17 @@
     urlcache.c
     utility.c
     wininet_main.c
+    internet.h)
+
+add_library(wininet SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/wininet.def)
 
-add_library(wininet SHARED ${SOURCE} rsrc.rc)
 set_module_type(wininet win32dll)
 target_link_libraries(wininet wine ${PSEH_LIB} zlib)
 add_delay_importlibs(wininet secur32 crypt32 cryptui)
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
+add_pch(wininet internet.h SOURCE)
 add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all)
Index: dll/win32/wininet/lang/wininet_Sq.rc
===================================================================
--- dll/win32/wininet/lang/wininet_Sq.rc	(rÃ©vision 0)
+++ dll/win32/wininet/lang/wininet_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2003 Mike McCormack for CodeWeavers
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_PROXYDLG DIALOG 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fusni FjalÃ«kalimin e Rrjetit"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", -1, 40, 6, 150, 15
+ LTEXT "Proxi", -1, 40, 26, 50, 10
+ LTEXT "VÃ«rtetÃ«m", -1, 40, 46, 50, 10
+ LTEXT "PÃ«rdoruese", -1, 40, 66, 50, 10
+ LTEXT "FjalÃ«kalimi", -1, 40, 86, 50, 10
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "Ruaj kÃ«tÃ« fjalÃ«kalim (i pasigurt)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Anulo", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+IDD_AUTHDLG DIALOG 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "VÃ«rtetimi Nevojitet"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", -1, 40, 6, 150, 15
+ LTEXT "Server", -1, 40, 26, 50, 10
+ LTEXT "VÃ«rtetÃ«m", -1, 40, 46, 50, 10
+ LTEXT "PÃ«rdoruesi", -1, 40, 66, 50, 10
+ LTEXT "FjalÃ«kalimi", -1, 40, 86, 50, 10
+ LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "Ruaj kÃ«tÃ« fjalÃ«kalim (i pasigurt)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Anulo", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+IDD_INVCERTDLG DIALOG 3, 24, 250, 86
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ParalajmÃ«rim Sigurie"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Ka njÃ« problem me certifikatÃ«n pÃ«r kÃ«tÃ« faqe.", -1, 40, 6, 200, 20
+ LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20
+ LTEXT "A doni tÃ« vazhdoni gjithsesi?", -1, 40, 46, 200, 20
+ PUSHBUTTON "Po", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Jo", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP
+}

Modification de propriÃ©tÃ©s sur dll/win32/wininet/lang/wininet_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/msgina/msgina.h
===================================================================
--- dll/win32/msgina/msgina.h	(rÃ©vision 61927)
+++ dll/win32/msgina/msgina.h	(copie de travail)
@@ -1,24 +1,17 @@
 #ifndef _MSGINA_H
 #define _MSGINA_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-#include <stdlib.h>
 #include <windef.h>
 #include <winbase.h>
-#include <wincon.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winsvc.h>
 #include <winuser.h>
-#include <userenv.h>
 #include <winwlx.h>
-#include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <ndk/sefuncs.h>
-#include <ntlsa.h>
 #include <ntsecapi.h>
 
 #include <wine/debug.h>
@@ -46,10 +39,12 @@
     BOOL bDontDisplayLastUserName;
     BOOL bShutdownWithoutLogon;
 
+    INT nShutdownAction;
+
     /* Information to be filled during logon */
     WCHAR UserName[256];
     WCHAR Domain[256];
-    LPWSTR Password;
+    WCHAR Password[256];
     SYSTEMTIME LogonTime;
     HANDLE UserToken;
     PLUID pAuthenticationId;
@@ -86,25 +81,42 @@
 
 /* lsa.c */
 
-BOOL
+NTSTATUS
 ConnectToLsa(
     PGINA_CONTEXT pgContext);
 
+NTSTATUS
+MyLogonUser(
+    HANDLE LsaHandle,
+    ULONG AuthenticationPackage,
+    LPWSTR lpszUsername,
+    LPWSTR lpszDomain,
+    LPWSTR lpszPassword,
+    PHANDLE phToken,
+    PNTSTATUS SubStatus);
+
 /* msgina.c */
 
 BOOL
 DoAdminUnlock(
+    IN PGINA_CONTEXT pgContext,
     IN PWSTR UserName,
     IN PWSTR Domain,
     IN PWSTR Password);
 
-BOOL
+NTSTATUS
 DoLoginTasks(
     IN OUT PGINA_CONTEXT pgContext,
     IN PWSTR UserName,
     IN PWSTR Domain,
+    IN PWSTR Password,
+    OUT PNTSTATUS SubStatus);
+
+BOOL
+CreateProfile(
+    IN OUT PGINA_CONTEXT pgContext,
+    IN PWSTR UserName,
+    IN PWSTR Domain,
     IN PWSTR Password);
 
 #endif /* _MSGINA_H */
-
-/* EOF */
Index: dll/win32/msgina/gui.c
===================================================================
--- dll/win32/msgina/gui.c	(rÃ©vision 61927)
+++ dll/win32/msgina/gui.c	(copie de travail)
@@ -7,6 +7,9 @@
 
 #include "msgina.h"
 
+#include <wingdi.h>
+#include <winnls.h>
+
 typedef struct _DISPLAYSTATUSMSG
 {
     PGINA_CONTEXT Context;
@@ -107,7 +110,13 @@
 
     if (!pgContext->hStatusWindow)
     {
-        msg = (PDISPLAYSTATUSMSG)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DISPLAYSTATUSMSG));
+        /*
+         * If everything goes correctly, 'msg' is freed
+         * by the 'StartupWindowThread' thread.
+         */
+        msg = (PDISPLAYSTATUSMSG)HeapAlloc(GetProcessHeap(),
+                                           HEAP_ZERO_MEMORY,
+                                           sizeof(DISPLAYSTATUSMSG));
         if(!msg)
             return FALSE;
 
@@ -117,29 +126,40 @@
         msg->pMessage = pMessage;
         msg->hDesktop = hDesktop;
 
-        msg->StartupEvent = CreateEventW(
-            NULL,
-            TRUE,
-            FALSE,
-            NULL);
+        msg->StartupEvent = CreateEventW(NULL,
+                                         TRUE,
+                                         FALSE,
+                                         NULL);
 
         if (!msg->StartupEvent)
+        {
+            HeapFree(GetProcessHeap(), 0, msg);
             return FALSE;
+        }
 
-        Thread = CreateThread(
-            NULL,
-            0,
-            StartupWindowThread,
-            (PVOID)msg,
-            0,
-            &ThreadId);
+        Thread = CreateThread(NULL,
+                              0,
+                              StartupWindowThread,
+                              (PVOID)msg,
+                              0,
+                              &ThreadId);
         if (Thread)
         {
+            /* 'msg' will be freed by 'StartupWindowThread' */
+
             CloseHandle(Thread);
             WaitForSingleObject(msg->StartupEvent, INFINITE);
             CloseHandle(msg->StartupEvent);
             return TRUE;
         }
+        else
+        {
+            /*
+             * The 'StartupWindowThread' thread couldn't be created,
+             * so we need to free the allocated 'msg'.
+             */
+            HeapFree(GetProcessHeap(), 0, msg);
+        }
 
         return FALSE;
     }
@@ -172,11 +192,34 @@
     IN WPARAM wParam,
     IN LPARAM lParam)
 {
-    UNREFERENCED_PARAMETER(hwndDlg);
-    UNREFERENCED_PARAMETER(uMsg);
-    UNREFERENCED_PARAMETER(wParam);
-    UNREFERENCED_PARAMETER(lParam);
+    PGINA_CONTEXT pgContext;
+    
+    pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
 
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+        }
+        case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            HDC hdc;
+            if (pgContext->hBitmap)
+            {
+                hdc = BeginPaint(hwndDlg, &ps);
+                DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
+                EndPaint(hwndDlg, &ps);
+            }
+            return TRUE;
+        }
+        case WM_DESTROY:
+        {
+            DeleteObject(pgContext->hBitmap);
+            return TRUE;
+        }
+    }
     return FALSE;
 }
 
@@ -250,7 +293,7 @@
     IN HWND hwndDlg)
 {
     WCHAR UserName[256];
-    WCHAR DomainName[256];
+    WCHAR Domain[256];
     WCHAR OldPassword[256];
     WCHAR NewPassword1[256];
     WCHAR NewPassword2[256];
@@ -264,7 +307,7 @@
     NTSTATUS Status;
 
     GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, 256);
-    GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, DomainName, 256);
+    GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, Domain, 256);
     GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, 256);
     GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, 256);
     GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, 256);
@@ -282,7 +325,7 @@
 
     /* Calculate the request buffer size */
     RequestBufferSize = sizeof(MSV1_0_CHANGEPASSWORD_REQUEST) +
-                        ((wcslen(DomainName) + 1) * sizeof(WCHAR)) +
+                        ((wcslen(Domain) + 1) * sizeof(WCHAR)) +
                         ((wcslen(UserName) + 1) * sizeof(WCHAR)) +
                         ((wcslen(OldPassword) + 1) * sizeof(WCHAR)) +
                         ((wcslen(NewPassword1) + 1) * sizeof(WCHAR));
@@ -304,12 +347,12 @@
     Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST));
 
     /* Pack the domain name */
-    RequestBuffer->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR);
+    RequestBuffer->DomainName.Length = wcslen(Domain) * sizeof(WCHAR);
     RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR);
     RequestBuffer->DomainName.Buffer = Ptr;
 
     RtlCopyMemory(RequestBuffer->DomainName.Buffer,
-                  DomainName,
+                  Domain,
                   RequestBuffer->DomainName.MaximumLength);
 
     Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength);
@@ -349,7 +392,7 @@
     if (!ConnectToLsa(pgContext))
     {
         ERR("ConnectToLsa() failed\n");
-        return FALSE;
+        goto done;
     }
 
     /* Call the authentication package */
@@ -380,6 +423,14 @@
                        IDS_CHANGEPWDTITLE,
                        IDS_PASSWORDCHANGED);
 
+    if ((wcscmp(UserName, pgContext->UserName) == 0) &&
+        (wcscmp(Domain, pgContext->Domain) == 0) &&
+        (wcscmp(OldPassword, pgContext->Password) == 0))
+    {
+        ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR));
+        wcscpy(pgContext->Password, NewPassword1);
+    }
+
 done:
     if (RequestBuffer != NULL)
         HeapFree(GetProcessHeap(), 0, RequestBuffer);
@@ -551,6 +602,221 @@
 }
 
 
+static
+VOID
+UpdateShutdownDesc(
+    IN HWND hwnd)
+{
+    WCHAR szBuffer[256];
+    UINT shutdownDescId = 0;
+    int shutdownCode = 0;
+
+    shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0);
+
+    switch (shutdownCode)
+    {
+        case 0: /* Log off */
+            shutdownDescId = IDS_SHUTDOWN_LOGOFF_DESC;
+            break;
+
+        case 1: /* Shut down */
+            shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC;
+            break;
+
+        case 2: /* Restart */
+            shutdownDescId = IDS_SHUTDOWN_RESTART_DESC;
+            break;
+
+        case 3: /* Sleep */
+            shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC;
+            break;
+
+        case 4: /* Hibernate */
+            shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC;
+            break;
+
+        default:
+            break;
+    }
+
+    LoadStringW(hDllInstance, shutdownDescId, szBuffer, sizeof(szBuffer));
+    SetDlgItemTextW(hwnd, IDC_SHUTDOWN_DESCRIPTION, szBuffer);
+}
+
+
+static
+VOID
+ShutDownOnInit(
+    IN HWND hwndDlg,
+    IN PGINA_CONTEXT pgContext)
+{
+    WCHAR szBuffer[256];
+    WCHAR szBuffer2[256];
+    HWND hwndList;
+    INT idx, count, i;
+
+    hwndList = GetDlgItem(hwndDlg, IDC_SHUTDOWN_LIST);
+
+    /* Clears the content before it's used */
+    SendMessageW(hwndList, CB_RESETCONTENT, 0, 0);
+
+    /* Log off */
+    LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR));
+    wsprintfW(szBuffer2, szBuffer, pgContext->UserName);
+    idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer2);
+    if (idx != CB_ERR)
+        SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF);
+
+    /* Shut down */
+    LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, szBuffer, sizeof(szBuffer) / sizeof(WCHAR));
+    idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer);
+    if (idx != CB_ERR)
+        SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF);
+
+    /* Restart */
+    LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, szBuffer, sizeof(szBuffer) / sizeof(WCHAR));
+    idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer);
+    if (idx != CB_ERR)
+        SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_REBOOT);
+
+    /* Sleep */
+#if 0
+    LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, szBuffer, sizeof(szBuffer) / sizeof(WCHAR));
+    idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer);
+    if (idx != CB_ERR)
+        SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_SLEEP);
+#endif
+
+    /* Hibernate */
+#if 0
+    LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR));
+    idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer);
+    if (idx != CB_ERR)
+        SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE);
+#endif
+
+    /* Sets the default shut down selection */
+    count = SendMessageW(hwndList, CB_GETCOUNT, 0, 0);
+    for (i = 0; i < count; i++)
+    {
+        if (pgContext->nShutdownAction == SendMessageW(hwndList, CB_GETITEMDATA, i, 0))
+        {
+            SendMessageW(hwndList, CB_SETCURSEL, i, 0);
+            break;
+        }
+    }
+
+    /* Updates the choice description based on the current selection */
+    UpdateShutdownDesc(hwndDlg);
+}
+
+
+static
+VOID
+ShutDownOnOk(
+    IN HWND hwndDlg,
+    IN PGINA_CONTEXT pgContext)
+{
+    INT idx;
+
+    idx = SendDlgItemMessageW(hwndDlg,
+                              IDC_SHUTDOWN_LIST,
+                              CB_GETCURSEL,
+                              0,
+                              0);
+    if (idx != CB_ERR)
+    {
+        pgContext->nShutdownAction = SendDlgItemMessageW(hwndDlg,
+                                                         IDC_SHUTDOWN_LIST,
+                                                         CB_GETITEMDATA,
+                                                         idx,
+                                                         0);
+    }
+}
+
+
+BOOL
+CALLBACK
+ShutDownDialogProc(
+    HWND hwnd,
+    UINT Message,
+    WPARAM wParam,
+    LPARAM lParam)
+{
+    PGINA_CONTEXT pgContext;
+
+    pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwnd, GWL_USERDATA);
+
+    switch (Message)
+    {
+        case WM_INITDIALOG:
+            pgContext = (PGINA_CONTEXT)lParam;
+            SetWindowLongPtr(hwnd, GWL_USERDATA, (INT_PTR)pgContext);
+
+            ShutDownOnInit(hwnd, pgContext);
+
+            /* Draw the logo graphic */
+            pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+            return TRUE;
+
+        case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            HDC hdc;
+            if (pgContext->hBitmap)
+            {
+                hdc = BeginPaint(hwnd, &ps);
+                DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
+                EndPaint(hwnd, &ps);
+            }
+            return TRUE;
+        }
+
+        case WM_DESTROY:
+            DeleteObject(pgContext->hBitmap);
+            return TRUE;
+
+        case WM_COMMAND:
+            switch(LOWORD(wParam))
+            {
+                case IDOK:
+                    ShutDownOnOk(hwnd, pgContext);
+                    EndDialog(hwnd, IDOK);
+                    break;
+
+                case IDCANCEL:
+                    EndDialog(hwnd, IDCANCEL);
+                    break;
+
+                case IDC_SHUTDOWN_LIST:
+                    UpdateShutdownDesc(hwnd);
+                    break;
+            }
+            break;
+
+        default:
+            return FALSE;
+    }
+    return TRUE;
+}
+
+
+static
+INT
+OnShutDown(
+    IN HWND hwndDlg,
+    IN PGINA_CONTEXT pgContext)
+{
+    return pgContext->pWlxFuncs->WlxDialogBoxParam(
+        pgContext->hWlx,
+        pgContext->hDllInstance,
+        MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG),
+        hwndDlg,
+        ShutDownDialogProc,
+        (LPARAM)pgContext);
+}
+
+
 static INT_PTR CALLBACK
 LoggedOnWindowProc(
     IN HWND hwndDlg,
@@ -586,7 +852,8 @@
                         EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF);
                     return TRUE;
                 case IDC_SHUTDOWN:
-                    EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF);
+                    if (OnShutDown(hwndDlg, pgContext) == IDOK)
+                        EndDialog(hwndDlg, pgContext->nShutdownAction);
                     return TRUE;
                 case IDC_CHANGEPWD:
                     if (OnChangePassword(hwndDlg, pgContext))
@@ -653,6 +920,104 @@
     return result;
 }
 
+
+static
+BOOL
+DoLogon(
+    IN HWND hwndDlg,
+    IN OUT PGINA_CONTEXT pgContext)
+{
+    LPWSTR UserName = NULL;
+    LPWSTR Password = NULL;
+    LPWSTR Domain = NULL;
+    BOOL result = FALSE;
+    NTSTATUS Status, SubStatus = STATUS_SUCCESS;
+
+    if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0')
+        goto done;
+
+    if (GetTextboxText(hwndDlg, IDC_LOGON_TO, &Domain) && *Domain == '\0')
+        goto done;
+
+    if (!GetTextboxText(hwndDlg, IDC_PASSWORD, &Password))
+        goto done;
+
+    Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus);
+    if (Status == STATUS_LOGON_FAILURE)
+    {
+        ResourceMessageBox(pgContext,
+                           hwndDlg,
+                           MB_OK | MB_ICONEXCLAMATION,
+                           IDS_LOGONTITLE,
+                           IDS_LOGONWRONGUSERORPWD);
+        goto done;
+    }
+    else if (Status == STATUS_ACCOUNT_RESTRICTION)
+    {
+        TRACE("DoLoginTasks failed! Status 0x%08lx  SubStatus 0x%08lx\n", Status, SubStatus);
+
+        if (SubStatus == STATUS_ACCOUNT_DISABLED)
+        {
+            ResourceMessageBox(pgContext,
+                               hwndDlg,
+                               MB_OK | MB_ICONEXCLAMATION,
+                               IDS_LOGONTITLE,
+                               IDS_LOGONUSERDISABLED);
+            goto done;
+        }
+        else if (SubStatus == STATUS_ACCOUNT_LOCKED_OUT)
+        {
+TRACE("Account locked!\n");
+            pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx,
+                                                hwndDlg,
+                                                L"Account locked!",
+                                                L"Logon error",
+                                                MB_OK | MB_ICONERROR);
+            goto done;
+        }
+        else
+        {
+TRACE("Other error!\n");
+            pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx,
+                                                hwndDlg,
+                                                L"Other error!",
+                                                L"Logon error",
+                                                MB_OK | MB_ICONERROR);
+            goto done;
+        }
+    }
+    else if (!NT_SUCCESS(Status))
+    {
+TRACE("DoLoginTasks failed! Status 0x%08lx\n", Status);
+
+        goto done;
+    }
+
+
+    if (!CreateProfile(pgContext, UserName, Domain, Password))
+    {
+        ERR("Failed to create the profile!\n");
+        goto done;
+    }
+
+    ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR));
+    wcscpy(pgContext->Password, Password);
+
+    result = TRUE;
+
+done:
+    if (UserName != NULL)
+        HeapFree(GetProcessHeap(), 0, UserName);
+
+    if (Password != NULL)
+        HeapFree(GetProcessHeap(), 0, Password);
+
+    if (Domain != NULL)
+        HeapFree(GetProcessHeap(), 0, Domain);
+
+    return result;
+}
+
 static INT_PTR CALLBACK
 LoggedOutWindowProc(
     IN HWND hwndDlg,
@@ -667,7 +1032,6 @@
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
             /* FIXME: take care of NoDomainUI */
             pgContext = (PGINA_CONTEXT)lParam;
             SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext);
@@ -681,11 +1045,14 @@
             if (pgContext->bShutdownWithoutLogon == FALSE)
                 EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE);
 
+            SendDlgItemMessageW(hwndDlg, IDC_LOGON_TO, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain);
+            SendDlgItemMessageW(hwndDlg, IDC_LOGON_TO, CB_SETCURSEL, 0, 0);
+
             SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD));
 
             pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
             return TRUE;
-        }
+
         case WM_PAINT:
         {
             PAINTSTRUCT ps;
@@ -698,51 +1065,28 @@
             }
             return TRUE;
         }
+
         case WM_DESTROY:
-        {
             DeleteObject(pgContext->hBitmap);
             return TRUE;
-        }
+
         case WM_COMMAND:
-        {
             switch (LOWORD(wParam))
             {
                 case IDOK:
-                {
-                    LPWSTR UserName = NULL, Password = NULL;
-                    INT result = WLX_SAS_ACTION_NONE;
+                    if (DoLogon(hwndDlg, pgContext))
+                        EndDialog(hwndDlg, WLX_SAS_ACTION_LOGON);
+                    return TRUE;
 
-                    if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0')
-                        break;
-                    if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password) &&
-                        DoLoginTasks(pgContext, UserName, NULL, Password))
-                    {
-                        pgContext->Password = HeapAlloc(GetProcessHeap(),
-                                                        HEAP_ZERO_MEMORY,
-                                                        (wcslen(Password) + 1) * sizeof(WCHAR));
-                        if (pgContext->Password != NULL)
-                            wcscpy(pgContext->Password, Password);
-
-                        result = WLX_SAS_ACTION_LOGON;
-                    }
-                    HeapFree(GetProcessHeap(), 0, UserName);
-                    HeapFree(GetProcessHeap(), 0, Password);
-                    EndDialog(hwndDlg, result);
-                    return TRUE;
-                }
                 case IDCANCEL:
-                {
                     EndDialog(hwndDlg, WLX_SAS_ACTION_NONE);
                     return TRUE;
-                }
+
                 case IDC_SHUTDOWN:
-                {
                     EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN);
                     return TRUE;
-                }
             }
             break;
-        }
     }
 
     return FALSE;
@@ -829,7 +1173,7 @@
         else
         {
             /* Wrong user name */
-            if (DoAdminUnlock(UserName, NULL, Password))
+            if (DoAdminUnlock(pgContext, UserName, NULL, Password))
             {
                 *Action = WLX_SAS_ACTION_UNLOCK_WKSTA;
                 res = TRUE;
Index: dll/win32/msgina/msgina.spec
===================================================================
--- dll/win32/msgina/msgina.spec	(rÃ©vision 61927)
+++ dll/win32/msgina/msgina.spec	(copie de travail)
@@ -26,7 +26,7 @@
 26 stub -noname stub26
 27 stub -noname stub27
 28 stub -noname stub28
-@ stdcall ShellShutdownDialog(ptr long long)
+@ stdcall ShellShutdownDialog(ptr wstr long)
 @ stdcall WlxActivateUserShell(ptr wstr wstr ptr)
 @ stdcall WlxDisconnectNotify(ptr)
 @ stdcall WlxDisplayLockedNotice(ptr)
Index: dll/win32/msgina/resources/shutdown.ico
===================================================================
--- dll/win32/msgina/resources/shutdown.ico	(rÃ©vision 0)
+++ dll/win32/msgina/resources/shutdown.ico	(rÃ©vision 62573)
@@ -0,0 +1,90 @@
+00¨Æ  ¨nÈhÞ00¨F$  ¨î@H–MhÞT00 ¨%FX   ¨î} ˆ	–Ž h˜(0`€
+ÿÿÿššš���›››¢¢¢¥¥¥ÞÞÞøøø÷÷÷ÖÖÖ±±±¨¨¨öööñññåååàààßßßáááâââîîî´´´¤¤¤ØØØ¦¦¦æææûûûþþþýýýüüüççç   žžžúúúãããõõõôôôäääóóóòòòÕÕÕÑÑÑÂÂÂTTTÌÌÌðððÐÐÐ===FFF@@@èèèïïïgggùùùqqqíííééé|||ÎÎÎìììêêê‡‡‡ÅÅÅ’’’ëëë¬¬¬ÄÄÄ¿¿¿ÇÇÇ¹¹¹ººº½½½¸¸¸­­­¶¶¶
+
+
+···˜˜˜ˆˆˆ²²²‰‰‰®®®ÔÔÔ“““¾¾¾ÙÙÙ%%%ÝÝÝ+++µµµ...ÛÛÛHHHÚÚÚ222YYYŠŠŠÓÓÓÏÏÏDDDÃÃÃÉÉÉ×××ÒÒÒÈÈÈËËËÁÁÁÍÍÍÜÜÜ§§§ªªªŸŸŸ€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿ,,,999EEERRR___lllxxx………«««ðûÿ¤  ÀÜÀðÊ¦>]|›ºÙð$$ÿHHÿllÿ��ÿ´´ÿ>](|2›<ºFÙUð$mÿH…ÿl�ÿ�µÿ´Íÿ*>?]T|i›~º“Ùªð$¶ÿHÂÿlÎÿ�Úÿ´æÿ>>]]||››ººÙÙðð$ÿÿHÿÿlÿÿ�ÿÿ´ÿÿ>*]?|T›iº~Ù“ðª$ÿ¶HÿÂlÿÎ�ÿÚ´ÿæ>]|(›2º<ÙFðU$ÿmHÿ…lÿ��ÿµ´ÿÍ>]|›ºÙð$ÿ$HÿHlÿl�ÿ�´ÿ´>](|2›<ºFÙUðmÿ$…ÿH�ÿlµÿ�Íÿ´*>?]T|i›~º“Ùªð¶ÿ$ÂÿHÎÿlÚÿ�æÿ´ w6v!	4..''&$$#
+
+								
+##$$&''.4'	u	4.._nn
+
+((YYiioo)))))))
+...4	 .44.cttttttttttttttttttttt
+.444.t______________________ti.4844._)'.44844.i;/)iY(]ecti'.44844.;HDrl?Emqsj)eY'.4844.9m/oYn]c_opq_
+.484."=kgggggggggfclmn.4884..%fgWhhhhhWgfiHj.4488844."""""0N]=d-Qe"""e.448<84.%%%%%_`a!!!!!!!9bCN%%%%c..48<88443]^							]^H*_.4488<<84=YZ[&&&&&&&\ZN)4488<A<88A)VW.......VX48<<AA<888)RS8888888T,U88<A=A<<8833333)O9999999PQ3333388<AA=AA<<8499999)JKLMN99999%88<<A=9=AA<<99999)E"""""""HIG999998<<AA=99=AA<'=====)DEEEEEEEFG=====<AAA=9399=AA$AAAAA)BBBBBBBBBCAAAAA3AA==993399==#<<<<<)@@@@@@@@@?<<<<<9A==9933399=
+88888)>>>>>>>>>?88888===99333399):::::::::;<999333336)777777777)89333!44444)555555555)44444433...../011111112)......%*+,-%%%'''''())))))))))'''''&%%""%%&&&&&&&&&&&&&&&&&&&&&&&$%%%""""%%&&&&&&&&&&&&&&&&&&&&&&&
+%%%""""""$$$$$$$$$$$$$$$$$$$$$$$	%""""#######################"" !
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	
+	
+
+	
+ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþ?øøðððððððððððððððððððððððððððððððððððøüþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ( @€ÿÿÿ…Šˆ»¾¼óóóáááàààâââãããïïïööö÷÷÷æææõõõäääåååôôôÌÌÌ„„„………ŽŽŽðððçççñññQQQ(((èèèUUU$$$AAA'''îîîéééííí```,,,ppp+++êêêëëëeee666iii‡‡‡---ìììlllµµµ°°°<<<www³³³ÔÔÔMMMzzzÇÇÇ___}}}ÞÞÞooo¢¢¢ÂÂÂ»»»ØØØmmmaaa«««ÒÒÒßßß¼¼¼ÁÁÁÅÅÅÉÉÉòòòÁÄÂÌÎÌ€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿ999EEERRRxxx’’’ŸŸŸ¸¸¸øøøðûÿ¤  ÀÜÀðÊ¦>]|›ºÙð$$ÿHHÿllÿ��ÿ´´ÿ>](|2›<ºFÙUð$mÿH…ÿl�ÿ�µÿ´Íÿ*>?]T|i›~º“Ùªð$¶ÿHÂÿlÎÿ�Úÿ´æÿ>>]]||››ººÙÙðð$ÿÿHÿÿlÿÿ�ÿÿ´ÿÿ>*]?|T›iº~Ù“ðª$ÿ¶HÿÂlÿÎ�ÿÚ´ÿæ>]|(›2º<ÙFðU$ÿmHÿ…lÿ��ÿµ´ÿÍ>]|›ºÙð$ÿ$HÿHlÿl�ÿ�´ÿ´>](|2›<ºFÙUðmÿ$…ÿH�ÿlµÿ�Íÿ´*>?]T|i›~º“Ùªð¶ÿ$ÂÿHÎÿlÚÿ�æÿ´>>]]||››ººÙÙððÿÿ$ÿÿHÿÿlÿÿ�ÿÿ´>*]?|T›iº~Ù“ðªÿ¶$ÿÂHÿÎlÿÚ�ÿæ´>]|(›2º<ÙFðUÿm$ÿ…Hÿ�lÿµ�ÿÍ´>]|›ºLMK	K
+()"		"	)<GHIJ6"	(<<0BC0DE<F"	>??@;A<	" ;<
+
+
+=<		/"(89//:  )")4567""()"!!0-1123!//!(	))*+,--.)(/)!""#$%&&'""(!			 !	
+
+
+
+
+
+
+
+
+
+	
+
+ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþüü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?þ?ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ(0 ÿÿÿ…Šˆ»¾¼óóóáááàààâââãããïïïööö÷÷÷æææõõõäääåååôôôÌÌÌ„„„………ŽŽŽðððçççñññQQQ(((èèèUUU$$$AAA'''îîîéééííí```,,,ppp+++êêêëëëeee666iii‡‡‡---ìììlllµµµ°°°<<<www³³³ÔÔÔMMMzzzÇÇÇ___}}}ÞÞÞooo¢¢¢ÂÂÂ»»»ØØØmmmaaa«««ÒÒÒßßß¼¼¼ÁÁÁÅÅÅÉÉÉòòòÁÄÂÌÎÌ€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿ999EEERRRxxx’’’ŸŸŸ¸¸¸øøøðûÿ¤  ÀÜÀðÊ¦>]|›ºÙð$$ÿHHÿllÿ��ÿ´´ÿ>](|2›<ºFÙUð$mÿH…ÿl�ÿ�µÿ´Íÿ*>?]T|i›~º“Ùªð$¶ÿHÂÿlÎÿ�Úÿ´æÿ>>]]||››ººÙÙðð$ÿÿHÿÿlÿÿ�ÿÿ´ÿÿ>*]?|T›iº~Ù“ðª$ÿ¶HÿÂlÿÎ�ÿÚ´ÿæ>]|(›2º<ÙFðU$ÿmHÿ…lÿ��ÿµ´ÿÍ>]|›ºÙð$ÿ$HÿHlÿl�ÿ�´ÿ´>](|2›<ºFÙUðmÿ$…ÿH�ÿlµÿ�Íÿ´*>?]T|i›~º“Ùªð¶ÿ$ÂÿHÎÿlÚÿ�æÿ´>>]]||››ººÙÙððÿÿ$ÿÿHÿÿlÿÿ�ÿÿ´>*]?|T›iº~Ù“ðªÿ¶$ÿÂHÿÎlÿÚ�ÿæ´>]|(›2º<ÙFðUÿm$ÿ…Hÿ�lÿµ�ÿÍ´>]|›ºLMK	K
+()"		"	)<GHIJ6"	(<<0BC0DE<F"	>??@;A<	" ;<
+
+
+=<		/"(89//:  )")4567""()"!!0-1123!//!(	))*+,--.)(/)!""#$%&&'""(!			 !	
+
+
+
+
+
+
+
+
+
+	
+
+ÿÿÿÿÿÿÿÿÿàÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀàðÿÿÿ( @ÿÿÿ…Šˆãããâââïïïööö÷÷÷æææõõõóóóäääåååôôôÌÌÌ„„„………ŽŽŽðððçççñññQQQ(((èèèUUU}}}€€€���'''àààîîîéééííí```¦¦¦   ³³³¼¼¼+++êêêëëëeee©©©¹¹¹ÃÃÃÉÉÉ---áááìììzzzÇÇÇ___ÞÞÞooo¢¢¢ÂÂÂ»»»ØØØlllmmmaaa«««ÒÒÒßßßÁÁÁÅÅÅÔÔÔ€€€€€€€€€ÀÀÀÿÿÿÿÿÿÿÿÿ,,,999EEERRRxxx’’’ŸŸŸ¸¸¸øøøðûÿ¤  ÀÜÀðÊ¦>]|›ºÙð$$ÿHHÿllÿ��ÿ´´ÿ>](|2›<ºFÙUð$mÿH…ÿl�ÿ�µÿ´Íÿ*>?]T|i›~º“Ùªð$¶ÿHÂÿlÎÿ�Úÿ´æÿ>>]]||››ººÙÙðð$ÿÿHÿÿlÿÿ�ÿÿ´ÿÿ>*]?|T›iº~Ù“ðª$ÿ¶HÿÂlÿÎ�ÿÚ´ÿæ>]|(›2º<ÙFðU$ÿmHÿ…lÿ��ÿµ´ÿÍ>]|›ºÙð$ÿ$HÿHlÿl�ÿ�´ÿ´>](|2›<ºFÙUðmÿ$…ÿH�ÿlµÿ�Íÿ´*>?]T|i›~º“Ùªð¶ÿ$ÂÿHÎÿlÚÿ�æÿ´>>]]||››ººÙÙððÿÿ$ÿÿHÿÿlÿÿ�ÿÿ´>*]?|T›iº~Ù“ðªÿ¶$ÿÂHÿÎlÿÚ�ÿæ´>]|(›2º<ÙFðUÿm$ÿ…Hÿ�lÿµ�ÿÍ´>]|›ºÙðÿ$$ÿHHÿllÿ��ÿ´´>]|(›2(//4%@A-B/'44:;<:=>4?6778944			54/ '12003'(()*+,-./('0  !"#$%&  '
+
+
+
+
+
+									
+(0`€���žžž››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››���¤¤¤ŸŸŸ›››¤¤¤çççûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùÞÞÞªªª¤¤¤úúú÷÷÷ñññïïïððððððñññòòòòòòóóóôôôôôôõõõöööööö÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷öööõõõõõõôôôôôôóóóòòòòòòñññðððïïïòòòøøø÷÷÷§§§   æææ÷÷÷îîîîîîïïïðððñññðððÝÝÝØØØØØØ××××××ÖÖÖÖÖÖÕÕÕÕÕÕÔÔÔÔÔÔÓÓÓÓÓÓÒÒÒÒÒÒÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÖÖÖðððñññððððððïïïîîî÷÷÷ååå���žžžûûûðððîîîïïïïïïðððñññåååÛÛÛÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÖÖÖáááññññññðððïïïîîîñññûûû���›››ÿÿÿîîîîîîïïïïïïðððñññÜÜÜÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÜÜÜÓÓÓññññññðððïïïîîîîîîÿÿÿ››››››ÿÿÿíííîîîïïïïïïðððñññÝÝÝÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÞÑÑÑòòòñññðððïïïïïïîîîÿÿÿ››››››ÿÿÿíííîîîïïïïïïðððñññßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßÓÓÓÎÎÎÐÐÐÑÑÑÓÓÓÔÔÔÕÕÕØØØÙÙÙÚÚÚÛÛÛÜÜÜßßßßßßÓÓÓòòòñññðððïïïïïïîîîÿÿÿ››››››ÿÿÿíííîîîïïïïïïðððñññàààààààààààààààààààààààààààÎÎÎ½½½¿¿¿ÁÁÁÃÃÃÅÅÅÇÇÇÉÉÉËËËÍÍÍÏÏÏÑÑÑÚÚÚààààààÔÔÔòòòñññðððïïïîîîîîîÿÿÿ››››››ÿÿÿíííîîîïïïïïïðððñññâââàààààààààààààààßßßéééÞÞÞÉÉÉÐÐÐÒÒÒÔÔÔ×××ÙÙÙÛÛÛÝÝÝàààÒÒÒÈÈÈËËËÝÝÝààààààÖÖÖññññññðððïïïîîîîîîÿÿÿ››››››ÿÿÿíííîîîîîîïïïðððñññãããáááááááááááááááêêêDDDYYYYYYYYYYYYYYYYYYYYYYYYYYY222ÛÛÛÃÃÃÉÉÉááááááááá×××ññññññðððïïïîîîîîîÿÿÿ››››››ÿÿÿííííííîîîïïïððððððäääâââââââââââââââæææ222YYY‰‰‰ŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠ‰‰‰YYY222ÓÓÓ½½½ÏÏÏâââââââââØØØñññðððïïïïïïîîîíííÿÿÿ››››››ÿÿÿííííííîîîïïïïïïðððæææãããããããããããããããâââ===¶¶¶ÙÙÙüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêêêHHHÌÌÌ···ÚÚÚãããããããããÚÚÚñññðððïïïïïïîîîíííÿÿÿ››››››ÿÿÿìììíííîîîîîîïïïðððçççäääääääääääääääÝÝÝ+++µµµúúúúúúúúúúúúúúúúúúúúúééé...ÄÄÄ¶¶¶ääääääääääääÛÛÛððððððïïïîîîîîîíííÿÿÿ››››››ÿÿÿìììííííííîîîïïïïïïèèèåååååååååååååååÙÙÙ%%%¨¨¨÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷ÙÙÙ%%%½½½ÂÂÂååååååååååååÝÝÝðððïïïïïïîîîííííííÿÿÿ››››››ÿÿÿììììììíííîîîîîîïïïêêêåååååååååååååååÔÔÔ“““óóóóóóóóóóóóóóóóóóóóó¾¾¾¶¶¶ÑÑÑååååååååååååÞÞÞïïïïïïîîîííííííìììÿÿÿ››››››ÿÿÿëëëìììííííííîîîîîîëëëæææææææææææææææÑÑÑ‰‰‰ððððððððððððððððððððð���®®®âââææææææææææææßßßïïïîîîîîîíííììììììÿÿÿ››››››ÿÿÿëëëëëëìììííííííîîîíííçççççççççççççççÑÑÑ˜˜˜íííííííííííííííííííííˆˆˆ²²²çççççççççççççççáááîîîîîîííííííìììëëëÿÿÿ››››››ÿÿÿêêêëëëììììììííííííîîîèèèèèèèèèèèèèèèÑÑÑ¨¨¨ééééééééééééééééééééé›››
+
+
+···èèèèèèèèèèèèèèèâââîîîííííííìììëëëëëëÿÿÿ››››››ÿÿÿêêêëëëëëëììììììíííïïïéééééééééééééééÑÑÑ¸¸¸æææææææææææææææææææææ­­­¶¶¶éééééééééééééééäääííííííììììììëëëêêêÿÿÿ››››››ÿÿÿéééêêêëëëëëëììììììñññéééééééééééééééÑÑÑÇÇÇããããããããããããããããããããã½½½ºººéééééééééééééééåååíííììììììëëëëëëêêêÿÿÿ››››››ÿÿÿééééééêêêëëëëëëìììòòòêêêêêêêêêêêêêêêÑÑÑ¿¿¿ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ¹¹¹ºººêêêêêêêêêêêêêêêæææìììëëëëëëëëëêêêéééÿÿÿ››››››ÿÿÿèèèééééééêêêëëëëëëôôôëëëëëëëëëëëëëëëÑÑÑ¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬ÄÄÄëëëëëëëëëëëëëëëèèèëëëëëëêêêêêêééééééÿÿÿ››››››ÿÿÿèèèèèèééééééêêêêêêõõõìììììììììììììììÑÑÑ’’’’’’’’’’’’’’’’’’’’’’’’’’’ÅÅÅìììììììììììììììéééëëëêêêêêêééééééèèèÿÿÿ››››››ÿÿÿçççèèèèèèééééééêêêöööíííííííííííííííÑÑÑ‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡ÅÅÅíííííííííííííííêêêêêêêêêééééééèèèèèèÿÿÿ››››››ÿÿÿççççççèèèèèèééééééøøøîîîîîîîîîîîîîîîÑÑÑ|||||||||||||||||||||||||||ÎÎÎîîîîîîîîîîîîîîîìììéééééééééèèèèèèçççÿÿÿ››››››ÿÿÿæææççççççèèèèèèèèèùùùîîîîîîîîîîîîîîîÑÑÑqqqqqqqqqqqqqqqqqqqqqqqqqqqÑÑÑîîîîîîîîîîîîîîîíííéééèèèèèèççççççæææÿÿÿ››››››ÿÿÿåååææææææççççççèèèúúúïïïïïïïïïïïïïïïÑÑÑgggggggggggggggggggggggggggÑÑÑïïïïïïïïïïïïïïïïïïèèèèèèççççççææææææÿÿÿ››››››ÿÿÿååååååææææææççççççüüüðððððððððððððððÐÐÐ===FFFFFFFFFFFFFFFFFFFFF@@@ÑÑÑððððððððððððððððððççççççæææææææææåååÿÿÿ››››››ÿÿÿäääåååååååååææææææýýýñññññññññññññññÂÂÂTTTÌÌÌññññññññññññññññññçççææææææåååååååååÿÿÿ››››››ÿÿÿäääääääääååååååæææÿÿÿòòòòòòòòòòòòòòòñññÕÕÕÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÞÞÞòòòòòòòòòòòòòòòóóóæææåååååååååääääääÿÿÿ››››››ÿÿÿããããããääääääååååååÿÿÿóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóôôôååååååäääääääääãããÿÿÿ››››››ÿÿÿâââãããããããããääääääÿÿÿóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóóöööäääääääääãããããããããÿÿÿ››››››ÿÿÿâââââââââãããããããããÿÿÿôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôô÷÷÷äääãããããããããââââââÿÿÿ››››››ÿÿÿááááááâââââââââãããÿÿÿõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõõøøøããããããâââââââââáááÿÿÿ›››žžžÿÿÿáááàààááááááââââââüüüúúúöööööööööööööööööööööööööööööööööööööööööööööööööööööööööööööööøøø÷÷÷ââââââáááááááááàààÿÿÿ���¦¦¦öööåååàààààààààááááááæææûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüøøøçççáááááááááààààààååå÷÷÷   ¤¤¤ØØØñññßßßßßßàààààààààááááááááááááââââââââââââââââââââââââââââââââââââââââââââââââââââââááááááááááááàààààààààßßßîîîÖÖÖ¨¨¨öööñññåååàààßßßààààààààààààááááááááááááááááááááááááââââââââââââáááááááááááááááááááááààààààààààààààààààåååîîîñññ´´´¥¥¥ÞÞÞøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ÖÖÖ±±±ššš���››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››››���¢¢¢ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþ?øøðððððððððððððððððððððððððððððððððððøüþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ( @€…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…ŠˆÁÄÂóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóÌÎÌ…Šˆóóóòòòïïïñññòòòôôôõõõ÷÷÷êêêëëëíííïïïóóóôôôóóóñññïïïóóó…Šˆ…ŠˆÿÿÿíííïïïñññëëëááááááÞÞÞ¼¼¼ÁÁÁÅÅÅÉÉÉÔÔÔáááðððñññðððÿÿÿ…Šˆ…ŠˆÿÿÿíííïïïêêêÞÞÞÞÞÞÌÌÌlllmmmaaalll«««ÒÒÒÞÞÞßßßñññðððÿÿÿ…Šˆ…Šˆÿÿÿíííïïïæææàààààà………¢¢¢ÂÂÂÂÂÂ»»»}}}ØØØàààÞÞÞðððïïïÿÿÿ…Šˆ…Šˆÿÿÿíííîîîèèèââââââ}}}ÞÞÞõõõõõõõõõoooÞÞÞâââáááïïïïïïÿÿÿ…Šˆ…ŠˆÿÿÿìììíííêêêääääääzzzÇÇÇììììììããã___ääääääãããîîîîîîÿÿÿ…Šˆ…Šˆÿÿÿëëëíííëëëææææææwww³³³çççåååÔÔÔMMMãããæææåååííííííÿÿÿ…Šˆ…Šˆÿÿÿêêêëëëíííéééééélll‡‡‡µµµµµµ°°°<<<ãããéééèèèììììììÿÿÿ…Šˆ…Šˆÿÿÿéééêêêïïïëëëëëëeee666iii‡‡‡‡‡‡---áááëëëêêêìììëëëÿÿÿ…Šˆ…Šˆÿÿÿèèèéééðððíííííí```,,,pppppp+++àààííííííêêêéééÿÿÿ…Šˆ…ŠˆÿÿÿçççèèèóóóïïïïïïUUU$$$$$$AAA'''àààïïïîîîéééèèèÿÿÿ…Šˆ…ŠˆÿÿÿåååæææôôôññññññQQQ(((âââññññññèèèæææÿÿÿ…Šˆ…ŠˆÿÿÿäääåååôôôóóóóóóÌÌÌ„„„………………………ŽŽŽðððóóóóóóçççåååÿÿÿ…Šˆ…Šˆÿÿÿâââãããïïïöööõõõõõõõõõõõõõõõõõõõõõõõõõõõóóóäääãããÿÿÿ…Šˆ…Šˆÿÿÿáááâââãããïïïööö÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷öööæææãããâââÿÿÿ…Šˆ…Šˆóóóáááàààááááááâââââââââããããããããããããââââââááááááàààóóó…Šˆ»¾¼óóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóó»¾¼…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþüü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?þ?ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ(0 …Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…ŠˆÁÄÂóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóÌÎÌ…Šˆóóóòòòïïïñññòòòôôôõõõ÷÷÷êêêëëëíííïïïóóóôôôóóóñññïïïóóó…Šˆ…ŠˆÿÿÿíííïïïñññëëëááááááÞÞÞ¼¼¼ÁÁÁÅÅÅÉÉÉÔÔÔáááðððñññðððÿÿÿ…Šˆ…ŠˆÿÿÿíííïïïêêêÞÞÞÞÞÞÌÌÌlllmmmaaalll«««ÒÒÒÞÞÞßßßñññðððÿÿÿ…Šˆ…Šˆÿÿÿíííïïïæææàààààà………¢¢¢ÂÂÂÂÂÂ»»»}}}ØØØàààÞÞÞðððïïïÿÿÿ…Šˆ…Šˆÿÿÿíííîîîèèèââââââ}}}ÞÞÞõõõõõõõõõoooÞÞÞâââáááïïïïïïÿÿÿ…Šˆ…ŠˆÿÿÿìììíííêêêääääääzzzÇÇÇììììììããã___ääääääãããîîîîîîÿÿÿ…Šˆ…Šˆÿÿÿëëëíííëëëææææææwww³³³çççåååÔÔÔMMMãããæææåååííííííÿÿÿ…Šˆ…Šˆÿÿÿêêêëëëíííéééééélll‡‡‡µµµµµµ°°°<<<ãããéééèèèììììììÿÿÿ…Šˆ…Šˆÿÿÿéééêêêïïïëëëëëëeee666iii‡‡‡‡‡‡---áááëëëêêêìììëëëÿÿÿ…Šˆ…Šˆÿÿÿèèèéééðððíííííí```,,,pppppp+++àààííííííêêêéééÿÿÿ…Šˆ…ŠˆÿÿÿçççèèèóóóïïïïïïUUU$$$$$$AAA'''àààïïïîîîéééèèèÿÿÿ…Šˆ…ŠˆÿÿÿåååæææôôôññññññQQQ(((âââññññññèèèæææÿÿÿ…Šˆ…ŠˆÿÿÿäääåååôôôóóóóóóÌÌÌ„„„………………………ŽŽŽðððóóóóóóçççåååÿÿÿ…Šˆ…Šˆÿÿÿâââãããïïïöööõõõõõõõõõõõõõõõõõõõõõõõõõõõóóóäääãããÿÿÿ…Šˆ…Šˆÿÿÿáááâââãããïïïööö÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷öööæææãããâââÿÿÿ…Šˆ…Šˆóóóáááàààááááááâââââââââããããããããããããââââââááááááàààóóó…Šˆ»¾¼óóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóó»¾¼…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…ŠˆÿÿÿÿÿÿÿÿÿàÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀàðÿÿÿ( @…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆññññññññññññññññññññññññññññññññññññññññññ…Šˆ…ŠˆïïïñññëëëááááááÞÞÞ¼¼¼ÁÁÁÅÅÅÉÉÉÔÔÔáááðððñññ…Šˆ…ŠˆïïïêêêÞÞÞÞÞÞÌÌÌlllmmmaaalll«««ÒÒÒÞÞÞßßßñññ…Šˆ…Šˆïïïæææàààààà………¢¢¢ÂÂÂÂÂÂ»»»}}}ØØØàààÞÞÞððð…Šˆ…Šˆîîîèèèââââââ}}}ÞÞÞõõõõõõõõõoooÞÞÞâââáááïïï…Šˆ…ŠˆíííêêêääääääzzzÇÇÇììììììããã___ääääääãããîîî…Šˆ…Šˆêêêïïïëëëëëëeee©©©¹¹¹ÃÃÃÉÉÉ---áááëëëêêêììì…Šˆ…Šˆéééðððíííííí```¦¦¦   ³³³¼¼¼+++àààííííííêêê…Šˆ…ŠˆèèèóóóïïïïïïUUU}}}€€€€€€���'''àààïïïîîîééé…Šˆ…ŠˆæææôôôññññññQQQQQQQQQQQQQQQ(((âââññññññèèè…Šˆ…ŠˆåååôôôóóóóóóÌÌÌ„„„………………………ŽŽŽðððóóóóóóççç…Šˆ…Šˆãããïïïöööõõõõõõõõõõõõõõõõõõõõõõõõõõõóóóäää…Šˆ…Šˆâââãããïïïööö÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷öööæææããã…Šˆ…Šˆãããããããããããããããããããããããããããããããããããããããããã…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ…Šˆ(0` €%	
+
+"&),.01210.+(%!
+›››8���¯žžžî›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ���÷¤¤¤ÌŸŸŸ`›››x¤¤¤ñçççûûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùÿÞÞÞüªªªØ——— ›››8¤¤¤ñúúúÿ÷÷÷ÿñññÿïïïÿðððÿðððÿñññÿòòòÿòòòÿóóóÿôôôÿôôôÿõõõÿöööÿöööÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿöööÿõõõÿõõõÿôôôÿôôôÿóóóÿòòòÿòòòÿñññÿðððÿïïïÿòòòÿøøøÿ÷÷÷ÿ§§§ÝŸŸŸ   ¶æææý÷÷÷ÿîîîÿîîîÿïïïÿðððÿñññÿðððÿÝÝÝÿØØØÿØØØÿ×××ÿ×××ÿÖÖÖÿÖÖÖÿÕÕÕÿÕÕÕÿÔÔÔÿÔÔÔÿÓÓÓÿÓÓÓÿÒÒÒÿÒÒÒÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÖÖÖÿðððÿñññÿðððÿðððÿïïïÿîîîÿ÷÷÷ÿååå÷���‚žžžñûûûÿðððÿîîîÿïïïÿïïïÿðððÿñññÿåååÿÛÛÛÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÜÜÜÿÖÖÖÿáááÿñññÿñññÿðððÿïïïÿîîîÿñññÿûûûÿ���ì›››ÿÿÿÿÿîîîÿîîîÿïïïÿïïïÿðððÿñññÿÜÜÜÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÝÝÝÿÜÜÜÿÓÓÓÿñññÿñññÿðððÿïïïÿîîîÿîîîÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿîîîÿïïïÿïïïÿðððÿñññÿÝÝÝÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÞÞÞÿÑÑÑÿòòòÿñññÿðððÿïïïÿïïïÿîîîÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿîîîÿïïïÿïïïÿðððÿñññÿßßßÿßßßÿßßßÿßßßÿßßßÿßßßÿßßßÿßßßÿßßßÿßßßÿÓÓÓÿÎÎÎÿÐÐÐÿÑÑÑÿÓÓÓÿÔÔÔÿÕÕÕÿØØØÿÙÙÙÿÚÚÚÿÛÛÛÿÜÜÜÿßßßÿßßßÿÓÓÓÿòòòÿñññÿðððÿïïïÿïïïÿîîîÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿîîîÿïïïÿïïïÿðððÿñññÿàààÿàààÿàààÿàààÿàààÿàààÿàààÿàààÿàààÿÎÎÎÿ½½½ÿ¿¿¿ÿÁÁÁÿÃÃÃÿÅÅÅÿÇÇÇÿÉÉÉÿËËËÿÍÍÍÿÏÏÏÿÑÑÑÿÚÚÚÿàààÿàààÿÔÔÔÿòòòÿñññÿðððÿïïïÿîîîÿîîîÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿîîîÿïïïÿïïïÿðððÿñññÿâââÿàààÿàààÿàààÿàààÿàààÿßßßÿéééÿÞÞÞÿÉÉÉÿÐÐÐÿÒÒÒÿÔÔÔÿ×××ÿÙÙÙÿÛÛÛÿÝÝÝÿàààÿÒÒÒÿÈÈÈÿËËËÿÝÝÝÿàààÿàààÿÖÖÖÿñññÿñññÿðððÿïïïÿîîîÿîîîÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿîîîÿîîîÿïïïÿðððÿñññÿãããÿáááÿáááÿáááÿáááÿáááÿêêêÿDDDÿYYYÿYYYÿYYYÿYYYÿYYYÿYYYÿYYYÿYYYÿYYYÿ222ÿÛÛÛÿÃÃÃÿÉÉÉÿáááÿáááÿáááÿ×××ÿñññÿñññÿðððÿïïïÿîîîÿîîîÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿíííÿîîîÿïïïÿðððÿðððÿäääÿâââÿâââÿâââÿâââÿâââÿæææÿ222ÿYYYÿ‰‰‰ÿŠŠŠÿŠŠŠÿŠŠŠÿŠŠŠÿŠŠŠÿ‰‰‰ÿYYYÿ222ÿÓÓÓÿ½½½ÿÏÏÏÿâââÿâââÿâââÿØØØÿñññÿðððÿïïïÿïïïÿîîîÿíííÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿíííÿíííÿîîîÿïïïÿïïïÿðððÿæææÿãããÿãããÿãããÿãããÿãããÿâââÿ===ÿ¶¶¶ÿÙÙÙÿüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêêêÿHHHÿÌÌÌÿ···ÿÚÚÚÿãããÿãããÿãããÿÚÚÚÿñññÿðððÿïïïÿïïïÿîîîÿíííÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿìììÿíííÿîîîÿîîîÿïïïÿðððÿçççÿäääÿäääÿäääÿäääÿäääÿÝÝÝÿ+++ÿµµµÿúúúÿúúúÿúúúÿúúúÿúúúÿúúúÿúúúÿéééÿ...ÿÄÄÄÿ¶¶¶ÿäääÿäääÿäääÿäääÿÛÛÛÿðððÿðððÿïïïÿîîîÿîîîÿíííÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿìììÿíííÿíííÿîîîÿïïïÿïïïÿèèèÿåååÿåååÿåååÿåååÿåååÿÙÙÙÿ%%%ÿ¨¨¨ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿÙÙÙÿ%%%ÿ½½½ÿÂÂÂÿåååÿåååÿåååÿåååÿÝÝÝÿðððÿïïïÿïïïÿîîîÿíííÿíííÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿìììÿìììÿíííÿîîîÿîîîÿïïïÿêêêÿåååÿåååÿåååÿåååÿåååÿÔÔÔÿÿ“““ÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿ¾¾¾ÿÿ¶¶¶ÿÑÑÑÿåååÿåååÿåååÿåååÿÞÞÞÿïïïÿïïïÿîîîÿíííÿíííÿìììÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿëëëÿìììÿíííÿíííÿîîîÿîîîÿëëëÿæææÿæææÿæææÿæææÿæææÿÑÑÑÿÿ‰‰‰ÿðððÿðððÿðððÿðððÿðððÿðððÿðððÿ���ÿÿ®®®ÿâââÿæææÿæææÿæææÿæææÿßßßÿïïïÿîîîÿîîîÿíííÿìììÿìììÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿëëëÿëëëÿìììÿíííÿíííÿîîîÿíííÿçççÿçççÿçççÿçççÿçççÿÑÑÑÿÿ˜˜˜ÿíííÿíííÿíííÿíííÿíííÿíííÿíííÿˆˆˆÿÿ²²²ÿçççÿçççÿçççÿçççÿçççÿáááÿîîîÿîîîÿíííÿíííÿìììÿëëëÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿêêêÿëëëÿìììÿìììÿíííÿíííÿîîîÿèèèÿèèèÿèèèÿèèèÿèèèÿÑÑÑÿÿ¨¨¨ÿéééÿéééÿéééÿéééÿéééÿéééÿéééÿ›››ÿ
+
+
+ÿ···ÿèèèÿèèèÿèèèÿèèèÿèèèÿâââÿîîîÿíííÿíííÿìììÿëëëÿëëëÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿêêêÿëëëÿëëëÿìììÿìììÿíííÿïïïÿéééÿéééÿéééÿéééÿéééÿÑÑÑÿÿ¸¸¸ÿæææÿæææÿæææÿæææÿæææÿæææÿæææÿ­­­ÿÿ¶¶¶ÿéééÿéééÿéééÿéééÿéééÿäääÿíííÿíííÿìììÿìììÿëëëÿêêêÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿéééÿêêêÿëëëÿëëëÿìììÿìììÿñññÿéééÿéééÿéééÿéééÿéééÿÑÑÑÿÿÇÇÇÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿ½½½ÿÿºººÿéééÿéééÿéééÿéééÿéééÿåååÿíííÿìììÿìììÿëëëÿëëëÿêêêÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿéééÿéééÿêêêÿëëëÿëëëÿìììÿòòòÿêêêÿêêêÿêêêÿêêêÿêêêÿÑÑÑÿÿ¿¿¿ÿÇÇÇÿÇÇÇÿÇÇÇÿÇÇÇÿÇÇÇÿÇÇÇÿÇÇÇÿ¹¹¹ÿÿºººÿêêêÿêêêÿêêêÿêêêÿêêêÿæææÿìììÿëëëÿëëëÿëëëÿêêêÿéééÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿèèèÿéééÿéééÿêêêÿëëëÿëëëÿôôôÿëëëÿëëëÿëëëÿëëëÿëëëÿÑÑÑÿÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿ¬¬¬ÿÿÄÄÄÿëëëÿëëëÿëëëÿëëëÿëëëÿèèèÿëëëÿëëëÿêêêÿêêêÿéééÿéééÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿèèèÿèèèÿéééÿéééÿêêêÿêêêÿõõõÿìììÿìììÿìììÿìììÿìììÿÑÑÑÿÿ’’’ÿ’’’ÿ’’’ÿ’’’ÿ’’’ÿ’’’ÿ’’’ÿ’’’ÿ’’’ÿÿÅÅÅÿìììÿìììÿìììÿìììÿìììÿéééÿëëëÿêêêÿêêêÿéééÿéééÿèèèÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿçççÿèèèÿèèèÿéééÿéééÿêêêÿöööÿíííÿíííÿíííÿíííÿíííÿÑÑÑÿÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿ‡‡‡ÿÿÅÅÅÿíííÿíííÿíííÿíííÿíííÿêêêÿêêêÿêêêÿéééÿéééÿèèèÿèèèÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿçççÿçççÿèèèÿèèèÿéééÿéééÿøøøÿîîîÿîîîÿîîîÿîîîÿîîîÿÑÑÑÿÿ|||ÿ|||ÿ|||ÿ|||ÿ|||ÿ|||ÿ|||ÿ|||ÿ|||ÿÿÎÎÎÿîîîÿîîîÿîîîÿîîîÿîîîÿìììÿéééÿéééÿéééÿèèèÿèèèÿçççÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿæææÿçççÿçççÿèèèÿèèèÿèèèÿùùùÿîîîÿîîîÿîîîÿîîîÿîîîÿÑÑÑÿÿqqqÿqqqÿqqqÿqqqÿqqqÿqqqÿqqqÿqqqÿqqqÿÿÑÑÑÿîîîÿîîîÿîîîÿîîîÿîîîÿíííÿéééÿèèèÿèèèÿçççÿçççÿæææÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿåååÿæææÿæææÿçççÿçççÿèèèÿúúúÿïïïÿïïïÿïïïÿïïïÿïïïÿÑÑÑÿÿgggÿgggÿgggÿgggÿgggÿgggÿgggÿgggÿgggÿÿÑÑÑÿïïïÿïïïÿïïïÿïïïÿïïïÿïïïÿèèèÿèèèÿçççÿçççÿæææÿæææÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿåååÿåååÿæææÿæææÿçççÿçççÿüüüÿðððÿðððÿðððÿðððÿðððÿÐÐÐÿÿ===ÿFFFÿFFFÿFFFÿFFFÿFFFÿFFFÿFFFÿ@@@ÿÿÑÑÑÿðððÿðððÿðððÿðððÿðððÿðððÿçççÿçççÿæææÿæææÿæææÿåååÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿäääÿåååÿåååÿåååÿæææÿæææÿýýýÿñññÿñññÿñññÿñññÿñññÿÂÂÂÿTTTÿÿÿÿÿÿÿÿÿÿÿÌÌÌÿñññÿñññÿñññÿñññÿñññÿñññÿçççÿæææÿæææÿåååÿåååÿåååÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿäääÿäääÿäääÿåååÿåååÿæææÿÿÿÿÿòòòÿòòòÿòòòÿòòòÿòòòÿñññÿÕÕÕÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÑÑÑÿÞÞÞÿòòòÿòòòÿòòòÿòòòÿòòòÿóóóÿæææÿåååÿåååÿåååÿäääÿäääÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿãããÿãããÿäääÿäääÿåååÿåååÿÿÿÿÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿôôôÿåååÿåååÿäääÿäääÿäääÿãããÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿâââÿãããÿãããÿãããÿäääÿäääÿÿÿÿÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿóóóÿöööÿäääÿäääÿäääÿãããÿãããÿãããÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿâââÿâââÿâââÿãããÿãããÿãããÿÿÿÿÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿôôôÿ÷÷÷ÿäääÿãããÿãããÿãããÿâââÿâââÿÿÿÿÿ›››ÿ›››ÿÿÿÿÿáááÿáááÿâââÿâââÿâââÿãããÿÿÿÿÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿøøøÿãããÿãããÿâââÿâââÿâââÿáááÿÿÿÿÿ›››ÿžžžõÿÿÿÿáááÿàààÿáááÿáááÿâââÿâââÿüüüÿúúúÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿöööÿøøøÿ÷÷÷ÿâââÿâââÿáááÿáááÿáááÿàààÿÿÿÿÿ���ò¦¦¦Ëöööÿåååÿàààÿàààÿàààÿáááÿáááÿæææÿûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþÿþþþÿýýýÿýýýÿüüüÿøøøÿçççÿáááÿáááÿáááÿàààÿàààÿåååÿ÷÷÷ÿ   ¤¤¤¤_ØØØýñññÿßßßÿßßßÿàààÿàààÿàààÿáááÿáááÿáááÿáááÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿâââÿáááÿáááÿáááÿáááÿàààÿàààÿàààÿßßßÿîîîÿÖÖÖüœœœ$¨¨¨Óöööþñññÿåååÿàààÿßßßÿàààÿàààÿàààÿàààÿáááÿáááÿáááÿáááÿáááÿáááÿáááÿáááÿâââÿâââÿâââÿâââÿáááÿáááÿáááÿáááÿáááÿáááÿáááÿàààÿàààÿàààÿàààÿàààÿàààÿåååÿîîîÿñññÿ´´´�ŸŸŸ¥¥¥ÝÞÞÞ÷øøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ÿÖÖÖý±±±•••ššš|���å›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ›››ÿ���ò¢¢¢§ššš+ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ€?ÿÿøÿü?øððððððððððððððððððððððððððððððððððððøøü?ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ( @ €
+	,@OZ]ZM9%…ŠˆV…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆg…ŠˆVÁÄÂÿóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóÿÌÎÌÿ…ŠˆD…Šˆÿóóóÿòòòÿïïïÿñññÿòòòÿôôôÿõõõÿ÷÷÷ÿêêêÿëëëÿíííÿïïïÿóóóÿôôôÿóóóÿñññÿïïïÿóóóÿ…Šˆÿ…ŠˆÿÿÿÿÿíííÿïïïÿñññÿëëëÿáááÿáááÿÞÞÞÿ¼¼¼ÿÁÁÁÿÅÅÅÿÉÉÉÿÔÔÔÿáááÿðððÿñññÿðððÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿíííÿïïïÿêêêÿÞÞÞÿÞÞÞÿÌÌÌÿlllÿmmmÿaaaÿlllÿ«««ÿÒÒÒÿÞÞÞÿßßßÿñññÿðððÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿíííÿïïïÿæææÿàààÿàààÿ………ÿ¢¢¢ÿÂÂÂÿÂÂÂÿ»»»ÿ}}}ÿØØØÿàààÿÞÞÞÿðððÿïïïÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿíííÿîîîÿèèèÿâââÿâââÿ}}}ÿÞÞÞÿõõõÿõõõÿõõõÿoooÿÞÞÞÿâââÿáááÿïïïÿïïïÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿìììÿíííÿêêêÿäääÿäääÿzzzÿÇÇÇÿìììÿìììÿãããÿ___ÿäääÿäääÿãããÿîîîÿîîîÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿëëëÿíííÿëëëÿæææÿæææÿwwwÿ³³³ÿçççÿåååÿÔÔÔÿMMMÿãããÿæææÿåååÿíííÿíííÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿêêêÿëëëÿíííÿéééÿéééÿlllÿ‡‡‡ÿµµµÿµµµÿ°°°ÿ<<<ÿãããÿéééÿèèèÿìììÿìììÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿéééÿêêêÿïïïÿëëëÿëëëÿeeeÿ666ÿiiiÿ‡‡‡ÿ‡‡‡ÿ---ÿáááÿëëëÿêêêÿìììÿëëëÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿèèèÿéééÿðððÿíííÿíííÿ```ÿ,,,ÿÿpppÿpppÿ+++ÿàààÿíííÿíííÿêêêÿéééÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿçççÿèèèÿóóóÿïïïÿïïïÿUUUÿÿ$$$ÿ$$$ÿAAAÿ'''ÿàààÿïïïÿîîîÿéééÿèèèÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿåååÿæææÿôôôÿñññÿñññÿQQQÿÿÿÿÿ(((ÿâââÿñññÿñññÿèèèÿæææÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿäääÿåååÿôôôÿóóóÿóóóÿÌÌÌÿ„„„ÿ………ÿ………ÿ………ÿŽŽŽÿðððÿóóóÿóóóÿçççÿåååÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿâââÿãããÿïïïÿöööÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿóóóÿäääÿãããÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿáááÿâââÿãããÿïïïÿöööÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿöööÿæææÿãããÿâââÿÿÿÿÿ…Šˆÿ…Šˆÿóóóÿáááÿàààÿáááÿáááÿâââÿâââÿâââÿãããÿãããÿãããÿãããÿâââÿâââÿáááÿáááÿàààÿóóóÿ…Šˆÿ…ŠˆD»¾¼ÿóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóÿ»¾¼ÿ…Šˆo…ŠˆD…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…ŠˆZÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüÿÿàÿþü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?ü?þÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ(0 `	
+	,@OZ]ZM9%…ŠˆV…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆg…ŠˆVÁÄÂÿóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóÿÌÎÌÿ…ŠˆD…Šˆÿóóóÿòòòÿïïïÿñññÿòòòÿôôôÿõõõÿ÷÷÷ÿêêêÿëëëÿíííÿïïïÿóóóÿôôôÿóóóÿñññÿïïïÿóóóÿ…Šˆÿ…ŠˆÿÿÿÿÿíííÿïïïÿñññÿëëëÿáááÿáááÿÞÞÞÿ¼¼¼ÿÁÁÁÿÅÅÅÿÉÉÉÿÔÔÔÿáááÿðððÿñññÿðððÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿíííÿïïïÿêêêÿÞÞÞÿÞÞÞÿÌÌÌÿlllÿmmmÿaaaÿlllÿ«««ÿÒÒÒÿÞÞÞÿßßßÿñññÿðððÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿíííÿïïïÿæææÿàààÿàààÿ………ÿ¢¢¢ÿÂÂÂÿÂÂÂÿ»»»ÿ}}}ÿØØØÿàààÿÞÞÞÿðððÿïïïÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿíííÿîîîÿèèèÿâââÿâââÿ}}}ÿÞÞÞÿõõõÿõõõÿõõõÿoooÿÞÞÞÿâââÿáááÿïïïÿïïïÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿìììÿíííÿêêêÿäääÿäääÿzzzÿÇÇÇÿìììÿìììÿãããÿ___ÿäääÿäääÿãããÿîîîÿîîîÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿëëëÿíííÿëëëÿæææÿæææÿwwwÿ³³³ÿçççÿåååÿÔÔÔÿMMMÿãããÿæææÿåååÿíííÿíííÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿêêêÿëëëÿíííÿéééÿéééÿlllÿ‡‡‡ÿµµµÿµµµÿ°°°ÿ<<<ÿãããÿéééÿèèèÿìììÿìììÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿéééÿêêêÿïïïÿëëëÿëëëÿeeeÿ666ÿiiiÿ‡‡‡ÿ‡‡‡ÿ---ÿáááÿëëëÿêêêÿìììÿëëëÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿèèèÿéééÿðððÿíííÿíííÿ```ÿ,,,ÿÿpppÿpppÿ+++ÿàààÿíííÿíííÿêêêÿéééÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿçççÿèèèÿóóóÿïïïÿïïïÿUUUÿÿ$$$ÿ$$$ÿAAAÿ'''ÿàààÿïïïÿîîîÿéééÿèèèÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿåååÿæææÿôôôÿñññÿñññÿQQQÿÿÿÿÿ(((ÿâââÿñññÿñññÿèèèÿæææÿÿÿÿÿ…Šˆÿ…ŠˆÿÿÿÿÿäääÿåååÿôôôÿóóóÿóóóÿÌÌÌÿ„„„ÿ………ÿ………ÿ………ÿŽŽŽÿðððÿóóóÿóóóÿçççÿåååÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿâââÿãããÿïïïÿöööÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿóóóÿäääÿãããÿÿÿÿÿ…Šˆÿ…Šˆÿÿÿÿÿáááÿâââÿãããÿïïïÿöööÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿöööÿæææÿãããÿâââÿÿÿÿÿ…Šˆÿ…Šˆÿóóóÿáááÿàààÿáááÿáááÿâââÿâââÿâââÿãããÿãããÿãããÿãããÿâââÿâââÿáááÿáááÿàààÿóóóÿ…Šˆÿ…ŠˆD»¾¼ÿóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóÿ»¾¼ÿ…Šˆo…ŠˆD…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…ŠˆZÿÿÿÿÀÿþ?àÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀàÿÿÿ(  @…Šˆ}…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆ\…Šˆÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿñññÿ…Šˆÿ…ŠˆÿïïïÿñññÿëëëÿáááÿáááÿÞÞÞÿ¼¼¼ÿÁÁÁÿÅÅÅÿÉÉÉÿÔÔÔÿáááÿðððÿñññÿ…Šˆÿ…ŠˆÿïïïÿêêêÿÞÞÞÿÞÞÞÿÌÌÌÿlllÿmmmÿaaaÿlllÿ«««ÿÒÒÒÿÞÞÞÿßßßÿñññÿ…Šˆÿ…Šˆÿïïïÿæææÿàààÿàààÿ………ÿ¢¢¢ÿÂÂÂÿÂÂÂÿ»»»ÿ}}}ÿØØØÿàààÿÞÞÞÿðððÿ…Šˆÿ…Šˆÿîîîÿèèèÿâââÿâââÿ}}}ÿÞÞÞÿõõõÿõõõÿõõõÿoooÿÞÞÞÿâââÿáááÿïïïÿ…Šˆÿ…ŠˆÿíííÿêêêÿäääÿäääÿzzzÿÇÇÇÿìììÿìììÿãããÿ___ÿäääÿäääÿãããÿîîîÿ…Šˆÿ…Šˆÿêêêÿïïïÿëëëÿëëëÿeeeÿ©©©ÿ¹¹¹ÿÃÃÃÿÉÉÉÿ---ÿáááÿëëëÿêêêÿìììÿ…Šˆÿ…Šˆÿéééÿðððÿíííÿíííÿ```ÿ¦¦¦ÿ   ÿ³³³ÿ¼¼¼ÿ+++ÿàààÿíííÿíííÿêêêÿ…Šˆÿ…ŠˆÿèèèÿóóóÿïïïÿïïïÿUUUÿ}}}ÿ€€€ÿ€€€ÿ���ÿ'''ÿàààÿïïïÿîîîÿéééÿ…Šˆÿ…ŠˆÿæææÿôôôÿñññÿñññÿQQQÿQQQÿQQQÿQQQÿQQQÿ(((ÿâââÿñññÿñññÿèèèÿ…Šˆÿ…ŠˆÿåååÿôôôÿóóóÿóóóÿÌÌÌÿ„„„ÿ………ÿ………ÿ………ÿŽŽŽÿðððÿóóóÿóóóÿçççÿ…Šˆÿ…Šˆÿãããÿïïïÿöööÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿõõõÿóóóÿäääÿ…Šˆÿ…Šˆÿâââÿãããÿïïïÿöööÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿ÷÷÷ÿöööÿæææÿãããÿ…Šˆÿ…Šˆÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿãããÿ…Šˆÿ…Šˆ}…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆÿ…Šˆ}
\ No newline at end of file

Modification de propriÃ©tÃ©s sur dll/win32/msgina/resources/shutdown.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: dll/win32/msgina/CMakeLists.txt
===================================================================
--- dll/win32/msgina/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msgina/CMakeLists.txt	(copie de travail)
@@ -11,14 +11,17 @@
     msgina.c
     stubs.c
     tui.c
+    msgina.h)
+
+add_library(msgina SHARED
+    ${SOURCE}
     msgina.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msgina_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
 
-add_library(msgina SHARED ${SOURCE})
 set_module_type(msgina win32dll)
 target_link_libraries(msgina wine)
 add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll)
 add_delay_importlibs(msgina secur32)
-add_pch(msgina msgina.h)
+add_pch(msgina msgina.h SOURCE)
 add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all)
Index: dll/win32/msgina/resource.h
===================================================================
--- dll/win32/msgina/resource.h	(rÃ©vision 61927)
+++ dll/win32/msgina/resource.h	(copie de travail)
@@ -7,19 +7,23 @@
 #define IDD_LOGGEDOUT_DLG    103
 #define IDD_LOCKED_DLG       104
 #define IDD_UNLOCK_DLG       105
+#define IDD_SHUTDOWN_DLG     108
 
-#define IDC_LOGOFF      1001
-#define IDC_USERNAME    1002
-#define IDC_PASSWORD    1003
-#define IDC_SHUTDOWN    1004
-#define IDC_STATUSLABEL 1005
-#define IDC_LOCK        1006
-#define IDC_ROSLOGO     1007
-#define IDC_TASKMGR     1008
-#define IDC_LOCKMSG     1009
-#define IDC_LOGONMSG    1010
-#define IDC_LOGONDATE   1011
-#define IDC_CHANGEPWD   1012
+#define IDC_LOGOFF               1001
+#define IDC_USERNAME             1002
+#define IDC_PASSWORD             1003
+#define IDC_SHUTDOWN             1004
+#define IDC_STATUSLABEL          1005
+#define IDC_LOCK                 1006
+#define IDC_ROSLOGO              1007
+#define IDC_TASKMGR              1008
+#define IDC_LOCKMSG              1009
+#define IDC_LOGONMSG             1010
+#define IDC_LOGONDATE            1011
+#define IDC_CHANGEPWD            1012
+#define IDC_LOGON_TO             1013
+#define IDC_SHUTDOWN_LIST        1014
+#define IDC_SHUTDOWN_DESCRIPTION 1015
 
 #define IDD_CHANGE_PASSWORD    106
 #define IDC_CHANGEPWD_USERNAME 1013
@@ -30,7 +34,8 @@
 
 #define IDD_LOGOFF_DLG         107
 
-#define IDI_ROSLOGO 20000
+#define IDI_ROSLOGO         20000
+#define IDI_SHELL_SHUTDOWN  20001
 
 #define IDI_LOCKICON 21
 
@@ -49,3 +54,18 @@
 #define IDS_CHANGEPWDTITLE       40012
 #define IDS_NONMATCHINGPASSWORDS 40013
 #define IDS_PASSWORDCHANGED      40014
+#define IDS_LOGONTITLE           40015
+#define IDS_LOGONWRONGUSERORPWD  40016
+#define IDS_LOGONUSERDISABLED    40017
+
+#define IDS_SHUTDOWN_SHUTDOWN         50000
+#define IDS_SHUTDOWN_LOGOFF           50001
+#define IDS_SHUTDOWN_RESTART          50002
+#define IDS_SHUTDOWN_SLEEP            50003
+#define IDS_SHUTDOWN_HIBERNATE        50004
+/* Shut down descriptions */
+#define IDS_SHUTDOWN_SHUTDOWN_DESC    50005
+#define IDS_SHUTDOWN_LOGOFF_DESC      50006
+#define IDS_SHUTDOWN_RESTART_DESC     50007
+#define IDS_SHUTDOWN_SLEEP_DESC       50008
+#define IDS_SHUTDOWN_HIBERNATE_DESC   50009
Index: dll/win32/msgina/msgina.c
===================================================================
--- dll/win32/msgina/msgina.c	(rÃ©vision 61927)
+++ dll/win32/msgina/msgina.c	(copie de travail)
@@ -26,6 +26,11 @@
 
 #include "msgina.h"
 
+#include <winreg.h>
+#include <winsvc.h>
+#include <userenv.h>
+#include <ndk/sefuncs.h>
+
 HINSTANCE hDllInstance;
 
 extern GINA_UI GinaGraphicalUI;
@@ -232,7 +237,7 @@
 
     dwSize = 256 * sizeof(WCHAR);
     rc = RegQueryValueExW(hKey,
-                          L"DefaultDomainName",
+                          L"DefaultDomain",
                           NULL,
                           NULL,
                           (LPBYTE)&pgContext->Domain,
@@ -308,6 +313,8 @@
     /* Check autologon settings the first time */
     pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY;
 
+    pgContext->nShutdownAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF;
+
     ChooseGinaUI();
     return pGinaUI->Initialize(pgContext);
 }
@@ -594,6 +601,7 @@
 
 BOOL
 DoAdminUnlock(
+    IN PGINA_CONTEXT pgContext,
     IN PWSTR UserName,
     IN PWSTR Domain,
     IN PWSTR Password)
@@ -604,20 +612,30 @@
     ULONG Size;
     ULONG i;
     NTSTATUS Status;
+    NTSTATUS SubStatus = STATUS_SUCCESS;
 
     TRACE("(%S %S %S)\n", UserName, Domain, Password);
 
-    if (!LogonUserW(UserName,
-                    Domain,
-                    Password,
-                    LOGON32_LOGON_INTERACTIVE,
-                    LOGON32_PROVIDER_DEFAULT,
-                    &hToken))
+    Status = ConnectToLsa(pgContext);
+    if (!NT_SUCCESS(Status))
     {
-        WARN("LogonUserW() failed\n");
+        WARN("ConnectToLsa() failed\n");
         return FALSE;
     }
 
+    Status = MyLogonUser(pgContext->LsaHandle,
+                         pgContext->AuthenticationPackage,
+                         UserName,
+                         Domain,
+                         Password,
+                         &pgContext->UserToken,
+                         &SubStatus);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN("MyLogonUser() failed\n");
+        return FALSE;
+    }
+
     Status = NtQueryInformationToken(hToken,
                                      TokenGroups,
                                      NULL,
@@ -668,11 +686,44 @@
 }
 
 
-BOOL
+NTSTATUS
 DoLoginTasks(
     IN OUT PGINA_CONTEXT pgContext,
     IN PWSTR UserName,
     IN PWSTR Domain,
+    IN PWSTR Password,
+    OUT PNTSTATUS SubStatus)
+{
+    NTSTATUS Status;
+
+    Status = ConnectToLsa(pgContext);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN("ConnectToLsa() failed (Status 0x%08lx)\n", Status);
+        return Status;
+    }
+
+    Status = MyLogonUser(pgContext->LsaHandle,
+                         pgContext->AuthenticationPackage,
+                         UserName,
+                         Domain,
+                         Password,
+                         &pgContext->UserToken,
+                         SubStatus);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN("MyLogonUser() failed (Status 0x%08lx)\n", Status);
+    }
+
+    return Status;
+}
+
+
+BOOL
+CreateProfile(
+    IN OUT PGINA_CONTEXT pgContext,
+    IN PWSTR UserName,
+    IN PWSTR Domain,
     IN PWSTR Password)
 {
     LPWSTR ProfilePath = NULL;
@@ -683,15 +734,6 @@
     DWORD dwLength;
     BOOL bResult;
 
-    if (!LogonUserW(UserName, Domain, Password,
-        LOGON32_LOGON_INTERACTIVE,
-        LOGON32_PROVIDER_DEFAULT,
-        &pgContext->UserToken))
-    {
-        WARN("LogonUserW() failed\n");
-        goto cleanup;
-    }
-
     /* Store the logon time in the context */
     GetLocalTime(&pgContext->LogonTime);
 
@@ -787,10 +829,12 @@
     LPWSTR AutoCount = NULL;
     LPWSTR IgnoreShiftOverride = NULL;
     LPWSTR UserName = NULL;
-    LPWSTR DomainName = NULL;
+    LPWSTR Domain = NULL;
     LPWSTR Password = NULL;
     BOOL result = FALSE;
     LONG rc;
+    NTSTATUS Status;
+    NTSTATUS SubStatus = STATUS_SUCCESS;
 
     TRACE("DoAutoLogon(): AutoLogonState = %lu\n",
         pgContext->AutoLogonState);
@@ -846,7 +890,7 @@
         rc = ReadRegSzKey(WinLogonKey, L"DefaultUserName", &UserName);
         if (rc != ERROR_SUCCESS)
             goto cleanup;
-        rc = ReadRegSzKey(WinLogonKey, L"DefaultDomainName", &DomainName);
+        rc = ReadRegSzKey(WinLogonKey, L"DefaultDomain", &Domain);
         if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND)
             goto cleanup;
         rc = ReadRegSzKey(WinLogonKey, L"DefaultPassword", &Password);
@@ -853,15 +897,19 @@
         if (rc != ERROR_SUCCESS)
             goto cleanup;
 
-        result = DoLoginTasks(pgContext, UserName, DomainName, Password);
+        Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus);
+        if (!NT_SUCCESS(Status))
+        {
+            /* FIXME: Handle errors!!! */
+            result = FALSE;
+            goto cleanup;
+        }
 
+        result = CreateProfile(pgContext, UserName, Domain, Password);
         if (result == TRUE)
         {
-            pgContext->Password = HeapAlloc(GetProcessHeap(),
-                                            HEAP_ZERO_MEMORY,
-                                            (wcslen(Password) + 1) * sizeof(WCHAR));
-            if (pgContext->Password != NULL)
-                wcscpy(pgContext->Password, Password);
+            ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR));
+            wcscpy(pgContext->Password, Password);
 
             NotifyBootConfigStatus(TRUE);
         }
@@ -874,7 +922,7 @@
     HeapFree(GetProcessHeap(), 0, AutoCount);
     HeapFree(GetProcessHeap(), 0, IgnoreShiftOverride);
     HeapFree(GetProcessHeap(), 0, UserName);
-    HeapFree(GetProcessHeap(), 0, DomainName);
+    HeapFree(GetProcessHeap(), 0, Domain);
     HeapFree(GetProcessHeap(), 0, Password);
     TRACE("DoAutoLogon(): AutoLogonState = %lu, returning %d\n",
         pgContext->AutoLogonState, result);
Index: dll/win32/msgina/lsa.c
===================================================================
--- dll/win32/msgina/lsa.c	(rÃ©vision 61927)
+++ dll/win32/msgina/lsa.c	(copie de travail)
@@ -7,7 +7,7 @@
 
 #include "msgina.h"
 
-BOOL
+NTSTATUS
 ConnectToLsa(
     PGINA_CONTEXT pgContext)
 {
@@ -18,7 +18,7 @@
 
     /* We are already connected to the LSA */
     if (pgContext->LsaHandle != NULL)
-        return TRUE;
+        return STATUS_SUCCESS;
 
     /* Connect to the LSA server */
     RtlInitAnsiString((PANSI_STRING)&LogonProcessName,
@@ -30,7 +30,7 @@
     if (!NT_SUCCESS(Status))
     {
         ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status);
-        return FALSE;
+        return Status;
     }
 
     /* Get the authentication package */
@@ -43,10 +43,222 @@
     if (!NT_SUCCESS(Status))
     {
         ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status);
-        return FALSE;
     }
 
-    return TRUE;
+    return Status;
 }
 
+
+NTSTATUS
+MyLogonUser(
+    HANDLE LsaHandle,
+    ULONG AuthenticationPackage,
+    LPWSTR lpszUsername,
+    LPWSTR lpszDomain,
+    LPWSTR lpszPassword,
+    PHANDLE phToken,
+    PNTSTATUS SubStatus)
+{
+    SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY};
+    SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY};
+    PSID LogonSid = NULL;
+    PSID LocalSid = NULL;
+    LSA_STRING OriginName;
+    UNICODE_STRING DomainName;
+    UNICODE_STRING UserName;
+    UNICODE_STRING Password;
+    PMSV1_0_INTERACTIVE_LOGON AuthInfo = NULL;
+    ULONG AuthInfoLength;
+    ULONG_PTR Ptr;
+    TOKEN_SOURCE TokenSource;
+    PTOKEN_GROUPS TokenGroups = NULL;
+    PMSV1_0_INTERACTIVE_PROFILE ProfileBuffer = NULL;
+    ULONG ProfileBufferLength = 0;
+    LUID Luid = {0, 0};
+    LUID LogonId = {0, 0};
+    HANDLE TokenHandle = NULL;
+    QUOTA_LIMITS QuotaLimits;
+    NTSTATUS Status;
+
+    *phToken = NULL;
+
+    RtlInitAnsiString((PANSI_STRING)&OriginName,
+                      "MSGINA Logon");
+
+    RtlInitUnicodeString(&DomainName,
+                         lpszDomain);
+
+    RtlInitUnicodeString(&UserName,
+                         lpszUsername);
+
+    RtlInitUnicodeString(&Password,
+                         lpszPassword);
+
+    AuthInfoLength = sizeof(MSV1_0_INTERACTIVE_LOGON)+
+                     DomainName.MaximumLength +
+                     UserName.MaximumLength +
+                     Password.MaximumLength;
+
+    AuthInfo = RtlAllocateHeap(RtlGetProcessHeap(),
+                               HEAP_ZERO_MEMORY,
+                               AuthInfoLength);
+    if (AuthInfo == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    AuthInfo->MessageType = MsV1_0InteractiveLogon;
+
+    Ptr = (ULONG_PTR)AuthInfo + sizeof(MSV1_0_INTERACTIVE_LOGON);
+
+    AuthInfo->LogonDomainName.Length = DomainName.Length;
+    AuthInfo->LogonDomainName.MaximumLength = DomainName.MaximumLength;
+    AuthInfo->LogonDomainName.Buffer = (DomainName.Buffer == NULL) ? NULL : (PWCHAR)Ptr;
+    if (DomainName.MaximumLength > 0)
+    {
+        RtlCopyMemory(AuthInfo->LogonDomainName.Buffer,
+                      DomainName.Buffer,
+                      DomainName.MaximumLength);
+
+        Ptr += DomainName.MaximumLength;
+    }
+
+    AuthInfo->UserName.Length = UserName.Length;
+    AuthInfo->UserName.MaximumLength = UserName.MaximumLength;
+    AuthInfo->UserName.Buffer = (PWCHAR)Ptr;
+    if (UserName.MaximumLength > 0)
+        RtlCopyMemory(AuthInfo->UserName.Buffer,
+                      UserName.Buffer,
+                      UserName.MaximumLength);
+
+    Ptr += UserName.MaximumLength;
+
+    AuthInfo->Password.Length = Password.Length;
+    AuthInfo->Password.MaximumLength = Password.MaximumLength;
+    AuthInfo->Password.Buffer = (PWCHAR)Ptr;
+    if (Password.MaximumLength > 0)
+        RtlCopyMemory(AuthInfo->Password.Buffer,
+                      Password.Buffer,
+                      Password.MaximumLength);
+
+    /* Create the Logon SID*/
+    AllocateLocallyUniqueId(&LogonId);
+    Status = RtlAllocateAndInitializeSid(&SystemAuthority,
+                                         SECURITY_LOGON_IDS_RID_COUNT,
+                                         SECURITY_LOGON_IDS_RID,
+                                         LogonId.HighPart,
+                                         LogonId.LowPart,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         &LogonSid);
+    if (!NT_SUCCESS(Status))
+        goto done;
+
+    /* Create the Local SID*/
+    Status = RtlAllocateAndInitializeSid(&LocalAuthority,
+                                         1,
+                                         SECURITY_LOCAL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         SECURITY_NULL_RID,
+                                         &LocalSid);
+    if (!NT_SUCCESS(Status))
+        goto done;
+
+    /* Allocate and set the token groups */
+    TokenGroups = RtlAllocateHeap(RtlGetProcessHeap(),
+                                  HEAP_ZERO_MEMORY,
+                                  sizeof(TOKEN_GROUPS) + ((2 - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES)));
+    if (TokenGroups == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    TokenGroups->GroupCount = 2;
+    TokenGroups->Groups[0].Sid = LogonSid;
+    TokenGroups->Groups[0].Attributes = SE_GROUP_MANDATORY | SE_GROUP_ENABLED |
+                                        SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_LOGON_ID;
+    TokenGroups->Groups[1].Sid = LocalSid;
+    TokenGroups->Groups[1].Attributes = SE_GROUP_MANDATORY | SE_GROUP_ENABLED |
+                                        SE_GROUP_ENABLED_BY_DEFAULT;
+
+    /* Set the token source */
+    strcpy(TokenSource.SourceName, "LogonUser");
+    AllocateLocallyUniqueId(&TokenSource.SourceIdentifier);
+
+    Status = LsaLogonUser(LsaHandle,
+                          &OriginName,
+                          Interactive,
+                          AuthenticationPackage,
+                          (PVOID)AuthInfo,
+                          AuthInfoLength,
+                          TokenGroups,
+                          &TokenSource,
+                          (PVOID*)&ProfileBuffer,
+                          &ProfileBufferLength,
+                          &Luid,
+                          &TokenHandle,
+                          &QuotaLimits,
+                          SubStatus);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsaLogonUser failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
+    if (ProfileBuffer != NULL)
+    {
+        TRACE("ProfileBuffer: %p\n", ProfileBuffer);
+        TRACE("MessageType: %u\n", ProfileBuffer->MessageType);
+
+        TRACE("FullName: %p\n", ProfileBuffer->FullName.Buffer);
+        TRACE("FullName: %S\n", ProfileBuffer->FullName.Buffer);
+
+        TRACE("LogonServer: %p\n", ProfileBuffer->LogonServer.Buffer);
+        TRACE("LogonServer: %S\n", ProfileBuffer->LogonServer.Buffer);
+    }
+
+    TRACE("Luid: 0x%08lx%08lx\n", Luid.HighPart, Luid.LowPart);
+
+    if (TokenHandle != NULL)
+    {
+        TRACE("TokenHandle: %p\n", TokenHandle);
+    }
+
+    *phToken = TokenHandle;
+
+done:
+    if (ProfileBuffer != NULL)
+        LsaFreeReturnBuffer(ProfileBuffer);
+
+    if (!NT_SUCCESS(Status))
+    {
+        if (TokenHandle != NULL)
+            CloseHandle(TokenHandle);
+    }
+
+    if (TokenGroups != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, TokenGroups);
+
+    if (LocalSid != NULL)
+        RtlFreeSid(LocalSid);
+
+    if (LogonSid != NULL)
+        RtlFreeSid(LogonSid);
+
+    if (AuthInfo != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, AuthInfo);
+
+    return Status;
+}
+
 /* EOF */
Index: dll/win32/msgina/lang/es-ES.rc
===================================================================
--- dll/win32/msgina/lang/es-ES.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/es-ES.rc	(copie de travail)
@@ -11,13 +11,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bienvenido a ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Presione la combinaciÃ³n Ctrl-Alt-Supr", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Presione la combinaciÃ³n Ctrl-Alt-Supr",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Usuario:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "ContraseÃ±a:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Aceptar", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Cancelar", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Usuario:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "ContraseÃ±a:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Aceptar", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Cancelar", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -113,6 +116,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Apagar ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "Â¿&Que quieres que haga el equipo?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "Aceptar", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Â¡Bienvenido!"
@@ -125,9 +142,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/fr-FR.rc
===================================================================
--- dll/win32/msgina/lang/fr-FR.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/fr-FR.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bienvenue Ã  ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Utilisateur :", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Mot de passe :", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Annuler", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Ã‰teindre", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Annuler", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Ã‰teindre", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Fermer ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Bienvenue!"
@@ -123,9 +140,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/bg-BG.rc
===================================================================
--- dll/win32/msgina/lang/bg-BG.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/bg-BG.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Ð ÐµÐ°ÐºÑ‚ÐžÐ¡ Ð²Ð¸ Ð¿Ñ€Ð¸Ð²ÐµÑ‚Ñ�Ñ‚Ð²Ð°"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Ð�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ ÐµÐ´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ctrl-Alt-Del", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Ð�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ ÐµÐ´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»:", IDC_STATIC, 36, 75, 45, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "ÐŸÐ°Ñ€Ð¾Ð»Ð°:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Ð”Ð¾Ð±Ñ€Ðµ", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "ÐžÑ‚ÐºÐ°Ð·", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "ÐŸÐ°Ñ€Ð¾Ð»Ð°:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Ð”Ð¾Ð±Ñ€Ðµ", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "ÐžÑ‚ÐºÐ°Ð·", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑ‚ÐžÐ¡"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&ÐšÐ°ÐºÐ²Ð¾ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€Ð°?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "Ð”Ð¾Ð±Ñ€Ðµ", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "ÐžÑ‚ÐºÐ°Ð·", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Ð—Ð´Ñ€Ð°Ð²ÐµÐ¹Ñ‚Ðµ!"
@@ -123,9 +140,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/de-DE.rc
===================================================================
--- dll/win32/msgina/lang/de-DE.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/de-DE.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Willkommen bei ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "DrÃ¼cken Sie Strg+Alt+Entf", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "DrÃ¼cken Sie Strg+Alt+Entf",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Benutzername:", IDC_STATIC, 36, 75, 54, 8
-    EDITTEXT IDC_USERNAME, 92, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Passwort:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 92, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 41, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Abbrechen", IDCANCEL, 103, 122, 50, 14
-    PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 165, 122, 64, 14
+    LTEXT "Benutzername:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Passwort:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Anmelden an:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Abbrechen", IDCANCEL, 145, 122, 50, 14
+    PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 199, 122, 65, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ReactOS herunterfahren"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Welcher Vorgang soll durchgefÃ¼hrt werden?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Willkommen!"
@@ -123,9 +140,28 @@
     IDS_LOGONMSG "Sie sind angemeldet als %s."
     IDS_LOGONDATE "Anmeldedatum: %s %s"
     IDS_COMPUTERLOCKED "Computer ist gesperrt"
-    IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch.  Bitte geben Sie das Passwort erneut ein.  Bei Buchstaben des Passworts wird GroÃŸ- und Kleinschreibung unterschieden."
-    IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt.  Nur %s\\%s oder ein Administrator kann den Computer entsperren."
+    IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch. Bitte geben Sie das Passwort erneut ein. Bei Buchstaben des Passworts wird GroÃŸ- und Kleinschreibung unterschieden."
+    IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren."
     IDS_CHANGEPWDTITLE "Passwort Ã¤ndern"
     IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht Ã¼berein. Geben Sie das neue Passwort in beide Textfelder ein."
     IDS_PASSWORDCHANGED "Ihr Passwort wurde geÃ¤ndert."
+    IDS_LOGONTITLE "Anmeldemeldung"
+    IDS_LOGONWRONGUSERORPWD "Sie konnten nicht angemeldet werden. PrÃ¼fen Sie Benutzername und DomÃ¤ne, und geben Sie das Passwort erneut ein. Bei Passworten wird GroÃŸ- und Kleinschreibung unterschieden."
+    IDS_LOGONUSERDISABLED "Ihr Konto wurde deaktiviert. Wenden Sie sich an Ihren Systemadministrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/cs-CZ.rc
===================================================================
--- dll/win32/msgina/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/cs-CZ.rc	(copie de travail)
@@ -14,13 +14,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "VÃ­tejte v systÃ©mu ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "StisknÄ›te klÃ¡vesy Ctrl-Alt-Delete", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "StisknÄ›te klÃ¡vesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -29,13 +30,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "JmÃ©no:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Heslo:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Storno", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "JmÃ©no:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Heslo:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Storno", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -116,6 +119,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Vypnout ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Co mÃ¡ poÄ�Ã­taÄ� provÃ©st?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "VÃ­tejte!"
@@ -128,9 +145,28 @@
     IDS_LOGONMSG "Jste pÅ™ihlÃ¡Å¡eni jako %s."
     IDS_LOGONDATE "Datum pÅ™ihlÃ¡Å¡enÃ­: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/uk-UA.rc
===================================================================
--- dll/win32/msgina/lang/uk-UA.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/uk-UA.rc	(copie de travail)
@@ -17,13 +17,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Ð›Ð°Ñ�ÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾Ñ�Ð¸Ð¼Ð¾ Ð´Ð¾ ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Ð�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ– Ctrl+Alt+Del", IDC_STATIC, 38, 10, 144, 14
+    CONTROL         IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON            IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT           "Ð�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ– Ctrl+Alt+Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -32,13 +33,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "ÐšÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡:", IDC_STATIC, 33, 75, 48, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 48, 93, 34, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 37, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Ð¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸", IDCANCEL, 93, 122, 50, 14
-    PUSHBUTTON "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ� Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸...", IDC_SHUTDOWN, 148, 122, 86, 14
+    LTEXT "ÐšÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡:", IDC_STATIC, 6, 60, 40, 8
+    EDITTEXT IDC_USERNAME, 54, 57, 159, 14, ES_AUTOHSCROLL
+    LTEXT "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:",IDC_STATIC, 6, 78, 42, 8
+    EDITTEXT IDC_PASSWORD, 54, 76, 159, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8
+    COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Ð¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ� Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸...", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -119,6 +122,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ� Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ð¾Ð´Ð½Ñƒ Ð· Ñ‚Ð°ÐºÐ¸Ñ… Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾Ñ�Ñ‚ÐµÐ¹?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Ð¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Ð›Ð°Ñ�ÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾Ñ�Ð¸Ð¼Ð¾!"
@@ -136,4 +153,23 @@
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/pl-PL.rc
===================================================================
--- dll/win32/msgina/lang/pl-PL.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/pl-PL.rc	(copie de travail)
@@ -18,13 +18,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Witamy w ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "ProszÄ™ wcisnÄ…Ä‡ kombinacjÄ™ klawiszy Ctrl-Alt-Del", IDC_STATIC, 37, 6, 144, 18
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "ProszÄ™ wcisnÄ…Ä‡ kombinacjÄ™ klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -33,13 +34,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Nazwa uÅ¼ytkownika:", IDC_STATIC, 11, 75, 70, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "HasÅ‚o:", IDC_STATIC, 56, 93, 27, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Anuluj", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "WyÅ‚Ä…cz", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Nazwa uÅ¼ytkownika:", IDC_STATIC, 6, 60, 70, 8
+    EDITTEXT IDC_USERNAME, 73, 57, 142, 14, ES_AUTOHSCROLL
+    LTEXT "HasÅ‚o:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 73, 76, 142, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 73, 95, 142, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Anuluj", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "WyÅ‚Ä…cz", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -120,6 +123,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Zamknij ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Co chcesz, aby zrobiÅ‚ komputer?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Witaj!"
@@ -132,9 +149,28 @@
     IDS_LOGONMSG "JesteÅ› zalogowany jako %s."
     IDS_LOGONDATE "Data logowania: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/id-ID.rc
===================================================================
--- dll/win32/msgina/lang/id-ID.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/id-ID.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Selamat datang di ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Nama pengguna:", IDC_STATIC, 22, 75, 61, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Kata sandi:", IDC_STATIC, 40, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Batal", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Matikan", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Nama pengguna:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Kata sandi:", IDC_STATIC, 6, 78, 42, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Batal", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Matikan", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Shut Down ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Selamat datang!"
@@ -120,11 +137,31 @@
     IDS_ASKFORPASSWORD "Kata sandi: "
     IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan.  Lanjutkan?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/it-IT.rc
===================================================================
--- dll/win32/msgina/lang/it-IT.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/it-IT.rc	(copie de travail)
@@ -17,13 +17,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Benvenuti in ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Premere i tasti Ctrl-Alt-Canc ", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Premere i tasti Ctrl-Alt-Canc ",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -32,13 +33,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Utente:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Password:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Annulla", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Utente:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Annulla", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -119,6 +122,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Spegnimento di ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Benvenuti!"
@@ -131,9 +148,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Dati di accesso: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/no-NO.rc
===================================================================
--- dll/win32/msgina/lang/no-NO.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/no-NO.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Velkommen til ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -28,9 +29,11 @@
     EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
     LTEXT "Passord:", IDC_STATIC, 36, 93, 42, 8
     EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Avbryt", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8
+    COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Avbryt", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "SlÃ¥ av ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Hva vil du at datamaskinen skal gjÃ¸re?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Velkommen!"
@@ -123,9 +140,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/en-US.rc
===================================================================
--- dll/win32/msgina/lang/en-US.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/en-US.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Welcome to ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Press Ctrl-Alt-Del key combination", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Press Ctrl-Alt-Delete to begin.",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Username:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Password:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Cancel", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Username:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Shut Down ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Welcome!"
@@ -118,14 +135,33 @@
     IDS_PRESSCTRLALTDELETE "Press Control+Alt+Delete to Logon."
     IDS_ASKFORUSER "User name: "
     IDS_ASKFORPASSWORD "Password: "
-    IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data.  Continue?"
+    IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/sk-SK.rc
===================================================================
--- dll/win32/msgina/lang/sk-SK.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/sk-SK.rc	(copie de travail)
@@ -14,13 +14,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Vitajte v systÃ©me ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "StlaÄ�te kombinÃ¡ciu klÃ¡ves Ctrl-Alt-Del", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "StlaÄ�te kombinÃ¡ciu klÃ¡ves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -29,13 +30,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Meno pouÅ¾Ã­vateÄ¾a:", IDC_STATIC, 18, 75, 64, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Heslo:", IDC_STATIC, 56, 93, 24, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "VypnÃºÅ¥", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Meno pouÅ¾Ã­vateÄ¾a:", IDC_STATIC, 6, 60, 59, 8
+    EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL
+    LTEXT "Heslo:", IDC_STATIC, 6, 78, 59, 8
+    EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 59, 8
+    COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL,160, 122, 50, 14
+    PUSHBUTTON "VypnÃºÅ¥", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -116,6 +119,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Vypnutie systÃ©mu ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&ÄŒo chcete aby poÄ�Ã­taÄ� urobil?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Vitajte!"
@@ -128,9 +145,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/ro-RO.rc
===================================================================
--- dll/win32/msgina/lang/ro-RO.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/ro-RO.rc	(copie de travail)
@@ -11,13 +11,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bun venit Ã®n ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "ApasaÈ›i simultan Â«CtrlÂ»+Â«AltÂ»+Â«DelÂ»", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO,IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "ApasaÈ›i simultan Â«CtrlÂ»+Â«AltÂ»+Â«DelÂ»", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Nume utilizator:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Parola:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Con&firmÄƒ", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "A&nuleazÄƒ", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "&OpreÈ™te", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Nume utilizator:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Parola:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Con&firmÄƒ", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "A&nuleazÄƒ", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "&OpreÈ™te", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -42,8 +45,8 @@
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     GROUPBOX "InformaÈ›ii de autentificare", IDC_STATIC, 7, 61, 261, 52
-    LTEXT "<Mesaj>", IDC_LOGONMSG, 15, 73, 245, 18
-    LTEXT "<DatÄƒ de autentificare>", IDC_LOGONDATE, 15, 94, 245, 8
+    LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18
+    LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8
     CTEXT "Ce acÈ›iune preferaÈ›i?", IDC_STATIC, 10, 119, 255, 8
     PUSHBUTTON "&BlocheazÄƒ calculatorul", IDC_LOCK, 10, 135, 70, 14
     PUSHBUTTON "&DeautentificÄƒ-mÄƒ", IDC_LOGOFF, 90, 135, 70, 14
@@ -113,6 +116,20 @@
     PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ÃŽnchidere ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Ce doriÈ›i sÄƒ se Ã®ntÃ¢mple?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "Con&firmÄƒ", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "A&nuleazÄƒ", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Bun venit!"
@@ -125,9 +142,28 @@
     IDS_LOGONMSG "SunteÈ›i autentificat ca %s."
     IDS_LOGONDATE "Data autentificÄƒrii: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/he-IL.rc
===================================================================
--- dll/win32/msgina/lang/he-IL.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/he-IL.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "×‘×¨×•×›×™×� ×”×‘×�×™×� ×œReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "×œ×—×¥ ×¢×œ Ctrl-Alt-Del ×‘×• ×–×ž× ×™×ª", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "×œ×—×¥ ×¢×œ Ctrl-Alt-Del ×‘×• ×–×ž× ×™×ª", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "×©×� ×ž×©×ª×ž×©:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "×¡×™×¡×ž×”:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "×�×™×©×•×¨", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "×‘×™×˜×•×œ", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "×›×™×‘×•×™", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "×©×� ×ž×©×ª×ž×©:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "×¡×™×¡×ž×”:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "×�×™×©×•×¨", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "×‘×™×˜×•×œ", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "×›×™×‘×•×™", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Shut Down ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "×‘×¨×•×›×™×� ×”×‘×�×™×�!"
@@ -123,9 +140,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "×ª×�×¨×™×š ×›× ×™×¡×”: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/ja-JP.rc
===================================================================
--- dll/win32/msgina/lang/ja-JP.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/ja-JP.rc	(copie de travail)
@@ -9,13 +9,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ReactOS ã�¸ã‚ˆã�†ã�“ã��"
 FONT 9, "MS UI Gothic", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Ctrl-Alt-Del ã‚­ãƒ¼ã�®çµ„ã�¿å�ˆã‚�ã�›ã‚’æŠ¼ã�—ã�¦ã��ã� ã�•ã�„", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Ctrl-Alt-Del ã‚­ãƒ¼ã�®çµ„ã�¿å�ˆã‚�ã�›ã‚’æŠ¼ã�—ã�¦ã��ã� ã�•ã�„", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@
 FONT 9, "MS UI Gothic", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "ãƒ¦ãƒ¼ã‚¶ãƒ¼å��:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "ã‚­ãƒ£ãƒ³ã‚»ãƒ«", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "ãƒ¦ãƒ¼ã‚¶ãƒ¼å��:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "ã‚­ãƒ£ãƒ³ã‚»ãƒ«", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -83,7 +86,7 @@
 IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Change Password"
-FONT 8, "MS Shell Dlg", 400, 0, 1
+FONT 9,"MS UI Gothic", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8
@@ -103,7 +106,7 @@
 IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP
 CAPTION "Log Off ReactOS"
-FONT 8, "MS Shell Dlg", 400, 0, 1
+FONT 9,"MS UI Gothic", 400, 0, 1
 BEGIN
     ICON IDI_LOCKICON, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
@@ -111,6 +114,20 @@
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ReactOSã�®ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³"
+FONT 9,"MS UI Gothic", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã�®å‹•ä½œã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "ã‚­ãƒ£ãƒ³ã‚»ãƒ«", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "ã‚ˆã�†ã�“ã��!"
@@ -123,9 +140,28 @@
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/tr-TR.rc
===================================================================
--- dll/win32/msgina/lang/tr-TR.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/tr-TR.rc	(copie de travail)
@@ -1,10 +1,10 @@
-/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
-CAPTION "LÃ¼tfen Bekleyiniz..."
+CAPTION "Bekleyiniz..."
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
@@ -11,13 +11,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ReactOS'a HoÅŸgeldiniz"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Denetim, SeÃ§enek ve Silme dÃ¼ÄŸmelerine birlikte basÄ±nÄ±z.", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Denetim, SeÃ§enek ve Silme dÃ¼ÄŸmelerine birlikte basÄ±nÄ±z.",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "KullanÄ±cÄ± AdÄ±:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Åžifre:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Tamam", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Ä°ptal", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "BilgisayarÄ± Kapat", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "KullanÄ±cÄ± AdÄ±:", IDC_STATIC, 6, 60, 59, 8
+    EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL
+    LTEXT "Åžifre:", IDC_STATIC, 6, 78, 59, 8
+    EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Olarak Oturum AÃ§:", IDC_STATIC, 6, 96, 59, 8
+    COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Tamam", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Ä°ptal", IDCANCEL, 145, 122, 50, 14
+    PUSHBUTTON "BilgisayarÄ± Kapat", IDC_SHUTDOWN, 199, 122, 65, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -61,7 +64,7 @@
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     ICON IDI_LOCKICON, -1, 7, 59, 20, 20
     LTEXT "Bu bilgisayar kullanÄ±mda ve kilitli.", IDC_STATIC, 36, 61, 232, 8
-    LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26
+    LTEXT "Ä°leti", IDC_LOCKMSG, 37, 75, 231, 26
     LTEXT "Bu bilgisayarÄ±n kilidini aÃ§mak iÃ§in Denetim, SeÃ§enek ve Silme dÃ¼ÄŸmelerine birlikte basÄ±nÄ±z.", IDC_STATIC, 36, 106, 232, 8
 END
 
@@ -73,7 +76,7 @@
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     ICON IDI_LOCKICON, -1, 7, 59, 20, 20
     LTEXT "Bu bilgisayar kullanÄ±mda ve kilitli.", IDC_STATIC, 36, 61, 232, 8
-    LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26
+    LTEXT "Ä°leti", IDC_LOCKMSG, 36, 75, 232, 26
     LTEXT "KullanÄ±cÄ± AdÄ±:", IDC_STATIC, 36, 107, 40, 8
     EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL
     LTEXT "Åžifre:", IDC_STATIC, 36, 125, 42, 8
@@ -104,15 +107,29 @@
 
 IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP
-CAPTION "Log Off ReactOS"
+CAPTION "Oturumu Kapatma"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     ICON IDI_LOCKICON, -1, 7, 7, 20, 20
-    LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
-    PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "No", IDNO, 95, 39, 50, 14
+    LTEXT "Oturumu kapatmayÄ± onaylÄ±yor musunuz?", IDC_STATIC, 35, 16, 146, 8
+    PUSHBUTTON "Evet", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "HayÄ±r", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Oturumu Kapat"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&BilgisayarÄ±nÄ±zÄ±n ne yapmasÄ±nÄ± istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "Tamam", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Ä°ptal", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "HoÅŸgeldiniz!"
@@ -124,10 +141,29 @@
     IDS_LOCKMSG "YalnÄ±zca %s ve bir yÃ¶netici bu bilgisayarÄ± kilitleyebilir."
     IDS_LOGONMSG "%s olarak oturum aÃ§tÄ±nÄ±z."
     IDS_LOGONDATE "Oturum AÃ§ma ZamÃ¢nÄ±: %s %s"
-    IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
-    IDS_CHANGEPWDTITLE "Change Password"
-    IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
-    IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_COMPUTERLOCKED "Bilgisayar kilitlendi."
+    IDS_LOCKEDWRONGPASSWORD "Åžifre yanlÄ±ÅŸtÄ±r. Åžifrenizi yine giriniz. Åžifredeki hÃ¢rfler doÄŸru bÃ¼yÃ¼k-kÃ¼Ã§Ã¼k ayrÄ±mÄ±yla yazÄ±lmalÄ±dÄ±r."
+    IDS_LOCKEDWRONGUSER "Bu bilgisayar kilitli. Bu bilgisayarÄ±n kilidini yalnÄ±zca %s\\%s veyÃ¢ bir yÃ¶netici aÃ§abilir."
+    IDS_CHANGEPWDTITLE "Åžifre DeÄŸÅŸtirme"
+    IDS_NONMATCHINGPASSWORDS "YazÄ±dÄ±ÄŸÄ±nÄ±z bu ÅŸifreler birbiriyle uyuÅŸmuyor. Her iki metin kutusuna da aynÄ± ÅŸifreyi yazÄ±nÄ±z."
+    IDS_PASSWORDCHANGED "Åžifreniz deÄŸiÅŸtirildi."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END
Index: dll/win32/msgina/lang/ru-RU.rc
===================================================================
--- dll/win32/msgina/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/lang/ru-RU.rc	(copie de travail)
@@ -11,13 +11,14 @@
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸ Ctrl-Alt-Del.", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸ Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    RTEXT "Ð˜Ð¼Ñ� Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ�:", IDC_STATIC, 6, 75, 70, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    RTEXT "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 6, 93, 70, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 47, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 109, 122, 50, 14
-    PUSHBUTTON "Ð’Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 171, 122, 58, 14
+    LTEXT "Ð˜Ð¼Ñ� Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ�:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Ð’Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -48,7 +51,7 @@
     PUSHBUTTON "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ", IDC_LOCK, 7, 135, 86, 14
     PUSHBUTTON "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ñ�ÐµÐ°Ð½Ñ�Ð°", IDC_LOGOFF, 102, 135, 86, 14
     PUSHBUTTON "Ð’Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 198, 135, 70, 14
-    PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14
+    PUSHBUTTON "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ�", IDC_CHANGEPWD, 7, 155, 86, 14
     PUSHBUTTON "Ð”Ð¸Ñ�Ð¿ÐµÑ‚Ñ‡ÐµÑ€ Ð·Ð°Ð´Ð°Ñ‡", IDC_TASKMGR, 102, 154, 86, 14
     PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 198, 154, 70, 14
 END
@@ -74,9 +77,9 @@
     ICON IDI_LOCKICON, -1, 7, 59, 20, 20
     LTEXT "Ð­Ñ‚Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ñ�Ñ� Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½.", IDC_STATIC, 36, 61, 232, 8
     LTEXT "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ", IDC_LOCKMSG, 36, 75, 232, 26
-    LTEXT "ÐŸÐ¾&Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ:", IDC_STATIC, 36, 107, 40, 8
+    LTEXT "ÐŸÐ¾&Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ:", IDC_STATIC, 36, 107, 51, 8
     EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL
-    LTEXT "&ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 36, 125, 42, 8
+    LTEXT "&ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 33, 125, 42, 8
     EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
     PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 144, 154, 50, 14
@@ -84,35 +87,49 @@
 
 IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
-CAPTION "Change Password"
+CAPTION "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ�"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8
+    LTEXT "Ð˜Ð¼Ñ�:", IDC_STATIC, 7, 61, 78, 8
     EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL
-    LTEXT "Log on to:", IDC_STATIC, 7, 78, 78, 8
+    LTEXT "Ð’Ð¾Ð¹Ñ‚Ð¸ Ð½Ð°:", IDC_STATIC, 7, 78, 78, 8
     COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT
-    LTEXT "Old Password:", IDC_STATIC, 7, 95, 78, 8
+    LTEXT "Ð¡Ñ‚Ð°Ñ€Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 7, 95, 78, 8
     EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD
-    LTEXT "New Password:", IDC_STATIC, 7, 111, 78, 8
+    LTEXT "Ð�Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 7, 111, 78, 8
     EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD
-    LTEXT "Confirm new Password:", IDC_STATIC, 7, 127, 78, 8
+    LTEXT "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:", IDC_STATIC, 7, 127, 78, 20
     EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD
     PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14
+    PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 218, 145, 50, 14
 END
 
 IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP
-CAPTION "Log Off ReactOS"
+CAPTION "Ð’Ñ‹Ñ…Ð¾Ð´ Ð¸Ð· ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     ICON IDI_LOCKICON, -1, 7, 7, 20, 20
-    LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
-    PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "No", IDNO, 95, 39, 50, 14
+    LTEXT "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð²Ñ‹Ð¹Ñ‚Ð¸?", IDC_STATIC, 35, 16, 146, 8
+    PUSHBUTTON "Ð”Ð°", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Ð�ÐµÑ‚", IDNO, 95, 39, 50, 14
 END
 
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ðµ.", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "ÐžÑ‚Ð¼ÐµÐ½Ð°", IDCANCEL, 204, 122, 55, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ!"
@@ -122,12 +139,31 @@
     IDS_ASKFORPASSWORD "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ: "
     IDS_FORCELOGOFF "ÐŸÑ€Ð¸ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°Ñ†Ð¸Ð¸ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ� Ð²Ñ�Ðµ Ð½ÐµÑ�Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ ÑƒÑ‚ÐµÑ€Ñ�Ð½Ñ‹. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
     IDS_LOCKMSG "Ð¢Ð¾Ð»ÑŒÐºÐ¾ %s Ð¸Ð»Ð¸ Ð�Ð´Ð¼Ð¸Ð½Ð¸Ñ�Ñ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð¼Ð¾Ð³ÑƒÑ‚ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ�Ñ‚Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€."
-    IDS_LOGONMSG "You are logged on as %s."
+    IDS_LOGONMSG "Ð’Ñ‹ Ð²Ð¾ÑˆÐ»Ð¸ Ð² Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñƒ ÐºÐ°Ðº %s."
     IDS_LOGONDATE "Ð”Ð°Ñ‚Ð° Ð²Ñ…Ð¾Ð´Ð°: %s %s"
-    IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
-    IDS_CHANGEPWDTITLE "Change Password"
-    IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
-    IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_COMPUTERLOCKED "ÐšÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½"
+    IDS_LOCKEDWRONGPASSWORD "Ð�ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹Ñ�Ñ‚Ð°, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·. Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð² ÐŸÐ°Ñ€Ð¾Ð»Ð¸ Ð²Ð²Ð¾Ð´Ñ�Ñ‚Ñ�Ñ� Ñ� ÑƒÑ‡ÐµÑ‚Ð¾Ð¼ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
+    IDS_CHANGEPWDTITLE "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
+    IDS_NONMATCHINGPASSWORDS "Ð’Ð²ÐµÐ´ÐµÐ½Ð½Ñ‹Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ð½ÐµÑ�Ð¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‚. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð² Ð¾Ð±Ð° Ð¿Ð¾Ð»Ñ�"
+    IDS_PASSWORDCHANGED "Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð±Ñ‹Ð» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "Ð¡Ð¸Ñ�Ñ‚ÐµÐ¼Ðµ Ð½Ðµ ÑƒÐ´Ð°ÐµÑ‚Ñ�Ñ� Ð²Ð¾Ð¹Ñ‚Ð¸ Ð². Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑ�ÑŒ Ð² Ñ‚Ð¾Ð¼, Ð²Ð°ÑˆÐµ Ð¸Ð¼Ñ� Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ� Ð¸ Ð´Ð¾Ð¼ÐµÐ½ Ð²ÐµÑ€Ð½Ñ‹, Ñ‚Ð¾ Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·. Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð² ÐŸÐ°Ñ€Ð¾Ð»Ð¸ Ð²Ð²Ð¾Ð´Ñ�Ñ‚Ñ�Ñ� Ñ� ÑƒÑ‡ÐµÑ‚Ð¾Ð¼ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°"
+    IDS_LOGONUSERDISABLED "Ð’Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð±Ñ‹Ð» Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹Ñ�Ñ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑ�ÑŒ Ðº Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ�Ñ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ."
 END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Ð’Ñ‹Ð¹Ñ‚Ð¸ ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹"
+    IDS_SHUTDOWN_RESTART "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
+    IDS_SHUTDOWN_SLEEP "Ð¡Ð¿Ñ�Ñ‰Ð¸Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼"
+    IDS_SHUTDOWN_HIBERNATE "Ð“Ð¸Ð±ÐµÑ€Ð½Ð°Ñ†Ð¸Ñ�"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ð—Ð°Ð²ÐµÑ€ÑˆÐ°ÐµÑ‚ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ�ÐµÐ°Ð½Ñ� Ð¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ�ÐµÑ‚ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ�Ð¼ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñƒ."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ð—Ð°Ð²ÐµÑ€ÑˆÐ°ÐµÑ‚ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ�ÐµÐ°Ð½Ñ� Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñƒ Ñ‚Ð°Ðº Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ñ�Ð¿Ð¾ÐºÐ¾Ð¹Ð½Ð¾ Ð²Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ðµ."
+    IDS_SHUTDOWN_RESTART_DESC "Ð—Ð°Ð²ÐµÑ€ÑˆÐ°ÐµÑ‚ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ�ÐµÐ°Ð½Ñ� Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñƒ."
+    IDS_SHUTDOWN_SLEEP_DESC "ÐŸÐµÑ€ÐµÐ²Ð¾Ð´Ð¸Ñ‚ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñƒ Ð² Ñ€ÐµÐ¶Ð¸Ð¼ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ�."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ñ�ÐµÑ‚ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ�ÐµÐ°Ð½Ñ� Ð¸ Ð²Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€."
+END
Index: dll/win32/msgina/lang/sq-AL.rc
===================================================================
--- dll/win32/msgina/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/msgina/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,170 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Ju Lutem Prisni..."
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
+END
+
+IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "MirÃ« se vini nÃ« ReactOS"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
+    LTEXT "Shtyp Ctrl-Alt-Del kombinimin butonave", IDC_STATIC, 38, 10, 144, 14
+END
+
+IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Hzr"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    LTEXT "PÃ«rdoruesi:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "FjalÃ«kalimi:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Anulo", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Fikje", IDC_SHUTDOWN, 214, 122, 50, 14
+END
+
+IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Siguria"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    GROUPBOX "Informacionet Hzrese", IDC_STATIC, 7, 61, 261, 52
+    LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18
+    LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8
+    CTEXT "Ã‡farÃ« doni tÃ« bÃ«ni?", IDC_STATIC, 10, 119, 255, 8
+    PUSHBUTTON "KyÃ§ kompjuterin", IDC_LOCK, 10, 135, 76, 14
+    PUSHBUTTON "Dilni...", IDC_LOGOFF, 100, 135, 75, 14
+    PUSHBUTTON "Fikje", IDC_SHUTDOWN, 189, 135, 76, 14
+    PUSHBUTTON "Ndrysho FjalÃ«kalimin", IDC_CHANGEPWD, 10, 154, 76, 14
+    PUSHBUTTON "Menaxhues detyrash", IDC_TASKMGR, 100, 154, 75, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 189, 154, 76, 14
+END
+
+IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Kompjuteri u kyÃ§"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, -1, 7, 59, 20, 20
+    LTEXT "Ky kompjuter Ã«shtÃ« nÃ« pÃ«rdorim dhe ka qenÃ« i mbyllur.", IDC_STATIC, 36, 61, 232, 8
+    LTEXT "Mesazhe", IDC_LOCKMSG, 37, 75, 231, 26
+    LTEXT "Shtzp Ctrl-Alt-Del pÃ«r tÃ« zhbllokuar kÃ«tÃ« kompjuter.", IDC_STATIC, 36, 106, 232, 8
+END
+
+IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Zblloko Kompjuterin"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, -1, 7, 59, 20, 20
+    LTEXT "Ky kompjuter Ã«shtÃ« nÃ« pÃ«rdorim dhe ka qenÃ« e mbyllur.", IDC_STATIC, 36, 61, 232, 8
+    LTEXT "Mesazhe", IDC_LOCKMSG, 36, 75, 232, 26
+    LTEXT "PÃ«rdoruesi:", IDC_STATIC, 36, 107, 40, 8
+    EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL
+    LTEXT "FjalÃ«kalimi:", IDC_STATIC, 36, 125, 42, 8
+    EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Anulo", IDCANCEL, 144, 154, 50, 14
+END
+
+IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Ndrysho FjalÃ«kalimin"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    LTEXT "PÃ«rdoruesi:", IDC_STATIC, 7, 61, 78, 8
+    EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL
+    LTEXT "Hzr nÃ«:", IDC_STATIC, 7, 78, 78, 8
+    COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT
+    LTEXT "FjalÃ«kalimi vjetÃ«r:", IDC_STATIC, 7, 95, 78, 8
+    EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "FjalÃ«kalimi Ri:", IDC_STATIC, 7, 111, 78, 8
+    EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Konfirmo FjalÃ«kalimin e ri:", IDC_STATIC, 7, 127, 78, 8
+    EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Anulo", IDCANCEL, 218, 145, 50, 14
+END
+
+IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP
+CAPTION "Dil nga ReactOS"
+FONT 8, "MS Shell Dlg", 400, 0, 1
+BEGIN
+    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    LTEXT "Jeni te sigurte qe doni te dilni?", IDC_STATIC, 35, 16, 146, 8
+    PUSHBUTTON "Po", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Jo", IDNO, 95, 39, 50, 14
+END
+
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Shut Down ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
+    COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
+    DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP
+    PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LOGGEDOUTSAS "MirÃ«seerdhÃ«t!"
+    IDS_LOCKEDSAS "Kompjuteri Ã«shtÃ« i bllokuar aktualisht."
+    IDS_PRESSCTRLALTDELETE "Shtypni Control+Alt+Delete pÃ«r tÃ« hzrÃ«."
+    IDS_ASKFORUSER "PÃ«rdoruesi: "
+    IDS_ASKFORPASSWORD "FjalÃ«kalimi: "
+    IDS_FORCELOGOFF "Kjo do tÃ« nxjerrÃ« pÃ«rdoruesin aktual jashtÃ« dhe do humbasin tÃ« gjitha tÃ« dhÃ«nat e paruajtura. vazhdo?"
+    IDS_LOCKMSG "VetÃ«m %s ose njÃ« Administrator mund tÃ« zhbllokoj kÃ«tÃ« kompjuter."
+    IDS_LOGONMSG "Ju jeni i lidhur si %s."
+    IDS_LOGONDATE "Data Hzrjes: %s %s"
+    IDS_COMPUTERLOCKED "Kompjuter mbyllur"
+    IDS_LOCKEDWRONGPASSWORD "FjalÃ«kalimi Ã«shtÃ« gabim.  Ju lutem shkruani fjalÃ«kalimin tuaj pÃ«rsÃ«ri. GÃ«rmat nÃ« fjalÃ«kalim duhet tÃ« shkruhen duke pÃ«rdorur rastin e duhur."
+    IDS_LOCKEDWRONGUSER "Ky kompjuter Ã«shtÃ« i bllokuar.  VetÃ«m %s\\%s ose njÃ« Administrator mund tÃ« zhbllokoj kÃ«tÃ« kompjuter."
+    IDS_CHANGEPWDTITLE "Change Password"
+    IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
+    IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
+END
+
+/* Shutdown Dialog Strings */
+STRINGTABLE
+BEGIN
+    IDS_SHUTDOWN_LOGOFF "Log off ""%s"""
+    IDS_SHUTDOWN_SHUTDOWN "Shut down"
+    IDS_SHUTDOWN_RESTART "Restart"
+    IDS_SHUTDOWN_SLEEP "Sleep"
+    IDS_SHUTDOWN_HIBERNATE "Hibernate"
+    /* Shut down descriptions */
+    IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system."
+    IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power."
+    IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system."
+    IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode."
+    IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
+END

Modification de propriÃ©tÃ©s sur dll/win32/msgina/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/msgina/msgina.rc
===================================================================
--- dll/win32/msgina/msgina.rc	(rÃ©vision 61927)
+++ dll/win32/msgina/msgina.rc	(copie de travail)
@@ -11,6 +11,7 @@
 
 IDI_ROSLOGO BITMAP "resources/reactos.bmp"
 IDI_LOCKICON ICON "resources/21.ico"
+IDI_SHELL_SHUTDOWN ICON "resources/shutdown.ico"
 
 /* UTF-8 */
 #pragma code_page(65001)
@@ -60,6 +61,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
Index: dll/win32/msgina/stubs.c
===================================================================
--- dll/win32/msgina/stubs.c	(rÃ©vision 61927)
+++ dll/win32/msgina/stubs.c	(copie de travail)
@@ -16,12 +16,12 @@
  */
 DWORD WINAPI
 ShellShutdownDialog(
-    HWND  hParent,
-    DWORD Unknown,
-    BOOL  bHideLogoff)
+    HWND   hParent,
+    LPWSTR lpUsername,
+    BOOL   bHideLogoff)
 {
     UNREFERENCED_PARAMETER(hParent);
-    UNREFERENCED_PARAMETER(Unknown);
+    UNREFERENCED_PARAMETER(lpUsername);
     UNREFERENCED_PARAMETER(bHideLogoff);
 
     /* Return values:
Index: dll/win32/msgina/tui.c
===================================================================
--- dll/win32/msgina/tui.c	(rÃ©vision 61927)
+++ dll/win32/msgina/tui.c	(copie de travail)
@@ -7,6 +7,8 @@
 
 #include "msgina.h"
 
+#include <wincon.h>
+
 static BOOL
 TUIInitialize(
     IN OUT PGINA_CONTEXT pgContext)
@@ -197,6 +199,8 @@
 {
     WCHAR UserName[256];
     WCHAR Password[256];
+    NTSTATUS Status;
+    NTSTATUS SubStatus = STATUS_SUCCESS;
 
     TRACE("TUILoggedOutSAS()\n");
 
@@ -206,10 +210,14 @@
     if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE))
         return WLX_SAS_ACTION_NONE;
 
-    if (DoLoginTasks(pgContext, UserName, NULL, Password))
-        return WLX_SAS_ACTION_LOGON;
-    else
-        return WLX_SAS_ACTION_NONE;
+    Status = DoLoginTasks(pgContext, UserName, NULL, Password, &SubStatus);
+    if (Status == STATUS_SUCCESS)
+    {
+        if (CreateProfile(pgContext, UserName, NULL, Password))
+            return WLX_SAS_ACTION_LOGON;
+    }
+
+    return WLX_SAS_ACTION_NONE;
 }
 
 static INT
@@ -219,6 +227,8 @@
     HANDLE hToken;
     WCHAR UserName[256];
     WCHAR Password[256];
+    NTSTATUS SubStatus;
+    NTSTATUS Status;
 
     TRACE("TUILockedSAS()\n");
 
@@ -233,14 +243,26 @@
     if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE))
         return WLX_SAS_ACTION_NONE;
 
-    if (!LogonUserW(UserName, NULL, Password,
-        LOGON32_LOGON_UNLOCK,
-        LOGON32_PROVIDER_DEFAULT,
-        &hToken))
+    Status = ConnectToLsa(pgContext);
+    if (!NT_SUCCESS(Status))
     {
-        TRACE("LogonUserW() failed\n");
+        WARN("ConnectToLsa() failed\n");
         return WLX_SAS_ACTION_NONE;
     }
+
+    Status = MyLogonUser(pgContext->LsaHandle,
+                         pgContext->AuthenticationPackage,
+                         UserName,
+                         NULL,
+                         Password,
+                         &hToken,
+                         &SubStatus);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN("MyLogonUser() failed\n");
+        return WLX_SAS_ACTION_NONE;
+    }
+
     CloseHandle(hToken);
     return WLX_SAS_ACTION_UNLOCK_WKSTA;
 }
Index: dll/win32/rpcrt4/CMakeLists.txt
===================================================================
--- dll/win32/rpcrt4/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/rpcrt4/CMakeLists.txt	(copie de travail)
@@ -23,9 +23,8 @@
     rpc_server.c
     rpc_transport.c
     unix_func.c
-    ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c
-    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def)
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
@@ -45,7 +44,9 @@
 add_library(rpcrt4 SHARED
     ${SOURCE}
     ${rpcrt4_asm}
-    rpcrt4.rc)
+    rpcrt4.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def)
 
 set_module_type(rpcrt4 win32dll)
 target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})
@@ -52,4 +53,5 @@
 
 add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32)
 add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll)
+add_pch(rpcrt4 precomp.h SOURCE)
 add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)
Index: dll/win32/xmllite/guid.c
===================================================================
--- dll/win32/xmllite/guid.c	(rÃ©vision 61927)
+++ dll/win32/xmllite/guid.c	(copie de travail)
@@ -12,6 +12,7 @@
 #include <initguid.h>
 #include <xmllite.h>
 
+/* reader.c */
 DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda);
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Index: dll/win32/xmllite/CMakeLists.txt
===================================================================
--- dll/win32/xmllite/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/xmllite/CMakeLists.txt	(copie de travail)
@@ -7,12 +7,16 @@
     reader.c
     writer.c
     xmllite_main.c
+    xmllite_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c)
+
+add_library(xmllite SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def)
 
-add_library(xmllite SHARED ${SOURCE})
 set_module_type(xmllite win32dll)
 target_link_libraries(xmllite uuid wine)
 add_importlibs(xmllite msvcrt kernel32 ntdll)
+add_pch(xmllite xmllite_private.h SOURCE)
 add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all)
Index: dll/win32/itss/CMakeLists.txt
===================================================================
--- dll/win32/itss/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/itss/CMakeLists.txt	(copie de travail)
@@ -11,12 +11,17 @@
     moniker.c
     protocol.c
     storage.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c)
+
+add_library(itss SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
 
-add_library(itss SHARED ${SOURCE} rsrc.rc)
 set_module_type(itss win32dll)
 target_link_libraries(itss uuid wine)
 add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll)
+add_pch(itss precomp.h SOURCE)
 add_cd_file(TARGET itss DESTINATION reactos/system32 FOR all)
Index: dll/win32/msxml3/CMakeLists.txt
===================================================================
--- dll/win32/msxml3/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msxml3/CMakeLists.txt	(copie de travail)
@@ -25,7 +25,6 @@
     domimpl.c
     element.c
     entityref.c
-    factory.c
     httprequest.c
     main.c
     mxnamespace.c
@@ -40,7 +39,6 @@
     selection.c
     stylesheet.c
     text.c
-    uuid.c
     xdr.c
     xmldoc.c
     xmlelem.c
@@ -48,8 +46,8 @@
     xmlview.c
     xslpattern.tab.c
     xslpattern.yy.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c)
 
 list(APPEND msxml3_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.manifest
@@ -58,10 +56,18 @@
     ${CMAKE_CURRENT_BINARY_DIR}/msxml3_v1.tlb)
 
 set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_deps}")
-add_library(msxml3 SHARED ${SOURCE} version.rc)
+
+add_library(msxml3 SHARED
+    ${SOURCE}
+    factory.c
+    uuid.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
+
 add_idl_headers(xmlparser_idlheader xmlparser.idl)
 set_module_type(msxml3 win32dll)
-target_link_libraries(msxml3 libxml2 uuid wine)
+target_link_libraries(msxml3 libxml2 iconv-static uuid wine)
 add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb
+add_pch(msxml3 precomp.h SOURCE)
 add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all)
Index: dll/win32/mswsock/precomp.h
===================================================================
--- dll/win32/mswsock/precomp.h	(rÃ©vision 61927)
+++ dll/win32/mswsock/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MSWSOCK_PCH_
+#define _MSWSOCK_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -6,3 +9,5 @@
 
 #include <windef.h>
 #include <winbase.h>
+
+#endif /* _MSWSOCK_PCH_ */
Index: dll/win32/mswsock/CMakeLists.txt
===================================================================
--- dll/win32/mswsock/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mswsock/CMakeLists.txt	(copie de travail)
@@ -8,13 +8,15 @@
 list(APPEND SOURCE
     extensions.c
     stubs.c
+    precomp.h)
+
+add_library(mswsock SHARED
+    ${SOURCE}
     mswsock.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
 
-add_library(mswsock SHARED ${SOURCE})
-
 set_module_type(mswsock win32dll UNICODE)
 add_importlibs(mswsock ws2_32 msvcrt kernel32)
-add_pch(mswsock precomp.h)
+add_pch(mswsock precomp.h SOURCE)
 add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/winmm/CMakeLists.txt
===================================================================
--- dll/win32/winmm/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/winmm/CMakeLists.txt	(copie de travail)
@@ -14,15 +14,17 @@
     registry.c
     time.c
     winmm.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
+    winemm.h
+    ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c)
 
 add_library(winmm SHARED
     ${SOURCE}
-    winmm_res.rc)
+    winmm_res.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
 
-set_module_type(winmm win32dll)
+set_module_type(winmm win32dll HOTPATCHABLE)
 target_link_libraries(winmm wine ${PSEH_LIB})
 add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
+add_pch(winmm winemm.h SOURCE)
 add_subdirectory(midimap)
 add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all)
Index: dll/win32/winmm/joystick.c
===================================================================
--- dll/win32/winmm/joystick.c	(rÃ©vision 61927)
+++ dll/win32/winmm/joystick.c	(copie de travail)
@@ -123,7 +123,7 @@
 /**************************************************************************
  * 				joyGetNumDevs		[WINMM.@]
  */
-UINT WINAPI joyGetNumDevs(void)
+UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void)
 {
     UINT	ret = 0;
     int		i;
@@ -139,7 +139,7 @@
 /**************************************************************************
  * 				joyGetDevCapsW		[WINMM.@]
  */
-MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize)
+MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize)
 {
     if (wID >= MAXJOYSTICK)	return JOYERR_PARMS;
     if (!JOY_LoadDriver(wID))	return MMSYSERR_NODRIVER;
@@ -153,7 +153,7 @@
 /**************************************************************************
  * 				joyGetDevCapsA		[WINMM.@]
  */
-MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize)
+MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize)
 {
     JOYCAPSW	jcw;
     MMRESULT	ret;
@@ -202,7 +202,7 @@
 /**************************************************************************
  *                              joyGetPosEx             [WINMM.@]
  */
-MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo)
+MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo)
 {
     TRACE("(%d, %p);\n", wID, lpInfo);
 
Index: dll/win32/winmm/winemm.h
===================================================================
--- dll/win32/winmm/winemm.h	(rÃ©vision 61927)
+++ dll/win32/winmm/winemm.h	(copie de travail)
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WINEMM_H_
+#define _WINEMM_H_
+
 #include <wine/config.h>
 
 #include <assert.h>
@@ -199,3 +202,5 @@
     "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers"
 
 INT LoadRegistryMMEDrivers(char* key);
+
+#endif /* _WINEMM_H_ */
Index: dll/win32/msi/CMakeLists.txt
===================================================================
--- dll/win32/msi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msi/CMakeLists.txt	(copie de travail)
@@ -51,12 +51,15 @@
     update.c
     upgrade.c
     where.c
+    msipriv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c)
+
+add_library(msi SHARED
+    ${SOURCE}
     msi.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msi.def)
 
-add_library(msi SHARED ${SOURCE})
 add_idl_headers(msi_idlheader msiserver.idl)
 add_typelib(msiserver.idl)
 set_source_files_properties(msi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msiserver.tlb)
@@ -83,5 +86,5 @@
     kernel32
     ntdll)
 
-add_pch(msi msipriv.h)
+add_pch(msi msipriv.h SOURCE)
 add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all)
Index: dll/win32/msi/msipriv.h
===================================================================
--- dll/win32/msi/msipriv.h	(rÃ©vision 61927)
+++ dll/win32/msi/msipriv.h	(copie de travail)
@@ -22,10 +22,10 @@
 #ifndef __WINE_MSI_PRIVATE__
 #define __WINE_MSI_PRIVATE__
 
-#include <config.h>
+#include <wine/config.h>
 
+#include <assert.h>
 #include <stdarg.h>
-#include <assert.h>
 
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -48,8 +48,8 @@
 #include <sddl.h>
 #include <msidefs.h>
 
+#include <wine/debug.h>
 #include <wine/list.h>
-#include <wine/debug.h>
 #include <wine/unicode.h>
 
 static const BOOL is_64bit = sizeof(void *) > sizeof(int);
Index: dll/win32/msi/msi_Sq.rc
===================================================================
--- dll/win32/msi/msi_Sq.rc	(rÃ©vision 0)
+++ dll/win32/msi/msi_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,37 @@
+/*
+ * English resources for MSI
+ *
+ * Copyright 2005 Mike McCormack
+ * Copyright 2010 Detlef Riekenberg
+ *
+ * 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
+ */
+
+#include "windef.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+	4 "Paketa e specifikuar instalimi nuk mund tÃ« hapet. Ju lutem kontrolloni rrugÃ«n e dokumentit dhe tÃ« provoni pÃ«rsÃ«ri."
+	5 "rruga %s nuk u gjÃ«nd"
+	9 "fusni diskun %s"
+	10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n"
+	11 "hyr e cila dosje pÃ«rmban %s"
+	12 "instalo burimin pÃ«r funksionin e munguar"
+	13 "rrjet drive-ri pÃ«r funksionin e munguar"
+	14 "funksione nga:"
+	15 "zgjidhni dosjen qÃ« pÃ«rmban %s"
+}

Modification de propriÃ©tÃ©s sur dll/win32/msi/msi_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/setupapi/setupapi.rc
===================================================================
--- dll/win32/setupapi/setupapi.rc	(rÃ©vision 61927)
+++ dll/win32/setupapi/setupapi.rc	(copie de travail)
@@ -76,6 +76,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/win32/setupapi/setupapi_private.h
===================================================================
--- dll/win32/setupapi/setupapi_private.h	(rÃ©vision 61927)
+++ dll/win32/setupapi/setupapi_private.h	(copie de travail)
@@ -25,6 +25,7 @@
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 
 #include <windef.h>
Index: dll/win32/setupapi/CMakeLists.txt
===================================================================
--- dll/win32/setupapi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/setupapi/CMakeLists.txt	(copie de travail)
@@ -29,12 +29,15 @@
     stringtable.c
     stubs.c
     rpc.c
+    setupapi_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c)
+
+add_library(setupapi SHARED
+    ${SOURCE}
     setupapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def
-    ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c)
+    ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def)
 
-add_library(setupapi SHARED ${SOURCE})
 set_module_type(setupapi win32dll UNICODE)
 target_link_libraries(setupapi uuid wine ${PSEH_LIB})
 add_delay_importlibs(setupapi shell32)
@@ -50,5 +53,5 @@
     kernel32
     ntdll)
 
-add_pch(setupapi setupapi_private.h)
+add_pch(setupapi setupapi_private.h SOURCE)
 add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all)
Index: dll/win32/setupapi/lang/sq-AL.rc
===================================================================
--- dll/win32/setupapi/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/setupapi/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,25 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+COPYFILEDLGORD DIALOGEX 20, 20, 208, 105
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Kopjimi Dokumentave..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Anulo", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "Burimi:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Destinacioni:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+    CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+STRINGTABLE
+BEGIN
+    IDS_QUERY_REBOOT_TEXT "Kompjuteri juaj duhet tÃ« rifillohet pÃ«r tÃ« pÃ«rfunduar instalimin. A doni tÃ« vazhdoni?"
+    IDS_QUERY_REBOOT_CAPTION "Rifillo"
+    IDS_INF_FILE "Informacione NdÃ«rtimi"
+END

Modification de propriÃ©tÃ©s sur dll/win32/setupapi/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/schannel/precomp.h
===================================================================
--- dll/win32/schannel/precomp.h	(rÃ©vision 61927)
+++ dll/win32/schannel/precomp.h	(copie de travail)
@@ -3,10 +3,11 @@
 
 #include <stdarg.h>
 
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <ntstatus.h>
 #define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
 #include <sspi.h>
Index: dll/win32/schannel/CMakeLists.txt
===================================================================
--- dll/win32/schannel/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/schannel/CMakeLists.txt	(copie de travail)
@@ -7,12 +7,16 @@
     lsamode.c
     schannel_main.c
     usermode.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/schannel_stubs.c)
+
+add_library(schannel SHARED
+    ${SOURCE}
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/schannel_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/schannel.def)
 
-add_library(schannel SHARED ${SOURCE})
 set_module_type(schannel win32dll)
 target_link_libraries(schannel wine)
 add_importlibs(schannel secur32 msvcrt kernel32 ntdll)
+add_pch(schannel precomp.h SOURCE)
 add_cd_file(TARGET schannel DESTINATION reactos/system32 FOR all)
Index: dll/win32/winhttp/CMakeLists.txt
===================================================================
--- dll/win32/winhttp/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/winhttp/CMakeLists.txt	(copie de travail)
@@ -2,6 +2,7 @@
 add_definitions(
     -D__WINESRC__
     -D_WINE)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(winhttp.dll winhttp.spec ADD_IMPORTLIB)
 
@@ -13,14 +14,20 @@
     request.c
     session.c
     url.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
+    winhttp_private.h)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winhttp_tlb.tlb)
 add_typelib(winhttp_tlb.idl)
-add_library(winhttp SHARED ${SOURCE} rsrc.rc)
+
+add_library(winhttp SHARED
+    ${SOURCE}
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
+
 set_module_type(winhttp win32dll)
 target_link_libraries(winhttp uuid wine)
 add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32)
 add_importlibs(winhttp user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(winhttp stdole2) # wininet_tlb.tlb needs stdole2.tlb
+add_pch(winhttp winhttp_private.h SOURCE)
 add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all)
Index: dll/win32/wbemprox/CMakeLists.txt
===================================================================
--- dll/win32/wbemprox/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wbemprox/CMakeLists.txt	(copie de travail)
@@ -19,13 +19,18 @@
     table.c
     wbemlocator.c
     wql.tab.c
+    wbemprox_private.h)
+
+add_library(wbemprox SHARED
+    ${SOURCE}
     guid.c
+    wbemprox.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def)
 
-add_library(wbemprox SHARED ${SOURCE} wbemprox.rc)
 set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs)
 set_module_type(wbemprox win32dll)
 target_link_libraries(wbemprox uuid wine)
 add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version msvcrt kernel32 ntdll)
 add_dependencies(wbemprox d3d_idl_headers)
+add_pch(wbemprox wbemprox_private.h SOURCE)
 add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all)
Index: dll/win32/wbemprox/wbemprox_private.h
===================================================================
--- dll/win32/wbemprox/wbemprox_private.h	(rÃ©vision 61927)
+++ dll/win32/wbemprox/wbemprox_private.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WBEMPROX_PRIVATE_H_
+#define _WBEMPROX_PRIVATE_H_
+
 #include <config.h>
 
 #include <stdarg.h>
@@ -331,3 +334,5 @@
 static const WCHAR param_userW[] = {'U','s','e','r',0};
 static const WCHAR param_valueW[] = {'s','V','a','l','u','e',0};
 static const WCHAR param_valuenameW[] = {'s','V','a','l','u','e','N','a','m','e',0};
+
+#endif /* _WBEMPROX_PRIVATE_H_ */
Index: dll/win32/mshtml/CMakeLists.txt
===================================================================
--- dll/win32/mshtml/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mshtml/CMakeLists.txt	(copie de travail)
@@ -85,16 +85,19 @@
     task.c
     txtrange.c
     view.c
-    guid.c
-    rsrc.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
+    mshtml_private.h)
 
 if(MSVC)
     add_asm_files(mshtml_asm msvc.S)
 endif()
 
-add_library(mshtml SHARED ${SOURCE} ${mshtml_asm})
+add_library(mshtml SHARED
+    ${SOURCE}
+    ${mshtml_asm}
+    guid.c
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
 
 list(APPEND mshtml_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/blank.htm
@@ -108,4 +111,5 @@
 add_delay_importlibs(mshtml wininet)
 add_importlibs(mshtml urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(mshtml mshtml_nsiface_header)
+add_pch(mshtml mshtml_private.h SOURCE)
 add_cd_file(TARGET mshtml DESTINATION reactos/system32 FOR all)
Index: dll/win32/mshtml/lang/Sq.rc
===================================================================
--- dll/win32/mshtml/lang/Sq.rc	(rÃ©vision 0)
+++ dll/win32/mshtml/lang/Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2005-2006 Jacek Caban
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_STATUS_DONE            "e BÃ«rÃ«"
+    IDS_STATUS_DOWNLOADINGFROM "Shkarko nga %s..."
+}
+
+STRINGTABLE
+{
+    IDS_HTMLDOCUMENT    "HTML Document"
+}
+
+IDD_HYPERLINK DIALOG 0, 0, 255, 65
+STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Hyperlink"
+FONT 8, "MS Shell Dlg"
+{
+    GROUPBOX "Hyperlink Informacioni", -1, 5, 5, 190, 55
+    LTEXT "&Tipi:", -1, 10, 22, 24, 10
+    COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
+    LTEXT "&URL:", -1, 10, 42, 24, 10
+    EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 200, 10, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 200, 28, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30
+    EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 40, 65, 50, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 110, 65, 50, 15, WS_GROUP | WS_TABSTOP
+}

Modification de propriÃ©tÃ©s sur dll/win32/mshtml/lang/Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/mshtml/mshtml_private.h
===================================================================
--- dll/win32/mshtml/mshtml_private.h	(rÃ©vision 61927)
+++ dll/win32/mshtml/mshtml_private.h	(copie de travail)
@@ -16,8 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _MSHTML_PRIVATE_H_
+#define _MSHTML_PRIVATE_H_
 
+#include <wine/config.h>
+
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -52,10 +55,10 @@
 #include <wininet.h>
 #include <nsiface.h>
 
+#include <wine/debug.h>
 #include <wine/list.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NS_ERROR_GENERATE_FAILURE(module,code) \
@@ -1204,3 +1207,5 @@
 #include "htmlstyle.h"
 #include "pluginhost.h"
 #include "resource.h"
+
+#endif /* _MSHTML_PRIVATE_H_ */
Index: dll/win32/mshtml/rsrc.rc
===================================================================
--- dll/win32/mshtml/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/mshtml/rsrc.rc	(copie de travail)
@@ -56,9 +56,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DA_DK
@@ -100,6 +97,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/Uk.rc"
 #endif
Index: dll/win32/mshtml/guid.c
===================================================================
--- dll/win32/mshtml/guid.c	(rÃ©vision 61927)
+++ dll/win32/mshtml/guid.c	(copie de travail)
@@ -11,6 +11,7 @@
 #include <initguid.h>
 #include <nsiface.h>
 
+/* mshtml_private.h */
 DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
 DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
 DEFINE_GUID(CLSID_MailtoProtocol, 0x3050F3DA, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
@@ -24,6 +25,7 @@
 DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58);
 DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8);
 
+/* htmlnode.c */
 DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9);
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Index: dll/win32/acledit/stubs.c
===================================================================
--- dll/win32/acledit/stubs.c	(rÃ©vision 61927)
+++ dll/win32/acledit/stubs.c	(copie de travail)
@@ -20,7 +20,6 @@
 #define UNIMPLEMENTED \
   DbgPrint("ACLEDIT:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
 
-
 DWORD
 WINAPI
 EditAuditInfo(DWORD Unknown)
Index: dll/win32/acledit/acledit.c
===================================================================
--- dll/win32/acledit/acledit.c	(rÃ©vision 61927)
+++ dll/win32/acledit/acledit.c	(copie de travail)
@@ -33,7 +33,6 @@
 
 HINSTANCE hDllInstance;
 
-
 BOOL WINAPI
 DllMain(
 	HINSTANCE hinstDLL,
Index: dll/win32/acledit/acleditint.h
===================================================================
--- dll/win32/acledit/acleditint.h	(rÃ©vision 61927)
+++ dll/win32/acledit/acleditint.h	(copie de travail)
@@ -1,7 +1,8 @@
+#ifndef _ACLEDIT_H
+#define _ACLEDIT_H
+
 #include <windef.h>
 
-#include "resource.h"
-
 extern HINSTANCE hDllInstance;
 
 typedef struct _ACL_HELP_CONTROL
@@ -56,4 +57,4 @@
                                       BOOL bApplyToSubObjects,
                                       LPDWORD lpdwChangeContextStatus);
 
-/* EOF */
+#endif /* _ACLEDIT_H */
Index: dll/win32/acledit/CMakeLists.txt
===================================================================
--- dll/win32/acledit/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/acledit/CMakeLists.txt	(copie de travail)
@@ -4,11 +4,11 @@
 list(APPEND SOURCE
     acledit.c
     stubs.c
-    acledit.rc
+    acleditint.h
     ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
-add_library(acledit SHARED ${SOURCE})
+add_library(acledit SHARED ${SOURCE} acledit.rc)
 set_module_type(acledit win32dll UNICODE)
 add_importlibs(acledit msvcrt kernel32 ntdll)
-add_pch(acledit acleditint.h)
+add_pch(acledit acleditint.h SOURCE)
 add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all)
Index: dll/win32/samlib/samlib.c
===================================================================
--- dll/win32/samlib/samlib.c	(rÃ©vision 61927)
+++ dll/win32/samlib/samlib.c	(copie de travail)
@@ -45,6 +45,12 @@
 SystemFunction007(PUNICODE_STRING string,
                   LPBYTE hash);
 
+NTSTATUS
+WINAPI
+SystemFunction012(const BYTE *in,
+                  const BYTE *key,
+                  LPBYTE out);
+
 /* GLOBALS *******************************************************************/
 
 
@@ -254,6 +260,13 @@
     BOOLEAN NewLmPasswordPresent = FALSE;
     NTSTATUS Status;
 
+    ENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm;
+    ENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm;
+    ENCRYPTED_LM_OWF_PASSWORD OldNtEncryptedWithNewNt;
+    ENCRYPTED_LM_OWF_PASSWORD NewNtEncryptedWithOldNt;
+    PENCRYPTED_LM_OWF_PASSWORD pOldLmEncryptedWithNewLm = NULL;
+    PENCRYPTED_LM_OWF_PASSWORD pNewLmEncryptedWithOldLm = NULL;
+
     /* Calculate the NT hash for the old password */
     Status = SystemFunction007(OldPassword,
                                (LPBYTE)&OldNtPassword);
@@ -312,15 +325,57 @@
         }
     }
 
+    if (OldLmPasswordPresent && NewLmPasswordPresent)
+    {
+        Status = SystemFunction012((const BYTE *)&OldLmPassword,
+                                   (const BYTE *)&NewLmPassword,
+                                   (LPBYTE)&OldLmEncryptedWithNewLm);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+            return Status;
+        }
+
+        Status = SystemFunction012((const BYTE *)&NewLmPassword,
+                                   (const BYTE *)&OldLmPassword,
+                                   (LPBYTE)&NewLmEncryptedWithOldLm);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+            return Status;
+        }
+
+        pOldLmEncryptedWithNewLm = &OldLmEncryptedWithNewLm;
+        pNewLmEncryptedWithOldLm = &NewLmEncryptedWithOldLm;
+    }
+
+    Status = SystemFunction012((const BYTE *)&OldNtPassword,
+                               (const BYTE *)&NewNtPassword,
+                               (LPBYTE)&OldNtEncryptedWithNewNt);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+        return Status;
+    }
+
+    Status = SystemFunction012((const BYTE *)&NewNtPassword,
+                               (const BYTE *)&OldNtPassword,
+                               (LPBYTE)&NewNtEncryptedWithOldNt);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+        return Status;
+    }
+
     RpcTryExcept
     {
         Status = SamrChangePasswordUser((SAMPR_HANDLE)UserHandle,
                                         OldLmPasswordPresent && NewLmPasswordPresent,
-                                        &OldLmPassword,
-                                        &NewLmPassword,
+                                        pOldLmEncryptedWithNewLm,
+                                        pNewLmEncryptedWithOldLm,
                                         TRUE,
-                                        &OldNtPassword,
-                                        &NewNtPassword,
+                                        &OldNtEncryptedWithNewNt,
+                                        &NewNtEncryptedWithOldNt,
                                         FALSE,
                                         NULL,
                                         FALSE,
Index: dll/win32/samlib/precomp.h
===================================================================
--- dll/win32/samlib/precomp.h	(rÃ©vision 61927)
+++ dll/win32/samlib/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SAMLIB_PCH_
+#define _SAMLIB_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -6,3 +9,5 @@
 
 #include <windef.h>
 #include <winbase.h>
+
+#endif /* _SAMLIB_PCH_ */
Index: dll/win32/samlib/CMakeLists.txt
===================================================================
--- dll/win32/samlib/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/samlib/CMakeLists.txt	(copie de travail)
@@ -10,14 +10,17 @@
 list(APPEND SOURCE
     dllmain.c
     samlib.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sam_c.c
+    ${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c)
+
+add_library(samlib SHARED
+    ${SOURCE}
     samlib.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/samlib.def
-    ${CMAKE_CURRENT_BINARY_DIR}/sam_c.c)
+    ${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
 
-add_library(samlib SHARED ${SOURCE})
 set_module_type(samlib win32dll UNICODE)
 target_link_libraries(samlib wine ${PSEH_LIB})
 add_importlibs(samlib rpcrt4 advapi32 msvcrt kernel32 ntdll)
-add_pch(samlib precomp.h)
+add_pch(samlib precomp.h SOURCE)
 add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all)
Index: dll/win32/windowscodecs/CMakeLists.txt
===================================================================
--- dll/win32/windowscodecs/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/windowscodecs/CMakeLists.txt	(copie de travail)
@@ -51,14 +51,19 @@
     tgaformat.c
     tiffformat.c
     ungif.c
+    wincodecs_private.h)
+
+add_library(windowscodecs SHARED
+    ${SOURCE}
     guid.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c)
 
-add_library(windowscodecs SHARED ${SOURCE} version.rc)
 set_module_type(windowscodecs win32dll)
 target_link_libraries(windowscodecs wine uuid ${PSEH_LIB})
 add_importlibs(windowscodecs ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(windowscodecs wincodecs_private.h SOURCE)
 add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all)
Index: dll/win32/credui/credui.rc
===================================================================
--- dll/win32/credui/credui.rc	(rÃ©vision 61927)
+++ dll/win32/credui/credui.rc	(copie de travail)
@@ -83,6 +83,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/credui_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/credui_Sq.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/credui_Tr.rc"
 #endif
Index: dll/win32/credui/lang/credui_Sq.rc
===================================================================
--- dll/win32/credui/lang/credui_Sq.rc	(rÃ©vision 0)
+++ dll/win32/credui/lang/credui_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,53 @@
+/*
+ * Albanian language resource file for Credentials UI
+ * Translation: Ardit Dani
+ *
+ * Copyright 2007 Robert Shearman (for CodeWeavers)
+ *
+ * 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
+ */
+
+#include "credui_resources.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_CREDDIALOG DIALOG  0, 0, 213, 149
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "IDS_TITLEFORMAT"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0,
+                    0,213,37
+    LTEXT           "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP
+    LTEXT           "PÃ«rdoruesi:",-1,8,62,72,12,SS_CENTERIMAGE
+    CONTROL         "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN |
+                    CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87
+    LTEXT           "&Password:",-1,8,80,72,12,SS_CENTERIMAGE
+    EDITTEXT        IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "Kujto passwordin tim",IDC_SAVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12
+    DEFPUSHBUTTON   "OK",IDOK,97,128,50,14
+    PUSHBUTTON      "Anulo",IDCANCEL,156,128,50,14
+END
+
+STRINGTABLE
+{
+    IDS_TITLEFORMAT     "Lidhu me %s"
+    IDS_MESSAGEFORMAT   "Duke u lidhur me %s"
+    IDS_INCORRECTPASSWORDTITLE  "Logon pa sukses"
+    IDS_INCORRECTPASSWORD       "Sigurohu qe pÃ«rdoruesi\ndhe passwordi jane korrekt."
+    IDS_CAPSLOCKONTITLE "Caps Lock Ã«shtÃ« On"
+    IDS_CAPSLOCKON      "Duke pasur Caps Lock tÃ« ndezur mund tÃ« shkaktojÃ« qÃ« tÃ« shkruani fjalÃ«kalimin tuaj gabimisht.\n\nShtypni Caps Lock ne tastieren tuaj per te fikur Caps Lock perpara\nse te fusni passwordin tuaj."
+}

Modification de propriÃ©tÃ©s sur dll/win32/credui/lang/credui_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/samsrv/samrpc.c
===================================================================
--- dll/win32/samsrv/samrpc.c	(rÃ©vision 61927)
+++ dll/win32/samsrv/samrpc.c	(copie de travail)
@@ -8047,10 +8047,10 @@
 {
     ENCRYPTED_LM_OWF_PASSWORD StoredLmPassword;
     ENCRYPTED_NT_OWF_PASSWORD StoredNtPassword;
-    PENCRYPTED_LM_OWF_PASSWORD OldLmPassword;
-    PENCRYPTED_LM_OWF_PASSWORD NewLmPassword;
-    PENCRYPTED_NT_OWF_PASSWORD OldNtPassword;
-    PENCRYPTED_NT_OWF_PASSWORD NewNtPassword;
+    ENCRYPTED_LM_OWF_PASSWORD OldLmPassword;
+    ENCRYPTED_LM_OWF_PASSWORD NewLmPassword;
+    ENCRYPTED_NT_OWF_PASSWORD OldNtPassword;
+    ENCRYPTED_NT_OWF_PASSWORD NewNtPassword;
     BOOLEAN StoredLmPresent = FALSE;
     BOOLEAN StoredNtPresent = FALSE;
     BOOLEAN StoredLmEmpty = TRUE;
@@ -8153,22 +8153,63 @@
         if (!NT_SUCCESS(Status))
         {
             TRACE("SampGetObjectAttribute failed to retrieve the fixed domain data (Status 0x%08lx)\n", Status);
-            return Status;
+            goto done;
         }
 
         if (DomainFixedData.MinPasswordAge.QuadPart > 0)
         {
             if (SystemTime.QuadPart < (UserFixedData.PasswordLastSet.QuadPart + DomainFixedData.MinPasswordAge.QuadPart))
-                return STATUS_ACCOUNT_RESTRICTION;
+            {
+                Status = STATUS_ACCOUNT_RESTRICTION;
+                goto done;
+            }
         }
     }
 
-    /* FIXME: Decrypt passwords */
-    OldLmPassword = OldLmEncryptedWithNewLm;
-    NewLmPassword = NewLmEncryptedWithOldLm;
-    OldNtPassword = OldNtEncryptedWithNewNt;
-    NewNtPassword = NewNtEncryptedWithOldNt;
+    /* Decrypt the LM passwords, if present */
+    if (LmPresent)
+    {
+        Status = SystemFunction013((const BYTE *)NewLmEncryptedWithOldLm,
+                                   (const BYTE *)&StoredLmPassword,
+                                   (LPBYTE)&NewLmPassword);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
 
+        Status = SystemFunction013((const BYTE *)OldLmEncryptedWithNewLm,
+                                   (const BYTE *)&NewLmPassword,
+                                   (LPBYTE)&OldLmPassword);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+    }
+
+    /* Decrypt the NT passwords, if present */
+    if (NtPresent)
+    {
+        Status = SystemFunction013((const BYTE *)NewNtEncryptedWithOldNt,
+                                   (const BYTE *)&StoredNtPassword,
+                                   (LPBYTE)&NewNtPassword);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        Status = SystemFunction013((const BYTE *)OldNtEncryptedWithNewNt,
+                                   (const BYTE *)&NewNtPassword,
+                                   (LPBYTE)&OldNtPassword);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+    }
+
     /* Check if the old passwords match the stored ones */
     if (NtPresent)
     {
@@ -8175,7 +8216,7 @@
         if (LmPresent)
         {
             if (!RtlEqualMemory(&StoredLmPassword,
-                                OldLmPassword,
+                                &OldLmPassword,
                                 sizeof(ENCRYPTED_LM_OWF_PASSWORD)))
             {
                 TRACE("Old LM Password does not match!\n");
@@ -8184,7 +8225,7 @@
             else
             {
                 if (!RtlEqualMemory(&StoredNtPassword,
-                                    OldNtPassword,
+                                    &OldNtPassword,
                                     sizeof(ENCRYPTED_LM_OWF_PASSWORD)))
                 {
                     TRACE("Old NT Password does not match!\n");
@@ -8195,7 +8236,7 @@
         else
         {
             if (!RtlEqualMemory(&StoredNtPassword,
-                                OldNtPassword,
+                                &OldNtPassword,
                                 sizeof(ENCRYPTED_LM_OWF_PASSWORD)))
             {
                 TRACE("Old NT Password does not match!\n");
@@ -8208,7 +8249,7 @@
         if (LmPresent)
         {
             if (!RtlEqualMemory(&StoredLmPassword,
-                                OldLmPassword,
+                                &OldLmPassword,
                                 sizeof(ENCRYPTED_LM_OWF_PASSWORD)))
             {
                 TRACE("Old LM Password does not match!\n");
@@ -8225,9 +8266,9 @@
     if (NT_SUCCESS(Status))
     {
         Status = SampSetUserPassword(UserObject,
-                                     NewNtPassword,
+                                     &NewNtPassword,
                                      NtPresent,
-                                     NewLmPassword,
+                                     &NewLmPassword,
                                      LmPresent);
         if (NT_SUCCESS(Status))
         {
Index: dll/win32/samsrv/CMakeLists.txt
===================================================================
--- dll/win32/samsrv/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/samsrv/CMakeLists.txt	(copie de travail)
@@ -19,15 +19,19 @@
     setup.c
     user.c
     utils.c
+    samsrv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c
+    ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c)
+
+add_library(samsrv SHARED
+    ${SOURCE}
     samsrv.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def
-    ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c)
+    ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
 
-add_library(samsrv SHARED ${SOURCE})
 set_module_type(samsrv win32dll UNICODE)
 
 target_link_libraries(samsrv wine ${PSEH_LIB})
 add_importlibs(samsrv msvcrt rpcrt4 advapi32 kernel32 ntdll)
 add_dependencies(samsrv psdk)
+add_pch(samsrv samsrv.h SOURCE)
 add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all)
Index: dll/win32/samsrv/samsrv.rc
===================================================================
--- dll/win32/samsrv/samsrv.rc	(rÃ©vision 61927)
+++ dll/win32/samsrv/samsrv.rc	(copie de travail)
@@ -34,3 +34,6 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
\ No newline at end of file
Index: dll/win32/samsrv/lang/sq-AL.rc
===================================================================
--- dll/win32/samsrv/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/samsrv/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,24 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_DOMAIN_BUILTIN_NAME "NdÃ«rtuar"
+    IDS_GROUP_NONE_NAME "AsnjÃ«"
+    IDS_GROUP_NONE_COMMENT "PÃ«rdorues ZakonshÃ«m"
+    IDS_ALIAS_ADMINISTRATORS_NAME "Administratori"
+    IDS_ALIAS_ADMINISTRATORS_COMMENT "AdministratorÃ«t kanÃ« akses tÃ« pakufizuar nÃ« kompjuter ose domain."
+    IDS_ALIAS_GUESTS_NAME "Vizitor"
+    IDS_ALIAS_GUESTS_COMMENT "VizitorÃ«t kanÃ« tÃ« njÃ«jtat tÃ« drejta e njÃ« anÃ«tarÃ« tÃ« grupit PÃ«rdorues nga parazgjedhje."
+    IDS_ALIAS_POWER_USERS_NAME "PÃ«rdorues tÃ« FuqishÃ«m"
+    IDS_ALIAS_POWER_USERS_COMMENT "PÃ«rdorues tÃ« FuqishÃ«m katÃ« tÃ« drejta administrative me disa kufizime."
+    IDS_ALIAS_USERS_NAME "PÃ«rdoruesit"
+    IDS_ALIAS_USERS_COMMENT "PÃ«rdoruesit janÃ« tÃ« penguar pÃ«r ndryshim bÃ«rje tÃ« gjÃ«rave tÃ« sistemit."
+    IDS_USER_ADMINISTRATOR_NAME "AdministratorÃ«r"
+    IDS_USER_ADMINISTRATOR_COMMENT "Llogaria NdÃ«rtimit tÃ« pÃ«rdorura pÃ«r tÃ« administruar kompjuterin ose domain."
+    IDS_USER_GUEST_NAME "VizitorÃ«"
+    IDS_USER_GUEST_COMMENT "Llogari NdÃ«rtuese pÃ«r akses vizitori nÃ« kompjuter ose domain."
+END

Modification de propriÃ©tÃ©s sur dll/win32/samsrv/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/samsrv/samsrv.h
===================================================================
--- dll/win32/samsrv/samsrv.h	(rÃ©vision 61927)
+++ dll/win32/samsrv/samsrv.h	(copie de travail)
@@ -7,6 +7,9 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
+#ifndef _SAMSRV_PCH_
+#define _SAMSRV_PCH_
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -430,3 +433,11 @@
 WINAPI
 SystemFunction007(PUNICODE_STRING string,
                   LPBYTE hash);
+
+NTSTATUS
+WINAPI
+SystemFunction013(const BYTE *in,
+                  const BYTE *key,
+                  LPBYTE out);
+
+#endif /* _SAMSRV_PCH_ */
Index: dll/win32/rasdlg/rasdlg.rc
===================================================================
--- dll/win32/rasdlg/rasdlg.rc	(rÃ©vision 61927)
+++ dll/win32/rasdlg/rasdlg.rc	(copie de travail)
@@ -58,6 +58,9 @@
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/rasdlg/lang/sq-AL.rc
===================================================================
--- dll/win32/rasdlg/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/rasdlg/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,2377 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+102 DIALOGEX 0, 0, 255, 265
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Numrat alternative Telefoni"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Specifikoni numra telefoni alternative qÃ« ju dÃ«shironi tÃ« pÃ«rdorni pÃ«r tÃ« bÃ«rÃ« kÃ«tÃ« lidhje.", 1018, 7, 5, 243, 16
+    LTEXT "&Numra Telefoni:", 1019, 7, 27, 238, 8
+    CONTROL "", 1012, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000848D, 7, 38, 217, 144
+    PUSHBUTTON "Leviz &lart", 1017, 230, 40, 18, 16, BS_ICON
+    PUSHBUTTON "Leviz &poshtÃ«", 1015, 230, 61, 18, 16, BS_ICON
+    PUSHBUTTON "&Shto...", 1013, 7, 187, 70, 14
+    PUSHBUTTON "&Modifiko...", 1016, 81, 187, 70, 14
+    PUSHBUTTON "&Fshi", 1014, 154, 187, 70, 14
+    AUTOCHECKBOX "NÃ«se &numri dÃ«shton, provo numrin tjetÃ«r", 1011, 8, 210, 243, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&Leviz numrat e suksesshÃ«m nÃ« krye tÃ« listÃ«s", 1010, 8, 228, 243, 10, BS_TOP | BS_MULTILINE
+    DEFPUSHBUTTON "OK", 1, 122, 245, 60, 14
+    PUSHBUTTON "Anulo", 2, 188, 245, 60, 14
+END
+
+103 DIALOGEX 6, 18, 250, 170
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Lidhja Rrjetit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", 1029, 5, 5, 241, 35, NOT WS_GROUP
+    LTEXT "Lidhje:", -1, 5, 46, 238, 10
+    CONTROL "List1", 1677, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 5, 57, 240, 57
+    AUTOCHECKBOX "&Mos mÃ« pyesni pÃ«rsÃ«ri deri nÃ« herÃ«n tjetÃ«r qÃ« unÃ« lidhem", 1022, 8, 125, 235, 10
+    PUSHBUTTON "&CilÃ«sime", 1026, 7, 149, 60, 14
+    DEFPUSHBUTTON "&Lidhu...", 1024, 117, 149, 60, 14
+    PUSHBUTTON "Anulo", 1025, 183, 149, 60, 14
+END
+
+104 DIALOGEX 6, 18, 269, 263
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Gabimet bundling Linje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 32516, 1031, 7, 7, 20, 20
+    LTEXT "NjÃ« ose mÃ« shumÃ« linja tÃ« tjera nuk e lidhÃ«n. ", 1033, 37, 8, 216, 20
+    CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
+    AUTOCHECKBOX "&Mos u pÃ«rpjek me linja tÃ« dÃ«shtuara nÃ« tÃ« ardhmen", 1030, 38, 226, 222, 10
+    DEFPUSHBUTTON "&Prano", 1, 135, 242, 60, 14
+    PUSHBUTTON "&Mbyllu", 2, 201, 242, 60, 14
+    LTEXT "NÃ« qoftÃ« se vetÃ«m njÃ« linjÃ« e vetme tÃ« lidh, serveri nuk mund tÃ« jetÃ« konfiguruar pÃ«r tÃ« pranuar thirrje multi-link. Kontrollo 'Mos u pÃ«rpiqni me linjat e dÃ«shtuara' pÃ«r tÃ« shmangur akuza tÃ« panevojshme tÃ« lidhjes nÃ« njÃ« rast tÃ« tillÃ«.", -1, 37, 36, 224, 44
+END
+
+105 DIALOGEX 0, 0, 261, 253
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«sime Sigurie Avancuara"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Siguria Hyrjes", 1547, 7, 33, 246, 191
+    LTEXT "&Kriptim T'dhanash:", 1546, 7, 5, 247, 10
+    COMBOBOX 1495, 7, 17, 247, 76, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    AUTORADIOBUTTON "PÃ«rdor &Protokolli Zgjatur VÃ«rtetimit (EAP)", 1544, 17, 47, 226, 8, WS_GROUP
+    LTEXT "EAP Tipi", -1, 18, 64, 35, 8, NOT WS_VISIBLE | NOT WS_GROUP
+    COMBOBOX 1034, 53, 62, 191, 42, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "Karakteristikat", 1035, 184, 77, 60, 14
+    AUTORADIOBUTTON "Lejo kÃ«eto &protokolle", 1545, 17, 92, 224, 10
+    AUTOCHECKBOX "&FjalÃ«kalime tÃ« Pakrituara (PAP)", 1491, 28, 105, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTOCHECKBOX "Protokolli i VÃ«rtetimit FjalÃ«kalimeve &Shiva (SPAP)", 1496, 28, 119, 214, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "Sfido Protokollin e Vertetimit ShtrongimDuarsh (CHAP)", 1494, 28, 133, 215, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&MS CHAP (MS-CHAP)", 1493, 28, 148, 212, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "Lejo versione tÃ« vjetra MS-CHAP pÃ«r &Win 95 servers", 200, 46, 162, 198, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "M&icrosoft CHAP Versioni 2 (MS-CHAP v2)", 1492, 28, 176, 200, 10, BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 28, 189, 208, 1
+    AUTOCHECKBOX "&PÃ«r protokollet bazÃ« MS-CHAP , pÃ«rdor emrin e pÃ«rdoruesit dhe fjalÃ«kalimin e ReactOS (dhe domain nÃ«se ka)", 1549, 28, 195, 213, 24, BS_TOP | BS_MULTILINE
+    DEFPUSHBUTTON "OK", 1, 127, 232, 60, 14
+    PUSHBUTTON "Anulo", 2, 192, 232, 60, 14
+END
+
+106 DIALOGEX 6, 18, 255, 109
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Lidhja Kompletua"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "OK", 1, 97, 91, 60, 14
+    ICON 563, 1046, 7, 7, 20, 20
+    LTEXT "'Emri lidhjes' Ã«shtÃ« lidhur tani.", 1047, 40, 7, 212, 16
+    LTEXT "PÃ«r tÃ« kontrolluar statusin e kÃ«saj lidhje ose shkÃ«putje, klikim-djathtÃ« ikonÃ«n e saj nÃ« dosje Lidhjet Rrjetit, ose klikoni ikonÃ«n e saj nÃ« tabelÃ«n menuse (nÃ«se Ã«shtÃ« i pranishÃ«m).", -1, 40, 30, 212, 34
+    AUTOCHECKBOX "&Mos e shfaq kÃ«tÃ« mesazh pÃ«rsÃ«ri", 1045, 40, 69, 212, 10, BS_TOP | BS_MULTILINE
+END
+
+107 DIALOGEX 0, 0, 258, 167
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Numri telefonit", 1053, 7, 5, 243, 92
+    LTEXT "&Area code:", 1055, 18, 17, 54, 8
+    COMBOBOX 1049, 17, 30, 55, 129, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&Numri telefonit:", 1057, 77, 17, 166, 8, NOT WS_GROUP
+    EDITTEXT 1051, 77, 30, 163, 14, ES_AUTOHSCROLL
+    LTEXT "&Shteti/kodi rajonit:", 1056, 18, 48, 221, 8, NOT WS_GROUP
+    COMBOBOX 1054, 17, 61, 224, 93, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "&PÃ«rdor rregullat e thirrjes", 1048, 20, 81, 219, 10, BS_TOP | BS_MULTILINE
+    GROUPBOX "Ko&mento", 1052, 7, 102, 243, 36
+    EDITTEXT 1050, 17, 115, 224, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 127, 147, 60, 14
+    PUSHBUTTON "Anulo", 2, 191, 147, 60, 14
+END
+
+108 DIALOGEX 6, 18, 222, 104
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Ndrysho FjalÃ«kalimi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "FjalÃ«kalimi juaj nÃ« rrjet tÃ« largÃ«t ka skaduar. Shkruani fjalÃ«kalimin, pastaj shtypni OK pÃ«r tÃ« vendosur njÃ« tÃ« ri.", 1062, 7, 5, 210, 24
+    LTEXT "&FjalÃ«kalimi i'ri:", 1064, 8, 43, 108, 8
+    EDITTEXT 1060, 118, 38, 98, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Konfirmo fjalÃ«kalimi i'ri:", 1061, 8, 61, 102, 8
+    EDITTEXT 1058, 118, 57, 98, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 90, 84, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 154, 84, 60, 14
+END
+
+109 DIALOGEX 6, 18, 223, 122
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Ndrysho FjalÃ«kalimi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "FjalÃ«kalimi juaj nÃ« rrjet tÃ« largÃ«t ka skaduar. Shkruani fjalÃ«kalimin, pastaj shtypni OK pÃ«r tÃ« vendosur njÃ« tÃ« ri.", 1062, 7, 5, 212, 29
+    LTEXT "&FjalÃ«kalimi vjetÃ«r:", 1063, 7, 42, 108, 8
+    EDITTEXT 1059, 116, 38, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalimi i'ri:", 1064, 7, 60, 108, 8
+    EDITTEXT 1060, 116, 56, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Konfirmo fjalÃ«kalimi i'ri:", 1061, 7, 78, 108, 8
+    EDITTEXT 1058, 116, 74, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 92, 101, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 156, 101, 60, 14
+END
+
+110 DIALOGEX 12, 16, 230, 105
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "ThirreMbrapa "
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ju keni 'Vendoset nga telefonuesi'  privilegjet e thirre mbrapa nÃ« server. Shtypni OK dhe serveri do t'ju thirrÃ« mbrapa nÃ« numrin e mÃ«poshtÃ«m. Shtypni Anulo pÃ«r tÃ« kaluar sÃ« thirruri mbrapa.", 1066, 5, 5, 221, 39, SS_NOPREFIX
+    LTEXT "&Enter your modem's phone number:", 1067, 5, 46, 222, 8, NOT WS_GROUP
+    EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 164, 85, 60, 14
+END
+
+111 DIALOGEX 6, 19, 265, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Gabim ne Lidhjen me %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 32515, 1068, 7, 7, 20, 20, WS_GROUP
+    LTEXT "", 1070, 34, 7, 226, 105
+    DEFPUSHBUTTON "Mos i bjer=88", 1, 4, 117, 128, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 136, 117, 60, 14
+    PUSHBUTTON "&MÃ« shum Info", 1069, 200, 117, 60, 14
+END
+
+112 DIALOGEX 6, 18, 263, 219
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Thirrje dhe Mbyllje Automatike"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ReactOS automatikisht mund tÃ« thÃ«rras dhe tÃ« ul pajisjen e receptorit tÃ« telefonit nÃ« varÃ«si tÃ« qfarÃ« informacion Ã«shtÃ« duke u dÃ«rguar dhe marrÃ«.", 1085, 9, 7, 253, 30
+    GROUPBOX "Thirrje Automatike", -1, 6, 38, 249, 71
+    LTEXT "Thirr njÃ« tjetÃ«r linjÃ« kur kjo lidhje plotÃ«son dy kushtet e mÃ«poshtme:", 1083, 16, 51, 237, 16, NOT WS_GROUP
+    LTEXT "Aktivizo tÃ« &paktÃ«n:", -1, 16, 73, 100, 8
+    COMBOBOX 1079, 117, 70, 60, 100, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&KohÃ«zgjatja tÃ« paktÃ«n:", 1084, 16, 92, 99, 8, NOT WS_GROUP
+    COMBOBOX 1080, 117, 89, 90, 162, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "Mbyllje Automatike", -1, 6, 113, 248, 81
+    LTEXT "Mbyll pajisjet qÃ« pÃ«rdoren pÃ«r kÃ«tÃ« lidhje kur ajo i plotÃ«son tÃ« dy kushtet e mÃ«poshtme:", 1086, 16, 127, 230, 18, NOT WS_GROUP
+    LTEXT "Aktivitet jo mÃ« shumÃ« se:", -1, 16, 150, 92, 8
+    COMBOBOX 1081, 115, 146, 60, 100, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "KohÃ«zgjatja tÃ« paktÃ«n:", 1087, 16, 168, 92, 8, NOT WS_GROUP
+    COMBOBOX 1082, 115, 166, 90, 151, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    DEFPUSHBUTTON "OK", 1, 131, 199, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 194, 199, 60, 14
+END
+
+113 DIALOGEX 21, 46, 225, 65
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Duke u Lidhur %1..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 563, 1417, 7, 7, 20, 20
+    LTEXT "", 1097, 36, 7, 185, 35, SS_NOPREFIX
+    PUSHBUTTON "Anulo", 2, 83, 47, 60, 14
+END
+
+114 DIALOGEX 6, 18, 225, 60
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Rrjeti Merr-tel"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 563, 1098, 7, 6, 20, 20, WS_GROUP
+    LTEXT "PÃ«rpjekja merr-automatiksiht dÃ«shtoi. A doni tÃ« Ã§aktivizoni merr-automatikisht nga ky vend?", 1099, 40, 6, 181, 34, NOT WS_GROUP
+    PUSHBUTTON "&Po", 1, 60, 42, 50, 14
+    DEFPUSHBUTTON "&Jo", 2, 115, 42, 50, 14
+END
+
+115 DIALOGEX 0, 0, 263, 124
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 263, 50
+    LTEXT "Bjeri:", 1412, 9, 60, 68, 8
+    COMBOBOX 1416, 88, 56, 165, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Bjeri &nga:", 1415, 9, 77, 71, 8
+    COMBOBOX 1414, 88, 75, 89, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Regullat telefonates", 1108, 181, 75, 72, 14
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 96, 245, 1
+    DEFPUSHBUTTON "&Bjeri", 1590, 8, 103, 61, 14
+    PUSHBUTTON "Anulo", 1591, 70, 103, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 132, 103, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 194, 103, 60, 14
+END
+
+116 DIALOGEX 0, 0, 265, 176
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 8, 60, 88, 8
+    EDITTEXT 1104, 103, 57, 154, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1112, 8, 79, 88, 8
+    EDITTEXT 1103, 103, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 8, 97, 248, 1
+    AUTOCHECKBOX "&Ruaj kÃ«tÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim pÃ«r pÃ«rdoruesit e mÃ«poshtme:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "VetÃ«m unÃ«", 1622, 26, 120, 226, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&Kushdo qÃ« e pÃ«rdor kÃ«tÃ« kompjuter", 1623, 26, 134, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 149, 248, 1
+    DEFPUSHBUTTON "&Bjeri", 1590, 8, 156, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 1591, 71, 156, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 133, 156, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 195, 156, 60, 14
+END
+
+117 DIALOGEX 0, 0, 263, 192
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 9, 61, 92, 8
+    EDITTEXT 1104, 102, 57, 154, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1112, 9, 80, 92, 8
+    EDITTEXT 1103, 102, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "Do&main:", 1110, 9, 99, 91, 8
+    EDITTEXT 1102, 102, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 9, 116, 247, 1
+    AUTOCHECKBOX "&Ruaj kÃ«tÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim pÃ«r pÃ«rdoruesit e mÃ«poshtme:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "VetÃ«m unÃ«", 1622, 25, 137, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&Kushdo qÃ« e pÃ«rdor kÃ«tÃ« kompjuter", 1623, 25, 151, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 167, 247, 1
+    DEFPUSHBUTTON "&Bjeri", 1590, 8, 173, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 1591, 71, 173, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 133, 173, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 195, 173, 60, 14
+END
+
+118 DIALOGEX 0, 0, 265, 220
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 61, 92, 8
+    EDITTEXT 1104, 104, 57, 154, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1112, 10, 80, 92, 8
+    EDITTEXT 1103, 104, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "Do&main:", 1110, 10, 100, 92, 8
+    EDITTEXT 1102, 104, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 11, 116, 247, 1
+    AUTOCHECKBOX "&Ruaj kÃ«tÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim pÃ«r pÃ«rdoruesit e mÃ«poshtme:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "VetÃ«m unÃ«", 1622, 29, 139, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&Kushdo qÃ« e pÃ«rdor kÃ«tÃ« kompjuter", 1623, 29, 152, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 167, 247, 1
+    LTEXT "Bjeri:", 1412, 10, 177, 90, 8
+    COMBOBOX 1416, 102, 173, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 192, 247, 1
+    DEFPUSHBUTTON "&Bjeri", 1590, 10, 199, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 1591, 72, 199, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 134, 199, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 196, 199, 60, 14
+END
+
+119 DIALOGEX 0, 0, 265, 200
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 62, 91, 8
+    EDITTEXT 1104, 104, 58, 154, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1112, 10, 81, 92, 8
+    EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 97, 247, 1
+    AUTOCHECKBOX "&Ruaj kÃ«tÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim pÃ«r pÃ«rdoruesit e mÃ«poshtme:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "VetÃ«m unÃ«", 1622, 24, 117, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&ushdo qÃ« e pÃ«rdor kÃ«tÃ« kompjuter", 1623, 24, 132, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 147, 247, 1
+    LTEXT "Bjeri:", 1412, 13, 157, 88, 8
+    COMBOBOX 1416, 103, 154, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 173, 247, 1
+    DEFPUSHBUTTON "&Bjeri", 1590, 10, 180, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 1591, 72, 180, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 134, 180, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 197, 180, 60, 14
+END
+
+121 DIALOGEX 6, 18, 230, 131
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "ISDN Konfigurim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Tipi linjes:", 1155, 9, 9, 65, 8
+    COMBOBOX 1153, 76, 7, 148, 42, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    AUTOCHECKBOX "&Negocimi llojit linjÃ«s", 1150, 23, 26, 199, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    GROUPBOX "    ", 1152, 8, 48, 214, 51, WS_GROUP
+    AUTOCHECKBOX "&PÃ«rdorimi protokoll e vjetÃ«r tÃ« cilÃ«simeve", 1149, 17, 48, 102, 10, BS_TOP | BS_MULTILINE
+    LTEXT "&Kanale pÃ«r pÃ«rdorim:", 1154, 16, 65, 100, 8, NOT WS_GROUP
+    EDITTEXT 1151, 119, 61, 94, 14, ES_AUTOHSCROLL
+    AUTOCHECKBOX "&Aktivizo kompresimin e pajisjeve lektronike", 1148, 16, 82, 198, 10, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "OK", 1, 99, 109, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 163, 109, 60, 14
+END
+
+122 DIALOGEX 6, 18, 220, 68
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "ISDN Konfigurim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Tipi linjes:", 1155, 9, 11, 55, 8
+    COMBOBOX 1153, 67, 7, 148, 43, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    AUTOCHECKBOX "&Negocimi llojit linjÃ«s", 1150, 21, 28, 194, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    PUSHBUTTON "OK", 1, 90, 49, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 154, 49, 60, 14
+END
+
+123 DIALOGEX 11, 20, 350, 275
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT 1161, 5, 5, 338, 236, ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL | WS_GROUP
+    LTEXT "Adresa I&P:", 1163, 7, 253, 68, 8
+    CONTROL "", 1160, "RASIPADDRESS", WS_TABSTOP, 76, 250, 117, 14
+    DEFPUSHBUTTON "", 1162, 197, 252, 16, 13, NOT WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    PUSHBUTTON "&e'bÃ«rÃ«", 1, 219, 252, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 283, 252, 60, 14
+END
+
+124 DIALOGEX 6, 17, 350, 266
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT 1161, 5, 4, 340, 236, ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL | WS_GROUP
+    DEFPUSHBUTTON "", 1162, 7, 247, 50, 14, NOT WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP
+    PUSHBUTTON "&e'bÃ«rÃ«", 1, 222, 247, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 286, 247, 60, 14
+END
+
+125 DIALOGEX 12, 16, 261, 190
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Modem Konfigurim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 15102, 1238, 7, 7, 20, 20
+    LTEXT "Modem", -1, 25, 27, 24, 8, NOT WS_VISIBLE | NOT WS_GROUP
+    EDITTEXT 1235, 40, 7, 214, 16, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT "ShpejtÃ«si &Maximale (bps):", 1243, 7, 36, 110, 8
+    COMBOBOX 1239, 119, 34, 136, 186, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&protokolli Modemit", 1244, 7, 52, 111, 8
+    COMBOBOX 1245, 119, 50, 136, 186, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "Paraqitje pjesÃ«ve elektronike", 1237, 6, 70, 248, 61, WS_GROUP
+    AUTOCHECKBOX "MundÃ«so kontrollin e rrjedhjes pjesÃ«ve elektronike", 1232, 19, 82, 217, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "MundÃ«so kontrollin gabimeve tÃ« modemit", 1231, 19, 98, 217, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "MundÃ«so ngjeshjen e m&odemit", 1229, 19, 115, 217, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&Shfaq dritaren e terminalit", 1234, 8, 136, 246, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "MundÃ«so boxet e mo&demit", 1230, 8, 151, 247, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    DEFPUSHBUTTON "OK", 1, 129, 171, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 194, 171, 60, 14
+END
+
+126 DIALOGEX 0, 0, 270, 117
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Zgjidhni Llojin e Komponenteve tÃ« Rrjetit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kliko llojin e komponentit tÃ« rrjetit qÃ« dÃ«shironi tÃ« instaloni:", -1, 8, 7, 258, 8
+    CONTROL "", 1251, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 8, 20, 188, 58
+    GROUPBOX "", -1, 8, 81, 188, 30
+    LTEXT "", 1250, 12, 90, 177, 17
+    DEFPUSHBUTTON "&Shto...", 1252, 205, 20, 60, 14
+    PUSHBUTTON "Anulo", 2, 205, 38, 60, 14
+END
+
+127 DIALOGEX 16, 20, 260, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "NetWare ose Lidhjet Compatible"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 32515, 1278, 7, 7, 21, 20, WS_GROUP
+    LTEXT "Ju keni lidhje njÃ« rrjet NetWare compatible. KÃ«to lidhje do tÃ« jenÃ« tÃ« mbyllura kur lidhja PPP IPX Ã«shtÃ« themeluar.", 1279, 42, 7, 215, 37
+    LTEXT "Para se tÃ« formoni i numrin, pÃ«r tÃ« shmangur humbjen e tÃ« dhÃ«nave, ose mbyllni tÃ« gjitha dosjet duke pÃ«rdorur kÃ«tÃ« lidhje ose zgjidhni IPX nÃ« parametrat e Protokollit tÃ« rrjetit hyrjes.", 1280, 42, 46, 215, 38, NOT WS_GROUP
+    AUTOCHECKBOX "&Mos e shfaq kÃ«tÃ« mesazh nÃ« tÃ« ardhmen", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    DEFPUSHBUTTON "OK", 1, 65, 112, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 134, 112, 60, 14
+END
+
+128 DIALOGEX 7, 22, 236, 90
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Bjeri Manualisht"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Merr telefonin dhe thirrni (ose kÃ«rkoni operatorit tÃ« thirrni). Pas formimit tÃ« numrit plotÃ«sisht, klikoni OK. DÃ«gjoni telefonin derisa tÃ« heshtin, dhe pastaj e mbyllni.", 1281, 8, 8, 219, 32
+    LTEXT "Numri Telefonit:", 1282, 8, 46, 91, 8
+    LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP
+    DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 168, 70, 60, 14
+END
+
+129 DIALOGEX 6, 20, 260, 85
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Protokolli Rrjeti Lidhja e Rezultateve"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 32516, 1328, 7, 7, 21, 20, WS_GROUP
+    LTEXT "", 1329, 38, 7, 216, 24, NOT WS_GROUP
+    AUTOCHECKBOX "&Mos kÃ«rkoni protokollet tÃ« dÃ«shtuar herÃ«n tjetÃ«r", 1327, 40, 44, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    PUSHBUTTON "&Prano", 1, 129, 64, 60, 14
+    PUSHBUTTON "&Prano", 2, 193, 64, 60, 14
+END
+
+133 DIALOGEX 6, 18, 231, 211
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "X.25 CilÃ«sime Hyrese"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni ofruesin e rrjetit tuaj X.25 dhe shkruani adresÃ«n X.121 e server nÃ« distancÃ«:", 1408, 7, 4, 220, 27
+    LTEXT "&Rrjeti:", 1410, 9, 35, 213, 8, NOT WS_GROUP
+    COMBOBOX 1406, 9, 46, 215, 125, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "X.121&adresa:", 1407, 9, 66, 213, 8, NOT WS_GROUP
+    EDITTEXT 1402, 8, 77, 215, 14, ES_AUTOHSCROLL
+    GROUPBOX "Fakultative", 1405, 8, 95, 215, 79
+    LTEXT "&T'dhÃ«nat PÃ«rdoruesit:", 1411, 19, 109, 182, 8, NOT WS_GROUP
+    EDITTEXT 1404, 19, 120, 193, 14, ES_AUTOHSCROLL
+    LTEXT "&LehtÃ«sira:", 1409, 19, 138, 182, 8, NOT WS_GROUP
+    EDITTEXT 1403, 19, 149, 193, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 100, 189, 60, 14
+    PUSHBUTTON "Anulo", 2, 164, 189, 60, 14
+END
+
+146 DIALOGEX 6, 18, 230, 210
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Thirr-Auto"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NÃ«se ju do tÃ« shkÃ«puteni nga njÃ« rrjet, thirr-auto pÃ«rpiqet pÃ«r tu lidhur nÃ« njÃ« rrjet sa herÃ« qÃ« ju tÃ« pÃ«rpiqeni pÃ«r tÃ« hyrÃ« nÃ« informacionin e largÃ«t.", -1, 7, 4, 219, 32
+    LTEXT "&MundÃ«so thirr-auto me vendndodhje:", 1006, 8, 42, 213, 8
+    CONTROL "", 1004, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000C401, 7, 53, 216, 109
+    AUTOCHECKBOX "PÃ«rhere pyet para thirr-automa", 1496, 8, 170, 218, 9, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&Gjzmto thirr-auto ndÃ«rsa unÃ« jam i lidhur", 1550, 8, 185, 217, 9, BS_TOP | BS_MULTILINE
+END
+
+147 DIALOGEX 6, 18, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Formo Numrin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "kÃ«to preferenca zbatohet pÃ«r 'Login pÃ«rdorur Dial-Up Networking' nÃ« Ctrl-Alt-Del login. Ju, si njÃ« administrator, tÃ« kenÃ« qasje nÃ« kÃ«tÃ« fletÃ«.", 1007, 7, 4, 221, 40, NOT WS_GROUP
+    LTEXT "&Numri i pÃ«rpjekjeve bjeri-prap:", 1005, 7, 55, 154, 8
+    EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL
+    LTEXT "&Sekonda ndÃ«rmjet pÃ«rpjekjeve bjeri-prap:", 1009, 7, 73, 156, 8, NOT WS_GROUP
+    EDITTEXT 1003, 164, 70, 60, 14, ES_AUTOHSCROLL
+    LTEXT "Sekonda pushim para se ta mbyllesh:", 1008, 7, 91, 154, 8, NOT WS_GROUP
+    EDITTEXT 1002, 164, 88, 60, 14, ES_AUTOHSCROLL
+END
+
+148 DIALOGEX 6, 18, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Thirr Prapa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kur ju thirrni nÃ« njÃ« server, ajo mund tÃ« ofrojÃ« pÃ«r t'ju thÃ«rras prapa pÃ«r tÃ« reduktuar faturat e telefonit tuaj. Specifikoni nÃ«se doni thirrjen prap. (Thirrja prapa nuk Ã«shtÃ« i mbÃ«shtetur pÃ«r lidhjet e rrjeteve virtual private (VPN).)", 1043, 8, 4, 219, 43
+    AUTORADIOBUTTON "&Ho Thirrjes-prapa", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "MÃ« pyet gjatÃ« thirrjeve kur serveri ofron", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE
+    AUTORADIOBUTTON "PÃ«rhere mÃ« thirr prapa tek numrat(Ã«) mÃ« poshtÃ«:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE
+    CONTROL "", 1037, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 16, 88, 204, 94
+    PUSHBUTTON "&Modifiko...", 1039, 96, 190, 60, 14
+    PUSHBUTTON "&Delete", 1038, 159, 190, 60, 14
+END
+
+149 DIALOGEX 6, 18, 317, 142
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ju duhet tÃ« vendosni formo-nÃ« kredencialet qÃ« ruterat e largÃ«t do tÃ« pÃ«rdorin kur lidhen me kÃ«tÃ« ndÃ«rfaqe. NjÃ« llogari pÃ«rdoruesi do tÃ« krijohet nÃ« kÃ«tÃ« router me informacionin qÃ« ju tÃ« hyni kÃ«tu.", 1094, 8, 5, 307, 35
+    LTEXT "&PÃ«rdorues:", 1078, 8, 47, 124, 8, NOT WS_GROUP
+    EDITTEXT 1074, 135, 45, 175, 12, ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT "&FjalÃ«kalim:", 1077, 8, 68, 124, 8, NOT WS_GROUP
+    EDITTEXT 1073, 135, 66, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Konfirmo fjalÃ«kalimin:", 1075, 8, 90, 124, 8, NOT WS_GROUP
+    EDITTEXT 1071, 135, 87, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL
+END
+
+150 DIALOGEX 6, 18, 321, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ju duhet tÃ« vendosni mbyllni-nÃ« kredencialet qÃ« ruoterat e largÃ«t do tÃ« pÃ«rdorin kur lidhen me kÃ«tÃ« ndÃ«rfaqe. KÃ«to kredencialet duhen tÃ« pÃ«rputhen me formo nÃ« kredencialet e konfiguruara nÃ« routerin e largÃ«t.", 1094, 8, 5, 308, 33
+    LTEXT "&PÃ«rdorues:", 1096, 8, 43, 130, 8, NOT WS_GROUP
+    EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL
+    LTEXT "&Domain:", 1093, 8, 63, 130, 8, NOT WS_GROUP
+    EDITTEXT 1089, 140, 60, 175, 12, ES_UPPERCASE | ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1095, 8, 81, 130, 8, NOT WS_GROUP
+    EDITTEXT 1090, 140, 78, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Konfirmo fjalÃ«kalimin:", 1092, 8, 99, 130, 8, NOT WS_GROUP
+    EDITTEXT 1088, 140, 96, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL
+END
+
+153 DIALOGEX 0, 0, 315, 140
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruaj njÃ« emÃ«r qÃ« ju dÃ«shironi pÃ«r kÃ«tÃ« lidhje:", -1, 8, 4, 190, 8
+    EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL
+    LTEXT "Kliko Mbaro pÃ«r tÃ« ruajtur atÃ« nÃ« dosjen Lidhjes Rrjetit.", -1, 8, 38, 193, 8
+    LTEXT "PÃ«r tÃ« ndryshuar kÃ«tÃ« lidhje mÃ« vonÃ«, zgjidhni atÃ«, klikoni dokumentin menu, dhe pastaj klikoni Karakteristikat.", -1, 8, 58, 193, 16
+END
+
+155 DIALOGEX 0, 0, 231, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "CilÃ«sime"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Lidhu pÃ«rdor:", 1124, 7, 5, 219, 8
+    CONTROL "", 1128, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00004C0D, 7, 17, 198, 44, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&Lart", 1132, 210, 18, 16, 14, BS_ICON
+    PUSHBUTTON "&PoshtÃ«", 1131, 210, 36, 16, 14, BS_ICON
+    AUTOCHECKBOX "T'gjithÃ« pajisjet telefononi tÃ« njÃ«jtin numer", 1119, 9, 66, 133, 14, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "K&onfiguro..", 1130, 144, 66, 60, 14
+    GROUPBOX "Tipi shÃ«mbullit", 1125, 8, 84, 215, 100, WS_GROUP
+    LTEXT "Kodi zonÃ«s:", 1133, 17, 102, 52, 8
+    COMBOBOX 1122, 17, 112, 52, 110, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&Numri telefonit:", 1135, 71, 102, 139, 8
+    EDITTEXT 1123, 73, 112, 79, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "Alter&noj", 1129, 154, 112, 60, 14
+    LTEXT "Shteti/Kodi ra&jonal:", 1134, 17, 132, 197, 8
+    COMBOBOX 1126, 17, 143, 193, 130, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "PÃ«rdor rregullat telefonuese", 1121, 17, 163, 132, 14, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "&Rregullat telefonike", 1136, 151, 161, 60, 14
+    AUTOCHECKBOX "Shfaq ikonÃ«n nÃ« zonÃ«n e njoftimit kur i lidhur", 1120, 10, 192, 214, 19, BS_TOP | BS_MULTILINE
+END
+
+156 DIALOGEX 0, 0, 231, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "CilÃ«sime"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "K&onfiguro...", 1130, 164, 38, 60, 14
+    GROUPBOX "Tipi shÃ«mbullit", 1125, 8, 55, 217, 100, WS_GROUP
+    LTEXT "Kodi zonÃ«s:", 1133, 17, 72, 48, 8
+    COMBOBOX 1122, 17, 83, 48, 119, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&Numri telefonit:", 1135, 71, 72, 146, 8
+    EDITTEXT 1123, 71, 83, 81, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "Alter&naoj", 1129, 155, 83, 63, 14
+    LTEXT "Shteti/Kodi ra&jonal:", 1134, 17, 103, 193, 8
+    COMBOBOX 1126, 17, 114, 201, 130, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "PÃ«rdor rregullat telefonuese", 1121, 19, 134, 136, 12, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "&Rregullat telefonike", 1136, 157, 132, 60, 14
+    AUTOCHECKBOX "Trego ikonÃ«n nÃ« zonÃ«n e njoftimit kur i lidhur", 1120, 12, 164, 209, 18, BS_TOP | BS_MULTILINE
+    LTEXT "Lidhu pÃ«rdor:", 1124, 8, 5, 217, 8
+    CONTROL "", 1127, "SYSLISTVIEW32", WS_DISABLED | WS_BORDER | 0x0000EC0D, 7, 18, 217, 15
+END
+
+157 DIALOGEX 6, 18, 235, 160
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Aparenca"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "&Numrat e telefonit shikim paraprak para telefonates", 1142, 8, 10, 224, 10, WS_GROUP
+    AUTOCHECKBOX "Trego cilÃ«simet e vendndodhjes para formimit tÃ« numrit", 1139, 8, 27, 224, 10
+    AUTOCHECKBOX "Lejo redaktimet vend gjatÃ« hyrjes", 1140, 21, 43, 212, 10
+    AUTOCHECKBOX "Shfaq &progresin lidhjes, ndÃ«rsa formoni numrin", 1143, 8, 59, 224, 10
+    AUTOCHECKBOX "Mbylle nÃ« formim tÃ« numrit", 1137, 8, 76, 224, 10
+    AUTOCHECKBOX "Lejo redaktimet Librit numrave gjatÃ« hyrjes", 1141, 8, 94, 224, 10
+    AUTOCHECKBOX "&PÃ«rdorimi magjistar pÃ«r tÃ« krijuar tÃ« hyrje tÃ« re nÃ« librin numrave", 1144, 22, 111, 210, 10
+END
+
+158 DIALOGEX 6, 18, 235, 160
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Aparenca"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "&Numrat e telefonit shikim paraprak para telefonates", 1142, 8, 10, 223, 10, WS_GROUP
+    AUTOCHECKBOX "Trego cilÃ«simet e vendndodhjes para formimit tÃ« numrit", 1139, 8, 27, 206, 10
+    AUTOCHECKBOX "Fillo monitorimin e rrjetit telefono para thirrjes telefonuse", 1138, 8, 44, 226, 10
+    AUTOCHECKBOX "Shfaq &progresin lidhjes, ndÃ«rsa formoni numrin", 1143, 8, 61, 224, 10
+    AUTOCHECKBOX "Mbylle nÃ« formim tÃ« numrit", 1137, 8, 79, 220, 10
+    AUTOCHECKBOX "&PÃ«rdorimi magjistar pÃ«r tÃ« krijuar tÃ« hyrje tÃ« re nÃ« librin numrave", 1144, 8, 97, 220, 10
+    AUTOCHECKBOX "pÃ«rhere shfaq para thirrjes telefonike", 1136, 8, 114, 220, 10
+END
+
+160 DIALOGEX 6, 18, 320, 145
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni njÃ« emÃ«r pÃ«r kÃ«tÃ« ndÃ«rfaqe kÃ«rkese telefonuese. NjÃ« praktikÃ« e zakonshme Ã«shtÃ« tÃ« emrÃ«rojmÃ« ndÃ«rfaqen pas rrjetit apo router-it pÃ«r tÃ« cilÃ«n ata lidhen.", 1158, 7, 5, 309, 29
+    LTEXT "Emri &NdÃ«rfaqes:", 1159, 17, 41, 285, 8, NOT WS_GROUP
+    EDITTEXT 1157, 17, 53, 284, 12, ES_AUTOHSCROLL
+    AUTOCHECKBOX "UnÃ« i di tÃ« gjitha pÃ«r ndÃ«rfaqettÃ« kÃ«rkesÃ«s-telefono dhe mÃ« parÃ« do tÃ« redaktoni cilÃ«simet direkt", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED
+END
+
+162 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Siguria"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Opsionet SigurisÃ«", 1580, 8, 3, 215, 139
+    AUTORADIOBUTTON "&Tipike (cilÃ«simet rekomanduara)", 1540, 14, 16, 201, 9, BS_NOTIFY | WS_GROUP
+    AUTORADIOBUTTON "A&vancuar (cilÃ«simet parazgjedhura)", 1541, 14, 102, 198, 8, BS_NOTIFY
+    LTEXT "&Vlereso identitetin tim si vijon:", 1537, 26, 29, 187, 8, NOT WS_GROUP
+    COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "Automatikisht pÃ«rdor emrin tim hzres ReactOS dhe fjalÃ«kalimin (dhe domain nÃ«se ka)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "KÃ«rkojnÃ« tÃ« dhÃ«nat kryptuara (shkÃ«putu nÃ«se ska)", 1169, 26, 82, 183, 10, BS_TOP | BS_MULTILINE
+    LTEXT "Duke pÃ«rdorur kÃ«to cilÃ«sime kÃ«rkoni njÃ« njohuri tÃ« protokolleve tÃ« sigurisÃ«.", 1539, 15, 114, 134, 20
+    PUSHBUTTON "&CilÃ«sime...", 1180, 151, 115, 60, 14
+    GROUPBOX "Hzrje interaktive dhe e shkruar", 1177, 8, 146, 215, 62, WS_GROUP
+    AUTOCHECKBOX "S&hfaq dritaren e terminalit", 1173, 14, 159, 198, 11, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "Ekzekuto skriptin:", 1172, 14, 172, 57, 10, BS_TOP | BS_MULTILINE
+    COMBOBOX 1179, 72, 171, 140, 104, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Modifiko...", 1182, 87, 187, 60, 14
+    PUSHBUTTON "&Shfleto...", 1181, 151, 187, 60, 14
+END
+
+163 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ju keni mÃ« shumÃ« se njÃ« pajisje telefonuse nÃ« kompjuterin tuaj.", -1, 6, 3, 307, 13
+    LTEXT "&Zgjidhni pajisjet pÃ«r tÃ« pÃ«rdorur nÃ« lidhje me kÃ«tÃ«:", -1, 6, 15, 307, 11
+    CONTROL "", 1228, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C415, 7, 28, 304, 77
+END
+
+165 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Rrjeti"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Tip&i telefonues i serverit qÃ« po thirr:", 1583, 7, 4, 219, 8
+    COMBOBOX 1418, 7, 17, 215, 46, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&CilÃ«sime", 1419, 160, 35, 60, 14
+    LTEXT "Kjo lidhje pÃ«rdorÃ« artikujt e mÃ«poshtÃ«m:", 1684, 8, 64, 219, 10
+    CONTROL "", 1251, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C40D, 7, 75, 216, 53
+    PUSHBUTTON "I&nstalo...", 1252, 7, 133, 67, 14
+    PUSHBUTTON "&Ã‡'install", 1254, 80, 133, 67, 14
+    PUSHBUTTON "CilÃ«sime", 1253, 153, 133, 67, 14
+    GROUPBOX "PÃ«rshkrime", 1585, 9, 158, 213, 43
+    LTEXT "", 1250, 18, 167, 195, 25
+END
+
+166 DIALOGEX 6, 18, 320, 145
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruani adresÃ«n IP tÃ« njÃ« DNS ose WINS serveri nÃ« rrjetin e largÃ«t, ose lÃ«re si 0.0.0.0 nÃ«se ju presin router-in e largÃ«t pÃ«r t'i pajisur ato, apo nuk e di.", 1275, 7, 2, 311, 25
+    LTEXT "&DNS server:", 1274, 7, 29, 160, 8, NOT WS_GROUP
+    CONTROL "", 1272, "RASIPADDRESS", WS_TABSTOP, 21, 41, 85, 12
+    LTEXT "&WINS server:", 1276, 7, 65, 166, 8, NOT WS_GROUP
+    CONTROL "", 1273, "RASIPADDRESS", WS_TABSTOP, 21, 77, 85, 12
+END
+
+167 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Alternativa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Alternativa thirrje", 1289, 7, 2, 213, 64
+    AUTOCHECKBOX "&Shfaq pÃ«rparim ndÃ«rsa lidhesh", 1284, 16, 14, 201, 10
+    AUTOCHECKBOX "&Shfaq pÃ«r emrin dhe fjalÃ«kalimin, certifikata, etj.", 1554, 16, 27, 201, 10
+    AUTOCHECKBOX "PÃ«rfshijÃ« hzrjen nÃ« domain &ReactOS", 1555, 16, 39, 201, 10
+    AUTOCHECKBOX "Shfaq &number telefonit", 1285, 16, 52, 200, 10, BS_TOP | BS_MULTILINE
+    GROUPBOX "Alternativa thirrje", 1290, 6, 72, 213, 79
+    LTEXT "&PÃ«rpjekje thirrje:", 1300, 16, 87, 123, 8
+    EDITTEXT 1287, 141, 84, 69, 14, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "&Koha mes pÃ«rpjekje thirrjeve:", 1301, 16, 103, 123, 8
+    COMBOBOX 1292, 141, 101, 70, 123, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Koha pushim para mbylljes telefonates:", 1299, 16, 120, 123, 8
+    COMBOBOX 1291, 141, 116, 70, 108, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "Merr prapÃ« nÃ«se &linja bie", 1286, 16, 136, 199, 10, BS_TOP | BS_MULTILINE
+    GROUPBOX "ShumÃ« Pajisje", 1288, 7, 156, 213, 32
+    COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "K&onfiguro...", 1293, 150, 168, 60, 14
+    PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14
+    PUSHBUTTON "&Virtuale ""tuneli"" lidhja", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED
+END
+
+168 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes T're"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruaj numrin e telefonit poshtÃ«. ", -1, 7, 4, 306, 14
+    LTEXT "&Numri telefonit:", 1308, 7, 19, 130, 8
+    EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
+    LTEXT "Ju mund tÃ« kenÃ« nevojÃ« pÃ«r tÃ« pÃ«rfshirÃ« njÃ« ""1"" ose kodin e zonÃ«s, ose tÃ« dyja. NÃ«se ju nuk jeni tÃ« sigurt qÃ« ju duhen numra shtesÃ«, thirrni numrin e telefonit nÃ« telefonin tuaj. NÃ«se ju dÃ«gjoni njÃ« tingull modemi, numri i thirrur Ã«shtÃ« e saktÃ«.", -1, 20, 50, 291, 53
+END
+
+169 DIALOGEX 6, 18, 235, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "RegjistÃ«r Numerave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PÃ«rdor kÃ«tÃ« regjistÃ«r numerave:", 1326, 8, 8, 222, 8
+    AUTORADIOBUTTON "Regjistri numerave &sistemit", 1325, 14, 22, 216, 10, WS_GROUP
+    AUTORADIOBUTTON "Regjistri numereve &personal", 1324, 14, 34, 216, 10
+    AUTORADIOBUTTON "A&lternimi regjistrit numerave:", 1323, 14, 46, 217, 10
+    COMBOBOX 1321, 26, 61, 201, 77, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_GROUP | NOT WS_TABSTOP
+    PUSHBUTTON "&Shfleto...", 1322, 167, 81, 60, 14
+END
+
+170 DIALOGEX 6, 18, 235, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "RegjistÃ«r Numrave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PÃ«rdor kÃ«tÃ« regjistÃ«r numerave:", 1326, 8, 8, 223, 8
+    AUTORADIOBUTTON "Regjistri numerave &sistemit", 1325, 14, 22, 217, 10, WS_GROUP
+    AUTORADIOBUTTON "A&lternimi regjistrit numerave:", 1323, 14, 36, 216, 10
+    COMBOBOX 1321, 26, 51, 203, 77, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_GROUP | NOT WS_TABSTOP
+    PUSHBUTTON "&Shfleto...", 1322, 169, 69, 60, 14
+END
+
+171 DIALOGEX 6, 18, 317, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruani adresÃ«n IP-sÃ« kÃ«tij routeri nÃ« rrjetin e largÃ«t, ose nÃ« qoftÃ« se ju prisni qÃ« routeri i largÃ«t t'ju japÃ« adresÃ«n, tÃ« lÃ«nÃ« si 0.0.0.0. Zakonisht operatori i rrjetit tÃ« largÃ«t apo routeri do tÃ« ju tregojnÃ« se Ã§farÃ« pÃ«r tÃ« pÃ«rdorur.", 1331, 5, 4, 308, 35
+    LTEXT "Adresa &IP-sÃ« time:", 1332, 4, 51, 100, 8, NOT WS_GROUP
+    CONTROL "", 1330, "RASIPADDRESS", WS_TABSTOP, 21, 62, 104, 12
+    LTEXT "ShÃ«nim: NÃ«se ju keni njÃ« pÃ«rshtatÃ«s rrjeti tÃ« instaluar, ju nuk duhet tÃ« zgjedhni tÃ« njÃ«jtÃ«n adresÃ« si pÃ«rshtatÃ«s tÃ« rrjetit tuaj.", 1333, 5, 94, 306, 36, NOT WS_GROUP
+END
+
+172 DIALOGEX 6, 18, 317, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Disa servera dial-up dhe routers kÃ«rkojnÃ« njÃ« hyrje interaktive pas lidhen. Ju mund tÃ« pÃ«rdorni njÃ« script automatike tÃ« pÃ«rgjigjet pÃ«r ju.", 1339, 5, 3, 309, 27
+    AUTOCHECKBOX "Shfaq dritaren &terminalit", 1462, 15, 31, 162, 10
+    AUTOCHECKBOX "&Ekzekuto skripten:", 1463, 15, 45, 58, 10
+    COMBOBOX 1334, 30, 60, 275, 88, CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Modifiko...", 1335, 180, 77, 60, 14
+    PUSHBUTTON "&Shfleto...", 1465, 244, 77, 60, 14
+END
+
+173 DIALOGEX 6, 18, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Formo Numrin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Politika TelefonatÃ«", 1344, 9, 4, 213, 53, WS_GROUP
+    LTEXT "&Numri i pÃ«rpjekjeve telefonatÃ«s:", 1349, 16, 22, 140, 8, NOT WS_GROUP
+    EDITTEXT 1340, 158, 19, 56, 14, ES_AUTOHSCROLL
+    LTEXT "&Sekonda ndÃ«rmjet pÃ«rpjekjeve telefonatÃ«s:", 1351, 16, 38, 140, 8, NOT WS_GROUP
+    EDITTEXT 1342, 158, 36, 56, 14, ES_AUTOHSCROLL
+    GROUPBOX "Tipi lidhjes", 1343, 9, 63, 213, 56, WS_GROUP
+    LTEXT "Pusho sekonda para se ta mbyllni:", 1350, 28, 88, 124, 8, NOT WS_GROUP
+    AUTORADIOBUTTON "&KÃ«rko lidhjen e telefonatÃ«s", 1347, 16, 78, 135, 10, WS_GROUP
+    AUTORADIOBUTTON "KÃ«mbÃ«ngul pÃ«r lidhjen", 1348, 16, 103, 199, 10, NOT WS_TABSTOP, WS_EX_TRANSPARENT
+    EDITTEXT 1341, 159, 85, 56, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "ThirrMbrapa...", 1345, 150, 125, 70, 14, WS_GROUP
+    PUSHBUTTON "ShumÃ« Linja...", 1346, 74, 125, 70, 14
+END
+
+174 DIALOGEX 0, 0, 215, 226
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Router"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CTEXT "NYI...duhen specifikimet nga KCrocker", -1, 57, 86, 106, 28
+END
+
+175 DIALOGEX 6, 18, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PlotÃ«simi i kÃ«rkesÃ«s tÃ« magjistarit ndÃ«rfaqes telefonuese.", 1352, 122, 5, 192, 32
+    LTEXT "PÃ«r tÃ« krijuar kÃ«tÃ« ndÃ«rfaqe dhe tÃ« mundÃ«sojÃ« atÃ« nÃ« router, kliko Mbaro.", 1354, 122, 41, 192, 26, NOT WS_GROUP
+    LTEXT "PÃ«r tÃ« ndryshuar kÃ«tÃ« ndÃ«rfaqe nÃ« Router dhe Menaxhuesin e Hyrjes nÃ« Distance, zgjidhni atÃ« nÃ« ndÃ«rfaqes e Routerit dhe klikoni CilÃ«sime.", 1355, 122, 68, 190, 39, NOT WS_GROUP
+END
+
+179 DIALOGEX 6, 18, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni modemin ose pÃ«rshtatÃ«sin qÃ« kjo ndÃ«rfaqe do tÃ« pÃ«rdorÃ«.", 1356, 7, 4, 306, 11
+    CONTROL "", 1355, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C415, 6, 15, 305, 80
+    LTEXT "Lista tregon pajisje tÃ« ndÃ«rtuar pÃ«r routerin.", 1357, 15, 98, 288, 37, NOT WS_GROUP
+END
+
+180 DIALOGEX 6, 18, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruani numrin e telefonit e serverit formues ose router qÃ« ju kanÃ« kÃ«rkuar. Numra telefoni alternative, nÃ«se ka, janÃ« tÃ« formuar automatikisht nÃ«se numri primar nuk mund tÃ« arrihet.", 1360, 7, 4, 305, 42
+    LTEXT "&Numri telefonit ose adresÃ«n:", 1361, 7, 50, 275, 8, NOT WS_GROUP
+    EDITTEXT 1358, 7, 62, 304, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "Alternoj...", 1359, 250, 80, 60, 14
+END
+
+181 DIALOGEX 6, 18, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Siguria"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Policia vÃ«rtetimit dhe kriptimit", 1367, 6, 8, 216, 103, WS_GROUP
+    AUTORADIOBUTTON "Prano Ã§do vÃ«rtetim pÃ«rfshirÃ« edhe tekst qartÃ«", 1370, 16, 20, 195, 10, BS_TOP | BS_MULTILINE
+    AUTORADIOBUTTON "Prano vetÃ«m kriptime tÃ« vÃ«rtetuara", 1373, 16, 36, 195, 10, BS_TOP | BS_MULTILINE
+    AUTORADIOBUTTON "Prano vetÃ«m Kriptime MS tÃ« vertetuara", 1374, 16, 52, 195, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "KÃ«rkon informacionet e kriptimit", 1363, 27, 65, 184, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTOCHECKBOX "KÃ«rkon informacionet e kriptimit tÃ« fortÃ«", 1364, 41, 80, 172, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "PÃ«rdor dy rrugÃ« vÃ«rtetimi", 1362, 17, 95, 194, 10, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "FjalÃ«kalime tÃ« paruajtura", 1369, 59, 117, 80, 14, WS_GROUP
+    PUSHBUTTON "A&vanuar...", 1368, 142, 117, 80, 14, NOT WS_VISIBLE | WS_DISABLED
+    AUTOCHECKBOX "&Zbulo dokumentat dhe ndarjen e printerave para formimit tÃ« numrit", 1365, 7, 198, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED
+END
+
+182 DIALOGEX 6, 18, 248, 148
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Siguria"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Policia vÃ«rtetimit dhe kriptimit", 1367, 7, 8, 200, 98, WS_GROUP
+    AUTORADIOBUTTON "Prano Ã§do vÃ«rtetim pÃ«rfshirÃ« edhe tekst qartÃ«", 1370, 14, 24, 183, 10
+    AUTORADIOBUTTON "Prano vetÃ«m kriptime tÃ« vÃ«rtetuara", 1373, 14, 39, 183, 10
+    AUTORADIOBUTTON "Prano vetÃ«m Kriptime MS tÃ« vertetuara", 1374, 14, 53, 184, 10
+    AUTOCHECKBOX "KÃ«rkon informacionet e kriptimit", 1363, 33, 67, 165, 10, WS_GROUP
+    AUTOCHECKBOX "KÃ«rkon informacionet e kriptimit tÃ« fortÃ«", 1364, 48, 79, 152, 10
+    AUTOCHECKBOX "PÃ«rdor pÃ«rdorues dhe fjalekalime aktuale ", 1366, 31, 91, 165, 10
+    PUSHBUTTON "FjalÃ«kalime tÃ« paruajtura", 1369, 6, 114, 100, 14, WS_GROUP
+    PUSHBUTTON "&Avancuar...", 1368, 109, 114, 60, 14, NOT WS_VISIBLE | WS_DISABLED
+    AUTOCHECKBOX "Zbulo dokumentat dhe ndarjen e printerave para formimit tÃ« numrit", 1365, 14, 134, 193, 10, NOT WS_VISIBLE | WS_DISABLED
+END
+
+183 DIALOGEX 6, 18, 317, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kontrollo tÃ« gjithqka qÃ« aplikohet:", 1388, 7, 4, 296, 9
+    AUTOCHECKBOX "Paketat nÃ« kÃ«tÃ« ndÃ«rqafe tÃ« Routerit dhe &IP've.", 1386, 20, 19, 285, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "Paketat nÃ« kÃ«tÃ« ndÃ«rqafe tÃ« Routerit dhe IP&X.", 1387, 20, 35, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&Shto njÃ« llogari pÃ«rdoruesi kÃ«shtu qÃ« njÃ« router i largÃ«t mund tÃ« elefonoj.", 1382, 20, 52, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "DÃ«rgo njÃ« dhe fjalÃ«kalim tekst-qartÃ«, nÃ«se kjo Ã«shtÃ« e vetmja mÃ«nyrÃ« pÃ«r tu lidhur.", 1385, 20, 70, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&PÃ«rdorimi scripting pÃ«r tÃ« pÃ«rfunduar lidhjen me router largÃ«t.", 1384, 20, 87, 289, 22, BS_LEFT | BS_TOP | BS_MULTILINE
+END
+
+184 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+186 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes SÃ« Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NjÃ« lidhje qÃ« Ã«shtÃ« krijuar pÃ«r pÃ«rdorimin tuaj tÃ« vetÃ«m Ã«shtÃ« ruajtur nÃ« llogarinÃ« tuaj tÃ« pÃ«rdoruesit dhe nuk Ã«shtÃ« nÃ« dispozicion nÃ«se nuk keni hyrÃ«.", -1, 7, 4, 306, 23
+    LTEXT "Krijo kÃ«tÃ« lidhje pÃ«r:", -1, 14, 27, 288, 12
+    AUTORADIOBUTTON "&PÃ«rdorim ndonjÃ«rit", 1400, 26, 40, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&PÃ«rdorim im vetÃ«m", 1401, 26, 55, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+END
+
+498 DIALOGEX 12, 16, 215, 126
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ReactOS nuk ishte nÃ« gjendje pÃ«r tu lidhur nÃ« rrjet duke pÃ«rdorur emrin e pÃ«rdoruesit dhe fjalÃ«kalimin qÃ« ju keni dhÃ«nÃ«. Ju lutem ri-shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin.", 1396, 7, 6, 206, 36
+    LTEXT "&PÃ«rdorues:", 1399, 8, 51, 49, 8
+    EDITTEXT 1394, 66, 46, 143, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1397, 8, 70, 49, 8, NOT WS_GROUP
+    EDITTEXT 1393, 66, 64, 143, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    AUTOCHECKBOX "&Ruaj fjalÃ«kalimin", 1391, 66, 84, 143, 10
+    CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 98, 200, 1
+    DEFPUSHBUTTON "OK", 1, 81, 104, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 145, 104, 60, 14
+END
+
+500 DIALOGEX 12, 16, 215, 173
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ReactOS nuk ishte nÃ« gjendje pÃ«r tu lidhur nÃ« rrjet duke pÃ«rdorur emrin e pÃ«rdoruesit dhe fjalÃ«kalimin qÃ« ju keni dhÃ«nÃ«. Ju lutem ri-shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin.", 1396, 7, 6, 209, 26
+    LTEXT "&PÃ«rdorues:", 1399, 7, 72, 44, 8
+    EDITTEXT 1394, 97, 69, 115, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1397, 7, 90, 45, 8, NOT WS_GROUP
+    EDITTEXT 1393, 97, 87, 115, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Domain:", 1395, 7, 108, 53, 8, NOT WS_GROUP
+    EDITTEXT 1392, 97, 105, 115, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    AUTOCHECKBOX "&Ruaj pÃ«rdoruesin dhe fjalÃ«kalimin", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE
+    DEFPUSHBUTTON "OK", 1, 87, 146, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 151, 146, 60, 14
+    CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 140, 205, 1
+    LTEXT "Ju mund tÃ« jepni njÃ« emÃ«r domain ose tÃ« lini fushÃ«n e domain bosh.\n(emrat e Domain nuk janÃ« tÃ« nevojshme pÃ«r lidhjet me internet)", -1, 8, 38, 209, 26
+END
+
+502 DIALOGEX 20, 60, 215, 73
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "PPP CilÃ«sime"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "&MundÃ«so shtojcat LCP", 1423, 9, 7, 200, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "MundÃ«so ngjeshjen e programeve", 1424, 9, 22, 201, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "Negocio lidhje-shumta pÃ«r lidhje teke", 1557, 9, 37, 202, 10, BS_TOP | BS_MULTILINE
+    DEFPUSHBUTTON "OK", 1, 82, 53, 60, 14
+    PUSHBUTTON "Anulo", 2, 148, 53, 60, 14
+END
+
+509 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Magjistari Lidhjes SÃ« Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni rolin qÃ« ju dÃ«shironi pÃ«r kÃ«tÃ« kompjuter:", -1, 10, 5, 275, 9
+    AUTORADIOBUTTON "&PritÃ«s", 1483, 31, 20, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&Ftuar", 1484, 31, 44, 265, 10, BS_TOP | BS_MULTILINE
+    LTEXT "Ky kompjuter ka informatat qÃ« ju dÃ«shironi pÃ«r tÃ« parÃ«.", -1, 43, 31, 253, 13, NOT WS_GROUP | WS_TABSTOP
+    LTEXT "Ky kompjuter pÃ«rdoret pÃ«r tÃ« aksesuar informacionin nÃ« kompjuterit pritÃ«s.", -1, 43, 56, 253, 23, NOT WS_GROUP
+END
+
+511 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Zgjidh njÃ« pajisje:", -1, 8, 5, 261, 8
+    COMBOBOX 1485, 9, 18, 302, 62, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+528 DIALOGEX 0, 0, 227, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Lidhje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Privilegje hyresÃ«", 1582, 8, 10, 213, 63
+    LTEXT "Jo-administratorÃ«t mund tÃ« lejohen pÃ«r tÃ« krijuar ose modifikuar lidhjet e para hyrjes nÃ«.", 1581, 16, 21, 194, 30
+    AUTOCHECKBOX "Lejo krijimin dhe modifikimin lidhjeve para hyrjes", 1497, 16, 56, 195, 10, BS_TOP | BS_MULTILINE
+END
+
+532 DIALOGEX 0, 0, 263, 263
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Router Thirrmbrapa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kur ju thirrni nÃ« njÃ« router, ajo mund tÃ« ofrojÃ« pÃ«r t'ju marrÃ« mbrapa pÃ«r tÃ« reduktuar faturat e telefonit tuaj ose pÃ«r tÃ« rritur sigurinÃ«. Specifikoni nÃ«se doni thirrmbrapa apo jo.", 1043, 7, 5, 253, 24
+    AUTORADIOBUTTON "&Jo thirrmbrapa", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "GjithmonÃ« mÃ« telefononi mbrapa nÃ« numri mÃ« poshtÃ«m:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT
+    CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143
+    PUSHBUTTON "&Modifiko...", 1504, 131, 213, 60, 14
+    PUSHBUTTON "&Fshi", 1505, 194, 213, 60, 14
+    CONTROL "", -1, "STATIC", SS_ETCHEDHORZ, 7, 233, 249, 1
+    DEFPUSHBUTTON "OK", 1, 132, 242, 60, 14
+    PUSHBUTTON "Anulo", 2, 196, 242, 60, 14
+END
+
+534 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Alternativa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Tipi lidhjes", 1289, 7, 7, 215, 55
+    AUTORADIOBUTTON "&KÃ«rkesÃ« thirrje", 1506, 16, 20, 199, 9, BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
+    LTEXT "Ora pushim para mbylljes telefonit:", 1299, 27, 33, 99, 8, NOT WS_GROUP
+    COMBOBOX 1291, 144, 30, 70, 108, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Lidhje kÃ«mbÃ«ngulÃ«se", 1507, 16, 47, 197, 9, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    GROUPBOX "Politika thirrjeve", 1290, 7, 66, 215, 48
+    LTEXT "&PÃ«rpjektje rithirrje:", 1300, 14, 79, 123, 8
+    EDITTEXT 1287, 143, 76, 70, 14, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "Inter&vale mesatare rithirrje:", 1301, 14, 96, 123, 8
+    COMBOBOX 1292, 143, 94, 70, 123, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "Disa pajisje", 1288, 7, 116, 215, 35
+    COMBOBOX 1551, 16, 130, 128, 41, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "K&onfiguro...", 1293, 150, 129, 65, 14
+    PUSHBUTTON "Thirrm&brapa", 1302, 8, 195, 60, 14
+    PUSHBUTTON "&X.25", 1295, 73, 195, 50, 14
+END
+
+539 DIALOGEX 0, 0, 265, 110
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 14, 64, 84, 8
+    EDITTEXT 1104, 102, 62, 154, 14, ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 82, 247, 1
+    DEFPUSHBUTTON "&Dial", 1590, 8, 89, 60, 14
+    PUSHBUTTON "Anulo", 1591, 71, 89, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 133, 89, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 195, 89, 60, 14
+END
+
+540 DIALOGEX 0, 0, 265, 133
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 64, 90, 8
+    EDITTEXT 1104, 105, 60, 154, 14, ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 7, 80, 252, 1
+    LTEXT "Th&irr:", 1412, 10, 91, 92, 10
+    COMBOBOX 1416, 105, 88, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 7, 107, 251, 1
+    DEFPUSHBUTTON "&Dial", 1590, 8, 113, 60, 14
+    PUSHBUTTON "Anulo", 1591, 71, 113, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 134, 113, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 197, 113, 60, 14
+END
+
+541 DIALOGEX 0, 0, 265, 157
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 67, 87, 8
+    EDITTEXT 1104, 103, 63, 154, 14, ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 84, 248, 1
+    LTEXT "Th&irr:", 1412, 11, 96, 48, 8
+    COMBOBOX 1416, 103, 92, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Thirr &nga:", 1415, 10, 114, 46, 8
+    COMBOBOX 1414, 103, 110, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Regullat thirrjeve", 1108, 193, 110, 64, 14
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 7, 130, 250, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 6, 136, 60, 14
+    PUSHBUTTON "Anulo", 1591, 69, 136, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 132, 136, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 196, 136, 60, 14
+END
+
+544 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ndarja Lidhjes Internetit lejon kompjuterat e tjerÃ« nÃ« rrjetin tuaj vendorÃ« pÃ«r tÃ« hyrÃ« nÃ« burimet e jashtme pÃ«rmes kÃ«saj lidhje.", -1, 10, 5, 300, 22
+    AUTOCHECKBOX "&Aktivizo NdarÃ«sin e Lidhjes Internetit pÃ«r kÃ«tÃ« lidhje", 1512, 21, 31, 272, 10
+    LTEXT "PÃ«r ti thirre automatikisht me kÃ«tÃ« lidhje kur njÃ« kompjuter nÃ« rrjetin tuaj vendorÃ« pÃ«rpiqet pÃ«r tÃ« hyrÃ« nÃ« burimet e jashtme, zgjidhni kutinÃ« e mÃ«poshtme kontrolli.", 1514, 10, 56, 294, 22
+    AUTOCHECKBOX "MundÃ«so thirrje me kÃ«rkesÃ«", 1513, 21, 86, 260, 10
+END
+
+545 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Aksesi ndarÃ«s lejon kompjutera tÃ« tjerÃ« nÃ« rrjetin tuaj vendorÃ« pÃ«r tÃ« hyrÃ« nÃ« burimet e jashtme pÃ«rmes kÃ«saj lidhje dial-up. Ju mund tÃ« mundÃ«sojÃ« mundÃ«soni aksesin ndarÃ«s pÃ«r njÃ« lidhje dhe njÃ« rrjet vendorÃ« nÃ« njÃ« kohÃ«.", -1, 10, 5, 300, 25
+    LTEXT "&Zgjidhni rrjetin vendorÃ« qÃ« do tÃ« kenÃ« akses nÃ« burimet pÃ«rmes kÃ«saj lidhje:", -1, 21, 35, 285, 8
+    COMBOBOX 1522, 21, 48, 231, 56, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+546 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ju mund tÃ« konfiguroni kÃ«tÃ« lidhje pÃ«r tÃ« pÃ«rdorur kartÃ«n tuaj smart tÃ« hyni ju nÃ« rrjetin e largÃ«t. PÃ«rzgjidhni nÃ«se do tÃ« pÃ«rdorni kartÃ«n tuaj smart me kÃ«tÃ« lidhje.", -1, 10, 5, 303, 22
+    AUTORADIOBUTTON "&PÃ«rdorni kartÃ«n time smart ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Mos pÃ«rdorni kartÃ«n time smart ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+END
+
+547 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Magjistari NdÃ«rfaqes KÃ«rkuese Thirr"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "MirÃ« se vini nÃ« Magjistarin NdÃ«rfaqorÃ« KÃ«rko Thirrje.", 1530, 122, 8, 192, 32
+    LTEXT "Duke pÃ«rdorur kÃ«tÃ« asistent ju mund tÃ« krijoni njÃ« ndÃ«rfaqe kÃ«rkese thirr pÃ«r tÃ« lidhur kÃ«tÃ« router me routerat e tjerÃ«.", 1531, 122, 43, 192, 37
+    LTEXT "Shtypni Tjetri pÃ«r tÃ« vazhduar.", 1532, 122, 85, 191, 29
+END
+
+548 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTORADIOBUTTON "Lidhu duke pÃ«rdorur njÃ« modem dhe, pÃ«rshtatÃ«s ISDN, ose pajisje tÃ« tjera fizike.", 1531, 21, 17, 290, 15, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
+    AUTORADIOBUTTON "Lidhu duke pÃ«rdorur rrjetÃ« privatÃ« &virtual (VPN)", 1532, 21, 38, 291, 15, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    AUTORADIOBUTTON "Lidhu duke pÃ«rdorur ethernet pÃ«rmes PPP (PPPoE)", 1688, 21, 58, 290, 12, NOT WS_TABSTOP
+END
+
+550 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Futni emrin ose adresÃ«n IP e routerit nÃ« tÃ« cilin ju jeni lidhur.", 1535, 10, 8, 289, 18
+    LTEXT "Emri &hostit ose adresa IP'sÃ« (si reactos.org ose 145.52.0.1):", 1537, 21, 35, 285, 8
+    EDITTEXT 1536, 21, 47, 285, 14, ES_AUTOHSCROLL
+END
+
+551 DIALOGEX 0, 0, 265, 127
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 12, 62, 89, 8
+    EDITTEXT 1104, 104, 58, 154, 14, ES_AUTOHSCROLL
+    LTEXT "Faqe:", 1110, 12, 82, 90, 8
+    EDITTEXT 1102, 104, 79, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 99, 248, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 9, 106, 61, 14
+    PUSHBUTTON "Anulo", 1591, 72, 106, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 135, 106, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 198, 106, 60, 14
+END
+
+552 DIALOGEX 0, 0, 265, 159
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 67, 91, 10
+    EDITTEXT 1104, 104, 64, 154, 14, ES_AUTOHSCROLL
+    LTEXT "Faqe:", 1110, 10, 86, 91, 8
+    EDITTEXT 1102, 104, 83, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 103, 248, 1
+    LTEXT "Th&irr:", 1412, 10, 115, 91, 8
+    COMBOBOX 1416, 104, 111, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 132, 248, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 8, 139, 60, 14
+    PUSHBUTTON "Anulo", 1591, 71, 139, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 134, 139, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 198, 139, 60, 14
+END
+
+553 DIALOGEX 0, 0, 265, 183
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 68, 92, 10
+    EDITTEXT 1104, 104, 65, 154, 14, ES_AUTOHSCROLL
+    LTEXT "Faqe:", 1110, 10, 90, 91, 8
+    EDITTEXT 1102, 104, 86, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 106, 248, 1
+    LTEXT "Th&irr:", 1412, 10, 118, 92, 8
+    COMBOBOX 1416, 104, 114, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Thirr &nga:", 1415, 10, 137, 91, 8
+    COMBOBOX 1414, 104, 134, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Regullat thirrjeve", 1108, 194, 134, 65, 14
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 154, 248, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 8, 162, 60, 14
+    PUSHBUTTON "Anulo", 1591, 71, 162, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 134, 162, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 198, 162, 60, 14
+END
+
+554 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Lidhu duke pÃ«rdorur:", 1124, 7, 4, 193, 8
+    CONTROL "", 1128, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00004C0D, 7, 17, 195, 44, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&Lart", 1132, 208, 18, 16, 14, BS_ICON
+    PUSHBUTTON "&PoshtÃ«", 1131, 208, 36, 16, 14, BS_ICON
+    AUTOCHECKBOX "TÃ« gjitha pajisjet thÃ«rrasin tÃ« njÃ«jtin numer", 1119, 7, 65, 131, 21, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "K&onfiguro...", 1130, 140, 66, 60, 14
+    GROUPBOX "Tipi shÃ«mbullit", 1125, 7, 87, 213, 56, WS_GROUP
+    LTEXT "&Numri telefonit:", 1135, 19, 102, 191, 8
+    EDITTEXT 1123, 17, 112, 138, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "Alter&nativa", 1129, 161, 112, 50, 14
+    AUTOCHECKBOX "Shfaq ikonat nÃ« zonÃ«n e njoftimin kur tÃ« jeni lidhur", 1120, 11, 194, 212, 20, BS_TOP | BS_MULTILINE
+END
+
+555 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "K&onfiguro...", 1130, 160, 38, 60, 14
+    LTEXT "&Numri telefonit:", 1135, 8, 72, 194, 8
+    EDITTEXT 1123, 8, 83, 148, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "Alter&nativa", 1129, 160, 83, 60, 14
+    AUTOCHECKBOX "Shfaq ikonat nÃ« zonÃ«n e njoftimin kur tÃ« jeni lidhur", 1120, 11, 194, 213, 10, BS_TOP | BS_MULTILINE
+    LTEXT "Lidhu duke pÃ«rdorur:", 1124, 8, 5, 214, 8
+    CONTROL "", 1127, "SYSLISTVIEW32", WS_DISABLED | WS_BORDER | 0x0000EC0D, 7, 18, 214, 15
+END
+
+556 DIALOGEX 0, 0, 220, 165
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«simet Programit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&PÃ«rshkrimi i programit gjatÃ« punÃ«s nÃ« rrjetin tuaj:", -1, 7, 5, 203, 8
+    EDITTEXT 1565, 7, 17, 206, 14, ES_AUTOHSCROLL
+    LTEXT "Numri portit serverit tÃ« &Internetit:", -1, 7, 35, 202, 8
+    EDITTEXT 1566, 7, 47, 113, 14, ES_AUTOHSCROLL | ES_NUMBER
+    AUTORADIOBUTTON "&TCP", 1548, 128, 49, 30, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "&UDP", 1567, 166, 49, 31, 10, NOT WS_TABSTOP
+    LTEXT "&DÃ«gjoni pÃ«r pÃ«rgjigjuni server'it tÃ« Internetiit nÃ« port ose varg portesh:\n(pÃ«r shÃ«mbull: 1024-1209, 1300-1310, 1450)", -1, 7, 70, 207, 22
+    LTEXT "T&CP:", -1, 7, 100, 28, 8
+    EDITTEXT 1569, 50, 97, 162, 14, ES_AUTOHSCROLL
+    LTEXT "UD&P:", -1, 7, 121, 30, 8
+    EDITTEXT 1551, 50, 117, 162, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 90, 144, 60, 14
+    PUSHBUTTON "Anulo", 2, 154, 144, 60, 14
+END
+
+557 DIALOGEX 0, 0, 217, 164
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«sime Pajisjesh"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&PÃ«rshkrimi i shÃ«rbimit:", -1, 7, 5, 203, 8
+    EDITTEXT 1552, 7, 18, 205, 14, ES_AUTOHSCROLL
+    LTEXT "&Emri ose adresa IP (pÃ«r shÃ«mmbull 192.168.0.12) e kompjuterit strehues pÃ«r kÃ«tÃ« shÃ«rbim nÃ« rrjetin tuaj:", -1, 7, 37, 208, 16
+    EDITTEXT 1556, 7, 57, 203, 14, ES_AUTOHSCROLL
+    LTEXT "&Numrin e portit ku ky shÃ«rbim banon:", -1, 7, 85, 203, 8
+    EDITTEXT 1553, 7, 97, 113, 14, ES_AUTOHSCROLL | ES_NUMBER
+    AUTORADIOBUTTON "&TCP", 1554, 128, 99, 30, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "&UDP", 1555, 166, 99, 31, 10, NOT WS_TABSTOP
+    DEFPUSHBUTTON "OK", 1, 86, 143, 60, 14
+    PUSHBUTTON "Anulo", 2, 150, 143, 60, 14
+END
+
+558 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Programe"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Lidhja internetit nÃ« kÃ«tÃ« kompjuter ka qenÃ« e pÃ«rshtatur pÃ«r tÃ« lejuar programet e mÃ«poshtme pÃ«r tÃ« punuar si duhet mbi rrjetin tuaj:", -1, 7, 7, 218, 28
+    CONTROL "Lista1", 1558, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000441D, 7, 37, 215, 155, WS_EX_CLIENTEDGE
+    PUSHBUTTON "Shto...", 1538, 7, 197, 67, 14
+    PUSHBUTTON "Modifiko...", 1559, 80, 197, 67, 14
+    PUSHBUTTON "Fshi", 1568, 153, 197, 67, 14
+END
+
+559 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ShÃ«rbime"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Zgjidhni shÃ«rbimet qÃ« punojnÃ« pÃ«r rrjetin tuaj qÃ« pÃ«rdoruesit e internetit mund tÃ« kenÃ« akses.", -1, 7, 5, 216, 22
+    LTEXT "ShÃ«rbime:", -1, 7, 27, 143, 8
+    CONTROL "Lista1", 1560, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000441D, 7, 37, 215, 155, WS_EX_CLIENTEDGE
+    PUSHBUTTON "Shto...", 1561, 7, 197, 67, 14
+    PUSHBUTTON "Modifiko...", 1563, 80, 197, 67, 14
+    PUSHBUTTON "Fshi", 1562, 153, 197, 67, 14
+END
+
+560 DIALOGEX 6, 18, 240, 88
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Lidhaj Fillestare"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "&Po", 6, 68, 68, 50, 14
+    PUSHBUTTON "&Jo", 7, 125, 68, 50, 14
+    ICON 32516, 1575, 7, 7, 20, 20
+    LTEXT "", 1576, 40, 7, 190, 33
+    AUTOCHECKBOX "&Mos shfaq kÃ«tÃ« kujtues pÃ«rsÃ«ri", 1579, 40, 48, 192, 11, BS_TOP | BS_MULTILINE
+END
+
+567 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruaj emrin e shÃ«rbimit tuaj nÃ« kutinÃ« e tekstit nÃ« vijim. NÃ« qoftÃ« se leni kutinÃ« tekstit bosh, ReactOS automatikisht do tÃ« zbulojÃ« dhe tÃ« konfigurojÃ« shÃ«rbimin tuaj, kur ju lidheni.", -1, 10, 7, 301, 25
+    LTEXT "Emri &Sherbimit (opsional):", -1, 22, 32, 229, 8
+    EDITTEXT 1593, 22, 44, 275, 14, ES_AUTOHSCROLL
+END
+
+568 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Emri &Sherbimit:", 1686, 7, 5, 217, 10
+    EDITTEXT 1594, 7, 17, 217, 14, ES_AUTOHSCROLL
+    AUTOCHECKBOX "Shfa&q ikona nÃ« zonÃ«n e njoftimit kur i lidhur", 1120, 9, 196, 215, 8
+END
+
+569 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Siguria"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Opsionet e sigurisÃ«", 1580, 8, 4, 213, 151
+    AUTORADIOBUTTON "&Tipike (CilÃ«sime Rekomandume)", 1540, 14, 16, 197, 9, BS_NOTIFY | WS_GROUP
+    AUTORADIOBUTTON "A&vancuar (CilÃ«sime parazgjedhura)", 1541, 14, 100, 197, 8, BS_NOTIFY
+    LTEXT "&Vlereso identitetin tim si vijon:", 1537, 26, 29, 183, 8, NOT WS_GROUP
+    COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "Automatikisht pÃ«rdor emrin dhe fjalÃ«kalimin tim hyres ReactOS (dhe domain nÃ«se ka)", 1174, 26, 59, 182, 20, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "KÃ«rkojnÃ« tÃ« dhÃ«nat e kriptume (shkÃ«put nÃ«se ska)", 1169, 26, 83, 182, 10, BS_TOP | BS_MULTILINE
+    LTEXT "Duke pÃ«rdorur kÃ«to cilÃ«sime kÃ«rko njÃ« njohuri tÃ« protokolleve tÃ« sigurisÃ«.", 1539, 26, 111, 136, 20
+    PUSHBUTTON "&CilÃ«sime...", 1180, 151, 134, 60, 14
+    PUSHBUTTON "I&PSec CilÃ«sime...", 1598, 126, 163, 85, 14
+END
+
+570 DIALOGEX 0, 0, 265, 126
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«simet IPSec"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "OK", 1, 151, 104, 50, 14
+    PUSHBUTTON "Anulo", 2, 207, 104, 50, 14
+    AUTOCHECKBOX "&PÃ«rdorni tastin para-shpÃ«rndar[s pÃ«r autentikim", 1604, 21, 15, 217, 10
+    LTEXT "&Ã‡elÃ«s:", 1602, 20, 31, 44, 12
+    EDITTEXT 1605, 66, 30, 172, 12, ES_AUTOHSCROLL
+    AUTOCHECKBOX "Lejo certifikata nga dyqan im pÃ«rdorues pÃ«rveÃ§ certifikatave tÃ« makinÃ«s", 1606, 20, 50, 242, 13, WS_DISABLED
+    AUTOCHECKBOX "PÃ«rdorni njÃ« certifikatÃ« tÃ« veÃ§antÃ«", 1607, 20, 67, 239, 10, WS_DISABLED
+    PUSHBUTTON "PÃ«rzgjedh", 1608, 31, 84, 50, 14, WS_DISABLED
+    COMBOBOX 1610, 91, 84, 135, 30, CBS_DROPDOWN | CBS_SORT | WS_DISABLED | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+571 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Hyrje e SigurtÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Alternativa HyrÃ«se:", -1, 6, 8, 216, 47
+    AUTOCHECKBOX "Hyrja e pasukseshme &pÃ«rpjekje pÃ«rbrenda lidhjes", 1642, 14, 22, 201, 10
+    AUTOCHECKBOX "Hyrje e suksesshme &lidhjet JashtÃ«", 1641, 14, 37, 200, 10
+    GROUPBOX "AlternativÃ« dokumentesh hyres:", -1, 7, 64, 215, 91
+    LTEXT "&Emri:", -1, 14, 78, 199, 8
+    EDITTEXT 1674, 14, 90, 199, 14, ES_READONLY
+    PUSHBUTTON "&Shfleto...", 1639, 153, 108, 60, 14
+    LTEXT "&Limiti masÃ«s:", -1, 14, 133, 67, 8
+    EDITTEXT 1640, 86, 130, 50, 14, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "KB", -1, 140, 133, 20, 8
+    PUSHBUTTON "&Rikthe Parazgjedhjet", 1643, 135, 197, 85, 14
+END
+
+572 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ICMP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Internet Control Message Protocol (ICMP) i lejon kompjuterave nÃ« njÃ« rrjet pÃ«r tÃ« ndarÃ« gabimin dhe informacionin dhe statusin. Zgjidhni kÃ«rkesat pÃ«r informacion nga interneti se ky kompjuter do tÃ« pÃ«rgjigjen:", -1, 7, 5, 215, 37
+    CONTROL "IList1", 1644, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 7, 45, 215, 100, WS_EX_CLIENTEDGE
+    GROUPBOX "PÃ«rshkrim:", -1, 7, 153, 215, 55
+    LTEXT "", 1645, 14, 171, 199, 32
+END
+
+574 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Avancuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", 575, 7, 60, 213, 100
+END
+
+577 DIALOGEX 0, 0, 312, 144
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Se"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Lloji emrit tÃ« ISP'sÃ« nÃ« kutinÃ« e mÃ«poshtme tekstit.", 1681, 10, 3, 296, 11
+    LTEXT "Emri:", 1690, 18, 20, 127, 10
+    EDITTEXT 1680, 17, 32, 222, 14, ES_AUTOHSCROLL
+    LTEXT "Emri qÃ« shkruani kÃ«tu do tÃ« jetÃ« emri i lidhjes qÃ« ju po krijoni.", 1683, 17, 52, 282, 42
+END
+
+580 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTORADIOBUTTON "PÃ«rzgjedhja &automatike", 1534, 21, 20, 288, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&PikÃ« nÃ« pikÃ« Tunel Protokol (PPTP)", 1532, 21, 39, 290, 11, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Shtresa 2 Tunel Protokol (L2TP)", 1533, 21, 56, 286, 11, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+END
+
+1420 DIALOGEX 0, 0, 265, 108
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "D&ial:", 1412, 14, 63, 86, 8
+    COMBOBOX 1416, 104, 60, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 80, 248, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 9, 87, 60, 14
+    PUSHBUTTON "Anulo", 1591, 72, 87, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 135, 87, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 198, 87, 60, 14
+END
+
+1421 DIALOGEX 0, 0, 265, 223
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 61, 90, 8
+    EDITTEXT 1104, 104, 58, 154, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1112, 11, 81, 90, 8
+    EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 98, 248, 1
+    AUTOCHECKBOX "&Ruaj kÃ«tÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim pÃ«r pÃ«rdoruesin e mÃ«poshtem:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "VetÃ«m unÃ«", 1622, 26, 119, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "Kushdo qÃ« e pÃ«rdor kÃ«tÃ« kompjuter", 1623, 26, 133, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 149, 248, 1
+    LTEXT "Thirr:", 1412, 14, 161, 87, 8
+    COMBOBOX 1416, 104, 157, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Thirr &nga:", 1415, 14, 178, 88, 8
+    COMBOBOX 1414, 104, 175, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Regullat thirrÃ«se", 1108, 193, 175, 65, 14
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 196, 248, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 9, 202, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 1591, 72, 202, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 135, 202, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 198, 202, 60, 14
+END
+
+1422 DIALOGEX 0, 0, 265, 242
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Lidhu %1"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50
+    LTEXT "&PÃ«rdorues:", 1413, 10, 67, 91, 8
+    EDITTEXT 1104, 104, 63, 154, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1112, 10, 85, 92, 8
+    EDITTEXT 1103, 104, 82, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "Faqja:", 1110, 10, 104, 92, 8
+    EDITTEXT 1102, 104, 101, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 121, 248, 1
+    AUTOCHECKBOX "&Ruaj kÃ«tÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim pÃ«r pÃ«rdoruesit e mÃ«poshtme:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "VetÃ«m UnÃ«", 1622, 24, 141, 227, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "Kushdo qÃ« e pÃ«rdorÃ« kÃ«tÃ« kompjuter", 1623, 24, 155, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 170, 248, 1
+    LTEXT "Thirr:", 1412, 14, 182, 87, 8
+    COMBOBOX 1416, 104, 178, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Thirr &nga:", 1415, 14, 198, 87, 8
+    COMBOBOX 1414, 104, 195, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&Regullat thirrÃ«se", 1108, 193, 195, 65, 14
+    CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 215, 248, 1
+    DEFPUSHBUTTON "&Thirr", 1590, 8, 221, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 1591, 71, 221, 60, 14
+    PUSHBUTTON "Karakteristika", 1107, 134, 221, 60, 14
+    PUSHBUTTON "&NdihmÃ«", 1592, 198, 221, 60, 14
+END
+
+1425 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Emri &Host-it ose adresa IP'sÃ« ose destinacioni (si psh reactos.org ose 145.52.0.1):", 1430, 7, 5, 217, 18
+    EDITTEXT 1427, 7, 25, 215, 14, ES_AUTOHSCROLL
+    GROUPBOX "Lidhja parÃ«", 1431, 9, 48, 213, 78
+    LTEXT "ReactOS parÃ« mund tÃ« lidhÃ« rrjetin publik, tÃ« tilla si internet, para se tÃ« pÃ«rpiqet pÃ«r tÃ« krijuar kÃ«tÃ« lidhje virtuale.", 1432, 17, 63, 199, 24
+    AUTOCHECKBOX "&Thirr njÃ« lidhje tjetÃ«r tÃ« parÃ«:", 1428, 19, 89, 183, 10
+    COMBOBOX 1429, 29, 103, 182, 87, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "Shfaq ikonÃ«n nÃ« zonÃ«n e njoftimit kur i lidhur", 1120, 10, 192, 213, 13
+END
+
+1426 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Alternativa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Alternativa thirrje", 1289, 8, 7, 214, 56
+    AUTOCHECKBOX "&Shfaq pÃ«rparim ndÃ«rsa lidhesh", 1284, 16, 17, 199, 10
+    AUTOCHECKBOX "Shfaq pÃ«r emrin dhe fjalÃ«kalimin, certifikatÃ«, etj.", 1554, 16, 32, 199, 10
+    AUTOCHECKBOX "PÃ«rfshijÃ« &ReactOS hyrje nÃ« domain", 1555, 16, 47, 178, 10
+    GROUPBOX "Alternativa ri-thirrje", 1290, 8, 68, 214, 89
+    LTEXT "PÃ«rpjekje &Rithirrje:", 1300, 16, 81, 121, 8
+    EDITTEXT 1287, 140, 77, 70, 14, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "&Koha ndÃ«rmjet pÃ«rpjekjeve rithirrjes:", 1301, 16, 99, 121, 8
+    COMBOBOX 1292, 141, 95, 70, 123, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Ora pushim para mbylljes telefonit:", 1299, 16, 117, 121, 8
+    COMBOBOX 1291, 141, 113, 70, 108, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "Rithirr nÃ«se &linja bie", 1286, 16, 138, 199, 10, BS_TOP | BS_MULTILINE
+END
+
+1427 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ShÃ«noni emrin host'it ose adresen e Internet Protocol (IP) tÃ« kompjuterit nÃ« tÃ« cilÃ«n ju jeni lidhur.", -1, 10, 6, 275, 16
+    LTEXT "Emri &Host'it ose adresa IP (pÃ«r shÃ«mbull, reactos.org ose 145.52.0.1 ):", -1, 21, 28, 277, 11
+    EDITTEXT 1433, 21, 42, 275, 14, ES_AUTOHSCROLL
+END
+
+1428 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ReactOS automatikisht mund tÃ« thirr lidhjen fillestare nÃ« internet ose rrjet tjetÃ«r publik, para krijimit tÃ« lidhjes virtuale.", -1, 10, 6, 275, 24
+    AUTORADIOBUTTON "&Mos thirrni lidhje fillestar.", 1509, 32, 31, 271, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Automatikisht thirr kÃ«tÃ« lidhje fillestar:", 1510, 32, 45, 269, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    COMBOBOX 1435, 43, 62, 253, 87, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+1436 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&PÃ«rzgjidhni njÃ« pajisje:", 1597, 8, 5, 213, 8
+    COMBOBOX 1437, 7, 17, 217, 166, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
+    AUTOCHECKBOX "Shfaq ikonÃ«n nÃ« zonÃ«n e njoftimit kur i lidhur", 1120, 11, 195, 213, 10, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "K&onfiguro...", 1130, 160, 34, 60, 14
+END
+
+1448 DIALOGEX 10, 20, 265, 71
+STYLE DS_SHELLFONT | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Lidhje Rrjeti"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjith njÃ« lidhje rrjeti:", 1456, 7, 7, 251, 10
+    COMBOBOX 1457, 8, 18, 250, 140, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    DEFPUSHBUTTON "&Lidhu...", 1449, 7, 50, 60, 14
+    PUSHBUTTON "Anulo", 1455, 70, 50, 60, 14
+    PUSHBUTTON "&E're...", 1459, 134, 50, 60, 14
+    PUSHBUTTON "Karakteristikat", 1460, 198, 50, 60, 14
+END
+
+1466 DIALOGEX 6, 18, 265, 262
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ShÃ«mbull teksti", 1469, 7, 7, 251, 8
+    EDITTEXT 1470, 7, 17, 193, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "&Shto", 1471, 77, 36, 60, 14
+    PUSHBUTTON "&ZÃ«venÃ«so", 1472, 141, 36, 60, 14
+    LTEXT "ShÃ«mbull teksti", 1473, 7, 57, 193, 8
+    LISTBOX 1474, 7, 68, 193, 145, WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "", 1475, 206, 68, 51, 14, BS_BITMAP | WS_GROUP
+    PUSHBUTTON "&PoshtÃ«", 1476, 206, 86, 51, 14, BS_BITMAP
+    PUSHBUTTON "Fshi", 1477, 141, 215, 60, 14
+    CONTROL "", 1479, "STATIC", SS_ETCHEDHORZ, 7, 233, 249, 1
+    PUSHBUTTON "OK", 1, 132, 242, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 196, 242, 60, 14
+END
+
+1467 DIALOGEX 6, 18, 263, 263
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ShÃ«mbull teksti", 1469, 7, 7, 197, 8
+    EDITTEXT 1470, 7, 17, 193, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "&Shto", 1471, 76, 36, 60, 14
+    PUSHBUTTON "&ZÃ«venÃ«so", 1472, 141, 36, 60, 14
+    LTEXT "ShÃ«mbull teksti", 1473, 7, 57, 193, 8
+    LISTBOX 1474, 7, 68, 193, 135, WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Lart", 1475, 206, 68, 51, 14, BS_BITMAP | WS_GROUP
+    PUSHBUTTON "&PoshtÃ«", 1476, 206, 86, 51, 14, BS_BITMAP
+    PUSHBUTTON "Fshi", 1477, 141, 204, 60, 14
+    AUTOCHECKBOX "ShÃ«mbull teksti", 1478, 7, 225, 249, 10, BS_TOP | BS_MULTILINE
+    PUSHBUTTON "OK", 1, 132, 242, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 196, 242, 60, 14
+END
+
+1468 DIALOGEX 6, 18, 263, 263
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ShÃ«mbull teksti", 1469, 7, 5, 249, 8
+    EDITTEXT 1470, 7, 17, 249, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "&Shto", 1471, 132, 36, 60, 14
+    PUSHBUTTON "&ZÃ«venÃ«so", 1472, 196, 36, 60, 14
+    LTEXT "ShÃ«mbull teksti", 1473, 7, 55, 251, 8
+    LISTBOX 1474, 7, 68, 249, 140, LBS_STANDARD | WS_TABSTOP
+    PUSHBUTTON "Fshi", 1477, 196, 214, 60, 14, WS_GROUP
+    CONTROL "", 1479, "STATIC", SS_ETCHEDHORZ, 7, 233, 249, 1
+    PUSHBUTTON "OK", 1, 132, 242, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 196, 242, 60, 14
+END
+
+1469 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTORADIOBUTTON "Thirr njÃ« rrjet &privat.", 1488, 24, 9, 116, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "Lidhuni me njÃ« rrjet privat pÃ«rmes internetit.", 1489, 24, 34, 206, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Lidhuni direkt me njÃ« kompjuter.", 1490, 24, 59, 157, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "Lidhja me rrjetin nÃ«pÃ«rmjet broadband", 1491, 24, 83, 273, 10, NOT WS_TABSTOP
+    LTEXT "Lidhu duke pÃ«rdorur linjÃ« tim tÃ« telefonit (modem ose ISDN).", -1, 45, 21, 156, 8
+    LTEXT "Krijo njÃ« Rrjet Privat Virtual (VPN) lidhje ose tunel pÃ«rmes internetit.", -1, 45, 46, 266, 8
+    LTEXT "Lidhu duke pÃ«rdorur serial, paralel, ose infra tÃ« kuqe portin tim.", -1, 45, 71, 266, 8
+    LTEXT "Lidhu me anÃ« tÃ« lidhjes broadband time.", -1, 45, 95, 266, 8
+END
+
+1480 DIALOGEX 0, 0, 230, 61
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Numri telefonit Editor"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Ju lutem shkruani numrin e ri tÃ« telefonit:", 1481, 7, 7, 218, 8
+    EDITTEXT 1482, 7, 17, 217, 15, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 99, 40, 60, 14
+    PUSHBUTTON "Anulo", 2, 163, 40, 60, 14
+END
+
+1481 DIALOGEX 0, 0, 321, 157
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Magjistari Lidhjes Re"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Shkruaj njÃ« emÃ«r llogari ISP dhe fjalÃ«kalimin, pastaj shkruani kÃ«tÃ« informacion dhe ruani atÃ« nÃ« njÃ« vend tÃ« sigurt. (NÃ«se keni harruar njÃ« emÃ«r llogarie ekzistuese apo fjalÃ«kalimin, kontaktoni ISP-nÃ« tuaj.)", 1689, 10, 4, 308, 25
+    LTEXT "&PÃ«rdorues:", 1636, 23, 35, 89, 15
+    EDITTEXT 1614, 115, 34, 190, 15, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", 1637, 23, 55, 90, 13
+    EDITTEXT 1615, 115, 54, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Konfirmo fjalÃ«kalimin:", 1638, 23, 74, 88, 13
+    EDITTEXT 1616, 115, 73, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
+    AUTOCHECKBOX "PÃ«rdorni kÃ«tÃ« emer llogarie dhe fjalÃ«kalimin kur dikush lidhet me internet nga ky kompjuter", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&BÃ«ni kÃ«tÃ« lidhje interneti parazgjedhur", 1595, 23, 112, 288, 14
+    AUTOCHECKBOX "Ndizni MurinMbrojtÃ«s Lidhjes tÃ« Internetit pÃ«r kÃ«tÃ« lidhje", 1682, 23, 133, 290, 14
+END
+
+1660 DIALOGEX 0, 0, 258, 78
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "MuriMbrojtÃ«s Lidhjes Internetit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 32515, -1, 7, 7, 20, 20
+    LTEXT "Fikja e MuritMbrojtÃ«s Lidhjes Internetit und tÃ« ekspozojÃ« kompjuterin tuaj pÃ«r akses tÃ« paautorizuar nÃ« Internet. Jeni te sigurte qe doni te fikni atÃ«?", -1, 44, 5, 212, 24
+    AUTOCHECKBOX "&Mos e tregoni kÃ«tÃ« dialog pÃ«rsÃ«ri", 1662, 42, 40, 210, 10
+    DEFPUSHBUTTON "&Po", 6, 74, 60, 50, 14
+    PUSHBUTTON "&Jo", 7, 128, 60, 50, 14
+END
+
+7000 DIALOGEX 0, 0, 215, 103
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&PÃ«rdorues:", -1, 7, 8, 90, 12, SS_CENTERIMAGE
+    EDITTEXT 7001, 101, 7, 108, 14, ES_AUTOHSCROLL
+    LTEXT "&Emri PlotÃ«:", -1, 7, 26, 90, 12
+    EDITTEXT 7002, 101, 25, 108, 14, ES_AUTOHSCROLL
+    LTEXT "&FjalÃ«kalim:", -1, 7, 44, 90, 12
+    EDITTEXT 7003, 101, 43, 108, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT "&Konfirmo fjalÃ«kalimin:", -1, 7, 62, 91, 12
+    EDITTEXT 7004, 101, 61, 108, 14, ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON "OK", 1, 84, 82, 60, 14
+    PUSHBUTTON "Anulo", 2, 149, 82, 60, 14
+END
+
+7005 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_CONTEXTHELP | WS_CHILD | WS_CAPTION
+CAPTION "ThhirrMbrapa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTORADIOBUTTON "&Mos lejo thirrje mbrapa", 7009, 9, 7, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "Lejo thirrÃ«sin pÃ«r tÃ« vendosur numrin e thirrmbrapa", 7006, 9, 20, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    AUTORADIOBUTTON "PÃ«rhere pÃ«rdor numrin e mÃ«tejshÃ«m pÃ«r thirr mbrapa:", 7007, 9, 34, 217, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    EDITTEXT 7008, 19, 49, 204, 14, ES_AUTOHSCROLL | WS_GROUP
+END
+
+7010 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_CONTEXTHELP | WS_CHILD | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Lidhje Hyrese", -1, 7, 4, 214, 110, WS_GROUP
+    LTEXT "Lejo lidhjet hyrÃ«se nÃ« kÃ«to pajisje.", -1, 17, 17, 195, 8
+    LTEXT "&Pajisje:", -1, 17, 29, 29, 8
+    CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00004405, 17, 41, 193, 47, WS_EX_CLIENTEDGE
+    AUTOCHECKBOX "&MundÃ«so shumÃ«link", 7012, 17, 96, 121, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    PUSHBUTTON "Karakteristika", 7013, 145, 94, 65, 14, WS_GROUP
+    GROUPBOX "Rrjeti Privat Virtual", -1, 6, 122, 214, 49, WS_GROUP
+    AUTOCHECKBOX "TÃ« lejojÃ« tÃ« tjerÃ«t pÃ«r tÃ« bÃ«rÃ« lidhje private nÃ« kompjuterin tim nga tunelet nÃ«pÃ«rmjet internetit ose rrjetet e tjera", 7014, 17, 137, 195, 27, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTOCHECKBOX "&Shfaq ikonÃ«n nÃ« zonÃ«n e njoftimit kur i lidhur", 7015, 12, 184, 209, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+END
+
+7016 DIALOGEX 0, 0, 265, 190
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«simet HyrÃ«se TCP/IP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Aksesi Rrjetit", -1, 6, 5, 252, 32
+    AUTOCHECKBOX "Lejo telefonuesit te aksesojnÃ« zonÃ«n e rrjetit vendorÃ«", 7017, 20, 20, 228, 9, BS_LEFT | BS_TOP | BS_MULTILINE
+    GROUPBOX "TCP/IP adresa detyrueshme", -1, 6, 42, 250, 122
+    AUTORADIOBUTTON "Cakto adresat TCP/IP automatike duke pÃ«rdorur DHCP", 7019, 20, 54, 231, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "S&pecifiko adresat TCP/IP", 7020, 20, 71, 231, 10, BS_TOP | BS_MULTILINE
+    LTEXT "&Nga:", -1, 29, 88, 53, 8
+    CONTROL "", 7018, "RASIPADDRESS", WS_GROUP | WS_TABSTOP, 90, 85, 103, 13
+    LTEXT "&PÃ«r:", -1, 29, 105, 53, 8
+    CONTROL "", 7021, "RASIPADDRESS", WS_GROUP | WS_TABSTOP, 90, 102, 103, 13
+    LTEXT "Totali:", -1, 29, 124, 53, 10
+    LTEXT "", 7024, 90, 121, 150, 14, 0, WS_EX_STATICEDGE
+    AUTOCHECKBOX "Lejo duke e quajtur kompjuterin pÃ«r tÃ« specifikuar vetÃ« adresÃ«n e saj IP", 7022, 20, 144, 231, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    DEFPUSHBUTTON "OK", 1, 133, 169, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 197, 169, 60, 14
+END
+
+7025 DIALOGEX 0, 0, 250, 157
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«sime hyrÃ«se IPX"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Akses Rrjeti", -1, 8, 6, 234, 32
+    AUTOCHECKBOX "Lejo telefonuesit te aksesojnÃ« zonÃ«n e rrjetit vendorÃ«", 7032, 18, 19, 194, 12, BS_LEFT | BS_TOP | BS_MULTILINE
+    GROUPBOX "Numri Rrjeti detyruar", -1, 8, 43, 234, 87
+    AUTOCHECKBOX "&Cakto numÃ«r tÃ« njÃ«jtÃ« pÃ«r tÃ« gjithÃ« kompjuterat e rrjetit", 7028, 17, 56, 203, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "CaktojÃ« numrat e rrjetit automatikisht", 7026, 28, 68, 191, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&Specifikoni numrat e rrjetit:", 7027, 28, 81, 189, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    EDITTEXT 7029, 40, 92, 154, 14, ES_UPPERCASE | WS_GROUP
+    AUTOCHECKBOX "Lejo telefonuesit pÃ«r tÃ« specifikuar numrin e tyre nyje", 7031, 17, 113, 208, 11, BS_TOP | BS_MULTILINE | WS_GROUP
+    DEFPUSHBUTTON "OK", 1, 116, 136, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", 2, 181, 136, 60, 14
+END
+
+7033 DIALOGEX 0, 0, 220, 50
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "CilÃ«simet HyrÃ«se Protokollare"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "Lejo telefonuesit te aksesojnÃ« zonÃ«n e rrjetit vendorÃ«", 7034, 7, 7, 208, 18, BS_LEFT | BS_TOP | BS_MULTILINE
+    DEFPUSHBUTTON "OK", 1, 86, 30, 60, 14
+    PUSHBUTTON "Anulo", 2, 151, 30, 60, 14
+END
+
+7035 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Rrjeti"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Komponente Rrjeti:", -1, 7, 7, 217, 9
+    CONTROL "", 7036, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 7, 17, 215, 89, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&Instalo...", 7037, 9, 110, 67, 14, WS_GROUP
+    PUSHBUTTON "&Ã‡'install", 7038, 80, 110, 67, 14, WS_GROUP
+    PUSHBUTTON "CilÃ«sime", 7039, 153, 110, 67, 14, WS_GROUP
+    GROUPBOX "PÃ«rshkrime", -1, 7, 138, 213, 69
+    LTEXT "<pÃ«rshkrime protokolli>", 7040, 17, 150, 193, 48
+END
+
+7042 DIALOGEX 0, 0, 230, 215
+STYLE DS_SHELLFONT | DS_CONTEXTHELP | WS_CHILD | WS_CAPTION
+CAPTION "PÃ«rdorues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&PÃ«rdoruesit e lejuar pÃ«r tu lidhur:", -1, 7, 5, 213, 8
+    CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 7, 19, 214, 83, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&E're...", 7044, 7, 107, 67, 14, WS_GROUP
+    PUSHBUTTON "&Fshi", 7045, 80, 107, 67, 14, WS_GROUP
+    PUSHBUTTON "CilÃ«sime", 7046, 153, 107, 67, 14, WS_GROUP
+    AUTOCHECKBOX "KÃ«rko tÃ« gjithÃ« pÃ«rdoruesve pÃ«r tÃ« siguruar fjalÃ«kalimet dhe tÃ« dhÃ«nat e tyre.", 7048, 8, 151, 217, 12, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "GjithmonÃ« lejo pajisjet e lidhura direkt tÃ« tilla si kompjutera palmtop tÃ« lidhen pa ofruar njÃ« fjalÃ«kalim.", 7049, 8, 169, 217, 23, BS_TOP | BS_MULTILINE
+    LTEXT "Vini re se faktorÃ« tÃ« tjerÃ«, tÃ« tilla si njÃ« llogari tÃ« pÃ«rdoruesit me aftÃ«si tÃ« kufizuara, mund tÃ« ndikojnÃ« nÃ« aftÃ«sinÃ« e pÃ«rdoruesit pÃ«r tu lidhur.", -1, 9, 126, 212, 23
+END
+
+7049 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni kutinÃ« e kontrollit pranÃ« Ã§do pÃ«rdorues i cili duhet tÃ« lejohet tÃ« lidhet me kÃ«tÃ« kompjuter. Vini re se faktorÃ« tÃ« tjerÃ«, tÃ« tilla si njÃ« llogari tÃ« pÃ«rdoruesit me aftÃ«si tÃ« kufizuara, mund tÃ« ndikojnÃ« nÃ« aftÃ«sinÃ« e pÃ«rdoruesit pÃ«r tu lidhur.", -1, 10, 1, 275, 27
+    LTEXT "&PÃ«rdoruesit e lejuar pÃ«r tu lidhur:", -1, 10, 28, 275, 8
+    CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73
+    PUSHBUTTON "&Shto...", 7044, 10, 122, 65, 14, WS_GROUP
+    PUSHBUTTON "&Hiq", 7045, 79, 122, 65, 14, WS_GROUP
+    PUSHBUTTON "&CilÃ«sime", 7046, 147, 122, 65, 14, WS_GROUP
+END
+
+7050 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni kutinÃ« e kontrollit pranÃ« Ã§do pajisje qÃ« ju dÃ«shironi tÃ« pÃ«rdorni pÃ«r lidhjet hyrÃ«se.", -1, 10, 4, 299, 10
+    LTEXT "&Pajisjet e lidhÃ«se:", -1, 10, 16, 275, 8
+    CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 26, 297, 87
+    PUSHBUTTON "CilÃ«sime", 7013, 243, 120, 65, 14, WS_GROUP
+END
+
+7051 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni kutinÃ« e kontrollit pranÃ« Ã§do lloj programi rrjeti qÃ« duhet aktivizuar pÃ«r lidhjet hyrÃ«se.", -1, 10, 1, 288, 20
+    LTEXT "&Programe rrjeti:", -1, 10, 24, 274, 8
+    CONTROL "", 7036, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 10, 34, 286, 33
+    PUSHBUTTON "&Instalo...", 7037, 108, 71, 60, 14, WS_GROUP
+    PUSHBUTTON "&Ã‡'install", 7038, 172, 71, 60, 14, WS_GROUP
+    PUSHBUTTON "&CilÃ«sime", 7039, 236, 71, 60, 14, WS_GROUP
+    LTEXT "<pÃ«rshkrime protokolli>", 7040, 21, 105, 273, 38
+    LTEXT "PÃ«rshkrime:", -1, 21, 95, 275, 8
+END
+
+7052 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Lidhjet virtuale private nÃ« kompjuterin tuaj nÃ«pÃ«rmjet internetit janÃ« tÃ« mundshme vetÃ«m nÃ« qoftÃ« se kompjuteri juaj ka njÃ« emÃ«r tÃ« njohur ose adresÃ«n IP nÃ« internet.", -1, 10, 4, 290, 20
+    AUTORADIOBUTTON "&Lejo lidhjet virtuale private", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTORADIOBUTTON "&Mos lejoni lidhjet virtuale private", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
+    LTEXT "A doni tÃ« lejoni lidhjet virtuale private nÃ« kÃ«tÃ« kompjuter?", -1, 17, 49, 275, 8
+    LTEXT "NÃ«se ju lejojnÃ« lidhjet VPN, ReactOS do tÃ« ndryshojÃ« MurinMbrojtÃ«s Lidhjes Internetit pÃ«r tÃ« lejuar kompjuterin tuaj tÃ« dÃ«rgojÃ« dhe tÃ« merrÃ« pako VPN.", -1, 10, 25, 293, 25
+END
+
+7055 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Pajisje pÃ«r kÃ«tÃ« lidhje:", -1, 23, 24, 275, 8
+    COMBOBOX 7056, 22, 36, 275, 125, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Pajisjet e tjera pÃ«rveÃ§ asaj qÃ« keni zgjedhur nuk do tÃ« preken dhe mund tÃ« pÃ«rdoret pÃ«r qÃ«llime tÃ« tjera.", -1, 10, 4, 275, 17
+    PUSHBUTTON "&Properties", 7061, 232, 53, 65, 14, WS_GROUP
+END
+
+7379 DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+19900 DIALOGEX 0, 0, 156, 44
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "Rrjeti Telefonues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 563, 19901, 10, 10, 18, 20
+    LTEXT "Duke pritur pÃ«r shÃ«rbime pÃ«r tÃ« filluar...", 19902, 34, 16, 120, 8
+END
+
+STRINGTABLE
+BEGIN
+    187 "&Jo, mos i bjerÃ«\0"
+    188 "Ju (ose nje program) keni kÃ«rkuar informacio nga %1. Cilen lidhje doni tÃ« pÃ«rdorni?\0"
+    189 "Shto Numra Alternativ telefoni\0"
+    190 "Thirr vetem pajisjes e para tÃ« mundÃ«suara\0"
+    191 "Thirr tÃ« gjitha pajisjet\0"
+    192 "Thirr pajisjet sipas nevojave\0"
+    193 "Futni njÃ« emÃ«r pÃ«rdoruesi dhe fjalÃ«kalim me tÃ« drejta nÃ« domenin e rrjetit tÃ« largÃ«t.\0"
+    194 "PÃ«rkthimi i Adresa tÃ« Rrjeti (NAT) aktualisht Ã«shtÃ« instaluar si njÃ« protokoll konfiguruar,\ndhe duhet tÃ« hiqet para se tÃ« bÃ«jÃ« tÃ« mundur ShpÃ«rndarjen e Lidhjes sÃ« Internetit.\nPÃ«r tÃ« hequr PÃ«rkthimin e Adreses sÃ« Rrjetit, hapni Konfigurimin dhe Menaxhuesin e TÃ« Dreltave nÃ« DistancÃ«\nkapÃ« dhe zgjero hyrjen e router-it nÃ« panelin e majtÃ«.\nFshi PÃ«rkthimin e Adresave tÃ« Rrjetit sÃ« protokollit Router-it nga lista e protokolleve \nrouti-m IP've.\0"
+    195 "Kodi i zonÃ«s duhet tÃ« pÃ«rmbajÃ« vetÃ«m shifra 0 tek 9.\0"
+    196 "Emri hyrjes duhet tÃ« pÃ«rmbajÃ« tÃ« paktÃ«n njÃ« karakter jo-bosh dhe nuk mund tÃ« fillojÃ« me njÃ« periudhÃ«. Zgjidhni njÃ« emÃ«r tjetÃ«r..\0"
+    197 "Ju duhet tÃ« zgjidhni njÃ« vlerÃ« prej %1 tek %2 pÃ«r kÃ«tÃ« fushÃ«.\0"
+    198 "Konfigurimi DLL vertetimit i parazgjedhur nuk mund tÃ« ngarkohet. Sigurohuni qÃ« paketa vertetuese parazgjedhur Ã«shtÃ« instaluar si duhet.\0"
+    199 "Lidhja zgjedhur Ã«shtÃ« themeluar nga router me shumÃ« protokolle.\nJu lutemi pÃ«rdorni 'Routing dhe RAS Admin 'mjet pÃ«r tÃ« mbyllur lidhjen'.\0"
+    200 "Komente\0"
+    201 "Konfigurimi PaketÃ«s sÃ« vÃ«rtetuar parazgjedhur dÃ«shtoi.\0"
+    202 "TCP/IP'ja nuk Ã«shtÃ« i instaluar, ose Ã«shtÃ« i paaftÃ« pÃ«r Routim dhe MundÃ«sim tÃ« LargÃ«t. NÃ« Panelin e Kontrollit, fillo Rrjetin, shkoni nÃ« faqen e ShÃ«rbimeve, zgjidhni 'Routim dhe ShÃ«rbime MundÃ«suare nÃ« DistancÃ«' CilÃ«sime, dhe shtypni butonin Rrjeti.\0"
+    203 "IPX nuk Ã«shtÃ« i instaluar, ose Ã«shtÃ« i paaftÃ« pÃ«r Routinm dhe MundÃ«sim tÃ« LargÃ«t. Ju mund tÃ« instaloni/mundÃ«soni IPX me shikimin e vetive nÃ« Ã§do lidhje nÃ« ""Lidhjet"" skedarin.\0"
+    204 "Hiq pajisjes e zgjedhura nga lista?\0"
+    205 "Fshi %1 nga libri i numrave?\0"
+    206 "ShkÃ«put nga %1?\0"
+    207 "NjÃ« dokument me emrin %1 tashmÃ« ekziston.  Mbi-shkruaje atÃ«?\0"
+    208 "Gabime sintakse u gjendÃ«n nÃ« skripte. A doni tÃ« shihni shÃ«nimet e gabimit?\0"
+    209 "'%1' Ã«shtÃ« i lidhur tani.  \0"
+    210 "kliko-djathtas Monitorimin e Formuesit tÃ« Rrjetit nÃ« tabelÃ«n e punÃ«ve pÃ«r ta mbyllur ose kontrolluar statusin e lidhjes suaj.\0"
+    212 "Lidhja me sukses.\0"
+    213 "Metoda vÃ«rtetimi e parazgjedhur duhet tÃ« niset duke shtypur CilÃ«sime.\0"
+    214 "lnk\0"
+    215 "Thirr ikona dokumenteve (*.rnk)\0"
+    216 "*.rnk\0"
+    217 "Krijo ikona thirrjes\0"
+    218 "Lidhja me %1 dÃ«shtoi.  Rilidhja nÃ« pritje...\0"
+    219 "Nuk mund tÃ« marrim informacion inkuadrim.\0"
+    220 "Nuk mund tÃ« marrÃ« informacione tÃ« portit.\0"
+    221 "Nuk mund tÃ« marrÃ« informacione nÃ« projektim.\0"
+    222 "Nuk mund tÃ« ngarkojÃ« listÃ«n e lidhjes.\0"
+    223 "Klient:\0"
+    224 "Detaje\0"
+    225 "Pajisje:\0"
+    226 "Rrjeti:\0"
+    227 "(Jo i lidhur)\0"
+    228 "&Lidhu...\0"
+    229 "Mbylle\0"
+    230 "Lidhja thirrjes\0"
+    231 "Konfigurimi Modemit vendosur nr standard\0"
+    232 "COM1\0"
+    233 "Router nÃ« distancÃ«\0"
+    234 "Modemi ose pajisje\0"
+    235 "Ju lutem shkruani njÃ« emÃ«r pÃ«rdoruesi pÃ«r llogarinÃ« e ndÃ«r-faqes nÃ« router'in e largÃ«t.\0"
+    236 "NjÃ« hyrje me emrin %1 tashmÃ« ekziston.  Zgjidhni njÃ« emÃ«r tjetÃ«r.\0"
+    237 "Ju mund tÃ« dÃ«shironi tÃ« lejoni dÃ«rgimin e fjalÃ«kalimin tuaj pa kryptim.\0"
+    238 "Kryptimi FjalÃ«kalimit\0"
+    239 "Magjistar Ã«shtÃ« i gatshÃ«m pÃ«r tÃ« krijuar lidhjen tuaj.\0"
+    240 "Mbaroi\0"
+    241 "&Numrat telefonik:\0"
+    242 "MÃ« Thirr Mbrapa Tel\0"
+    243 "Modifiko Alternativat e Numrave Telefonik\0"
+    244 "Me qÃ« kjo lidhje Ã«shtÃ« aktualisht aktive, disa konfigurime nuk do tÃ« hyjÃ« nÃ« fuqi deri nÃ« herÃ«n tjetÃ«r qÃ« ju thirrni atÃ«.\0"
+    245 "Nuk ka lidhje nÃ« dispozicion pÃ«r tÃ« gjithÃ« pÃ«rdoruesit.  Ju duhet tÃ« futeni para se tÃ« thirrni.\0"
+    246 "Libri Telefonit Ã«shtÃ« bosh.\n\nShtypni OK pÃ«r tÃ« shtuar njÃ« shÃ«nim.\0"
+    247 "PÃ«r shkak tÃ« kufizimeve tÃ« import/eksportit, tÃ« dhÃ«nat e kryptimit nuk janÃ« nÃ« dispozicion nÃ« kÃ«tÃ« version tÃ« ReactOS.\0"
+    248 "Ju lutem fusni njÃ« X.25 adresÃ« nÃ« ekranin tjetÃ«r.\0"
+    249 "Gabim %1: %2\0"
+    250 "%1\n\nGabim %2: %3\0"
+    251 "%1\n\nGabim %2: %3\nDiagnostikim: %4\0"
+    252 "%1\n\nGabim %2: %3\nKodi DÃ«shtoi: %4\0"
+    253 "%1\n\nGabim %2: %3\n\nShtypni F1 pÃ«r mÃ« shumÃ« informacione.\0"
+    254 "%1\n\nGabim %2: %3\nEmri: %4\0"
+    255 "%1\n\n%4\0"
+    256 "%1\n\nGabim %2: %3\nPÃ«rgjigje: %4\0"
+    257 "Kodi DÃ«shtoi: 0x%1\n\0"
+    258 "Emri: %1\n\0"
+    259 "%1 CP raportoj gabim %2: %3\n\0"
+    260 "%1 CP u lidh me sukses.\n\0"
+    261 "Mund tÃ« zgjidhni cilin protokoll thirrÃ«s tÃ« pÃ«rdorni.\0"
+    262 "Zgjidh Protokollin ThirrÃ«s\0"
+    263 "Kliko Mbaro pÃ«r tÃ« ruajtur '%1'.\0"
+    264 "netcfg.hlp\0"
+    265 "&MasÃ« numÃ«ri suksesshÃ«m nÃ« majÃ« tÃ« lista nÃ« lidhje\0"
+    266 "&Numer Telefoni i Ri:\0"
+    267 "&Numer Telefoni:\0"
+    268 "Numer Telefoni\0"
+    269 "Ju mund tÃ« hyni nÃ« njÃ« adresÃ« IP fikse.\0"
+    270 "IP AdresÃ«\0"
+    271 "Protokollet Interneti (TCP/IP), nuk janÃ« instaluar ose janÃ« tÃ« paaftÃ« pÃ«r MundÃ«sim nÃ« DistancÃ«. NÃ« Panelin e Kontrollit, tÃ« fillojÃ« Rrjeti, shkoni nÃ« faqen e ShÃ«rbimeve, zgjidhni CilÃ«sime 'ShÃ«rbime tÃ« LargÃ«ta MundÃ«simi, dhe shtypni butonin Rrjeti.\0"
+    272 "TCP/IP\0"
+    273 "IPSec, Politika e parazgjedhur\0"
+    274 "IPX/SPX ose pajtueshÃ«m\0"
+    275 " (vendndodhja e tanishme)\0"
+    276 "ISDN\0"
+    277 "TÃ« gjithÃ« linjat shumÃ«-lidheshe ISDN nÃ« dispozicion\0"
+    278 "64K Digjital\0"
+    279 "56K Digjital\0"
+    280 "56K ZÃ«ri\0"
+    281 "Ju mund t'ju duhet njÃ« procedurÃ« tÃ« veÃ§antÃ« para se tÃ« lidheni.\0"
+    282 "Zgjidh Opsionet HyrÃ«se\0"
+    283 "%d%%\0"
+    284 "Numri Telefonit pÃ«r %s\0"
+    285 "&Vendndodhje e Re :\0"
+    286 "&Vendndodhje:\0"
+    287 "Vendndodhje\0"
+    288 "Kjo Ã«shtÃ« pajisja qÃ« do tÃ« pÃ«rdoret pÃ«r tÃ« bÃ«rÃ« lidhjen.\0"
+    289 "Zgjidh njÃ« Pajisje\0"
+    290 "ShumÃ« Linja nuk mund tÃ« jenÃ« deng nÃ«se ju po thÃ«rrisni njÃ« server PPP.\0"
+    291 "Modeme\0"
+    292 "Modemi nuk Ã«shtÃ« instaluar.\0"
+    293 "MS PikÃ«-nÃ«-PikÃ« Kryptim, 128 bit RSA/RC4\0"
+    294 "MS PikÃ«-nÃ«-PikÃ« Kryptim, 40 bit RSA/RC4\0"
+    295 "ShumÃ« Linja\0"
+    296 "(Shtypni Konfiguro pÃ«r tÃ« vendosur)\0"
+    297 "Ju mund tÃ« fusni DNS dhe WINS adresash fikse.\0"
+    298 "Emri Adreses Serverit\0"
+    299 "Niveli-poshtÃ« RAS\0"
+    300 "PPP\0"
+    301 "PPP shumÃ«-lidhje\0"
+    302 "SLIP\0"
+    303 "NetBEUI\0"
+    304 "NjÃ« LiberKontakti personal Ã«shtÃ« krijuar dhe fillon me pÃ«rmbajtjen e sistemit LibriKontakteve.\0"
+    305 "Nuk ka LiberKontakti alternativ qÃ« Ã«shtÃ« zgjedhur.\0"
+    306 "Ajo pajisje nuk mund tÃ« konfigurohet dinamike.\0"
+    307 "Hyrja nuk mund tÃ« fshihet sepse Ã«shtÃ« e lidhur.\0"
+    308 "Nuk ka hyrje tÃ« zgjedhur.  Shtypni butonin e Ri pÃ«r tÃ« krijuar njÃ« hyrje.\0"
+    309 "NjÃ« adresÃ« IP jo-zero duhet furnizuar kur 'specifiko njÃ« adresÃ« IP' Ã«shtÃ« zgjedhur.\0"
+    310 "NjÃ« X.25 AdresÃ« kÃ«rkohet kur njÃ« X.25 rrjet thirrÃ«s apo X.25 pajisje Ã«shtÃ« zgjedhur.\0"
+    311 "(asnjÃ«)\0"
+    312 "'%1' Ã«shtÃ« tashmÃ« nÃ« listÃ«.\0"
+    313 "Siguro fjalÃ«kalimin tim dhe tÃ« dhÃ«nat e mia\0"
+    314 "Protokolli %1 nuk mund tÃ« pÃ«rzgjidhet sepse nuk Ã«shtÃ« instaluar ose Ã«shtÃ« i gjymtuar Akses nÃ« DistancÃ«.  PÃ«r ndryshim, nÃ« Panelin e Kontrollit fillo Rrjetin, zgjidhni faqen ShebimÃ«ve, CilÃ«simet Aksesit nÃ« DistancÃ«, dhe shtypni butonin Rrjeti.\0"
+    315 "Nuk mund te ruaj fjalÃ«kalimin.\0"
+    316 "Nuk mund tÃ« shfaq data.\0"
+    317 "Nuk mund tÃ« marrÃ« informacion thirrje-automa.\0"
+    318 "Nuk mund tÃ« ngarkojÃ« dialogun.\0"
+    319 "Nuk mund tÃ« gjymtojÃ« aksesin shpÃ«rndarÃ«s.\0"
+    320 "Nuk mund tÃ« ngarkojÃ« faqen pronÃ«s.\0"
+    321 "Nuk mund tÃ« ngarkojÃ« LibriKontakteve.\0"
+    322 "Nuk mund tÃ« ngarkojÃ« Menaxhuesin informativ tÃ« port'it RAS.\0"
+    323 "Nuk mund tÃ« lexojÃ« preferencat e pÃ«rdoruesit nga regjistri.\0"
+    324 "Nuk mund tÃ« ngarkojÃ« informacionin e skriptes.\0"
+    325 "Nuk mund tÃ« vÃ«zhgojÃ« script.log me notepad.exe\0"
+    326 "Nuk mund tÃ« modifikojÃ« switch.inf me notepad.exe\0"
+    327 "Nuk mund tÃ« ngarkojÃ« informacionet TAPI.\0"
+    328 "Nuk mund tÃ« ngarkojÃ« informacionet  X.25.\0"
+    329 "Nuk mund tÃ« krijojÃ« njÃ« LibÃ«rKontaktesh tÃ« ri.\0"
+    330 "Nuk mund tÃ«  mundÃ«sojÃ« akses shpÃ«rndarÃ«s.\0"
+    331 "Nuk mund tÃ« lidhet me hyrjen e LibritKontakteve.\0"
+    332 "Nuk mund tÃ« marrÃ« dÃ«rgo/merr buffer.\0"
+    333 "Nuk mund tÃ« marrÃ« status informacioni pÃ«r njÃ« port.\0"
+    334 "Nuk mund tÃ« rifitoj informacion protokolli.\0"
+    335 "Nuk mund tÃ« rifitoj buffer nga pajisja.\0"
+    336 "Nuk mund tÃ« dÃ«rgojÃ« buffer tek pajisja.\0"
+    337 "Nuk mund tÃ«  rifitoj tÃ« dhÃ«nat.\0"
+    338 "Nuk mund tÃ« ruaj informacionin TAPI.\0"
+    339 "Nuk mund tÃ« ruaj tÃ« dhÃ«na.\0"
+    340 "Skripte ka ndaluar.\0"
+    341 "Skripte ka ndaluar pÃ«r shkak tÃ« njÃ« gabimi. DÃ«shironi tÃ« vÃ«zhgoni gabimin e Do you wish to view the error log?\0"
+    342 "Nuk mund tÃ« vendosÃ« informacionet thirr-auto.\0"
+    343 "Nuk mund tÃ« fshij fjalÃ«kalime tÃ« ruajtura.\0"
+    344 "Nuk mund tÃ« shkruaj librin e kontakteve.\0"
+    345 "Duke shkruar preferencat nÃ« regjistÃ«r\0"
+    346 "Nuk mund tÃ« shkruaj ikonÃ« dokumenti.\0"
+    347 "OK\0"
+    348 "Ã‡farÃ« Ã«shtÃ« ISP'ja numrit telefonik tuaj?\0"
+    349 "Numri telefonik pÃ«r tu thirrur\0"
+    350 "Fushat fjalÃ«kalim dhe konfirmo fjalÃ«kalimin nuk janÃ« tÃ« pranueshme.\0"
+    351 "FjalÃ«kalimi i ri dhe fusha konfirmo fjalÃ«kalimin e ri nuk pÃ«rputhen.\0"
+    352 "pbk\0"
+    353 "Dokumenti LibriTelefonik (*.pbk)\0"
+    354 "*.pbk\0"
+    355 "Hap LibriTelefonik\0"
+    356 "Mbyll LibriTelefonik hyrÃ«s\0"
+    357 "Modifiko LibriTelefonik hyrÃ«s\0"
+    358 "Hyrje e re nÃ« LibriTelefonik\0"
+    359 "Numri Telefonik\0"
+    360 "Numrat Telefonik\0"
+    361 "Lidhje Rrjeti\0"
+    362 "Ju duhet tÃ« zgjidhni tÃ« paktÃ«n njÃ« protokoll rrjeti.\0"
+    363 "Para se ju mund tÃ« telefononi server-at PPP duhet tÃ« instaloni njÃ« protokoll rrjeti me aplikacionet e Kontrollit tÃ« Rrjetit.\0"
+    364 "Prefiks i &Ri:\0"
+    365 "&PrefisÃ«:\0"
+    366 "Prefiksi Numrit Telefonit\0"
+    367 "NjÃ« ose mÃ« shumÃ« protokolle tÃ« kÃ«rkuara rrjetit nuk u lidhÃ«n me sukses.\n\n\0"
+    368 "Shtypni Prano pÃ«r tÃ« pÃ«rdorur lidhjen si Ã«shtÃ«, ose Mbyllni pÃ«r shkÃ«putje.\0"
+    369 "PkÃ«-nÃ«-PikÃ« konfigurim protokolli pÃ«r tÃ« pÃ«rdorur kur %1 fillon njÃ« lidhje formo kÃ«rkesa pÃ«r ndÃ«r-faqe %2:\0"
+    370 "[PÃ«r tÃ« ndryshuar fjalÃ«kalimin e ruajtur, klikoni kÃ«tu]\0"
+    405 "Protokolli NetBEUI Ã«shtÃ« e nevojshme pÃ«r tÃ« thirrur serverat e vjetra RAS.\0"
+    406 "Para se ju mund tÃ« telefononi serverat e vjeter Ras ju duhet ta instaloni protokollin NetBEUI. NetBEUI mund tÃ« instalohet me aplikacione Kontroll Panel Rrjeti.\0"
+    407 "&Riformo\0"
+    408 "Ju keni zgjedhur pÃ«r tÃ« Ã§aktivizuar njÃ« ose mÃ« shumÃ« transporte. Duke bÃ«rÃ« kÃ«shtu kÃ«rkohen menaxherÃ«t router dhe protokollet router pÃ«r transportet me aftÃ«si tÃ« kufizuara qÃ« tÃ« hiqet nga kjo kÃ«rkesÃ«-thirrÃ«se ndÃ«rfaqe.\nKlikoni Po nÃ« qoftÃ« se ju doni tÃ« vazhd\n\n\n\n\n\n\noni, apo Jo nÃ« qoftÃ« se ju dÃ«shironi tÃ« ri-mundÃ«soni transportin.\0"
+    409 "ShpÃ«rndarja Lidhjes Internetit\0"
+    410 "KÃ«rkues-formimi ndÃ«rfaqe llogari thirrÃ«se.\0"
+    411 "Ju tani duhet pÃ«r tÃ« vendosur kredencialet thirje-dalÃ«se tÃ« ndÃ«rfaqes '%1' qÃ« do tÃ« pÃ«rdorni kur lidheni me router tÃ« largÃ«t. KÃ«to kredencialet duhet tÃ« pÃ«rputhen me kredencialet e konfiguruara nÃ« router tÃ« largÃ«t pÃ«r thirrje-hyrÃ«se . Kur tÃ« lidheni me njÃ« \n\n\n\n\n\n\nWin NT4/2000 router, emri i pÃ«rdoruesit duhet tÃ« pÃ«rputhen me emrin e ndÃ«rfaqes router tÃ« largÃ«t.\0"
+    412 "mpradmin.hlp\0"
+    413 "&Leviz numrin ose adresÃ«n e suksesshme nÃ« krye tÃ« listÃ«s pÃ«r lidhjen\0"
+    414 "NumÃ«r telefoni i ri ose adresÃ«:\0"
+    415 "Numra telefonine ose adresa:\0"
+    416 "Numra dhe addresa\0"
+    417 "PPP: Win 95/98/NT4/2000, Internet\0"
+    418 "AsnjÃ«\0"
+    419 "SLIP: Lidhje Unix\0"
+    420 "TÃ« gjitha pajisjet e lidhura.\0"
+    421 "Merr rezultatin e regjistrimit...\0"
+    422 "DÃ«rgo informacione thirrmbrapa...\0"
+    423 "DÃ«rgo fjalÃ«kalimin e ri...\0"
+    424 "DhogaritÃ« shpejtÃ«sinÃ« e lidhjes...\0"
+    425 "Kontrolli statusin e verifikimit...\0"
+    426 "Regjistro kompjuterin tuaj njÃ« rrjet...\0"
+    427 "Rigjykimi verifikimit...\0"
+    428 "Verifiko pÃ«rdoruesin dhe fjalÃ«kalimin...\0"
+    429 "Vertetuar.\0"
+    430 "Duke u lidhur nÃ«pÃ«rmjet %1...\0"
+    431 "Formo Numrin...\0"
+    432 "Lidhaj Modem...\0"
+    433 "Lidhaj me kabull...\0"
+    434 "Formo Numrin %1...\0"
+    435 "Lidhu mbi X.25 tek %1...\0"
+    436 "Pas-lidhÃ«se pÃ«rmes %1...\0"
+    437 "Para-lidhÃ«se pÃ«rmes %1...\0"
+    438 "Lidhur.\0"
+    439 "Pajisja lidhur.\0"
+    440 "ShkÃ«putur.\0"
+    441 "Modemi lidhur.\0"
+    442 "Kabulli lidhur.\0"
+    443 "Hap portin...\0"
+    444 "X.25 lidhur.\0"
+    445 "Porti hapur.\0"
+    446 "Pas-lidhja plotÃ«.\0"
+    447 "Para-lidhja plotÃ«.\0"
+    448 "PÃ«rgatitje pÃ«r thirrmbrapa...\0"
+    449 "Kontrollimi i lidhjeve tÃ« protokollit tÃ« rrjetit...\0"
+    450 "Verifiko pÃ«rdoruesin dhe fjalÃ«kalimin...\0"
+    451 "Lidhur, dÃ«ng linjash shtesÃ«\0"
+    452 "GjÃ«ndje panjohur.\0"
+    453 "Pritje pÃ«r thirrjen mbrapa...\0"
+    454 "Pritje pÃ«r rivendosur modemin...\0"
+    455 "Make the phone number change permanent?\0"
+    456 "scp\0"
+    457 "*.scp\0"
+    458 "SkriptÃ« dokumenti thirr (*.scp)\0"
+    459 "Shfleto skriptÃ«n formo numrin\0"
+    460 "Ju duhet tÃ« kontrolloni tÃ« paktÃ«n njÃ« modem ose pÃ«rshtatÃ«s.\0"
+    461 "NumÃ«r telefonik\0"
+    462 "Protokolli TCP/IP Ã«shtÃ« i nevojshÃ«m tÃ« thÃ«rrasÃ« SLIP servers.\0"
+    463 "Para se ju mund tÃ« telefononi serverat SLIP ju duhet ta instaloni protokollin TCP/IP. TCP/IP mund tÃ« instalohet me aplikacionin Kontroll Paneli Rrjetit.\0"
+    464 "GjÃ«ndja\0"
+    465 "PrapashtesÃ« e Re:\0"
+    466 "Prapashtesa:\0"
+    467 "PrapashtesÃ« NumÃ«r Telefoni\0"
+    468 "Ju mund tÃ« shkoni pÃ«r tÃ« zgjedhur parametrat e veÃ§anta, nÃ«se Ã«shtÃ« e nevojshme.\0"
+    469 "Parametra Parazgjedhur\0"
+    470 "Manual Modem KomandÃ« Terminal\0"
+    471 "Pas Terminalit Formues\0"
+    472 "Para Terminalit Formues\0"
+    473 "SLIP Terminal HyrÃ«s\0"
+    474 "10 minuta\0"
+    475 "10 sekonda\0"
+    476 "1 orÃ«\0"
+    477 "1 minuta\0"
+    478 "24 orÃ«\0"
+    479 "2 orÃ«\0"
+    480 "2 minuta\0"
+    481 "30 minuta\0"
+    482 "30 sekonda\0"
+    483 "3 sekonda\0"
+    484 "4 orÃ«\0"
+    485 "4 minuta\0"
+    486 "5 minuta\0"
+    487 "5 sekonda\0"
+    488 "8 orÃ«\0"
+    489 "kurr\0"
+    490 "Ju mund tÃ« bÃ«ni lidhje e re nÃ« dispozicion pÃ«r Ã§do pÃ«rdorues ose vetÃ«m pÃ«r veten tuaj.\0"
+    491 "DisponueshmÃ«ria Lidhjes\0"
+    492 "Hedh cilÃ«simet e shumta tÃ« linjÃ«s  pÃ«r hyrjen?\0"
+    493 "Pajisja pa-disponueshÃ«m\0"
+    494 "Preferencat HyrÃ«se\0"
+    495 "Preferencat Formo-numrin\0"
+    496 "X.25\0"
+    497 "X.25 PAD\0"
+    498 "Ju mund tÃ« leni burimet kompjutera tÃ« tjerÃ« akses pÃ«rmes kÃ«saj lidhje formuese.\0"
+    499 "PÃ«rzgjedhje VPN Server\0"
+    500 "Nuk mund tÃ« mundÃ«sojÃ« mbi-kÃ«rkesÃ«n formimi i numrit.\0"
+    501 "Cili Ã«shtÃ« emri ose adresa e serverit VPN?\0"
+    502 "Nuk mund tÃ« gjymtojÃ« mbi-kÃ«rkesÃ«n formimi i numrit.\0"
+    503 "Rrjeti Publik\0"
+    504 "ReactOS mund tÃ« sigurohet qÃ« rrjet publik Ã«shtÃ« e lidhur sÃ« pari.\0"
+    505 "VPN1\0"
+    506 "ShpÃ«rndarja Lidhjes Internetit\0"
+    507 "Ju mund tÃ« leni njÃ« burim vendÃ«ro tÃ« aksesit tÃ« rrjetit pÃ«rmes kÃ«saj lidhje formuese.\0"
+    508 "PritÃ«se ose Vizitori?\0"
+    509 "ShpÃ«rndarja Lidhjes Internetit Ã«shtÃ« aktivizuar aktualisht pÃ«r lidhje '%1'.\n\nEdhe tani do tÃ« jenÃ« tÃ« aktivizuara pÃ«r lidhje '%2' nÃ« vend.\0"
+    510 "PÃ«r tÃ« lidhur dy kompjutera, kompjuteri juaj duhet tÃ« identifikohet si njÃ« pritÃ«s ose njÃ« vizitor.\0"
+    511 "Kur Lidhaj ShpÃ«rndarÃ«se Internetit Ã«shtÃ« aktivizuar, pÃ«rshtatÃ«si LAN juaj do tÃ« jetÃ« i vendosur pÃ«r tÃ« pÃ«rdorur adresÃ«n IP 192.168.0.1. Kompjuteri juaj mund tÃ« humbasÃ« lidhjen me kompjutera tÃ« tjerÃ« nÃ« rrjetin tuaj. NÃ«se kÃ«ta kompjuterÃ« tÃ« tjerÃ« kanÃ« IP adresa statike, ju duhet vendosur ato pÃ«r tÃ« marrÃ« IP adresat e tyre automatikisht. Jeni te sigurte qe doni te mundÃ«suar Lidhjen ShpÃ«rndarÃ«se Internetit?\0"
+    512 "Zgjidh njÃ« pajisjes\0"
+    513 "Kjo Ã«shtÃ« pajisja qÃ« do tÃ« pÃ«rdoret pÃ«r tÃ« bÃ«rÃ« lidhjen.\0"
+    514 "&Lidhu\0"
+    515 "Le tÃ« pÃ«rcaktojÃ« serveri kryptimin\0"
+    516 "PÃ«rherÃ« krypto tÃ« dhÃ«nat e mia\0"
+    517 "PÃ«rdor MPPE-40 kriptim tÃ« dhÃ«nash\0"
+    518 "PÃ«rdor MPPE-128 kryptim tÃ« dhÃ«nash\0"
+    519 "PÃ«rzgjedhja aktuale e kryptimin kÃ«rkon vertetim MS-CHAP ose EAP.\0"
+    520 "Mesazhe Vertetimi ParapÃ«rzgjedhur\0"
+    521 "Duke u lidhur tek %1...\0"
+    522 "Emri Lidhjes\0"
+    523 "Automatike\0"
+    524 "PPTP VPN\0"
+    525 "L2TP IPSec VPN\0"
+    526 "Zgjidh tipin e lidhjes.\0"
+    527 "Tipi i lidhjes\0"
+    528 "hh.exe netcfg.chm::/trouble_all.htm\0"
+    529 "Lidhja Private Virtuale\0"
+    530 "PÃ«rdorni Ã§do formÃ« tÃ« vÃ«rtetimit tÃ« kÃ«rkuar pÃ«rfshirÃ« tekst tÃ« qartÃ«. Mos kriptoni tÃ« dhÃ«na tÃ«.\0"
+    531 "PÃ«rdorni Ã§do formÃ« tÃ« vÃ«rtetimi qÃ« kÃ«rkon fjalÃ«kalimet pÃ«r tÃ« koduara.  Mos kriptoni tÃ« dhÃ«na tÃ«.\0"
+    532 "Ju lutem shkruani njÃ« emÃ«r pÃ«r hyrjen.\0"
+    533 "Krypto fjalÃ«kalimin dhe tÃ« dhÃ«nat.\0"
+    534 "Ju lutem shkruani njÃ« numÃ«r porti ndÃ«rmjet 1 dhe 65535.\0"
+    535 "Specifikoni vÃ«rtetimin doganore e tÃ« dhÃ«nave kryptume me butonin Konfiguro.\0"
+    536 "PÃ«rdorni Ã§do formÃ« vÃ«rtetimi qÃ« kÃ«rkon fjalÃ«kalimet e kriptuara.  Mos kriptoni tÃ« dhÃ«na.\0"
+    537 "Kripto fjalÃ«kalimin dhe tÃ« dhÃ«nat.\0"
+    538 "Specifikoni vertetimin parapÃ«rgjedhÃ«s dhe tÃ« dhÃ«nat e kriptimit me butonin Konfiguro.\0"
+    539 "Numrin e portit Ã«shtÃ« pÃ«rdorur tashmÃ« nga njÃ« tjetÃ«r hyrje.\nJu lutemi shkruani njÃ« numÃ«r unik portit.\0"
+    540 "Ju lutem shkruani njÃ« ose mÃ« shumÃ« portet pÃ«r pÃ«rgjigjet hyrÃ«se.\0"
+    541 "Ju lutemi zgjidhni hyrjen qÃ« tÃ« fshihet.\0"
+    542 "1 sekond\0"
+    543 "Ju lutemi zgjidhni hyrjen qÃ« duhet modifikuar.\0"
+    549 "Cili Ã«shtÃ« emri i kompjuterit tjetÃ«r qÃ« ju jeni lidh me tÃ«?\0"
+    576 "20 minutÃ«\0"
+    579 "Specifikoni njÃ« emÃ«r pÃ«r lidhjen nÃ« vendin tuaj tÃ« punÃ«s.\0"
+    581 "Aplikacioni Konfigurues i Rrjetit\0"
+    582 "Shkruaj njÃ« emÃ«r pÃ«r kÃ«tÃ« lidhje nÃ« kutinÃ« e mÃ«poshtme.\0"
+    583 "Shkruani emrin e kompjuterit tjetÃ«r nÃ« kutinÃ« e mÃ«poshtme.\0"
+    584 "Shkruaj njÃ« emÃ«r e ISP'sÃ« nÃ« kutinÃ« e mÃ«poshtme.\0"
+    585 "Cili Ã«shtÃ« emri i shÃ«rbimit qÃ« ofron lidhja juaj e internetit?\0"
+    586 "Ju lutemi shkruani adresÃ«n IP tÃ« kompjuterit server nÃ« rrjetin privat.\0"
+    587 "Konfigurime Avancuara\0"
+    588 "Emri hyrjes fillon me njÃ« periudhÃ«. ose pÃ«rmban disa shenja tÃ« pavlefshme. \nZgjidhni njÃ« emÃ«r tjetÃ«r.\0"
+    589 "CilÃ«sime\0"
+    1512 "Porti Komunikues\0"
+    1523 " kanali\0"
+    1526 "Karta Smart\0"
+    1527 "Ju mund tÃ« pÃ«rdorni kartÃ«n tuaj smart me kÃ«tÃ« lidhje.\0"
+    1528 "Lidhje Direkt\0"
+    1529 "Ju lutem zgjidhni njÃ« pajisje pÃ«r kÃ«tÃ« lidhje.\0"
+    1530 "Verdana Bold\0"
+    1531 "12\0"
+    1532 "Tipi Lidhjes\0"
+    1533 "Zgjidhni llojin e ndÃ«rfaqes formuese kÃ«rkesa qÃ« ju dÃ«shironi pÃ«r tÃ« krijuar.\0"
+    1534 "Zgjidhni njÃ« pajisje\0"
+    1535 "Kjo Ã«shtÃ« pajisja qÃ« do tÃ« pÃ«rdoret pÃ«r tÃ« bÃ«rÃ« lidhjen.\0"
+    1536 "Numri Telefonik\0"
+    1537 "Shkruani numrin e telefonit tÃ« serverit nÃ« distancÃ« apo router qÃ« ju po thirrni.\0"
+    1538 "Tipi VPN\0"
+    1539 "PÃ«rzgjidhni llojin e VPN ndÃ«rfaqe qÃ« ju dÃ«shironi pÃ«r tÃ« krijuar.\0"
+    1540 "Adresa Destinacionit\0"
+    1541 "Cili Ã«shtÃ« emri ose adresa e routerit tÃ« largÃ«t?\0"
+    1544 "IP Adresa\0"
+    1545 "Konfiguro adresÃ«n IP tÃ« kÃ«tij routeri pÃ«r kÃ«tÃ« ndÃ«rfaqe.\0"
+    1546 "Adresa Emrit Serverit\0"
+    1547 "Konfiguro adresat DNS dhe WINS pÃ«r pÃ«rdorim nga kjo ndÃ«rfaqe.\0"
+    1548 "Router Scripting\0"
+    1549 "Ju mund tÃ« krijoni njÃ« skriptÃ« pÃ«r lidhjen me router tÃ« largÃ«t.\0"
+    1550 "Formo Kredencialet\0"
+    1551 "Konfiguro emrin e pÃ«rdoruesit dhe fjalÃ«kalimin qÃ« routeri i largÃ«t do tÃ« pÃ«rdorÃ« kur ajo lidhet nÃ« tÃ« kÃ«tÃ« server.\0"
+    1552 "ShkÃ«put Kredencialet\0"
+    1553 "Konfiguro emri i pÃ«rdoruesit dhe fjalÃ«kalimin qÃ« do tÃ« pÃ«rdoret kur lidhet me routerin e largÃ«t.\0"
+    1554 "Emri NdÃ«rfaqes\0"
+    1555 "Zgjidhni emrin me tÃ« cilin kjo ndÃ«rfaqe e re do tÃ« jetÃ« i njohur.\0"
+    1556 "Nuk ka pajisje nÃ« dispozicion\0"
+    1557 "NjÃ« llogari pÃ«rdoruesi %1 tashmÃ« ekziston nÃ« kompjuter vendorÃ«. A duhet kÃ«rkesa e ndÃ«rfaqes formuese tÃ« jetÃ« konfiguruar pÃ«r tÃ« pÃ«rdorur kÃ«tÃ« llogari pÃ«rdoruesi?\0"
+    1558 "Nuk ka parametrat e protokollit tÃ« sigurisÃ« pÃ«r lidhje SLIP nÃ« server.\0"
+    1559 "Lejo fjalÃ«kalimin pasigurta\0"
+    1560 "KÃ«rkojnÃ« fjalÃ«kalimin siguruara\0"
+    1561 "PÃ«rdor kartÃ«n smart\0"
+    1562 "Ju duhet tÃ« zgjidhni tÃ« paktÃ«n njÃ« protokoll verifikues fjalÃ«kalimi.\0"
+    1563 "Nuk lejohet kriptimi (serveri do tÃ« shkÃ«putet nÃ« qoftÃ« se ajo kÃ«rkon kriptim)\0"
+    1564 "Kriptim opsional (lidhu edhe nÃ« qoftÃ« se nuk ka kriptim)\0"
+    1565 "KÃ«rkojnÃ« kriptim (shkÃ«putu nÃ«se server refuzon)\0"
+    1566 "Kriptim maksimal force (shkÃ«put nÃ«se serveri refuzon)\0"
+    1567 " (kriptimi aktivizuar)\0"
+    1568 "Llogaria Informuese Internetit\0"
+    1569 "Ju do ju duhet njÃ« emer llogarie dhe fjalÃ«kalimin pÃ«r tÃ« nÃ«nshkruar te llogaria juaj e internetit.\0"
+    1570 "Paketa e zgjedhur PAA nuk jep Ã§elÃ«sat kriptume. Zgjidh njÃ« paketÃ« PAA qÃ« do tÃ« ofrojnÃ« Ã§elÃ«sat ose zgjidhni tÃ« mos kriptoni.\0"
+    1571 "PÃ«rzgjedhja e tanishme kriptimit kÃ«rkon EAP-it ose ndonjÃ« version tÃ« MS-djalÃ« metodave tÃ« sigurisÃ« hyrÃ«se.\0"
+    1572 "Protokolle dhe Siguria\0"
+    1573 "Zgjidhni transporto dhe opsione tÃ« sigurisÃ« pÃ«r kÃ«tÃ« lidhje.\0"
+    1574 "Protokollet qÃ« keni pÃ«rzgjedhur pÃ«rfshijnÃ« PAP, SPAP, dhe/ose CHAP. NÃ«se njÃ« nga kÃ«to Ã«shtÃ« negociuar, kriptimit i tÃ« dhÃ«nave nuk do tÃ« ndodhÃ«. A doni ju tÃ« mbani kÃ«to rregullime?\0"
+    1575 "PÃ«r t'u lidhur me '%1', ju sÃ« pari duhet tÃ« jeni i lidhur me '%2'. A doni tÃ« lidheni '%2' tani?\0"
+    1576 "Lidhur mbi kabllo paralele...\0"
+    1577 "Lidhur mbi infrared...\0"
+    1578 "Kabllo paralele tÃ« lidhur.\0"
+    1579 "Lidhja Infrared.\0"
+    1580 "Kjo lidhje Ã«shtÃ« konfiguruar pÃ«r tÃ« pÃ«rdorur njÃ« forcÃ« tÃ« dhÃ«nash tÃ« kriptume qÃ« nuk janÃ« pajisur me software tÃ« instaluar. Pronat sigurisÃ« tÃ« kÃ«saj lidhje janÃ« rivendosur nÃ« pikat e forta kriptimit nÃ« dispozicion.\0"
+    1581 "Tipi i VPN:\0"
+    1582 "Ju lutem fusni njÃ« pÃ«rdorues.\0"
+    1583 "Ky pÃ«rdorues dhe fjalÃ«kalimi do tÃ« ruhen pÃ«r pÃ«rdorimin tuaj. Ka tashmÃ« njÃ« pÃ«rdorues dhe fjalÃ«kalimin tÃ« ruajtur pÃ«r tÃ« gjithÃ« pÃ«rdoruesit e tjerÃ« tÃ« kÃ«saj lidhje. A doni tÃ« fshini pÃ«rdoruesin dhe fjalÃ«kalimin e ruajtur pÃ«r tÃ« gjithÃ« pÃ«rdoruesit e tjerÃ«?\0"
+    1584 "PÃ«r shembull, ju mund tÃ« shkruani emrin e vendin tuaj tÃ« punÃ«s ose emrin e njÃ« server qÃ« ju do tÃ« lidheni me.\0"
+    1585 "Informacionet e LlogarisÃ«\0"
+    1586 "Kontrollet nÃ« kÃ«tÃ« fletÃ« tÃ« pronÃ«s janÃ« me aftÃ«si tÃ« kufizuara pÃ«r shkak se sistemi i parÃ« duhet tÃ« restartohet para se tÃ« mund tÃ« bÃ«hen ndryshime tÃ« konfigurimit.\0"
+    1587 "Kontrollet nÃ« kÃ«tÃ« fletÃ« tÃ« pronÃ«s janÃ« tÃ« paaftÃ« pÃ«r shkak se njÃ« ose mÃ« shumÃ« fletÃ« tÃ« tjera tÃ« pronÃ«s e rrjetit janÃ« tashmÃ« tÃ« hapura. PÃ«r tÃ« pÃ«rdorur kÃ«to kontrolle, mbyllni tÃ« gjitha kÃ«to fletÃ« pronÃ«sore dhe pastaj tÃ« rihapÃ« kÃ«tÃ«.\0"
+    1588 "Disa nga kontrollet mbi kÃ«tÃ« fletÃ« tÃ« pronÃ«s janÃ« me aftÃ«si tÃ« kufizuara pÃ«r shkak se ju nuk keni privilegje tÃ« mjaftueshme pÃ«r tÃ« hyrÃ« nÃ« ato.\0"
+    1589 "Mesazhi i mÃ«poshtÃ«m Ã«shtÃ« marrÃ« nga ofruesi juaj i shÃ«rbimit:\r\n\r\n%1\0"
+    1590 "Rilidhu %1\0"
+    1591 "Emri ShÃ«rbimit\0"
+    1592 "Cili Ã«shtÃ« emri i shÃ«rbimit qÃ« ofron lidhjen tuaj broadband?\0"
+    1593 "Ju do ju duhet njÃ« emer e llogarisÃ« dhe fjalÃ«kalimin pÃ«r tÃ« hyrÃ« nÃ« llogarinÃ« tuaj\0"
+    1594 "PPPOE1-0\0"
+    1595 "PikÃ«-nÃ«-PikÃ« Protokoll mbi Ethernet (PPPoE)\0"
+    1596 "Lloji i dhe lidhje &broadband pÃ«r tÃ« bÃ«rÃ«:\0"
+    1611 "Lidhja Broadband\0"
+    1612 "Ju keni zgjedhur pÃ«r tÃ« pÃ«rdorur njÃ« Ã§elÃ«s para-shpÃ«rndarÃ«s, por ju nuk e keni futur njÃ« tÃ« tillÃ«.\nJu lutemi fusni njÃ« Ã§elÃ«s para-shpÃ«rndarÃ«s.\0"
+    1613 "Nuk mund tÃ« DorÃ«zojÃ« letrat kredenciale\0"
+    1634 "PÃ«r shkak se shÃ«rbimi i Menaximit tÃ« InstrumentÃ«ve Windows-i (WMI) ka qenÃ« me aftÃ«si tÃ« kufizuara, ReactOS nuk mund tÃ« shfaqin vetitÃ« e kÃ«saj lidhje ose rrjetit nÃ« shtÃ«pi.\n\nPÃ«r tÃ« konfiguruar vetitÃ« e kÃ«saj lidhje ose rrjetit tuaj nÃ« shtÃ«pi, ju duhet sÃ« pari tÃ« mundÃ«soni shÃ«rbimin WMI. PÃ«r ta bÃ«rÃ« kÃ«tÃ«, ne Veglat Administrative tÃ« panelit tÃ« kontrollit, klikoni dy herÃ« ShÃ«rbimet, klikoni me tÃ« djathtÃ«n nÃ« Menaxhimin e Orkestrimit Windows, dhe pastaj klikoni Fillo.\0"
+    1635 "ReactOS nuk mund tÃ« shfaqin vetitÃ« e kÃ«saj lidhje. Menaxhimi Instrumental Windows (WMI) Informues mund tÃ« jetÃ« i korruptuar. PÃ«r tÃ« korrigjuar kÃ«tÃ«, pÃ«rdorimi Restauro Sistemin pÃ«r tÃ« rivendosur ReactOS njÃ« kohÃ« mÃ« parÃ« (e quajtur njÃ« pikÃ« tÃ« rivendosur). Restaurimi Sistemit Ã«shtÃ« e vendosur nÃ« Dosjen e Veglave tÃ« Sistemit nÃ« Aksesore.\0"
+    1646 "Lejo hyrjen kÃ«rkesÃ« e pÃ«rsÃ«ritur hyrÃ«se\0"
+    1647 "Lejo hyrjen kÃ«rkesÃ« kohÃ«stampe\0"
+    1648 "Lejo hyrjen kÃ«rkesÃ« maske\0"
+    1649 "Lejo hyrjen kÃ«rkesÃ« routeri\0"
+    1650 "Lejo daljen destinacion i pakapshÃ«m\0"
+    1651 "Lejo daljen shuaj burim\0"
+    1652 "Lejo daljen problem parametrash\0"
+    1653 "Lejo daljen koha tejkaluar\0"
+    1654 "Lejo pÃ«rcjellÃ«se\0"
+    1655 "log\0"
+    1656 "*.log\0"
+    1657 "MuriMbrojtÃ«s i dokumentave (*.log)\0"
+    1658 "Shfleto\0"
+    1663 "Zgjidh njÃ« lidhje rrjeti private\0"
+    1664 "PÃ«r tÃ« mundÃ«suar shpÃ«rndarjen e lidhjes internetit njÃ« lidhje duhet tÃ« zgjidhet pÃ«r rrjetin privat. Ju lutem, pÃ«rzgjidhni njÃ« lidhje nga lista e lidhjeve nÃ« dispozicion.\0"
+    1665 "Mesazhet e dÃ«rguara nÃ« kÃ«tÃ« kompjuter do tÃ« pÃ«rsÃ«riten pÃ«rsÃ«ri mbrapa tek dÃ«rguesi. Kjo zakonisht Ã«shtÃ« pÃ«rdorur pÃ«r kontrolluar problemet, pÃ«r shembull, tÃ« ping njÃ« makinÃ«.\0"
+    1666 "TÃ« dhÃ«nat e dÃ«rguara nÃ« kÃ«tÃ« kompjuter mund tÃ« njihen me njÃ« mesazh konfirmimi treguar kohÃ«n qÃ« tÃ« dhÃ«nat janÃ« marrÃ«.\0"
+    1667 "Ky kompjuter do tÃ« dÃ«gjojÃ« pÃ«r dhe do pÃ«rgjigjet kÃ«rkesave pÃ«r mÃ« shumÃ« informacion rreth rrjetit publik pÃ«r tÃ« cilin ajo Ã«shtÃ« e bashkangjitur.\0"
+    1668 "Ky kompjuter do tÃ« pÃ«rgjigjet ndaj kÃ«rkesave pÃ«r informacion nÃ« lidhje me rrugÃ«t qÃ« njeh.\0"
+    1669 "TÃ« dhÃ«nat e dÃ«rguara nÃ« internet qÃ« dÃ«shtojnÃ« pÃ«r tÃ« arritur kÃ«tÃ« kompjuter pÃ«r shkak tÃ« njÃ« gabimi do tÃ« hiqen dhe pranohen me njÃ« mesazh ""destinacion pakapshÃ«m"" qÃ« shpjegon dÃ«shtimin.\0"
+    1670 "Kur aftÃ«sia e kÃ«tij kompjuterit pÃ«r pÃ«rpunimin e tÃ« dhÃ«nave nÃ« hyrje nuk mund tÃ« mbajnÃ« deri me normÃ«n e transmetimit, tÃ« dhÃ«nat do tÃ« hiqen dhe dÃ«rguesi do tÃ« kÃ«rkohet pÃ«r tÃ« ngadalÃ«suar.\0"
+    1671 "Kur ky kompjuter kthen tÃ« dhÃ«nave qÃ« ka marrÃ« pÃ«r shkak tÃ« njÃ« goditje me kokÃ« problematike, ajo do tÃ« pÃ«rgjigjen pÃ«r dÃ«rguesin me njÃ« ""kokÃ« tÃ« keqe"" mesazh gabimi.\0"
+    1672 "Kur ky kompjuter kthen njÃ« transmetim tÃ« dhÃ«nash jo tÃ« plota, sepse i gjithÃ« transmetimi kÃ«rkoi mÃ« shumÃ« kohÃ« se sa e lejuar, ajo do tÃ« pÃ«rgjigjet pÃ«r tÃ« dÃ«rguesit me njÃ« ""kohÃ« tÃ« skaduar "" mesazh.\0"
+    1673 "TÃ« dhÃ«nat e dÃ«rguara nga ky kompjuter do tÃ« ri-routohen nÃ«se rruga e parazgjedhur ndryshon.\0"
+    1675 "Vlera hyrÃ«se pÃ«r madhÃ«sinÃ« e dokumentit shÃ«nime nuk Ã«shtÃ« e vlefshme. Futni njÃ« vlerÃ« nÃ« mes tÃ« 1 dhe 32767 k.\0"
+    1685 "Llogaria juaj e pÃ«rdoruesit nuk duhet lejuar pÃ«r tÃ« pÃ«rdorur kÃ«tÃ« lidhje. Zakonisht, kjo Ã«shtÃ« pÃ«r shkak se ju jeni regjistruar si Vizitor.\0"
+    1686 "Shkruani njÃ« emÃ«r dhe fjalÃ«kalimin. (NÃ«se keni harruar emrin e llogarise ekzistuese apo fjalÃ«kalimin, kontaktoni administratorin e rrjetit tuaj.)\0"
+    1687 "Emri Kompjuterit\0"
+    1688 "Emri ISP\0"
+    1689 "Emri KompanisÃ«\0"
+    1690 "Cili Ã«shtÃ« numri i telefonit qÃ« ju do tÃ« pÃ«rdorni pÃ«r tÃ« bÃ«rÃ« kÃ«tÃ« lidhje?\n\0"
+    7301 "Hyrje CilÃ«sime TCP/IP\0"
+    7302 "Ju duhet tÃ« zgjidhni njÃ« vlerÃ« prej 1% nÃ« 2% pÃ«r kÃ«tÃ« fushÃ«.\0"
+    7306 "Gabimi Lidhjes HyrÃ«se\0"
+    7307 "Gabim i pÃ«rgjithshÃ«m Lidhjes HyrÃ«s\0"
+    7308 "Lidhje HyrÃ«se\0"
+    7309 "Gabim nÃ« Lidhjen HyrÃ«se Rrjetit\0"
+    7310 "Gabim Gjendjen ShumÃ«LidhÃ«se HyrÃ«se\0"
+    7311 "Gabimi Lidhjes HyrÃ«se\0"
+    7312 "Gabim Fillimin e Lidhjes HyrÃ«se\0"
+    7313 "Gabim CilÃ«simi Lidhjes TCP/IP HyrÃ«se\0"
+    7314 "Gabim CilÃ«simi Lidhjes IPX HyrÃ«se\0"
+    7315 "Gabimi Lidhjes HyrÃ«se\0"
+    7316 "Gjenerik\0"
+    7317 "Pajisje\0"
+    7318 "PÃ«rzierje BazÃ« tÃ« dhÃ«nash\0"
+    7319 "PÃ«rdoruesi i BazÃ«s tÃ« dhÃ«nave\0"
+    7320 "Protokolli i BazÃ«s tÃ« dhÃ«nave\0"
+    7321 "Ju duhet tÃ« shkruani njÃ« emÃ«r HyrÃ«s pÃ«r pÃ«rdoruesin e ri ose shtypni anuloj.\0"
+    7322 "FjalÃ«kalimi qÃ« dhatÃ« Ã«shtÃ« shumÃ« e shkurtÃ«r.\0"
+    7323 "FjalÃ«kalimet e futura nuk janÃ« tÃ« njÃ«jta. Ju lutem ri-shkruani ato.\0"
+    7324 "NjÃ« gabim i brendshÃ«m ka ndodhur.  \0"
+    7325 "Listo\0"
+    7326 "NjÃ« gabim ka ndodhur gjatÃ« pÃ«rpjekjes pÃ«r tÃ« kryer ndryshimet qÃ« keni bÃ«rÃ« nÃ« bazÃ«n e tÃ« dhÃ«nave lokale e pÃ«rdoruesit.  \0"
+    7327 "Ju duhet privelegje tÃ« pamjaftueshme pÃ«r tÃ« shtuar njÃ« pÃ«rdorues qÃ« bazÃ«n e tÃ« dhÃ«nave tÃ« sistemit lokal.  \0"
+    7328 "PÃ«rdoruesin qÃ« ju jeni duke u pÃ«rpjekur pÃ«r tÃ« krijuar tashmÃ« ekziston nÃ« bazÃ«n e tÃ« dhÃ«nave lokale e pÃ«rdoruesit.\0"
+    7329 "ShfrytÃ«zuesi nuk Ã«shtÃ« shtuar nÃ« bazÃ«n e tÃ« dhÃ«nave lokale pÃ«rdoruesit, sepse fjalÃ«kalimi qÃ« dhatÃ« Ã«shtÃ« refuzuar.\0"
+    7330 "NÃ« pamundÃ«si pÃ«r tÃ« rifreskuar bazÃ«n e tÃ« dhÃ«nave tÃ« pÃ«rdoruesit tÃ« sistemit pÃ«r shkak tÃ« njÃ« gabimi tÃ« brendshÃ«m.\0"
+    7331 "NjÃ« gabim i brendshÃ«m ka ndodhur: Baza e tÃ« dhÃ«nave lokale tÃ« pÃ«rdoruesve Ã«shtÃ« e korruptuar.\0"
+    7332 "NÃ« pamundÃ«si pÃ«r tÃ« ngarkuar burime tÃ« nevojshme pÃ«r tÃ« shfaqur tab'in e pÃ«rdoruesit.\0"
+    7333 "Ndodhi njÃ« gabim i brendshÃ«m gjatÃ« pÃ«rpjekjes pÃ«r tÃ« rikthyer ndryshimet qÃ« keni bÃ«rÃ« nÃ« bazÃ«n e tÃ« dhÃ«nave lokale e pÃ«rdoruesit.  \0"
+    7334 "Pajisja trajtimit sÃ« BazÃ«s e tÃ« dhÃ«nave Ã«shtÃ« i korruptuar.\0"
+    7335 "NÃ« pamundÃ«si pÃ«r tÃ« ngarkuar burimet e nevojshme pÃ«r tÃ« shfaqur tab'in e pÃ«rgjithshÃ«m.\0"
+    7336 "NjÃ« gabim ka ndodhur gjatÃ« pÃ«rpjekjes pÃ«r tÃ« kryer disa nga ndryshimet tek pajisjet/VPN tÃ« bÃ«ra.  \0"
+    7337 "Ndodhi njÃ« gabim i brendshÃ«m.\0"
+    7338 "NjÃ« gabim i brendshÃ«m ndodhi: Baza e tÃ« dhÃ«nave Komponenti rrjeteve trajtuar Ã«shtÃ« i korruptuar.\0"
+    7339 "NjÃ« gabim i brendshÃ«m ka ndodhur.  \0"
+    7340 "NjÃ« gabim ka ndodhur gjatÃ« pÃ«rpjekjes pÃ«r tÃ« kryer ndryshimet qÃ« keni bÃ«rÃ« pÃ«r tÃ« komponentÃ«ve tÃ« rrjetit.\0"
+    7341 "NjÃ« gabim i brendshÃ«m ka ndodhur.\0"
+    7342 "NÃ« pamundÃ«si pÃ«r tÃ« kryer ndryshimet qÃ« keni bÃ«rÃ« pÃ«r tÃ« TCP/IP protokollit tÃ« sistemit.  \0"
+    7343 "NÃ« pamundÃ«si pÃ«r tÃ« ruajtur ndryshimet qÃ« keni bÃ«rÃ« pÃ«r tÃ« protokollit IPX me sistemin.  \0"
+    7344 "NÃ« pamundÃ«si pÃ«r tÃ« shfaqur TCP/IP cilÃ«simet.\0"
+    7345 "NÃ« pamundÃ«si pÃ«r tÃ« shfaqur vetitÃ« IPX.\0"
+    7346 "NÃ« pamundÃ«si pÃ«r tÃ« ngarkuar TCP/IP cilÃ«simet nga sistemi.  \0"
+    7347 "NÃ« pamundÃ«si pÃ«r tÃ« ngarkuar cilÃ«simet IPX nga sistemi.  \0"
+    7348 "Lidhjet nÃ« hyrje tÃ« varet nga Routime dhe ShÃ«rbimin Aksesit LargÃ«t i cili nuk ishte nÃ« gjendje pÃ«r tÃ« filluar. PÃ«r mÃ« shumÃ« informacion, shikoni shÃ«nimet e ngjarjes tÃ« sistemit.\0"
+    7349 "NÃ« pamundÃ«si pÃ«r tÃ« lejuar modifikimin e komponentÃ«ve tÃ« rrjetit nÃ« kÃ«tÃ« kohÃ«, sepse ata janÃ« duke u modifikuar diku tjetÃ«r.\0"
+    7350 "PÃ«rdorues tÃ« ri qÃ« dhatÃ« nuk Ã«shtÃ« shtuar nÃ« bazÃ«n e tÃ« dhÃ«nave lokale tÃ« pÃ«rdoruesve, sepse emri ose fjalÃ«kalimi futur shkel politikÃ«n e sistemit (kjo ishte shumÃ« e madhe, shumÃ« e vogÃ«l, apo keq-formuar).  \0"
+    7351 "Sistemi nuk Ã«shtÃ« nÃ« gjendje tÃ« fshi pÃ«rdoruesit e kÃ«rkuar.  \0"
+    7352 "NÃ« pamundÃ«si pÃ«r tÃ« hequr komponentin e zgjedhur tÃ« rrjetit pÃ«r shkak se ajo Ã«shtÃ« nÃ« pÃ«rdorim.\0"
+    7353 "ParalajmÃ«rim Lidhjet HyrÃ«se\0"
+    7354 "Ã‡do pÃ«rdoruesit qÃ« ju fshini do tÃ« hiqet pÃ«rgjithmonÃ« nga sistemi edhe nÃ«se anulo Ã«shtÃ« shtypur. Jeni te sigurte qe doni ta hiqni pÃ«rherÃ« %s? \0"
+    7355 "Ju jeni gati pÃ«r tÃ« kaluar nÃ« njÃ« sistem menaxhimi konsol. Kjo lidhje e cilÃ«suar do tÃ« mbyllet dhe Ã§do ndryshim qÃ« mund tÃ« keni bÃ«rÃ« do tÃ« angazhohen nÃ« sistemin. A jeni dakord pÃ«r tÃ« vazhduar?\0"
+    7356 "Vlera juaj MaskÃ«s Rrjetit ka ndryshuar. NjÃ« zero bit nÃ« njÃ« maskÃ« mund tÃ« ndiqet vetÃ«m nga zero copa tÃ« tjera. PÃ«r shembull, njÃ« vlerÃ« Rrjeti maskÃ«, e shprehur nÃ« simbol dhjetore me pika, e 255.255.0.0, Ã«shtÃ« i vlefshÃ«m, por nuk Ã«shtÃ« 255.0.255.0.  \n\0"
+    7357 "Lejet PÃ«rdoruesi\0"
+    7358 "Ju mund tÃ« specifikoni pÃ«rdoruesit tÃ« cilÃ«t mund tÃ« lidheni nÃ« kÃ«tÃ« kompjuter.\0"
+    7359 "Pajisje pÃ«r lidhjet hyrÃ«se\0"
+    7360 "Ju mund tÃ« zgjidhni pajisjet kompjuterike tuaja qÃ« pÃ«rdor pÃ«r tÃ« pranuar lidhjet hyrÃ«se.\0"
+    7361 "Lidhja HyrÃ«se Private Rrjetit (VPN)\0"
+    7362 "NjÃ« kompjuter mund tÃ« lidheni me kompjuterin tuajat pÃ«rmes njÃ« lidhje VPN\0"
+    7363 "Programi Rrjetit\0"
+    7364 "Programi Rrjetit lejon kÃ«tÃ« kompjuter tÃ« pranojÃ« lidhje nga kompjutera tÃ« llojeve e tjera.\0"
+    7365 "Kompletimi Magjistarit tÃ« Lidhjes sÃ« Re\0"
+    7366 " \0"
+    7367 "Lidhjet HyrÃ«se\0"
+    7371 "Ska pajisje nÃ« gjÃ«ndje tÃ« pranojnÃ« thirrjeve qÃ« Ã«shtÃ« instaluar.\0"
+    7372 " \0"
+    7373 "Cakto numrin e rrjetit specifikuar:\0"
+    7374 "Cakto rrjetit numrat sekuenciale nga:\0"
+    7375 "PÃ«rdorues Ri\0"
+    7376 "Lidh Pajisjen\0"
+    7377 "Ã‡farÃ« pajisje ju dÃ«shironi tÃ« pÃ«rdorni pÃ«r tÃ« bÃ«rÃ« kÃ«tÃ« lidhje?\0"
+    7378 "Nuk ka pajisje tÃ« aftÃ« pÃ«r tÃ« pranuar lidhjet e drejtpÃ«rdrejta janÃ« tÃ« instaluara aktualisht.\0"
+    7379 "ParalajmÃ«rim Lidhjes tÃ« Re HyrÃ«se\0"
+    7380 "PÃ«r shkak se ky Win 2000 Server i pÃ«rket ose kontrollon njÃ« domain, ju duhet tÃ« pÃ«rdorni Routim dhe Akses DistancÃ« sistemit tastierÃ« pÃ«r tÃ« konfiguruar kÃ«tÃ« makinÃ« pÃ«r tÃ« marrÃ« lidhjet hyrÃ«se. Anulo ndryshime dhe kaloni nÃ« kÃ«tÃ« konsol?\n\0"
+    7381 "Cakto numrin e rrjetit automatikisht\0"
+    7382 "CaktojÃ« numrat e rrjetit automatikisht\0"
+    7383 "Lidhjet hyrÃ«se nuk mund tÃ« lÃ«shojnÃ« numrat e rrjetit IPX 00000000 ose FFFFFFFF. Ju lutemi tÃ« ndryshoni numrat qÃ« janÃ« caktuar tÃ« rrjetit ose pÃ«rdorni caktimin e numrit tÃ« rrjetit automatik.\0"
+    7384 "to\0"
+    7385 "Porti Komunikues(%s)\0"
+    7386 "Lidhjet Rrjetit nuk shfaqin disa opsione tÃ« specializuara pÃ«r lidhjet pÃ«rbrenda qÃ« janÃ« tÃ« pÃ«rcaktuara duke pÃ«rdorur PÃ«rdoruesin VendorÃ« Futboll apo Politika Aksesi nÃ« DistancÃ« konsole. PÃ«r informacion tÃ« plotÃ« dhe tÃ« saktÃ« pÃ«r lidhjet hyrÃ«se, ju do tÃ« duhet tÃ« pÃ«rdorin kÃ«tÃ« konsole.\0"
+    7387 "MÃ«nyra thirrmbrapa e pÃ«rdoruesit qÃ« keni zgjedhur kÃ«rkon qÃ« ju tÃ« shkruani nÃ« njÃ« numÃ«r tÃ« vlefshme pÃ«r thirrmbrapa.\0"
+    7388 "ReactOS duhet tÃ« riniset pÃ«r tÃ« pÃ«rfunduar operacionin. A Ã«shtÃ« mire tÃ« riniset tani?\0"
+    7389 "Pajisja zgjedhur aktualisht nuk ka opsionet e konfigurimit nÃ« dispozicion.\0"
+    7390 "Gama e pavlefshme\0"
+    7391 "Ju keni kÃ«rkuar qÃ« '%1' tÃ« jetÃ« me aftÃ«si tÃ« kufizuara pÃ«r lidhjet hyrÃ«se. PÃ«r tÃ« Ã§aktivizuar kÃ«tÃ«, ju duhet tÃ« ndaloni shÃ«rbimit 'Serverit'. Pasi u ndal, Ã§do skedarÃ« i pÃ«rbashkÃ«t ose printera nÃ« kÃ«tÃ« kompjuter nuk do tÃ« jenÃ« nÃ« dispozicion tÃ« Ã§do kompjuter tjetÃ«r. A doni tÃ« sjellÃ« tastierÃ«n njÃ« sistem qÃ« do t'ju lejojÃ« tÃ« ndaloni shÃ«rbimin 'Server'?\r\n\nPoshtÃ« Menaxhimit Komputerit, klikoni Veglat Sistemit dhe pastaj kliko ShÃ«rbimet. NÃ« panelin djathtas, klikoni me tÃ« djathtÃ«n Server dhe klikoni ndalo.\0"
+    7392 "Ky port serial nuk Ã«shtÃ« aktivizuar pÃ«r pÃ«rdorim nÃ« njÃ« lidhje tÃ« drejtpÃ«rdrejtÃ« me njÃ« kompjuter tjetÃ«r. Kjo do tÃ« mundÃ«sohet pasi tÃ« keni pÃ«rfunduar kÃ«tÃ« asistent. Ju pastaj mund tÃ« konfiguroni shpejtÃ«sinÃ« e portit dhe cilÃ«sime tÃ« tjera me tÃ« drejtÃ«-duke klikuar ikonÃ«n pÃ«r kÃ«tÃ« lidhje dhe duke zgjedhur CilÃ«sime.\n\0"
+    7393 "Lidhje HyrÃ«se\0"
+    7394 "Adresa IP'sÃ« qÃ« ju keni dhÃ«nÃ« Ã«shtÃ« i pavlefshÃ«m.\0"
+    7395 "MaskÃ« me kusht Ã«shtÃ« i pavlefshÃ«m.\0"
+    7396 "Adresa Fillimi hyrÃ«se pÃ«r TCP/IP Ã«shtÃ« e pavlefshme. Ajo duhet tÃ« shtrihet nÃ« mes 1.0.0.0 dhe 224.0.0.0 dhe nuk duhet tÃ« jetÃ« nÃ« formÃ« 127.x.x.x.\0"
+    7397 "The TCP/IP pool entered is invalid because the address is more specific than the mask.\0"
+    7398 "Adresa fillimit duhet tÃ« jetÃ« mÃ« pak se adresa e fundit.\0"
+    7399 "Routiimi dhe ShÃ«rbimi Aksesit nÃ« DistancÃ« Ã«shtÃ« nÃ« proces tÃ« ndalur. Derisa tÃ« ndalet, opsione Lidhjeve HyrÃ«se nuk Ã«shtÃ« nÃ« dispozicion. Ju lutem prisni disa momente dhe riprovoni.\0"
+    7400 "%s (%s)\0"
+    7401 "%s (%d kanale)\0"
+    7402 "Lidhjet HyrÃ«se VPN (PPTP)\0"
+    7403 "Lidhjet HyrÃ«se VPN (L2TP)\0"
+    7404 "Siguria IP (IKE)\0"
+    7405 "127.0.0.1\0"
+    7406 "Ju nuk keni privilegje tÃ« mjaftueshme pÃ«r tÃ« ngritur lidhjet hyrÃ«se\0"
+    29900 "Nuk mund tÃ« ngarkoni ShÃ«rbimin Menaxhues Lidhjes Aksesit DistancÃ«.\0"
+    29901 "nuk mund tÃ« ngarkojÃ« dokumentin MPRAPI.DLL nÃ« skedarin system32.\0"
+END

Modification de propriÃ©tÃ©s sur dll/win32/rasdlg/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/scrrun/CMakeLists.txt
===================================================================
--- dll/win32/scrrun/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/scrrun/CMakeLists.txt	(copie de travail)
@@ -10,9 +10,8 @@
     dictionary.c
     filesystem.c
     scrrun.c
-    guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)
+    scrrun_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c)
 
 list(APPEND scrrun_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/scrrun.rgs
@@ -20,9 +19,16 @@
     ${CMAKE_CURRENT_BINARY_DIR}/scrrun.tlb)
 
 set_source_files_properties(scrrun.rc PROPERTIES OBJECT_DEPENDS "${scrrun_rc_deps}")
-add_library(scrrun SHARED ${SOURCE} scrrun.rc)
+
+add_library(scrrun SHARED
+    ${SOURCE}
+    guid.c
+    scrrun.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)
+
 add_dependencies(scrrun scrrun_idlheader stdole2)
 set_module_type(scrrun win32dll)
 target_link_libraries(scrrun uuid wine)
 add_importlibs(scrrun oleaut32 version advapi32 msvcrt kernel32 ntdll)
+add_pch(scrrun scrrun_private.h SOURCE)
 add_cd_file(TARGET scrrun DESTINATION reactos/system32 FOR all)
Index: dll/win32/netshell/CMakeLists.txt
===================================================================
--- dll/win32/netshell/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/netshell/CMakeLists.txt	(copie de travail)
@@ -17,15 +17,18 @@
     netshell.cpp
     shfldr_netconnect.cpp
     enumlist.cpp
-    netshell.rc
     classfactory.cpp
     connectmanager.cpp
     lanconnectui.cpp
     lanstatusui.cpp
+    precomp.h)
+
+add_library(netshell SHARED
+    ${SOURCE}
+    netshell.rc
     ${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netshell.def)
 
-add_library(netshell SHARED ${SOURCE})
 set_module_type(netshell win32dll)
 target_link_libraries(netshell uuid wine)
 
@@ -44,5 +47,5 @@
     kernel32
     ntdll)
 
-add_pch(netshell precomp.h)
+add_pch(netshell precomp.h SOURCE)
 add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all)
Index: dll/win32/netshell/lang/sk-SK.rc
===================================================================
--- dll/win32/netshell/lang/sk-SK.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/sk-SK.rc	(copie de travail)
@@ -59,26 +59,26 @@
 CAPTION "Podpora"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Stav pripojenia", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Stav pripojenia", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Typ adresy:", -1, 22, 20, 80, 8
     LTEXT "Adresa IP:", -1, 22, 34, 80, 8
     LTEXT "Maska podsiete:", -1, 22, 48, 80, 8
     LTEXT "PredvolenÃ¡ brÃ¡na:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "Po&drobnosti...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Podrobnosti sieÅ¥ovÃ©ho pripojenia" // SieÅ¥ovÃ© pripojenie - podrobnosti
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Po&drobnosti sieÅ¥ovÃ©ho pripojenia:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&ZavrieÅ¥", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Po&drobnosti sieÅ¥ovÃ©ho pripojenia:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&ZavrieÅ¥", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/sv-SE.rc
===================================================================
--- dll/win32/netshell/lang/sv-SE.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/sv-SE.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Support"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Connection Status", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Address type:", -1, 22, 20, 80, 8
     LTEXT "IP Address:", -1, 22, 34, 80, 8
     LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
     LTEXT "Default Gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/ro-RO.rc
===================================================================
--- dll/win32/netshell/lang/ro-RO.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/ro-RO.rc	(copie de travail)
@@ -68,14 +68,14 @@
     PUSHBUTTON "&Detaliiâ€¦", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Detalii conexiune reÈ›ea"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Detalii de conexiune:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "ÃŽ&nchide", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Detalii de conexiune:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "ÃŽ&nchide", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/he-IL.rc
===================================================================
--- dll/win32/netshell/lang/he-IL.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/he-IL.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "×ª×ž×™×›×”"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "×ž×¦×‘ ×”×—×™×‘×•×¨", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "×ž×¦×‘ ×”×—×™×‘×•×¨", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "×¡×•×’ ×›×ª×•×‘×ª:", -1, 22, 20, 80, 8
     LTEXT "×›×ª×•×‘×ª IP:", -1, 22, 34, 80, 8
     LTEXT "×ž×¡×›×ª ×¨×©×ª ×ž×©× ×”:", -1, 22, 48, 80, 8
     LTEXT "×©×¢×¨ ×‘×¨×™×¨×ª ×ž×—×“×œ:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "×ž×�×¤×™×™× ×™×�...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "×¤×¨×˜×™ ×—×™×‘×•×¨ ×”×¨×©×ª"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "×ž×�×¤×™×™× ×™ ×—×™×‘×•×¨ ×”×¨×©×ª:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "×¡×’×•×¨", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "×ž×�×¤×™×™× ×™ ×—×™×‘×•×¨ ×”×¨×©×ª:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "×¡×’×•×¨", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/ja-JP.rc
===================================================================
--- dll/win32/netshell/lang/ja-JP.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/ja-JP.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "ã‚µãƒ�ãƒ¼ãƒˆ"
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "æŽ¥ç¶šçŠ¶æ…‹", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "æŽ¥ç¶šçŠ¶æ…‹", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "ã‚¢ãƒ‰ãƒ¬ã‚¹ã�®ç¨®é¡ž:", -1, 22, 20, 80, 8
     LTEXT "IP ã‚¢ãƒ‰ãƒ¬ã‚¹:", -1, 22, 34, 80, 8
     LTEXT "ã‚µãƒ–ãƒ�ãƒƒãƒˆ ãƒžã‚¹ã‚¯:", -1, 22, 48, 80, 8
     LTEXT "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤:", -1, 22, 62, 80, 8
-    RTEXT "åˆ©ç”¨ä¸�å�¯", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "åˆ©ç”¨ä¸�å�¯", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "è©³ç´°(&D)...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã�®è©³ç´°"
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã�®è©³ç´°(&D):", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "é–‰ã�˜ã‚‹(&C)", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã�®è©³ç´°(&D):", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "é–‰ã�˜ã‚‹(&C)", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/el-GR.rc
===================================================================
--- dll/win32/netshell/lang/el-GR.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/el-GR.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Î¥Ï€Î¿ÏƒÏ„Î®Ï�Î¹Î¾Î·"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î£Ï�Î½Î´ÎµÏƒÎ·Ï‚", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î£Ï�Î½Î´ÎµÏƒÎ·Ï‚", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Î¤Ï�Ï€Î¿Ï‚ Î”Î¹ÎµÏ�Î¸Ï…Î½ÏƒÎ·Ï‚:", -1, 22, 20, 80, 8
     LTEXT "Î”Î¹ÎµÏ�Î¸Ï…Î½ÏƒÎ· IP:", -1, 22, 34, 80, 8
     LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
     LTEXT "Default Gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/zh-TW.rc
===================================================================
--- dll/win32/netshell/lang/zh-TW.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/zh-TW.rc	(copie de travail)
@@ -62,26 +62,26 @@
 CAPTION "Support"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "é€£æŽ¥ç‹€æ…‹", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "é€£æŽ¥ç‹€æ…‹", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "ä½�å�€é¡žåž‹:", -1, 22, 20, 80, 8
     LTEXT "IP ä½�å�€:", -1, 22, 34, 80, 8
     LTEXT "å­�ç¶²çµ¡é�®ç½©:", -1, 22, 48, 80, 8
     LTEXT "é �è¨­é–˜é�“:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "è©³ç´°è³‡æ–™(&D)...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "ç¶²è·¯é€£ç·šè©³ç´°è³‡æ–™"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "ç¶²è·¯é€£ç·šè©³ç´°è³‡æ–™(&D):", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "é—œé–‰(&C)", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "ç¶²è·¯é€£ç·šè©³ç´°è³‡æ–™(&D):", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "é—œé–‰(&C)", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/ru-RU.rc
===================================================================
--- dll/win32/netshell/lang/ru-RU.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/ru-RU.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "ÐŸÐ¾Ð´Ð´ÐµÐ¶ÐºÐ°"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ� Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ�", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ� Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ�", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Ð¢Ð¸Ð¿ Ð°Ð´Ñ€ÐµÑ�Ð°:", -1, 22, 20, 80, 8
     LTEXT "IP Ð°Ð´Ñ€ÐµÑ�:", -1, 22, 34, 80, 8
     LTEXT "ÐœÐ°Ñ�ÐºÐ° Ð¿Ð¾Ð´Ñ�ÐµÑ‚Ð¸:", -1, 22, 48, 80, 8
     LTEXT "Ð¨Ð»ÑŽÐ· Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ:", -1, 22, 62, 80, 8
-    RTEXT "Ð½/Ð´", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "Ð½/Ð´", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñ�Ñ‚Ð¸...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 172
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Ð”ÐµÑ‚Ð°Ð»Ð¸ Ñ�ÐµÑ‚ÐµÐ²Ð¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ�"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ñ�Ð²ÐµÐ´ÐµÐ½Ð¸Ñ� Ð¾ Ñ�ÐµÑ‚Ð¸:", -1, 5, 4, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 5, 17, 190, 130
-    PUSHBUTTON "&Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ", IDC_CLOSE, 132, 153, 62, 14
+    LTEXT "&Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ñ�Ð²ÐµÐ´ÐµÐ½Ð¸Ñ� Ð¾ Ñ�ÐµÑ‚Ð¸:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/es-ES.rc
===================================================================
--- dll/win32/netshell/lang/es-ES.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/es-ES.rc	(copie de travail)
@@ -66,14 +66,14 @@
     PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Detalles de la conexiÃ³n de red"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Detalles de la conexiÃ³n de red:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Cerrar", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "&Detalles de la conexiÃ³n de red:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Cerrar", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/fr-FR.rc
===================================================================
--- dll/win32/netshell/lang/fr-FR.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/fr-FR.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Support"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Statut de la connexion", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Statut de la connexion", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Type d'adresse :", -1, 22, 20, 80, 8
     LTEXT "Adresse IP :", -1, 22, 34, 80, 8
     LTEXT "Masque de sous-rÃ©seau :", -1, 22, 48, 80, 8
     LTEXT "Passerelle par dÃ©faut :", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&DÃ©tails...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "DÃ©tails de connexion rÃ©seau"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&DÃ©tails de connexion rÃ©seau :", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "Fermer", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "&DÃ©tails de connexion rÃ©seau :", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "Fermer", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/bg-BG.rc
===================================================================
--- dll/win32/netshell/lang/bg-BG.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/bg-BG.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "ÐŸÐ¾Ð´Ð´Ñ€ÑŠÐ¶ÐºÐ°"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Ð¡ÑŠÑ�Ñ‚Ð¾Ñ�Ð½Ð¸Ðµ Ð½Ð° Ñ�Ð²ÑŠÑ€Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Ð¡ÑŠÑ�Ñ‚Ð¾Ñ�Ð½Ð¸Ðµ Ð½Ð° Ñ�Ð²ÑŠÑ€Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Ð’Ð¸Ð´ Ð°Ð´Ñ€ÐµÑ�:", -1, 22, 20, 80, 8
     LTEXT "IP Ð°Ð´Ñ€ÐµÑ�:", -1, 22, 34, 80, 8
     LTEXT "ÐœÑ€ÐµÐ¶Ð¾Ð²Ð° Ð¼Ð°Ñ�ÐºÐ°:", -1, 22, 48, 80, 8
     LTEXT "ÐŸÐ¾Ð´Ñ€Ð°Ð·Ð±Ð¸Ñ€Ð°Ð½ Ñ€Ð°Ð·Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÐµÐ» (gateway):", -1, 22, 62, 80, 8
-    RTEXT "Ð�ÐµÐ½Ð°Ð»Ð¸Ñ‡Ð½Ð¾", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "Ð�ÐµÐ½Ð°Ð»Ð¸Ñ‡Ð½Ð¾", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñ�Ñ‚Ð¸...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñ�Ñ‚Ð¸ Ð·Ð° Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¾Ñ‚Ð¾ Ñ�Ð²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "ÐŸÐ¾&Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñ�Ñ‚Ð¸ Ð·Ð° Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¾Ñ‚Ð¾ Ñ�Ð²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Ð—Ð°Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ðµ", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "ÐŸÐ¾&Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñ�Ñ‚Ð¸ Ð·Ð° Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¾Ñ‚Ð¾ Ñ�Ð²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Ð—Ð°Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ðµ", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/de-DE.rc
===================================================================
--- dll/win32/netshell/lang/de-DE.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/de-DE.rc	(copie de travail)
@@ -66,14 +66,14 @@
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Netzwerkverbindungsdetails"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Netzwerkverbindungs&details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&SchlieÃŸen", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Netzwerkverbindungs&details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&SchlieÃŸen", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/zh-CN.rc
===================================================================
--- dll/win32/netshell/lang/zh-CN.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/zh-CN.rc	(copie de travail)
@@ -62,26 +62,26 @@
 CAPTION "Support"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "è¿žæŽ¥çŠ¶æ€�", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "è¿žæŽ¥çŠ¶æ€�", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Address type:", -1, 22, 20, 80, 8
     LTEXT "IP åœ°å�€:", -1, 22, 34, 80, 8
     LTEXT "å­�ç½‘æŽ©ç �:", -1, 22, 48, 80, 8
     LTEXT "é»˜è®¤ç½‘å…³:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/cs-CZ.rc
===================================================================
--- dll/win32/netshell/lang/cs-CZ.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/cs-CZ.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Podpora"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Stav pÅ™ipojenÃ­", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Stav pÅ™ipojenÃ­", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Typ adresy:", -1, 22, 20, 80, 8
     LTEXT "IP adresa:", -1, 22, 34, 80, 8
     LTEXT "Maska podsÃ­tÄ›:", -1, 22, 48, 80, 8
     LTEXT "VÃ½chozÃ­ brÃ¡na:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Podrobnosti...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Podrobnosti sÃ­Å¥ovÃ©ho pÅ™ipojenÃ­"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Podrobnosti sÃ­Å¥ovÃ©ho pÅ™ipojenÃ­:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&zavÅ™Ã­t", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "&Podrobnosti sÃ­Å¥ovÃ©ho pÅ™ipojenÃ­:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&zavÅ™Ã­t", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/da-DK.rc
===================================================================
--- dll/win32/netshell/lang/da-DK.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/da-DK.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Support"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Connection Status", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Address type:", -1, 22, 20, 80, 8
     LTEXT "IP Address:", -1, 22, 34, 80, 8
     LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
     LTEXT "Default Gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/nl-NL.rc
===================================================================
--- dll/win32/netshell/lang/nl-NL.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/nl-NL.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Support"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Verbinding Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Verbinding Status", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Adres type:", -1, 22, 20, 80, 8
     LTEXT "IP adres:", -1, 22, 34, 80, 8
     LTEXT "SubNet mask:", -1, 22, 48, 80, 8
     LTEXT "Standaard gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Netwerk Verbinding Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Netwerk Verbinding &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Netwerk Verbinding &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/uk-UA.rc
===================================================================
--- dll/win32/netshell/lang/uk-UA.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/uk-UA.rc	(copie de travail)
@@ -74,14 +74,14 @@
     PUSHBUTTON "&Ð¡ÐºÐ»Ð°Ð´...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Ð’Ñ–Ð´Ð¾Ð¼Ð¾Ñ�Ñ‚Ñ– Ð¿Ñ€Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ð½Ðµ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ�"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Ð’Ñ–Ð´Ð¾Ð¼Ð¾Ñ�Ñ‚Ñ– Ð¿Ñ€Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ð½Ðµ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ�:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "&Ð’Ñ–Ð´Ð¾Ð¼Ð¾Ñ�Ñ‚Ñ– Ð¿Ñ€Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ð½Ðµ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ�:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/pl-PL.rc
===================================================================
--- dll/win32/netshell/lang/pl-PL.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/pl-PL.rc	(copie de travail)
@@ -56,26 +56,26 @@
 CAPTION "SzczegÃ³Å‚y"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Status poÅ‚Ä…czenia", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Status poÅ‚Ä…czenia", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Typ adresu:", -1, 22, 20, 80, 8
     LTEXT "Adres IP:", -1, 22, 34, 80, 8
     LTEXT "Maska podsieci:", -1, 22, 48, 80, 8
     LTEXT "Brama domyÅ›lna:", -1, 22, 62, 80, 8
-    RTEXT "n/d", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "n/d", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&SzczegÃ³Å‚y...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "SzczegÃ³Å‚y poÅ‚Ä…czenia sieciowego"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&SzczegÃ³Å‚y poÅ‚Ä…czenia sieciowego:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Zamknij", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "&SzczegÃ³Å‚y poÅ‚Ä…czenia sieciowego:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Zamknij", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/no-NO.rc
===================================================================
--- dll/win32/netshell/lang/no-NO.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/no-NO.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Hjelp"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Tilkoblingsstatus", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Tilkoblingsstatus", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Adressetype:", -1, 22, 20, 80, 8
     LTEXT "IP adresse:", -1, 22, 34, 80, 8
     LTEXT "Subnet maske:", -1, 22, 48, 80, 8
     LTEXT "Standard Gateway:", -1, 22, 62, 80, 8
-    RTEXT "Ikke tilgjengelig", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "Ikke tilgjengelig", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Detaljer...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Nettverk tilkobling detaljer"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Nettverk tilkobling &detaljer:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Lukk", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Nettverk tilkobling &detaljer:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Lukk", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/it-IT.rc
===================================================================
--- dll/win32/netshell/lang/it-IT.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/it-IT.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Supporto"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Stato della connessione", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Stato della connessione", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Tipo di indirizzo:", -1, 22, 20, 80, 8
     LTEXT "Indirizzo IP:", -1, 22, 34, 80, 8
     LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
     LTEXT "Default Gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Dettagli della connessione di rete"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Dettagli della connessione di &rete:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Dettagli della connessione di &rete:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/id-ID.rc
===================================================================
--- dll/win32/netshell/lang/id-ID.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/id-ID.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Dukungan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Status Sambungan", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Status Sambungan", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Tipe Alamat:", -1, 22, 20, 80, 8
     LTEXT "Alamat IP:", -1, 22, 34, 80, 8
     LTEXT "SubNet mask:", -1, 22, 48, 80, 8
     LTEXT "Gateway standar:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Detil...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/hu-HU.rc
===================================================================
--- dll/win32/netshell/lang/hu-HU.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/hu-HU.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Support"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Connection Status", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Address type:", -1, 22, 20, 80, 8
     LTEXT "IP Address:", -1, 22, 34, 80, 8
     LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
     LTEXT "Default Gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/en-US.rc
===================================================================
--- dll/win32/netshell/lang/en-US.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/lang/en-US.rc	(copie de travail)
@@ -54,26 +54,26 @@
 CAPTION "Support"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+    GROUPBOX "Connection Status", -1, 9, 8, 190, 88, BS_GROUPBOX
     LTEXT "Address type:", -1, 22, 20, 80, 8
     LTEXT "IP Address:", -1, 22, 34, 80, 8
     LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
     LTEXT "Default Gateway:", -1, 22, 62, 80, 8
-    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
-    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 112, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8
     PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
-IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Network Connection Details"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
-    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
-    PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+    LTEXT "Network Connection &Details:", -1, 10, 4, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130
+    PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
 END
 
 STRINGTABLE
Index: dll/win32/netshell/lang/sq-AL.rc
===================================================================
--- dll/win32/netshell/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/netshell/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,126 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55
+    LTEXT "Lidhu Duke pÃ«rdorur:", -1, 9, 9, 217, 8
+    EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY
+    PUSHBUTTON "&Konfiguro", IDC_CONFIGURE, 189, 38, 50, 14
+    LTEXT "Komponentet e kontrolluar janÃ« pÃ«rdorur nga kjo lidhje:", -1, 9, 59, 217, 8
+    PUSHBUTTON "&Instalo", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP
+    PUSHBUTTON "&Ã‡'instalo", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP
+    PUSHBUTTON "&Karaktiristsikat", IDC_PROPERTIES, 174, 130, 65, 14
+    GROUPBOX "PÃ«rshkrimi", -1, 9, 153, 230, 46, BS_GROUPBOX
+    LTEXT "PÃ«rshkrimi Komponenteve shkon kÃ«tu...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP
+    CHECKBOX "&Shfaq Ikonat nÃ« tabelen e punÃ«s gjatÃ« lidhjes", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&MÃ« njofto kur kjo linjÃ« ka kufizim ose ska lidhje", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+END
+
+IDD_STATUS DIALOGEX 0, 0, 200, 280
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_LAN_NETSTATUS DIALOGEX 0, 0, 200, 180
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Lidhje", -1, 9, 8, 182, 58, BS_GROUPBOX
+    LTEXT "GjÃ«ndje:", -1, 19, 20, 60, 8
+    LTEXT "KohÃ«zgjatja:", -1, 19, 34, 60, 8
+    LTEXT "ShpejtÃ«sia:", -1, 19, 48, 60, 8
+    GROUPBOX "Aktiviteti", -1, 9, 74, 182, 70, BS_GROUPBOX
+    RTEXT "SentDÃ«guar", -1, 26, 90, 60, 8
+    ICON "", IDC_NETSTAT, 110, 85, 32, 32
+    LTEXT "MarrÃ«", -1, 149, 90, 37, 8
+    LTEXT "Bytes:", -1, 17, 115, 32, 8
+    RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
+    RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
+    PUSHBUTTON "&Karaktiristsikat", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "&Gjzmto", IDC_ENDISABLE, 66, 150, 50, 14
+    RTEXT "", IDC_STATUS, 83, 20, 98, 8
+    RTEXT "", IDC_DURATION, 83, 34, 98, 8
+    RTEXT "", IDC_SPEED, 83, 48, 98, 8
+END
+
+IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "MbÃ«shtetje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "GjÃ«ndja Lidhjes", -1, 9, 8, 200, 88, BS_GROUPBOX
+    LTEXT "Tipi Adreses:", -1, 22, 20, 80, 8
+    LTEXT "Adresa IP:", -1, 22, 34, 80, 8
+    LTEXT "Subnet MaskÃ«:", -1, 22, 48, 80, 8
+    LTEXT "Gateway ParapÃ«rzgjedhur:", -1, 22, 62, 80, 8
+    RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+    RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+    RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+    PUSHBUTTON "&Detaje...", IDC_DETAILS, 22, 76, 62, 14
+END
+
+IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 200, 200
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "Detaje Lidhjes Rrjetit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Detaje Lidhjes Rrjetit:", -1, 15, 9, 170, 12
+    CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+    PUSHBUTTON "&Mbyll", IDC_CLOSE, 125, 165, 62, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_PHYSICAL_ADDRESS "Adresa Fiyike"
+    IDS_IP_ADDRESS "Adresa IP"
+    IDS_SUBNET_MASK "Subnet MaskÃ«"
+    IDS_DEF_GATEWAY "Gateway ParapÃ«rzgjedhur"
+    IDS_DHCP_SERVER "DHCP Serveri"
+    IDS_LEASE_OBTAINED "MarrÃ« me Qira"
+    IDS_LEASE_EXPIRES "Qiraja Skadon"
+    IDS_DNS_SERVERS "DNS Server-at"
+    IDS_WINS_SERVERS "WINS Server-at"
+    IDS_PROPERTY "Karakteristikat"
+    IDS_VALUE "Vlera"
+    IDS_NETWORKCONNECTION "Lidhja Rrjetit"
+    IDS_SHV_COLUMN_NAME "Emri"
+    IDS_SHV_COLUMN_TYPE "Tipi"
+    IDS_SHV_COLUMN_STATE "GjÃ«ndja"
+    IDS_SHV_COLUMN_DEVNAME "Emri Pajisjes"
+    IDS_SHV_COLUMN_PHONE "Telefoni # ose Adresa Host-it"
+    IDS_SHV_COLUMN_OWNER "Pronari"
+    IDS_TYPE_ETHERNET "LAN ose Internet ShpejtÃ«si-LartÃ«"
+    IDS_STATUS_NON_OPERATIONAL "Gjymto"
+    IDS_STATUS_UNREACHABLE "Ska Lidhje"
+    IDS_STATUS_DISCONNECTED "Kabulli Rrjetit Stakuar"
+    IDS_STATUS_CONNECTING "Marrje Adrese e Rrjetit"
+    IDS_STATUS_CONNECTED "Lidhur"
+    IDS_STATUS_OPERATIONAL "Lidhur"
+    IDS_NET_ACTIVATE "MundÃ«suar"
+    IDS_NET_DEACTIVATE "Gjymtoj"
+    IDS_NET_STATUS "GjÃ«ndja"
+    IDS_NET_REPAIR "Riparim"
+    IDS_NET_CREATELINK "Krijo Ikone"
+    IDS_NET_DELETE "Fshi"
+    IDS_NET_RENAME "RiemÃ«rtoj"
+    IDS_NET_PROPERTIES "Karaktiristsikat"
+    IDS_FORMAT_BIT "%u Bit/s"
+    IDS_FORMAT_KBIT "%u KBit/s"
+    IDS_FORMAT_MBIT "%u MBit/s"
+    IDS_FORMAT_GBIT "%u GBit/s"
+    IDS_DURATION_DAY "%d Day %s"
+    IDS_DURATION_DAYS "%d DitÃ« %s"
+    IDS_ASSIGNED_DHCP "Caktuar nga DHCP"
+    IDS_ASSIGNED_MANUAL "Konfiguruar Manualisht"
+END

Modification de propriÃ©tÃ©s sur dll/win32/netshell/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/netshell/netshell.rc
===================================================================
--- dll/win32/netshell/netshell.rc	(rÃ©vision 61927)
+++ dll/win32/netshell/netshell.rc	(copie de travail)
@@ -82,6 +82,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/win32/netshell/lanconnectui.cpp
===================================================================
--- dll/win32/netshell/lanconnectui.cpp	(rÃ©vision 61927)
+++ dll/win32/netshell/lanconnectui.cpp	(copie de travail)
@@ -2,6 +2,7 @@
 
 #include <netcfgx.h>
 #include <netcfgn.h>
+#include <strsafe.h>
 
 /// CLASSID
 /// {7007ACC5-3202-11D1-AAD2-00805FC1270E}
@@ -53,6 +54,7 @@
         VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type);
         VOID InitializeLANPropertiesUIDlg(HWND hwndDlg);
         VOID ShowNetworkComponentProperties(HWND hwndDlg);
+        BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); 
         static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
         INetConnection * pCon;
@@ -426,11 +428,75 @@
                 This->ShowNetworkComponentProperties(hwndDlg);
                 return FALSE;
             }
+            else if (LOWORD(wParam) == IDC_CONFIGURE)
+            {
+                LPOLESTR DeviceInstanceID;
+                This = (CNetConnectionPropertyUi*)GetWindowLongPtr(hwndDlg, DWLP_USER);
+
+                if (This->GetDeviceInstanceID(&DeviceInstanceID))
+                {
+                    WCHAR wszCmd[2*MAX_PATH];
+                    StringCbPrintfW(wszCmd, sizeof(wszCmd), L"rundll32.exe devmgr.dll,DeviceProperties_RunDLL /DeviceID %s", DeviceInstanceID);
+                    CoTaskMemFree(DeviceInstanceID);
+
+                    STARTUPINFOW si;
+                    PROCESS_INFORMATION pi;
+                    ZeroMemory(&si, sizeof(si));
+                    si.cb = sizeof(si);
+                    if (!CreateProcessW(NULL, wszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+                        break;
+
+                   CloseHandle(pi.hProcess);
+                   CloseHandle(pi.hThread);
+                }
+            }
             break;
     }
     return FALSE;
 }
 
+BOOL
+CNetConnectionPropertyUi::GetDeviceInstanceID(
+    OUT LPOLESTR *DeviceInstanceID)
+{
+    LPOLESTR pStr, pResult;
+    HKEY hKey;
+    DWORD dwInstanceID;
+    WCHAR szKeyName[2*MAX_PATH];
+    WCHAR szInstanceID[2*MAX_PATH];
+
+    if (StringFromCLSID(pProperties->guidId, &pStr) != ERROR_SUCCESS)
+    {
+        // failed to convert guid to string
+        return FALSE;
+    }
+
+    StringCbPrintfW(szKeyName, sizeof(szKeyName), L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pStr);
+    CoTaskMemFree(pStr);
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKeyName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) 
+    {
+        // failed to open key
+        return FALSE;
+    }
+    
+    dwInstanceID = sizeof(szInstanceID);
+    if (RegGetValueW(hKey, NULL, L"PnpInstanceId", RRF_RT_REG_SZ, NULL, (PVOID)szInstanceID, &dwInstanceID) == ERROR_SUCCESS)
+    {
+        szInstanceID[MAX_PATH-1] = L'\0';
+        pResult = (LPOLESTR)CoTaskMemAlloc((wcslen(szInstanceID) + 1) * sizeof(WCHAR));
+        if (pResult != 0)
+        {
+            wcscpy(pResult, szInstanceID);
+            *DeviceInstanceID = pResult;
+            RegCloseKey(hKey);
+            return TRUE;
+        }
+    }
+    RegCloseKey(hKey);
+    return FALSE;
+}
+
 HRESULT
 WINAPI
 CNetConnectionPropertyUi::QueryInterface(
@@ -568,6 +634,7 @@
         return E_POINTER;
 
     this->pCon = pCon;
+	
     pCon->AddRef();
     return S_OK;
 }
Index: dll/win32/ole32/storage32.h
===================================================================
--- dll/win32/ole32/storage32.h	(rÃ©vision 61927)
+++ dll/win32/ole32/storage32.h	(copie de travail)
@@ -27,6 +27,7 @@
  * 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 __STORAGE32_H__
 #define __STORAGE32_H__
 
Index: dll/win32/ole32/CMakeLists.txt
===================================================================
--- dll/win32/ole32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/ole32/CMakeLists.txt	(copie de travail)
@@ -59,10 +59,19 @@
     storage32.c
     stubmanager.c
     usrmarshal.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
+    ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c)
+
+if(MSVC AND (ARCH STREQUAL "i386"))
+    list(APPEND SOURCE msvc-thiscall.c)
+endif()
+
+add_library(ole32 SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
+    ole32res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c
-    ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32_objidl_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32_oleidl_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32_unknwn_p.c
@@ -70,14 +79,10 @@
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
 
-if(MSVC AND (ARCH STREQUAL "i386"))
-    list(APPEND SOURCE msvc-thiscall.c)
-endif()
-
-add_library(ole32 SHARED ${SOURCE} ole32res.rc)
 set_module_type(ole32 win32dll)
 target_link_libraries(ole32 wine uuid ${PSEH_LIB})
 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
 add_delay_importlibs(ole32 oleaut32)
 add_dependencies(ole32 ole32idl)
+add_pch(ole32 precomp.h SOURCE)
 add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/ole32/enumx.h
===================================================================
--- dll/win32/ole32/enumx.h	(rÃ©vision 61927)
+++ dll/win32/ole32/enumx.h	(copie de travail)
@@ -31,4 +31,4 @@
 extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG) DECLSPEC_HIDDEN;
 extern void *enumx_add_element(enumx_impl *, const void *) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* __OLE_ENUM_H__ */
Index: dll/win32/devmgr/devmgr.rc
===================================================================
--- dll/win32/devmgr/devmgr.rc	(rÃ©vision 61927)
+++ dll/win32/devmgr/devmgr.rc	(copie de travail)
@@ -68,6 +68,12 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/devmgr/CMakeLists.txt
===================================================================
--- dll/win32/devmgr/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/devmgr/CMakeLists.txt	(copie de travail)
@@ -2,7 +2,6 @@
 spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
-    devmgr.rc
     advprop.c
     devprblm.c
     hwpage.c
@@ -9,10 +8,14 @@
     hwresource.c
     misc.c
     stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c)
+
+add_library(devmgr SHARED
+    ${SOURCE}
+    devmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
 
-add_library(devmgr SHARED ${SOURCE})
 set_module_type(devmgr win32dll UNICODE)
 target_link_libraries(devmgr uuid wine)
 
@@ -26,5 +29,5 @@
     kernel32
     ntdll)
 
-add_pch(devmgr precomp.h)
+add_pch(devmgr precomp.h SOURCE)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
Index: dll/win32/devmgr/lang/sq-AL.rc
===================================================================
--- dll/win32/devmgr/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/devmgr/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,241 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_NAME "Emri"
+    IDS_TYPE "Tipi"
+    IDS_MANUFACTURER "Prodhues: %1"
+    IDS_LOCATION "Vendnodhje: %1"
+    IDS_STATUS "Gjendja PjesÃ«s Elektronike: %1"
+    IDS_UNKNOWN "Panjohur"
+    IDS_LOCATIONSTR "Vendnodhje %1!u! (%2)"
+    IDS_DEVCODE " (Kode %1!u!)"
+    IDS_DEVCODE2 " (Kode %2!u!)"
+    IDS_ENABLEDEVICE "PÃ«rdor kÃ«tÃ«t pjesÃ« (mundÃ«so)"
+    IDS_DISABLEDEVICE "Mos pÃ«rdor kÃ«tÃ« pjesÃ« (gjymto)"
+    IDS_UNKNOWNDEVICE "PjesÃ« panjohur"
+    IDS_NODRIVERLOADED "Komanduesit e kÃ«saj pajisje nuk kane instaluar."
+    IDS_DEVONPARENT "ndeyur %1"
+    IDS_TROUBLESHOOTDEV "&Rregullo..."
+    IDS_ENABLEDEV "MundÃ«so Pajisjen"
+    IDS_REINSTALLDRV "Re&instalo Komanduesit"
+    IDS_PROPERTIES "Karakteristikat"
+    IDS_UPDATEDRV "Azhorno Komanduesin..."
+    IDS_REBOOT "Rifillo &Komphuterin..."
+    IDS_NOTAVAILABLE "Jo nÃ« dispozicion"
+    IDS_NOTDIGITALLYSIGNED "Nuk Ã«shtÃ« nÃ«nshkruar digjitale"
+    IDS_NODRIVERS "Nuk ka dokument komandimi tÃ« nevojshme ose tÃ« jenÃ« qenÃ« tÃ« ngarkuar pÃ«r kÃ«tÃ« pajisje."
+    IDS_RESOURCE_COLUMN "Tipi burimeve"
+    IDS_SETTING_COLUMN "CilÃ«sime"
+    IDS_RESOURCE_MEMORY_RANGE "Shtrirje Memorie"
+    IDS_RESOURCE_INTERRUPT "IRQ"
+    IDS_RESOURCE_DMA "DMA"
+    IDS_RESOURCE_PORT "E/A shtrirje"
+END
+
+/* error messages, source: http://www.z123.org/techsupport/medm.htm */
+STRINGTABLE
+BEGIN
+    IDS_DEV_NO_PROBLEM "Kjo pajisje Ã«shtÃ« duke punuar si duhet."
+    IDS_DEV_NOT_CONFIGURED "Kjo pajisje nuk Ã«shtÃ« i konfiguruar si duhet."
+    IDS_DEV_DEVLOADER_FAILED "ReactOS nuk mund tÃ« ngarkojÃ« komanduesin pÃ«r kÃ«tÃ« pajisje, sepse kompjuteri po raporton dy %1 lloje tÃ« busÃ«-ve."
+    IDS_DEV_DEVLOADER_FAILED2 "%1 ngarkuesi i pajisje(s) pÃ«r kÃ«tÃ« pajisje nuk mund tÃ« ngarkojÃ« komanduesin e pajisjes."
+    IDS_DEV_OUT_OF_MEMORY "Komanduesi pÃ«r kÃ«tÃ« pajisje mund tÃ« jetÃ« i keq, ose sistemi juaj mund tÃ« jetÃ« i ulÃ«t nÃ« kujtesÃ« ose burime tÃ« tjera."
+    IDS_DEV_ENTRY_IS_WRONG_TYPE "Kjo pajisje nuk punon si duhet, sepse njÃ« nga drejtuesit e saj mund tÃ« jetÃ« i keq, ose regjistri juaj mund tÃ« jetÃ« i keq."
+    IDS_DEV_LACKED_ARBITRATOR "Komanduesi pÃ«r kÃ«tÃ« pajisje kÃ«rkoi njÃ« burim qÃ« ReactOS nuk e di se si tÃ« trajtojÃ«."
+    IDS_DEV_BOOT_CONFIG_CONFLICT "NjÃ« tjetÃ«r pajisje Ã«shtÃ« duke pÃ«rdorur nevojat e burimet e kÃ«saj pajisje."
+    IDS_DEV_FAILED_FILTER "Komanduesi pÃ«r kÃ«tÃ« pajisje duhet tÃ« re-instaluar."
+    IDS_DEV_DEVLOADER_NOT_FOUND "Kjo pajisje nuk punon si duhet, sepse ReactOS nuk mund tÃ« ngarkojÃ« dokumentin %1 qÃ« ngarkon komanduesin pÃ«r pajisjen."
+    IDS_DEV_DEVLOADER_NOT_FOUND2 "Kjo pajisje nuk punon si duhet, sepse %1 dokumenti komandues qÃ« ngarkon komanduesin pÃ«r kÃ«tÃ« pajisje Ã«shtÃ« i keq."
+    IDS_DEV_DEVLOADER_NOT_FOUND3 "Pajisja DÃ«shtoj: Provoni ndryshimin e komanduesit pÃ«r kÃ«tÃ« pajisje. NÃ«se kjo nuk funksionon, shikoni dokumentacionin tuaj tÃ« pajisjes."
+    IDS_DEV_INVALID_DATA "Kjo pajisje nuk punon si duhet, sepse BIOS nÃ« kompjuterin tuaj po raporton burimin pÃ«r pajisjen e gabuar."
+    IDS_DEV_INVALID_DATA2 "Kjo pajisje nuk punon si duhet, sepse BIOS nÃ« pajisje po raporton burimin e gabuar pÃ«r kÃ«tÃ« pajisje. "
+    IDS_DEV_FAILED_START "Kjo pajisje Ã«shtÃ« ose nuk Ã«shtÃ« i pranishme, nuk punon si duhet, ose nuk ka tÃ« gjithÃ« komanduesat e instaluar."
+    IDS_DEV_LIAR "ReactOS ndaloi se pÃ«rgjigjuri duke u pÃ«rpjekur pÃ«r tÃ« filluar kÃ«tÃ« pajisje, dhe pÃ«r kÃ«tÃ« arsye nuk do tÃ« pÃ«rpiqet pÃ«r tÃ« filluar kÃ«tÃ« pajisje pÃ«rsÃ«ri."
+    IDS_DEV_NORMAL_CONFLICT "Kjo pajisje nuk mund tÃ« gjejnÃ« ndonjÃ« burim tÃ« lirÃ« %1 pÃ«r tÃ« pÃ«rdorur si."
+    IDS_DEV_NOT_VERIFIED "Kjo pajisje ose nuk Ã«shtÃ« i pranishme, nuk punon si duhet, ose nuk ka tÃ« gjithÃ« komanduesit e instaluar."
+    IDS_DEV_NEED_RESTART "Kjo pajisje nuk mund tÃ« punojnÃ« si duhet deri sa ju tÃ« rinisni kompjuterin tuaj."
+    IDS_DEV_REENUMERATION "Kjo pajisje Ã«shtÃ« duke shkaktuar njÃ« konflikt tÃ« burimeve."
+    IDS_DEV_PARTIAL_LOG_CONF "ReactOS nuk mund tÃ« identifikojÃ« tÃ« gjitha burimet pÃ«r kÃ«tÃ« pajisje."
+    IDS_DEV_UNKNOWN_RESOURCE "Informacioni komanduesit dokumenteve %1 po i thoÃ«te pajisje fÃ«mijÃ«s pÃ«r tÃ« pÃ«rdorur njÃ« burim qÃ« pajisja prindi nuk ka ose njeh."
+    IDS_DEV_REINSTALL "Komanduesi pÃ«r kÃ«tÃ« pajisje duhet tÃ« re-instaluar."
+    IDS_DEV_REGISTRY "Regjistrit juaj mund tÃ« jetÃ« i keq."
+    IDS_DEV_WILL_BE_REMOVED "ReactOS Ã«shtÃ« duke hequr kÃ«tÃ« pajisje."
+    IDS_DEV_DISABLED "Kjo pajisje nuk Ã«shtÃ« nisur."
+    IDS_DEV_DISABLED2 "Kjo pajisje Ã«shtÃ« gjymtuar."
+    IDS_DEV_DEVLOADER_NOT_READY "Ngarkuesit pÃ«r kÃ«tÃ« pajisje nuk mund tÃ« ngarkojnÃ« komanduesin e kÃ«rkuar."
+    IDS_DEV_DEVLOADER_NOT_READY2 "Kjo pÃ«rshtatÃ«s ekrani Ã«shtÃ« duke funksionuar si duhet."
+    IDS_DEV_DEVLOADER_NOT_READY3 "Ngarkuesit pÃ«r kÃ«tÃ« pajisje nuk mund tÃ« ngarkojnÃ« komanduesin e kÃ«rkuar."
+    IDS_DEV_DEVICE_NOT_THERE "Kjo pajisje ose nuk Ã«shtÃ« e pranishme, nuk punon si duhet, ose nuk ka tÃ« gjithÃ« komanduesit e instaluar."
+    IDS_DEV_MOVED "ReactOS Ã«shtÃ« nÃ« procesin e krijimit tÃ« kÃ«saj pajisje."
+    IDS_DEV_TOO_EARLY "ReactOS Ã«shtÃ« nÃ« procesin e krijimit tÃ« kÃ«saj pajisje."
+    IDS_DEV_NO_VALID_LOG_CONF "ReactOS nuk mund tÃ« specifikojÃ« burimet pÃ«r kÃ«tÃ« pajisje."
+    IDS_DEV_FAILED_INSTALL "Komanduesit pÃ«r kÃ«tÃ« pajisje nuk janÃ« instaluar."
+    IDS_DEV_HARDWARE_DISABLED "Kjo pajisje Ã«shtÃ« me aftÃ«si tÃ« kufizuara, sepse BIOS pÃ«r pajisjen nuk jep asnjÃ« burimeve."
+    IDS_DEV_CANT_SHARE_IRQ "Kjo pajisje po pÃ«rdorur njÃ« kÃ«rkesÃ« interrupt (IRQ) e burimeve qÃ« Ã«shtÃ« nÃ« pÃ«rdorim nga njÃ« tjetÃ«r pajisje dhe nuk mund tÃ« ndahet.\nJu duhet tÃ« ndryshoni vendosjen konfliktuale ose hiqni menyren-reale e komanduesit qÃ« shkakton konfliktin."
+    IDS_DEV_FAILED_ADD "Kjo pajisje nuk punon si duhet pÃ«r shkak %1 nuk Ã«shtÃ« duke punuar si duhet."
+    IDS_DEV_DISABLED_SERVICE "ReactOS nuk mund tÃ« instaloni komanduesin pÃ«r kÃ«tÃ« pajisje, sepse ajo nuk mund tÃ« hyje ne driverin apo vendin e rrjetit qÃ« ka dokumentat e instalimit nÃ« tÃ«."
+    IDS_DEV_TRANSLATION_FAILED "Kjo pajisje nuk i pÃ«rgjigjer komanduesit tÃ« saj."
+    IDS_DEV_NO_SOFTCONFIG "ReactOS nuk mund tÃ« pÃ«rcaktojÃ« parametrat pÃ«r kÃ«tÃ« pajisje. Konsultoni dokumentacionin qÃ« erdhi me kÃ«tÃ« pajisje dhe tÃ« pÃ«rdorin tabelen e Burimeve pÃ«r tÃ« vendosur konfigurimin."
+    IDS_DEV_BIOS_TABLE "Firmware i sistemit kompjuterit tuaj nuk pÃ«rfshin informacione tÃ« mjaftueshme pÃ«r tÃ« konfiguruar siÃ§ duhet dhe tÃ« pÃ«rdorÃ« kÃ«tÃ« pajisje.\nPÃ«r pÃ«rdorimin e kÃ«saj pajisje, kontaktoni prodhuesin e kompjuterit tuaj pÃ«r tÃ« marrÃ« njÃ« firmware apo azhornim BIOS-i."
+    IDS_DEV_IRQ_TRANSLATION_FAILED "Kjo pajisje Ã«shtÃ« duke kÃ«rkuar njÃ« interrupt PCI por Ã«shtÃ« konfiguruar pÃ«r njÃ« interrupt ISA (ose anasjelltas). \nJu lutemi pÃ«rdorni programin e konfigurimit e sistemit tÃ« kompjuterit pÃ«r tÃ« rikonfiguruar interrupt pÃ«r kÃ«tÃ« pajisje."
+    IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nuk mund nisÃ« komanduesin e pajisjes pÃ«r kÃ«tÃ« pjesÃ« elektronike."
+    IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS nuk mund tÃ« ngarkojÃ« komanduesin e pajisjes pÃ«r kÃ«tÃ« pjesÃ« elektronike, sepse njÃ« shembull i mÃ«parshÃ«m i komanduesit tÃ« pajisjes Ã«shtÃ« ende nÃ« memorie."
+    IDS_DEV_DRIVER_FAILED_LOAD "ReactOS nuk mund tÃ« ngarkojÃ« komanduesin e pajisjes pÃ«r kÃ«tÃ« pjesÃ« elektronike. Komanduesi mund tÃ« jetÃ« i korruptuar ose mungon."
+    IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS nuk mund tÃ« hyni nÃ« kÃ«tÃ« pajisje elektronike, sepse shÃ«rbimi i informacionit kyÃ§ i saj nÃ« regjistÃ«r mungon ose Ã«shtÃ« regjistruar gabimisht."
+    IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ka ngarkuar me sukses komanduesin e pajisjes pÃ«r kÃ«tÃ« pjesÃ« elektronike, por nuk mund tÃ« gjejÃ« pajisje elektronike."
+    IDS_DEV_DUPLICATE_DEVICE "ReactOS nuk mund tÃ« ngarkojÃ« komanduesin e pajisjes pÃ«r kÃ«tÃ« pajisje elektronike, sepse nuk Ã«shtÃ« njÃ« pajisje e dublikatÃ« duke punuar nÃ« sistem."
+    IDS_DEV_FAILED_POST_START "ReactOS ka ndaluar kÃ«tÃ« pajisje pÃ«r shkak se ajo e ka raportuar probleme."
+    IDS_DEV_HALTED "NjÃ« program apo shÃ«rbim e ka mbyllur kÃ«tÃ« pajisje elektronike."
+    IDS_DEV_PHANTOM "Aktualisht, kjo pajisje pajisje nuk Ã«shtÃ« e lidhur tek kompjuteri."
+    IDS_DEV_SYSTEM_SHUTDOWN "ReactOS nuk mund tÃ« kenÃ« akses nÃ« kÃ«tÃ« pajisje elektronike pÃ«r shkak se sistemi operativ Ã«shtÃ« nÃ« proces mbyllje."
+    IDS_DEV_HELD_FOR_EJECT "ReactOS nuk mund tÃ« pÃ«rdorÃ« kÃ«tÃ« pajisje elektronike pÃ«r shkak se ajo Ã«shtÃ« pÃ«rgatitur pÃ«r heqje tÃ« sigurt, por ajo nuk Ã«shtÃ« hequr nga kompjuteri"
+    IDS_DEV_DRIVER_BLOCKED "Programi pÃ«r kÃ«tÃ« pajisje Ã«shtÃ« bllokuar nga fillimi pÃ«r shkak se ajo Ã«shtÃ« e njohur qÃ« tÃ« ketÃ« probleme me ReactOS. Kontaktoni shitÃ«sin e pjesÃ«s elektronike pÃ«r komandues tÃ« ri."
+    IDS_DEV_REGISTRY_TOO_LARGE "ReactOS nuk mund tÃ« fillojÃ« pajisje tÃ« reja elektronike pÃ«r shkak se kosherja e sistemit Ã«shtÃ« shumÃ« e madhe (e kalon Limitin e MasÃ«s Registrit."
+    IDS_DEV_SETPROPERTIES_FAILED "ReactOS nuk ishte nÃ« gjendje tÃ« ndryshojÃ« parametrat e kÃ«saj pajisje."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_PROP_DEVICEID "ShÃ«bulli Pajisjes ID"
+    IDS_PROP_HARDWAREIDS "Pajisja Elektronike IDs"
+    IDS_PROP_COMPATIBLEIDS "PajtushmÃ«ria IDs"
+    IDS_PROP_MATCHINGDEVICEID "Koincidim Pajisje ID"
+    IDS_PROP_SERVICE "ShÃ«rbim"
+    IDS_PROP_ENUMERATOR "Anketues"
+    IDS_PROP_CAPABILITIES "AftÃ«si"
+    IDS_PROP_DEVNODEFLAGS "Flamuj Devnode"
+    IDS_PROP_CONFIGFLAGS "Flamuj Konfigurues"
+    IDS_PROP_CSCONFIGFLAGS "Flamuj CSConfig"
+    IDS_PROP_EJECTIONRELATIONS "MarrÃ«dhÃ«niet nxjerrje"
+    IDS_PROP_REMOVALRELATIONS "MarrÃ«dhÃ«niet Shkarkimi"
+    IDS_PROP_BUSRELATIONS "MarrÃ«dhÃ«niet Bus"
+    IDS_PROP_DEVUPPERFILTERS "Filtrat e sipÃ«rme pajisjes"
+    IDS_PROP_DEVLOWERFILTERS "Filtrat e ulÃ«t pajisjes"
+    IDS_PROP_CLASSUPPERFILTERS "Filtrat e sipÃ«rme klasÃ«s"
+    IDS_PROP_CLASSLOWERFILTERS "Filtrat e ulÃ«t klasÃ«s"
+    IDS_PROP_CLASSINSTALLER "Klasa Instaluesve"
+    IDS_PROP_CLASSCOINSTALLER "Klasa Coinstallers"
+    IDS_PROP_DEVICECOINSTALLER "PjesÃ«t Coinstallers"
+    IDS_PROP_FIRMWAREREVISION "Firmware Rishikim"
+    IDS_PROP_CURRENTPOWERSTATE "Gjendja Aktuale EnergjisÃ«"
+    IDS_PROP_POWERCAPABILITIES "AftÃ«sitÃ« EnergjisÃ«"
+    IDS_PROP_POWERSTATEMAPPINGS "Planifikimi GjÃ«ndjes EnergjisÃ«"
+END
+
+IDD_HARDWARE DIALOGEX 0, 0, 300, 400
+STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PjesÃ«:", IDC_DEVICES, 7, 6, 196, 10
+    CONTROL "", IDC_LV_DEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS |
+            LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 16, 196, 50
+    GROUPBOX "Karakteristikat Pajisjeve", IDC_PROPERTIESGROUP, 7, 76, 196, 105
+    LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS
+    LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS
+    LTEXT "", IDC_STATUS, 14, 112, 183, 30
+    PUSHBUTTON "&Diagnostikim...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP
+    PUSHBUTTON "Karakteristika", IDC_PROPERTIES, 146, 140, 50, 14
+END
+
+IDD_DEVICEGENERAL DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "Tipi Pajisjeve:", -1, 37, 39, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Prodhuesi:", -1, 37, 53, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "VÃ«ndndodhja:", -1, 37, 67, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    GROUPBOX "GjÃ«ndja Pajisjes", IDC_DEVSTATUSGROUP, 7, 83, 238, 100
+    EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+    PUSHBUTTON "&Diagnostikim...", IDC_DEVPROBLEM, 148, 163, 90, 15
+    LTEXT "&PÃ«rdorimi pajisjes:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED
+    COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED
+END
+
+IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Komandues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "Ofruesi komanduesit:", -1, 37, 39, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Data Komanduesit:", -1, 37, 53, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Versioni komanduesit:", -1, 37, 67, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "FirmÃ« Digjitale:", -1, 37, 81, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON "&Detajet komanduesit...", IDC_DRIVERDETAILS, 7, 106, 75, 15
+    LTEXT "PÃ«r tÃ« parÃ« detaje nÃ« lidhje me dokumentin e komanduesit.", -1, 91, 110, 154, 17, SS_NOPREFIX
+    PUSHBUTTON "&Azhorno Komanduesin...", IDC_UPDATEDRIVER, 7, 126, 75, 15
+    LTEXT "Azhorno Komanduesin e Pajisje.", -1, 91, 130, 154, 17, SS_NOPREFIX
+END
+
+IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME
+CAPTION "Detajet Dokumentit Komanduesit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "&Dokumentat Komanduesit:", -1, 7, 36, 204, 8
+    CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER |
+            LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING |
+            LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80
+    LTEXT "Furniyues:", -1, 14, 134, 50, 8
+    EDITTEXT IDC_FILEPROVIDER, 66, 134, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Versioni Dokumentit:", -1, 14, 150, 50, 8
+    EDITTEXT IDC_FILEVERSION, 66, 150, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Drejta e Autorit:", -1, 14, 166, 50, 8
+    EDITTEXT IDC_FILECOPYRIGHT, 66, 166, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "FirmÃ« Digjitale:", -1, 14, 182, 50, 8
+    EDITTEXT IDC_DIGITALSIGNER, 66, 182, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    DEFPUSHBUTTON "OK", IDOK, 167, 208, 50, 14
+END
+
+IDD_DEVICEDETAILS DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Detaje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL "", IDC_DETAILSPROPVALUE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER |
+            LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
+            LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155
+END
+
+IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Burime"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "Konfigurime Burimesh:", -1, 7, 36, 204, 8
+    CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | 
+            LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING |
+            LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80
+END
+
+IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Energji"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+END

Modification de propriÃ©tÃ©s sur dll/win32/devmgr/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/devmgr/lang/tr-TR.rc
===================================================================
--- dll/win32/devmgr/lang/tr-TR.rc	(rÃ©vision 0)
+++ dll/win32/devmgr/lang/tr-TR.rc	(rÃ©vision 62573)
@@ -0,0 +1,239 @@
+/* TRANSLATOR: 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_NAME "Ad"
+    IDS_TYPE "TÃ¼r"
+    IDS_MANUFACTURER "Ãœretici: %1"
+    IDS_LOCATION "Konum: %1"
+    IDS_STATUS "AygÄ±t Durumu: %1"
+    IDS_UNKNOWN "Bilinmiyor"
+    IDS_LOCATIONSTR "Konum %1!u! (%2)"
+    IDS_DEVCODE " (Kod %1!u!)"
+    IDS_DEVCODE2 " (Kod %2!u!)"
+    IDS_ENABLEDEVICE "Bu AygÄ±tÄ± Kullan (EtkinleÅŸtir)"
+    IDS_DISABLEDEVICE "Bu AygÄ±tÄ± Kullanma (EdilginleÅŸtir)"
+    IDS_UNKNOWNDEVICE "Bilinmeyen AygÄ±t"
+    IDS_NODRIVERLOADED "Bu aygÄ±t iÃ§in hiÃ§bir sÃ¼rÃ¼cÃ¼ kurulmadÄ±."
+    IDS_DEVONPARENT "%1 Ãœzerinde"
+    IDS_TROUBLESHOOTDEV "&Sorun Giderme..."
+    IDS_ENABLEDEV "&SÃ¼rÃ¼cÃ¼yÃ¼ EtkinleÅŸtir"
+    IDS_REINSTALLDRV "&SÃ¼rÃ¼cÃ¼yÃ¼ Yeniden Kur"
+    IDS_PROPERTIES "&HusÃ»siyetler"
+    IDS_UPDATEDRV "&SÃ¼rÃ¼cÃ¼yÃ¼ ÅžimdikileÅŸtir..."
+    IDS_REBOOT "&BilgisayarÄ± Yeniden BaÅŸlat..."
+    IDS_NOTAVAILABLE "Yok"
+    IDS_NOTDIGITALLYSIGNED "SayÄ±lÄ±k olarak imzÃ¢lanmamÄ±ÅŸ."
+    IDS_NODRIVERS "Bu aygÄ±t iÃ§in gerekli olan veyÃ¢ yÃ¼klenen sÃ¼rÃ¼cÃ¼ kÃ¼tÃ¼kleri yok."
+    IDS_RESOURCE_COLUMN "Kaynak TÃ¼rÃ¼"
+    IDS_SETTING_COLUMN "Ayar"
+    IDS_RESOURCE_MEMORY_RANGE "Bellek Erimi"
+    IDS_RESOURCE_INTERRUPT "IRQ"
+    IDS_RESOURCE_DMA "DMA"
+    IDS_RESOURCE_PORT "E/A Erimi"
+END
+
+/* error messages, source: http://www.z123.org/techsupport/medm.htm */
+STRINGTABLE
+BEGIN
+    IDS_DEV_NO_PROBLEM "Bu aygÄ±t dÃ¼zgÃ¼n Ã§alÄ±ÅŸÄ±yor."
+    IDS_DEV_NOT_CONFIGURED "Bu aygÄ±t doÄŸru yapÄ±landÄ±rÄ±lmamÄ±ÅŸ."
+    IDS_DEV_DEVLOADER_FAILED "Bilgisayar, iki tÃ¼r veri yolu bildirdiÄŸinden dolayÄ± ReactOS bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ yÃ¼kleyemedi."
+    IDS_DEV_DEVLOADER_FAILED2 "Bu aygÄ±tÄ±n %1 aygÄ±t yÃ¼kleyicisi/yÃ¼kleyicileri aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ yÃ¼kleyemedi."
+    IDS_DEV_OUT_OF_MEMORY "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼sÃ¼ kÃ¶tÃ¼ olabilir veyÃ¢ dizgeniz bellekte veyÃ¢ baÅŸka kaynaklarda yavaÅŸ Ã§alÄ±ÅŸÄ±yor olabilir."
+    IDS_DEV_ENTRY_IS_WRONG_TYPE "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼lerinin kÃ¶tÃ¼ veyÃ¢ deÄŸer defterinizin bozuk olabilmesinden dolayÄ± bu aygÄ±t dÃ¼zgÃ¼n bir ÅŸekilde Ã§alÄ±ÅŸmÄ±yor."
+    IDS_DEV_LACKED_ARBITRATOR "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼sÃ¼, ReactOS'un nasÄ±l yÃ¶neteceÄŸini bilmediÄŸi bir kaynaÄŸa gereksinim duyuyor."
+    IDS_DEV_BOOT_CONFIG_CONFLICT "Bu aygÄ±tÄ±n gereksinim duyduÄŸu kaynaklarÄ± baÅŸka bir aygÄ±t kullanÄ±yor."
+    IDS_DEV_FAILED_FILTER "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼leri yeniden kurulmaya gereksinim duyuyor."
+    IDS_DEV_DEVLOADER_NOT_FOUND "ReactOS'un bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼lerini yÃ¼kleyen %1 kÃ¼tÃ¼ÄŸÃ¼nÃ¼ yÃ¼kleyemesinden dolayÄ± bu aygÄ±t dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor."
+    IDS_DEV_DEVLOADER_NOT_FOUND2 "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼lerini yÃ¼kleyen %1 kÃ¼tÃ¼ÄŸÃ¼nÃ¼n kÃ¶tÃ¼ olmasÄ±ndan dolayÄ± bu aygÄ±t dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor."
+    IDS_DEV_DEVLOADER_NOT_FOUND3 "AygÄ±t baÅŸarÄ±sÄ±zlÄ±ÄŸÄ±: Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ deÄŸiÅŸtirmeyi deneyiniz. EÄŸer olmuyorsa donanÄ±mÄ±nÄ±zÄ±n belgelerine bakÄ±nÄ±z."
+    IDS_DEV_INVALID_DATA "BilgisayarÄ±nÄ±zÄ±n BIOS'u bu aygÄ±tÄ±n kaynaklarÄ±nÄ±n yanlÄ±ÅŸ olduÄŸunu bildirdiÄŸinden dolayÄ± bu aygÄ±t dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor."
+    IDS_DEV_INVALID_DATA2 "Bu aygÄ±tÄ±n BIOS'u bu aygÄ±tÄ±n kaynaklarÄ±nÄ±n yanlÄ±ÅŸ olduÄŸunu bildirdiÄŸinden dolayÄ± bu aygÄ±t dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor."
+    IDS_DEV_FAILED_START "Bu aygÄ±t ya yok, ya dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor, ya da bu aygÄ±tÄ±n kurulu tÃ¼m sÃ¼rÃ¼cÃ¼leri yok."
+    IDS_DEV_LIAR "ReactOS, bu aygÄ±tÄ± baÅŸlatÄ±rken yanÄ±t vermeyi durdurdu, bu yÃ¼zden bu aygÄ±t bir daha baÅŸlatÄ±lmayacak."
+    IDS_DEV_NORMAL_CONFLICT "Bu aygÄ±t, kullanmak iÃ§in hiÃ§ boÅŸ %1 kaynaklarÄ±nÄ± bulamÄ±yor."
+    IDS_DEV_NOT_VERIFIED "Bu aygÄ±t ya yok, ya dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor, ya da bu aygÄ±tÄ±n kurulu tÃ¼m sÃ¼rÃ¼cÃ¼leri yok."
+    IDS_DEV_NEED_RESTART "Bu aygÄ±t bilgisayarÄ±nÄ±zÄ± yeniden baÅŸlatana kadar dÃ¼zgÃ¼n Ã§alÄ±ÅŸamaz."
+    IDS_DEV_REENUMERATION "Bu aygÄ±t, kaynak Ã§akÄ±ÅŸmasÄ±na neden oldu."
+    IDS_DEV_PARTIAL_LOG_CONF "ReactOS, bu aygÄ±tÄ±n kullandÄ±ÄŸÄ± tÃ¼m kaynaklarÄ± tanÄ±layamadÄ±."
+    IDS_DEV_UNKNOWN_RESOURCE "%1 sÃ¼rÃ¼cÃ¼ bilgi kÃ¼tÃ¼ÄŸÃ¼, bu alt aygÄ±tÄ±n, bu Ã¼st aygÄ±tÄ±n iye olmadÄ±ÄŸÄ± ya da tanÄ±madÄ±ÄŸÄ± kaynaÄŸÄ± kullandÄ±ÄŸÄ±nÄ± gÃ¶steriyor."
+    IDS_DEV_REINSTALL "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼leri yeniden baÅŸlatÄ±lmaya gereksinim duyuyor."
+    IDS_DEV_REGISTRY "DeÄŸer defteriniz bozuk olabilir."
+    IDS_DEV_WILL_BE_REMOVED "ReactOS bu aygÄ±tÄ± kaldÄ±rÄ±yor."
+    IDS_DEV_DISABLED "Bu aygÄ±t baÅŸlatÄ±lmamÄ±ÅŸ."
+    IDS_DEV_DISABLED2 "Bu aygÄ±t edilgin."
+    IDS_DEV_DEVLOADER_NOT_READY "Bu aygÄ±tÄ±n yÃ¼kleyicileri gerekli sÃ¼rÃ¼cÃ¼leri yÃ¼kleyemiyor."
+    IDS_DEV_DEVLOADER_NOT_READY2 "Bu gÃ¶rÃ¼ntÃ¼ baÄŸdaÅŸtÄ±rÄ±cÄ±sÄ± dÃ¼zgÃ¼n Ã§alÄ±ÅŸÄ±yor."
+    IDS_DEV_DEVLOADER_NOT_READY3 "Bu aygÄ±tÄ±n yÃ¼kleyicileri gerekli sÃ¼rÃ¼cÃ¼leri yÃ¼kleyemiyor."
+    IDS_DEV_DEVICE_NOT_THERE "Bu aygÄ±t ya yok, ya dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor, ya da bu aygÄ±tÄ±n kurulu tÃ¼m sÃ¼rÃ¼cÃ¼leri yok."
+    IDS_DEV_MOVED "ReactOS, bu aygÄ±tÄ± kurma iÅŸleminde."
+    IDS_DEV_TOO_EARLY "ReactOS, bu aygÄ±tÄ± kurma iÅŸleminde."
+    IDS_DEV_NO_VALID_LOG_CONF "ReactOS, bu aygÄ±tÄ±n kaynaklarÄ±nÄ± belirleyemez."
+    IDS_DEV_FAILED_INSTALL "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼leri kurulu deÄŸil."
+    IDS_DEV_HARDWARE_DISABLED "Bu aygÄ±tÄ±n BIOS'u aygÄ±ta hiÃ§ kaynak vermediÄŸinden dolayÄ± bu aygÄ±t edilgin."
+    IDS_DEV_CANT_SHARE_IRQ "Bu aygÄ±t, baÅŸka bir aygÄ±tÄ±n kullandÄ±ÄŸÄ± paylaÅŸÄ±lamayan Kesme Ä°steÄŸi (IRQ) kaynaÄŸÄ± kullanÄ±yor.\nÃ‡akÄ±ÅŸan ayÃ¢rÄ± deÄŸiÅŸtirmeli ya da Ã§akÄ±ÅŸmaya neden olan gerÃ§ek kip sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ kaldÄ±rmalÄ±sÄ±nÄ±z."
+    IDS_DEV_FAILED_ADD "%1 ÅŸeyinin dÃ¼zgÃ¼n Ã§alÄ±ÅŸmamasÄ±ndan dolayÄ± bu aygÄ±t dÃ¼zgÃ¼n Ã§alÄ±ÅŸmÄ±yor."
+    IDS_DEV_DISABLED_SERVICE "ReactOS, kurulum kÃ¼tÃ¼klerinin Ã¼zerinde bulunduÄŸu, sÃ¼rÃ¼cÃ¼ye ya da aÄŸ konumuna eriÅŸememesinden dolayÄ± bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼lerini kuramÄ±yor."
+    IDS_DEV_TRANSLATION_FAILED "Bu aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼ne yanÄ±t vermiyor."
+    IDS_DEV_NO_SOFTCONFIG "ReactOS, bu aygÄ±tÄ±n ayarlarÄ±nÄ± belirleyemiyor. Bu aygÄ±tla gelen belgelere bakÄ±nÄ±z ve yapÄ±landÄ±rmayÄ± ayarlamak iÃ§in ""Kaynaklar"" sekmesini kullanÄ±nÄ±z."
+    IDS_DEV_BIOS_TABLE "BilgisayarÄ±nÄ±zÄ±n dizge bellenimi, bu aygÄ±tÄ±, dÃ¼zgÃ¼n olarak, yapÄ±landÄ±rmak ve kullanmak iÃ§in yeterli bilgi iÃ§ermiyor.\nBu aygÄ±tÄ± kullanmak iÃ§in, bellenim veyÃ¢ BIOS gÃ¼ncellemesi elde etmek iÃ§in bilgisayarÄ±nÄ±zÄ±n Ã¼reticisiyle iletiÅŸime geÃ§iniz."
+    IDS_DEV_IRQ_TRANSLATION_FAILED "Bu aygÄ±t, bir PCI kesmesi istemektedir ancak bir ISA kesmesi iÃ§in yapÄ±landÄ±rÄ±lmÄ±ÅŸtÄ±r (ya da tersi).\nBu aygÄ±tÄ±n kesmesini yapÄ±landÄ±rmak iÃ§in bilgisayarÄ±n dizge kurulum Ã§izeylemini kullanÄ±nÄ±z."
+    IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS, bu donanÄ±mÄ±n aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ baÅŸlatamÄ±yor."
+    IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS, bellekte hÃ¢lÃ¢ aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼n bir Ã¶nceki tÄ±pkÄ±sÄ± olduÄŸundan dolayÄ± bu donanÄ±mÄ±n aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ yÃ¼kleyemiyor."
+    IDS_DEV_DRIVER_FAILED_LOAD "ReactOS, bu donanÄ±mÄ±n aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ yÃ¼kleyemiyor. SÃ¼rÃ¼cÃ¼ eksik ya da bozulmuÅŸ olabilir."
+    IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS, bu donanÄ±mÄ±n, deÄŸer defterinde hizmet dizini bilgisinin eksik ya da yanlÄ±ÅŸ kaydedildiÄŸinden dolayÄ± bu donanÄ±ma eriÅŸemiyor."
+    IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS, bu donanÄ±mÄ±n aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ baÅŸarÄ±lÄ± bir ÅŸekilde yÃ¼kledi ancak donanÄ±m aygÄ±tÄ±nÄ± bulamÄ±yor."
+    IDS_DEV_DUPLICATE_DEVICE "ReactOS, dizgede Ã¶nceden bir tÄ±pkÄ± aygÄ±t Ã§alÄ±ÅŸÄ±yor olmasÄ±ndan dolayÄ± bu donanÄ±mÄ±n aygÄ±t sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ yÃ¼kleyemiyor."
+    IDS_DEV_FAILED_POST_START "ReactOS, bu aygÄ±tÄ±, sorunlar bildirdiÄŸinden dolayÄ± durdurdu."
+    IDS_DEV_HALTED "Bir uygulama ya da bir hizmet, bu donanÄ±m aygÄ±tÄ±nÄ± kapattÄ±."
+    IDS_DEV_PHANTOM "Åžu an bu donanÄ±m aygÄ±tÄ± bilgisayara baÄŸlÄ± deÄŸil."
+    IDS_DEV_SYSTEM_SHUTDOWN "ReactOS, iÅŸletim dizgesinin kapatma iÅŸleminde olmasÄ±ndan dolayÄ± bu donanÄ±m aygÄ±tÄ±nÄ±n eriÅŸimini elde edemiyor."
+    IDS_DEV_HELD_FOR_EJECT "ReactOS, bu donanÄ±m aygÄ±tÄ±nÄ±n, gÃ¼venli kaldÄ±rÄ±lmaya anÄ±klandÄ±ÄŸÄ±ndan ancak bilgisayardan kaldÄ±rÄ±lmadÄ±ÄŸÄ±ndan dolayÄ± onu kullanamÄ±yor."
+    IDS_DEV_DRIVER_BLOCKED "Bu aygÄ±tÄ±n yazÄ±lÄ±mÄ±, ReactOS'la sorunlarÄ± olduÄŸu bilindiÄŸinden dolayÄ± baÅŸlatmaktan engellendi. Yeni bir donanÄ±m iÃ§in donanÄ±mÄ±n satÄ±cÄ±sÄ±yla iletiÅŸime geÃ§iniz."
+    IDS_DEV_REGISTRY_TOO_LARGE "ReactOS, dizge yÄ±ÄŸÄ±nÄ±nÄ±n Ã§ok bÃ¼yÃ¼k olmasÄ±ndan dolayÄ± yeni donanÄ±m aygÄ±tlarÄ±nÄ± baÅŸlatamÄ±yor. (DeÄŸer Defteri BÃ¼yÃ¼klÃ¼k SÄ±nÄ±rÄ±'nÄ± aÅŸar.)"
+    IDS_DEV_SETPROPERTIES_FAILED "ReactOS, bu aygÄ±tÄ±n ayarlarÄ±nÄ± deÄŸiÅŸtiremez."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_PROP_DEVICEID "AygÄ±t Ã–rneÄŸi KimliÄŸi"
+    IDS_PROP_HARDWAREIDS "DonanÄ±m Kimlikleri"
+    IDS_PROP_COMPATIBLEIDS "Uyumlu Kimlikler"
+    IDS_PROP_MATCHINGDEVICEID "EÅŸleÅŸen AygÄ±t KimliÄŸi"
+    IDS_PROP_SERVICE "Hizmet"
+    IDS_PROP_ENUMERATOR "NumaralandÄ±rÄ±cÄ±"
+    IDS_PROP_CAPABILITIES "Yetenekler"
+    IDS_PROP_DEVNODEFLAGS "AygÄ±t BileÅŸeni Ä°mleri"
+    IDS_PROP_CONFIGFLAGS "YapÄ±landÄ±rma Ä°mleri"
+    IDS_PROP_CSCONFIGFLAGS "CSConfig Ä°mleri"
+    IDS_PROP_EJECTIONRELATIONS "Ã‡Ä±karma Ä°liÅŸkileri"
+    IDS_PROP_REMOVALRELATIONS "KaldÄ±rma Ä°liÅŸkileri"
+    IDS_PROP_BUSRELATIONS "Veri Yolu Ä°liÅŸkileri"
+    IDS_PROP_DEVUPPERFILTERS "Ãœst AygÄ±t SÃ¼zgeÃ§leri"
+    IDS_PROP_DEVLOWERFILTERS "Alt AygÄ±t SÃ¼zgeÃ§leri"
+    IDS_PROP_CLASSUPPERFILTERS "Ãœst SÄ±nÄ±f SÃ¼zgeÃ§leri"
+    IDS_PROP_CLASSLOWERFILTERS "Alt SÄ±nÄ±f SÃ¼zgeÃ§leri"
+    IDS_PROP_CLASSINSTALLER "SÄ±nÄ±f YÃ¼kleyicileri"
+    IDS_PROP_CLASSCOINSTALLER "SÄ±nÄ±f YÃ¼kleme YardÄ±mcÄ±larÄ±"
+    IDS_PROP_DEVICECOINSTALLER "AygÄ±t YÃ¼kleme YardÄ±mcÄ±larÄ±"
+    IDS_PROP_FIRMWAREREVISION "Bellenim DÃ¼zeltmesi"
+    IDS_PROP_CURRENTPOWERSTATE "Åžimdiki GÃ¼Ã§ Durumu"
+    IDS_PROP_POWERCAPABILITIES "GÃ¼Ã§ Yetenekleri"
+    IDS_PROP_POWERSTATEMAPPINGS "GÃ¼Ã§ Durumu EÅŸlemeleri"
+END
+
+IDD_HARDWARE DIALOGEX 0, 0, 300, 400
+STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&AygÄ±tlar:", IDC_DEVICES, 7, 6, 196, 10
+    CONTROL "", IDC_LV_DEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS |
+            LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 16, 196, 50
+    GROUPBOX "AygÄ±t HusÃ»siyetleri", IDC_PROPERTIESGROUP, 7, 76, 196, 105
+    LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS
+    LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS
+    LTEXT "", IDC_STATUS, 14, 112, 183, 30
+    PUSHBUTTON "&Sorun Giderme...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP
+    PUSHBUTTON "&HusÃ»siyetler", IDC_PROPERTIES, 146, 140, 50, 14
+END
+
+IDD_DEVICEGENERAL DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "UmÃ»mÃ®"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "AygÄ±t TÃ¼rÃ¼:", -1, 37, 39, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Ãœretici:", -1, 37, 53, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Konum:", -1, 37, 67, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    GROUPBOX "AygÄ±t Durumu", IDC_DEVSTATUSGROUP, 7, 83, 238, 100
+    EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+    PUSHBUTTON "&Sorun Giderme...", IDC_DEVPROBLEM, 148, 163, 90, 15
+    LTEXT "&AygÄ±t KullanÄ±mÄ±:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED
+    COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED
+END
+
+IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "SÃ¼rÃ¼cÃ¼"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "SÃ¼rÃ¼cÃ¼ SaÄŸlayÄ±cÄ±sÄ±:", -1, 37, 39, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "SÃ¼rÃ¼cÃ¼ ZamÃ¢nÄ±:", -1, 37, 53, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "SÃ¼rÃ¼cÃ¼ SÃ¼rÃ¼mÃ¼:", -1, 37, 67, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "SÃ¼rÃ¼cÃ¼ Ä°mzÃ¢layÄ±cÄ±sÄ±:", -1, 37, 81, 60, 8, SS_NOPREFIX
+    EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON "&SÃ¼rÃ¼cÃ¼ AyrÄ±ntÄ±larÄ±...", IDC_DRIVERDETAILS, 7, 106, 75, 15
+    LTEXT "SÃ¼rÃ¼cÃ¼ kÃ¼tÃ¼kleri hakkÄ±nda ayrÄ±ntÄ±larÄ± gÃ¶rmek iÃ§in.", -1, 91, 110, 154, 17, SS_NOPREFIX
+    PUSHBUTTON "S&Ã¼rÃ¼cÃ¼yÃ¼ ÅžimdikileÅŸtir...", IDC_UPDATEDRIVER, 7, 126, 75, 15
+    LTEXT "Bu aygÄ±tÄ±n sÃ¼rÃ¼cÃ¼sÃ¼nÃ¼ ÅŸimdikileÅŸtir.", -1, 91, 130, 154, 17, SS_NOPREFIX
+END
+
+IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME
+CAPTION "SÃ¼rÃ¼cÃ¼ KÃ¼tÃ¼ÄŸÃ¼ AyrÄ±ntÄ±larÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "&SÃ¼rÃ¼cÃ¼ KÃ¼tÃ¼kleri:", -1, 7, 36, 204, 8
+    CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER |
+            LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING |
+            LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80
+    LTEXT "SaÄŸlayÄ±cÄ±:", -1, 14, 134, 50, 8
+    EDITTEXT IDC_FILEPROVIDER, 66, 134, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "KÃ¼tÃ¼k SÃ¼rÃ¼mÃ¼:", -1, 14, 150, 50, 8
+    EDITTEXT IDC_FILEVERSION, 66, 150, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "Telif HakkÄ±:", -1, 14, 166, 50, 8
+    EDITTEXT IDC_FILECOPYRIGHT, 66, 166, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT "SayÄ±lÄ±k Ä°mzÃ¢layÄ±cÄ±:", -1, 14, 182, 50, 8
+    EDITTEXT IDC_DIGITALSIGNER, 66, 182, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY
+    DEFPUSHBUTTON "Tamam", IDOK, 167, 208, 50, 14
+END
+
+IDD_DEVICEDETAILS DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "AyrÄ±ntÄ±lar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL "", IDC_DETAILSPROPVALUE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER |
+            LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
+            LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155
+END
+
+IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Kaynaklar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+    LTEXT "Kaynak AyarlarÄ±:", -1, 7, 36, 204, 8
+    CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | 
+            LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING |
+            LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80
+END
+
+IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "GÃ¼Ã§"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_DEVICON, 7, 7, 20, 20
+    LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
+END

Modification de propriÃ©tÃ©s sur dll/win32/devmgr/lang/tr-TR.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/twain_32/CMakeLists.txt
===================================================================
--- dll/win32/twain_32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/twain_32/CMakeLists.txt	(copie de travail)
@@ -6,10 +6,15 @@
 list(APPEND SOURCE
     dsm_ctrl.c
     twain32_main.c
+    twain_i.h)
+
+add_library(twain_32 SHARED
+    ${SOURCE}
+    twain_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def)
 
-add_library(twain_32 SHARED ${SOURCE} twain_32.rc)
 set_module_type(twain_32 win32dll)
 target_link_libraries(twain_32 wine)
 add_importlibs(twain_32 msvcrt kernel32 ntdll)
+add_pch(twain_32 twain_i.h SOURCE)
 add_cd_file(TARGET twain_32 DESTINATION reactos FOR all)
Index: dll/win32/twain_32/twain_i.h
===================================================================
--- dll/win32/twain_32/twain_i.h	(rÃ©vision 61927)
+++ dll/win32/twain_32/twain_i.h	(copie de travail)
@@ -20,7 +20,7 @@
 #ifndef _TWAIN32_H
 #define _TWAIN32_H
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -67,4 +67,4 @@
 extern TW_UINT16 TWAIN_GetDSMStatus
            (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* _TWAIN32_H */
Index: dll/win32/cryptdlg/lang/cryptdlg_Tr.rc
===================================================================
--- dll/win32/cryptdlg/lang/cryptdlg_Tr.rc	(rÃ©vision 61927)
+++ dll/win32/cryptdlg/lang/cryptdlg_Tr.rc	(copie de travail)
@@ -1,8 +1,10 @@
 /*
- * cryptdlg Turkish resource
+ * cryptdlg dll resources
  *
- * Copyright: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com)
+ * Copyright 2008 Juan Lang
  *
+ * Translated to Turkish by Erdem Ersoy (eersoy93) (erdemersoy@live.com) in 2013.
+ *
  * 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
@@ -24,12 +26,12 @@
 
 STRINGTABLE
 {
-    IDS_CERT_POLICY "Onay Belgesi PoliÃ§esi"
-    IDS_POLICY_ID "PoliÃ§e TanÄ±mlayÄ±cÄ±sÄ±: "
-    IDS_POLICY_QUALIFIER_INFO "PoliÃ§e Niteleyici Bilgisi"
-    IDS_POLICY_QUALIFIER_ID "PoliÃ§e Niteleyici KimliÄŸi="
-    IDS_CPS "CPS" /* Onay Belgesi Uygulama EsaslarÄ± */
-    IDS_USER_NOTICE "KullanÄ±cÄ± Bildirimi"
+    IDS_CERT_POLICY "Onay Belgesi Ä°lkesi"
+    IDS_POLICY_ID "Ä°lke TanÄ±mlayÄ±cÄ±sÄ±: "
+    IDS_POLICY_QUALIFIER_INFO "Ä°lke Niteleyici Bilgisi"
+    IDS_POLICY_QUALIFIER_ID "Ä°lke Niteleyici KimliÄŸi="
+    IDS_CPS "CPS" /* Certification Practice Statement (Onay Belgesi Uygulama EsaslarÄ±) */
+    IDS_USER_NOTICE "KullanÄ±cÄ± Bildirisi"
     IDS_QUALIFIER "Niteleyici"
     IDS_NOTICE_REF "Bildirim KaynaÄŸÄ±"
     IDS_ORGANIZATION "Kurum="
Index: dll/win32/cryptdlg/lang/cryptdlg_Sq.rc
===================================================================
--- dll/win32/cryptdlg/lang/cryptdlg_Sq.rc	(rÃ©vision 0)
+++ dll/win32/cryptdlg/lang/cryptdlg_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,39 @@
+/*
+ * cryptdlg dll resources
+ *
+ * Copyright 2008 Juan Lang
+ * Translation: Ardit Dani (Albanian) 
+ *
+ * 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
+ */
+
+#include "cryptres.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_CERT_POLICY "Policy Ã‡ertifikate"
+    IDS_POLICY_ID "Identifikues Policy: "
+    IDS_POLICY_QUALIFIER_INFO "kualifikues info Policy"
+    IDS_POLICY_QUALIFIER_ID "Policy Kualifikues Id="
+    IDS_CPS "CPS" /* Certification Practice Statement */
+    IDS_USER_NOTICE "Njoftim Perdoruesi"
+    IDS_QUALIFIER "Kualifikues"
+    IDS_NOTICE_REF "Njoftim Reference"
+    IDS_ORGANIZATION "Organizata="
+    IDS_NOTICE_NUM "Numer Njoftimi="
+    IDS_NOTICE_TEXT "Njoftim Teksti="
+}

Modification de propriÃ©tÃ©s sur dll/win32/cryptdlg/lang/cryptdlg_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/cryptdlg/cryptdlg.rc
===================================================================
--- dll/win32/cryptdlg/cryptdlg.rc	(rÃ©vision 61927)
+++ dll/win32/cryptdlg/cryptdlg.rc	(copie de travail)
@@ -66,6 +66,9 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/cryptdlg_Ro.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/cryptdlg_Sq.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/cryptdlg_Tr.rc"
 #endif
Index: dll/win32/aclui/precomp.h
===================================================================
--- dll/win32/aclui/precomp.h	(rÃ©vision 61927)
+++ dll/win32/aclui/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _ACLUI_PCH_
+#define _ACLUI_PCH_
+
 #define _ACLUI_
 
 #include <stdarg.h>
@@ -199,4 +202,4 @@
 DereferenceSidReqResult(IN HANDLE SidCacheMgr,
                         IN PSIDREQRESULT ReqResult);
 
-/* EOF */
+#endif /* _ACLUI_PCH_ */
Index: dll/win32/aclui/CMakeLists.txt
===================================================================
--- dll/win32/aclui/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/aclui/CMakeLists.txt	(copie de travail)
@@ -6,14 +6,17 @@
 list(APPEND SOURCE
     aclui.c
     checklist.c
-    guid.c
     misc.c
     sidcache.c
+    precomp.h)
+
+add_library(aclui SHARED
+    ${SOURCE}
+    guid.c
+    aclui.rc
     ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
 
-add_library(aclui SHARED ${SOURCE} aclui.rc)
-
 set_module_type(aclui win32dll UNICODE)
 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
-add_pch(aclui precomp.h)
+add_pch(aclui precomp.h SOURCE)
 add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all)
Index: dll/win32/aclui/aclui.rc
===================================================================
--- dll/win32/aclui/aclui.rc	(rÃ©vision 61927)
+++ dll/win32/aclui/aclui.rc	(copie de travail)
@@ -66,6 +66,9 @@
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/win32/aclui/lang/sq-AL.rc
===================================================================
--- dll/win32/aclui/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/aclui/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,35 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+ * DATE OF TR:  29-11-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_SECPAGE DIALOGEX 0, 0, 227, 215
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Siguri"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "&Grupe ose perdoruesi user names:", -1, 7, 21, 105, 8
+    CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE
+    LTEXT "Zoteruesi:", -1, 7, 7, 49, 8
+    EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY
+    PUSHBUTTON "Shto...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14
+    PUSHBUTTON "Hiq", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14
+    LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX
+    LTEXT "Lejo", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER
+    LTEXT "Moho", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER
+    CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE
+    LTEXT "PÃ«r lejet e veÃ§anta ose pÃ«r parametrat e avancuar, klikoni avancuar.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT
+    PUSHBUTTON "Ad&vanced", IDC_ADVANCED, 165, 194, 55, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_PSP_TITLE "Leje per %1"
+    IDS_UNKNOWN "P'anjohur"
+    IDS_SPECIAL_PERMISSIONS "Leje Speciale"
+    IDS_PERMISSIONS_FOR "Leje per %1"
+    IDS_PERMISSIONS "Leje"
+    IDS_USERDOMAINFORMAT "%1 (%2\\%3)"
+    IDS_USERFORMAT "%1"
+END

Modification de propriÃ©tÃ©s sur dll/win32/aclui/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: dll/win32/rasadhlp/CMakeLists.txt
===================================================================
--- dll/win32/rasadhlp/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/rasadhlp/CMakeLists.txt	(copie de travail)
@@ -7,11 +7,14 @@
     autodial.c
     init.c
     winsock.c
-    ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp_stubs.c)
+
+add_library(rasadhlp SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
 
-add_library(rasadhlp SHARED ${SOURCE})
 set_module_type(rasadhlp win32dll)
 add_importlibs(rasadhlp ws2_32 msvcrt kernel32 ntdll)
-add_pch(rasadhlp precomp.h)
+add_pch(rasadhlp precomp.h SOURCE)
 add_cd_file(TARGET rasadhlp DESTINATION reactos/system32 FOR all)
Index: dll/win32/rasadhlp/precomp.h
===================================================================
--- dll/win32/rasadhlp/precomp.h	(rÃ©vision 61927)
+++ dll/win32/rasadhlp/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _RASADHLP_H
+#define _RASADHLP_H
+
 #define _WIN32_WINNT 0x502
 #define _CRT_SECURE_NO_DEPRECATE
 #define WIN32_NO_STATUS
@@ -91,3 +94,4 @@
     IN PAUTODIAL_ADDR ConnectionAddress
 );
 
+#endif /* _RASADHLP_H */
Index: dll/win32/winsta/logon.c
===================================================================
--- dll/win32/winsta/logon.c	(rÃ©vision 61927)
+++ dll/win32/winsta/logon.c	(copie de travail)
@@ -6,6 +6,7 @@
  * NOTES:           This file contains exported functions relevant to
  *                  userinit, winlogon, lsass and friends in vista.
  */
+
 #include "winsta.h"
 
 VOID
Index: dll/win32/winsta/main.c
===================================================================
--- dll/win32/winsta/main.c	(rÃ©vision 61927)
+++ dll/win32/winsta/main.c	(copie de travail)
@@ -23,6 +23,7 @@
  * PROGRAMMER:      Emanuele Aliberti <ea@reactos.com>
  *                  Samuel Serapi?n
  */
+
 #include "winsta.h"
 
 HINSTANCE hDllInstance;
Index: dll/win32/winsta/security.c
===================================================================
--- dll/win32/winsta/security.c	(rÃ©vision 61927)
+++ dll/win32/winsta/security.c	(copie de travail)
@@ -5,6 +5,7 @@
  * PROGRAMMER:      Samuel Serapi?n
  * NOTE:            Not needed, just here for the show.
  */
+
 #include "winsta.h"
 
 VOID
Index: dll/win32/winsta/ws.c
===================================================================
--- dll/win32/winsta/ws.c	(rÃ©vision 61927)
+++ dll/win32/winsta/ws.c	(copie de travail)
@@ -5,6 +5,7 @@
  * PROGRAMMER:      Samuel Serapi?n
  * 
  */
+
 #include "winsta.h"
 
 VOID
Index: dll/win32/winsta/winsta.h
===================================================================
--- dll/win32/winsta/winsta.h	(rÃ©vision 61927)
+++ dll/win32/winsta/winsta.h	(copie de travail)
@@ -10,9 +10,7 @@
 #ifndef _WINSTA_H
 #define _WINSTA_H
 
-/* Default header set */
 #include <stdarg.h>
-//#include <time.h>
 
 #include <windef.h>
 #include <winbase.h>
@@ -25,5 +23,4 @@
 /* WinSta calling convention */
 #define WINSTAAPI WINAPI
 
-#endif /* !def _WINSTA_H */
-
+#endif /* _WINSTA_H */
Index: dll/win32/winsta/misc.c
===================================================================
--- dll/win32/winsta/misc.c	(rÃ©vision 61927)
+++ dll/win32/winsta/misc.c	(copie de travail)
@@ -6,6 +6,7 @@
  * NOTES:           Misc functions.
  * 
  */
+
 #include "winsta.h"
 
 VOID
Index: dll/win32/winsta/CMakeLists.txt
===================================================================
--- dll/win32/winsta/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/winsta/CMakeLists.txt	(copie de travail)
@@ -9,13 +9,15 @@
     security.c
     server.c
     ws.c
+    winsta.h)
+
+add_library(winsta SHARED
+    ${SOURCE}
     winsta.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winsta.def)
 
-add_library(winsta SHARED ${SOURCE})
-    
 set_module_type(winsta win32dll)
 target_link_libraries(winsta wine)
 add_importlibs(winsta msvcrt kernel32 ntdll)
-add_pch(winsta winsta.h)
+add_pch(winsta winsta.h SOURCE)
 add_cd_file(TARGET winsta DESTINATION reactos/system32 FOR all)
Index: dll/win32/msvfw32/lang/msvfw32_Sq.rc
===================================================================
--- dll/win32/msvfw32/lang/msvfw32_Sq.rc	(rÃ©vision 0)
+++ dll/win32/msvfw32/lang/msvfw32_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2005 Dmitry Timoshkov
+ * Translation: Ardit Dani (Albanian Laguage Support File)
+ *
+ * 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
+ */
+
+#include "msvideo_private.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Video Ngjeshje"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON "OK",IDOK,129,2,49,14
+    PUSHBUTTON "Anulo",IDCANCEL,129,18,49,14
+
+    LTEXT "Ngjeshje:",-1,9,6,105,8
+    COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+
+    PUSHBUTTON "Kon&figuro...",882,129,36,49,14
+    PUSHBUTTON "Rreth...",883,129,52,49,14
+
+    SCROLLBAR 884,9,44,111,9,WS_TABSTOP
+
+    LTEXT "Kualitet Ngjeshje:",886,9,34,80,8
+
+    CONTROL "Frame Ã§do Ã§eles",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
+    EDITTEXT 888,78,60,22,12
+    LTEXT "frames",889,103,62,26,10
+
+    CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
+    EDITTEXT 895,78,76,22,12
+    LTEXT "KB/sec",896,102,78,26,10
+}
+
+STRINGTABLE
+{
+    IDS_FULLFRAMES "Frames te plote (pa-gnjeshur)"
+}

Modification de propriÃ©tÃ©s sur dll/win32/msvfw32/lang/msvfw32_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/msvfw32/rsrc.rc
===================================================================
--- dll/win32/msvfw32/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/msvfw32/rsrc.rc	(copie de travail)
@@ -48,9 +48,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/msvfw32_Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/msvfw32_Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DE_DE
@@ -80,6 +77,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/msvfw32_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/msvfw32_Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/msvfw32_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/msvfw32_Uk.rc"
 #endif
Index: dll/win32/msvfw32/CMakeLists.txt
===================================================================
--- dll/win32/msvfw32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msvfw32/CMakeLists.txt	(copie de travail)
@@ -8,11 +8,16 @@
     mciwnd.c
     msvideo_main.c
     drawdib.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c
+    msvideo_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c)
+
+add_library(msvfw32 SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
 
-add_library(msvfw32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(msvfw32 win32dll)
 target_link_libraries(msvfw32 wine)
 add_importlibs(msvfw32 winmm comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(msvfw32 msvideo_private.h SOURCE)
 add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/winspool/CMakeLists.txt
===================================================================
--- dll/win32/winspool/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/winspool/CMakeLists.txt	(copie de travail)
@@ -5,13 +5,17 @@
 list(APPEND SOURCE
     info.c
     stubs.c
+    precomp.h)
+
+add_library(winspool.drv SHARED
+    ${SOURCE}
     winspool.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/winspool.def)
 
-add_library(winspool.drv SHARED ${SOURCE})
 set_target_properties(winspool.drv PROPERTIES SUFFIX "")
 set_module_type(winspool.drv win32dll UNICODE)
 target_link_libraries(winspool.drv wine)
 add_importlibs(winspool.drv advapi32 shlwapi msvcrt kernel32 ntdll)
+add_pch(winspool.drv precomp.h SOURCE)
 add_cd_file(TARGET winspool.drv DESTINATION reactos/system32 FOR all)
Index: dll/win32/lsasrv/lsasrv.rc
===================================================================
--- dll/win32/lsasrv/lsasrv.rc	(rÃ©vision 61927)
+++ dll/win32/lsasrv/lsasrv.rc	(copie de travail)
@@ -30,3 +30,6 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
\ No newline at end of file
Index: dll/win32/lsasrv/CMakeLists.txt
===================================================================
--- dll/win32/lsasrv/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/lsasrv/CMakeLists.txt	(copie de travail)
@@ -20,15 +20,18 @@
     security.c
     session.c
     utils.c
+    lsasrv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c
+    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c)
+
+add_library(lsasrv SHARED
+    ${SOURCE}
     lsasrv.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def
-    ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c)
+    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
 
-add_library(lsasrv SHARED ${SOURCE})
 set_module_type(lsasrv win32dll UNICODE)
 target_link_libraries(lsasrv wine ${PSEH_LIB})
 add_importlibs(lsasrv samsrv rpcrt4 msvcrt kernel32 advapi32 ntdll)
-add_pch(lsasrv lsasrv.h)
+add_pch(lsasrv lsasrv.h SOURCE)
 add_dependencies(lsasrv psdk)
 add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all)
Index: dll/win32/lsasrv/lang/sq-AL.rc
===================================================================
--- dll/win32/lsasrv/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/lsasrv/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,48 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_NT_AUTHORITY "NT AUTORITITE"
+    IDS_NULL_RID "SID PAVLEFSHÃ‹M"
+    IDS_WORLD_RID "T'gjithÃ«"
+    IDS_LOCAL_RID "LOCAL"
+    IDS_CREATOR_OWNER_RID "KRIJUES PRONAR"
+    IDS_CREATOR_GROUP_RID "GRUPI KRIJUES"
+    IDS_CREATOR_OWNER_SERVER_RID "SERVERI KRIJUESIT PRONARIT"
+    IDS_CREATOR_GROUP_SERVER_RID "SERVERI GRUPIT KRIJUES"
+    IDS_DIALUP_RID "BJERI"
+    IDS_NETWORK_RID "RRJETI"
+    IDS_BATCH_RID "GRUMBULL"
+    IDS_INTERACTIVE_RID "INTERAKTIVE"
+    IDS_SERVICE_RID "SHÃ‹RBIMI"
+    IDS_ANONYMOUS_LOGON_RID "HZRJE ANONIM"
+    IDS_PROXY_RID "PROXI"
+    IDS_ENTERPRISE_CONTROLLERS_RID "KONTROLLUES NDÃ‹RMARJE DOMAINI"
+    IDS_PRINCIPAL_SELF_RID "VETÃ‹"
+    IDS_AUTHENTICATED_USER_RID "PÃ«rdorues vÃ«rtetuar"
+    IDS_RESTRICTED_CODE_RID "KUFIZUAR"
+    IDS_TERMINAL_SERVER_RID "TERMINALI PÃ‹RDORUESIT NÃ‹ SERVER"
+    IDS_REMOTE_LOGON_RID "HZRJA INTERAKTIVE NÃ‹ DISTANCÃ‹"
+    IDS_THIS_ORGANIZATION_RID "Kjo organizatÃ«"
+    IDS_LOCAL_SYSTEM_RID "SISTEMI"
+    IDS_LOCAL_SERVICE_RID "SHÃ‹RBIMET LOKALE"
+    IDS_NETWORK_SERVICE_RID "SHÃ‹RBIMET RRJETIT"
+    IDS_BUILTIN_DOMAIN_RID "NDÃ‹RTUAR NÃ‹"
+    IDS_ALIAS_RID_ADMINS "AdministratorÃ«t"
+    IDS_ALIAS_RID_USERS "PÃ«rdoruesit"
+    IDS_ALIAS_RID_GUESTS "Visitor"
+    IDS_ALIAS_RID_POWER_USERS "PÃ«rdoruesit e FuqishÃ«m"
+    IDS_ALIAS_RID_ACCOUNT_OPS "OperatorÃ«t e llogarisÃ«"
+    IDS_ALIAS_RID_SYSTEM_OPS "OperatorÃ«t e serverit"
+    IDS_ALIAS_RID_PRINT_OPS "OperatorÃ«t Printimit"
+    IDS_ALIAS_RID_BACKUP_OPS "OperatorÃ«t rezervÃ«"
+    IDS_ALIAS_RID_REPLICATOR "PÃ«rsÃ«ritÃ«sit"
+    IDS_ALIAS_RID_RAS_SERVERS "Serverat RAS dhe IAS"
+    IDS_ALIAS_RID_PREW2KCOMPACCESS "Hyrja e Mundshme Para-Windows 2000"
+    IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "PÃ«rdoruesit e Desktop-it nÃ« Distance"
+    IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "OperatorÃ«t e Konfigurimit Rrjetit"
+END

Modification de propriÃ©tÃ©s sur dll/win32/lsasrv/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/lsasrv/lsasrv.h
===================================================================
--- dll/win32/lsasrv/lsasrv.h	(rÃ©vision 61927)
+++ dll/win32/lsasrv/lsasrv.h	(copie de travail)
@@ -7,6 +7,9 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
+#ifndef _LSASRV_H
+#define _LSASRV_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -411,4 +414,4 @@
     PSID SrcSid,
     ULONG Rid);
 
-/* EOF */
+#endif /* _LSASRV_H */
Index: dll/win32/sxs/CMakeLists.txt
===================================================================
--- dll/win32/sxs/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/sxs/CMakeLists.txt	(copie de travail)
@@ -7,12 +7,16 @@
     cache.c
     name.c
     sxs.c
+    sxs_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c)
+
+add_library(sxs SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 
-add_library(sxs SHARED ${SOURCE})
 set_module_type(sxs win32dll)
 target_link_libraries(sxs wine)
 add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll)
+add_pch(sxs sxs_private.h SOURCE)
 add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all)
Index: dll/win32/sxs/sxs_private.h
===================================================================
--- dll/win32/sxs/sxs_private.h	(rÃ©vision 61927)
+++ dll/win32/sxs/sxs_private.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _SXS_PRIVATE_H_
+#define _SXS_PRIVATE_H_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -54,3 +57,5 @@
     if (dst) strcpyW( dst, src );
     return dst;
 }
+
+#endif /* _SXS_PRIVATE_H_ */
Index: dll/win32/objsel/CMakeLists.txt
===================================================================
--- dll/win32/objsel/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/objsel/CMakeLists.txt	(copie de travail)
@@ -11,11 +11,13 @@
 list(APPEND SOURCE
     factory.c
     objsel.c
+    objsel_private.h)
+
+add_library(objsel SHARED
+    ${SOURCE}
     objsel.rc
     ${CMAKE_CURRENT_BINARY_DIR}/objsel.def)
 
-add_library(objsel SHARED ${SOURCE})
-
 set_module_type(objsel win32dll)
 
 target_link_libraries(objsel uuid wine)
@@ -27,5 +29,5 @@
     kernel32
     ntdll)
 
-add_pch(objsel objsel_private.h)
+add_pch(objsel objsel_private.h SOURCE)
 add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all)
Index: dll/win32/objsel/objsel_private.h
===================================================================
--- dll/win32/objsel/objsel_private.h	(rÃ©vision 61927)
+++ dll/win32/objsel/objsel_private.h	(copie de travail)
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _OBJSEL_PRIVATE_H
+#define _OBJSEL_PRIVATE_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -58,3 +61,5 @@
 HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN;
 
 extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN;
+
+#endif /* _OBJSEL_PRIVATE_H */
Index: dll/win32/objsel/objsel.c
===================================================================
--- dll/win32/objsel/objsel.c	(rÃ©vision 61927)
+++ dll/win32/objsel/objsel.c	(copie de travail)
@@ -19,6 +19,7 @@
  */
 
 #include "objsel_private.h"
+
 #include <rpcproxy.h>
 
 LONG dll_refs = 0;
Index: dll/win32/uxtheme/CMakeLists.txt
===================================================================
--- dll/win32/uxtheme/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/uxtheme/CMakeLists.txt	(copie de travail)
@@ -16,14 +16,17 @@
     system.c
     themehooks.c
     uxini.c
+    uxthemep.h
+    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c)
+
+add_library(uxtheme SHARED
+    ${SOURCE}
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
 
-add_library(uxtheme SHARED ${SOURCE})
 set_module_type(uxtheme win32dll)
 target_link_libraries(uxtheme wine)
 add_delay_importlibs(uxtheme msimg32)
 add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll)
-add_pch(uxtheme uxthemep.h)
+add_pch(uxtheme uxthemep.h SOURCE)
 add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all)
Index: dll/win32/uxtheme/uxthemep.h
===================================================================
--- dll/win32/uxtheme/uxthemep.h	(rÃ©vision 61927)
+++ dll/win32/uxtheme/uxthemep.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _UXTHEME_PCH_
+#define _UXTHEME_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -230,3 +233,5 @@
 #define ALPHABLEND_BINARY           1
 /* Full alpha blending */
 #define ALPHABLEND_FULL             2
+
+#endif /* _UXTHEME_PCH_ */
Index: dll/win32/ws2help/CMakeLists.txt
===================================================================
--- dll/win32/ws2help/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/ws2help/CMakeLists.txt	(copie de travail)
@@ -9,11 +9,13 @@
     dllmain.c
     handle.c
     notify.c
+    precomp.h)
+
+add_library(ws2help SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 
-add_library(ws2help SHARED ${SOURCE})
 set_module_type(ws2help win32dll)
 add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll)
-add_pch(ws2help precomp.h)
+add_pch(ws2help precomp.h SOURCE)
 add_cd_file(TARGET ws2help DESTINATION reactos/system32 FOR all)
-
Index: dll/win32/comctl32/rsrc.rc
===================================================================
--- dll/win32/comctl32/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/comctl32/rsrc.rc	(copie de travail)
@@ -162,6 +162,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/comctl_Sk.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/comctl_Sq.rc"
+#endif
 #ifdef LANGUAGE_SL_SI
     #include "lang/comctl_Si.rc"
 #endif
Index: dll/win32/comctl32/CMakeLists.txt
===================================================================
--- dll/win32/comctl32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/comctl32/CMakeLists.txt	(copie de travail)
@@ -47,13 +47,17 @@
     trackbar.c
     treeview.c
     updown.c
+    comctl32.h)
+
+add_library(comctl32 SHARED
+    ${SOURCE}
     stubs.c
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def)
 
-add_library(comctl32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(comctl32 win32dll UNICODE)
 target_link_libraries(comctl32 uuid wine ${PSEH_LIB})
 add_delay_importlibs(comctl32 winmm uxtheme)
 add_importlibs(comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
-add_pch(comctl32 comctl32.h)
+add_pch(comctl32 comctl32.h SOURCE)
 add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/comctl32/lang/comctl_Tr.rc
===================================================================
--- dll/win32/comctl32/lang/comctl_Tr.rc	(rÃ©vision 61927)
+++ dll/win32/comctl32/lang/comctl_Tr.rc	(copie de travail)
@@ -59,7 +59,7 @@
 
 IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Sihirbaz"
+CAPTION "YardÄ±mcÄ±"
 FONT 8, "MS Shell Dlg"
 BEGIN
   PUSHBUTTON    "< &Geri", IDC_BACK_BUTTON,56,138,55,14
Index: dll/win32/comctl32/lang/comctl_Sq.rc
===================================================================
--- dll/win32/comctl32/lang/comctl_Sq.rc	(rÃ©vision 0)
+++ dll/win32/comctl32/lang/comctl_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,93 @@
+/*
+ * Top level resource file for Common Controls
+ *
+ * Copyright 1999 Bertho Stultiens
+ * Copyright 1999 Eric Kohl
+ * Translator : Ardit Dani : 2013
+ *
+ * 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
+ */
+
+#include "comctl32.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_CLOSE    "Mbyll"
+}
+
+STRINGTABLE
+{
+    IDM_TODAY    "Sot:"
+    IDM_GOTODAY  "Ik tek Sot"
+}
+
+STRINGTABLE
+{
+    IDS_SEPARATOR "Ndares"
+}
+
+STRINGTABLE
+{
+    HKY_NONE "Asnje"
+}
+
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Properties for %s"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+  PUSHBUTTON    "Anulo", IDCANCEL,58,122,50,14
+  PUSHBUTTON    "&Apliko", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+  PUSHBUTTON    "NdihmÃ«",   IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+  CONTROL       "",       IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG 0, 0, 290, 159
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  PUSHBUTTON    "< &Mbrapa", IDC_BACK_BUTTON,56,138,55,14
+  DEFPUSHBUTTON "&Tjetra >", IDC_NEXT_BUTTON,111,138,55,14
+  DEFPUSHBUTTON "Mbaro",  IDC_FINISH_BUTTON,111,138,55,14
+  PUSHBUTTON    "Anulo",  IDCANCEL,173,138,55,14
+  PUSHBUTTON    "NdihmÃ«",    IDHELP,235,138,55,14,WS_GROUP
+  LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+  CONTROL       "",        IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+  LTEXT	        "",        IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfiguro Toolbarin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  DEFPUSHBUTTON "&Mbyll",     IDCANCEL,320,6,70,14
+  PUSHBUTTON    "R&eseto",     IDC_RESET_BTN,320,23,70,14
+  PUSHBUTTON    "&NdihmÃ«",      IDC_HELP_BTN,320,40,70,14
+  PUSHBUTTON    "Leviz lart",   IDC_MOVEUP_BTN,320,74,70,14
+  PUSHBUTTON    "Leviz poshte", IDC_MOVEDN_BTN,320,91,70,14
+  LTEXT         "Butona te pranishem:", -1,4,5,120,10
+  LISTBOX       IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+  PUSHBUTTON    "&Shto ->",    IDOK, 132, 42, 55, 14
+  PUSHBUTTON    "<- &Hiq", IDC_REMOVE_BTN,132,62,55,14
+  LTEXT         "&Toolbar butona:", -1,194,5,120,10
+  LISTBOX       IDC_TOOLBARBTN_LBOX, 194,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END

Modification de propriÃ©tÃ©s sur dll/win32/comctl32/lang/comctl_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/comctl32/toolbar.c
===================================================================
--- dll/win32/comctl32/toolbar.c	(rÃ©vision 61927)
+++ dll/win32/comctl32/toolbar.c	(copie de travail)
@@ -205,7 +205,7 @@
 
 /* Used to find undocumented extended styles */
 #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \
-                        TBSTYLE_EX_UNDOC1 | \
+                        TBSTYLE_EX_VERTICAL | \
                         TBSTYLE_EX_MIXEDBUTTONS | \
                         TBSTYLE_EX_DOUBLEBUFFER | \
                         TBSTYLE_EX_HIDECLIPPEDBUTTONS)
@@ -843,16 +843,20 @@
         /* empirical tests show that iBitmap can/will be non-zero    */
         /* when drawing the vertical bar...      */
         if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) {
-            if (dwStyle & CCS_VERT)
-               TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr);
-	    else
-		TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr);
-	}
-	else if (btnPtr->fsStyle != BTNS_SEP) {
-	    FIXME("Draw some kind of separator: fsStyle=%x\n",
-		  btnPtr->fsStyle);
-	}
-	return;
+            if (dwStyle & CCS_VERT) {
+                RECT rcsep = rc;
+                InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy);
+                TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr);
+            }
+            else {
+                TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr);
+            }
+        }
+        else if (btnPtr->fsStyle != BTNS_SEP) {
+            FIXME("Draw some kind of separator: fsStyle=%x\n",
+              btnPtr->fsStyle);
+        }
+        return;
     }
 
     /* get a pointer to the text */
@@ -1257,7 +1261,7 @@
 * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
 *
-* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow
+* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_VERTICAL can be used also to allow
 * vertical toolbar lists.
 */
 
@@ -1273,7 +1277,7 @@
     /*	no layout is necessary. Applications may use this style */
     /*	to perform their own layout on the toolbar. 		*/
     if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) &&
-	!(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) )  return;
+	!(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) )  return;
 
     btnPtr = infoPtr->buttons;
     x  = infoPtr->nIndent;
@@ -1662,7 +1666,7 @@
 	if (btnPtr->fsStyle & BTNS_SEP) {
 	    if (infoPtr->dwStyle & CCS_VERT) {
                 cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH;
-                cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth;
+                cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth;
 	    }
 	    else
                 cx = (btnPtr->cx > 0) ? btnPtr->cx :
@@ -3023,7 +3027,7 @@
     cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER;
     cx = parent_rect.right - parent_rect.left;
 
-    if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1))
+    if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL))
     {
         TOOLBAR_LayoutToolbar(infoPtr);
         InvalidateRect( infoPtr->hwndSelf, NULL, TRUE );
@@ -3333,7 +3337,7 @@
     if (lpTbInfo == NULL)
 	return -1;
 
-    /* MSDN documents a iImageLabel field added in Vista but it is not present in
+    /* MSDN documents an iImageLabel field added in Vista but it is not present in
      * the headers and tests shows that even with comctl 6 Vista accepts only the
      * original TBBUTTONINFO size
      */
@@ -4132,7 +4136,7 @@
                 {
                     /* separator */
                     nmtbr.tbButton.fsStyle = TBSTYLE_SEP;
-                    /* when inserting separators, iBitmap controls it's size.
+                    /* when inserting separators, iBitmap controls its size.
                        0 sets default size (width) */
                     nmtbr.tbButton.iBitmap = 0;
                 }
Index: dll/win32/comctl32/rebar.c
===================================================================
--- dll/win32/comctl32/rebar.c	(rÃ©vision 61927)
+++ dll/win32/comctl32/rebar.c	(copie de travail)
@@ -2514,8 +2514,10 @@
 
     /* initialize band */
     memset(lpBand, 0, sizeof(*lpBand));
-    lpBand->clrFore = infoPtr->clrText;
-    lpBand->clrBack = infoPtr->clrBk;
+    lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText :
+                                                     infoPtr->clrText;
+    lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace :
+                                                   infoPtr->clrBk;
     lpBand->iImage = -1;
 
     REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand);
Index: dll/win32/newdev/newdev.rc
===================================================================
--- dll/win32/newdev/newdev.rc	(rÃ©vision 61927)
+++ dll/win32/newdev/newdev.rc	(copie de travail)
@@ -65,6 +65,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif
Index: dll/win32/newdev/CMakeLists.txt
===================================================================
--- dll/win32/newdev/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/newdev/CMakeLists.txt	(copie de travail)
@@ -6,14 +6,17 @@
     newdev.c
     stubs.c
     wizard.c
+    newdev_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c)
+
+add_library(newdev SHARED
+    ${SOURCE}
     newdev.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/newdev.def)
 
-add_library(newdev SHARED ${SOURCE})
 set_module_type(newdev win32dll UNICODE)
 target_link_libraries(newdev wine)
 add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll)
-add_pch(newdev newdev_private.h)
+add_pch(newdev newdev_private.h SOURCE)
 add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/newdev/lang/sq-AL.rc
===================================================================
--- dll/win32/newdev/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/newdev/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,91 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "MirÃ«seerdhÃ«t", IDC_WELCOMETITLE, 120, 8, 195, 24
+    LTEXT "Ky magjistar instalon njÃ« komandues tÃ« ri tÃ« pajisjes pÃ«r:", IDC_STATIC, 120, 21, 195, 16
+    LTEXT "Klikoni Vazhdo pÃ«r tÃ« vazhduar.", IDC_STATIC, 120, 169, 195, 17
+    LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 134, 36, 164, 11
+    LTEXT "KUJDES! INSTALIMI I NJÃ‹ PAJISJE TÃ‹ PERSONALIZUAR MUND TÃ‹ NGRIJÃ‹ KOMPJUTERIN TUAJ OSE TA BÃ‹JNÃ‹ TÃ‹ MOS NISET!", IDC_STATIC, 120, 59, 195, 16
+    CONTROL "Instalo komanduesit automatikisht", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 178, 13
+    CONTROL "Instalo komanduesit nga njÃ« vend specifik", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 164, 14
+END
+
+IDD_NODRIVER DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Instalimi dÃ«shtoj", IDC_FINISHTITLE, 120, 8, 195, 24
+    LTEXT "Pajisja nuk mund tÃ« instalohet pÃ«r shkak se komanduesi nuk mund tÃ« gjendet.", IDC_STATIC, 120, 40, 195, 19
+    LTEXT "Kliko Kthehu nÃ« qoftÃ« se ju keni komanduesin n[ disk ose e di rrugÃ«n pÃ«r tÃ« komanduesi.", IDC_STATIC, 120, 98, 181, 24
+    CONTROL "Mos e tregoni kÃ«tÃ« dialog mÃ«", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 180, 11
+END
+
+IDD_INSTALLFAILED DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Instalimi dÃ«shtoj", IDC_FINISHTITLE, 120, 8, 195, 24
+    LTEXT "Pajisja nuk mund tÃ« instalohet pÃ«r shkak se njÃ« gabim i papritur ka ndodhur.", IDC_STATIC, 120, 40, 195, 19
+    LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 134, 55, 164, 11
+END
+
+IDD_CHSOURCE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "KÃ«rko nÃ« kÃ«to vende", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 13
+    CONTROL "Zgjidhni komanduesin manualisht", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 27, 98, 171, 12
+    CONTROL "KÃ«rko media e lÃ«vizshme", IDC_CHECK_MEDIA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 33, 163, 9
+    CONTROL "PÃ«rfshij kÃ«tÃ« rrugÃ«", IDC_CHECK_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 54, 162, 10
+    PUSHBUTTON "Shfleto", IDC_BROWSE, 248, 69, 50, 14
+    COMBOBOX IDC_COMBO_PATH, 61, 71, 176, 12, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
+END
+
+IDD_SEARCHDRV DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 51, 20, 169, 16
+END
+
+IDD_INSTALLDRV DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 51, 20, 169, 16
+END
+
+IDD_NEEDREBOOT DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Instalimi i plotÃ«", IDC_FINISHTITLE, 120, 8, 195, 11
+    LTEXT "Ju duhet tÃ« rinisni pÃ«r tÃ« pÃ«rfunduar tÃ« instaluari tÃ«:", IDC_STATIC, 120, 32, 195, 19
+    LTEXT "Kliko Mbaro pÃ«r tÃ« mbyllur magjistar.", IDC_STATIC, 120, 174, 179, 11
+    LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12
+END
+
+IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalimi Pajisjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Instalimi i plotÃ«", IDC_FINISHTITLE, 120, 8, 195, 11
+    LTEXT "Magjistar ka pÃ«rfunduar instalimin e komanduesit pÃ«r:", IDC_STATIC, 120, 32, 195, 19
+    LTEXT "Kliko Mbaro pÃ«r tÃ« mbyllur magjistar.", IDC_STATIC, 120, 174, 179, 11
+    LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12
+END

Modification de propriÃ©tÃ©s sur dll/win32/newdev/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/xinput1_3/CMakeLists.txt
===================================================================
--- dll/win32/xinput1_3/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/xinput1_3/CMakeLists.txt	(copie de travail)
@@ -8,7 +8,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def)
 
 add_library(xinput1_3 SHARED ${SOURCE} version.rc)
-set_module_type(xinput1_3 win32dll)
+set_module_type(xinput1_3 win32dll HOTPATCHABLE)
 target_link_libraries(xinput1_3 wine)
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
 add_cd_file(TARGET xinput1_3 DESTINATION reactos/system32 FOR all)
Index: dll/win32/xinput1_3/xinput1_3_main.c
===================================================================
--- dll/win32/xinput1_3/xinput1_3_main.c	(rÃ©vision 61927)
+++ dll/win32/xinput1_3/xinput1_3_main.c	(copie de travail)
@@ -65,7 +65,7 @@
     return ERROR_BAD_ARGUMENTS;
 }
 
-DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState)
+DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState)
 {
     static int warn_once;
 
Index: dll/win32/dhcpcsvc/CMakeLists.txt
===================================================================
--- dll/win32/dhcpcsvc/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/dhcpcsvc/CMakeLists.txt	(copie de travail)
@@ -19,17 +19,19 @@
     dhcp/tables.c
     dhcp/util.c
     dhcpcsvc.c
+    include/rosdhcp.h)
+
+add_library(dhcpcsvc SHARED
+    ${SOURCE}
     dhcpcsvc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def)
 
-add_library(dhcpcsvc SHARED ${SOURCE})
-
 set_module_type(dhcpcsvc win32dll)
 
 add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
 
 
-add_pch(dhcpcsvc include/rosdhcp.h)
+add_pch(dhcpcsvc include/rosdhcp.h SOURCE)
 
 add_cd_file(TARGET dhcpcsvc DESTINATION reactos/system32 FOR all)
Index: dll/win32/cryptui/lang/cryptui_Sq.rc
===================================================================
--- dll/win32/cryptui/lang/cryptui_Sq.rc	(rÃ©vision 0)
+++ dll/win32/cryptui/lang/cryptui_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,456 @@
+/*
+ * cryptui dll resources
+ *
+ * Copyright 2008 Juan Lang
+ * Translation: Ardit Dani (Albanian Translation Resource File)
+ *
+ * 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
+ */
+
+#include "cryptuires.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_CERTIFICATE "Ã‡ertifikate"
+    IDS_CERTIFICATEINFORMATION "Informacion Ã‡ertifikate"
+    IDS_CERT_INFO_BAD_SIG "Kjo Ã§ertifikate ka firme te pavelfshme. Ã‡ertifikata mund te jete ndryshuar ose korruptuar."
+    IDS_CERT_INFO_UNTRUSTED_CA "Kjo Ã§ertifikate root nuk Ã«shtÃ«t e besushme.  PÃ«r ta besuar, shtoje tek dyqani i besuar i Ã§ertifikatave root."
+    IDS_CERT_INFO_UNTRUSTED_ROOT "Kjo certifikatÃ« nuk mund tÃ« miratohet si njÃ« certifikatÃ« e besuar rrÃ«njÃ«."
+    IDS_CERT_INFO_PARTIAL_CHAIN "Leshuesi i kesaj certifikatÃ« nuk mund tÃ« gjendet."
+    IDS_CERT_INFO_BAD_PURPOSES "TÃ« gjitha qÃ«llimet e synuara tÃ« kÃ«tij certifikatÃ« nuk mund tÃ« verifikohet."
+    IDS_CERT_INFO_PURPOSES "Kjo Ã§ertifikatÃ« Ã«shtÃ« lÃ«shuar pÃ«r qÃ«llimet e mÃ«poshtme:"
+    IDS_SUBJECT_HEADING "LÃ«shuar pÃ«r: "
+    IDS_ISSUER_HEADING "LÃ«shuar nga: "
+    IDS_VALID_FROM "Vlefshme nga "
+    IDS_VALID_TO " tek "
+    IDS_CERTIFICATE_BAD_SIGNATURE "Kjo certifikatÃ« ka nÃ«nshkrim tÃ« pavlefshÃ«m."
+    IDS_CERTIFICATE_BAD_TIME "Kjo certifikatÃ« ka skaduar ose nuk Ã«shtÃ« ende e vlefshme."
+    IDS_CERTIFICATE_BAD_TIMENEST "Periudha e vlefshmÃ«risÃ« sÃ« kÃ«saj certifikatÃ«s tejkalon atÃ« tÃ« lÃ«shuesit tÃ« saj."
+    IDS_CERTIFICATE_REVOKED "Kjo certifikatÃ« ishte revokuar nga leshuesi i saj."
+    IDS_CERTIFICATE_VALID "Kjo Ã§ertifikate Ã«shtÃ« OK."
+    IDS_FIELD "FushÃ«"
+    IDS_VALUE "Vlera"
+    IDS_FIELDS_ALL "<All>"
+    IDS_FIELDS_V1 "Versioni 1 Vetem FushÃ«"
+    IDS_FIELDS_EXTENSIONS "Vetem Zgjatues"
+    IDS_FIELDS_CRITICAL_EXTENSIONS "Vetem Zgjatues Kritik"
+    IDS_FIELDS_PROPERTIES "Vetem Tiparet"
+    IDS_FIELD_VERSION "Versioni"
+    IDS_FIELD_SERIAL_NUMBER "Numri Serial"
+    IDS_FIELD_ISSUER "Leshuesi"
+    IDS_FIELD_VALID_FROM "Vlefshme nga"
+    IDS_FIELD_VALID_TO "Vlefshme deri"
+    IDS_FIELD_SUBJECT "Subjekti"
+    IDS_FIELD_PUBLIC_KEY "Ã‡elesi Publik"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bits)"
+    IDS_PROP_HASH "SHA1 hash"
+    IDS_PROP_ENHKEY_USAGE "Zgjtja Perdorimmi i Ã§elesit (tipare)"
+    IDS_PROP_FRIENDLY_NAME "Emer miqesor"
+    IDS_PROP_DESCRIPTION "Pershkrimi"
+    IDS_CERTIFICATE_PROPERTIES "Tiparet e Ã‡ertifikates"
+    IDS_CERTIFICATE_PURPOSE_ERROR "Ju lutem fusni OID nÃ« forme 1.2.3.4"
+    IDS_CERTIFICATE_PURPOSE_EXISTS "OID'ja e perzgjedhur ekziston."
+    IDS_SELECT_STORE_TITLE "Perzgjedh dyqanin e Ã§ertifikates"
+    IDS_SELECT_STORE "Ju lutem perzgjidhni dyqanin e Ã§ertifikates."
+    IDS_IMPORT_WIZARD "Importuesi Wizard i Ã‡ertifikates"
+    IDS_IMPORT_TYPE_MISMATCH "Dosja pÃ«rmban objektet qÃ« nuk pÃ«rputhen kriteret e dhÃ«na.  Ju lutem zgjidhni nje dokument tjeter."
+    IDS_IMPORT_FILE_TITLE "Dokument per importim"
+    IDS_IMPORT_FILE_SUBTITLE "Specifiko dokumentin per tu importuar."
+    IDS_IMPORT_STORE_TITLE "Dyqani i Ã‡ertifikates"
+    IDS_IMPORT_STORE_SUBTITLE "Dyqane Certifikata janÃ« koleksionet e certifikatave, listat certifikatÃ« revokimit, dhe listat e besimit certifikatÃ«."
+    IDS_IMPORT_FILTER_CERT "X.509 Ã‡ertifikate (*.cer; *.crt)"
+    IDS_IMPORT_FILTER_PFX "Shkembim Informacionesh Personale (*.pfx; *.p12)"
+    IDS_IMPORT_FILTER_CRL "Lista e revokimit te Ã§ertifikatave (*.crl)"
+    IDS_IMPORT_FILTER_CTL "Lista e besuar e Ã§ertifikatave (*.stl)"
+    IDS_IMPORT_FILTER_SERIALIZED_STORE "Dyqani i Microsoft Ã‡ertifikatave te Serializuara (*.sst)"
+    IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Mesazhe (*.spc; *.p7b)"
+    IDS_IMPORT_FILTER_ALL "Te gjith Dokumentet (*.*)"
+    IDS_IMPORT_EMPTY_FILE "Ju lutem zgjidhni nje dokument."
+    IDS_IMPORT_BAD_FORMAT "Formati i dokumentit nuk njihet.  Ju lutem zgjidhni nje dokument tjeter."
+    IDS_IMPORT_OPEN_FAILED "Nuk mund te hapet "
+    IDS_IMPORT_DEST_DETERMINED "PÃ«rcaktohet nga programi"
+    IDS_IMPORT_SELECT_STORE "Ju lutem zgjidhni nje dyqan"
+    IDS_IMPORT_STORE_SELECTION "Dyqani i Ã‡ertifikatave u zgjidh"
+    IDS_IMPORT_DEST_AUTOMATIC "MÃ«nyrÃ« automatike nga programi"
+    IDS_IMPORT_FILE "Dokument"
+    IDS_IMPORT_CONTENT "PÃ«rmbajtje"
+    IDS_IMPORT_CONTENT_CERT "Ã‡ertifikate"
+    IDS_IMPORT_CONTENT_CRL "Lista revokuese e Ã‡ertifikatave"
+    IDS_IMPORT_CONTENT_CTL "Lista e besueshme e Ã‡ertifikatave"
+    IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Mesazhe"
+    IDS_IMPORT_CONTENT_PFX "Shkembim Informacionesh Personale"
+    IDS_IMPORT_CONTENT_STORE "Dyqani i Ã‡ertifikates"
+    IDS_IMPORT_SUCCEEDED "Importimi me sukses."
+    IDS_IMPORT_FAILED "Importimi deshtoj."
+    IDS_WIZARD_TITLE_FONT "Arial"
+    IDS_PURPOSE_ALL "<All>"
+    IDS_PURPOSE_ADVANCED "<Advanced Purposes>"
+    IDS_SUBJECT_COLUMN "LÃ«shuar pÃ«r"
+    IDS_ISSUER_COLUMN "LÃ«shuar nga"
+    IDS_EXPIRATION_COLUMN "Data e skadimit"
+    IDS_FRIENDLY_NAME_COLUMN "Emer Miqesor"
+    IDS_ALLOWED_PURPOSE_ALL "<Te gjith>"
+    IDS_ALLOWED_PURPOSE_NONE "<Asnje>"
+    IDS_WARN_REMOVE_MY "Ju nuk do tÃ« jenÃ« mÃ« nÃ« gjendje tÃ« decrypt mesazhe me kÃ«tÃ« certifikatÃ«, ose tÃ« nÃ«nshkruajÃ« mesazhe me tÃ«.\n\
+Jeni te sigurte qe doni te hiqni kÃ«tÃ« certifikatÃ«?"
+    IDS_WARN_REMOVE_PLURAL_MY "Ju nuk do tÃ« jenÃ« mÃ« nÃ« gjendje tÃ« decrypt mesazhe me kÃ«to certifikata, ose tÃ« nÃ«nshkruajÃ« mesazhe me ta.\n\
+Jeni te sigurte qe doni te hiqni kÃ«to certifikata?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Ju nuk do tÃ« jenÃ« mÃ« nÃ« gjendje tÃ« encrypt mesazhe me kÃ«tÃ« certifikatÃ«, ose tÃ« verifikojÃ« mesazhe tÃ« nÃ«nshkruara me tÃ«.\n\Jeni te sigurte qe doni te hiqni kÃ«tÃ« certifikatÃ«?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Ju do tÃ« jenÃ« mÃ« nÃ« gjendje tÃ« encrypt mesazhe me kÃ«tÃ« certifikatÃ«, ose tÃ« verifikojÃ« mesazhe tÃ« nÃ«nshkruara me tÃ«.\n\Jeni te sigurte qe doni te hiqni kÃ«to certifikata?"
+    IDS_WARN_REMOVE_CA "Certifikatat e lÃ«shuara nga ky autoritet certifikues nuk do t'i besohet mÃ«.\n\
+Jeni te sigurte qe doni te hiqni kÃ«tÃ« certifikatÃ«?"
+    IDS_WARN_REMOVE_PLURAL_CA "Certifikatat e lÃ«shuara nga ky autoritet certifikues nuk do t'i besohet mÃ«.\n\
+Jeni te sigurte qe doni te hiqni kÃ«to certifikata?"
+    IDS_WARN_REMOVE_ROOT "Certifikatat e lÃ«shuara nga ky autoritet certifikues rrÃ«njÃ«, ose Ã§do autoritet certifikimit tÃ« lÃ«shuara, mÃ« nuk do tÃ« besohet.\n\Jeni te sigurte qe doni te hiqni certifikatÃ«n root te besuar?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Certifikatat e lÃ«shuara nga ky autoritet certifikues rrÃ«njÃ«, ose Ã§do autoritet certifikimit tÃ« lÃ«shuara, mÃ« nuk do tÃ« besohet.\n\Jeni te sigurte qe doni te hiqni certifikatÃ«n root te besuar?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software nÃ«nshkruar nga ky botues nuk do t'i besohet.\n\
+Jeni te sigurte qe doni te hiqni kÃ«tÃ« certifikatÃ«?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software nÃ«nshkruar nga ky botues nuk do t'i besohet.\n\
+Jeni te sigurte qe doni te hiqni kÃ«to certifikata?"
+    IDS_WARN_REMOVE_DEFAULT "Jeni te sigurte qe doni te hiqni kÃ«tÃ« certifikatÃ«?"
+    IDS_WARN_REMOVE_PLURAL_DEFAULT "Jeni te sigurte qe doni te hiqni kÃ«to certifikata?"
+    IDS_CERT_MGR "Ã‡ertifikata"
+    IDS_FRIENDLY_NAME_NONE "<Asnje>"
+    IDS_PURPOSE_SERVER_AUTH "Siguron identitetin e njÃ« kompjuter nÃ« distancÃ«"
+    IDS_PURPOSE_CLIENT_AUTH "Provon identitetin tuaj nÃ« njÃ« kompjuter nÃ« distancÃ«"
+    IDS_PURPOSE_CODE_SIGNING "Siguron software erdhi nga botuesit software\n\Mbron software nga ndryshimi pas publikimit"
+    IDS_PURPOSE_EMAIL_PROTECTION "Mbron mesazhe e-maili"
+    IDS_PURPOSE_IPSEC "Lejon komunikim tÃ« sigurt nÃ« Internet"
+    IDS_PURPOSE_TIMESTAMP_SIGNING "Lejon tÃ« dhÃ«nave tÃ« nÃ«nshkruar me kohÃ«n aktuale"
+    IDS_PURPOSE_CTL_USAGE_SIGNING "Ju lejon nÃ«nshkrimin digjital nÃ« listÃ«n e besuar tÃ« certifikatÃ«"
+    IDS_PURPOSE_EFS "Lejon tÃ« dhÃ«nat nÃ« disk pÃ«r tÃ« kryptuar"
+    IDS_PURPOSE_EFS_RECOVERY "Sherim Dokumentash"
+    IDS_PURPOSE_WHQL "Verifikim Windows Hardware Driver"
+    IDS_PURPOSE_NT5 "Verifikim Pjesesh Windows System"
+    IDS_PURPOSE_OEM_WHQL "Verifikim Pjesesh OEM Windows System"
+    IDS_PURPOSE_EMBEDDED_NT "Verifikim Pjesesh Embedded Windows System"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "Liste Firme Root"
+    IDS_PURPOSE_QUALIFIED_SUBORDINATION "VarshmÃ«ria kualifikuar"
+    IDS_PURPOSE_KEY_RECOVERY "Sherim Ã‡elesi"
+    IDS_PURPOSE_DOCUMENT_SIGNING "Firme Dokumentash"
+    IDS_PURPOSE_LIFETIME_SIGNING "Firme kohejetegjatesine"
+    IDS_PURPOSE_DRM "Te Drejtat Digjitale"
+    IDS_PURPOSE_LICENSES "Pako LiÃ§ense Ã‡elesi"
+    IDS_PURPOSE_LICENSE_SERVER "Verifikim License Serveri"
+    IDS_PURPOSE_ENROLLMENT_AGENT "Axhend Kerkues Ã‡ertifikate"
+    IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Logon"
+    IDS_PURPOSE_CA_EXCHANGE "Arkivim Ã‡eles Privat"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "Axhend Sherim Ã‡elesi"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Replikim i Sherbimeve Directorie Emaili"
+    IDS_EXPORT_WIZARD "Ã‡ertifikata Eksport Wizard"
+    IDS_EXPORT_FORMAT_TITLE "Formati Eksportit"
+    IDS_EXPORT_FORMAT_SUBTITLE "Zgjidhni formatin nÃ« tÃ« cilÃ«n pÃ«rmbajtja do tÃ« ruhen."
+    IDS_EXPORT_FILE_TITLE "Exporto Dokumentin"
+    IDS_EXPORT_FILE_SUBTITLE "Specifikoni emrin e skedarit nÃ« tÃ« cilÃ«n pÃ«rmbajtja do tÃ« shpÃ«tohet."
+    IDS_EXPORT_FILE_EXISTS "Dosja e specifikuar tashmÃ« ekziston. A doni tÃ« zÃ«vendÃ«suar atÃ«?"
+    IDS_EXPORT_FILTER_CERT "DER-Encoded Binary X.509 (*.cer)"
+    IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)"
+    IDS_EXPORT_FILTER_CRL "Lista Rivokimit Ã‡ertifikates (*.crl)"
+    IDS_EXPORT_FILTER_CTL "Lista e Besuar e Ã‡ertifikatave (*.stl)"
+    IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Meszhe (*.p7b)"
+    IDS_EXPORT_FILTER_PFX "Shkembim Informacinesh Personale (*.pfx)"
+    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Dyqani i Ã‡ertifikates (*.sst)"
+    IDS_EXPORT_FORMAT "Formati Dokumentave"
+    IDS_EXPORT_INCLUDE_CHAIN "PÃ«rfshirja e tÃ« gjitha certifikatat nÃ« rrugÃ«n e certifikatÃ«s"
+    IDS_EXPORT_KEYS "Ã‡elesi Eksportit"
+    IDS_YES "Po"
+    IDS_NO "Jo"
+    IDS_EXPORT_SUCCEEDED "Eksportim me sukses."
+    IDS_EXPORT_FAILED "Eksportimi Deshtoj."
+    IDS_EXPORT_PRIVATE_KEY_TITLE "Eksporot Ã‡eles Privat"
+    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Certifikata pÃ«rmban njÃ« Ã§elÃ«s privat qÃ« mund tÃ« eksportohen sÃ« bashku me certifikatÃ«n e."
+    IDS_EXPORT_PASSWORD_TITLE "Fut Passwordin"
+    IDS_EXPORT_PASSWORD_SUBTITLE "Mund te mbroni nje Ã§eles privat."
+    IDS_EXPORT_PASSWORD_MISMATCH "Passwordi nuk perputhet."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Shenim: Ã‡elÃ«si privat pÃ«r kÃ«tÃ« certifikatÃ« nuk mund tÃ« hapet."
+    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Shenim: Ã‡elÃ«si privat pÃ«r kÃ«tÃ« certifikatÃ« nuk Ã«shtÃ« eksportueshme."
+}
+
+IDD_GENERAL DIALOG 0, 0, 255, 236
+CAPTION "PÃ«rgjithshÃ«m"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", -1, "Statik", WS_BORDER|SS_WHITERECT, 6,10,241,200
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
+  CONTROL "", -1, "Statik", SS_BLACKFRAME, 16,37,222,1
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
+  CONTROL "", -1, "Statik", SS_BLACKFRAME, 16,116,222,1
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Instalo Ã‡ertifikaten...", IDC_ADDTOSTORE,53,216,95,14
+  PUSHBUTTON "Deklarate Leshuesit", IDC_ISSUERSTATEMENT,152,216,95,14
+END
+
+IDD_DETAIL DIALOG 0, 0, 255, 236
+CAPTION "Detaje"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&Shfaq:", -1, 6,12,40,14
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_DETAIL_LIST, "SysListView32",
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "Modifiko Tiparet...", IDC_EDITPROPERTIES,53,216,95,14
+  PUSHBUTTON "Kopjo Dokumentin...", IDC_EXPORT,152,216,95,14
+END
+
+IDD_HIERARCHY DIALOG 0, 0, 255, 236
+CAPTION "Rruga Ã‡ertifikimit"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Rruga Ã‡ertifikimit", -1,6,10,245,165, BS_GROUPBOX
+  CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
+    13,22,231,130
+  PUSHBUTTON "&VÃ«zhgo Ã‡ertifikaten", IDC_VIEWCERTIFICATE,155,156,90,14
+  LTEXT "Ã‡ertifikate &status:", IDC_CERTIFICATESTATUS,6,183,200,14
+  CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
+    WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
+END
+
+IDD_USERNOTICE DIALOG 0, 0, 255, 256
+CAPTION "Mohim"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", IDC_USERNOTICE,"RichEdit20W",
+    WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
+  PUSHBUTTON "Mbyll", IDOK,73,216,85,14
+  PUSHBUTTON "MÃ« Shum &Info", IDC_CPS,162,216,85,14
+END
+
+IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
+CAPTION "PÃ«rgjithshÃ«m"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Emer Miqesor:", -1, 6,14,60,14
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
+  LTEXT "PÃ«rshkrim:", -1, 6,32,60,14
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Arsye Ã‡ertifikimi", -1,6,48,245,185, BS_GROUPBOX
+  AUTORADIOBUTTON "Aktivizo tÃ« gjitha qÃ«llimet pÃ«r kÃ«tÃ« certifikatÃ«",
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "Ã‡'aktivizo tÃ« gjitha qÃ«llimet pÃ«r kÃ«tÃ« certifikatÃ«",
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "Aktivizo vetÃ«m qÃ«llimet e mÃ«poshtme pÃ«r kÃ«tÃ« certifikatÃ«:",
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
+  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    24,100,220,106
+  PUSHBUTTON "Shto Arsyet...", IDC_ADD_PURPOSE,174,212,70,14
+END
+
+IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
+CAPTION "Shto Arsyet"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Shto identifikues objekt (oid) me qÃ«llim certifikatÃ«s ju dÃ«shironi tÃ« shtoni:",
+    -1, 6,6,190,28
+  EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  PUSHBUTTON "OK", IDOK, 33,48,60,14
+  PUSHBUTTON "Anulo", IDCANCEL, 100,48,60,14
+END
+
+IDD_SELECT_STORE DIALOG 0,0,200,136
+CAPTION "PÃ«rzgjedh Dyqanin e Ã‡ertifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Zgjidhni dyqanin e certifikatave qÃ« dÃ«shironi tÃ« pÃ«rdorni:", IDC_STORE_TEXT, 6,6,190,28
+  CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
+    6,28,188,70
+  CHECKBOX "&Shfaq dyqanet fizike", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
+  PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "Anulo", IDCANCEL, 144,118,50,14
+END
+
+IDD_IMPORT_WELCOME DIALOG 0,0,317,143
+CAPTION "Magjistrari Importimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "MirÃ« se vini nÃ« Magjistarin Importues te Certifikatave", IDC_IMPORT_TITLE, 115,7,195,30
+  LTEXT "Ky magjistar ju ndihmon ne importimin e certifikatave, listen e revokimit te certifikatave, dhe listen e besuar te certifikatave nga nje dokument ne certifikate dyqani.\n\
+\n\
+Certifikata mund tÃ« pÃ«rdoret pÃ«r tÃ« identifikuar ju ose kompjuterin me tÃ« cilÃ«n ju komunikoni. Ajo gjithashtu mund tÃ« pÃ«rdoret pÃ«r tÃ« legalizuara, dhe pÃ«r tÃ« nÃ«nshkruar mesazhe. Dyqanet e Certifikatave janÃ« koleksionet e certifikatave, listat certifikatÃ« revokimit, dhe listat e besimit te certifikatave.\n\
+\n\
+PÃ«r tÃ« vazhduar, klikoni TjetÃ«r.",
+    -1, 115,40,195,120
+END
+
+IDD_IMPORT_FILE DIALOG 0,0,317,178
+CAPTION "Magjistrari Importimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Emri Dokumentit:", -1, 21,1,195,10
+  EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  PUSHBUTTON "Shfleto...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  LTEXT "Shenim:  Formati i mÃ«poshtme mund tÃ« pÃ«rmbajÃ« mÃ« shumÃ« se njÃ« certifikatÃ«, certifikatÃ« listÃ« revokimi ose certifikatÃ«n listÃ«n e besimit:",
+    -1, 21,30,265,16
+  LTEXT "Mesazh kriptografike Sintaksa Standard/PKCS #7 Messages (.p7b)",
+    -1, 31,53,265,10
+  LTEXT "ShkÃ«mbim Informacione Personale/PKCS #12 (.pfx, .p12)",
+    -1, 31,68,265,10
+  LTEXT "Microsoft Serialized Certificate Store (.sst)",
+    -1, 31,83,265,10
+END
+
+IDD_IMPORT_STORE DIALOG 0,0,317,143
+CAPTION "Magjistrari Importimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Wine mund tÃ« zgjedh automatikisht dyqanin e certifikatÃ«s, ose ju mund tÃ« specifikoni njÃ« vend pÃ«r certifikatat.",
+    -1, 21,1,220,25
+  AUTORADIOBUTTON "&Automatikisht zgjidhni dyqan certifikatÃ«",
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "Vendi tÃ« gjitha certifikatat nÃ« dyqan nÃ« vijim:",
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
+  PUSHBUTTON "Shfleto...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
+END
+
+IDD_IMPORT_FINISH DIALOG 0,0,317,178
+CAPTION "Magjistrari Importimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "PlotÃ«simi Magjistarit per Importin e Certifikatave", IDC_IMPORT_TITLE,
+    115,1,195,40
+  LTEXT "Ju keni pÃ«rfunduar me sukses Magjistarin e Importimit te Certifikatave.",
+    -1, 115,33,195,24
+  LTEXT "Ju keni specifikuar konfigurimet e metejshme:",
+    -1, 115,57,195,12
+  CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    115,67,174,100
+END
+
+IDD_CERT_MGR DIALOG 0,0,335,270
+CAPTION "Ã‡ertifikata"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Arsyeja e QÃ«llimit:", -1, 7,9,100,12
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Importo...", IDC_MGR_IMPORT, 7,172,65,14
+  PUSHBUTTON "&Eksporto...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
+  PUSHBUTTON "Hiq", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
+  PUSHBUTTON "&Avancume...", IDC_MGR_ADVANCED, 263,172,65,14
+  GROUPBOX "Arsyeja dhe QÃ«llimi certifikimit", -1,7,194,321,47, BS_GROUPBOX
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
+  PUSHBUTTON "&VÃ«zhgo", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "Mbyll", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
+END
+
+IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
+CAPTION "Opsione PÃ«rparuara"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Aryeja Ã‡ertifikimit", -1, 7,7,234,141, BS_GROUPBOX
+  LTEXT "Zgjidh nje ose me shume arsye te listimit kur behet perzgjedhja e Aryest te perparuar.",
+    -1, 14,18,220,16
+  LTEXT "Aryeja Ã‡ertifikimit:", -1, 14,41,90,12, WS_TABSTOP
+  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    14,51,220,90
+  PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "Anulo", IDCANCEL, 190,155,51,14
+END
+
+IDD_EXPORT_WELCOME DIALOG 0,0,317,143
+CAPTION "Magjistrari Eksportimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "MirÃ« se vini nÃ« Magjistarin Eksportues te Certifikatave", IDC_EXPORT_TITLE, 115,7,195,30
+  LTEXT "Ky magjistar ju ndihmon ne eksmportimin e certifikatave, listen e revokimit te certifikatave, dhe listen e besuar te certifikatave nga nje dokument ne certifikate dyqani.\n\
+\n\
+Certifikata mund tÃ« pÃ«rdoret pÃ«r tÃ« identifikuar ju ose kompjuterin me tÃ« cilÃ«n ju komunikoni. Ajo gjithashtu mund tÃ« pÃ«rdoret pÃ«r tÃ« legalizuara, dhe pÃ«r tÃ« nÃ«nshkruar mesazhe. Dyqanet e Certifikatave janÃ« koleksionet e certifikatave, listat certifikatÃ« revokimit, dhe listat e besimit te certifikatave.\n\
+\n\
+PÃ«r tÃ« vazhduar, klikoni TjetÃ«r.",
+    -1, 115,40,195,120
+END
+
+IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
+CAPTION "Magjistrari Eksportimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "NÃ«se ju vendosni pÃ«r tÃ« eksportuar Ã§elÃ«sin privat, do ju kerkohet fjalÃ«kalimi pÃ«r tÃ« mbrojtur/kyÃ§ privattish nÃ« njÃ« faqe tÃ« mÃ«vonshme.", -1, 21,1,195,25
+  LTEXT "A dÃ«shironi tÃ« eksportojÃ« Ã§elÃ«sin privat?", -1, 21,27,195,10
+  AUTORADIOBUTTON "Po, eksport Ã§elÃ«sin privat",
+    IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "Jo, mos eksporto Ã§elÃ«sin privat",
+    IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON
+  LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24
+END
+
+IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
+CAPTION "Magjistrari Eksportimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&Password:", -1, 21,1,195,10
+  EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  LTEXT "Konfirmo passwordin:", -1, 21,35,195,10
+  EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+END
+
+IDD_EXPORT_FORMAT DIALOG 0,0,317,143
+CAPTION "Magjistrari Eksportimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Zgjidhni formatin qÃ« dÃ«shironi tÃ« pÃ«rdorni:", -1, 21,1,195,10
+  AUTORADIOBUTTON "&DER-encoded X.509 (.cer)",
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):",
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "Mesazh kriptografike Sintaksa Standard/PKCS #7 Message (.p7b)",
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
+  CHECKBOX "PÃ«rfshirja e tÃ« gjitha certifikatat nÃ« rrugÃ«n e certifikimit nÃ«se Ã«shtÃ« e mundur",
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  AUTORADIOBUTTON "ShkÃ«mbim Informacione Personale/PKCS #12 (.pfx)",
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
+  CHECKBOX "PÃ«rfshirja e tÃ« gjitha certifikatat nÃ« rrugÃ«n e certifikimit nÃ«se Ã«shtÃ« e mundur",
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  CHECKBOX "Aktivizo kryptim tÃ« fortÃ«",
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  CHECKBOX "Fshije Ã§elesat privat nÃ« qoftÃ« se eksporti Ã«shtÃ« i suksesshÃ«m",
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+END
+
+IDD_EXPORT_FILE DIALOG 0,0,317,143
+CAPTION "Magjistrari Eksportimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Emri Dokumentit:", -1, 21,1,195,10
+  EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  PUSHBUTTON "Shfleto...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+END
+
+IDD_EXPORT_FINISH DIALOG 0,0,317,178
+CAPTION "Magjistrari Eksportimit Ã‡etifikatave"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "PlotÃ«simi Magjistarit per Eksportin e Certifikatave", IDC_EXPORT_TITLE,
+    115,1,195,40
+  LTEXT "Ju keni pÃ«rfunduar me sukses Magjistarin e Eksportimit te Certifikatave.",
+    -1, 115,33,195,24
+  LTEXT "Ju keni specifikuar konfigurimet e metejshme:",
+    -1, 115,57,195,12
+  CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    115,67,174,100
+END

Modification de propriÃ©tÃ©s sur dll/win32/cryptui/lang/cryptui_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/cryptui/lang/cryptui_Tr.rc
===================================================================
--- dll/win32/cryptui/lang/cryptui_Tr.rc	(rÃ©vision 0)
+++ dll/win32/cryptui/lang/cryptui_Tr.rc	(rÃ©vision 62573)
@@ -0,0 +1,462 @@
+/*
+ * cryptui dll resources
+ *
+ * Copyright 2008 Juan Lang
+ *
+ * Translated to Turkish by Erdem Ersoy (eersoy93) (erdemersoy@live.com) in 2014.
+ *
+ * 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
+ */
+
+#include "cryptuires.h"
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_CERTIFICATE "Onay Belgesi"
+    IDS_CERTIFICATEINFORMATION "Onay Belgesi Bilgisi"
+    IDS_CERT_INFO_BAD_SIG "Bu onay belgesinde geÃ§ersiz bir imzÃ¢ vardÄ±r. Bu onay belgesi deÄŸiÅŸtirilmiÅŸ veyÃ¢ bozulmuÅŸ olabilir."
+    IDS_CERT_INFO_UNTRUSTED_CA "Bu kÃ¶k onay belgesi gÃ¼venilir deÄŸil. Bunu gÃ¼venilir yapmak iÃ§in bunu dizgenizin gÃ¼venilir kÃ¶k onay belgesi deposuna ekleyiniz."
+    IDS_CERT_INFO_UNTRUSTED_ROOT "Bu onay belgesinin gÃ¼venilir kÃ¶k onay belgesi olduÄŸu doÄŸrulanamadÄ±."
+    IDS_CERT_INFO_PARTIAL_CHAIN "Bu onay belgesinin daÄŸÄ±tÄ±cÄ±sÄ± bulunamadÄ±."
+    IDS_CERT_INFO_BAD_PURPOSES "Bu onay belgesinin tÃ¼m kullanÄ±m amaÃ§larÄ± doÄŸrulanamadÄ±."
+    IDS_CERT_INFO_PURPOSES "Bu onay belgesi aÅŸaÄŸÄ±daki amaÃ§lar iÃ§in anÄ±klanmÄ±ÅŸtÄ±r:"
+    IDS_SUBJECT_HEADING "Åžuraya DaÄŸÄ±tÄ±ldÄ±: "
+    IDS_ISSUER_HEADING "Åžu DaÄŸÄ±ttÄ±: "
+    IDS_VALID_FROM "Åžuradan geÃ§erlidir "
+    IDS_VALID_TO " ÅŸuraya "
+    IDS_CERTIFICATE_BAD_SIGNATURE "Bu onay belgesinde geÃ§ersiz bir imzÃ¢ vardÄ±r."
+    IDS_CERTIFICATE_BAD_TIME "Bu onay belgesinin, sÃ¼resi dolmuÅŸtur ya da daha geÃ§ersizdir."
+    IDS_CERTIFICATE_BAD_TIMENEST "Bu onay belgesinin geÃ§erlilik dÃ¶nemi daÄŸÄ±tÄ±cÄ±sÄ±nÄ±nkisini aÅŸÄ±yor."
+    IDS_CERTIFICATE_REVOKED "Bu onay belgesi, daÄŸÄ±tÄ±cÄ±sÄ± eliyle iptal edildi."
+    IDS_CERTIFICATE_VALID "Bu onay belgesi doÄŸrulanmÄ±ÅŸtÄ±r."
+    IDS_FIELD "Alan"
+    IDS_VALUE "DeÄŸer"
+    IDS_FIELDS_ALL "<TÃ¼mÃ¼>"
+    IDS_FIELDS_V1 "YalnÄ±zca SÃ¼rÃ¼m 1 AlanlarÄ±"
+    IDS_FIELDS_EXTENSIONS "YalnÄ±zca Eklentiler"
+    IDS_FIELDS_CRITICAL_EXTENSIONS "YalnÄ±zca Ã–nemli Eklentiler"
+    IDS_FIELDS_PROPERTIES "YalnÄ±zca HusÃ»siyetler"
+    IDS_FIELD_VERSION "SÃ¼rÃ¼m"
+    IDS_FIELD_SERIAL_NUMBER "Dizi NumarasÄ±"
+    IDS_FIELD_ISSUER "DaÄŸÄ±tÄ±cÄ±"
+    IDS_FIELD_VALID_FROM "Åžuradan GeÃ§erlidir"
+    IDS_FIELD_VALID_TO "Åžuraya GeÃ§erlidir"
+    IDS_FIELD_SUBJECT "Konu"
+    IDS_FIELD_PUBLIC_KEY "AÃ§Ä±k Anahtar"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bit)"
+    IDS_PROP_HASH "SHA1 Kodu"
+    IDS_PROP_ENHKEY_USAGE "GeliÅŸmiÅŸ anahtar kullanÄ±mÄ± (husÃ»siyet)"
+    IDS_PROP_FRIENDLY_NAME "Kolay AdÄ±"
+    IDS_PROP_DESCRIPTION "TanÄ±mÄ±"
+    IDS_CERTIFICATE_PROPERTIES "Onay Belgesi HusÃ»siyetleri"
+    IDS_CERTIFICATE_PURPOSE_ERROR "1.2.3.4 biÃ§iminde bir OID giriniz."
+    IDS_CERTIFICATE_PURPOSE_EXISTS "GirdiÄŸiniz OID Ã¶nceden var."
+    IDS_SELECT_STORE_TITLE "Onay Belgesi Deposu SeÃ§me"
+    IDS_SELECT_STORE "Bir onay belgesi deposu seÃ§iniz."
+    IDS_IMPORT_WIZARD "Onay Belgesi Alma YardÄ±mcÄ±sÄ±"
+    IDS_IMPORT_TYPE_MISMATCH "Bu kÃ¼tÃ¼k, verilen Ã¶lÃ§Ã¼tlerle uyuÅŸmayan nesneler iÃ§eriyor. BaÅŸka bir kÃ¼tÃ¼k seÃ§iniz."
+    IDS_IMPORT_FILE_TITLE "AlÄ±nacak KÃ¼tÃ¼k"
+    IDS_IMPORT_FILE_SUBTITLE "Almak istediÄŸiniz kÃ¼tÃ¼ÄŸÃ¼ belirtiniz."
+    IDS_IMPORT_STORE_TITLE "Onay Belgesi Deposu"
+    IDS_IMPORT_STORE_SUBTITLE "Onay belgesi depolarÄ±; onay belgelerinden, onay belgesi iptal dizelgelerinden ve onay belgesi gÃ¼ven dizelgelerinden oluÅŸan derlemlerdir."
+    IDS_IMPORT_FILTER_CERT "X.509 Onay Belgesi (*.cer; *.crt)"
+    IDS_IMPORT_FILTER_PFX "ÅžahsÃ® Bilgi DeÄŸiÅŸtirmesi (*.pfx; *.p12)"
+    IDS_IMPORT_FILTER_CRL "Onay Belgesi Ä°ptal Dizelgesi (*.crl)"
+    IDS_IMPORT_FILTER_CTL "Onay Belgesi GÃ¼ven Dizelgesi (*.stl)"
+    IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft DizilendirilmiÅŸ Onay Belgesi Deposu (*.sst)"
+    IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Ä°letileri (*.spc; *.p7b)"
+    IDS_IMPORT_FILTER_ALL "TÃ¼m KÃ¼tÃ¼kler (*.*)"
+    IDS_IMPORT_EMPTY_FILE "Bir kÃ¼tÃ¼k seÃ§iniz."
+    IDS_IMPORT_BAD_FORMAT "Bu kÃ¼tÃ¼k biÃ§imi tanÄ±nmÄ±ÅŸ deÄŸil. BaÅŸka bir kÃ¼tÃ¼k seÃ§iniz."
+    IDS_IMPORT_OPEN_FAILED "AÃ§Ä±lmadÄ±."
+    IDS_IMPORT_DEST_DETERMINED "Ã‡izeylem eliyle karar verildi."
+    IDS_IMPORT_SELECT_STORE "Bir depo seÃ§iniz."
+    IDS_IMPORT_STORE_SELECTION "Onay belgesi deposu seÃ§ildi."
+    IDS_IMPORT_DEST_AUTOMATIC "Ã‡izeylem eliyle kendilÄŸinden karar verildi."
+    IDS_IMPORT_FILE "KÃ¼tÃ¼k"
+    IDS_IMPORT_CONTENT "Ä°Ã§erik"
+    IDS_IMPORT_CONTENT_CERT "Onay Belgesi"
+    IDS_IMPORT_CONTENT_CRL "Onay Belgesi Ä°ptal Dizelgesi"
+    IDS_IMPORT_CONTENT_CTL "Onay Belgesi GÃ¼ven Dizelgesi"
+    IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Ä°letisi"
+    IDS_IMPORT_CONTENT_PFX "ÅžahsÃ® Bilgi DeÄŸiÅŸtirmesi"
+    IDS_IMPORT_CONTENT_STORE "Onay Belgesi Deposu"
+    IDS_IMPORT_SUCCEEDED "Alma iÅŸlemi baÅŸarÄ±lÄ± oldu."
+    IDS_IMPORT_FAILED "Alma iÅŸlemi baÅŸarÄ±sÄ±z oldu."
+    IDS_WIZARD_TITLE_FONT "Arial"
+    IDS_PURPOSE_ALL "<TÃ¼mÃ¼>"
+    IDS_PURPOSE_ADVANCED "<GeliÅŸmiÅŸ AmaÃ§lar>"
+    IDS_SUBJECT_COLUMN "Åžuraya DaÄŸÄ±tÄ±ldÄ±"
+    IDS_ISSUER_COLUMN "Eliyle DaÄŸÄ±tÄ±ldÄ±"
+    IDS_EXPIRATION_COLUMN "BitiÅŸ ZamÃ¢nÄ±"
+    IDS_FRIENDLY_NAME_COLUMN "Kolay AdÄ±"
+    IDS_ALLOWED_PURPOSE_ALL "<TÃ¼mÃ¼>"
+    IDS_ALLOWED_PURPOSE_NONE "<Yok>"
+    IDS_WARN_REMOVE_MY "ArtÄ±k bu onay belgesiyle, iletileri Ã§Ã¶zemeyeceksiniz veyÃ¢ iletileri imzÃ¢layamayacaksÄ±nÄ±z.\n\
+Bu onay belgesini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_PLURAL_MY "ArtÄ±k bu onay belgeleriyle, iletileri Ã§Ã¶zemeyeceksiniz veyÃ¢ iletileri imzÃ¢layamayacaksÄ±nÄ±z.\n\
+Bu onay belgelerini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "ArtÄ±k bu onay belgesiyle, iletileri ÅŸifreleyemeyeceksiniz veyÃ¢ imzÃ¢lanmÄ±ÅŸ iletileri doÄŸrulayamayacaksÄ±nÄ±z.\n\
+Bu onay belgesini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "ArtÄ±k bu onay belgeleriyle, iletileri ÅŸifreleyemeyeceksiniz veyÃ¢ imzÃ¢lanmÄ±ÅŸ iletileri doÄŸrulayamayacaksÄ±nÄ±z.\n\
+Bu onay belgelerini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_CA "ArtÄ±k bu onaylama yetkilisiyle daÄŸÄ±tÄ±lan onay belgeleri gÃ¼venilir olmayacaktÄ±r.\n\
+Bu onay belgesini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_PLURAL_CA "ArtÄ±k bu onaylama yetkilileriyle daÄŸÄ±tÄ±lan onay belgeleri gÃ¼venilir olmayacaktÄ±r.\n\
+Bu onay belgelerini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_ROOT "ArtÄ±k, bu kÃ¶k onaylama yetkilisiyle daÄŸÄ±tÄ±lan onay belgeleri ve daÄŸÄ±tan bu onaylama yetkilisi gÃ¼venilir olmayacaktÄ±r.\n\
+Bu gÃ¼venilir kÃ¶k onay belgesini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "ArtÄ±k, bu kÃ¶k onaylama yetkilileriyle daÄŸÄ±tÄ±lan onay belgeleri ve daÄŸÄ±tan bu onaylama yetkilileri gÃ¼venilir olmayacaktÄ±r.\n\
+Bu gÃ¼venilir kÃ¶k onay belgelerini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "ArtÄ±k, bu yayÄ±mcÄ±nÄ±n imzÃ¢ladÄ±ÄŸÄ± yazÄ±lÄ±m gÃ¼venilir olmayacaktÄ±r.\n\
+Bu onay belgesini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "ArtÄ±k, bu yayÄ±mcÄ±larnÄ±n imzÃ¢ladÄ±ÄŸÄ± yazÄ±lÄ±m gÃ¼venilir olmayacaktÄ±r.\n\
+Bu onay belgelerini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_DEFAULT "Bu onay belgesini silmeyi onaylÄ±yor musunuz?"
+    IDS_WARN_REMOVE_PLURAL_DEFAULT "Bu onay belgelerini silmeyi onaylÄ±yor musunuz?"
+    IDS_CERT_MGR "Onay Belgeleri"
+    IDS_FRIENDLY_NAME_NONE "<Yok>"
+    IDS_PURPOSE_SERVER_AUTH "Uzaktaki bilgisayarÄ±n kimliÄŸini saÄŸlar."
+    IDS_PURPOSE_CLIENT_AUTH "Uzaktaki bilgisayara kimliÄŸinizi tanÄ±ttÄ±rÄ±r."
+    IDS_PURPOSE_CODE_SIGNING "YazÄ±lÄ±m yayÄ±mcÄ±sÄ±ndan gelen yazÄ±lÄ±mÄ± korur.\n\
+YazÄ±lÄ±mÄ± yayÄ±mlamadan sonraki deÄŸiÅŸikliklerden korur."
+    IDS_PURPOSE_EMAIL_PROTECTION "E-posta iletilerini korur."
+    IDS_PURPOSE_IPSEC "Ã–rÃ¼tbaÄŸ Ã¼zerinden gÃ¼venli iletiÅŸim saÄŸlar."
+    IDS_PURPOSE_TIMESTAMP_SIGNING "Verilerin ÅŸimdiki zamanla imzÃ¢lanmasÄ±nÄ± saÄŸlar."
+    IDS_PURPOSE_CTL_USAGE_SIGNING "Onay belgesi gÃ¼ven dizelgesini sayÄ±lÄ±k olarak imzÃ¢lamanÄ±zÄ± saÄŸlar."
+    IDS_PURPOSE_EFS "Diskteki verilerin ÅŸifrelenmesini saÄŸlar."
+    IDS_PURPOSE_EFS_RECOVERY "KÃ¼tÃ¼k Kurtarma"
+    IDS_PURPOSE_WHQL "Windows DonanÄ±m SÃ¼rÃ¼cÃ¼sÃ¼ DoÄŸrulamasÄ±"
+    IDS_PURPOSE_NT5 "Windows Dizge BileÅŸeni DoÄŸrulamasÄ±"
+    IDS_PURPOSE_OEM_WHQL "OEM Windows Dizge BileÅŸeni DoÄŸrulamasÄ±"
+    IDS_PURPOSE_EMBEDDED_NT "GÃ¶mÃ¼lÃ¼ Windows Dizge BileÅŸeni DoÄŸrulamasÄ±"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "KÃ¶k Dizelgesi Ä°mzÃ¢layÄ±cÄ±sÄ±"
+    IDS_PURPOSE_QUALIFIED_SUBORDINATION "Nitelikli BaÄŸlÄ±lÄ±k"
+    IDS_PURPOSE_KEY_RECOVERY "Anahtar Kurtarma"
+    IDS_PURPOSE_DOCUMENT_SIGNING "Belge Ä°mzÃ¢lama"
+    IDS_PURPOSE_LIFETIME_SIGNING "YaÅŸam Boyu Ä°mzÃ¢lama"
+    IDS_PURPOSE_DRM "SayÄ±lÄ±k Haklar"
+    IDS_PURPOSE_LICENSES "Anahtar Paketi RuhsatlarÄ±"
+    IDS_PURPOSE_LICENSE_SERVER "Ruhsat Sunucusu DoÄŸrulamasÄ±"
+    IDS_PURPOSE_ENROLLMENT_AGENT "Onay Belgesi Ä°stek YardÄ±mcÄ±sÄ±"
+    IDS_PURPOSE_SMARTCARD_LOGON "AkÄ±llÄ± Kart ile Oturum AÃ§ma"
+    IDS_PURPOSE_CA_EXCHANGE "HusÃ»sÃ® Anahtar BelgelikliÄŸi"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "Anahtar Kurtarma YardÄ±mcÄ±sÄ±"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Dizin Hizmeti E-Posta SÃ»reti"
+    IDS_EXPORT_WIZARD "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+    IDS_EXPORT_FORMAT_TITLE "Verme BiÃ§imi"
+    IDS_EXPORT_FORMAT_SUBTITLE "Ä°Ã§eriÄŸin kaydedileceÄŸi biÃ§imi seÃ§iniz."
+    IDS_EXPORT_FILE_TITLE "Verme KÃ¼tÃ¼k AdÄ±"
+    IDS_EXPORT_FILE_SUBTITLE "Ä°Ã§eriÄŸin kaydedildeceÄŸi kÃ¼tÃ¼ÄŸÃ¼n adÄ±nÄ± belirtiniz."
+    IDS_EXPORT_FILE_EXISTS "Belirtilen kÃ¼tÃ¼k Ã¶nceden var. Onu deÄŸiÅŸtirmek ister misiniz?"
+    IDS_EXPORT_FILTER_CERT "DER ÅžifrelenmiÅŸ Ä°kili X.509 (*.cer)"
+    IDS_EXPORT_FILTER_BASE64_CERT "Base64 ÅžifrelenmiÅŸ X.509 (*.cer)"
+    IDS_EXPORT_FILTER_CRL "Onay Belgesi Ä°ptal Dizelgesi (*.crl)"
+    IDS_EXPORT_FILTER_CTL "Onay Belgesi GÃ¼ven Dizelgesi (*.stl)"
+    IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Ä°letileri (*.p7b)"
+    IDS_EXPORT_FILTER_PFX "ÅžahsÃ® Bilgi DeÄŸiÅŸtirmesi (*.pfx)"
+    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "DizilendirilmiÅŸ Onay Belgesi Deposu (*.sst)"
+    IDS_EXPORT_FORMAT "KÃ¼tÃ¼k BiÃ§imi"
+    IDS_EXPORT_INCLUDE_CHAIN "Onay belgesi yolundaki tÃ¼m onay belgeleri iÃ§inde olsun."
+    IDS_EXPORT_KEYS "Verilen Anahtarlar"
+    IDS_YES "Evet"
+    IDS_NO "HayÄ±r"
+    IDS_EXPORT_SUCCEEDED "Verme iÅŸlemi baÅŸarÄ±lÄ± oldu."
+    IDS_EXPORT_FAILED "Verme iÅŸlemi baÅŸarÄ±sÄ±z oldu."
+    IDS_EXPORT_PRIVATE_KEY_TITLE "HusÃ»sÃ® AnahtarÄ± Verme"
+    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Bu onay belgesi, kendisiyle birlikte verilebilecek bir husÃ»sÃ® anahtar iÃ§erir."
+    IDS_EXPORT_PASSWORD_TITLE "Åžifreyi Girme"
+    IDS_EXPORT_PASSWORD_SUBTITLE "Bir husÃ»sÃ® anahtarÄ± ÅŸifreyle koruyabilirsiniz."
+    IDS_EXPORT_PASSWORD_MISMATCH "Åžifreler birbiriyle uyuÅŸmuyor."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Ã–nemli: Bu onay belgesinin husÃ»sÃ® anahtarÄ± aÃ§Ä±lamadÄ±."
+    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Ã–nemli: Bu onay belgesinin husÃ»sÃ® anahtarÄ± verilebilen deÄŸil."
+}
+
+IDD_GENERAL DIALOG 0, 0, 255, 236
+CAPTION "UmÃ»mÃ®"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
+  CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
+  CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Onay Belgesini Kur...", IDC_ADDTOSTORE,53,216,95,14
+  PUSHBUTTON "&DaÄŸÄ±tÄ±cÄ± AÃ§Ä±klamasÄ±", IDC_ISSUERSTATEMENT,152,216,95,14
+END
+
+IDD_DETAIL DIALOG 0, 0, 255, 236
+CAPTION "AyrÄ±ntÄ±lar"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&GÃ¶ster:", -1, 6,12,40,14
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_DETAIL_LIST, "SysListView32",
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&HusÃ»siyetleri DÃ¼zenle...", IDC_EDITPROPERTIES,53,216,95,14
+  PUSHBUTTON "&KÃ¼tÃ¼ÄŸe Ã‡oÄŸalt...", IDC_EXPORT,152,216,95,14
+END
+
+IDD_HIERARCHY DIALOG 0, 0, 255, 236
+CAPTION "Onay Belgesi Yolu"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Onay Belgesi Yolu", -1,6,10,245,165, BS_GROUPBOX
+  CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
+    13,22,231,130
+  PUSHBUTTON "&Onay Belgesini GÃ¶ster", IDC_VIEWCERTIFICATE,155,156,90,14
+  LTEXT "O&nay Belgesi Durumu:", IDC_CERTIFICATESTATUS,6,183,200,14
+  CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
+    WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
+END
+
+IDD_USERNOTICE DIALOG 0, 0, 255, 256
+CAPTION "Geri Ã‡evirici"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", IDC_USERNOTICE,"RichEdit20W",
+    WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
+  PUSHBUTTON "Kapat", IDOK,73,216,85,14
+  PUSHBUTTON "&Daha Ã‡ok Bilgi", IDC_CPS,162,216,85,14
+END
+
+IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
+CAPTION "UmÃ»mÃ®"
+STYLE WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&Kolay AdÄ±:", -1, 6,14,60,14
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
+  LTEXT "&TanÄ±mÄ±:", -1, 6,32,60,14
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Onay Belgesi AmaÃ§larÄ±", -1,6,48,245,185, BS_GROUPBOX
+  AUTORADIOBUTTON "&Bu onay belgesinin tÃ¼m amaÃ§larÄ±nÄ± etkinleÅŸtir.",
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "B&u onay belgesinin tÃ¼m amaÃ§larÄ±nÄ± edilginleÅŸtir.",
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "Bu &onay belgesinin yalnÄ±zca aÅŸaÄŸÄ±daki amaÃ§larÄ±nÄ± etkinleÅŸtir:",
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
+  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    24,100,220,106
+  PUSHBUTTON "&AmaÃ§ Ekle...", IDC_ADD_PURPOSE,174,212,70,14
+END
+
+IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
+CAPTION "AmaÃ§ Ekleme"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Eklemek istediÄŸiniz onay belgesi kullanÄ±m amacÄ±nÄ±n nesne tanÄ±mlayÄ±cÄ±sÄ±nÄ± (OID'sini) giriniz:",
+    -1, 6,6,190,28
+  EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  PUSHBUTTON "Tamam", IDOK, 33,48,60,14
+  PUSHBUTTON "Ä°ptal", IDCANCEL, 100,48,60,14
+END
+
+IDD_SELECT_STORE DIALOG 0,0,200,136
+CAPTION "Onay Belgesi Deposunu SeÃ§me"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Kullanmak istediÄŸiniz onay belgesi deposunu seÃ§iniz:", IDC_STORE_TEXT, 6,6,190,28
+  CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
+    6,28,188,70
+  CHECKBOX "&FizÃ®kÃ® DepolarÄ± GÃ¶ster", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
+  PUSHBUTTON "Tamam", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "Ä°ptal", IDCANCEL, 144,118,50,14
+END
+
+IDD_IMPORT_WELCOME DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Onay Belgesi Alma YardÄ±mcÄ±sÄ±'na HoÅŸgeldiniz", IDC_IMPORT_TITLE, 115,7,195,30
+  LTEXT "Bu yardÄ±mcÄ±; bir kÃ¼tÃ¼kten, onay belgelerinin, onay belgesi iptal dizelgelerinin ve onay belgesi gÃ¼ven dizelgelerinin bir onay belgesi deposuna verilmesini saÄŸlar.\n\
+\n\
+Bir onay belgesi, sizi veyÃ¢ sizle iletiÅŸim kuran bilgisayarÄ± tanÄ±mada kullanÄ±lmÄ±ÅŸ olabilir. Bu onay belgesi, yetkilendirmede ve iletileri imzÃ¢lamada da kullanÄ±lmÄ±ÅŸ olabilir. Onay belgesi depolarÄ±; onay belgelerinden, onay belgesi iptal dizelgelerinden ve onay belgesi gÃ¼ven dizelgelerinden oluÅŸan derlemlerdir.\n\
+\n\
+SÃ¼rdÃ¼rmek iÃ§in ""Ä°leri >"" dÃ¼ÄŸmesine tÄ±klayÄ±nÄ±z.",
+    -1, 115,40,195,120
+END
+
+IDD_IMPORT_FILE DIALOG 0,0,317,178
+CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&KÃ¼tÃ¼k AdÄ±:", -1, 21,1,195,10
+  EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  PUSHBUTTON "&GÃ¶z At...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  LTEXT "Ã–nemli: AÅŸaÄŸÄ±daki kÃ¼tÃ¼k biÃ§imleri, bir onay belgesinden, bir onay belgesi iptal dizelgesinden veyÃ¢ bir onay belgesi gÃ¼ven dizelgesinden daha Ã§oÄŸunu iÃ§erebilir:",
+    -1, 21,30,265,16
+  LTEXT "Kriptografik Ä°leti SÃ¶z Dizimi Ã–lÃ§Ã¼nÃ¼/PKCS #7 Ä°letileri (.p7b)",
+    -1, 31,53,265,10
+  LTEXT "ÅžahsÃ® Bilgi DeÄŸiÅŸtirmesi/PKCS #12 (.pfx, .p12)",
+    -1, 31,68,265,10
+  LTEXT "Microsoft DizilendirilmiÅŸ Onay Belgesi Deposu (.sst)",
+    -1, 31,83,265,10
+END
+
+IDD_IMPORT_STORE DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "ReactOS, kendiliÄŸinden bir onay belgesi deposu seÃ§ebilir ya da siz, onay belgeleri iÃ§in bir konum belirtebilirsiniz.",
+    -1, 21,1,220,25
+  AUTORADIOBUTTON "&Onay belgesi deposunu kendiliÄŸinden seÃ§.",
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "&TÃ¼m onay belgelerini aÅŸaÄŸÄ±daki depoya yerleÅŸtir:",
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
+  PUSHBUTTON "&GÃ¶z At...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
+END
+
+IDD_IMPORT_FINISH DIALOG 0,0,317,178
+CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Onay Belgesi Alma YardÄ±mcÄ±sÄ±'nÄ±n Bitirilmesi", IDC_IMPORT_TITLE,
+    115,1,195,40
+  LTEXT "Onay Belgesi Alma YardÄ±mcÄ±sÄ±'nÄ± baÅŸarÄ±lÄ± bir ÅŸekilde bitirdiniz.",
+    -1, 115,33,195,24
+  LTEXT "AÅŸaÄŸÄ±daki ayarlarÄ± belirlediniz:",
+    -1, 115,57,195,12
+  CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    115,67,174,100
+END
+
+IDD_CERT_MGR DIALOG 0,0,335,270
+CAPTION "Onay Belgeleri"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "K&ullanÄ±m AmacÄ±:", -1, 7,9,100,12
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Al...", IDC_MGR_IMPORT, 7,172,65,14
+  PUSHBUTTON "&Ver...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
+  PUSHBUTTON "&Sil", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
+  PUSHBUTTON "G&eliÅŸmiÅŸ...", IDC_MGR_ADVANCED, 263,172,65,14
+  GROUPBOX "Onay Belgesi KullanÄ±m AmaÃ§larÄ±", -1,7,194,321,47, BS_GROUPBOX
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
+  PUSHBUTTON "&GÃ¶ster", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Kapat", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
+END
+
+IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
+CAPTION "GeliÅŸmiÅŸ SeÃ§enekler"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Onay Belgesi AmaÃ§larÄ±", -1, 7,7,234,141, BS_GROUPBOX
+  LTEXT """GeliÅŸmiÅŸ AmaÃ§lar"" seÃ§ilmiÅŸ olduÄŸunda dizelgelenen bir ya da daha Ã§ok amacÄ± seÃ§iniz.",
+    -1, 14,18,220,16
+  LTEXT "&Onay Belgesi AmaÃ§larÄ±:", -1, 14,41,90,12, WS_TABSTOP
+  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    14,51,220,90
+  PUSHBUTTON "Tamam", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "Ä°ptal", IDCANCEL, 190,155,51,14
+END
+
+IDD_EXPORT_WELCOME DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Onay Belgesi Verme YardÄ±mcÄ±sÄ±'na HoÅŸgeldiniz", IDC_EXPORT_TITLE, 115,7,195,30
+  LTEXT "Bu yardÄ±mcÄ±; bir onay belgesi deposundan, onay belgelerinin, onay belgesi iptal dizelgelerinin ve onay belgesi gÃ¼ven dizelgelerinin bir kÃ¼tÃ¼ÄŸe verilmesini saÄŸlar.\n\
+\n\
+Bir onay belgesi, sizi veyÃ¢ sizle iletiÅŸim kuran bilgisayarÄ± tanÄ±mada kullanÄ±lmÄ±ÅŸ olabilir. Bu onay belgesi, yetkilendirmede ve iletileri imzÃ¢lamada da kullanÄ±lmÄ±ÅŸ olabilir. Onay belgesi depolarÄ±; onay belgelerinden, onay belgesi iptal dizelgelerinden ve onay belgesi gÃ¼ven dizelgelerinden oluÅŸan derlemlerdir.\n\
+\n\
+SÃ¼rdÃ¼rmek iÃ§in ""Ä°leri >"" dÃ¼ÄŸmesine basÄ±nÄ±z.",
+    -1, 115,40,195,120
+END
+
+IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Siz, husÃ»si anahtarÄ±n verilmesini seÃ§tiÄŸinizde sizden bir sonraki aÅŸamada husÃ»sÃ® anahtarÄ±n korunmasÄ± iÃ§in bir ÅŸifre istenecektir.", -1, 21,1,195,25
+  LTEXT "Bu husÃ»sÃ® anahtar verilsin mi?", -1, 21,27,195,10
+  AUTORADIOBUTTON "&Evet, husÃ»sÃ® anahtarÄ± ver.",
+    IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "&HayÄ±r, husÃ»sÃ® anahtarÄ± verme.",
+    IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON
+  LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24
+END
+
+IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&Åžifre:", -1, 21,1,195,10
+  EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  LTEXT "Åž&ifreyi DoÄŸrula:", -1, 21,35,195,10
+  EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+END
+
+IDD_EXPORT_FORMAT DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "KullanÄ±lacak biÃ§imi seÃ§iniz:", -1, 21,1,195,10
+  AUTORADIOBUTTON "&DER ÅžifrelenmiÅŸ X.509 (.cer)",
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+  AUTORADIOBUTTON "&Base64 ÅžifrelenmiÅŸ X.509 (.cer):",
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "&Kriptografik Ä°leti SÃ¶z Dizimi Ã–lÃ§Ã¼nÃ¼/PKCS #7 Ä°letileri (.p7b)",
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
+  CHECKBOX "&OlabildiÄŸince onaylama yoluna tÃ¼m onay belgelerini koy.",
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  AUTORADIOBUTTON "&ÅžahsÃ® Bilgi DeÄŸiÅŸtirmesi/PKCS #12 (.pfx)",
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
+  CHECKBOX "O&labildiÄŸince onaylama yoluna tÃ¼m onay belgelerini koy.",
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  CHECKBOX "&GÃ¼Ã§lÃ¼ ÅŸifrelemeyi etkinleÅŸtir.",
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  CHECKBOX "&Verme iÅŸlemi baÅŸarÄ±lÄ± olduÄŸunda husÃ»sÃ® anahtarÄ± sil.",
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+END
+
+IDD_EXPORT_FILE DIALOG 0,0,317,143
+CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "&KÃ¼tÃ¼k AdÄ±:", -1, 21,1,195,10
+  EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  PUSHBUTTON "&GÃ¶z At...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+END
+
+IDD_EXPORT_FINISH DIALOG 0,0,317,178
+CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Onay Belgesi Verme YardÄ±mcÄ±sÄ±'nÄ±n Bitirilmesi", IDC_EXPORT_TITLE,
+    115,1,195,40
+  LTEXT "Onay Belgesi Verme YardÄ±mcÄ±sÄ±'nÄ± baÅŸarÄ±lÄ± bir ÅŸekilde bitirdiniz.",
+    -1, 115,33,195,24
+  LTEXT "AÅŸaÄŸÄ±daki ayarlarÄ± belirlediniz:",
+    -1, 115,57,195,12
+  CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    115,67,174,100
+END

Modification de propriÃ©tÃ©s sur dll/win32/cryptui/lang/cryptui_Tr.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/cryptui/cryptui.rc
===================================================================
--- dll/win32/cryptui/cryptui.rc	(rÃ©vision 61927)
+++ dll/win32/cryptui/cryptui.rc	(copie de travail)
@@ -82,6 +82,12 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/cryptui_Ro.rc"
 #endif
+#ifdef LANGAUGE_SQ_AL
+    #include "lang/cryptui_Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/cryptui_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/cryptui_Uk.rc"
 #endif
Index: dll/win32/riched20/editor.h
===================================================================
--- dll/win32/riched20/editor.h	(rÃ©vision 61927)
+++ dll/win32/riched20/editor.h	(copie de travail)
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _RICHED20_EDITOR_H
+#define _RICHED20_EDITOR_H
+
 #include <config.h>
 
 #include <assert.h>
@@ -375,3 +378,5 @@
 
 /* clipboard.c */
 HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, LPDATAOBJECT *lplpdataobj) DECLSPEC_HIDDEN;
+
+#endif /* _RICHED20_EDITOR_H */
Index: dll/win32/riched20/CMakeLists.txt
===================================================================
--- dll/win32/riched20/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/riched20/CMakeLists.txt	(copie de travail)
@@ -18,12 +18,10 @@
     string.c
     style.c
     table.c
-    txthost.c
-    txtsrv.c
     undo.c
     wrap.c
     writer.c
-    ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
+    editor.h)
 
 if(MSVC)
     if(ARCH STREQUAL "i386")
@@ -30,11 +28,18 @@
         list(APPEND SOURCE msvc-thiscall.c)
     endif()
     set_source_files_properties(txthost.c txtsrv.c PROPERTIES COMPILE_FLAGS "/FImsvc.h")
+    list(APPEND ADDITIONAL_SOURCE txthost.c txtsrv.c)
+else()
+    list(APPEND SOURCE txthost.c txtsrv.c)
 endif()
 
-add_library(riched20 SHARED ${SOURCE} version.rc)
+list(APPEND ADDITIONAL_SOURCE
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
+
+add_library(riched20 SHARED ${SOURCE} ${ADDITIONAL_SOURCE})
 set_module_type(riched20 win32dll)
 target_link_libraries(riched20 wine uuid)
 add_importlibs(riched20 ole32 oleaut32 imm32 user32 gdi32 msvcrt kernel32 ntdll)
-add_pch(riched20 editor.h)
+add_pch(riched20 editor.h SOURCE)
 add_cd_file(TARGET riched20 DESTINATION reactos/system32 FOR all)
Index: dll/win32/fusion/CMakeLists.txt
===================================================================
--- dll/win32/fusion/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/fusion/CMakeLists.txt	(copie de travail)
@@ -10,13 +10,18 @@
     asmname.c
     assembly.c
     fusion.c
-    ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c
+    fusionpriv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c)
+
+add_library(fusion SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
-add_library(fusion SHARED ${SOURCE} version.rc)
 set_module_type(fusion win32dll)
 target_link_libraries(fusion uuid wine)
 add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
+add_pch(fusion fusionpriv.h SOURCE)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)
Index: dll/win32/getuname/lang/sq-AL.rc
===================================================================
--- dll/win32/getuname/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/getuname/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,16051 @@
+/*
+ * PROJECT:     Unicode name dll
+ * FILE:        dll/win32/getuname/lang/sq-AL.rc
+ * PURPOSE:     Unicode Description Strings
+ * PROGRAMMERS: Baruch Rutman (peterooch at gmail dot com)
+ * TRANSLATOR:  Ardit Dani (ardit.dani at gmail dor com
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+STRINGTABLE
+BEGIN
+    /* Autogenerated from http://www.unicode.org/Public/UNIDATA/UnicodeData.txt */
+    0 "PavlefshÃ«m" 
+    1 "Fillimi i kreut" 
+    2 "Fillimi i tekstit" 
+    3 "Mbarimi i tekstit" 
+    4 "Mbarimi i transmetimit" 
+    5 "Hetim" 
+    6 "FalÃ«nderime" 
+    7 "Zile" 
+    8 "HapÃ«sirÃ«" 
+    9 "Karaktere Tabelore" 
+    10 "LinjÃ« Furnizimi" 
+    11 "LinjÃ« Tabelore" 
+    12 "FormÃ« Furnizimi" 
+    13 "Kthim Transporti" 
+    14 "Nxirr JashtÃ«" 
+    15 "Fut Brenda" 
+    16 "LinjÃ« Informacioni Arratisje" 
+    17 "Kontroll Pajisje NjÃ«" 
+    18 "Kontroll Pajisje Dy" 
+    19 "Kontroll Pajisje Tre" 
+    20 "Kontroll Pajisje KatÃ«r" 
+    21 "FalÃ«nderime Negative" 
+    22 "Pushim Sinkronizimi" 
+    23 "Mbarimi i Bllokut Transmetimit" 
+    24 "Anulo" 
+    25 "Mbarim MesatarÃ«" 
+    26 "ZÃ«vendÃ«sim" 
+    27 "Arratisje" 
+    28 "Informacion NdarÃ«s KatÃ«r" 
+    29 "Informacion NdarÃ«s Tre" 
+    30 "Informacion NdarÃ«s Dy" 
+    31 "Informacion NdarÃ«s NjÃ«" 
+    32 "HapÃ«sire" 
+    33 "PikÃ«-Ã§uditÃ«se" 
+    34 "PikÃ«pyetje" 
+    35 "ShenjÃ« Numri" 
+    36 "ShenjÃ« Dollari" 
+    37 "ShenjÃ« PÃ«rqindje" 
+    38 "Simbol" 
+    39 "Apostrof" 
+    40 "Kllape Majtas" 
+    41 "Kllape Djathtas" 
+    42 "Yll" 
+    43 "Shenja Plus" 
+    44 "Presje" 
+    45 "VizÃ« ndarÃ«se-Minus" 
+    46 "PikÃ«" 
+    47 "Solidus" 
+    48 "ShifÃ«r Zero" 
+    49 "ShifÃ«r NjÃ«" 
+    50 "ShifÃ«r Dy" 
+    51 "ShifÃ«r Tre" 
+    52 "ShifÃ«r KatÃ«r" 
+    53 "ShifÃ«r PesÃ«" 
+    54 "ShifÃ«r GjashtÃ«" 
+    55 "ShifÃ«r ShtatÃ«" 
+    56 "ShifÃ«r TetÃ«" 
+    57 "ShifÃ«r NÃ«ntÃ«" 
+    58 "Dy Pika" 
+    59 "PikÃ«presje" 
+    60 "ShenjÃ« MpakÃ«-Se" 
+    61 "ShenjÃ« Barazimi" 
+    62 "ShenjÃ« MÃ«-madhe Se" 
+    63 "PikÃ«pyetje" 
+    64 "NÃ« Komercial" 
+    65 "ShkronjÃ« e Madhe Latine A" 
+    66 "ShkronjÃ« e Madhe Latine B" 
+    67 "ShkronjÃ« e Madhe Latine C" 
+    68 "ShkronjÃ« e Madhe Latine D" 
+    69 "ShkronjÃ« e Madhe Latine E" 
+    70 "ShkronjÃ« e Madhe Latine F" 
+    71 "ShkronjÃ« e Madhe Latine G" 
+    72 "ShkronjÃ« e Madhe Latine H" 
+    73 "ShkronjÃ« e Madhe Latine I" 
+    74 "ShkronjÃ« e Madhe Latine J" 
+    75 "ShkronjÃ« e Madhe Latine K" 
+    76 "ShkronjÃ« e Madhe Latine L" 
+    77 "ShkronjÃ« e Madhe Latine M" 
+    78 "ShkronjÃ« e Madhe Latine N" 
+    79 "ShkronjÃ« e Madhe Latine O" 
+    80 "ShkronjÃ« e Madhe Latine P" 
+    81 "ShkronjÃ« e Madhe Latine Q" 
+    82 "ShkronjÃ« e Madhe Latine R" 
+    83 "ShkronjÃ« e Madhe Latine S" 
+    84 "ShkronjÃ« e Madhe Latine T" 
+    85 "ShkronjÃ« e Madhe Latine U" 
+    86 "ShkronjÃ« e Madhe Latine V" 
+    87 "ShkronjÃ« e Madhe Latine W" 
+    88 "ShkronjÃ« e Madhe Latine X" 
+    89 "ShkronjÃ« e Madhe Latine Y" 
+    90 "ShkronjÃ« e Madhe Latine Z" 
+    91 "KllapÃ« Rrumbullake Majtas" 
+    92 "Rikthe Solidus" 
+    93 "KllapÃ« Rrumbullake Djathtas" 
+    94 "Theks Lakor" 
+    95 "LinjÃ« UlÃ«t" 
+    96 "Theks RÃ«ndÃ«" 
+    97 "ShkronjÃ« e VogÃ«l Latine A" 
+    98 "ShkronjÃ« e VogÃ«l Latine B" 
+    99 "ShkronjÃ« e VogÃ«l Latine C" 
+    100 "ShkronjÃ« e VogÃ«l Latine D" 
+    101 "ShkronjÃ« e VogÃ«l Latine E" 
+    102 "ShkronjÃ« e VogÃ«l Latine F" 
+    103 "ShkronjÃ« e VogÃ«l Latine G" 
+    104 "ShkronjÃ« e VogÃ«l Latine H" 
+    105 "ShkronjÃ« e VogÃ«l Latine I" 
+    106 "ShkronjÃ« e VogÃ«l Latine J" 
+    107 "ShkronjÃ« e VogÃ«l Latine K" 
+    108 "ShkronjÃ« e VogÃ«l Latine L" 
+    109 "ShkronjÃ« e VogÃ«l Latine M" 
+    110 "ShkronjÃ« e VogÃ«l Latine N" 
+    111 "ShkronjÃ« e VogÃ«l Latine O" 
+    112 "ShkronjÃ« e VogÃ«l Latine P" 
+    113 "ShkronjÃ« e VogÃ«l Latine Q" 
+    114 "ShkronjÃ« e VogÃ«l Latine R" 
+    115 "ShkronjÃ« e VogÃ«l Latine S" 
+    116 "ShkronjÃ« e VogÃ«l Latine T" 
+    117 "ShkronjÃ« e VogÃ«l Latine U" 
+    118 "ShkronjÃ« e VogÃ«l Latine V" 
+    119 "ShkronjÃ« e VogÃ«l Latine W" 
+    120 "ShkronjÃ« e VogÃ«l Latine X" 
+    121 "ShkronjÃ« e VogÃ«l Latine Y" 
+    122 "ShkronjÃ« e VogÃ«l Latine Z" 
+    123 "KllapÃ« Dredhur Majtas" 
+    124 "LinjÃ« Vertikale" 
+    125 "KllapÃ« Dredhur Djathtas" 
+    126 "TildÃ«" 
+    127 "Fshi" 
+    130 "Pushimi Lejuar KÃ«tu" 
+    131 "Pa Pushim KÃ«tu" 
+    133 "Linja TjetÃ«r" 
+    134 "Fillimi i ZonÃ«s PÃ«rzgjedhur" 
+    135 "Mbarimi i ZonÃ«s PÃ«rzgjedhur" 
+    136 "NdÃ«rto Karakterin NxjerrÃ«s" 
+    137 "Karakterin NxjerrÃ«s Me Justifikim" 
+    138 "NdÃ«rto LinjÃ«n Karakterit" 
+    139 "Linja e Pjesshme PÃ«rpara" 
+    140 "Linja e Pjesshme Mbrapa" 
+    141 "Rikthe LinjÃ«n Furnizuese" 
+    142 "Turne Tek Dy" 
+    143 "Turne Tek Tre" 
+    144 "Varg Kontroll Pajisjesh" 
+    145 "PÃ«rdorim Privat NjÃ«" 
+    146 "PÃ«rdorim Privat Dy" 
+    147 "Vendos Gjendjen Transmetimit" 
+    148 "Anulo Karakteret" 
+    149 "Mesazh Pritje" 
+    150 "Fillimi i ZonÃ«s Ruajtur" 
+    151 "Mbarimi i ZonÃ«s Ruajtur" 
+    152 "Fillimi i Vargut" 
+    154 "Prezantim Karakteri Tek" 
+    155 "Prezantimi i Kontrollit SekuencÃ«" 
+    156 "PÃ«rfundues Vargu" 
+    157 "Komanda e Operimit tÃ« Sistemit" 
+    158 "Mesazhe FshehtÃ«sie" 
+    159 "Komanda Programi Aplikimi" 
+    160 "Jo-Pushim HapÃ«sirÃ«" 
+    161 "PikÃ«Ã§uditje PÃ«rmbysur" 
+    162 "ShenjÃ« Cent" 
+    163 "ShenjÃ« Pound" 
+    164 "ShenjÃ« Monedhe" 
+    165 "Shenja Yen" 
+    166 "TabelÃ« Thyer" 
+    167 "Zgjedh ShenjÃ«" 
+    168 "Diaeresis" 
+    169 "ShenjÃ« DrejtÃ« Autorit" 
+    170 "Treguese RendorÃ« FemÃ«rorÃ«" 
+    171 "Drejtim-Majtas KÃ«nd DyfishtÃ« ShenjÃ« Citati" 
+    172 "Ska ShenjÃ«" 
+    173 "VizÃ« NdarÃ«se ButÃ«" 
+    174 "ShenjÃ« Regjistruar" 
+    175 "Macron" 
+    176 "ShenjÃ« Shkalle" 
+    177 "ShenjÃ« Plus-Minus" 
+    178 "Indeks i SipÃ«rm Dy" 
+    179 "Indeks i SipÃ«rm Tre" 
+    180 "Theks i MprehtÃ«" 
+    181 "ShenjÃ« Micro" 
+    182 "ShenjÃ« Pilcrow" 
+    183 "PikÃ« Mesit" 
+    184 "Cedilla" 
+    185 "Indeks i SipÃ«rm NjÃ«" 
+    186 "Tregues Rendor Mashkullor" 
+    187 "Drejtim-Djathtas KÃ«nd DyfishtÃ« ShenjÃ« Citat" 
+    188 "Pjesa NjÃ« Tremujori Vulgare" 
+    189 "Gjysma PjesÃ«s Vulgare" 
+    190 "Pjesa e TreÃ§erekut Vulgare" 
+    191 "PikÃ«pyetje PÃ«rmbysur" 
+    192 "ShkronjÃ« e Madhe Latine A Me RÃ«ndÃ«" 
+    193 "ShkronjÃ« e Madhe Latine A Me MprehtÃ«" 
+    194 "ShkronjÃ« e Madhe Latine A Me Theks-lakor" 
+    195 "ShkronjÃ« e Madhe Latine A Me TildÃ«" 
+    196 "ShkronjÃ« e Madhe Latine A Me Diaeresis" 
+    197 "ShkronjÃ« e Madhe Latine A Me Rreth Mbi" 
+    198 "ShkronjÃ« e Madhe Latine Ae" 
+    199 "ShkronjÃ« e Madhe Latine C Me Cedilla" 
+    200 "ShkronjÃ« e Madhe Latine E Me RÃ«ndÃ«" 
+    201 "ShkronjÃ« e Madhe Latine E Me MprehtÃ«" 
+    202 "ShkronjÃ« e Madhe Latine E Me Theks-lakor" 
+    203 "ShkronjÃ« e Madhe Latine E Me Diaeresis" 
+    204 "ShkronjÃ« e Madhe Latine I Me RÃ«ndÃ«" 
+    205 "ShkronjÃ« e Madhe Latine I Me MprehtÃ«" 
+    206 "ShkronjÃ« e Madhe Latine I Me Theks-lakor" 
+    207 "ShkronjÃ« e Madhe Latine I Me Diaeresis" 
+    208 "ShkronjÃ« e Madhe Latine Eth" 
+    209 "ShkronjÃ« e Madhe Latine N Me TildÃ«" 
+    210 "ShkronjÃ« e Madhe Latine O Me RÃ«ndÃ«" 
+    211 "ShkronjÃ« e Madhe Latine O Me MprehtÃ«" 
+    212 "ShkronjÃ« e Madhe Latine O Me Theks-lakor" 
+    213 "ShkronjÃ« e Madhe Latine O Me TildÃ«" 
+    214 "ShkronjÃ« e Madhe Latine O Me Diaeresis" 
+    215 "ShenjÃ« ShumÃ«zimi" 
+    216 "ShkronjÃ« e Madhe Latine O Me Goditje" 
+    217 "ShkronjÃ« e Madhe Latine U Me RÃ«ndÃ«" 
+    218 "ShkronjÃ« e Madhe Latine U Me MprehtÃ«" 
+    219 "ShkronjÃ« e Madhe Latine U Me Theks-lakor" 
+    220 "ShkronjÃ« e Madhe Latine U Me Diaeresis" 
+    221 "ShkronjÃ« e Madhe Latine Y Me MprehtÃ«" 
+    222 "ShkronjÃ« e Madhe Latine Gjemb" 
+    223 "ShkronjÃ« e VogÃ«l Latine FortÃ« S" 
+    224 "ShkronjÃ« e VogÃ«l Latine A Me RÃ«ndÃ«" 
+    225 "ShkronjÃ« e VogÃ«l Latine A Me MprehtÃ«" 
+    226 "ShkronjÃ« e VogÃ«l Latine A Me Theks-lakor" 
+    227 "ShkronjÃ« e VogÃ«l Latine A Me TildÃ«" 
+    228 "ShkronjÃ« e VogÃ«l Latine A Me Diaeresis" 
+    229 "ShkronjÃ« e VogÃ«l Latine A Me Rreth Mbi" 
+    230 "ShkronjÃ« e VogÃ«l Latine Ae" 
+    231 "ShkronjÃ« e VogÃ«l Latine C Me Cedilla" 
+    232 "ShkronjÃ« e VogÃ«l Latine E Me RÃ«ndÃ«" 
+    233 "ShkronjÃ« e VogÃ«l Latine E Me MprehtÃ«" 
+    234 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor" 
+    235 "ShkronjÃ« e VogÃ«l Latine E Me Diaeresis" 
+    236 "ShkronjÃ« e VogÃ«l Latine I Me RÃ«ndÃ«" 
+    237 "ShkronjÃ« e VogÃ«l Latine I Me MprehtÃ«" 
+    238 "ShkronjÃ« e VogÃ«l Latine I Me Theks-lakor" 
+    239 "ShkronjÃ« e VogÃ«l Latine I Me Diaeresis" 
+    240 "ShkronjÃ« e VogÃ«l Latine Eth" 
+    241 "ShkronjÃ« e VogÃ«l Latine N Me TildÃ«" 
+    242 "ShkronjÃ« e VogÃ«l Latine O Me RÃ«ndÃ«" 
+    243 "ShkronjÃ« e VogÃ«l Latine O Me MprehtÃ«" 
+    244 "ShkronjÃ« e VogÃ«l Latine O Me Theks-lakor" 
+    245 "ShkronjÃ« e VogÃ«l Latine O Me TildÃ«" 
+    246 "ShkronjÃ« e VogÃ«l Latine O Me Diaeresis" 
+    247 "ShenjÃ« Pjestimi" 
+    248 "ShkronjÃ« e VogÃ«l Latine O Me Goditje" 
+    249 "ShkronjÃ« e VogÃ«l Latine U Me RÃ«ndÃ«" 
+    250 "ShkronjÃ« e VogÃ«l Latine U Me MprehtÃ«" 
+    251 "ShkronjÃ« e VogÃ«l Latine U Me Theks-lakor" 
+    252 "ShkronjÃ« e VogÃ«l Latine U Me Diaeresis" 
+    253 "ShkronjÃ« e VogÃ«l Latine Y Me MprehtÃ«" 
+    254 "ShkronjÃ« e VogÃ«l Latine Gjemb" 
+    255 "ShkronjÃ« e VogÃ«l Latine Y Me Diaeresis" 
+    256 "ShkronjÃ« e Madhe Latine A Me Macron" 
+    257 "ShkronjÃ« e VogÃ«l Latine A Me Macron" 
+    258 "ShkronjÃ« e Madhe Latine A Me Breve" 
+    259 "ShkronjÃ« e VogÃ«l Latine A Me Breve" 
+    260 "ShkronjÃ« e Madhe Latine A Me Ogonek" 
+    261 "ShkronjÃ« e VogÃ«l Latine A Me Ogonek" 
+    262 "ShkronjÃ« e Madhe Latine C Me MprehtÃ«" 
+    263 "ShkronjÃ« e VogÃ«l Latine C Me MprehtÃ«" 
+    264 "ShkronjÃ« e Madhe Latine C Me Theks-lakor" 
+    265 "ShkronjÃ« e VogÃ«l Latine C Me Theks-lakor" 
+    266 "ShkronjÃ« e Madhe Latine C Me PikÃ« Mbi" 
+    267 "ShkronjÃ« e VogÃ«l Latine C Me PikÃ« Mbi" 
+    268 "ShkronjÃ« e Madhe Latine C Me Caron" 
+    269 "ShkronjÃ« e VogÃ«l Latine C Me Caron" 
+    270 "ShkronjÃ« e Madhe Latine D Me Caron" 
+    271 "ShkronjÃ« e VogÃ«l Latine D Me Caron" 
+    272 "ShkronjÃ« e Madhe Latine D Me Goditje" 
+    273 "ShkronjÃ« e VogÃ«l Latine D Me Goditje" 
+    274 "ShkronjÃ« e Madhe Latine E Me Macron" 
+    275 "ShkronjÃ« e VogÃ«l Latine E Me Macron" 
+    276 "ShkronjÃ« e Madhe Latine E Me Breve" 
+    277 "ShkronjÃ« e VogÃ«l Latine E Me Breve" 
+    278 "ShkronjÃ« e Madhe Latine E Me PikÃ« Mbi" 
+    279 "ShkronjÃ« e VogÃ«l Latine E Me PikÃ« Mbi" 
+    280 "ShkronjÃ« e Madhe Latine E Me Ogonek" 
+    281 "ShkronjÃ« e VogÃ«l Latine E Me Ogonek" 
+    282 "ShkronjÃ« e Madhe Latine E Me Caron" 
+    283 "ShkronjÃ« e VogÃ«l Latine E Me Caron" 
+    284 "ShkronjÃ« e Madhe Latine G Me Theks-lakor" 
+    285 "ShkronjÃ« e VogÃ«l Latine G Me Theks-lakor" 
+    286 "ShkronjÃ« e Madhe Latine G Me Breve" 
+    287 "ShkronjÃ« e VogÃ«l Latine G Me Breve" 
+    288 "ShkronjÃ« e Madhe Latine G Me PikÃ« Mbi" 
+    289 "ShkronjÃ« e VogÃ«l Latine G Me PikÃ« Mbi" 
+    290 "ShkronjÃ« e Madhe Latine G Me Cedilla" 
+    291 "ShkronjÃ« e VogÃ«l Latine G Me Cedilla" 
+    292 "ShkronjÃ« e Madhe Latine H Me Theks-lakor" 
+    293 "ShkronjÃ« e VogÃ«l Latine H Me Theks-lakor" 
+    294 "ShkronjÃ« e Madhe Latine H Me Goditje" 
+    295 "ShkronjÃ« e VogÃ«l Latine H Me Goditje" 
+    296 "ShkronjÃ« e Madhe Latine I Me TildÃ«" 
+    297 "ShkronjÃ« e VogÃ«l Latine I Me TildÃ«" 
+    298 "ShkronjÃ« e Madhe Latine I Me Macron" 
+    299 "ShkronjÃ« e VogÃ«l Latine I Me Macron" 
+    300 "ShkronjÃ« e Madhe Latine I Me Breve" 
+    301 "ShkronjÃ« e VogÃ«l Latine I Me Breve" 
+    302 "ShkronjÃ« e Madhe Latine I Me Ogonek" 
+    303 "ShkronjÃ« e VogÃ«l Latine I Me Ogonek" 
+    304 "ShkronjÃ« e Madhe Latine I Me PikÃ« Mbi" 
+    305 "ShkronjÃ« e VogÃ«l Latine Pa-PikÃ« I" 
+    306 "ShkronjÃ« e Madhe Latine Ij" 
+    307 "ShkronjÃ« e VogÃ«l Latine Ij" 
+    308 "ShkronjÃ« e Madhe Latine J Me Theks-lakor" 
+    309 "ShkronjÃ« e VogÃ«l Latine J Me Theks-lakor" 
+    310 "ShkronjÃ« e Madhe Latine K Me Cedilla" 
+    311 "ShkronjÃ« e VogÃ«l Latine K Me Cedilla" 
+    312 "ShkronjÃ« e VogÃ«l Latine Kra" 
+    313 "ShkronjÃ« e Madhe Latine L Me MprehtÃ«" 
+    314 "ShkronjÃ« e VogÃ«l Latine L Me MprehtÃ«" 
+    315 "ShkronjÃ« e Madhe Latine L Me Cedilla" 
+    316 "ShkronjÃ« e VogÃ«l Latine L Me Cedilla" 
+    317 "ShkronjÃ« e Madhe Latine L Me Caron" 
+    318 "ShkronjÃ« e VogÃ«l Latine L Me Caron" 
+    319 "ShkronjÃ« e Madhe Latine L Me Pike Mesi" 
+    320 "ShkronjÃ« e VogÃ«l Latine L Me PikÃ« Mesi" 
+    321 "ShkronjÃ« e Madhe Latine L Me Goditje" 
+    322 "ShkronjÃ« e VogÃ«l Latine L Me Goditje" 
+    323 "ShkronjÃ« e Madhe Latine N Me MprehtÃ«" 
+    324 "ShkronjÃ« e VogÃ«l Latine N Me MprehtÃ«" 
+    325 "ShkronjÃ« e Madhe Latine N Me Cedilla" 
+    326 "ShkronjÃ« e VogÃ«l Latine N Me Cedilla" 
+    327 "ShkronjÃ« e Madhe Latine N Me Caron" 
+    328 "ShkronjÃ« e VogÃ«l Latine N Me Caron" 
+    329 "ShkronjÃ« e VogÃ«l Latine N Paraprihet nga apostrof" 
+    330 "ShkronjÃ« e Madhe Latine Eng" 
+    331 "ShkronjÃ« e VogÃ«l Latine Eng" 
+    332 "ShkronjÃ« e Madhe Latine O Me Macron" 
+    333 "ShkronjÃ« e VogÃ«l Latine O Me Macron" 
+    334 "ShkronjÃ« e Madhe Latine O Me Breve" 
+    335 "ShkronjÃ« e VogÃ«l Latine O Me Breve" 
+    336 "ShkronjÃ« e Madhe Latine O Me Dy MprehtÃ«" 
+    337 "ShkronjÃ« e VogÃ«l Latine O Me Dy MprehtÃ«" 
+    338 "Bashkim Shkronje Madhe Latine Oe" 
+    339 "Bashkim Shkronje VogÃ«l Latine Oe" 
+    340 "ShkronjÃ« e Madhe Latine R Me MprehtÃ«" 
+    341 "ShkronjÃ« e VogÃ«l Latine R Me MprehtÃ«" 
+    342 "ShkronjÃ« e Madhe Latine R Me Cedilla" 
+    343 "ShkronjÃ« e VogÃ«l Latine R Me Cedilla" 
+    344 "ShkronjÃ« e Madhe Latine R Me Caron" 
+    345 "ShkronjÃ« e VogÃ«l Latine R Me Caron" 
+    346 "ShkronjÃ« e Madhe Latine S Me MprehtÃ«" 
+    347 "ShkronjÃ« e VogÃ«l Latine S Me MprehtÃ«" 
+    348 "ShkronjÃ« e Madhe Latine S Me Theks-lakor" 
+    349 "ShkronjÃ« e VogÃ«l Latine S Me Theks-lakor" 
+    350 "ShkronjÃ« e Madhe Latine S Me Cedilla" 
+    351 "ShkronjÃ« e VogÃ«l Latine S Me Cedilla" 
+    352 "ShkronjÃ« e Madhe Latine S Me Caron" 
+    353 "ShkronjÃ« e VogÃ«l Latine S Me Caron" 
+    354 "ShkronjÃ« e Madhe Latine T Me Cedilla" 
+    355 "ShkronjÃ« e VogÃ«l Latine T Me Cedilla" 
+    356 "ShkronjÃ« e Madhe Latine T Me Caron" 
+    357 "ShkronjÃ« e VogÃ«l Latine T Me Caron" 
+    358 "ShkronjÃ« e Madhe Latine T Me Goditje" 
+    359 "ShkronjÃ« e VogÃ«l Latine T Me Goditje" 
+    360 "ShkronjÃ« e Madhe Latine U Me TildÃ«" 
+    361 "ShkronjÃ« e VogÃ«l Latine U Me TildÃ«" 
+    362 "ShkronjÃ« e Madhe Latine U Me Macron" 
+    363 "ShkronjÃ« e VogÃ«l Latine U Me Macron" 
+    364 "ShkronjÃ« e Madhe Latine U Me Breve" 
+    365 "ShkronjÃ« e VogÃ«l Latine U Me Breve" 
+    366 "ShkronjÃ« e Madhe Latine U Me Rreth Mbi" 
+    367 "ShkronjÃ« e VogÃ«l Latine U Me Rreth Mbi" 
+    368 "ShkronjÃ« e Madhe Latine U Me Dy MprehtÃ«" 
+    369 "ShkronjÃ« e VogÃ«l Latine U Me Dy MprehtÃ«" 
+    370 "ShkronjÃ« e Madhe Latine U Me Ogonek" 
+    371 "ShkronjÃ« e VogÃ«l Latine U Me Ogonek" 
+    372 "ShkronjÃ« e Madhe Latine W Me Theks-lakor" 
+    373 "ShkronjÃ« e VogÃ«l Latine W Me Theks-lakor" 
+    374 "ShkronjÃ« e Madhe Latine Y Me Theks-lakor" 
+    375 "ShkronjÃ« e VogÃ«l Latine Y Me Theks-lakor" 
+    376 "ShkronjÃ« e Madhe Latine Y Me Diaeresis" 
+    377 "ShkronjÃ« e Madhe Latine Z Me MprehtÃ«" 
+    378 "ShkronjÃ« e VogÃ«l Latine Z Me MprehtÃ«" 
+    379 "ShkronjÃ« e Madhe Latine Z Me PikÃ« Mbi" 
+    380 "ShkronjÃ« e VogÃ«l Latine Z Me PikÃ« Mbi" 
+    381 "ShkronjÃ« e Madhe Latine Z Me Caron" 
+    382 "ShkronjÃ« e VogÃ«l Latine Z Me Caron" 
+    383 "ShkronjÃ« e VogÃ«l Latine GjatÃ« S" 
+    384 "ShkronjÃ« e VogÃ«l Latine B Me Goditje" 
+    385 "ShkronjÃ« e Madhe Latine B Me Kapje" 
+    386 "ShkronjÃ« e Madhe Latine B Me Bar-lart" 
+    387 "ShkronjÃ« e VogÃ«l Latine B Me Bar-lart" 
+    388 "ShkronjÃ« e Madhe Latine Tone GjashtÃ«" 
+    389 "ShkronjÃ« e VogÃ«l Latine Tone GjashtÃ«" 
+    390 "ShkronjÃ« e Madhe Latine Hap O" 
+    391 "ShkronjÃ« e Madhe Latine C Me Kapje" 
+    392 "ShkronjÃ« e VogÃ«l Latine C Me Kapje" 
+    393 "ShkronjÃ« e Madhe Latine Afrikan D" 
+    394 "ShkronjÃ« e Madhe Latine D Me Kapje" 
+    395 "ShkronjÃ« e Madhe Latine D Me Bar-lart" 
+    396 "ShkronjÃ« e VogÃ«l Latine D Me Bar-lart" 
+    397 "ShkronjÃ« e VogÃ«l Latine Ktheu Delta" 
+    398 "ShkronjÃ« e Madhe Latine KundÃ«rt E" 
+    399 "ShkronjÃ« e Madhe Latine Schwa" 
+    400 "ShkronjÃ« e Madhe Latine Hap E" 
+    401 "ShkronjÃ« e Madhe Latine F Me Kapje" 
+    402 "ShkronjÃ« e VogÃ«l Latine F Me Kapje" 
+    403 "ShkronjÃ« e Madhe Latine G Me Kapje" 
+    404 "ShkronjÃ« e Madhe Latine Gama" 
+    405 "ShkronjÃ« e VogÃ«l Latine Hv" 
+    406 "ShkronjÃ« e Madhe Latine Iota" 
+    407 "ShkronjÃ« e Madhe Latine I Me Goditje" 
+    408 "ShkronjÃ« e Madhe Latine K Me Kapje" 
+    409 "ShkronjÃ« e VogÃ«l Latine K Me Kapje" 
+    410 "ShkronjÃ« e VogÃ«l Latine L Me Bar" 
+    411 "ShkronjÃ« e VogÃ«l Latine Lambda Me Goditje" 
+    412 "ShkronjÃ« e Madhe Latine Ktheu M" 
+    413 "ShkronjÃ« e Madhe Latine N Me Majtas Kapje" 
+    414 "ShkronjÃ« e VogÃ«l Latine N Me KÃ«mbÃ« GjatÃ«si Djathtas" 
+    415 "ShkronjÃ« e Madhe Latine O Me Mesit TildÃ«" 
+    416 "ShkronjÃ« e Madhe Latine O Me Bri" 
+    417 "ShkronjÃ« e VogÃ«l Latine O Me Bri" 
+    418 "ShkronjÃ« e Madhe Latine Oi" 
+    419 "ShkronjÃ« e VogÃ«l Latine Oi" 
+    420 "ShkronjÃ« e Madhe Latine P Me Kapje" 
+    421 "ShkronjÃ« e VogÃ«l Latine P Me Kapje" 
+    422 "Latine ShkronjÃ« Yr" 
+    423 "ShkronjÃ« e Madhe Latine Tone Dy" 
+    424 "ShkronjÃ« e VogÃ«l Latine Tone Dy" 
+    425 "ShkronjÃ« e Madhe Latine Esh" 
+    426 "Latin ShkronjÃ« KundÃ«rt Esh lak" 
+    427 "ShkronjÃ« e VogÃ«l Latine T Me Palatal Kapje" 
+    428 "ShkronjÃ« e Madhe Latine T Me Kapje" 
+    429 "ShkronjÃ« e VogÃ«l Latine T Me Kapje" 
+    430 "ShkronjÃ« e Madhe Latine T Me Kapje Retroflex" 
+    431 "ShkronjÃ« e Madhe Latine U Me Bri" 
+    432 "ShkronjÃ« e VogÃ«l Latine U Me Bri" 
+    433 "ShkronjÃ« e Madhe Latine Upsilon" 
+    434 "ShkronjÃ« e Madhe Latine V Me Kapje" 
+    435 "ShkronjÃ« e Madhe Latine Y Me Kapje" 
+    436 "ShkronjÃ« e VogÃ«l Latine Y Me Kapje" 
+    437 "ShkronjÃ« e Madhe Latine Z Me Goditje" 
+    438 "ShkronjÃ« e VogÃ«l Latine Z Me Goditje" 
+    439 "ShkronjÃ« e Madhe Latine Ezh" 
+    440 "ShkronjÃ« e Madhe Latine Ezh KundÃ«rt" 
+    441 "ShkronjÃ« e VogÃ«l Latine Ezh KundÃ«rt" 
+    442 "ShkronjÃ« e VogÃ«l Latine Ezh Me Bisht" 
+    443 "Latine ShkronjÃ« Dy Me Goditje" 
+    444 "ShkronjÃ« e Madhe Latine Tone PesÃ«" 
+    445 "ShkronjÃ« e VogÃ«l Latine Tone PesÃ«" 
+    446 "Latine ShkronjÃ« PÃ«rmbys Glottal Ndalo Me Goditje" 
+    447 "Latine ShkronjÃ« Wynn" 
+    448 "Latine ShkronjÃ« Dental Kliko" 
+    449 "Latine ShkronjÃ« Lateral Kliko" 
+    450 "Latine ShkronjÃ« Alveolar Kliko" 
+    451 "Latine ShkronjÃ« Retroflex Kliko" 
+    452 "ShkronjÃ« e Madhe Latine Dz Me Caron" 
+    453 "ShkronjÃ« e Madhe Latine D Me ShkronjÃ« e VogÃ«l Z Me Caron" 
+    454 "ShkronjÃ« e VogÃ«l Latine Dz Me Caron" 
+    455 "ShkronjÃ« e Madhe Latine Lj" 
+    456 "ShkronjÃ« e Madhe Latine L Me ShkronjÃ« e VogÃ«l J" 
+    457 "ShkronjÃ« e VogÃ«l Latine Lj" 
+    458 "ShkronjÃ« e Madhe Latine Nj" 
+    459 "ShkronjÃ« e Madhe Latine N Me ShkronjÃ« e VogÃ«l J" 
+    460 "ShkronjÃ« e VogÃ«l Latine Nj" 
+    461 "ShkronjÃ« e Madhe Latine A Me Caron" 
+    462 "ShkronjÃ« e VogÃ«l Latine A Me Caron" 
+    463 "ShkronjÃ« e Madhe Latine I Me Caron" 
+    464 "ShkronjÃ« e VogÃ«l Latine I Me Caron" 
+    465 "ShkronjÃ« e Madhe Latine O Me Caron" 
+    466 "ShkronjÃ« e VogÃ«l Latine O Me Caron" 
+    467 "ShkronjÃ« e Madhe Latine U Me Caron" 
+    468 "ShkronjÃ« e VogÃ«l Latine U Me Caron" 
+    469 "ShkronjÃ« e Madhe Latine U Me Diaeresis dhe Macron" 
+    470 "ShkronjÃ« e VogÃ«l Latine U Me Diaeresis dhe Macron" 
+    471 "ShkronjÃ« e Madhe Latine U Me Diaeresis dhe MprehtÃ«" 
+    472 "ShkronjÃ« e VogÃ«l Latine U Me Diaeresis dhe MprehtÃ«" 
+    473 "ShkronjÃ« e Madhe Latine U Me Diaeresis dhe Caron" 
+    474 "ShkronjÃ« e VogÃ«l Latine U Me Diaeresis dhe Caron" 
+    475 "ShkronjÃ« e Madhe Latine U Me Diaeresis dhe RÃ«ndÃ«" 
+    476 "ShkronjÃ« e VogÃ«l Latine U Me Diaeresis dhe RÃ«ndÃ«" 
+    477 "ShkronjÃ« e VogÃ«l Latine kthyer E" 
+    478 "ShkronjÃ« e Madhe Latine A Me Diaeresis dhe Macron" 
+    479 "ShkronjÃ« e VogÃ«l Latine A Me Diaeresis dhe Macron" 
+    480 "ShkronjÃ« e Madhe Latine A Me PikÃ« Mbi dhe Macron" 
+    481 "ShkronjÃ« e VogÃ«l Latine A Me PikÃ« Mbi dhe Macron" 
+    482 "ShkronjÃ« e Madhe Latine Ae Me Macron" 
+    483 "ShkronjÃ« e VogÃ«l Latine Ae Me Macron" 
+    484 "ShkronjÃ« e Madhe Latine G Me Goditje" 
+    485 "ShkronjÃ« e VogÃ«l Latine G Me Goditje" 
+    486 "ShkronjÃ« e Madhe Latine G Me Caron" 
+    487 "ShkronjÃ« e VogÃ«l Latine G Me Caron" 
+    488 "ShkronjÃ« e Madhe Latine K Me Caron" 
+    489 "ShkronjÃ« e VogÃ«l Latine K Me Caron" 
+    490 "ShkronjÃ« e Madhe Latine O Me Ogonek" 
+    491 "ShkronjÃ« e VogÃ«l Latine O Me Ogonek" 
+    492 "ShkronjÃ« e Madhe Latine O Me Ogonek dhe Macron" 
+    493 "ShkronjÃ« e VogÃ«l Latine O Me Ogonek dhe Macron" 
+    494 "ShkronjÃ« e Madhe Latine Ezh Me Caron" 
+    495 "ShkronjÃ« e VogÃ«l Latine Ezh Me Caron" 
+    496 "ShkronjÃ« e VogÃ«l Latine J Me Caron" 
+    497 "ShkronjÃ« e Madhe Latine Dz" 
+    498 "ShkronjÃ« e Madhe Latine D Me ShkronjÃ« e VogÃ«l Z" 
+    499 "ShkronjÃ« e VogÃ«l Latine Dz" 
+    500 "ShkronjÃ« e Madhe Latine G Me MprehtÃ«" 
+    501 "ShkronjÃ« e VogÃ«l Latine G Me MprehtÃ«" 
+    502 "ShkronjÃ« e Madhe Latine Hwair" 
+    503 "ShkronjÃ« e Madhe Latine Wynn" 
+    504 "ShkronjÃ« e Madhe Latine N Me RÃ«ndÃ«" 
+    505 "ShkronjÃ« e VogÃ«l Latine N Me RÃ«ndÃ«" 
+    506 "ShkronjÃ« e Madhe Latine A Me Rreth Mbi dhe MprehtÃ«" 
+    507 "ShkronjÃ« e VogÃ«l Latine A Me Rreth Mbi dhe MprehtÃ«" 
+    508 "ShkronjÃ« e Madhe Latine Ae Me MprehtÃ«" 
+    509 "ShkronjÃ« e VogÃ«l Latine Ae Me MprehtÃ«" 
+    510 "ShkronjÃ« e Madhe Latine O Me Goditje dhe MprehtÃ«" 
+    511 "ShkronjÃ« e VogÃ«l Latine O Me Goditje dhe MprehtÃ«" 
+    512 "ShkronjÃ« e Madhe Latine A Me Dyshe RÃ«ndÃ«" 
+    513 "ShkronjÃ« e VogÃ«l Latine A Me Dyshe RÃ«ndÃ«" 
+    514 "ShkronjÃ« e Madhe Latine A Me PÃ«rmbysur Breve" 
+    515 "ShkronjÃ« e VogÃ«l Latine A Me PÃ«rmbysur Breve" 
+    516 "ShkronjÃ« e Madhe Latine E Me Dyshe RÃ«ndÃ«" 
+    517 "ShkronjÃ« e VogÃ«l Latine E Me Dyshe RÃ«ndÃ«" 
+    518 "ShkronjÃ« e Madhe Latine E Me PÃ«rmbysur Breve" 
+    519 "ShkronjÃ« e VogÃ«l Latine E Me PÃ«rmbysur Breve" 
+    520 "ShkronjÃ« e Madhe Latine I Me Dyshe RÃ«ndÃ«" 
+    521 "ShkronjÃ« e VogÃ«l Latine I Me Dyshe RÃ«ndÃ«" 
+    522 "ShkronjÃ« e Madhe Latine I Me PÃ«rmbysur Breve" 
+    523 "ShkronjÃ« e VogÃ«l Latine I Me PÃ«rmbysur Breve" 
+    524 "ShkronjÃ« e Madhe Latine O Me Dyshe RÃ«ndÃ«" 
+    525 "ShkronjÃ« e VogÃ«l Latine O Me Dyshe RÃ«ndÃ«" 
+    526 "ShkronjÃ« e Madhe Latine O Me PÃ«rmbysur Breve" 
+    527 "ShkronjÃ« e VogÃ«l Latine O Me PÃ«rmbysur Breve" 
+    528 "ShkronjÃ« e Madhe Latine R Me Dyshe RÃ«ndÃ«" 
+    529 "ShkronjÃ« e VogÃ«l Latine R Me Dyshe RÃ«ndÃ«" 
+    530 "ShkronjÃ« e Madhe Latine R Me PÃ«rmbysur Breve" 
+    531 "ShkronjÃ« e VogÃ«l Latine R Me PÃ«rmbysur Breve" 
+    532 "ShkronjÃ« e Madhe Latine U Me Dyshe RÃ«ndÃ«" 
+    533 "ShkronjÃ« e VogÃ«l Latine U Me Dyshe RÃ«ndÃ«" 
+    534 "ShkronjÃ« e Madhe Latine U Me PÃ«rmbysur Breve" 
+    535 "ShkronjÃ« e VogÃ«l Latine U Me PÃ«rmbysur Breve" 
+    536 "ShkronjÃ« e Madhe Latine S Me Presje PoshtÃ«" 
+    537 "ShkronjÃ« e VogÃ«l Latine S Me Presje PoshtÃ«" 
+    538 "ShkronjÃ« e Madhe Latine T Me Presje PoshtÃ«" 
+    539 "ShkronjÃ« e VogÃ«l Latine T Me Presje PoshtÃ«" 
+    540 "ShkronjÃ« e Madhe Latine Yogh" 
+    541 "ShkronjÃ« e VogÃ«l Latine Yogh" 
+    542 "ShkronjÃ« e Madhe Latine H Me Caron" 
+    543 "ShkronjÃ« e VogÃ«l Latine H Me Caron" 
+    544 "ShkronjÃ« e Madhe Latine N Me KÃ«mb GjatÃ«si Majtas" 
+    545 "ShkronjÃ« e VogÃ«l Latine D Me KaÃ§urel" 
+    546 "ShkronjÃ« e Madhe Latine Ou" 
+    547 "ShkronjÃ« e VogÃ«l Latine Ou" 
+    548 "ShkronjÃ« e Madhe Latine Z Me Kapje" 
+    549 "ShkronjÃ« e VogÃ«l Latine Z Me Kapje" 
+    550 "ShkronjÃ« e Madhe Latine A Me PikÃ« Mbi" 
+    551 "ShkronjÃ« e VogÃ«l Latine A Me PikÃ« Mbi" 
+    552 "ShkronjÃ« e Madhe Latine E Me Cedilla" 
+    553 "ShkronjÃ« e VogÃ«l Latine E Me Cedilla" 
+    554 "ShkronjÃ« e Madhe Latine O Me Diaeresis dhe Macron" 
+    555 "ShkronjÃ« e VogÃ«l Latine O Me Diaeresis dhe Macron" 
+    556 "ShkronjÃ« e Madhe Latine O Me TildÃ« dhe Macron" 
+    557 "ShkronjÃ« e VogÃ«l Latine O Me TildÃ« dhe Macron" 
+    558 "ShkronjÃ« e Madhe Latine O Me PikÃ« Mbi" 
+    559 "ShkronjÃ« e VogÃ«l Latine O Me PikÃ« Mbi" 
+    560 "ShkronjÃ« e Madhe Latine O Me PikÃ« Mbi dhe Macron" 
+    561 "ShkronjÃ« e VogÃ«l Latine O Me PikÃ« Mbi dhe Macron" 
+    562 "ShkronjÃ« e Madhe Latine Y Me Macron" 
+    563 "ShkronjÃ« e VogÃ«l Latine Y Me Macron" 
+    564 "ShkronjÃ« e VogÃ«l Latine L Me KaÃ§urel" 
+    565 "ShkronjÃ« e VogÃ«l Latine N Me KaÃ§urel" 
+    566 "ShkronjÃ« e VogÃ«l Latine T Me KaÃ§urel" 
+    567 "ShkronjÃ« e VogÃ«l Latine Pa=PikÃ« J" 
+    568 "ShkronjÃ« e VogÃ«l Latine Db DyshkronjÃ«sh" 
+    569 "ShkronjÃ« e VogÃ«l Latine Qp DyshkronjÃ«sh" 
+    570 "ShkronjÃ« e Madhe Latine A Me Goditje" 
+    571 "ShkronjÃ« e Madhe Latine C Me Goditje" 
+    572 "ShkronjÃ« e VogÃ«l Latine C Me Goditje" 
+    573 "ShkronjÃ« e Madhe Latine L Me Bar" 
+    574 "ShkronjÃ« e Madhe Latine T Me Diagonal Goditje" 
+    575 "ShkronjÃ« e VogÃ«l Latine S Me Swash Bisht" 
+    576 "ShkronjÃ« e VogÃ«l Latine Z Me Swash Bisht" 
+    577 "ShkronjÃ« e Madhe Latine Glottal Ndalo" 
+    578 "ShkronjÃ« e VogÃ«l Latine Glottal Ndalo" 
+    579 "ShkronjÃ« e Madhe Latine B Me Goditje" 
+    580 "ShkronjÃ« e Madhe Latine U Bar" 
+    581 "ShkronjÃ« e Madhe Latine Kthyer V" 
+    582 "ShkronjÃ« e Madhe Latine E Me Goditje" 
+    583 "ShkronjÃ« e VogÃ«l Latine E Me Goditje" 
+    584 "ShkronjÃ« e Madhe Latine J Me Goditje" 
+    585 "ShkronjÃ« e VogÃ«l Latine J Me Goditje" 
+    586 "ShkronjÃ« e Madhe Latine e VogÃ«l Q Me Kapje Bisht" 
+    587 "ShkronjÃ« e VogÃ«l Latine Q Me Kapje Bisht" 
+    588 "ShkronjÃ« e Madhe Latine R Me Goditje" 
+    589 "ShkronjÃ« e VogÃ«l Latine R Me Goditje" 
+    590 "ShkronjÃ« e Madhe Latine Y Me Goditje" 
+    591 "ShkronjÃ« e VogÃ«l Latine Y Me Goditje" 
+    592 "ShkronjÃ« e VogÃ«l Latine Kthyer A" 
+    593 "ShkronjÃ« e VogÃ«l Latine Alfa" 
+    594 "ShkronjÃ« e VogÃ«l Latine Kthyer Alfa" 
+    595 "ShkronjÃ« e VogÃ«l Latine B Me Kapje" 
+    596 "ShkronjÃ« e VogÃ«l Latine Hap O" 
+    597 "ShkronjÃ« e VogÃ«l Latine C Me PÃ«rdridhje" 
+    598 "ShkronjÃ« e VogÃ«l Latine D Me Bisht" 
+    599 "ShkronjÃ« e VogÃ«l Latine D Me Kapje" 
+    600 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt E" 
+    601 "ShkronjÃ« e VogÃ«l Latine Schwa" 
+    602 "ShkronjÃ« e VogÃ«l Latine Schwa Me Kapje" 
+    603 "ShkronjÃ« e VogÃ«l Latine Hap E" 
+    604 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt Hap E" 
+    605 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt Hap E Me Kapje" 
+    606 "ShkronjÃ« e VogÃ«l Latine Mbyllur KundÃ«rt Hap E" 
+    607 "ShkronjÃ« e VogÃ«l Latine Pa-PikÃ« J Me Goditje" 
+    608 "ShkronjÃ« e VogÃ«l Latine G Me Kapje" 
+    609 "ShkronjÃ« e VogÃ«l Latine DorÃ«shkrim G" 
+    610 "Latin ShkronjÃ« e VogÃ«l e Madhe G" 
+    611 "ShkronjÃ« e VogÃ«l Latine Gama" 
+    612 "ShkronjÃ« e VogÃ«l Latine Rams Bri" 
+    613 "ShkronjÃ« e VogÃ«l Latine Kthyer H" 
+    614 "ShkronjÃ« e VogÃ«l Latine H Me Kapje" 
+    615 "ShkronjÃ« e VogÃ«l Latine Heng Me Kapje" 
+    616 "ShkronjÃ« e VogÃ«l Latine I Me Goditje" 
+    617 "ShkronjÃ« e VogÃ«l Latine Iota" 
+    618 "Latin ShkronjÃ« e VogÃ«l e Madhe I" 
+    619 "ShkronjÃ« e VogÃ«l Latine L Me Mesit TildÃ«" 
+    620 "ShkronjÃ« e VogÃ«l Latine L Me Belt" 
+    621 "ShkronjÃ« e VogÃ«l Latine L Me Retroflex Kapje" 
+    622 "ShkronjÃ« e VogÃ«l Latine Lezh" 
+    623 "ShkronjÃ« e VogÃ«l Latine Kthyer M" 
+    624 "ShkronjÃ« e VogÃ«l Latine Kthyer M Me GjatÃ« KÃ«mbÃ«" 
+    625 "ShkronjÃ« e VogÃ«l Latine M Me Kapje" 
+    626 "ShkronjÃ« e VogÃ«l Latine N Me MajtÃ« Kapje" 
+    627 "ShkronjÃ« e VogÃ«l Latine N Me Retroflex Kapje" 
+    628 "Latin ShkronjÃ« e VogÃ«l e Madhe N" 
+    629 "ShkronjÃ« e VogÃ«l Latine Mbrojtur O" 
+    630 "Latin ShkronjÃ« e VogÃ«l e Madhe Oe" 
+    631 "ShkronjÃ« e VogÃ«l Latine Mbyllur Omega" 
+    632 "ShkronjÃ« e VogÃ«l Latine Phi" 
+    633 "ShkronjÃ« e VogÃ«l Latine Kthyer R" 
+    634 "ShkronjÃ« e VogÃ«l Latine Kthyer R Me GjatÃ« KÃ«mbÃ«" 
+    635 "ShkronjÃ« e VogÃ«l Latine Kthyer R Me Kapje" 
+    636 "ShkronjÃ« e VogÃ«l Latine R Me GjatÃ« KÃ«mbÃ«" 
+    637 "ShkronjÃ« e VogÃ«l Latine R Me Bisht" 
+    638 "ShkronjÃ« e VogÃ«l Latine R Me FishKapje" 
+    639 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt R Me FishKapje" 
+    640 "Latin ShkronjÃ« e VogÃ«l e Madhe R" 
+    641 "Latin ShkronjÃ« e VogÃ«l e Madhe Kthyer R" 
+    642 "ShkronjÃ« e VogÃ«l Latine S Me Kapje" 
+    643 "ShkronjÃ« e VogÃ«l Latine Esh" 
+    644 "ShkronjÃ« e VogÃ«l Latine Pa-PikÃ« J Me Goditje dhe Kapje" 
+    645 "ShkronjÃ« e VogÃ«l Latine Mbledhje KundÃ«rt Esh" 
+    646 "ShkronjÃ« e VogÃ«l Latine Esh Me PÃ«rdredhje" 
+    647 "ShkronjÃ« e VogÃ«l Latine Kthyer T" 
+    648 "ShkronjÃ« e VogÃ«l Latine T Me Retroflex Kapje" 
+    649 "ShkronjÃ« e VogÃ«l Latine U Bar" 
+    650 "ShkronjÃ« e VogÃ«l Latine Upsilon" 
+    651 "ShkronjÃ« e VogÃ«l Latine V Me Kapje" 
+    652 "ShkronjÃ« e VogÃ«l Latine Kthyer V" 
+    653 "ShkronjÃ« e VogÃ«l Latine Kthyer W" 
+    654 "ShkronjÃ« e VogÃ«l Latine Kthyer Y" 
+    655 "Latin ShkronjÃ« e VogÃ«l e Madhe Y" 
+    656 "ShkronjÃ« e VogÃ«l Latine Z Me Kapje Retroflex" 
+    657 "ShkronjÃ« e VogÃ«l Latine Z Me PÃ«rdredhje" 
+    658 "ShkronjÃ« e VogÃ«l Latine Ezh" 
+    659 "ShkronjÃ« e VogÃ«l Latine Ezh Me PÃ«rdredhje" 
+    660 "Latin ShkronjÃ« Glottal Stop" 
+    661 "Latin ShkronjÃ« Pharyngeal Voiced Fricative" 
+    662 "Latin ShkronjÃ« Kthyer Glottal Stop" 
+    663 "Latin ShkronjÃ« Zgjatur C" 
+    664 "Latin ShkronjÃ« Bilabial Kliko" 
+    665 "Latin ShkronjÃ« e VogÃ«l e Madhe B" 
+    666 "ShkronjÃ« e VogÃ«l Latine Mbyllur Hap E" 
+    667 "Latin ShkronjÃ« e VogÃ«l e Madhe G Me Kapje" 
+    668 "Latin ShkronjÃ« e VogÃ«l e Madhe H" 
+    669 "ShkronjÃ« e VogÃ«l Latine J Me Mbyllur-Bisht" 
+    670 "ShkronjÃ« e VogÃ«l Latine Kthyer K" 
+    671 "Latin ShkronjÃ« e VogÃ«l e Madhe L" 
+    672 "ShkronjÃ« e VogÃ«l Latine Q Me Kapje" 
+    673 "Latin ShkronjÃ« Glottal Stop Me Goditje" 
+    674 "Latin ShkronjÃ« KundÃ«rt Glottal Stop Me Goditje" 
+    675 "ShkronjÃ« e VogÃ«l Latine Dz DyshkronjÃ«sh" 
+    676 "ShkronjÃ« e VogÃ«l Latine Dezh DyshkronjÃ«sh" 
+    677 "ShkronjÃ« e VogÃ«l Latine Dz DyshkronjÃ«sh Me PÃ«rdredhje" 
+    678 "ShkronjÃ« e VogÃ«l Latine Ts DyshkronjÃ«sh" 
+    679 "ShkronjÃ« e VogÃ«l Latine Tesh DyshkronjÃ«sh" 
+    680 "ShkronjÃ« e VogÃ«l Latine Tc DyshkronjÃ«sh Me PÃ«rdredhje" 
+    681 "ShkronjÃ« e VogÃ«l Latine Feng DyshkronjÃ«sh" 
+    682 "ShkronjÃ« e VogÃ«l Latine Ls DyshkronjÃ«sh" 
+    683 "ShkronjÃ« e VogÃ«l Latine Lz DyshkronjÃ«sh" 
+    684 "Latin ShkronjÃ« Bilabial me Perkusion" 
+    685 "Latin ShkronjÃ« Bidental me Perkusion" 
+    686 "ShkronjÃ« e VogÃ«l Latine Kthyer H Me Grep Peshkimi" 
+    687 "ShkronjÃ« e VogÃ«l Latine Kthyer H Me FishKapje dhe Bisht" 
+    688 "Modifiko ShkronjÃ« e VogÃ«l H" 
+    689 "Modifiko ShkronjÃ« e VogÃ«l H Me Kapje" 
+    690 "Modifiko ShkronjÃ« e VogÃ«l J" 
+    691 "Modifiko ShkronjÃ« e VogÃ«l R" 
+    692 "Modifiko ShkronjÃ« e VogÃ«l Kthyer R" 
+    693 "Modifiko ShkronjÃ« e VogÃ«l Kthyer R Me Kapje" 
+    694 "Modifiko ShkronjÃ« e VogÃ«l e Madhe Kthyer R" 
+    695 "Modifiko ShkronjÃ« e VogÃ«l W" 
+    696 "Modifiko ShkronjÃ« e VogÃ«l Y" 
+    697 "Modifiko ShkronjÃ« Prime" 
+    698 "Modifiko ShkronjÃ« Dyshe Prime" 
+    699 "Modifiko ShkronjÃ« Kthyer Presje" 
+    700 "Modifiko ShkronjÃ« Apostrof" 
+    701 "Modifiko ShkronjÃ« KundÃ«rt Presje" 
+    702 "Modifiko ShkronjÃ« DjathtÃ« GjysmÃ« Rreth" 
+    703 "Modifiko ShkronjÃ« MajtÃ« GjysmÃ« Rreth" 
+    704 "Modifiko ShkronjÃ« Glottal Stop" 
+    705 "Modifiko ShkronjÃ« KundÃ«rt Glottal Stop" 
+    706 "Modifiko ShkronjÃ« MajtÃ« kokÃ«-Shigjete" 
+    707 "Modifiko ShkronjÃ« DjathtÃ« kokÃ«-Shigjete" 
+    708 "Modifiko ShkronjÃ« Lart kokÃ«-Shigjete" 
+    709 "Modifiko ShkronjÃ« PoshtÃ« kokÃ«-Shigjete" 
+    710 "Modifiko ShkronjÃ« Theks-lakor Theks" 
+    711 "Caron" 
+    712 "Modifiko ShkronjÃ« Vertikale LinjÃ«" 
+    713 "Modifiko ShkronjÃ« Macron" 
+    714 "Modifiko ShkronjÃ« Theks i MprehtÃ«" 
+    715 "Modifiko ShkronjÃ« RÃ«ndÃ« Theks" 
+    716 "Modifiko ShkronjÃ« UlÃ«t Vertikale LinjÃ«" 
+    717 "Modifiko ShkronjÃ« UlÃ«t Macron" 
+    718 "Modifiko ShkronjÃ« UlÃ«t RÃ«ndÃ« Theks" 
+    719 "Modifiko ShkronjÃ« UlÃ«t Theks i MprehtÃ«" 
+    720 "Modifiko ShkronjÃ« TrekÃ«ndÃ«sh Dy pika" 
+    721 "Modifiko ShkronjÃ« GjysmÃ« TrekÃ«ndÃ«sh Dy Pika" 
+    722 "Modifiko ShkronjÃ« NÃ« QendÃ«r DjathtÃ« GjysmÃ« Rreth" 
+    723 "Modifiko ShkronjÃ« NÃ« QendÃ«r MajtÃ« GjysmÃ« Rreth" 
+    724 "Modifiko ShkronjÃ« Lart Litar" 
+    725 "Modifiko ShkronjÃ« PoshtÃ« Litar" 
+    726 "Modifiko ShkronjÃ« Plus ShenjÃ«" 
+    727 "Modifiko ShkronjÃ« Minus ShenjÃ«" 
+    728 "Breve" 
+    729 "PikÃ« Mbi" 
+    730 "Rreth Mbi" 
+    731 "Ogonek" 
+    732 "e VogÃ«l TildÃ«" 
+    733 "Dyshe Theks i MprehtÃ«" 
+    734 "Modifiko ShkronjÃ« Rhotic Kapje" 
+    735 "Modifiko ShkronjÃ« Kryq Theks" 
+    736 "Modifiko ShkronjÃ« e VogÃ«l Gamma" 
+    737 "Modifiko ShkronjÃ« e VogÃ«l L" 
+    738 "Modifiko ShkronjÃ« e VogÃ«l S" 
+    739 "Modifiko ShkronjÃ« e VogÃ«l X" 
+    740 "Modifiko ShkronjÃ« e VogÃ«l KundÃ«rt Glottal Stop" 
+    741 "Modifiko ShkronjÃ« ShumÃ«-Lart Tone Bar" 
+    742 "Modifiko ShkronjÃ« Lart Tone Bar" 
+    743 "Modifiko ShkronjÃ« Mesatar Tone Bar" 
+    744 "Modifiko ShkronjÃ« UlÃ«t Tone Bar" 
+    745 "Modifiko ShkronjÃ« ShumÃ«-UlÃ«t Tone Bar" 
+    746 "Modifiko ShkronjÃ« Yin Nisen Tone ShenjÃ«" 
+    747 "Modifiko ShkronjÃ« Yang Nisen Tone ShenjÃ«" 
+    748 "Modifiko ShkronjÃ« Shprehur" 
+    749 "Modifiko ShkronjÃ« Pa-Ajrim" 
+    750 "Modifiko ShkronjÃ« Dyshe Apostrof" 
+    751 "Modifiko ShkronjÃ« UlÃ«t PoshtÃ« kokÃ«-Shigjete" 
+    752 "Modifiko ShkronjÃ« UlÃ«t Lart kokÃ«-Shigjete" 
+    753 "Modifiko ShkronjÃ« UlÃ«t MajtÃ« kokÃ«-Shigjete" 
+    754 "Modifiko ShkronjÃ« UlÃ«t DjathtÃ« kokÃ«-Shigjete" 
+    755 "Modifiko ShkronjÃ« UlÃ«t Rreth" 
+    756 "Modifiko ShkronjÃ« Mesit RÃ«ndÃ« Theks" 
+    757 "Modifiko ShkronjÃ« Mesit Dyshe RÃ«ndÃ« Theks" 
+    758 "Modifiko ShkronjÃ« Mesit Dyshe Theks i MprehtÃ«" 
+    759 "Modifiko ShkronjÃ« UlÃ«t TildÃ«" 
+    760 "Modifiko ShkronjÃ« Ngritur Dy Pika" 
+    761 "Modifiko ShkronjÃ« Filloj Lart Tone" 
+    762 "Modifiko ShkronjÃ« End Lart Tone" 
+    763 "Modifiko ShkronjÃ« Filloj UlÃ«t Tone" 
+    764 "Modifiko ShkronjÃ« End UlÃ«t Tone" 
+    765 "Modifiko ShkronjÃ« Shelf" 
+    766 "Modifiko ShkronjÃ« Hap Shelf" 
+    767 "Modifiko ShkronjÃ« UlÃ«t MajtÃ« ShigjetÃ«" 
+    768 "Kombinuar RÃ«ndÃ« Theks" 
+    769 "Kombinuar Theks i MprehtÃ«" 
+    770 "Kombinuar Theks-lakor Theks" 
+    771 "Kombinuar TildÃ«" 
+    772 "Kombinuar Macron" 
+    773 "Kombinuar MbilinjÃ«" 
+    774 "Kombinuar Breve" 
+    775 "Kombinuar PikÃ« Mbi" 
+    776 "Kombinuar Diaeresis" 
+    777 "Kombinuar Kapje Lart" 
+    778 "Kombinuar Rreth Mbi" 
+    779 "Kombinuar Dyshe Theks i MprehtÃ«" 
+    780 "Kombinuar Caron" 
+    781 "Kombinuar Vertikale LinjÃ« Lart" 
+    782 "Kombinuar Dyshe Vertikale LinjÃ« Lart" 
+    783 "Kombinuar Dyshe RÃ«ndÃ« Theks" 
+    784 "Kombinuar Candrabindu" 
+    785 "Kombinuar Kthyer Breve" 
+    786 "Kombinuar Kthyer Presje Lart" 
+    787 "Kombinuar Presje Lart" 
+    788 "Kombinuar KundÃ«rt Presje Lart" 
+    789 "Kombinuar Presje Lart DjathtÃ«" 
+    790 "Kombinuar RÃ«ndÃ« Theks PoshtÃ«" 
+    791 "Kombinuar Theks i MprehtÃ« PoshtÃ«" 
+    792 "Kombinuar MajtÃ« Litar PoshtÃ«" 
+    793 "Kombinuar DjathtÃ« Litar PoshtÃ«" 
+    794 "Kombinuar MajtÃ« KÃ«nd Lart" 
+    795 "Kombinuar Bri" 
+    796 "Kombinuar MajtÃ« GjysmÃ« Rreth PoshtÃ«" 
+    797 "Kombinuar Lart Litar PoshtÃ«" 
+    798 "Kombinuar PoshtÃ« Litar PoshtÃ«" 
+    799 "Kombinuar Plus ShenjÃ« PoshtÃ«" 
+    800 "Kombinuar Minus ShenjÃ« PoshtÃ«" 
+    801 "Kombinuar Zbutur Kapje PoshtÃ«" 
+    802 "Kombinuar Retroflex Kapje PoshtÃ«" 
+    803 "Kombinuar PikÃ« PoshtÃ«" 
+    804 "Kombinuar Diaeresis PoshtÃ«" 
+    805 "Kombinuar Rreth PoshtÃ«" 
+    806 "Kombinuar Presje PoshtÃ«" 
+    807 "Kombinuar Cedilla" 
+    808 "Kombinuar Ogonek" 
+    809 "Kombinuar Vertikale LinjÃ« PoshtÃ«" 
+    810 "Kombinuar UrÃ« PoshtÃ«" 
+    811 "Kombinuar Kthyer Dyshe Hark PoshtÃ«" 
+    812 "Kombinuar Caron PoshtÃ«" 
+    813 "Kombinuar Theks-lakor Theks PoshtÃ«" 
+    814 "Kombinuar Breve PoshtÃ«" 
+    815 "Kombinuar Kthyer Breve PoshtÃ«" 
+    816 "Kombinuar TildÃ« PoshtÃ«" 
+    817 "Kombinuar Macron PoshtÃ«" 
+    818 "Kombinuar UlÃ«t LinjÃ«" 
+    819 "Kombinuar Dyshe UlÃ«t LinjÃ«" 
+    820 "Kombinuar TildÃ« Mbulim" 
+    821 "Kombinuar ShkurtÃ«r Goditje Mbulim" 
+    822 "Kombinuar GjatÃ« Goditje Mbulim" 
+    823 "Kombinuar ShkurtÃ«r Solidus Mbulim" 
+    824 "Kombinuar GjatÃ« Solidus Mbulim" 
+    825 "Kombinuar DjathtÃ« GjysmÃ« Rreth PoshtÃ«" 
+    826 "Kombinuar Kthyer UrÃ« PoshtÃ«" 
+    827 "Kombinuar Katror PoshtÃ«" 
+    828 "Kombinuar PulÃ«bardha PoshtÃ«" 
+    829 "Kombinuar X Lart" 
+    830 "Kombinuar Vertikale TildÃ«" 
+    831 "Kombinuar Dyshe MbilinjÃ«" 
+    832 "Kombinuar RÃ«ndÃ« Tone ShenjÃ«" 
+    833 "Kombinuar MprehtÃ« Tone ShenjÃ«" 
+    834 "Kombinuar Greke Perispomeni" 
+    835 "Kombinuar Greke Koronis" 
+    836 "Kombinuar Greke Dialytika Tonos" 
+    837 "Kombinuar Greke Ypogegrammeni" 
+    838 "Kombinuar UrÃ« Lart" 
+    839 "Kombinuar BarabartÃ« ShenjÃ« PoshtÃ«" 
+    840 "Kombinuar Dyshe Vertikale LinjÃ« PoshtÃ«" 
+    841 "Kombinuar MajtÃ« KÃ«nd PoshtÃ«" 
+    842 "Kombinuar Jo TildÃ« Lart" 
+    843 "Kombinuar Homothetic Lart" 
+    844 "Kombinuar Pothuajse e BarabartÃ« Me Lart" 
+    845 "Kombinuar Majtas Djathtas ShigjetÃ« PoshtÃ«" 
+    846 "Kombinuar PÃ«rpjetÃ« ShigjetÃ« PoshtÃ«" 
+    847 "Kombinuar Grapheme Joiner" 
+    848 "Kombinuar DjathtÃ« ShigjetÃ«head Lart" 
+    849 "Kombinuar MajtÃ« GjysmÃ« Rreth Mbi" 
+    850 "Kombinuar Fermata" 
+    851 "Kombinuar X PoshtÃ«" 
+    852 "Kombinuar MajtÃ« kokÃ«-Shigjete PoshtÃ«" 
+    853 "Kombinuar DjathtÃ« kokÃ«-Shigjete PoshtÃ«" 
+    854 "Kombinuar DjathtÃ« kokÃ«-Shigjete dhe Lart kokÃ«-Shigjete PoshtÃ«" 
+    855 "Kombinuar DjathtÃ« GjysmÃ« Rreth Mbi" 
+    856 "Kombinuar PikÃ« Mbi DjathtÃ«" 
+    857 "Kombinuar YllÃ« PoshtÃ«" 
+    858 "Kombinuar Dyshe Rreth PoshtÃ«" 
+    859 "Kombinuar Zigzag Lart" 
+    860 "Kombinuar Dyshe Breve PoshtÃ«" 
+    861 "Kombinuar Dyshe Breve" 
+    862 "Kombinuar Dyshe Macron" 
+    863 "Kombinuar Dyshe Macron PoshtÃ«" 
+    864 "Kombinuar Dyshe TildÃ«" 
+    865 "Kombinuar Dyshe Kthyer Breve" 
+    866 "Kombinuar Dyshe Djathtas ShigjetÃ« PoshtÃ«" 
+    867 "Kombinuar ShkronjÃ« e VogÃ«l Latine A" 
+    868 "Kombinuar ShkronjÃ« e VogÃ«l Latine E" 
+    869 "Kombinuar ShkronjÃ« e VogÃ«l Latine I" 
+    870 "Kombinuar ShkronjÃ« e VogÃ«l Latine O" 
+    871 "Kombinuar ShkronjÃ« e VogÃ«l Latine U" 
+    872 "Kombinuar ShkronjÃ« e VogÃ«l Latine C" 
+    873 "Kombinuar ShkronjÃ« e VogÃ«l Latine D" 
+    874 "Kombinuar ShkronjÃ« e VogÃ«l Latine H" 
+    875 "Kombinuar ShkronjÃ« e VogÃ«l Latine M" 
+    876 "Kombinuar ShkronjÃ« e VogÃ«l Latine R" 
+    877 "Kombinuar ShkronjÃ« e VogÃ«l Latine T" 
+    878 "Kombinuar ShkronjÃ« e VogÃ«l Latine V" 
+    879 "Kombinuar ShkronjÃ« e VogÃ«l Latine X" 
+    880 "Greke ShkronjÃ« e Madhe Heta" 
+    881 "Greke ShkronjÃ« e VogÃ«l Heta" 
+    882 "Greke ShkronjÃ« e Madhe Archaic Sampi" 
+    883 "Greke ShkronjÃ« e VogÃ«l Archaic Sampi" 
+    884 "Greke NumÃ«ror ShenjÃ«" 
+    885 "Greke MÃ« e'ulÃ«t NumÃ«rore ShenjÃ«" 
+    886 "Greke ShkronjÃ« e Madhe Pamphylian Digamma" 
+    887 "Greke ShkronjÃ« e VogÃ«l Pamphylian Digamma" 
+    890 "Greke Ypogegrammeni" 
+    891 "Greke e VogÃ«l KundÃ«rt Lunate Sigma Simbol" 
+    892 "Greke e VogÃ«l Pika-Pika Lunate Sigma Simbol" 
+    893 "Greke e VogÃ«l KundÃ«rt Pika-Pika Lunate Sigma Simbol" 
+    894 "Greke Pyetje ShenjÃ«" 
+    900 "Greke Tonos" 
+    901 "Greke Dialytika Tonos" 
+    902 "Greke ShkronjÃ« e Madhe Alpha Me Tonos" 
+    903 "Greke Ano Teleia" 
+    904 "Greke ShkronjÃ« e Madhe Epsilon Me Tonos" 
+    905 "Greke ShkronjÃ« e Madhe Eta Me Tonos" 
+    906 "Greke ShkronjÃ« e Madhe Iota Me Tonos" 
+    908 "Greke ShkronjÃ« e Madhe Omicron Me Tonos" 
+    910 "Greke ShkronjÃ« e Madhe Upsilon Me Tonos" 
+    911 "Greke ShkronjÃ« e Madhe Omega Me Tonos" 
+    912 "Greke ShkronjÃ« e VogÃ«l Iota Me Dialytika dhe Tonos" 
+    913 "Greke ShkronjÃ« e Madhe Alpha" 
+    914 "Greke ShkronjÃ« e Madhe Beta" 
+    915 "Greke ShkronjÃ« e Madhe Gamma" 
+    916 "Greke ShkronjÃ« e Madhe Delta" 
+    917 "Greke ShkronjÃ« e Madhe Epsilon" 
+    918 "Greke ShkronjÃ« e Madhe Zeta" 
+    919 "Greke ShkronjÃ« e Madhe Eta" 
+    920 "Greke ShkronjÃ« e Madhe Theta" 
+    921 "Greke ShkronjÃ« e Madhe Iota" 
+    922 "Greke ShkronjÃ« e Madhe Kappa" 
+    923 "Greke ShkronjÃ« e Madhe Lamda" 
+    924 "Greke ShkronjÃ« e Madhe Mu" 
+    925 "Greke ShkronjÃ« e Madhe Nu" 
+    926 "Greke ShkronjÃ« e Madhe Xi" 
+    927 "Greke ShkronjÃ« e Madhe Omicron" 
+    928 "Greke ShkronjÃ« e Madhe Pi" 
+    929 "Greke ShkronjÃ« e Madhe Rho" 
+    931 "Greke ShkronjÃ« e Madhe Sigma" 
+    932 "Greke ShkronjÃ« e Madhe Tau" 
+    933 "Greke ShkronjÃ« e Madhe Upsilon" 
+    934 "Greke ShkronjÃ« e Madhe Phi" 
+    935 "Greke ShkronjÃ« e Madhe Chi" 
+    936 "Greke ShkronjÃ« e Madhe Psi" 
+    937 "Greke ShkronjÃ« e Madhe Omega" 
+    938 "Greke ShkronjÃ« e Madhe Iota Me Dialytika" 
+    939 "Greke ShkronjÃ« e Madhe Upsilon Me Dialytika" 
+    940 "Greke ShkronjÃ« e VogÃ«l Alpha Me Tonos" 
+    941 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Tonos" 
+    942 "Greke ShkronjÃ« e VogÃ«l Eta Me Tonos" 
+    943 "Greke ShkronjÃ« e VogÃ«l Iota Me Tonos" 
+    944 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dialytika dhe Tonos" 
+    945 "Greke ShkronjÃ« e VogÃ«l Alpha" 
+    946 "Greke ShkronjÃ« e VogÃ«l Beta" 
+    947 "Greke ShkronjÃ« e VogÃ«l Gamma" 
+    948 "Greke ShkronjÃ« e VogÃ«l Delta" 
+    949 "Greke ShkronjÃ« e VogÃ«l Epsilon" 
+    950 "Greke ShkronjÃ« e VogÃ«l Zeta" 
+    951 "Greke ShkronjÃ« e VogÃ«l Eta" 
+    952 "Greke ShkronjÃ« e VogÃ«l Theta" 
+    953 "Greke ShkronjÃ« e VogÃ«l Iota" 
+    954 "Greke ShkronjÃ« e VogÃ«l Kappa" 
+    955 "Greke ShkronjÃ« e VogÃ«l Lamda" 
+    956 "Greke ShkronjÃ« e VogÃ«l Mu" 
+    957 "Greke ShkronjÃ« e VogÃ«l Nu" 
+    958 "Greke ShkronjÃ« e VogÃ«l Xi" 
+    959 "Greke ShkronjÃ« e VogÃ«l Omicron" 
+    960 "Greke ShkronjÃ« e VogÃ«l Pi" 
+    961 "Greke ShkronjÃ« e VogÃ«l Rho" 
+    962 "Greke ShkronjÃ« e VogÃ«l PÃ«rfundimtare Sigma" 
+    963 "Greke ShkronjÃ« e VogÃ«l Sigma" 
+    964 "Greke ShkronjÃ« e VogÃ«l Tau" 
+    965 "Greke ShkronjÃ« e VogÃ«l Upsilon" 
+    966 "Greke ShkronjÃ« e VogÃ«l Phi" 
+    967 "Greke ShkronjÃ« e VogÃ«l Chi" 
+    968 "Greke ShkronjÃ« e VogÃ«l Psi" 
+    969 "Greke ShkronjÃ« e VogÃ«l Omega" 
+    970 "Greke ShkronjÃ« e VogÃ«l Iota Me Dialytika" 
+    971 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dialytika" 
+    972 "Greke ShkronjÃ« e VogÃ«l Omicron Me Tonos" 
+    973 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Tonos" 
+    974 "Greke ShkronjÃ« e VogÃ«l Omega Me Tonos" 
+    975 "Greke e Madhe Kai Simbol" 
+    976 "Greke Beta Simbol" 
+    977 "Greke Theta Simbol" 
+    978 "Greke Upsilon Me Kapje Simbol" 
+    979 "Greke Upsilon Me MprehtÃ« dhe Kapje Simbol" 
+    980 "Greke Upsilon Me Diaeresis dhe Kapje Simbol" 
+    981 "Greke Phi Simbol" 
+    982 "Greke Pi Simbol" 
+    983 "Greke Kai Simbol" 
+    984 "Greke ShkronjÃ« Archaic Koppa" 
+    985 "Greke ShkronjÃ« e VogÃ«l Archaic Koppa" 
+    986 "Greke ShkronjÃ« Stigma" 
+    987 "Greke ShkronjÃ« e VogÃ«l Stigma" 
+    988 "Greke ShkronjÃ« Digamma" 
+    989 "Greke ShkronjÃ« e VogÃ«l Digamma" 
+    990 "Greke ShkronjÃ« Koppa" 
+    991 "Greke ShkronjÃ« e VogÃ«l Koppa" 
+    992 "Greke ShkronjÃ« Sampi" 
+    993 "Greke ShkronjÃ« e VogÃ«l Sampi" 
+    994 "Coptic ShkronjÃ« e Madhe Shei" 
+    995 "Coptic ShkronjÃ« e VogÃ«l Shei" 
+    996 "Coptic ShkronjÃ« e Madhe Fei" 
+    997 "Coptic ShkronjÃ« e VogÃ«l Fei" 
+    998 "Coptic ShkronjÃ« e Madhe Khei" 
+    999 "Coptic ShkronjÃ« e VogÃ«l Khei" 
+    1000 "Coptic ShkronjÃ« e Madhe Hori" 
+    1001 "Coptic ShkronjÃ« e VogÃ«l Hori" 
+    1002 "Coptic ShkronjÃ« e Madhe Gangia" 
+    1003 "Coptic ShkronjÃ« e VogÃ«l Gangia" 
+    1004 "Coptic ShkronjÃ« e Madhe Shima" 
+    1005 "Coptic ShkronjÃ« e VogÃ«l Shima" 
+    1006 "Coptic ShkronjÃ« e Madhe Dei" 
+    1007 "Coptic ShkronjÃ« e VogÃ«l Dei" 
+    1008 "Greke Kappa Simbol" 
+    1009 "Greke Rho Simbol" 
+    1010 "Greke Lunate Sigma Simbol" 
+    1011 "Greke ShkronjÃ« Yot" 
+    1012 "Greke e Madhe Theta Simbol" 
+    1013 "Greke Lunate Epsilon Simbol" 
+    1014 "Greke KundÃ«rt Lunate Epsilon Simbol" 
+    1015 "Greke ShkronjÃ« e Madhe Sho" 
+    1016 "Greke ShkronjÃ« e VogÃ«l Sho" 
+    1017 "Greke e Madhe Lunate Sigma Simbol" 
+    1018 "Greke ShkronjÃ« e Madhe San" 
+    1019 "Greke ShkronjÃ« e VogÃ«l San" 
+    1020 "Greke Rho Me Goditje Simbol" 
+    1021 "Greke e Madhe KundÃ«rt Lunate Sigma Simbol" 
+    1022 "Greke e Madhe Pika-Pika Lunate Sigma Simbol" 
+    1023 "Greke e Madhe KundÃ«rt Pika-Pika Lunate Sigma Simbol" 
+    1024 "Cyrillic ShkronjÃ« e Madhe Ie Me RÃ«ndÃ«" 
+    1025 "Cyrillic ShkronjÃ« e Madhe Io" 
+    1026 "Cyrillic ShkronjÃ« e Madhe Dje" 
+    1027 "Cyrillic ShkronjÃ« e Madhe Gje" 
+    1028 "Cyrillic ShkronjÃ« e Madhe Ukrainase Ie" 
+    1029 "Cyrillic ShkronjÃ« e Madhe Dze" 
+    1030 "Cyrillic ShkronjÃ« e Madhe Bjelloruse-Ukrainase I" 
+    1031 "Cyrillic ShkronjÃ« e Madhe Yi" 
+    1032 "Cyrillic ShkronjÃ« e Madhe Je" 
+    1033 "Cyrillic ShkronjÃ« e Madhe Lje" 
+    1034 "Cyrillic ShkronjÃ« e Madhe Nje" 
+    1035 "Cyrillic ShkronjÃ« e Madhe Tshe" 
+    1036 "Cyrillic ShkronjÃ« e Madhe Kje" 
+    1037 "Cyrillic ShkronjÃ« e Madhe I Me RÃ«ndÃ«" 
+    1038 "Cyrillic ShkronjÃ« e Madhe ShkurtÃ«r U" 
+    1039 "Cyrillic ShkronjÃ« e Madhe Dzhe" 
+    1040 "Cyrillic ShkronjÃ« e Madhe A" 
+    1041 "Cyrillic ShkronjÃ« e Madhe Be" 
+    1042 "Cyrillic ShkronjÃ« e Madhe Ve" 
+    1043 "Cyrillic ShkronjÃ« e Madhe Ghe" 
+    1044 "Cyrillic ShkronjÃ« e Madhe De" 
+    1045 "Cyrillic ShkronjÃ« e Madhe Ie" 
+    1046 "Cyrillic ShkronjÃ« e Madhe Zhe" 
+    1047 "Cyrillic ShkronjÃ« e Madhe Ze" 
+    1048 "Cyrillic ShkronjÃ« e Madhe I" 
+    1049 "Cyrillic ShkronjÃ« e Madhe ShkurtÃ«r I" 
+    1050 "Cyrillic ShkronjÃ« e Madhe Ka" 
+    1051 "Cyrillic ShkronjÃ« e Madhe El" 
+    1052 "Cyrillic ShkronjÃ« e Madhe Em" 
+    1053 "Cyrillic ShkronjÃ« e Madhe En" 
+    1054 "Cyrillic ShkronjÃ« e Madhe O" 
+    1055 "Cyrillic ShkronjÃ« e Madhe Pe" 
+    1056 "Cyrillic ShkronjÃ« e Madhe Er" 
+    1057 "Cyrillic ShkronjÃ« e Madhe Es" 
+    1058 "Cyrillic ShkronjÃ« e Madhe Te" 
+    1059 "Cyrillic ShkronjÃ« e Madhe U" 
+    1060 "Cyrillic ShkronjÃ« e Madhe Ef" 
+    1061 "Cyrillic ShkronjÃ« e Madhe Ha" 
+    1062 "Cyrillic ShkronjÃ« e Madhe Tse" 
+    1063 "Cyrillic ShkronjÃ« e Madhe Che" 
+    1064 "Cyrillic ShkronjÃ« e Madhe Sha" 
+    1065 "Cyrillic ShkronjÃ« e Madhe Shcha" 
+    1066 "Cyrillic ShkronjÃ« e Madhe ShenjÃ« FortÃ«" 
+    1067 "Cyrillic ShkronjÃ« e Madhe Yeru" 
+    1068 "Cyrillic ShkronjÃ« e Madhe ShenjÃ« ButÃ«" 
+    1069 "Cyrillic ShkronjÃ« e Madhe E" 
+    1070 "Cyrillic ShkronjÃ« e Madhe Yu" 
+    1071 "Cyrillic ShkronjÃ« e Madhe Ya" 
+    1072 "Cyrillic ShkronjÃ« e VogÃ«l A" 
+    1073 "Cyrillic ShkronjÃ« e VogÃ«l Be" 
+    1074 "Cyrillic ShkronjÃ« e VogÃ«l Ve" 
+    1075 "Cyrillic ShkronjÃ« e VogÃ«l Ghe" 
+    1076 "Cyrillic ShkronjÃ« e VogÃ«l De" 
+    1077 "Cyrillic ShkronjÃ« e VogÃ«l Ie" 
+    1078 "Cyrillic ShkronjÃ« e VogÃ«l Zhe" 
+    1079 "Cyrillic ShkronjÃ« e VogÃ«l Ze" 
+    1080 "Cyrillic ShkronjÃ« e VogÃ«l I" 
+    1081 "Cyrillic ShkronjÃ« e VogÃ«l ShkurtÃ«r I" 
+    1082 "Cyrillic ShkronjÃ« e VogÃ«l Ka" 
+    1083 "Cyrillic ShkronjÃ« e VogÃ«l El" 
+    1084 "Cyrillic ShkronjÃ« e VogÃ«l Em" 
+    1085 "Cyrillic ShkronjÃ« e VogÃ«l En" 
+    1086 "Cyrillic ShkronjÃ« e VogÃ«l O" 
+    1087 "Cyrillic ShkronjÃ« e VogÃ«l Pe" 
+    1088 "Cyrillic ShkronjÃ« e VogÃ«l Er" 
+    1089 "Cyrillic ShkronjÃ« e VogÃ«l Es" 
+    1090 "Cyrillic ShkronjÃ« e VogÃ«l Te" 
+    1091 "Cyrillic ShkronjÃ« e VogÃ«l U" 
+    1092 "Cyrillic ShkronjÃ« e VogÃ«l Ef" 
+    1093 "Cyrillic ShkronjÃ« e VogÃ«l Ha" 
+    1094 "Cyrillic ShkronjÃ« e VogÃ«l Tse" 
+    1095 "Cyrillic ShkronjÃ« e VogÃ«l Che" 
+    1096 "Cyrillic ShkronjÃ« e VogÃ«l Sha" 
+    1097 "Cyrillic ShkronjÃ« e VogÃ«l Shcha" 
+    1098 "Cyrillic ShkronjÃ« e VogÃ«l Hard ShenjÃ«" 
+    1099 "Cyrillic ShkronjÃ« e VogÃ«l Yeru" 
+    1100 "Cyrillic ShkronjÃ« e VogÃ«l Soft ShenjÃ«" 
+    1101 "Cyrillic ShkronjÃ« e VogÃ«l E" 
+    1102 "Cyrillic ShkronjÃ« e VogÃ«l Yu" 
+    1103 "Cyrillic ShkronjÃ« e VogÃ«l Ya" 
+    1104 "Cyrillic ShkronjÃ« e VogÃ«l Ie Me RÃ«ndÃ«" 
+    1105 "Cyrillic ShkronjÃ« e VogÃ«l Io" 
+    1106 "Cyrillic ShkronjÃ« e VogÃ«l Dje" 
+    1107 "Cyrillic ShkronjÃ« e VogÃ«l Gje" 
+    1108 "Cyrillic ShkronjÃ« e VogÃ«l Ukrainase Ie" 
+    1109 "Cyrillic ShkronjÃ« e VogÃ«l Dze" 
+    1110 "Cyrillic ShkronjÃ« e VogÃ«l Bjelloruse-Ukrainase I" 
+    1111 "Cyrillic ShkronjÃ« e VogÃ«l Yi" 
+    1112 "Cyrillic ShkronjÃ« e VogÃ«l Je" 
+    1113 "Cyrillic ShkronjÃ« e VogÃ«l Lje" 
+    1114 "Cyrillic ShkronjÃ« e VogÃ«l Nje" 
+    1115 "Cyrillic ShkronjÃ« e VogÃ«l Tshe" 
+    1116 "Cyrillic ShkronjÃ« e VogÃ«l Kje" 
+    1117 "Cyrillic ShkronjÃ« e VogÃ«l I Me RÃ«ndÃ«" 
+    1118 "Cyrillic ShkronjÃ« e VogÃ«l ShkurtÃ«r U" 
+    1119 "Cyrillic ShkronjÃ« e VogÃ«l Dzhe" 
+    1120 "Cyrillic ShkronjÃ« e Madhe Omega" 
+    1121 "Cyrillic ShkronjÃ« e VogÃ«l Omega" 
+    1122 "Cyrillic ShkronjÃ« e Madhe Yat" 
+    1123 "Cyrillic ShkronjÃ« e VogÃ«l Yat" 
+    1124 "Cyrillic ShkronjÃ« e Madhe Iotified E" 
+    1125 "Cyrillic ShkronjÃ« e VogÃ«l Iotified E" 
+    1126 "Cyrillic ShkronjÃ« e Madhe Pak Yus" 
+    1127 "Cyrillic ShkronjÃ« e VogÃ«l Pak Yus" 
+    1128 "Cyrillic ShkronjÃ« e Madhe Iotified Pak Yus" 
+    1129 "Cyrillic ShkronjÃ« e VogÃ«l Iotified Pak Yus" 
+    1130 "Cyrillic ShkronjÃ« e Madhe Big Yus" 
+    1131 "Cyrillic ShkronjÃ« e VogÃ«l Big Yus" 
+    1132 "Cyrillic ShkronjÃ« e Madhe Iotified Big Yus" 
+    1133 "Cyrillic ShkronjÃ« e VogÃ«l Iotified Big Yus" 
+    1134 "Cyrillic ShkronjÃ« e Madhe Ksi" 
+    1135 "Cyrillic ShkronjÃ« e VogÃ«l Ksi" 
+    1136 "Cyrillic ShkronjÃ« e Madhe Psi" 
+    1137 "Cyrillic ShkronjÃ« e VogÃ«l Psi" 
+    1138 "Cyrillic ShkronjÃ« e Madhe Fita" 
+    1139 "Cyrillic ShkronjÃ« e VogÃ«l Fita" 
+    1140 "Cyrillic ShkronjÃ« e Madhe Izhitsa" 
+    1141 "Cyrillic ShkronjÃ« e VogÃ«l Izhitsa" 
+    1142 "Cyrillic ShkronjÃ« e Madhe Izhitsa Me Dyshe RÃ«ndÃ« Theks" 
+    1143 "Cyrillic ShkronjÃ« e VogÃ«l Izhitsa Me Dyshe RÃ«ndÃ« Theks" 
+    1144 "Cyrillic ShkronjÃ« e Madhe Uk" 
+    1145 "Cyrillic ShkronjÃ« e VogÃ«l Uk" 
+    1146 "Cyrillic ShkronjÃ« e Madhe Rreth Omega" 
+    1147 "Cyrillic ShkronjÃ« e VogÃ«l Rreth Omega" 
+    1148 "Cyrillic ShkronjÃ« e Madhe Omega Me Titlo" 
+    1149 "Cyrillic ShkronjÃ« e VogÃ«l Omega Me Titlo" 
+    1150 "Cyrillic ShkronjÃ« e Madhe Ot" 
+    1151 "Cyrillic ShkronjÃ« e VogÃ«l Ot" 
+    1152 "Cyrillic ShkronjÃ« e Madhe Koppa" 
+    1153 "Cyrillic ShkronjÃ« e VogÃ«l Koppa" 
+    1154 "Cyrillic MijÃ«ra ShenjÃ«" 
+    1155 "Kombinuar Cyrillic Titlo" 
+    1156 "Kombinuar Cyrillic Palatalization" 
+    1157 "Kombinuar Cyrillic Dasia Pneumata" 
+    1158 "Kombinuar Cyrillic Psili Pneumata" 
+    1159 "Kombinuar Cyrillic Pokrytie" 
+    1160 "Kombinuar Cyrillic NjÃ«qind MijÃ«s ShenjÃ«" 
+    1161 "Kombinuar Cyrillic Miliona ShenjÃ«" 
+    1162 "Cyrillic ShkronjÃ« e Madhe ShkurtÃ«r I Me Bisht" 
+    1163 "Cyrillic ShkronjÃ« e VogÃ«l ShkurtÃ«r I Me Bisht" 
+    1164 "Cyrillic ShkronjÃ« e Madhe ShenjÃ« GjysÃ«m-ButÃ«" 
+    1165 "Cyrillic ShkronjÃ« e VogÃ«l  ShenjÃ« GjysÃ«m-ButÃ«" 
+    1166 "Cyrillic ShkronjÃ« e Madhe Er Me ShenjÃ«" 
+    1167 "Cyrillic ShkronjÃ« e VogÃ«l Er Me ShenjÃ«" 
+    1168 "Cyrillic ShkronjÃ« e Madhe Ghe Me Upturn" 
+    1169 "Cyrillic ShkronjÃ« e VogÃ«l Ghe Me Upturn" 
+    1170 "Cyrillic ShkronjÃ« e Madhe Ghe Me Goditje" 
+    1171 "Cyrillic ShkronjÃ« e VogÃ«l Ghe Me Goditje" 
+    1172 "Cyrillic ShkronjÃ« e Madhe Ghe Me Mesit Kapje" 
+    1173 "Cyrillic ShkronjÃ« e VogÃ«l Ghe Me Mesit Kapje" 
+    1174 "Cyrillic ShkronjÃ« e Madhe Zhe Me Descender" 
+    1175 "Cyrillic ShkronjÃ« e VogÃ«l Zhe Me Descender" 
+    1176 "Cyrillic ShkronjÃ« e Madhe Ze Me Descender" 
+    1177 "Cyrillic ShkronjÃ« e VogÃ«l Ze Me Descender" 
+    1178 "Cyrillic ShkronjÃ« e Madhe Ka Me Descender" 
+    1179 "Cyrillic ShkronjÃ« e VogÃ«l Ka Me Descender" 
+    1180 "Cyrillic ShkronjÃ« e Madhe Ka Me Vertikale Goditje" 
+    1181 "Cyrillic ShkronjÃ« e VogÃ«l Ka Me Vertikale Goditje" 
+    1182 "Cyrillic ShkronjÃ« e Madhe Ka Me Goditje" 
+    1183 "Cyrillic ShkronjÃ« e VogÃ«l Ka Me Goditje" 
+    1184 "Cyrillic ShkronjÃ« e Madhe Bashkir Ka" 
+    1185 "Cyrillic ShkronjÃ« e VogÃ«l Bashkir Ka" 
+    1186 "Cyrillic ShkronjÃ« e Madhe En Me Descender" 
+    1187 "Cyrillic ShkronjÃ« e VogÃ«l En Me Descender" 
+    1188 "Cyrillic e Madhe Lidhje En Ghe" 
+    1189 "Cyrillic e VogÃ«l Lidhje En Ghe" 
+    1190 "Cyrillic ShkronjÃ« e Madhe Pe Me Mesit Kapje" 
+    1191 "Cyrillic ShkronjÃ« e VogÃ«l Pe Me Mesit Kapje" 
+    1192 "Cyrillic ShkronjÃ« e Madhe Abkhasian Ha" 
+    1193 "Cyrillic ShkronjÃ« e VogÃ«l Abkhasian Ha" 
+    1194 "Cyrillic ShkronjÃ« e Madhe Es Me Descender" 
+    1195 "Cyrillic ShkronjÃ« e VogÃ«l Es Me Descender" 
+    1196 "Cyrillic ShkronjÃ« e Madhe Te Me Descender" 
+    1197 "Cyrillic ShkronjÃ« e VogÃ«l Te Me Descender" 
+    1198 "Cyrillic ShkronjÃ« e Madhe Drejt U" 
+    1199 "Cyrillic ShkronjÃ« e VogÃ«l Drejt U" 
+    1200 "Cyrillic ShkronjÃ« e Madhe Drejt U Me Goditje" 
+    1201 "Cyrillic ShkronjÃ« e VogÃ«l Drejt U Me Goditje" 
+    1202 "Cyrillic ShkronjÃ« e Madhe Ha Me Descender" 
+    1203 "Cyrillic ShkronjÃ« e VogÃ«l Ha Me Descender" 
+    1204 "Cyrillic e Madhe Lidhje Te Tse" 
+    1205 "Cyrillic e VogÃ«l Lidhje Te Tse" 
+    1206 "Cyrillic ShkronjÃ« e Madhe Che Me Descender" 
+    1207 "Cyrillic ShkronjÃ« e VogÃ«l Che Me Descender" 
+    1208 "Cyrillic ShkronjÃ« e Madhe Che Me Vertikale Goditje" 
+    1209 "Cyrillic ShkronjÃ« e VogÃ«l Che Me Vertikale Goditje" 
+    1210 "Cyrillic ShkronjÃ« e Madhe Shha" 
+    1211 "Cyrillic ShkronjÃ« e VogÃ«l Shha" 
+    1212 "Cyrillic ShkronjÃ« e Madhe Abkhasian Che" 
+    1213 "Cyrillic ShkronjÃ« e VogÃ«l Abkhasian Che" 
+    1214 "Cyrillic ShkronjÃ« e Madhe Abkhasian Che Me Descender" 
+    1215 "Cyrillic ShkronjÃ« e VogÃ«l Abkhasian Che Me Descender" 
+    1216 "Cyrillic ShkronjÃ« Palochka" 
+    1217 "Cyrillic ShkronjÃ« e Madhe Zhe Me Breve" 
+    1218 "Cyrillic ShkronjÃ« e VogÃ«l Zhe Me Breve" 
+    1219 "Cyrillic ShkronjÃ« e Madhe Ka Me Kapje" 
+    1220 "Cyrillic ShkronjÃ« e VogÃ«l Ka Me Kapje" 
+    1221 "Cyrillic ShkronjÃ« e Madhe El Me Bisht" 
+    1222 "Cyrillic ShkronjÃ« e VogÃ«l El Me Bisht" 
+    1223 "Cyrillic ShkronjÃ« e Madhe En Me Kapje" 
+    1224 "Cyrillic ShkronjÃ« e VogÃ«l En Me Kapje" 
+    1225 "Cyrillic ShkronjÃ« e Madhe En Me Bisht" 
+    1226 "Cyrillic ShkronjÃ« e VogÃ«l En Me Bisht" 
+    1227 "Cyrillic ShkronjÃ« e Madhe Khakassian Che" 
+    1228 "Cyrillic ShkronjÃ« e VogÃ«l Khakassian Che" 
+    1229 "Cyrillic ShkronjÃ« e Madhe Em Me Bisht" 
+    1230 "Cyrillic ShkronjÃ« e VogÃ«l Em Me Bisht" 
+    1231 "Cyrillic ShkronjÃ« e VogÃ«l Palochka" 
+    1232 "Cyrillic ShkronjÃ« e Madhe A Me Breve" 
+    1233 "Cyrillic ShkronjÃ« e VogÃ«l A Me Breve" 
+    1234 "Cyrillic ShkronjÃ« e Madhe A Me Diaeresis" 
+    1235 "Cyrillic ShkronjÃ« e VogÃ«l A Me Diaeresis" 
+    1236 "Cyrillic e Madhe Lidhje A Ie" 
+    1237 "Cyrillic e VogÃ«l Lidhje A Ie" 
+    1238 "Cyrillic ShkronjÃ« e Madhe Ie Me Breve" 
+    1239 "Cyrillic ShkronjÃ« e VogÃ«l Ie Me Breve" 
+    1240 "Cyrillic ShkronjÃ« e Madhe Schwa" 
+    1241 "Cyrillic ShkronjÃ« e VogÃ«l Schwa" 
+    1242 "Cyrillic ShkronjÃ« e Madhe Schwa Me Diaeresis" 
+    1243 "Cyrillic ShkronjÃ« e VogÃ«l Schwa Me Diaeresis" 
+    1244 "Cyrillic ShkronjÃ« e Madhe Zhe Me Diaeresis" 
+    1245 "Cyrillic ShkronjÃ« e VogÃ«l Zhe Me Diaeresis" 
+    1246 "Cyrillic ShkronjÃ« e Madhe Ze Me Diaeresis" 
+    1247 "Cyrillic ShkronjÃ« e VogÃ«l Ze Me Diaeresis" 
+    1248 "Cyrillic ShkronjÃ« e Madhe Abkhasian Dze" 
+    1249 "Cyrillic ShkronjÃ« e VogÃ«l Abkhasian Dze" 
+    1250 "Cyrillic ShkronjÃ« e Madhe I Me Macron" 
+    1251 "Cyrillic ShkronjÃ« e VogÃ«l I Me Macron" 
+    1252 "Cyrillic ShkronjÃ« e Madhe I Me Diaeresis" 
+    1253 "Cyrillic ShkronjÃ« e VogÃ«l I Me Diaeresis" 
+    1254 "Cyrillic ShkronjÃ« e Madhe O Me Diaeresis" 
+    1255 "Cyrillic ShkronjÃ« e VogÃ«l O Me Diaeresis" 
+    1256 "Cyrillic ShkronjÃ« e Madhe Mbrojtur O" 
+    1257 "Cyrillic ShkronjÃ« e VogÃ«l Mbrojtur O" 
+    1258 "Cyrillic ShkronjÃ« e Madhe Mbrojtur O Me Diaeresis" 
+    1259 "Cyrillic ShkronjÃ« e VogÃ«l Mbrojtur O Me Diaeresis" 
+    1260 "Cyrillic ShkronjÃ« e Madhe E Me Diaeresis" 
+    1261 "Cyrillic ShkronjÃ« e VogÃ«l E Me Diaeresis" 
+    1262 "Cyrillic ShkronjÃ« e Madhe U Me Macron" 
+    1263 "Cyrillic ShkronjÃ« e VogÃ«l U Me Macron" 
+    1264 "Cyrillic ShkronjÃ« e Madhe U Me Diaeresis" 
+    1265 "Cyrillic ShkronjÃ« e VogÃ«l U Me Diaeresis" 
+    1266 "Cyrillic ShkronjÃ« e Madhe U Me Dyshe MprehtÃ«" 
+    1267 "Cyrillic ShkronjÃ« e VogÃ«l U Me Dyshe MprehtÃ«" 
+    1268 "Cyrillic ShkronjÃ« e Madhe Che Me Diaeresis" 
+    1269 "Cyrillic ShkronjÃ« e VogÃ«l Che Me Diaeresis" 
+    1270 "Cyrillic ShkronjÃ« e Madhe Ghe Me Descender" 
+    1271 "Cyrillic ShkronjÃ« e VogÃ«l Ghe Me Descender" 
+    1272 "Cyrillic ShkronjÃ« e Madhe Yeru Me Diaeresis" 
+    1273 "Cyrillic ShkronjÃ« e VogÃ«l Yeru Me Diaeresis" 
+    1274 "Cyrillic ShkronjÃ« e Madhe Ghe Me Goditje dhe Kapje" 
+    1275 "Cyrillic ShkronjÃ« e VogÃ«l Ghe Me Goditje dhe Kapje" 
+    1276 "Cyrillic ShkronjÃ« e Madhe Ha Me Kapje" 
+    1277 "Cyrillic ShkronjÃ« e VogÃ«l Ha Me Kapje" 
+    1278 "Cyrillic ShkronjÃ« e Madhe Ha Me Goditje" 
+    1279 "Cyrillic ShkronjÃ« e VogÃ«l Ha Me Goditje" 
+    1280 "Cyrillic ShkronjÃ« e Madhe Komi De" 
+    1281 "Cyrillic ShkronjÃ« e VogÃ«l Komi De" 
+    1282 "Cyrillic ShkronjÃ« e Madhe Komi Dje" 
+    1283 "Cyrillic ShkronjÃ« e VogÃ«l Komi Dje" 
+    1284 "Cyrillic ShkronjÃ« e Madhe Komi Zje" 
+    1285 "Cyrillic ShkronjÃ« e VogÃ«l Komi Zje" 
+    1286 "Cyrillic ShkronjÃ« e Madhe Komi Dzje" 
+    1287 "Cyrillic ShkronjÃ« e VogÃ«l Komi Dzje" 
+    1288 "Cyrillic ShkronjÃ« e Madhe Komi Lje" 
+    1289 "Cyrillic ShkronjÃ« e VogÃ«l Komi Lje" 
+    1290 "Cyrillic ShkronjÃ« e Madhe Komi Nje" 
+    1291 "Cyrillic ShkronjÃ« e VogÃ«l Komi Nje" 
+    1292 "Cyrillic ShkronjÃ« e Madhe Komi Sje" 
+    1293 "Cyrillic ShkronjÃ« e VogÃ«l Komi Sje" 
+    1294 "Cyrillic ShkronjÃ« e Madhe Komi Tje" 
+    1295 "Cyrillic ShkronjÃ« e VogÃ«l Komi Tje" 
+    1296 "Cyrillic ShkronjÃ« e Madhe KundÃ«rt Ze" 
+    1297 "Cyrillic ShkronjÃ« e VogÃ«l KundÃ«rt Ze" 
+    1298 "Cyrillic ShkronjÃ« e Madhe El Me Kapje" 
+    1299 "Cyrillic ShkronjÃ« e VogÃ«l El Me Kapje" 
+    1300 "Cyrillic ShkronjÃ« e Madhe Lha" 
+    1301 "Cyrillic ShkronjÃ« e VogÃ«l Lha" 
+    1302 "Cyrillic ShkronjÃ« e Madhe Rha" 
+    1303 "Cyrillic ShkronjÃ« e VogÃ«l Rha" 
+    1304 "Cyrillic ShkronjÃ« e Madhe Yae" 
+    1305 "Cyrillic ShkronjÃ« e VogÃ«l Yae" 
+    1306 "Cyrillic ShkronjÃ« e Madhe Qa" 
+    1307 "Cyrillic ShkronjÃ« e VogÃ«l Qa" 
+    1308 "Cyrillic ShkronjÃ« e Madhe We" 
+    1309 "Cyrillic ShkronjÃ« e VogÃ«l We" 
+    1310 "Cyrillic ShkronjÃ« e Madhe Aleut Ka" 
+    1311 "Cyrillic ShkronjÃ« e VogÃ«l Aleut Ka" 
+    1312 "Cyrillic ShkronjÃ« e Madhe El Me Mesit Kapje" 
+    1313 "Cyrillic ShkronjÃ« e VogÃ«l El Me Mesit Kapje" 
+    1314 "Cyrillic ShkronjÃ« e Madhe En Me Mesit Kapje" 
+    1315 "Cyrillic ShkronjÃ« e VogÃ«l En Me Mesit Kapje" 
+    1316 "Cyrillic ShkronjÃ« e Madhe Pe Me Descender" 
+    1317 "Cyrillic ShkronjÃ« e VogÃ«l Pe Me Descender" 
+    1318 "Cyrillic ShkronjÃ« e Madhe Shha Me Descender" 
+    1319 "Cyrillic ShkronjÃ« e VogÃ«l Shha Me Descender" 
+    1329 "ShkronjÃ« e Madhe Armene Ayb" 
+    1330 "ShkronjÃ« e Madhe Armene Ben" 
+    1331 "ShkronjÃ« e Madhe Armene Gim" 
+    1332 "ShkronjÃ« e Madhe Armene Da" 
+    1333 "ShkronjÃ« e Madhe Armene Ech" 
+    1334 "ShkronjÃ« e Madhe Armene Za" 
+    1335 "ShkronjÃ« e Madhe Armene Eh" 
+    1336 "ShkronjÃ« e Madhe Armene Et" 
+    1337 "ShkronjÃ« e Madhe Armene To" 
+    1338 "ShkronjÃ« e Madhe Armene Zhe" 
+    1339 "ShkronjÃ« e Madhe Armene Ini" 
+    1340 "ShkronjÃ« e Madhe Armene Liwn" 
+    1341 "ShkronjÃ« e Madhe Armene Xeh" 
+    1342 "ShkronjÃ« e Madhe Armene Ca" 
+    1343 "ShkronjÃ« e Madhe Armene Ken" 
+    1344 "ShkronjÃ« e Madhe Armene Ho" 
+    1345 "ShkronjÃ« e Madhe Armene Ja" 
+    1346 "ShkronjÃ« e Madhe Armene Ghad" 
+    1347 "ShkronjÃ« e Madhe Armene Cheh" 
+    1348 "ShkronjÃ« e Madhe Armene Men" 
+    1349 "ShkronjÃ« e Madhe Armene Yi" 
+    1350 "ShkronjÃ« e Madhe Armene Now" 
+    1351 "ShkronjÃ« e Madhe Armene Sha" 
+    1352 "ShkronjÃ« e Madhe Armene Vo" 
+    1353 "ShkronjÃ« e Madhe Armene Cha" 
+    1354 "ShkronjÃ« e Madhe Armene Peh" 
+    1355 "ShkronjÃ« e Madhe Armene Jheh" 
+    1356 "ShkronjÃ« e Madhe Armene Ra" 
+    1357 "ShkronjÃ« e Madhe Armene Seh" 
+    1358 "ShkronjÃ« e Madhe Armene Vew" 
+    1359 "ShkronjÃ« e Madhe Armene Tiwn" 
+    1360 "ShkronjÃ« e Madhe Armene Reh" 
+    1361 "ShkronjÃ« e Madhe Armene Co" 
+    1362 "ShkronjÃ« e Madhe Armene Yiwn" 
+    1363 "ShkronjÃ« e Madhe Armene Piwr" 
+    1364 "ShkronjÃ« e Madhe Armene Keh" 
+    1365 "ShkronjÃ« e Madhe Armene Oh" 
+    1366 "ShkronjÃ« e Madhe Armene Feh" 
+    1369 "Modifiko LetÃ«r Armene Majtas GjysmÃ« Rrethi" 
+    1370 "Apostrof Armen" 
+    1371 "Armene Theksim ShenjÃ«" 
+    1372 "Armene Thirrje ShenjÃ«" 
+    1373 "Armene Presje" 
+    1374 "Armene Pyetje ShenjÃ«" 
+    1375 "Armene Shkurtim ShenjÃ«" 
+    1377 "ShkronjÃ« e VogÃ«l Armene Ayb" 
+    1378 "ShkronjÃ« e VogÃ«l Armene Ben" 
+    1379 "ShkronjÃ« e VogÃ«l Armene Gim" 
+    1380 "ShkronjÃ« e VogÃ«l Armene Da" 
+    1381 "ShkronjÃ« e VogÃ«l Armene Ech" 
+    1382 "ShkronjÃ« e VogÃ«l Armene Za" 
+    1383 "ShkronjÃ« e VogÃ«l Armene Eh" 
+    1384 "ShkronjÃ« e VogÃ«l Armene Et" 
+    1385 "ShkronjÃ« e VogÃ«l Armene To" 
+    1386 "ShkronjÃ« e VogÃ«l Armene Zhe" 
+    1387 "ShkronjÃ« e VogÃ«l Armene Ini" 
+    1388 "ShkronjÃ« e VogÃ«l Armene Liwn" 
+    1389 "ShkronjÃ« e VogÃ«l Armene Xeh" 
+    1390 "ShkronjÃ« e VogÃ«l Armene Ca" 
+    1391 "ShkronjÃ« e VogÃ«l Armene Ken" 
+    1392 "ShkronjÃ« e VogÃ«l Armene Ho" 
+    1393 "ShkronjÃ« e VogÃ«l Armene Ja" 
+    1394 "ShkronjÃ« e VogÃ«l Armene Ghad" 
+    1395 "ShkronjÃ« e VogÃ«l Armene Cheh" 
+    1396 "ShkronjÃ« e VogÃ«l Armene Men" 
+    1397 "ShkronjÃ« e VogÃ«l Armene Yi" 
+    1398 "ShkronjÃ« e VogÃ«l Armene Now" 
+    1399 "ShkronjÃ« e VogÃ«l Armene Sha" 
+    1400 "ShkronjÃ« e VogÃ«l Armene Vo" 
+    1401 "ShkronjÃ« e VogÃ«l Armene Cha" 
+    1402 "ShkronjÃ« e VogÃ«l Armene Peh" 
+    1403 "ShkronjÃ« e VogÃ«l Armene Jheh" 
+    1404 "ShkronjÃ« e VogÃ«l Armene Ra" 
+    1405 "ShkronjÃ« e VogÃ«l Armene Seh" 
+    1406 "ShkronjÃ« e VogÃ«l Armene Vew" 
+    1407 "ShkronjÃ« e VogÃ«l Armene Tiwn" 
+    1408 "ShkronjÃ« e VogÃ«l Armene Reh" 
+    1409 "ShkronjÃ« e VogÃ«l Armene Co" 
+    1410 "ShkronjÃ« e VogÃ«l Armene Yiwn" 
+    1411 "ShkronjÃ« e VogÃ«l Armene Piwr" 
+    1412 "ShkronjÃ« e VogÃ«l Armene Keh" 
+    1413 "ShkronjÃ« e VogÃ«l Armene Oh" 
+    1414 "ShkronjÃ« e VogÃ«l Armene Feh" 
+    1415 "Armene e VogÃ«l Lidhje Ech Yiwn" 
+    1417 "Armene PikÃ«" 
+    1418 "Armene Hyphen" 
+    1423 "Armene Dram ShenjÃ«" 
+    1425 "Theks Hebre Etnahta" 
+    1426 "Theks Hebre Segol" 
+    1427 "Theks Hebre Shalshelet" 
+    1428 "Theks Hebre Zaqef Qatan" 
+    1429 "Theks Hebre Zaqef Gadol" 
+    1430 "Theks Hebre Tipeha" 
+    1431 "Theks Hebre Revia" 
+    1432 "Theks Hebre Zarqa" 
+    1433 "Theks Hebre Pashta" 
+    1434 "Theks Hebre Yetiv" 
+    1435 "Theks Hebre Tevir" 
+    1436 "Theks Hebre Geresh" 
+    1437 "Theks Hebre Geresh Muqdam" 
+    1438 "Theks Hebre Gershayim" 
+    1439 "Theks Hebre Qarney Para" 
+    1440 "Theks Hebre Telisha Gedola" 
+    1441 "Theks Hebre Pazer" 
+    1442 "Theks Hebre Atnah Hafukh" 
+    1443 "Theks Hebre Munah" 
+    1444 "Theks Hebre Mahapakh" 
+    1445 "Theks Hebre Merkha" 
+    1446 "Theks Hebre Merkha Kefula" 
+    1447 "Theks Hebre Darga" 
+    1448 "Theks Hebre Qadma" 
+    1449 "Theks Hebre Telisha Qetana" 
+    1450 "Theks Hebre Yerah Ben Yomo" 
+    1451 "Theks Hebre Ole" 
+    1452 "Theks Hebre Iluy" 
+    1453 "Theks Hebre Dehi" 
+    1454 "Theks Hebre Zinor" 
+    1455 "Hebre ShenjÃ« Masora Rreth" 
+    1456 "Hebre PikÃ« Sheva" 
+    1457 "Hebre PikÃ« Hataf Segol" 
+    1458 "Hebre PikÃ« Hataf Patah" 
+    1459 "Hebre PikÃ« Hataf Qamats" 
+    1460 "Hebre PikÃ« Hiriq" 
+    1461 "Hebre PikÃ« Tsere" 
+    1462 "Hebre PikÃ« Segol" 
+    1463 "Hebre PikÃ« Patah" 
+    1464 "Hebre PikÃ« Qamats" 
+    1465 "Hebre PikÃ« Holam" 
+    1466 "Hebre PikÃ« Holam Haser PÃ«r Vav" 
+    1467 "Hebre PikÃ« Qubuts" 
+    1468 "Hebre PikÃ« Dagesh ose Mapiq" 
+    1469 "Hebre PikÃ« Meteg" 
+    1470 "Hebre PikÃ«sim Maqaf" 
+    1471 "Hebre PikÃ« Rafe" 
+    1472 "Hebre PikÃ«sim Paseq" 
+    1473 "Hebre PikÃ« Shin PikÃ«" 
+    1474 "Hebre PikÃ« Sin PikÃ«" 
+    1475 "Hebre PikÃ«sim Sof Pasuq" 
+    1476 "Hebre ShenjÃ« SipÃ«rm PikÃ«" 
+    1477 "Hebre ShenjÃ« MÃ« i'ulÃ«t PikÃ«" 
+    1478 "Hebre PikÃ«sim Nun Hafukha" 
+    1479 "Hebre PikÃ« Qamats Qatan" 
+    1488 "Hebre LetÃ«r Alef" 
+    1489 "Hebre LetÃ«r Bet" 
+    1490 "Hebre LetÃ«r Gimel" 
+    1491 "Hebre LetÃ«r Dalet" 
+    1492 "Hebre LetÃ«r He" 
+    1493 "Hebre LetÃ«r Vav" 
+    1494 "Hebre LetÃ«r Zayin" 
+    1495 "Hebre LetÃ«r Het" 
+    1496 "Hebre LetÃ«r Tet" 
+    1497 "Hebre LetÃ«r Yod" 
+    1498 "Hebre LetÃ«r PÃ«rfundimtare Kaf" 
+    1499 "Hebre LetÃ«r Kaf" 
+    1500 "Hebre LetÃ«r Lamed" 
+    1501 "Hebre LetÃ«r PÃ«rfundimtare Mem" 
+    1502 "Hebre LetÃ«r Mem" 
+    1503 "Hebre LetÃ«r PÃ«rfundimtare Nun" 
+    1504 "Hebre LetÃ«r Nun" 
+    1505 "Hebre LetÃ«r Samekh" 
+    1506 "Hebre LetÃ«r Ayin" 
+    1507 "Hebre LetÃ«r PÃ«rfundimtare Pe" 
+    1508 "Hebre LetÃ«r Pe" 
+    1509 "Hebre LetÃ«r PÃ«rfundimtare Tsadi" 
+    1510 "Hebre LetÃ«r Tsadi" 
+    1511 "Hebre LetÃ«r Qof" 
+    1512 "Hebre LetÃ«r Resh" 
+    1513 "Hebre LetÃ«r Shin" 
+    1514 "Hebre LetÃ«r Tav" 
+    1520 "Hebre Lidhje Yiddish Dyshe Vav" 
+    1521 "Hebre Lidhje Yiddish Vav Yod" 
+    1522 "Hebre Lidhje Yiddish Dyshe Yod" 
+    1523 "Hebre PikÃ«sim Geresh" 
+    1524 "Hebre PikÃ«sim Gershayim" 
+    1536 "Arabe NumÃ«r ShenjÃ«" 
+    1537 "Arabe ShenjÃ« Sanah" 
+    1538 "Arabe NÃ«n-ShÃ«nim ShÃ«nues" 
+    1539 "Arabe ShenjÃ« Safha" 
+    1540 "Arabe ShenjÃ« Samvat" 
+    1542 "Arabe-Indic Cube Root" 
+    1543 "Arabe-Indic KatÃ«rt Root" 
+    1544 "Arabe Ray" 
+    1545 "Arabe-Indic PÃ«r Mille ShenjÃ«" 
+    1546 "Arabe-Indic PÃ«r DhjetÃ« MijÃ« ShenjÃ«" 
+    1547 "Afgane ShenjÃ«" 
+    1548 "Arabe Presje" 
+    1549 "Arabe Date NdarÃ«s" 
+    1550 "Arabe Vargu poetik ShenjÃ«" 
+    1551 "Arabe ShenjÃ« Misra" 
+    1552 "Arabe ShenjÃ« Sallallahou Alayhe Wassallam" 
+    1553 "Arabe ShenjÃ« Alayhe Assallam" 
+    1554 "Arabe ShenjÃ« Rahmatullah Alayhe" 
+    1555 "Arabe ShenjÃ« Radi Allahou Anhu" 
+    1556 "Arabe ShenjÃ« Takhallus" 
+    1557 "Arabe e VogÃ«l Lart Tah" 
+    1558 "Arabe e VogÃ«l Lart Lidhje Alef Me Lam Me Yeh" 
+    1559 "Arabe e VogÃ«l Lart Zain" 
+    1560 "Arabe e VogÃ«l Fatha" 
+    1561 "Arabe e VogÃ«l Damma" 
+    1562 "Arabe e VogÃ«l Kasra" 
+    1563 "Arabe PikÃ«presje" 
+    1566 "Arabe Trefish PikÃ« PikÃ«sim ShenjÃ«" 
+    1567 "Arabe Pyetje ShenjÃ«" 
+    1568 "Arabe ShkronjÃ« Kashmiri Yeh" 
+    1569 "Arabe ShkronjÃ« Hamza" 
+    1570 "Arabe ShkronjÃ« Alef Me Madda Lart" 
+    1571 "Arabe ShkronjÃ« Alef Me Hamza Lart" 
+    1572 "Arabe ShkronjÃ« Waw Me Hamza Lart" 
+    1573 "Arabe ShkronjÃ« Alef Me Hamza PoshtÃ«" 
+    1574 "Arabe ShkronjÃ« Yeh Me Hamza Lart" 
+    1575 "Arabe ShkronjÃ« Alef" 
+    1576 "Arabe ShkronjÃ« Beh" 
+    1577 "Arabe ShkronjÃ« Teh Marbuta" 
+    1578 "Arabe ShkronjÃ« Teh" 
+    1579 "Arabe ShkronjÃ« Theh" 
+    1580 "Arabe ShkronjÃ« Jeem" 
+    1581 "Arabe ShkronjÃ« Hah" 
+    1582 "Arabe ShkronjÃ« Khah" 
+    1583 "Arabe ShkronjÃ« Dal" 
+    1584 "Arabe ShkronjÃ« Thal" 
+    1585 "Arabe ShkronjÃ« Reh" 
+    1586 "Arabe ShkronjÃ« Zain" 
+    1587 "Arabe ShkronjÃ« ParÃ«" 
+    1588 "Arabe ShkronjÃ« Sheen" 
+    1589 "Arabe ShkronjÃ« Sad" 
+    1590 "Arabe ShkronjÃ« Dad" 
+    1591 "Arabe ShkronjÃ« Tah" 
+    1592 "Arabe ShkronjÃ« Zah" 
+    1593 "Arabe ShkronjÃ« Ain" 
+    1594 "Arabe ShkronjÃ« Ghain" 
+    1595 "Arabe ShkronjÃ« Keheh Me Dy PikÃ« Lart" 
+    1596 "Arabe ShkronjÃ« Keheh Me Tre PikÃ« PoshtÃ«" 
+    1597 "Arabe ShkronjÃ« Farsi Yeh Me Kthyer V" 
+    1598 "Arabe ShkronjÃ« Farsi Yeh Me Dy PikÃ« Lart" 
+    1599 "Arabe ShkronjÃ« Farsi Yeh Me Tre PikÃ« Lart" 
+    1600 "Arabe Tatweel" 
+    1601 "Arabe ShkronjÃ« Feh" 
+    1602 "Arabe ShkronjÃ« Qaf" 
+    1603 "Arabe ShkronjÃ« Kaf" 
+    1604 "Arabe ShkronjÃ« Lam" 
+    1605 "Arabe ShkronjÃ« Meem" 
+    1606 "Arabe ShkronjÃ« Noon" 
+    1607 "Arabe ShkronjÃ« Heh" 
+    1608 "Arabe ShkronjÃ« Waw" 
+    1609 "Arabe ShkronjÃ« Alef Maksura" 
+    1610 "Arabe ShkronjÃ« Yeh" 
+    1611 "Arabe Fathatan" 
+    1612 "Arabe Dammatan" 
+    1613 "Arabe Kasratan" 
+    1614 "Arabe Fatha" 
+    1615 "Arabe Damma" 
+    1616 "Arabe Kasra" 
+    1617 "Arabe Shadda" 
+    1618 "Arabe Sukun" 
+    1619 "Arabe Maddah Lart" 
+    1620 "Arabe Hamza Lart" 
+    1621 "Arabe Hamza PoshtÃ«" 
+    1622 "Arabe NÃ«nshkrim Alef" 
+    1623 "Arabe Kthyer Damma" 
+    1624 "Arabe ShenjÃ« Noon Ghunna" 
+    1625 "Arabe Zwarakay" 
+    1626 "Arabe Zanore ShenjÃ« e VogÃ«l V Lart" 
+    1627 "Arabe Zanore ShenjÃ« Kthyer e VogÃ«l V Lart" 
+    1628 "Arabe Zanore ShenjÃ« PikÃ« PoshtÃ«" 
+    1629 "Arabe KundÃ«rt Damma" 
+    1630 "Arabe Fatha Me Dy PikÃ«" 
+    1631 "Arabe Wavy Hamza PoshtÃ«" 
+    1632 "Arabe-Indic ShifÃ«r Zero" 
+    1633 "Arabe-Indic ShifÃ«r NjÃ«" 
+    1634 "Arabe-Indic ShifÃ«r Dy" 
+    1635 "Arabe-Indic ShifÃ«r Tre" 
+    1636 "Arabe-Indic ShifÃ«r KatÃ«r" 
+    1637 "Arabe-Indic ShifÃ«r PesÃ«" 
+    1638 "Arabe-Indic ShifÃ«r GjashtÃ«" 
+    1639 "Arabe-Indic ShifÃ«r ShtatÃ«" 
+    1640 "Arabe-Indic ShifÃ«r TetÃ«" 
+    1641 "Arabe-Indic ShifÃ«r NÃ«ntÃ«" 
+    1642 "Arabe pÃ«rqindje ShenjÃ«" 
+    1643 "Arabe Decimal NdarÃ«s" 
+    1644 "Arabe MijÃ«ra NdarÃ«s" 
+    1645 "Arabe Yll Spikatur PesÃ«" 
+    1646 "Arabe ShkronjÃ« Pa-Pika Beh" 
+    1647 "Arabe ShkronjÃ« Pa-Pika Qaf" 
+    1648 "Arabe ShkronjÃ« Indeks i SipÃ«rm Alef" 
+    1649 "Arabe ShkronjÃ« Alef Wasla" 
+    1650 "Arabe ShkronjÃ« Alef Me Wavy Hamza Lart" 
+    1651 "Arabe ShkronjÃ« Alef Me Wavy Hamza PoshtÃ«" 
+    1652 "Arabe ShkronjÃ« Lart Hamza" 
+    1653 "Arabe ShkronjÃ« Lart Hamza Alef" 
+    1654 "Arabe ShkronjÃ« Lart Hamza Waw" 
+    1655 "Arabe ShkronjÃ« U Me Hamza Lart" 
+    1656 "Arabe ShkronjÃ« Lart Hamza Yeh" 
+    1657 "Arabe ShkronjÃ« Tteh" 
+    1658 "Arabe ShkronjÃ« Tteheh" 
+    1659 "Arabe ShkronjÃ« Beeh" 
+    1660 "Arabe ShkronjÃ« Teh Me Rreth" 
+    1661 "Arabe ShkronjÃ« Teh Me Tre PikÃ« Lart TeposhtÃ«" 
+    1662 "Arabe ShkronjÃ« Peh" 
+    1663 "Arabe ShkronjÃ« Teheh" 
+    1664 "Arabe ShkronjÃ« Beheh" 
+    1665 "Arabe ShkronjÃ« Hah Me Hamza Lart" 
+    1666 "Arabe ShkronjÃ« Hah Me Dy PikÃ« Vertikale Lart" 
+    1667 "Arabe ShkronjÃ« Nyeh" 
+    1668 "Arabe ShkronjÃ« Dyeh" 
+    1669 "Arabe ShkronjÃ« Hah Me Tre PikÃ« Lart" 
+    1670 "Arabe ShkronjÃ« Tcheh" 
+    1671 "Arabe ShkronjÃ« Tcheheh" 
+    1672 "Arabe ShkronjÃ« Ddal" 
+    1673 "Arabe ShkronjÃ« Dal Me Rreth" 
+    1674 "Arabe ShkronjÃ« Dal Me PikÃ« PoshtÃ«" 
+    1675 "Arabe ShkronjÃ« Dal Me PikÃ« PoshtÃ« dhe e VogÃ«l Tah" 
+    1676 "Arabe ShkronjÃ« Dahal" 
+    1677 "Arabe ShkronjÃ« Ddahal" 
+    1678 "Arabe ShkronjÃ« Dul" 
+    1679 "Arabe ShkronjÃ« Dal Me Tre PikÃ« Lart TeposhtÃ«" 
+    1680 "Arabe ShkronjÃ« Dal Me KatÃ«r PikÃ« Lart" 
+    1681 "Arabe ShkronjÃ« Rreh" 
+    1682 "Arabe ShkronjÃ« Reh Me e VogÃ«l V" 
+    1683 "Arabe ShkronjÃ« Reh Me Rreth" 
+    1684 "Arabe ShkronjÃ« Reh Me PikÃ« PoshtÃ«" 
+    1685 "Arabe ShkronjÃ« Reh Me e VogÃ«l V PoshtÃ«" 
+    1686 "Arabe ShkronjÃ« Reh Me PikÃ« PoshtÃ« dhe PikÃ« Mbi" 
+    1687 "Arabe ShkronjÃ« Reh Me Dy PikÃ« Lart" 
+    1688 "Arabe ShkronjÃ« Jeh" 
+    1689 "Arabe ShkronjÃ« Reh Me KatÃ«r PikÃ« Lart" 
+    1690 "Arabe ShkronjÃ« ParÃ« Me PikÃ« PoshtÃ« dhe PikÃ« Mbi" 
+    1691 "Arabe ShkronjÃ« ParÃ« Me Tre PikÃ« PoshtÃ«" 
+    1692 "Arabe ShkronjÃ« ParÃ« Me Tre PikÃ« PoshtÃ« dhe Tre PikÃ« Lart" 
+    1693 "Arabe ShkronjÃ« Sad Me Dy PikÃ« PoshtÃ«" 
+    1694 "Arabe ShkronjÃ« Sad Me Tre PikÃ« Lart" 
+    1695 "Arabe ShkronjÃ« Tah Me Tre PikÃ« Lart" 
+    1696 "Arabe ShkronjÃ« Ain Me Tre PikÃ« Lart" 
+    1697 "Arabe ShkronjÃ« Dotless Feh" 
+    1698 "Arabe ShkronjÃ« Feh Me PikÃ« LÃ«vizur PoshtÃ«" 
+    1699 "Arabe ShkronjÃ« Feh Me PikÃ« PoshtÃ«" 
+    1700 "Arabe ShkronjÃ« Veh" 
+    1701 "Arabe ShkronjÃ« Feh Me Tre PikÃ« PoshtÃ«" 
+    1702 "Arabe ShkronjÃ« Peheh" 
+    1703 "Arabe ShkronjÃ« Qaf Me PikÃ« Mbi" 
+    1704 "Arabe ShkronjÃ« Qaf Me Tre PikÃ« Lart" 
+    1705 "Arabe ShkronjÃ« Keheh" 
+    1706 "Arabe ShkronjÃ« Swash Kaf" 
+    1707 "Arabe ShkronjÃ« Kaf Me Rreth" 
+    1708 "Arabe ShkronjÃ« Kaf Me PikÃ« Mbi" 
+    1709 "Arabe ShkronjÃ« Ng" 
+    1710 "Arabe ShkronjÃ« Kaf Me Tre PikÃ« PoshtÃ«" 
+    1711 "Arabe ShkronjÃ« Gaf" 
+    1712 "Arabe ShkronjÃ« Gaf Me Rreth" 
+    1713 "Arabe ShkronjÃ« Ngoeh" 
+    1714 "Arabe ShkronjÃ« Gaf Me Dy PikÃ« PoshtÃ«" 
+    1715 "Arabe ShkronjÃ« Gueh" 
+    1716 "Arabe ShkronjÃ« Gaf Me Tre PikÃ« Lart" 
+    1717 "Arabe ShkronjÃ« Lam Me e VogÃ«l V" 
+    1718 "Arabe ShkronjÃ« Lam Me PikÃ« Mbi" 
+    1719 "Arabe ShkronjÃ« Lam Me Tre PikÃ« Lart" 
+    1720 "Arabe ShkronjÃ« Lam Me Tre PikÃ« PoshtÃ«" 
+    1721 "Arabe ShkronjÃ« Noon Me PikÃ« PoshtÃ«" 
+    1722 "Arabe ShkronjÃ« Noon Ghunna" 
+    1723 "Arabe ShkronjÃ« Rnoon" 
+    1724 "Arabe ShkronjÃ« Noon Me Rreth" 
+    1725 "Arabe ShkronjÃ« Noon Me Tre PikÃ« Lart" 
+    1726 "Arabe ShkronjÃ« Heh Doachashmee" 
+    1727 "Arabe ShkronjÃ« Tcheh Me PikÃ« Mbi" 
+    1728 "Arabe ShkronjÃ« Heh Me Yeh Lart" 
+    1729 "Arabe ShkronjÃ« Heh Goal" 
+    1730 "Arabe ShkronjÃ« Heh Goal Me Hamza Lart" 
+    1731 "Arabe ShkronjÃ« Teh Marbuta Goal" 
+    1732 "Arabe ShkronjÃ« Waw Me Rreth" 
+    1733 "Arabe ShkronjÃ« Kirghiz Oe" 
+    1734 "Arabe ShkronjÃ« Oe" 
+    1735 "Arabe ShkronjÃ« U" 
+    1736 "Arabe ShkronjÃ« Yu" 
+    1737 "Arabe ShkronjÃ« Kirghiz Yu" 
+    1738 "Arabe ShkronjÃ« Waw Me Dy PikÃ« Lart" 
+    1739 "Arabe ShkronjÃ« Ve" 
+    1740 "Arabe ShkronjÃ« Farsi Yeh" 
+    1741 "Arabe ShkronjÃ« Yeh Me Bisht" 
+    1742 "Arabe ShkronjÃ« Yeh Me e VogÃ«l V" 
+    1743 "Arabe ShkronjÃ« Waw Me PikÃ« Mbi" 
+    1744 "Arabe ShkronjÃ« E" 
+    1745 "Arabe ShkronjÃ« Yeh Me Tre PikÃ« PoshtÃ«" 
+    1746 "Arabe ShkronjÃ« Yeh Barree" 
+    1747 "Arabe ShkronjÃ« Yeh Barree Me Hamza Lart" 
+    1748 "Arabe PikÃ«" 
+    1749 "Arabe ShkronjÃ« Ae" 
+    1750 "Arabe e VogÃ«l Lart Lidhje Sad Me Lam Me Alef Maksura" 
+    1751 "Arabe e VogÃ«l Lart Lidhje Qaf Me Lam Me Alef Maksura" 
+    1752 "Arabe e VogÃ«l Lart Meem Fillestar FormÃ«" 
+    1753 "Arabe e VogÃ«l Lart Lam Alef" 
+    1754 "Arabe e VogÃ«l Lart Jeem" 
+    1755 "Arabe e VogÃ«l Lart Tre PikÃ«" 
+    1756 "Arabe e VogÃ«l Lart ParÃ«" 
+    1757 "Arabe Mbarimi I Ayah" 
+    1758 "Arabe Start Of Rub El Hizb" 
+    1759 "Arabe e VogÃ«l Lart Rrethore Zero" 
+    1760 "Arabe e VogÃ«l Lart DrejtkÃ«ndÃ«she DrejtÃ« Zero" 
+    1761 "Arabe e VogÃ«l Lart Pa-Pika KokÃ« e Khah" 
+    1762 "Arabe e VogÃ«l Lart Meem Izoluar FormÃ«" 
+    1763 "Arabe e VogÃ«l UlÃ«t ParÃ«" 
+    1764 "Arabe e VogÃ«l Lart Madda" 
+    1765 "Arabe e VogÃ«l Waw" 
+    1766 "Arabe e VogÃ«l Yeh" 
+    1767 "Arabe e VogÃ«l Lart Yeh" 
+    1768 "Arabe e VogÃ«l Lart Noon" 
+    1769 "Arabe Vendi i Sajdah" 
+    1770 "Arabe QendÃ«r Bosh e UlÃ«t Ndaluar" 
+    1771 "Arabe QendÃ«r Bosh e Lart Ndaluar" 
+    1772 "Arabe Rrethore Lart Nadluar Me QendÃ«r Mbushur" 
+    1773 "Arabe e VogÃ«l UlÃ«t Meem" 
+    1774 "Arabe ShkronjÃ« Dal Me Kthyer V" 
+    1775 "Arabe ShkronjÃ« Reh Me Kthyer V" 
+    1776 "Zgjeruar Arabe-Indic ShifÃ«r Zero" 
+    1777 "Zgjeruar Arabe-Indic ShifÃ«r NjÃ«" 
+    1778 "Zgjeruar Arabe-Indic ShifÃ«r Dy" 
+    1779 "Zgjeruar Arabe-Indic ShifÃ«r Tre" 
+    1780 "Zgjeruar Arabe-Indic ShifÃ«r KatÃ«r" 
+    1781 "Zgjeruar Arabe-Indic ShifÃ«r PesÃ«" 
+    1782 "Zgjeruar Arabe-Indic ShifÃ«r GjashtÃ«" 
+    1783 "Zgjeruar Arabe-Indic ShifÃ«r ShtatÃ«" 
+    1784 "Zgjeruar Arabe-Indic ShifÃ«r TetÃ«" 
+    1785 "Zgjeruar Arabe-Indic ShifÃ«r NÃ«ntÃ«" 
+    1786 "Arabe ShkronjÃ« Sheen Me PikÃ« PoshtÃ«" 
+    1787 "Arabe ShkronjÃ« Dad Me PikÃ« PoshtÃ«" 
+    1788 "Arabe ShkronjÃ« Ghain Me PikÃ« PoshtÃ«" 
+    1789 "Arabe ShenjÃ« Sindhi Ampersand" 
+    1790 "Arabe ShenjÃ« Sindhi Postposition Men" 
+    1791 "Arabe ShkronjÃ« Heh Me Kthyer V" 
+    1792 "Siriane Mbarimi I Paragraph" 
+    1793 "Siriane mbi-linjÃ« PikÃ«" 
+    1794 "Siriane mbi-linjÃ« PikÃ«" 
+    1795 "Siriane mbi-linjÃ« Dy Pika" 
+    1796 "Siriane mbi-linjÃ« Dy Pika" 
+    1797 "Siriane Horizontal Dy Pika" 
+    1798 "Siriane Dy Pika Skewed MajtÃ«" 
+    1799 "Siriane Dy Pika Skewed DjathtÃ«" 
+    1800 "Siriane mbi-linjÃ« Dy Pika Skewed MajtÃ«" 
+    1801 "Siriane mbi-linjÃ« Dy Pika Skewed DjathtÃ«" 
+    1802 "Siriane Tkurrje" 
+    1803 "Siriane Harklean Obelus" 
+    1804 "Siriane Harklean Metobelus" 
+    1805 "Siriane Harklean Asteriscus" 
+    1807 "Siriane Shkurtim ShenjÃ«" 
+    1808 "Siriane ShkronjÃ« Alaph" 
+    1809 "Siriane ShkronjÃ« Indeks i SipÃ«rm Alaph" 
+    1810 "Siriane ShkronjÃ« Beth" 
+    1811 "Siriane ShkronjÃ« Gamal" 
+    1812 "Siriane ShkronjÃ« Gamal Garshuni" 
+    1813 "Siriane ShkronjÃ« Dalath" 
+    1814 "Siriane ShkronjÃ« Dotless Dalath Rish" 
+    1815 "Siriane ShkronjÃ« He" 
+    1816 "Siriane ShkronjÃ« Waw" 
+    1817 "Siriane ShkronjÃ« Zain" 
+    1818 "Siriane ShkronjÃ« Heth" 
+    1819 "Siriane ShkronjÃ« Teth" 
+    1820 "Siriane ShkronjÃ« Teth Garshuni" 
+    1821 "Siriane ShkronjÃ« Yudh" 
+    1822 "Siriane ShkronjÃ« Yudh He" 
+    1823 "Siriane ShkronjÃ« Kaph" 
+    1824 "Siriane ShkronjÃ« Lamadh" 
+    1825 "Siriane ShkronjÃ« Mim" 
+    1826 "Siriane ShkronjÃ« Nun" 
+    1827 "Siriane ShkronjÃ« Semkath" 
+    1828 "Siriane ShkronjÃ« PÃ«rfundimtare Semkath" 
+    1829 "Siriane ShkronjÃ« E" 
+    1830 "Siriane ShkronjÃ« Pe" 
+    1831 "Siriane ShkronjÃ« KundÃ«rt Pe" 
+    1832 "Siriane ShkronjÃ« Sadhe" 
+    1833 "Siriane ShkronjÃ« Qaph" 
+    1834 "Siriane ShkronjÃ« Rish" 
+    1835 "Siriane ShkronjÃ« Shin" 
+    1836 "Siriane ShkronjÃ« Taw" 
+    1837 "Siriane ShkronjÃ« Persian Bheth" 
+    1838 "Siriane ShkronjÃ« Persian Ghamal" 
+    1839 "Siriane ShkronjÃ« Persian Dhalath" 
+    1840 "Siriane Pthaha Lart" 
+    1841 "Siriane Pthaha PoshtÃ«" 
+    1842 "Siriane Pthaha Pika-Pika" 
+    1843 "Siriane Zqapha Lart" 
+    1844 "Siriane Zqapha PoshtÃ«" 
+    1845 "Siriane Zqapha Pika-Pika" 
+    1846 "Siriane Rbasa Lart" 
+    1847 "Siriane Rbasa PoshtÃ«" 
+    1848 "Siriane Pika-Pika Zlama Horizontal" 
+    1849 "Siriane Pika-Pika Zlama Angular" 
+    1850 "Siriane Hbasa Lart" 
+    1851 "Siriane Hbasa PoshtÃ«" 
+    1852 "Siriane Hbasa-Esasa Pika-Pika" 
+    1853 "Siriane Esasa Lart" 
+    1854 "Siriane Esasa PoshtÃ«" 
+    1855 "Siriane Rwaha" 
+    1856 "Siriane Feminine Dot" 
+    1857 "Siriane Qushshaya" 
+    1858 "Siriane Rukkakha" 
+    1859 "Siriane Dy Vertikale PikÃ« Lart" 
+    1860 "Siriane Dy Vertikale PikÃ« PoshtÃ«" 
+    1861 "Siriane Tre PikÃ« Lart" 
+    1862 "Siriane Tre PikÃ« PoshtÃ«" 
+    1863 "Siriane PjerrÃ«t LinjÃ« Lart" 
+    1864 "Siriane PjerrÃ«t LinjÃ« PoshtÃ«" 
+    1865 "Siriane MuzikÃ«" 
+    1866 "Siriane Barrekh" 
+    1869 "Siriane ShkronjÃ« Sogdian Zhain" 
+    1870 "Siriane ShkronjÃ« Sogdian Khaph" 
+    1871 "Siriane ShkronjÃ« Sogdian Fe" 
+    1872 "Arabe ShkronjÃ« Beh Me Tre PikÃ« Horizontale PoshtÃ«" 
+    1873 "Arabe ShkronjÃ« Beh Me PikÃ« PoshtÃ« dhe Tre PikÃ« Lart" 
+    1874 "Arabe ShkronjÃ« Beh Me Tre PikÃ« Treguese PÃ«rpjetÃ« PoshtÃ«" 
+    1875 "Arabe ShkronjÃ« Beh Me Tre PikÃ« Treguese PÃ«rpjetÃ« PoshtÃ« dhe Dy PikÃ« Lart" 
+    1876 "Arabe ShkronjÃ« Beh Me Dy PikÃ« PoshtÃ« dhe PikÃ« Mbi" 
+    1877 "Arabe ShkronjÃ« Beh Me Kthyer e VogÃ«l V PoshtÃ«" 
+    1878 "Arabe ShkronjÃ« Beh Me e VogÃ«l V" 
+    1879 "Arabe ShkronjÃ« Hah Me Dy PikÃ« Lart" 
+    1880 "Arabe ShkronjÃ« Hah Me Tre PikÃ« Treguese PÃ«rpjetÃ« PoshtÃ«" 
+    1881 "Arabe ShkronjÃ« Dal Me Dy PikÃ« Vertikale PoshtÃ« dhe e VogÃ«l Tah" 
+    1882 "Arabe ShkronjÃ« Dal Me Kthyer e VogÃ«l V PoshtÃ«" 
+    1883 "Arabe ShkronjÃ« Reh Me Goditje" 
+    1884 "Arabe ShkronjÃ« ParÃ« Me KatÃ«r PikÃ« Lart" 
+    1885 "Arabe ShkronjÃ« Ain Me Dy PikÃ« Lart" 
+    1886 "Arabe ShkronjÃ« Ain Me Tre PikÃ« Treguese TeposhtÃ« Lart" 
+    1887 "Arabe ShkronjÃ« Ain Me Dy PikÃ« Vertikale Lart" 
+    1888 "Arabe ShkronjÃ« Feh Me Dy PikÃ« PoshtÃ«" 
+    1889 "Arabe ShkronjÃ« Feh Me Tre PikÃ« Treguese PÃ«rpjetÃ« PoshtÃ«" 
+    1890 "Arabe ShkronjÃ« Keheh Me PikÃ« Mbi" 
+    1891 "Arabe ShkronjÃ« Keheh Me Tre PikÃ« Lart" 
+    1892 "Arabe ShkronjÃ« Keheh Me Tre PikÃ« Treguese PÃ«rpjetÃ« PoshtÃ«" 
+    1893 "Arabe ShkronjÃ« Meem Me PikÃ« Mbi" 
+    1894 "Arabe ShkronjÃ« Meem Me PikÃ« PoshtÃ«" 
+    1895 "Arabe ShkronjÃ« Noon Me Dy PikÃ« PoshtÃ«" 
+    1896 "Arabe ShkronjÃ« Noon Me e VogÃ«l Tah" 
+    1897 "Arabe ShkronjÃ« Noon Me e VogÃ«l V" 
+    1898 "Arabe ShkronjÃ« Lam Me Bar" 
+    1899 "Arabe ShkronjÃ« Reh Me Dy PikÃ« Vertikale Lart" 
+    1900 "Arabe ShkronjÃ« Reh Me Hamza Lart" 
+    1901 "Arabe ShkronjÃ« ParÃ« Me Dy PikÃ« Vertikale Lart" 
+    1902 "Arabe ShkronjÃ« Hah Me e VogÃ«l Arabe ShkronjÃ« Tah PoshtÃ«" 
+    1903 "Arabe ShkronjÃ« Hah Me e VogÃ«l Arabe ShkronjÃ« Tah dhe Dy PikÃ«" 
+    1904 "Arabe ShkronjÃ« ParÃ« Me e VogÃ«l Arabe ShkronjÃ« Tah dhe Dy PikÃ«" 
+    1905 "Arabe ShkronjÃ« Reh Me e VogÃ«l Arabe ShkronjÃ« Tah dhe Dy PikÃ«" 
+    1906 "Arabe ShkronjÃ« Hah Me e VogÃ«l Arabe ShkronjÃ« Tah Lart" 
+    1907 "Arabe ShkronjÃ« Alef Me Zgjeruar Arabe-Indic ShifÃ«r Dy Lart" 
+    1908 "Arabe ShkronjÃ« Alef Me Zgjeruar Arabe-Indic ShifÃ«r Tre Lart" 
+    1909 "Arabe ShkronjÃ« Farsi Yeh Me Zgjeruar Arabe-Indic ShifÃ«r Dy Lart" 
+    1910 "Arabe ShkronjÃ« Farsi Yeh Me Zgjeruar Arabe-Indic ShifÃ«r Tre Lart" 
+    1911 "Arabe ShkronjÃ« Farsi Yeh Me Zgjeruar Arabe-Indic ShifÃ«r KatÃ«r PoshtÃ«" 
+    1912 "Arabe ShkronjÃ« Waw Me Zgjeruar Arabe-Indic ShifÃ«r Dy Lart" 
+    1913 "Arabe ShkronjÃ« Waw Me Zgjeruar Arabe-Indic ShifÃ«r Tre Lart" 
+    1914 "Arabe ShkronjÃ« Yeh Barree Me Zgjeruar Arabe-Indic ShifÃ«r Dy Lart" 
+    1915 "Arabe ShkronjÃ« Yeh Barree Me Zgjeruar Arabe-Indic ShifÃ«r Tre Lart" 
+    1916 "Arabe ShkronjÃ« Hah Me Zgjeruar Arabe-Indic ShifÃ«r KatÃ«r PoshtÃ«" 
+    1917 "Arabe ShkronjÃ« ParÃ« Me Zgjeruar Arabe-Indic ShifÃ«r KatÃ«r Lart" 
+    1918 "Arabe ShkronjÃ« ParÃ« Me Kthyer V" 
+    1919 "Arabe ShkronjÃ« Kaf Me Dy PikÃ« Lart" 
+    1920 "Thaana ShkronjÃ« Haa" 
+    1921 "Thaana ShkronjÃ« Shaviyani" 
+    1922 "Thaana ShkronjÃ« Noonu" 
+    1923 "Thaana ShkronjÃ« Raa" 
+    1924 "Thaana ShkronjÃ« Baa" 
+    1925 "Thaana ShkronjÃ« Lhaviyani" 
+    1926 "Thaana ShkronjÃ« Kaafu" 
+    1927 "Thaana ShkronjÃ« Alifu" 
+    1928 "Thaana ShkronjÃ« Vaavu" 
+    1929 "Thaana ShkronjÃ« Meemu" 
+    1930 "Thaana ShkronjÃ« Faafu" 
+    1931 "Thaana ShkronjÃ« Dhaalu" 
+    1932 "Thaana ShkronjÃ« Thaa" 
+    1933 "Thaana ShkronjÃ« Laamu" 
+    1934 "Thaana ShkronjÃ« Gaafu" 
+    1935 "Thaana ShkronjÃ« Gnaviyani" 
+    1936 "Thaana ShkronjÃ« Seenu" 
+    1937 "Thaana ShkronjÃ« Daviyani" 
+    1938 "Thaana ShkronjÃ« Zaviyani" 
+    1939 "Thaana ShkronjÃ« Taviyani" 
+    1940 "Thaana ShkronjÃ« Yaa" 
+    1941 "Thaana ShkronjÃ« Paviyani" 
+    1942 "Thaana ShkronjÃ« Javiyani" 
+    1943 "Thaana ShkronjÃ« Chaviyani" 
+    1944 "Thaana ShkronjÃ« Ttaa" 
+    1945 "Thaana ShkronjÃ« Hhaa" 
+    1946 "Thaana ShkronjÃ« Khaa" 
+    1947 "Thaana ShkronjÃ« Thaalu" 
+    1948 "Thaana ShkronjÃ« Zaa" 
+    1949 "Thaana ShkronjÃ« Sheenu" 
+    1950 "Thaana ShkronjÃ« Saadhu" 
+    1951 "Thaana ShkronjÃ« Daadhu" 
+    1952 "Thaana ShkronjÃ« To" 
+    1953 "Thaana ShkronjÃ« Zo" 
+    1954 "Thaana ShkronjÃ« Ainu" 
+    1955 "Thaana ShkronjÃ« Ghainu" 
+    1956 "Thaana ShkronjÃ« Qaafu" 
+    1957 "Thaana ShkronjÃ« Waavu" 
+    1958 "Thaana Abafili" 
+    1959 "Thaana Aabaafili" 
+    1960 "Thaana Ibifili" 
+    1961 "Thaana Eebeefili" 
+    1962 "Thaana Ubufili" 
+    1963 "Thaana Ooboofili" 
+    1964 "Thaana Ebefili" 
+    1965 "Thaana Eybeyfili" 
+    1966 "Thaana Obofili" 
+    1967 "Thaana Oaboafili" 
+    1968 "Thaana Sukun" 
+    1969 "Thaana ShkronjÃ« Naa" 
+    1984 "Nko ShifÃ«r Zero" 
+    1985 "Nko ShifÃ«r NjÃ«" 
+    1986 "Nko ShifÃ«r Dy" 
+    1987 "Nko ShifÃ«r Tre" 
+    1988 "Nko ShifÃ«r KatÃ«r" 
+    1989 "Nko ShifÃ«r PesÃ«" 
+    1990 "Nko ShifÃ«r GjashtÃ«" 
+    1991 "Nko ShifÃ«r ShtatÃ«" 
+    1992 "Nko ShifÃ«r TetÃ«" 
+    1993 "Nko ShifÃ«r NÃ«ntÃ«" 
+    1994 "Nko ShkronjÃ« A" 
+    1995 "Nko ShkronjÃ« Ee" 
+    1996 "Nko ShkronjÃ« I" 
+    1997 "Nko ShkronjÃ« E" 
+    1998 "Nko ShkronjÃ« U" 
+    1999 "Nko ShkronjÃ« Oo" 
+    2000 "Nko ShkronjÃ« O" 
+    2001 "Nko ShkronjÃ« Dagbasinna" 
+    2002 "Nko ShkronjÃ« N" 
+    2003 "Nko ShkronjÃ« Ba" 
+    2004 "Nko ShkronjÃ« Pa" 
+    2005 "Nko ShkronjÃ« Ta" 
+    2006 "Nko ShkronjÃ« Ja" 
+    2007 "Nko ShkronjÃ« Cha" 
+    2008 "Nko ShkronjÃ« Da" 
+    2009 "Nko ShkronjÃ« Ra" 
+    2010 "Nko ShkronjÃ« Rra" 
+    2011 "Nko ShkronjÃ« Sa" 
+    2012 "Nko ShkronjÃ« Gba" 
+    2013 "Nko ShkronjÃ« Fa" 
+    2014 "Nko ShkronjÃ« Ka" 
+    2015 "Nko ShkronjÃ« La" 
+    2016 "Nko ShkronjÃ« Na Woloso" 
+    2017 "Nko ShkronjÃ« Ma" 
+    2018 "Nko ShkronjÃ« Nya" 
+    2019 "Nko ShkronjÃ« Na" 
+    2020 "Nko ShkronjÃ« Ha" 
+    2021 "Nko ShkronjÃ« Wa" 
+    2022 "Nko ShkronjÃ« Ya" 
+    2023 "Nko ShkronjÃ« Nya Woloso" 
+    2024 "Nko ShkronjÃ« Jona Ja" 
+    2025 "Nko ShkronjÃ« Jona Cha" 
+    2026 "Nko ShkronjÃ« Jona Ra" 
+    2027 "Nko Kombinuar ShkurtÃ«r Lart Tone" 
+    2028 "Nko Kombinuar ShkurtÃ«r UlÃ«t Tone" 
+    2029 "Nko Kombinuar ShkurtÃ«r Rritje Tone" 
+    2030 "Nko Kombinuar GjatÃ« Ulje Tone" 
+    2031 "Nko Kombinuar GjatÃ« Lart Tone" 
+    2032 "Nko Kombinuar GjatÃ« UlÃ«t Tone" 
+    2033 "Nko Kombinuar GjatÃ« Rritje Tone" 
+    2034 "Nko Kombinuar Nasalization ShenjÃ«" 
+    2035 "Nko Kombinuar Dyshe PikÃ« Mbi" 
+    2036 "Nko Lart Tone Apostrof" 
+    2037 "Nko UlÃ«t Tone Apostrof" 
+    2038 "Nko Simbol Oo Dennen" 
+    2039 "Nko Simbol Gbakurunen" 
+    2040 "Nko Presje" 
+    2041 "Nko Thirrje ShenjÃ«" 
+    2042 "Nko Lajanyalan" 
+    2048 "Samaritan ShkronjÃ« Alaf" 
+    2049 "Samaritan ShkronjÃ« Bit" 
+    2050 "Samaritan ShkronjÃ« Gaman" 
+    2051 "Samaritan ShkronjÃ« Dalat" 
+    2052 "Samaritan ShkronjÃ« Iy" 
+    2053 "Samaritan ShkronjÃ« Baa" 
+    2054 "Samaritan ShkronjÃ« Zen" 
+    2055 "Samaritan ShkronjÃ« It" 
+    2056 "Samaritan ShkronjÃ« Tit" 
+    2057 "Samaritan ShkronjÃ« Yut" 
+    2058 "Samaritan ShkronjÃ« Kaaf" 
+    2059 "Samaritan ShkronjÃ« Labat" 
+    2060 "Samaritan ShkronjÃ« Mim" 
+    2061 "Samaritan ShkronjÃ« Nun" 
+    2062 "Samaritan ShkronjÃ« Singaat" 
+    2063 "Samaritan ShkronjÃ« In" 
+    2064 "Samaritan ShkronjÃ« Fi" 
+    2065 "Samaritan ShkronjÃ« Tsaadiy" 
+    2066 "Samaritan ShkronjÃ« Quf" 
+    2067 "Samaritan ShkronjÃ« Rish" 
+    2068 "Samaritan ShkronjÃ« Shan" 
+    2069 "Samaritan ShkronjÃ« Taaf" 
+    2070 "Samaritan ShenjÃ« In" 
+    2071 "Samaritan ShenjÃ« In-Alaf" 
+    2072 "Samaritan ShenjÃ« Occlusion" 
+    2073 "Samaritan ShenjÃ« Dagesh" 
+    2074 "Samaritan Modifiko ShkronjÃ« Epenthetic Yut" 
+    2075 "Samaritan ShenjÃ« Epenthetic Yut" 
+    2076 "Samaritan Zanore ShenjÃ« GjatÃ« E" 
+    2077 "Samaritan Zanore ShenjÃ« E" 
+    2078 "Samaritan Zanore ShenjÃ« ShumÃ«-GjatÃ« Aa" 
+    2079 "Samaritan Zanore ShenjÃ« GjatÃ« Aa" 
+    2080 "Samaritan Zanore ShenjÃ« Aa" 
+    2081 "Samaritan Zanore ShenjÃ« ShumÃ«-GjatÃ« A" 
+    2082 "Samaritan Zanore ShenjÃ« GjatÃ« A" 
+    2083 "Samaritan Zanore ShenjÃ« A" 
+    2084 "Samaritan Modifiko ShkronjÃ« ShkurtÃ«r A" 
+    2085 "Samaritan Zanore ShenjÃ« ShkurtÃ«r A" 
+    2086 "Samaritan Zanore ShenjÃ« GjatÃ« U" 
+    2087 "Samaritan Zanore ShenjÃ« U" 
+    2088 "Samaritan Modifiko ShkronjÃ« I" 
+    2089 "Samaritan Zanore ShenjÃ« GjatÃ« I" 
+    2090 "Samaritan Zanore ShenjÃ« I" 
+    2091 "Samaritan Zanore ShenjÃ« O" 
+    2092 "Samaritan Zanore ShenjÃ« Sukun" 
+    2093 "Samaritan ShenjÃ« Nequdaa" 
+    2096 "Samaritan PikÃ«sim Nequdaa" 
+    2097 "Samaritan PikÃ«sim Afsaaq" 
+    2098 "Samaritan PikÃ«sim Anged" 
+    2099 "Samaritan PikÃ«sim Bau" 
+    2100 "Samaritan PikÃ«sim Atmaau" 
+    2101 "Samaritan PikÃ«sim Shiyyaalaa" 
+    2102 "Samaritan Shkurtim ShenjÃ«" 
+    2103 "Samaritan PikÃ«sim Melodic Qitsa" 
+    2104 "Samaritan PikÃ«sim Ziqaa" 
+    2105 "Samaritan PikÃ«sim Qitsa" 
+    2106 "Samaritan PikÃ«sim Zaef" 
+    2107 "Samaritan PikÃ«sim Turu" 
+    2108 "Samaritan PikÃ«sim Arkaanu" 
+    2109 "Samaritan PikÃ«sim Sof Mashfaat" 
+    2110 "Samaritan PikÃ«sim Annaau" 
+    2112 "Mandaic ShkronjÃ« Halqa" 
+    2113 "Mandaic ShkronjÃ« Ab" 
+    2114 "Mandaic ShkronjÃ« Ag" 
+    2115 "Mandaic ShkronjÃ« Ad" 
+    2116 "Mandaic ShkronjÃ« Ah" 
+    2117 "Mandaic ShkronjÃ« Ushenna" 
+    2118 "Mandaic ShkronjÃ« Az" 
+    2119 "Mandaic ShkronjÃ« It" 
+    2120 "Mandaic ShkronjÃ« Att" 
+    2121 "Mandaic ShkronjÃ« Aksa" 
+    2122 "Mandaic ShkronjÃ« Ak" 
+    2123 "Mandaic ShkronjÃ« Al" 
+    2124 "Mandaic ShkronjÃ« Am" 
+    2125 "Mandaic ShkronjÃ« An" 
+    2126 "Mandaic ShkronjÃ« As" 
+    2127 "Mandaic ShkronjÃ« In" 
+    2128 "Mandaic ShkronjÃ« Ap" 
+    2129 "Mandaic ShkronjÃ« Asz" 
+    2130 "Mandaic ShkronjÃ« Aq" 
+    2131 "Mandaic ShkronjÃ« Ar" 
+    2132 "Mandaic ShkronjÃ« Ash" 
+    2133 "Mandaic ShkronjÃ« At" 
+    2134 "Mandaic ShkronjÃ« Dushenna" 
+    2135 "Mandaic ShkronjÃ« Kad" 
+    2136 "Mandaic ShkronjÃ« Ain" 
+    2137 "Mandaic Affrication ShenjÃ«" 
+    2138 "Mandaic Shqiptim ShenjÃ«" 
+    2139 "Mandaic Dyfishim ShenjÃ«" 
+    2142 "Mandaic PikÃ«sim" 
+    2208 "Arabe ShkronjÃ« Beh Me e VogÃ«l V PoshtÃ«" 
+    2210 "Arabe ShkronjÃ« Jeem Me Dy PikÃ« Lart" 
+    2211 "Arabe ShkronjÃ« Tah Me Dy PikÃ« Lart" 
+    2212 "Arabe ShkronjÃ« Feh Me PikÃ« PoshtÃ« dhe Tre PikÃ« Lart" 
+    2213 "Arabe ShkronjÃ« Qaf Me PikÃ« PoshtÃ«" 
+    2214 "Arabe ShkronjÃ« Lam Me Dyshe Bar" 
+    2215 "Arabe ShkronjÃ« Meem Me Tre PikÃ« Lart" 
+    2216 "Arabe ShkronjÃ« Yeh Me Dy PikÃ« PoshtÃ« dhe Hamza Lart" 
+    2217 "Arabe ShkronjÃ« Yeh Me Dy PikÃ« PoshtÃ« dhe PikÃ« Mbi" 
+    2218 "Arabe ShkronjÃ« Reh Me Loop" 
+    2219 "Arabe ShkronjÃ« Waw Me PikÃ« Mein" 
+    2220 "Arabe ShkronjÃ« Rohingya Yeh" 
+    2276 "Arabe Dredhur Fatha" 
+    2277 "Arabe Dredhur Damma" 
+    2278 "Arabe Dredhur Kasra" 
+    2279 "Arabe Dredhur Fathatan" 
+    2280 "Arabe Dredhur Dammatan" 
+    2281 "Arabe Dredhur Kasratan" 
+    2282 "Arabe Tone NjÃ« PikÃ« Mbi" 
+    2283 "Arabe Tone Dy PikÃ« Lart" 
+    2284 "Arabe Tone Loop Lart" 
+    2285 "Arabe TNjÃ« NjÃ« PikÃ« PoshtÃ«" 
+    2286 "Arabe Tone Dy PikÃ« PoshtÃ«" 
+    2287 "Arabe Tone Loop PoshtÃ«" 
+    2288 "Arabe Hap Fathatan" 
+    2289 "Arabe Hap Dammatan" 
+    2290 "Arabe Hap Kasratan" 
+    2291 "Arabe e VogÃ«l Lart Waw" 
+    2292 "Arabe Fatha Me Rreth" 
+    2293 "Arabe Fatha Me PikÃ« Mbi" 
+    2294 "Arabe Kasra Me PikÃ« PoshtÃ«" 
+    2295 "Arabe MajtÃ« kokÃ«-Shigjete Lart" 
+    2296 "Arabe DjathtÃ« kokÃ«-Shigjete Lart" 
+    2297 "Arabe MajtÃ« kokÃ«-Shigjete PoshtÃ«" 
+    2298 "Arabe DjathtÃ« kokÃ«-Shigjete PoshtÃ«" 
+    2299 "Arabe Dyshe DjathtÃ« kokÃ«-Shigjete Lart" 
+    2300 "Arabe Dyshe DjathtÃ« kokÃ«-Shigjete Lart Me PikÃ«" 
+    2301 "Arabe DjathtÃ« kokÃ«-Shigjete Lart Me PikÃ«" 
+    2302 "Arabe Damma Me PikÃ«" 
+    2304 "Devanagari ShenjÃ« Kthyer Candrabindu" 
+    2305 "Devanagari ShenjÃ« Candrabindu" 
+    2306 "Devanagari ShenjÃ« Anusvara" 
+    2307 "Devanagari ShenjÃ« Visarga" 
+    2308 "Devanagari ShkronjÃ« ShkurtÃ«r A" 
+    2309 "Devanagari ShkronjÃ« A" 
+    2310 "Devanagari ShkronjÃ« Aa" 
+    2311 "Devanagari ShkronjÃ« I" 
+    2312 "Devanagari ShkronjÃ« Ii" 
+    2313 "Devanagari ShkronjÃ« U" 
+    2314 "Devanagari ShkronjÃ« Uu" 
+    2315 "Devanagari ShkronjÃ« Vocalic R" 
+    2316 "Devanagari ShkronjÃ« Vocalic L" 
+    2317 "Devanagari ShkronjÃ« Candra E" 
+    2318 "Devanagari ShkronjÃ« ShkurtÃ«r E" 
+    2319 "Devanagari ShkronjÃ« E" 
+    2320 "Devanagari ShkronjÃ« Ai" 
+    2321 "Devanagari ShkronjÃ« Candra O" 
+    2322 "Devanagari ShkronjÃ« ShkurtÃ«r O" 
+    2323 "Devanagari ShkronjÃ« O" 
+    2324 "Devanagari ShkronjÃ« Au" 
+    2325 "Devanagari ShkronjÃ« Ka" 
+    2326 "Devanagari ShkronjÃ« Kha" 
+    2327 "Devanagari ShkronjÃ« Ga" 
+    2328 "Devanagari ShkronjÃ« Gha" 
+    2329 "Devanagari ShkronjÃ« Nga" 
+    2330 "Devanagari ShkronjÃ« Ca" 
+    2331 "Devanagari ShkronjÃ« Cha" 
+    2332 "Devanagari ShkronjÃ« Ja" 
+    2333 "Devanagari ShkronjÃ« Jha" 
+    2334 "Devanagari ShkronjÃ« Nya" 
+    2335 "Devanagari ShkronjÃ« Tta" 
+    2336 "Devanagari ShkronjÃ« Ttha" 
+    2337 "Devanagari ShkronjÃ« Dda" 
+    2338 "Devanagari ShkronjÃ« Ddha" 
+    2339 "Devanagari ShkronjÃ« Nna" 
+    2340 "Devanagari ShkronjÃ« Ta" 
+    2341 "Devanagari ShkronjÃ« Tha" 
+    2342 "Devanagari ShkronjÃ« Da" 
+    2343 "Devanagari ShkronjÃ« Dha" 
+    2344 "Devanagari ShkronjÃ« Na" 
+    2345 "Devanagari ShkronjÃ« Nnna" 
+    2346 "Devanagari ShkronjÃ« Pa" 
+    2347 "Devanagari ShkronjÃ« Pha" 
+    2348 "Devanagari ShkronjÃ« Ba" 
+    2349 "Devanagari ShkronjÃ« Bha" 
+    2350 "Devanagari ShkronjÃ« Ma" 
+    2351 "Devanagari ShkronjÃ« Ya" 
+    2352 "Devanagari ShkronjÃ« Ra" 
+    2353 "Devanagari ShkronjÃ« Rra" 
+    2354 "Devanagari ShkronjÃ« La" 
+    2355 "Devanagari ShkronjÃ« Lla" 
+    2356 "Devanagari ShkronjÃ« Llla" 
+    2357 "Devanagari ShkronjÃ« Va" 
+    2358 "Devanagari ShkronjÃ« Sha" 
+    2359 "Devanagari ShkronjÃ« Ssa" 
+    2360 "Devanagari ShkronjÃ« Sa" 
+    2361 "Devanagari ShkronjÃ« Ha" 
+    2362 "Devanagari Zanore ShenjÃ« Oe" 
+    2363 "Devanagari Zanore ShenjÃ« Ooe" 
+    2364 "Devanagari ShenjÃ« Nukta" 
+    2365 "Devanagari ShenjÃ« Avagraha" 
+    2366 "Devanagari Zanore ShenjÃ« Aa" 
+    2367 "Devanagari Zanore ShenjÃ« I" 
+    2368 "Devanagari Zanore ShenjÃ« Ii" 
+    2369 "Devanagari Zanore ShenjÃ« U" 
+    2370 "Devanagari Zanore ShenjÃ« Uu" 
+    2371 "Devanagari Zanore ShenjÃ« Vocalic R" 
+    2372 "Devanagari Zanore ShenjÃ« Vocalic Rr" 
+    2373 "Devanagari Zanore ShenjÃ« Candra E" 
+    2374 "Devanagari Zanore ShenjÃ« ShkurtÃ«r E" 
+    2375 "Devanagari Zanore ShenjÃ« E" 
+    2376 "Devanagari Zanore ShenjÃ« Ai" 
+    2377 "Devanagari Zanore ShenjÃ« Candra O" 
+    2378 "Devanagari Zanore ShenjÃ« ShkurtÃ«r O" 
+    2379 "Devanagari Zanore ShenjÃ« O" 
+    2380 "Devanagari Zanore ShenjÃ« Au" 
+    2381 "Devanagari ShenjÃ« Virama" 
+    2382 "Devanagari Zanore ShenjÃ« Prishthamatra E" 
+    2383 "Devanagari Zanore ShenjÃ« Aw" 
+    2384 "Devanagari Om" 
+    2385 "Devanagari Stres ShenjÃ« Udatta" 
+    2386 "Devanagari Stres ShenjÃ« Anudatta" 
+    2387 "Devanagari RÃ«ndÃ« Theks" 
+    2388 "Devanagari Theks i MprehtÃ«" 
+    2389 "Devanagari Zanore ShenjÃ« Candra GjatÃ« E" 
+    2390 "Devanagari Zanore ShenjÃ« Ue" 
+    2391 "Devanagari Zanore ShenjÃ« Uue" 
+    2392 "Devanagari ShkronjÃ« Qa" 
+    2393 "Devanagari ShkronjÃ« Khha" 
+    2394 "Devanagari ShkronjÃ« Ghha" 
+    2395 "Devanagari ShkronjÃ« Za" 
+    2396 "Devanagari ShkronjÃ« Dddha" 
+    2397 "Devanagari ShkronjÃ« Rha" 
+    2398 "Devanagari ShkronjÃ« Fa" 
+    2399 "Devanagari ShkronjÃ« Yya" 
+    2400 "Devanagari ShkronjÃ« Vocalic Rr" 
+    2401 "Devanagari ShkronjÃ« Vocalic Ll" 
+    2402 "Devanagari Zanore ShenjÃ« Vocalic L" 
+    2403 "Devanagari Zanore ShenjÃ« Vocalic Ll" 
+    2404 "Devanagari Danda" 
+    2405 "Devanagari Dyshe Danda" 
+    2406 "Devanagari ShifÃ«r Zero" 
+    2407 "Devanagari ShifÃ«r NjÃ«" 
+    2408 "Devanagari ShifÃ«r Dy" 
+    2409 "Devanagari ShifÃ«r Tre" 
+    2410 "Devanagari ShifÃ«r KatÃ«r" 
+    2411 "Devanagari ShifÃ«r PesÃ«" 
+    2412 "Devanagari ShifÃ«r GjashtÃ«" 
+    2413 "Devanagari ShifÃ«r ShtatÃ«" 
+    2414 "Devanagari ShifÃ«r TetÃ«" 
+    2415 "Devanagari ShifÃ«r NÃ«ntÃ«" 
+    2416 "Devanagari Shkurtim ShenjÃ«" 
+    2417 "Devanagari ShenjÃ« Lart HapÃ«sirÃ« PikÃ«" 
+    2418 "Devanagari ShkronjÃ« Candra A" 
+    2419 "Devanagari ShkronjÃ« Oe" 
+    2420 "Devanagari ShkronjÃ« Ooe" 
+    2421 "Devanagari ShkronjÃ« Aw" 
+    2422 "Devanagari ShkronjÃ« Ue" 
+    2423 "Devanagari ShkronjÃ« Uue" 
+    2425 "Devanagari ShkronjÃ« Zha" 
+    2426 "Devanagari ShkronjÃ« RÃ«ndÃ« Ya" 
+    2427 "Devanagari ShkronjÃ« Gga" 
+    2428 "Devanagari ShkronjÃ« Jja" 
+    2429 "Devanagari ShkronjÃ« Glottal Stop" 
+    2430 "Devanagari ShkronjÃ« Ddda" 
+    2431 "Devanagari ShkronjÃ« Bba" 
+    2433 "Bengali ShenjÃ« Candrabindu" 
+    2434 "Bengali ShenjÃ« Anusvara" 
+    2435 "Bengali ShenjÃ« Visarga" 
+    2437 "Bengali ShkronjÃ« A" 
+    2438 "Bengali ShkronjÃ« Aa" 
+    2439 "Bengali ShkronjÃ« I" 
+    2440 "Bengali ShkronjÃ« Ii" 
+    2441 "Bengali ShkronjÃ« U" 
+    2442 "Bengali ShkronjÃ« Uu" 
+    2443 "Bengali ShkronjÃ« Vocalic R" 
+    2444 "Bengali ShkronjÃ« Vocalic L" 
+    2447 "Bengali ShkronjÃ« E" 
+    2448 "Bengali ShkronjÃ« Ai" 
+    2451 "Bengali ShkronjÃ« O" 
+    2452 "Bengali ShkronjÃ« Au" 
+    2453 "Bengali ShkronjÃ« Ka" 
+    2454 "Bengali ShkronjÃ« Kha" 
+    2455 "Bengali ShkronjÃ« Ga" 
+    2456 "Bengali ShkronjÃ« Gha" 
+    2457 "Bengali ShkronjÃ« Nga" 
+    2458 "Bengali ShkronjÃ« Ca" 
+    2459 "Bengali ShkronjÃ« Cha" 
+    2460 "Bengali ShkronjÃ« Ja" 
+    2461 "Bengali ShkronjÃ« Jha" 
+    2462 "Bengali ShkronjÃ« Nya" 
+    2463 "Bengali ShkronjÃ« Tta" 
+    2464 "Bengali ShkronjÃ« Ttha" 
+    2465 "Bengali ShkronjÃ« Dda" 
+    2466 "Bengali ShkronjÃ« Ddha" 
+    2467 "Bengali ShkronjÃ« Nna" 
+    2468 "Bengali ShkronjÃ« Ta" 
+    2469 "Bengali ShkronjÃ« Tha" 
+    2470 "Bengali ShkronjÃ« Da" 
+    2471 "Bengali ShkronjÃ« Dha" 
+    2472 "Bengali ShkronjÃ« Na" 
+    2474 "Bengali ShkronjÃ« Pa" 
+    2475 "Bengali ShkronjÃ« Pha" 
+    2476 "Bengali ShkronjÃ« Ba" 
+    2477 "Bengali ShkronjÃ« Bha" 
+    2478 "Bengali ShkronjÃ« Ma" 
+    2479 "Bengali ShkronjÃ« Ya" 
+    2480 "Bengali ShkronjÃ« Ra" 
+    2482 "Bengali ShkronjÃ« La" 
+    2486 "Bengali ShkronjÃ« Sha" 
+    2487 "Bengali ShkronjÃ« Ssa" 
+    2488 "Bengali ShkronjÃ« Sa" 
+    2489 "Bengali ShkronjÃ« Ha" 
+    2492 "Bengali ShenjÃ« Nukta" 
+    2493 "Bengali ShenjÃ« Avagraha" 
+    2494 "Bengali Zanore ShenjÃ« Aa" 
+    2495 "Bengali Zanore ShenjÃ« I" 
+    2496 "Bengali Zanore ShenjÃ« Ii" 
+    2497 "Bengali Zanore ShenjÃ« U" 
+    2498 "Bengali Zanore ShenjÃ« Uu" 
+    2499 "Bengali Zanore ShenjÃ« Vocalic R" 
+    2500 "Bengali Zanore ShenjÃ« Vocalic Rr" 
+    2503 "Bengali Zanore ShenjÃ« E" 
+    2504 "Bengali Zanore ShenjÃ« Ai" 
+    2507 "Bengali Zanore ShenjÃ« O" 
+    2508 "Bengali Zanore ShenjÃ« Au" 
+    2509 "Bengali ShenjÃ« Virama" 
+    2510 "Bengali ShkronjÃ« Khanda Ta" 
+    2519 "Bengali Au GjatÃ«si ShenjÃ«" 
+    2524 "Bengali ShkronjÃ« Rra" 
+    2525 "Bengali ShkronjÃ« Rha" 
+    2527 "Bengali ShkronjÃ« Yya" 
+    2528 "Bengali ShkronjÃ« Vocalic Rr" 
+    2529 "Bengali ShkronjÃ« Vocalic Ll" 
+    2530 "Bengali Zanore ShenjÃ« Vocalic L" 
+    2531 "Bengali Zanore ShenjÃ« Vocalic Ll" 
+    2534 "Bengali ShifÃ«r Zero" 
+    2535 "Bengali ShifÃ«r NjÃ«" 
+    2536 "Bengali ShifÃ«r Dy" 
+    2537 "Bengali ShifÃ«r Tre" 
+    2538 "Bengali ShifÃ«r KatÃ«r" 
+    2539 "Bengali ShifÃ«r PesÃ«" 
+    2540 "Bengali ShifÃ«r GjashtÃ«" 
+    2541 "Bengali ShifÃ«r ShtatÃ«" 
+    2542 "Bengali ShifÃ«r TetÃ«" 
+    2543 "Bengali ShifÃ«r NÃ«ntÃ«" 
+    2544 "Bengali ShkronjÃ« Ra Me Mesit Diagonal" 
+    2545 "Bengali ShkronjÃ« Ra Me e'ulÃ«t Diagonal" 
+    2546 "Bengali Rupee ShenjÃ«" 
+    2547 "Bengali Rupee ShenjÃ«" 
+    2548 "Bengali MonedhÃ« NumÃ«rator NjÃ«" 
+    2549 "Bengali MonedhÃ« NumÃ«rator Dy" 
+    2550 "Bengali MonedhÃ« NumÃ«rator Tre" 
+    2551 "Bengali MonedhÃ« NumÃ«rator KatÃ«r" 
+    2552 "Bengali MonedhÃ« NumÃ«rator NjÃ« Less Se The EmÃ«rtues" 
+    2553 "Bengali MonedhÃ« EmÃ«rtues GjashtÃ«mbÃ«dhjetÃ«" 
+    2554 "Bengali Isshar" 
+    2555 "Bengali Ganda ShenjÃ«" 
+    2561 "Gurmukhi ShenjÃ« Adak Bindi" 
+    2562 "Gurmukhi ShenjÃ« Bindi" 
+    2563 "Gurmukhi ShenjÃ« Visarga" 
+    2565 "Gurmukhi ShkronjÃ« A" 
+    2566 "Gurmukhi ShkronjÃ« Aa" 
+    2567 "Gurmukhi ShkronjÃ« I" 
+    2568 "Gurmukhi ShkronjÃ« Ii" 
+    2569 "Gurmukhi ShkronjÃ« U" 
+    2570 "Gurmukhi ShkronjÃ« Uu" 
+    2575 "Gurmukhi ShkronjÃ« Ee" 
+    2576 "Gurmukhi ShkronjÃ« Ai" 
+    2579 "Gurmukhi ShkronjÃ« Oo" 
+    2580 "Gurmukhi ShkronjÃ« Au" 
+    2581 "Gurmukhi ShkronjÃ« Ka" 
+    2582 "Gurmukhi ShkronjÃ« Kha" 
+    2583 "Gurmukhi ShkronjÃ« Ga" 
+    2584 "Gurmukhi ShkronjÃ« Gha" 
+    2585 "Gurmukhi ShkronjÃ« Nga" 
+    2586 "Gurmukhi ShkronjÃ« Ca" 
+    2587 "Gurmukhi ShkronjÃ« Cha" 
+    2588 "Gurmukhi ShkronjÃ« Ja" 
+    2589 "Gurmukhi ShkronjÃ« Jha" 
+    2590 "Gurmukhi ShkronjÃ« Nya" 
+    2591 "Gurmukhi ShkronjÃ« Tta" 
+    2592 "Gurmukhi ShkronjÃ« Ttha" 
+    2593 "Gurmukhi ShkronjÃ« Dda" 
+    2594 "Gurmukhi ShkronjÃ« Ddha" 
+    2595 "Gurmukhi ShkronjÃ« Nna" 
+    2596 "Gurmukhi ShkronjÃ« Ta" 
+    2597 "Gurmukhi ShkronjÃ« Tha" 
+    2598 "Gurmukhi ShkronjÃ« Da" 
+    2599 "Gurmukhi ShkronjÃ« Dha" 
+    2600 "Gurmukhi ShkronjÃ« Na" 
+    2602 "Gurmukhi ShkronjÃ« Pa" 
+    2603 "Gurmukhi ShkronjÃ« Pha" 
+    2604 "Gurmukhi ShkronjÃ« Ba" 
+    2605 "Gurmukhi ShkronjÃ« Bha" 
+    2606 "Gurmukhi ShkronjÃ« Ma" 
+    2607 "Gurmukhi ShkronjÃ« Ya" 
+    2608 "Gurmukhi ShkronjÃ« Ra" 
+    2610 "Gurmukhi ShkronjÃ« La" 
+    2611 "Gurmukhi ShkronjÃ« Lla" 
+    2613 "Gurmukhi ShkronjÃ« Va" 
+    2614 "Gurmukhi ShkronjÃ« Sha" 
+    2616 "Gurmukhi ShkronjÃ« Sa" 
+    2617 "Gurmukhi ShkronjÃ« Ha" 
+    2620 "Gurmukhi ShenjÃ« Nukta" 
+    2622 "Gurmukhi Zanore ShenjÃ« Aa" 
+    2623 "Gurmukhi Zanore ShenjÃ« I" 
+    2624 "Gurmukhi Zanore ShenjÃ« Ii" 
+    2625 "Gurmukhi Zanore ShenjÃ« U" 
+    2626 "Gurmukhi Zanore ShenjÃ« Uu" 
+    2631 "Gurmukhi Zanore ShenjÃ« Ee" 
+    2632 "Gurmukhi Zanore ShenjÃ« Ai" 
+    2635 "Gurmukhi Zanore ShenjÃ« Oo" 
+    2636 "Gurmukhi Zanore ShenjÃ« Au" 
+    2637 "Gurmukhi ShenjÃ« Virama" 
+    2641 "Gurmukhi ShenjÃ« Udaat" 
+    2649 "Gurmukhi ShkronjÃ« Khha" 
+    2650 "Gurmukhi ShkronjÃ« Ghha" 
+    2651 "Gurmukhi ShkronjÃ« Za" 
+    2652 "Gurmukhi ShkronjÃ« Rra" 
+    2654 "Gurmukhi ShkronjÃ« Fa" 
+    2662 "Gurmukhi ShifÃ«r Zero" 
+    2663 "Gurmukhi ShifÃ«r NjÃ«" 
+    2664 "Gurmukhi ShifÃ«r Dy" 
+    2665 "Gurmukhi ShifÃ«r Tre" 
+    2666 "Gurmukhi ShifÃ«r KatÃ«r" 
+    2667 "Gurmukhi ShifÃ«r PesÃ«" 
+    2668 "Gurmukhi ShifÃ«r GjashtÃ«" 
+    2669 "Gurmukhi ShifÃ«r ShtatÃ«" 
+    2670 "Gurmukhi ShifÃ«r TetÃ«" 
+    2671 "Gurmukhi ShifÃ«r NÃ«ntÃ«" 
+    2672 "Gurmukhi Tippi" 
+    2673 "Gurmukhi Addak" 
+    2674 "Gurmukhi Iri" 
+    2675 "Gurmukhi Ura" 
+    2676 "Gurmukhi Ek Onkar" 
+    2677 "Gurmukhi ShenjÃ« Yakash" 
+    2689 "Gujarati ShenjÃ« Candrabindu" 
+    2690 "Gujarati ShenjÃ« Anusvara" 
+    2691 "Gujarati ShenjÃ« Visarga" 
+    2693 "Gujarati ShkronjÃ« A" 
+    2694 "Gujarati ShkronjÃ« Aa" 
+    2695 "Gujarati ShkronjÃ« I" 
+    2696 "Gujarati ShkronjÃ« Ii" 
+    2697 "Gujarati ShkronjÃ« U" 
+    2698 "Gujarati ShkronjÃ« Uu" 
+    2699 "Gujarati ShkronjÃ« Vocalic R" 
+    2700 "Gujarati ShkronjÃ« Vocalic L" 
+    2701 "Gujarati Zanore Candra E" 
+    2703 "Gujarati ShkronjÃ« E" 
+    2704 "Gujarati ShkronjÃ« Ai" 
+    2705 "Gujarati Zanore Candra O" 
+    2707 "Gujarati ShkronjÃ« O" 
+    2708 "Gujarati ShkronjÃ« Au" 
+    2709 "Gujarati ShkronjÃ« Ka" 
+    2710 "Gujarati ShkronjÃ« Kha" 
+    2711 "Gujarati ShkronjÃ« Ga" 
+    2712 "Gujarati ShkronjÃ« Gha" 
+    2713 "Gujarati ShkronjÃ« Nga" 
+    2714 "Gujarati ShkronjÃ« Ca" 
+    2715 "Gujarati ShkronjÃ« Cha" 
+    2716 "Gujarati ShkronjÃ« Ja" 
+    2717 "Gujarati ShkronjÃ« Jha" 
+    2718 "Gujarati ShkronjÃ« Nya" 
+    2719 "Gujarati ShkronjÃ« Tta" 
+    2720 "Gujarati ShkronjÃ« Ttha" 
+    2721 "Gujarati ShkronjÃ« Dda" 
+    2722 "Gujarati ShkronjÃ« Ddha" 
+    2723 "Gujarati ShkronjÃ« Nna" 
+    2724 "Gujarati ShkronjÃ« Ta" 
+    2725 "Gujarati ShkronjÃ« Tha" 
+    2726 "Gujarati ShkronjÃ« Da" 
+    2727 "Gujarati ShkronjÃ« Dha" 
+    2728 "Gujarati ShkronjÃ« Na" 
+    2730 "Gujarati ShkronjÃ« Pa" 
+    2731 "Gujarati ShkronjÃ« Pha" 
+    2732 "Gujarati ShkronjÃ« Ba" 
+    2733 "Gujarati ShkronjÃ« Bha" 
+    2734 "Gujarati ShkronjÃ« Ma" 
+    2735 "Gujarati ShkronjÃ« Ya" 
+    2736 "Gujarati ShkronjÃ« Ra" 
+    2738 "Gujarati ShkronjÃ« La" 
+    2739 "Gujarati ShkronjÃ« Lla" 
+    2741 "Gujarati ShkronjÃ« Va" 
+    2742 "Gujarati ShkronjÃ« Sha" 
+    2743 "Gujarati ShkronjÃ« Ssa" 
+    2744 "Gujarati ShkronjÃ« Sa" 
+    2745 "Gujarati ShkronjÃ« Ha" 
+    2748 "Gujarati ShenjÃ« Nukta" 
+    2749 "Gujarati ShenjÃ« Avagraha" 
+    2750 "Gujarati Zanore ShenjÃ« Aa" 
+    2751 "Gujarati Zanore ShenjÃ« I" 
+    2752 "Gujarati Zanore ShenjÃ« Ii" 
+    2753 "Gujarati Zanore ShenjÃ« U" 
+    2754 "Gujarati Zanore ShenjÃ« Uu" 
+    2755 "Gujarati Zanore ShenjÃ« Vocalic R" 
+    2756 "Gujarati Zanore ShenjÃ« Vocalic Rr" 
+    2757 "Gujarati Zanore ShenjÃ« Candra E" 
+    2759 "Gujarati Zanore ShenjÃ« E" 
+    2760 "Gujarati Zanore ShenjÃ« Ai" 
+    2761 "Gujarati Zanore ShenjÃ« Candra O" 
+    2763 "Gujarati Zanore ShenjÃ« O" 
+    2764 "Gujarati Zanore ShenjÃ« Au" 
+    2765 "Gujarati ShenjÃ« Virama" 
+    2768 "Gujarati Om" 
+    2784 "Gujarati ShkronjÃ« Vocalic Rr" 
+    2785 "Gujarati ShkronjÃ« Vocalic Ll" 
+    2786 "Gujarati Zanore ShenjÃ« Vocalic L" 
+    2787 "Gujarati Zanore ShenjÃ« Vocalic Ll" 
+    2790 "Gujarati ShifÃ«r Zero" 
+    2791 "Gujarati ShifÃ«r NjÃ«" 
+    2792 "Gujarati ShifÃ«r Dy" 
+    2793 "Gujarati ShifÃ«r Tre" 
+    2794 "Gujarati ShifÃ«r KatÃ«r" 
+    2795 "Gujarati ShifÃ«r PesÃ«" 
+    2796 "Gujarati ShifÃ«r GjashtÃ«" 
+    2797 "Gujarati ShifÃ«r ShtatÃ«" 
+    2798 "Gujarati ShifÃ«r TetÃ«" 
+    2799 "Gujarati ShifÃ«r NÃ«ntÃ«" 
+    2800 "Gujarati Shkurtim ShenjÃ«" 
+    2801 "Gujarati Rupee ShenjÃ«" 
+    2817 "Oriya ShenjÃ« Candrabindu" 
+    2818 "Oriya ShenjÃ« Anusvara" 
+    2819 "Oriya ShenjÃ« Visarga" 
+    2821 "Oriya ShkronjÃ« A" 
+    2822 "Oriya ShkronjÃ« Aa" 
+    2823 "Oriya ShkronjÃ« I" 
+    2824 "Oriya ShkronjÃ« Ii" 
+    2825 "Oriya ShkronjÃ« U" 
+    2826 "Oriya ShkronjÃ« Uu" 
+    2827 "Oriya ShkronjÃ« Vocalic R" 
+    2828 "Oriya ShkronjÃ« Vocalic L" 
+    2831 "Oriya ShkronjÃ« E" 
+    2832 "Oriya ShkronjÃ« Ai" 
+    2835 "Oriya ShkronjÃ« O" 
+    2836 "Oriya ShkronjÃ« Au" 
+    2837 "Oriya ShkronjÃ« Ka" 
+    2838 "Oriya ShkronjÃ« Kha" 
+    2839 "Oriya ShkronjÃ« Ga" 
+    2840 "Oriya ShkronjÃ« Gha" 
+    2841 "Oriya ShkronjÃ« Nga" 
+    2842 "Oriya ShkronjÃ« Ca" 
+    2843 "Oriya ShkronjÃ« Cha" 
+    2844 "Oriya ShkronjÃ« Ja" 
+    2845 "Oriya ShkronjÃ« Jha" 
+    2846 "Oriya ShkronjÃ« Nya" 
+    2847 "Oriya ShkronjÃ« Tta" 
+    2848 "Oriya ShkronjÃ« Ttha" 
+    2849 "Oriya ShkronjÃ« Dda" 
+    2850 "Oriya ShkronjÃ« Ddha" 
+    2851 "Oriya ShkronjÃ« Nna" 
+    2852 "Oriya ShkronjÃ« Ta" 
+    2853 "Oriya ShkronjÃ« Tha" 
+    2854 "Oriya ShkronjÃ« Da" 
+    2855 "Oriya ShkronjÃ« Dha" 
+    2856 "Oriya ShkronjÃ« Na" 
+    2858 "Oriya ShkronjÃ« Pa" 
+    2859 "Oriya ShkronjÃ« Pha" 
+    2860 "Oriya ShkronjÃ« Ba" 
+    2861 "Oriya ShkronjÃ« Bha" 
+    2862 "Oriya ShkronjÃ« Ma" 
+    2863 "Oriya ShkronjÃ« Ya" 
+    2864 "Oriya ShkronjÃ« Ra" 
+    2866 "Oriya ShkronjÃ« La" 
+    2867 "Oriya ShkronjÃ« Lla" 
+    2869 "Oriya ShkronjÃ« Va" 
+    2870 "Oriya ShkronjÃ« Sha" 
+    2871 "Oriya ShkronjÃ« Ssa" 
+    2872 "Oriya ShkronjÃ« Sa" 
+    2873 "Oriya ShkronjÃ« Ha" 
+    2876 "Oriya ShenjÃ« Nukta" 
+    2877 "Oriya ShenjÃ« Avagraha" 
+    2878 "Oriya Zanore ShenjÃ« Aa" 
+    2879 "Oriya Zanore ShenjÃ« I" 
+    2880 "Oriya Zanore ShenjÃ« Ii" 
+    2881 "Oriya Zanore ShenjÃ« U" 
+    2882 "Oriya Zanore ShenjÃ« Uu" 
+    2883 "Oriya Zanore ShenjÃ« Vocalic R" 
+    2884 "Oriya Zanore ShenjÃ« Vocalic Rr" 
+    2887 "Oriya Zanore ShenjÃ« E" 
+    2888 "Oriya Zanore ShenjÃ« Ai" 
+    2891 "Oriya Zanore ShenjÃ« O" 
+    2892 "Oriya Zanore ShenjÃ« Au" 
+    2893 "Oriya ShenjÃ« Virama" 
+    2902 "Oriya Ai GjatÃ«si ShenjÃ«" 
+    2903 "Oriya Au GjatÃ«si ShenjÃ«" 
+    2908 "Oriya ShkronjÃ« Rra" 
+    2909 "Oriya ShkronjÃ« Rha" 
+    2911 "Oriya ShkronjÃ« Yya" 
+    2912 "Oriya ShkronjÃ« Vocalic Rr" 
+    2913 "Oriya ShkronjÃ« Vocalic Ll" 
+    2914 "Oriya Zanore ShenjÃ« Vocalic L" 
+    2915 "Oriya Zanore ShenjÃ« Vocalic Ll" 
+    2918 "Oriya ShifÃ«r Zero" 
+    2919 "Oriya ShifÃ«r NjÃ«" 
+    2920 "Oriya ShifÃ«r Dy" 
+    2921 "Oriya ShifÃ«r Tre" 
+    2922 "Oriya ShifÃ«r KatÃ«r" 
+    2923 "Oriya ShifÃ«r PesÃ«" 
+    2924 "Oriya ShifÃ«r GjashtÃ«" 
+    2925 "Oriya ShifÃ«r ShtatÃ«" 
+    2926 "Oriya ShifÃ«r TetÃ«" 
+    2927 "Oriya ShifÃ«r NÃ«ntÃ«" 
+    2928 "Oriya Isshar" 
+    2929 "Oriya ShkronjÃ« Wa" 
+    2930 "Oriya Fraksion NjÃ« Ã‡erek" 
+    2931 "Oriya Fraksion NjÃ« GjysmÃ«" 
+    2932 "Oriya Fraksion Tre Ã‡erek" 
+    2933 "Oriya Fraksion NjÃ« Sixteenth" 
+    2934 "Oriya Fraksion NjÃ« TetÃ«" 
+    2935 "Oriya Fraksion Tre Sixteenths" 
+    2946 "Tamil ShenjÃ« Anusvara" 
+    2947 "Tamil ShenjÃ« Visarga" 
+    2949 "Tamil ShkronjÃ« A" 
+    2950 "Tamil ShkronjÃ« Aa" 
+    2951 "Tamil ShkronjÃ« I" 
+    2952 "Tamil ShkronjÃ« Ii" 
+    2953 "Tamil ShkronjÃ« U" 
+    2954 "Tamil ShkronjÃ« Uu" 
+    2958 "Tamil ShkronjÃ« E" 
+    2959 "Tamil ShkronjÃ« Ee" 
+    2960 "Tamil ShkronjÃ« Ai" 
+    2962 "Tamil ShkronjÃ« O" 
+    2963 "Tamil ShkronjÃ« Oo" 
+    2964 "Tamil ShkronjÃ« Au" 
+    2965 "Tamil ShkronjÃ« Ka" 
+    2969 "Tamil ShkronjÃ« Nga" 
+    2970 "Tamil ShkronjÃ« Ca" 
+    2972 "Tamil ShkronjÃ« Ja" 
+    2974 "Tamil ShkronjÃ« Nya" 
+    2975 "Tamil ShkronjÃ« Tta" 
+    2979 "Tamil ShkronjÃ« Nna" 
+    2980 "Tamil ShkronjÃ« Ta" 
+    2984 "Tamil ShkronjÃ« Na" 
+    2985 "Tamil ShkronjÃ« Nnna" 
+    2986 "Tamil ShkronjÃ« Pa" 
+    2990 "Tamil ShkronjÃ« Ma" 
+    2991 "Tamil ShkronjÃ« Ya" 
+    2992 "Tamil ShkronjÃ« Ra" 
+    2993 "Tamil ShkronjÃ« Rra" 
+    2994 "Tamil ShkronjÃ« La" 
+    2995 "Tamil ShkronjÃ« Lla" 
+    2996 "Tamil ShkronjÃ« Llla" 
+    2997 "Tamil ShkronjÃ« Va" 
+    2998 "Tamil ShkronjÃ« Sha" 
+    2999 "Tamil ShkronjÃ« Ssa" 
+    3000 "Tamil ShkronjÃ« Sa" 
+    3001 "Tamil ShkronjÃ« Ha" 
+    3006 "Tamil Zanore ShenjÃ« Aa" 
+    3007 "Tamil Zanore ShenjÃ« I" 
+    3008 "Tamil Zanore ShenjÃ« Ii" 
+    3009 "Tamil Zanore ShenjÃ« U" 
+    3010 "Tamil Zanore ShenjÃ« Uu" 
+    3014 "Tamil Zanore ShenjÃ« E" 
+    3015 "Tamil Zanore ShenjÃ« Ee" 
+    3016 "Tamil Zanore ShenjÃ« Ai" 
+    3018 "Tamil Zanore ShenjÃ« O" 
+    3019 "Tamil Zanore ShenjÃ« Oo" 
+    3020 "Tamil Zanore ShenjÃ« Au" 
+    3021 "Tamil ShenjÃ« Virama" 
+    3024 "Tamil Om" 
+    3031 "Tamil Au GjatÃ«si ShenjÃ«" 
+    3046 "Tamil ShifÃ«r Zero" 
+    3047 "Tamil ShifÃ«r NjÃ«" 
+    3048 "Tamil ShifÃ«r Dy" 
+    3049 "Tamil ShifÃ«r Tre" 
+    3050 "Tamil ShifÃ«r KatÃ«r" 
+    3051 "Tamil ShifÃ«r PesÃ«" 
+    3052 "Tamil ShifÃ«r GjashtÃ«" 
+    3053 "Tamil ShifÃ«r ShtatÃ«" 
+    3054 "Tamil ShifÃ«r TetÃ«" 
+    3055 "Tamil ShifÃ«r NÃ«ntÃ«" 
+    3056 "Tamil NumÃ«r DhjetÃ«" 
+    3057 "Tamil NumÃ«r NjÃ« NjÃ«qind" 
+    3058 "Tamil NumÃ«r NjÃ« MijÃ«" 
+    3059 "Tamil DitÃ« ShenjÃ«" 
+    3060 "Tamil Muaj ShenjÃ«" 
+    3061 "Tamil Viti ShenjÃ«" 
+    3062 "Tamil Debit ShenjÃ«" 
+    3063 "Tamil Nderim ShenjÃ«" 
+    3064 "Tamil Aq Lart ShenjÃ«" 
+    3065 "Tamil Rupee ShenjÃ«" 
+    3066 "Tamil NumÃ«r ShenjÃ«" 
+    3073 "Telugu ShenjÃ« Candrabindu" 
+    3074 "Telugu ShenjÃ« Anusvara" 
+    3075 "Telugu ShenjÃ« Visarga" 
+    3077 "Telugu ShkronjÃ« A" 
+    3078 "Telugu ShkronjÃ« Aa" 
+    3079 "Telugu ShkronjÃ« I" 
+    3080 "Telugu ShkronjÃ« Ii" 
+    3081 "Telugu ShkronjÃ« U" 
+    3082 "Telugu ShkronjÃ« Uu" 
+    3083 "Telugu ShkronjÃ« Vocalic R" 
+    3084 "Telugu ShkronjÃ« Vocalic L" 
+    3086 "Telugu ShkronjÃ« E" 
+    3087 "Telugu ShkronjÃ« Ee" 
+    3088 "Telugu ShkronjÃ« Ai" 
+    3090 "Telugu ShkronjÃ« O" 
+    3091 "Telugu ShkronjÃ« Oo" 
+    3092 "Telugu ShkronjÃ« Au" 
+    3093 "Telugu ShkronjÃ« Ka" 
+    3094 "Telugu ShkronjÃ« Kha" 
+    3095 "Telugu ShkronjÃ« Ga" 
+    3096 "Telugu ShkronjÃ« Gha" 
+    3097 "Telugu ShkronjÃ« Nga" 
+    3098 "Telugu ShkronjÃ« Ca" 
+    3099 "Telugu ShkronjÃ« Cha" 
+    3100 "Telugu ShkronjÃ« Ja" 
+    3101 "Telugu ShkronjÃ« Jha" 
+    3102 "Telugu ShkronjÃ« Nya" 
+    3103 "Telugu ShkronjÃ« Tta" 
+    3104 "Telugu ShkronjÃ« Ttha" 
+    3105 "Telugu ShkronjÃ« Dda" 
+    3106 "Telugu ShkronjÃ« Ddha" 
+    3107 "Telugu ShkronjÃ« Nna" 
+    3108 "Telugu ShkronjÃ« Ta" 
+    3109 "Telugu ShkronjÃ« Tha" 
+    3110 "Telugu ShkronjÃ« Da" 
+    3111 "Telugu ShkronjÃ« Dha" 
+    3112 "Telugu ShkronjÃ« Na" 
+    3114 "Telugu ShkronjÃ« Pa" 
+    3115 "Telugu ShkronjÃ« Pha" 
+    3116 "Telugu ShkronjÃ« Ba" 
+    3117 "Telugu ShkronjÃ« Bha" 
+    3118 "Telugu ShkronjÃ« Ma" 
+    3119 "Telugu ShkronjÃ« Ya" 
+    3120 "Telugu ShkronjÃ« Ra" 
+    3121 "Telugu ShkronjÃ« Rra" 
+    3122 "Telugu ShkronjÃ« La" 
+    3123 "Telugu ShkronjÃ« Lla" 
+    3125 "Telugu ShkronjÃ« Va" 
+    3126 "Telugu ShkronjÃ« Sha" 
+    3127 "Telugu ShkronjÃ« Ssa" 
+    3128 "Telugu ShkronjÃ« Sa" 
+    3129 "Telugu ShkronjÃ« Ha" 
+    3133 "Telugu ShenjÃ« Avagraha" 
+    3134 "Telugu Zanore ShenjÃ« Aa" 
+    3135 "Telugu Zanore ShenjÃ« I" 
+    3136 "Telugu Zanore ShenjÃ« Ii" 
+    3137 "Telugu Zanore ShenjÃ« U" 
+    3138 "Telugu Zanore ShenjÃ« Uu" 
+    3139 "Telugu Zanore ShenjÃ« Vocalic R" 
+    3140 "Telugu Zanore ShenjÃ« Vocalic Rr" 
+    3142 "Telugu Zanore ShenjÃ« E" 
+    3143 "Telugu Zanore ShenjÃ« Ee" 
+    3144 "Telugu Zanore ShenjÃ« Ai" 
+    3146 "Telugu Zanore ShenjÃ« O" 
+    3147 "Telugu Zanore ShenjÃ« Oo" 
+    3148 "Telugu Zanore ShenjÃ« Au" 
+    3149 "Telugu ShenjÃ« Virama" 
+    3157 "Telugu GjatÃ«si ShenjÃ«" 
+    3158 "Telugu Ai GjatÃ«si ShenjÃ«" 
+    3160 "Telugu ShkronjÃ« Tsa" 
+    3161 "Telugu ShkronjÃ« Dza" 
+    3168 "Telugu ShkronjÃ« Vocalic Rr" 
+    3169 "Telugu ShkronjÃ« Vocalic Ll" 
+    3170 "Telugu Zanore ShenjÃ« Vocalic L" 
+    3171 "Telugu Zanore ShenjÃ« Vocalic Ll" 
+    3174 "Telugu ShifÃ«r Zero" 
+    3175 "Telugu ShifÃ«r NjÃ«" 
+    3176 "Telugu ShifÃ«r Dy" 
+    3177 "Telugu ShifÃ«r Tre" 
+    3178 "Telugu ShifÃ«r KatÃ«r" 
+    3179 "Telugu ShifÃ«r PesÃ«" 
+    3180 "Telugu ShifÃ«r GjashtÃ«" 
+    3181 "Telugu ShifÃ«r ShtatÃ«" 
+    3182 "Telugu ShifÃ«r TetÃ«" 
+    3183 "Telugu ShifÃ«r NÃ«ntÃ«" 
+    3192 "Telugu Fraksion ShifÃ«r Zero PÃ«r ForcÃ« Probabiliteti KatÃ«r" 
+    3193 "Telugu Fraksion ShifÃ«r NjÃ« PÃ«r ForcÃ« Probabiliteti KatÃ«r" 
+    3194 "Telugu Fraksion ShifÃ«r Dy PÃ«r ForcÃ« Probabiliteti KatÃ«r" 
+    3195 "Telugu Fraksion ShifÃ«r Tre PÃ«r ForcÃ« Probabiliteti KatÃ«r" 
+    3196 "Telugu Fraksion ShifÃ«r NjÃ« PÃ«r ForcÃ« Probabiliteti KatÃ«r" 
+    3197 "Telugu Fraksion ShifÃ«r Dy PÃ«r ForcÃ« Probabiliteti KatÃ«r" 
+    3198 "Telugu Fraksion ShifÃ«r Tre PÃ«r  ForcÃ« Probabiliteti BarabartÃ« me KatÃ«r" 
+    3199 "Telugu ShenjÃ« Tuumu" 
+    3202 "Kanada ShenjÃ« Anusvara" 
+    3203 "Kanada ShenjÃ« Visarga" 
+    3205 "Kanada ShkronjÃ« A" 
+    3206 "Kanada ShkronjÃ« Aa" 
+    3207 "Kanada ShkronjÃ« I" 
+    3208 "Kanada ShkronjÃ« Ii" 
+    3209 "Kanada ShkronjÃ« U" 
+    3210 "Kanada ShkronjÃ« Uu" 
+    3211 "Kanada ShkronjÃ« Vocalic R" 
+    3212 "Kanada ShkronjÃ« Vocalic L" 
+    3214 "Kanada ShkronjÃ« E" 
+    3215 "Kanada ShkronjÃ« Ee" 
+    3216 "Kanada ShkronjÃ« Ai" 
+    3218 "Kanada ShkronjÃ« O" 
+    3219 "Kanada ShkronjÃ« Oo" 
+    3220 "Kanada ShkronjÃ« Au" 
+    3221 "Kanada ShkronjÃ« Ka" 
+    3222 "Kanada ShkronjÃ« Kha" 
+    3223 "Kanada ShkronjÃ« Ga" 
+    3224 "Kanada ShkronjÃ« Gha" 
+    3225 "Kanada ShkronjÃ« Nga" 
+    3226 "Kanada ShkronjÃ« Ca" 
+    3227 "Kanada ShkronjÃ« Cha" 
+    3228 "Kanada ShkronjÃ« Ja" 
+    3229 "Kanada ShkronjÃ« Jha" 
+    3230 "Kanada ShkronjÃ« Nya" 
+    3231 "Kanada ShkronjÃ« Tta" 
+    3232 "Kanada ShkronjÃ« Ttha" 
+    3233 "Kanada ShkronjÃ« Dda" 
+    3234 "Kanada ShkronjÃ« Ddha" 
+    3235 "Kanada ShkronjÃ« Nna" 
+    3236 "Kanada ShkronjÃ« Ta" 
+    3237 "Kanada ShkronjÃ« Tha" 
+    3238 "Kanada ShkronjÃ« Da" 
+    3239 "Kanada ShkronjÃ« Dha" 
+    3240 "Kanada ShkronjÃ« Na" 
+    3242 "Kanada ShkronjÃ« Pa" 
+    3243 "Kanada ShkronjÃ« Pha" 
+    3244 "Kanada ShkronjÃ« Ba" 
+    3245 "Kanada ShkronjÃ« Bha" 
+    3246 "Kanada ShkronjÃ« Ma" 
+    3247 "Kanada ShkronjÃ« Ya" 
+    3248 "Kanada ShkronjÃ« Ra" 
+    3249 "Kanada ShkronjÃ« Rra" 
+    3250 "Kanada ShkronjÃ« La" 
+    3251 "Kanada ShkronjÃ« Lla" 
+    3253 "Kanada ShkronjÃ« Va" 
+    3254 "Kanada ShkronjÃ« Sha" 
+    3255 "Kanada ShkronjÃ« Ssa" 
+    3256 "Kanada ShkronjÃ« Sa" 
+    3257 "Kanada ShkronjÃ« Ha" 
+    3260 "Kanada ShenjÃ« Nukta" 
+    3261 "Kanada ShenjÃ« Avagraha" 
+    3262 "Kanada Zanore ShenjÃ« Aa" 
+    3263 "Kanada Zanore ShenjÃ« I" 
+    3264 "Kanada Zanore ShenjÃ« Ii" 
+    3265 "Kanada Zanore ShenjÃ« U" 
+    3266 "Kanada Zanore ShenjÃ« Uu" 
+    3267 "Kanada Zanore ShenjÃ« Vocalic R" 
+    3268 "Kanada Zanore ShenjÃ« Vocalic Rr" 
+    3270 "Kanada Zanore ShenjÃ« E" 
+    3271 "Kanada Zanore ShenjÃ« Ee" 
+    3272 "Kanada Zanore ShenjÃ« Ai" 
+    3274 "Kanada Zanore ShenjÃ« O" 
+    3275 "Kanada Zanore ShenjÃ« Oo" 
+    3276 "Kanada Zanore ShenjÃ« Au" 
+    3277 "Kanada ShenjÃ« Virama" 
+    3285 "Kanada GjatÃ«si ShenjÃ«" 
+    3286 "Kanada Ai GjatÃ«si ShenjÃ«" 
+    3294 "Kanada ShkronjÃ« Fa" 
+    3296 "Kanada ShkronjÃ« Vocalic Rr" 
+    3297 "Kanada ShkronjÃ« Vocalic Ll" 
+    3298 "Kanada Zanore ShenjÃ« Vocalic L" 
+    3299 "Kanada Zanore ShenjÃ« Vocalic Ll" 
+    3302 "Kanada ShifÃ«r Zero" 
+    3303 "Kanada ShifÃ«r NjÃ«" 
+    3304 "Kanada ShifÃ«r Dy" 
+    3305 "Kanada ShifÃ«r Tre" 
+    3306 "Kanada ShifÃ«r KatÃ«r" 
+    3307 "Kanada ShifÃ«r PesÃ«" 
+    3308 "Kanada ShifÃ«r GjashtÃ«" 
+    3309 "Kanada ShifÃ«r ShtatÃ«" 
+    3310 "Kanada ShifÃ«r TetÃ«" 
+    3311 "Kanada ShifÃ«r NÃ«ntÃ«" 
+    3313 "Kanada ShenjÃ« Jihvamuliya" 
+    3314 "Kanada ShenjÃ« Upadhmaniya" 
+    3330 "Malayalam ShenjÃ« Anusvara" 
+    3331 "Malayalam ShenjÃ« Visarga" 
+    3333 "Malayalam ShkronjÃ« A" 
+    3334 "Malayalam ShkronjÃ« Aa" 
+    3335 "Malayalam ShkronjÃ« I" 
+    3336 "Malayalam ShkronjÃ« Ii" 
+    3337 "Malayalam ShkronjÃ« U" 
+    3338 "Malayalam ShkronjÃ« Uu" 
+    3339 "Malayalam ShkronjÃ« Vocalic R" 
+    3340 "Malayalam ShkronjÃ« Vocalic L" 
+    3342 "Malayalam ShkronjÃ« E" 
+    3343 "Malayalam ShkronjÃ« Ee" 
+    3344 "Malayalam ShkronjÃ« Ai" 
+    3346 "Malayalam ShkronjÃ« O" 
+    3347 "Malayalam ShkronjÃ« Oo" 
+    3348 "Malayalam ShkronjÃ« Au" 
+    3349 "Malayalam ShkronjÃ« Ka" 
+    3350 "Malayalam ShkronjÃ« Kha" 
+    3351 "Malayalam ShkronjÃ« Ga" 
+    3352 "Malayalam ShkronjÃ« Gha" 
+    3353 "Malayalam ShkronjÃ« Nga" 
+    3354 "Malayalam ShkronjÃ« Ca" 
+    3355 "Malayalam ShkronjÃ« Cha" 
+    3356 "Malayalam ShkronjÃ« Ja" 
+    3357 "Malayalam ShkronjÃ« Jha" 
+    3358 "Malayalam ShkronjÃ« Nya" 
+    3359 "Malayalam ShkronjÃ« Tta" 
+    3360 "Malayalam ShkronjÃ« Ttha" 
+    3361 "Malayalam ShkronjÃ« Dda" 
+    3362 "Malayalam ShkronjÃ« Ddha" 
+    3363 "Malayalam ShkronjÃ« Nna" 
+    3364 "Malayalam ShkronjÃ« Ta" 
+    3365 "Malayalam ShkronjÃ« Tha" 
+    3366 "Malayalam ShkronjÃ« Da" 
+    3367 "Malayalam ShkronjÃ« Dha" 
+    3368 "Malayalam ShkronjÃ« Na" 
+    3369 "Malayalam ShkronjÃ« Nnna" 
+    3370 "Malayalam ShkronjÃ« Pa" 
+    3371 "Malayalam ShkronjÃ« Pha" 
+    3372 "Malayalam ShkronjÃ« Ba" 
+    3373 "Malayalam ShkronjÃ« Bha" 
+    3374 "Malayalam ShkronjÃ« Ma" 
+    3375 "Malayalam ShkronjÃ« Ya" 
+    3376 "Malayalam ShkronjÃ« Ra" 
+    3377 "Malayalam ShkronjÃ« Rra" 
+    3378 "Malayalam ShkronjÃ« La" 
+    3379 "Malayalam ShkronjÃ« Lla" 
+    3380 "Malayalam ShkronjÃ« Llla" 
+    3381 "Malayalam ShkronjÃ« Va" 
+    3382 "Malayalam ShkronjÃ« Sha" 
+    3383 "Malayalam ShkronjÃ« Ssa" 
+    3384 "Malayalam ShkronjÃ« Sa" 
+    3385 "Malayalam ShkronjÃ« Ha" 
+    3386 "Malayalam ShkronjÃ« Ttta" 
+    3389 "Malayalam ShenjÃ« Avagraha" 
+    3390 "Malayalam Zanore ShenjÃ« Aa" 
+    3391 "Malayalam Zanore ShenjÃ« I" 
+    3392 "Malayalam Zanore ShenjÃ« Ii" 
+    3393 "Malayalam Zanore ShenjÃ« U" 
+    3394 "Malayalam Zanore ShenjÃ« Uu" 
+    3395 "Malayalam Zanore ShenjÃ« Vocalic R" 
+    3396 "Malayalam Zanore ShenjÃ« Vocalic Rr" 
+    3398 "Malayalam Zanore ShenjÃ« E" 
+    3399 "Malayalam Zanore ShenjÃ« Ee" 
+    3400 "Malayalam Zanore ShenjÃ« Ai" 
+    3402 "Malayalam Zanore ShenjÃ« O" 
+    3403 "Malayalam Zanore ShenjÃ« Oo" 
+    3404 "Malayalam Zanore ShenjÃ« Au" 
+    3405 "Malayalam ShenjÃ« Virama" 
+    3406 "Malayalam ShkronjÃ« PikÃ« Reph" 
+    3415 "Malayalam Au GjatÃ«si ShenjÃ«" 
+    3424 "Malayalam ShkronjÃ« Vocalic Rr" 
+    3425 "Malayalam ShkronjÃ« Vocalic Ll" 
+    3426 "Malayalam Zanore ShenjÃ« Vocalic L" 
+    3427 "Malayalam Zanore ShenjÃ« Vocalic Ll" 
+    3430 "Malayalam ShifÃ«r Zero" 
+    3431 "Malayalam ShifÃ«r NjÃ«" 
+    3432 "Malayalam ShifÃ«r Dy" 
+    3433 "Malayalam ShifÃ«r Tre" 
+    3434 "Malayalam ShifÃ«r KatÃ«r" 
+    3435 "Malayalam ShifÃ«r PesÃ«" 
+    3436 "Malayalam ShifÃ«r GjashtÃ«" 
+    3437 "Malayalam ShifÃ«r ShtatÃ«" 
+    3438 "Malayalam ShifÃ«r TetÃ«" 
+    3439 "Malayalam ShifÃ«r NÃ«ntÃ«" 
+    3440 "Malayalam NumÃ«r DhjetÃ«" 
+    3441 "Malayalam NumÃ«r NjÃ« NjÃ«qind" 
+    3442 "Malayalam NumÃ«r NjÃ« MijÃ«" 
+    3443 "Malayalam Fraksion NjÃ« Ã‡erek" 
+    3444 "Malayalam Fraksion NjÃ« GjysmÃ«" 
+    3445 "Malayalam Fraksion Tre Ã‡erek" 
+    3449 "Malayalam Date ShenjÃ«" 
+    3450 "Malayalam ShkronjÃ« Chillu Nn" 
+    3451 "Malayalam ShkronjÃ« Chillu N" 
+    3452 "Malayalam ShkronjÃ« Chillu Rr" 
+    3453 "Malayalam ShkronjÃ« Chillu L" 
+    3454 "Malayalam ShkronjÃ« Chillu Ll" 
+    3455 "Malayalam ShkronjÃ« Chillu K" 
+    3458 "Senegaleze ShenjÃ« Anusvaraya" 
+    3459 "Senegaleze ShenjÃ« Visargaya" 
+    3461 "Senegaleze ShkronjÃ« Ayanna" 
+    3462 "Senegaleze ShkronjÃ« Aayanna" 
+    3463 "Senegaleze ShkronjÃ« Aeyanna" 
+    3464 "Senegaleze ShkronjÃ« Aeeyanna" 
+    3465 "Senegaleze ShkronjÃ« Iyanna" 
+    3466 "Senegaleze ShkronjÃ« Iiyanna" 
+    3467 "Senegaleze ShkronjÃ« Uyanna" 
+    3468 "Senegaleze ShkronjÃ« Uuyanna" 
+    3469 "Senegaleze ShkronjÃ« Iruyanna" 
+    3470 "Senegaleze ShkronjÃ« Iruuyanna" 
+    3471 "Senegaleze ShkronjÃ« Iluyanna" 
+    3472 "Senegaleze ShkronjÃ« Iluuyanna" 
+    3473 "Senegaleze ShkronjÃ« Eyanna" 
+    3474 "Senegaleze ShkronjÃ« Eeyanna" 
+    3475 "Senegaleze ShkronjÃ« Aiyanna" 
+    3476 "Senegaleze ShkronjÃ« Oyanna" 
+    3477 "Senegaleze ShkronjÃ« Ooyanna" 
+    3478 "Senegaleze ShkronjÃ« Auyanna" 
+    3482 "Senegaleze ShkronjÃ« Alpapraana Kayanna" 
+    3483 "Senegaleze ShkronjÃ« Mahaapraana Kayanna" 
+    3484 "Senegaleze ShkronjÃ« Alpapraana Gayanna" 
+    3485 "Senegaleze ShkronjÃ« Mahaapraana Gayanna" 
+    3486 "Senegaleze ShkronjÃ« Kantaja Naasikyaya" 
+    3487 "Senegaleze ShkronjÃ« Sanyaka Gayanna" 
+    3488 "Senegaleze ShkronjÃ« Alpapraana Cayanna" 
+    3489 "Senegaleze ShkronjÃ« Mahaapraana Cayanna" 
+    3490 "Senegaleze ShkronjÃ« Alpapraana Jayanna" 
+    3491 "Senegaleze ShkronjÃ« Mahaapraana Jayanna" 
+    3492 "Senegaleze ShkronjÃ« Taaluja Naasikyaya" 
+    3493 "Senegaleze ShkronjÃ« Taaluja Sanyooga Naaksikyaya" 
+    3494 "Senegaleze ShkronjÃ« Sanyaka Jayanna" 
+    3495 "Senegaleze ShkronjÃ« Alpapraana Ttayanna" 
+    3496 "Senegaleze ShkronjÃ« Mahaapraana Ttayanna" 
+    3497 "Senegaleze ShkronjÃ« Alpapraana Ddayanna" 
+    3498 "Senegaleze ShkronjÃ« Mahaapraana Ddayanna" 
+    3499 "Senegaleze ShkronjÃ« Muurdhaja Nayanna" 
+    3500 "Senegaleze ShkronjÃ« Sanyaka Ddayanna" 
+    3501 "Senegaleze ShkronjÃ« Alpapraana Tayanna" 
+    3502 "Senegaleze ShkronjÃ« Mahaapraana Tayanna" 
+    3503 "Senegaleze ShkronjÃ« Alpapraana Dayanna" 
+    3504 "Senegaleze ShkronjÃ« Mahaapraana Dayanna" 
+    3505 "Senegaleze ShkronjÃ« Dantaja Nayanna" 
+    3507 "Senegaleze ShkronjÃ« Sanyaka Dayanna" 
+    3508 "Senegaleze ShkronjÃ« Alpapraana Payanna" 
+    3509 "Senegaleze ShkronjÃ« Mahaapraana Payanna" 
+    3510 "Senegaleze ShkronjÃ« Alpapraana Bayanna" 
+    3511 "Senegaleze ShkronjÃ« Mahaapraana Bayanna" 
+    3512 "Senegaleze ShkronjÃ« Mayanna" 
+    3513 "Senegaleze ShkronjÃ« Amba Bayanna" 
+    3514 "Senegaleze ShkronjÃ« Yayanna" 
+    3515 "Senegaleze ShkronjÃ« Rayanna" 
+    3517 "Senegaleze ShkronjÃ« Dantaja Layanna" 
+    3520 "Senegaleze ShkronjÃ« Vayanna" 
+    3521 "Senegaleze ShkronjÃ« Taaluja Sayanna" 
+    3522 "Senegaleze ShkronjÃ« Muurdhaja Sayanna" 
+    3523 "Senegaleze ShkronjÃ« Dantaja Sayanna" 
+    3524 "Senegaleze ShkronjÃ« Hayanna" 
+    3525 "Senegaleze ShkronjÃ« Muurdhaja Layanna" 
+    3526 "Senegaleze ShkronjÃ« Fayanna" 
+    3530 "Senegaleze ShenjÃ« Al-Lakuna" 
+    3535 "Senegaleze Zanore ShenjÃ« Aela-Pilla" 
+    3536 "Senegaleze Zanore ShenjÃ« Ketti Aeda-Pilla" 
+    3537 "Senegaleze Zanore ShenjÃ« Diga Aeda-Pilla" 
+    3538 "Senegaleze Zanore ShenjÃ« Ketti Is-Pilla" 
+    3539 "Senegaleze Zanore ShenjÃ« Diga Is-Pilla" 
+    3540 "Senegaleze Zanore ShenjÃ« Ketti Paa-Pilla" 
+    3542 "Senegaleze Zanore ShenjÃ« Diga Paa-Pilla" 
+    3544 "Senegaleze Zanore ShenjÃ« Gaetta-Pilla" 
+    3545 "Senegaleze Zanore ShenjÃ« Kombuva" 
+    3546 "Senegaleze Zanore ShenjÃ« Diga Kombuva" 
+    3547 "Senegaleze Zanore ShenjÃ« Kombu Deka" 
+    3548 "Senegaleze Zanore ShenjÃ« Kombuva Haa Aela-Pilla" 
+    3549 "Senegaleze Zanore ShenjÃ« Kombuva Haa Diga Aela-Pilla" 
+    3550 "Senegaleze Zanore ShenjÃ« Kombuva Haa Gayanukitta" 
+    3551 "Senegaleze Zanore ShenjÃ« Gayanukitta" 
+    3570 "Senegaleze Zanore ShenjÃ« Diga Gaetta-Pilla" 
+    3571 "Senegaleze Zanore ShenjÃ« Diga Gayanukitta" 
+    3572 "Senegaleze PikÃ«sim Kunddaliya" 
+    3585 "Tajlandeze Karakter Ko Kai" 
+    3586 "Tajlandeze Karakter Kho Khai" 
+    3587 "Tajlandeze Karakter Kho Khuat" 
+    3588 "Tajlandeze Karakter Kho Khwai" 
+    3589 "Tajlandeze Karakter Kho Khon" 
+    3590 "Tajlandeze Karakter Kho Rakhang" 
+    3591 "Tajlandeze Karakter Ngo Ngu" 
+    3592 "Tajlandeze Karakter Cho Chan" 
+    3593 "Tajlandeze Karakter Cho Ching" 
+    3594 "Tajlandeze Karakter Cho Chang"
+    3595 "Tajlandeze Karakter So So" 
+    3596 "Tajlandeze Karakter Cho Choe" 
+    3597 "Tajlandeze Karakter Yo Ying" 
+    3598 "Tajlandeze Karakter Do Chada" 
+    3599 "Tajlandeze Karakter To Patak" 
+    3600 "Tajlandeze Karakter Tho Se" 
+    3601 "Tajlandeze Karakter Tho Nangmontho" 
+    3602 "Tajlandeze Karakter Tho Phuthao" 
+    3603 "Tajlandeze Karakter No Nen" 
+    3604 "Tajlandeze Karakter Do Dek" 
+    3605 "Tajlandeze Karakter To Tao" 
+    3606 "Tajlandeze Karakter Tho Thung" 
+    3607 "Tajlandeze Karakter Tho Thahan" 
+    3608 "Tajlandeze Karakter Tho Thong" 
+    3609 "Tajlandeze Karakter No Nu" 
+    3610 "Tajlandeze Karakter Bo Baimai" 
+    3611 "Tajlandeze Karakter Po Pla" 
+    3612 "Tajlandeze Karakter Pho Phung" 
+    3613 "Tajlandeze Karakter Fo Fa" 
+    3614 "Tajlandeze Karakter Pho Phan" 
+    3615 "Tajlandeze Karakter Fo Fan" 
+    3616 "Tajlandeze Karakter Pho Samphao" 
+    3617 "Tajlandeze Karakter Mo Ma" 
+    3618 "Tajlandeze Karakter Yo Yak" 
+    3619 "Tajlandeze Karakter Ro Rua" 
+    3620 "Tajlandeze Karakter Ru" 
+    3621 "Tajlandeze Karakter Lo Ling" 
+    3622 "Tajlandeze Karakter Lu" 
+    3623 "Tajlandeze Karakter Wo Waen" 
+    3624 "Tajlandeze Karakter So Sala" 
+    3625 "Tajlandeze Karakter So Rusi" 
+    3626 "Tajlandeze Karakter So Sua" 
+    3627 "Tajlandeze Karakter Ho Hip" 
+    3628 "Tajlandeze Karakter Lo Chula" 
+    3629 "Tajlandeze Karakter O Ang" 
+    3630 "Tajlandeze Karakter Ho Nokhuk" 
+    3631 "Tajlandeze Karakter Paiyannoi" 
+    3632 "Tajlandeze Karakter Sara A" 
+    3633 "Tajlandeze Karakter Mai Han-Akat" 
+    3634 "Tajlandeze Karakter Sara Aa" 
+    3635 "Tajlandeze Karakter Sara Am" 
+    3636 "Tajlandeze Karakter Sara I" 
+    3637 "Tajlandeze Karakter Sara Ii" 
+    3638 "Tajlandeze Karakter Sara Ue" 
+    3639 "Tajlandeze Karakter Sara Uee" 
+    3640 "Tajlandeze Karakter Sara U" 
+    3641 "Tajlandeze Karakter Sara Uu" 
+    3642 "Tajlandeze Karakter Phinthu" 
+    3647 "Tajlandeze MonedhÃ« Simbol Baht" 
+    3648 "Tajlandeze Karakter Sara E" 
+    3649 "Tajlandeze Karakter Sara Ae" 
+    3650 "Tajlandeze Karakter Sara O" 
+    3651 "Tajlandeze Karakter Sara Ai Maimuan" 
+    3652 "Tajlandeze Karakter Sara Ai Maimalai" 
+    3653 "Tajlandeze Karakter Lakkhangyao" 
+    3654 "Tajlandeze Karakter Maiyamok" 
+    3655 "Tajlandeze Karakter Maitaikhu" 
+    3656 "Tajlandeze Karakter Mai Ek" 
+    3657 "Tajlandeze Karakter Mai Tho" 
+    3658 "Tajlandeze Karakter Mai Tri" 
+    3659 "Tajlandeze Karakter Mai Chattawa" 
+    3660 "Tajlandeze Karakter Thanthakhat" 
+    3661 "Tajlandeze Karakter Nikhahit" 
+    3662 "Tajlandeze Karakter Yamakkan" 
+    3663 "Tajlandeze Karakter Fongman" 
+    3664 "Tajlandeze ShifÃ«r Zero" 
+    3665 "Tajlandeze ShifÃ«r NjÃ«" 
+    3666 "Tajlandeze ShifÃ«r Dy" 
+    3667 "Tajlandeze ShifÃ«r Tre" 
+    3668 "Tajlandeze ShifÃ«r KatÃ«r" 
+    3669 "Tajlandeze ShifÃ«r PesÃ«" 
+    3670 "Tajlandeze ShifÃ«r GjashtÃ«" 
+    3671 "Tajlandeze ShifÃ«r ShtatÃ«" 
+    3672 "Tajlandeze ShifÃ«r TetÃ«" 
+    3673 "Tajlandeze ShifÃ«r NÃ«ntÃ«" 
+    3674 "Tajlandeze Karakter Angkhankhu" 
+    3675 "Tajlandeze Karakter Khomut" 
+    3713 "Lao ShkronjÃ« Ko" 
+    3714 "Lao ShkronjÃ« Kho Sung" 
+    3716 "Lao ShkronjÃ« Kho Tam" 
+    3719 "Lao ShkronjÃ« Ngo" 
+    3720 "Lao ShkronjÃ« Co" 
+    3722 "Lao ShkronjÃ« So Tam" 
+    3725 "Lao ShkronjÃ« Nyo" 
+    3732 "Lao ShkronjÃ« Do" 
+    3733 "Lao ShkronjÃ« To" 
+    3734 "Lao ShkronjÃ« Tho Sung" 
+    3735 "Lao ShkronjÃ« Tho Tam" 
+    3737 "Lao ShkronjÃ« No" 
+    3738 "Lao ShkronjÃ« Bo" 
+    3739 "Lao ShkronjÃ« Po" 
+    3740 "Lao ShkronjÃ« Pho Sung" 
+    3741 "Lao ShkronjÃ« Fo Tam" 
+    3742 "Lao ShkronjÃ« Pho Tam" 
+    3743 "Lao ShkronjÃ« Fo Sung" 
+    3745 "Lao ShkronjÃ« Mo" 
+    3746 "Lao ShkronjÃ« Yo" 
+    3747 "Lao ShkronjÃ« Lo Ling" 
+    3749 "Lao ShkronjÃ« Lo Loot" 
+    3751 "Lao ShkronjÃ« Wo" 
+    3754 "Lao ShkronjÃ« So Sung" 
+    3755 "Lao ShkronjÃ« Ho Sung" 
+    3757 "Lao ShkronjÃ« O" 
+    3758 "Lao ShkronjÃ« Ho Tam" 
+    3759 "Lao Ellipsis" 
+    3760 "Lao Zanore ShenjÃ« A" 
+    3761 "Lao Zanore ShenjÃ« Mai Kan" 
+    3762 "Lao Zanore ShenjÃ« Aa" 
+    3763 "Lao Zanore ShenjÃ« Am" 
+    3764 "Lao Zanore ShenjÃ« I" 
+    3765 "Lao Zanore ShenjÃ« Ii" 
+    3766 "Lao Zanore ShenjÃ« Y" 
+    3767 "Lao Zanore ShenjÃ« Yy" 
+    3768 "Lao Zanore ShenjÃ« U" 
+    3769 "Lao Zanore ShenjÃ« Uu" 
+    3771 "Lao Zanore ShenjÃ« Mai Kon" 
+    3772 "Lao SemiZanore ShenjÃ« Lo" 
+    3773 "Lao SemiZanore ShenjÃ« Nyo" 
+    3776 "Lao Zanore ShenjÃ« E" 
+    3777 "Lao Zanore ShenjÃ« Ei" 
+    3778 "Lao Zanore ShenjÃ« O" 
+    3779 "Lao Zanore ShenjÃ« Ay" 
+    3780 "Lao Zanore ShenjÃ« Ai" 
+    3782 "Lao Ko La" 
+    3784 "Lao Tone Mai Ek" 
+    3785 "Lao Tone Mai Tho" 
+    3786 "Lao Tone Mai Ti" 
+    3787 "Lao Tone Mai Catawa" 
+    3788 "Lao Cancellation ShenjÃ«" 
+    3789 "Lao Niggahita" 
+    3792 "Lao ShifÃ«r Zero" 
+    3793 "Lao ShifÃ«r NjÃ«" 
+    3794 "Lao ShifÃ«r Dy" 
+    3795 "Lao ShifÃ«r Tre" 
+    3796 "Lao ShifÃ«r KatÃ«r" 
+    3797 "Lao ShifÃ«r PesÃ«" 
+    3798 "Lao ShifÃ«r GjashtÃ«" 
+    3799 "Lao ShifÃ«r ShtatÃ«" 
+    3800 "Lao ShifÃ«r TetÃ«" 
+    3801 "Lao ShifÃ«r NÃ«ntÃ«" 
+    3804 "Lao Ho No" 
+    3805 "Lao Ho Mo" 
+    3806 "Lao ShkronjÃ« Khmu Go" 
+    3807 "Lao ShkronjÃ« Khmu Nyo" 
+    3840 "Tibetian Rrokje Om" 
+    3841 "Tibetian ShenjÃ« Gter Yig Mgo Truncated A" 
+    3842 "Tibetian ShenjÃ« Gter Yig Mgo -Um Rnam Bcad Ma" 
+    3843 "Tibetian ShenjÃ« Gter Yig Mgo -Um Gter Tsheg Ma" 
+    3844 "Tibetian ShenjÃ« Fillestar Yig Mgo Mdun Ma" 
+    3845 "Tibetian ShenjÃ« Closing Yig Mgo Sgab Ma" 
+    3846 "Tibetian ShenjÃ« Caret Yig Mgo Phur Shad Ma" 
+    3847 "Tibetian ShenjÃ« Yig Mgo Tsheg Shad Ma" 
+    3848 "Tibetian ShenjÃ« Sbrul Shad" 
+    3849 "Tibetian ShenjÃ« Bskur Yig Mgo" 
+    3850 "Tibetian ShenjÃ« Bka- Shog Yig Mgo" 
+    3851 "Tibetian ShenjÃ« Intersyllabic Tsheg" 
+    3852 "Tibetian ShenjÃ« Delimiter Tsheg Bstar" 
+    3853 "Tibetian ShenjÃ« Shad" 
+    3854 "Tibetian ShenjÃ« Nyis Shad" 
+    3855 "Tibetian ShenjÃ« Tsheg Shad" 
+    3856 "Tibetian ShenjÃ« Nyis Tsheg Shad" 
+    3857 "Tibetian ShenjÃ« Rin Chen Spungs Shad" 
+    3858 "Tibetian ShenjÃ« Rgya Gram Shad" 
+    3859 "Tibetian ShenjÃ« Caret -Dzud Rtags Me GjatÃ« Can" 
+    3860 "Tibetian ShenjÃ« Gter Tsheg" 
+    3861 "Tibetian Tipi-GjatÃ« ShenjÃ« Chad Rtags" 
+    3862 "Tibetian Tipi-GjatÃ« ShenjÃ« Lhag Rtags" 
+    3863 "Tibetian Astrologjie ShenjÃ« Sgra Gcan -Char Rtags" 
+    3864 "Tibetian Astrologjie ShenjÃ« -Khyud Pa" 
+    3865 "Tibetian Astrologjie ShenjÃ« Sdong Tshugs" 
+    3866 "Tibetian ShenjÃ« Rdel Dkar Gcig" 
+    3867 "Tibetian ShenjÃ« Rdel Dkar Gnyis" 
+    3868 "Tibetian ShenjÃ« Rdel Dkar Gsum" 
+    3869 "Tibetian ShenjÃ« Rdel Nag Gcig" 
+    3870 "Tibetian ShenjÃ« Rdel Nag Gnyis" 
+    3871 "Tibetian ShenjÃ« Rdel Dkar Rdel Nag" 
+    3872 "Tibetian ShifÃ«r Zero" 
+    3873 "Tibetian ShifÃ«r NjÃ«" 
+    3874 "Tibetian ShifÃ«r Dy" 
+    3875 "Tibetian ShifÃ«r Tre" 
+    3876 "Tibetian ShifÃ«r KatÃ«r" 
+    3877 "Tibetian ShifÃ«r PesÃ«" 
+    3878 "Tibetian ShifÃ«r GjashtÃ«" 
+    3879 "Tibetian ShifÃ«r ShtatÃ«" 
+    3880 "Tibetian ShifÃ«r TetÃ«" 
+    3881 "Tibetian ShifÃ«r NÃ«ntÃ«" 
+    3882 "Tibetian ShifÃ«r GjysmÃ« NjÃ«" 
+    3883 "Tibetian ShifÃ«r GjysmÃ« Dy" 
+    3884 "Tibetian ShifÃ«r GjysmÃ« Tre" 
+    3885 "Tibetian ShifÃ«r GjysmÃ« KatÃ«r" 
+    3886 "Tibetian ShifÃ«r GjysmÃ« PesÃ«" 
+    3887 "Tibetian ShifÃ«r GjysmÃ« GjashtÃ«" 
+    3888 "Tibetian ShifÃ«r GjysmÃ« ShtatÃ«" 
+    3889 "Tibetian ShifÃ«r GjysmÃ« TetÃ«" 
+    3890 "Tibetian ShifÃ«r GjysmÃ« NÃ«ntÃ«" 
+    3891 "Tibetian ShifÃ«r GjysmÃ« Zero" 
+    3892 "Tibetian ShenjÃ« Bsdus Rtags" 
+    3893 "Tibetian ShenjÃ« Ngas Bzung Nyi Zla" 
+    3894 "Tibetian ShenjÃ« Caret -Dzud Rtags Bzhi Mig Can" 
+    3895 "Tibetian ShenjÃ« Ngas Bzung Sgor Rtags" 
+    3896 "Tibetian ShenjÃ« Che Mgo" 
+    3897 "Tibetian ShenjÃ« Tsa -Phru" 
+    3898 "Tibetian ShenjÃ« Gug Rtags Gyon" 
+    3899 "Tibetian ShenjÃ« Gug Rtags Gyas" 
+    3900 "Tibetian ShenjÃ« Ang Khang Gyon" 
+    3901 "Tibetian ShenjÃ« Ang Khang Gyas" 
+    3902 "Tibetian ShenjÃ« Yar Tshes" 
+    3903 "Tibetian ShenjÃ« Mar Tshes" 
+    3904 "Tibetian ShkronjÃ« Ka" 
+    3905 "Tibetian ShkronjÃ« Kha" 
+    3906 "Tibetian ShkronjÃ« Ga" 
+    3907 "Tibetian ShkronjÃ« Gha" 
+    3908 "Tibetian ShkronjÃ« Nga" 
+    3909 "Tibetian ShkronjÃ« Ca" 
+    3910 "Tibetian ShkronjÃ« Cha" 
+    3911 "Tibetian ShkronjÃ« Ja" 
+    3913 "Tibetian ShkronjÃ« Nya" 
+    3914 "Tibetian ShkronjÃ« Tta" 
+    3915 "Tibetian ShkronjÃ« Ttha" 
+    3916 "Tibetian ShkronjÃ« Dda" 
+    3917 "Tibetian ShkronjÃ« Ddha" 
+    3918 "Tibetian ShkronjÃ« Nna" 
+    3919 "Tibetian ShkronjÃ« Ta" 
+    3920 "Tibetian ShkronjÃ« Tha" 
+    3921 "Tibetian ShkronjÃ« Da" 
+    3922 "Tibetian ShkronjÃ« Dha" 
+    3923 "Tibetian ShkronjÃ« Na" 
+    3924 "Tibetian ShkronjÃ« Pa" 
+    3925 "Tibetian ShkronjÃ« Pha" 
+    3926 "Tibetian ShkronjÃ« Ba" 
+    3927 "Tibetian ShkronjÃ« Bha" 
+    3928 "Tibetian ShkronjÃ« Ma" 
+    3929 "Tibetian ShkronjÃ« Tsa" 
+    3930 "Tibetian ShkronjÃ« Tsha" 
+    3931 "Tibetian ShkronjÃ« Dza" 
+    3932 "Tibetian ShkronjÃ« Dzha" 
+    3933 "Tibetian ShkronjÃ« Wa" 
+    3934 "Tibetian ShkronjÃ« Zha" 
+    3935 "Tibetian ShkronjÃ« Za" 
+    3936 "Tibetian ShkronjÃ« -A" 
+    3937 "Tibetian ShkronjÃ« Ya" 
+    3938 "Tibetian ShkronjÃ« Ra" 
+    3939 "Tibetian ShkronjÃ« La" 
+    3940 "Tibetian ShkronjÃ« Sha" 
+    3941 "Tibetian ShkronjÃ« Ssa" 
+    3942 "Tibetian ShkronjÃ« Sa" 
+    3943 "Tibetian ShkronjÃ« Ha" 
+    3944 "Tibetian ShkronjÃ« A" 
+    3945 "Tibetian ShkronjÃ« Kssa" 
+    3946 "Tibetian ShkronjÃ« Fixed-FormÃ« Ra" 
+    3947 "Tibetian ShkronjÃ« Kka" 
+    3948 "Tibetian ShkronjÃ« Rra" 
+    3953 "Tibetian Zanore ShenjÃ« Aa" 
+    3954 "Tibetian Zanore ShenjÃ« I" 
+    3955 "Tibetian Zanore ShenjÃ« Ii" 
+    3956 "Tibetian Zanore ShenjÃ« U" 
+    3957 "Tibetian Zanore ShenjÃ« Uu" 
+    3958 "Tibetian Zanore ShenjÃ« Vocalic R" 
+    3959 "Tibetian Zanore ShenjÃ« Vocalic Rr" 
+    3960 "Tibetian Zanore ShenjÃ« Vocalic L" 
+    3961 "Tibetian Zanore ShenjÃ« Vocalic Ll" 
+    3962 "Tibetian Zanore ShenjÃ« E" 
+    3963 "Tibetian Zanore ShenjÃ« Ee" 
+    3964 "Tibetian Zanore ShenjÃ« O" 
+    3965 "Tibetian Zanore ShenjÃ« Oo" 
+    3966 "Tibetian ShenjÃ« Rjes Su Nga Ro" 
+    3967 "Tibetian ShenjÃ« Rnam Bcad" 
+    3968 "Tibetian Zanore ShenjÃ« KundÃ«rt I" 
+    3969 "Tibetian Zanore ShenjÃ« KundÃ«rt Ii" 
+    3970 "Tibetian ShenjÃ« Nyi Zla Naa Da" 
+    3971 "Tibetian ShenjÃ« Sna Ldan" 
+    3972 "Tibetian ShenjÃ« Halanta" 
+    3973 "Tibetian ShenjÃ« Paluta" 
+    3974 "Tibetian ShenjÃ« Lci Rtags" 
+    3975 "Tibetian ShenjÃ« Yang Rtags" 
+    3976 "Tibetian ShenjÃ« Lce Tsa Can" 
+    3977 "Tibetian ShenjÃ« Mchu Can" 
+    3978 "Tibetian ShenjÃ« Gru Can Rgyings" 
+    3979 "Tibetian ShenjÃ« Gru Med Rgyings" 
+    3980 "Tibetian ShenjÃ« Kthyer Mchu Can" 
+    3981 "Tibetian BashkÃ«ngjitur ShenjÃ« Lce Tsa Can" 
+    3982 "Tibetian BashkÃ«ngjitur ShenjÃ« Mchu Can" 
+    3983 "Tibetian BashkÃ«ngjitur ShenjÃ« Kthyer Mchu Can" 
+    3984 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ka" 
+    3985 "Tibetian BashkÃ«ngjitur ShkronjÃ« Kha" 
+    3986 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ga" 
+    3987 "Tibetian BashkÃ«ngjitur ShkronjÃ« Gha" 
+    3988 "Tibetian BashkÃ«ngjitur ShkronjÃ« Nga" 
+    3989 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ca" 
+    3990 "Tibetian BashkÃ«ngjitur ShkronjÃ« Cha" 
+    3991 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ja" 
+    3993 "Tibetian BashkÃ«ngjitur ShkronjÃ« Nya" 
+    3994 "Tibetian BashkÃ«ngjitur ShkronjÃ« Tta" 
+    3995 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ttha" 
+    3996 "Tibetian BashkÃ«ngjitur ShkronjÃ« Dda" 
+    3997 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ddha" 
+    3998 "Tibetian BashkÃ«ngjitur ShkronjÃ« Nna" 
+    3999 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ta" 
+    4000 "Tibetian BashkÃ«ngjitur ShkronjÃ« Tha" 
+    4001 "Tibetian BashkÃ«ngjitur ShkronjÃ« Da" 
+    4002 "Tibetian BashkÃ«ngjitur ShkronjÃ« Dha" 
+    4003 "Tibetian BashkÃ«ngjitur ShkronjÃ« Na" 
+    4004 "Tibetian BashkÃ«ngjitur ShkronjÃ« Pa" 
+    4005 "Tibetian BashkÃ«ngjitur ShkronjÃ« Pha" 
+    4006 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ba" 
+    4007 "Tibetian BashkÃ«ngjitur ShkronjÃ« Bha" 
+    4008 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ma" 
+    4009 "Tibetian BashkÃ«ngjitur ShkronjÃ« Tsa" 
+    4010 "Tibetian BashkÃ«ngjitur ShkronjÃ« Tsha" 
+    4011 "Tibetian BashkÃ«ngjitur ShkronjÃ« Dza" 
+    4012 "Tibetian BashkÃ«ngjitur ShkronjÃ« Dzha" 
+    4013 "Tibetian BashkÃ«ngjitur ShkronjÃ« Wa" 
+    4014 "Tibetian BashkÃ«ngjitur ShkronjÃ« Zha" 
+    4015 "Tibetian BashkÃ«ngjitur ShkronjÃ« Za" 
+    4016 "Tibetian BashkÃ«ngjitur ShkronjÃ« -A" 
+    4017 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ya" 
+    4018 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ra" 
+    4019 "Tibetian BashkÃ«ngjitur ShkronjÃ« La" 
+    4020 "Tibetian BashkÃ«ngjitur ShkronjÃ« Sha" 
+    4021 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ssa" 
+    4022 "Tibetian BashkÃ«ngjitur ShkronjÃ« Sa" 
+    4023 "Tibetian BashkÃ«ngjitur ShkronjÃ« Ha" 
+    4024 "Tibetian BashkÃ«ngjitur ShkronjÃ« A" 
+    4025 "Tibetian BashkÃ«ngjitur ShkronjÃ« Kssa" 
+    4026 "Tibetian BashkÃ«ngjitur ShkronjÃ« Fixed-FormÃ« Wa" 
+    4027 "Tibetian BashkÃ«ngjitur ShkronjÃ« Fixed-FormÃ« Ya" 
+    4028 "Tibetian BashkÃ«ngjitur ShkronjÃ« Fixed-FormÃ« Ra" 
+    4030 "Tibetian Ku Ru Kha" 
+    4031 "Tibetian Ku Ru Kha Bzhi Mig Can" 
+    4032 "Tibetian Cantillation ShenjÃ« Tingull RÃ«ndÃ«" 
+    4033 "Tibetian Cantillation ShenjÃ« Tingull LehtÃ«" 
+    4034 "Tibetian Cantillation ShenjÃ« Cang Te-U" 
+    4035 "Tibetian Cantillation ShenjÃ« Sbub -Chal" 
+    4036 "Tibetian Simbol Dril Bu" 
+    4037 "Tibetian Simbol Rdo Rje" 
+    4038 "Tibetian Simbol Padma Gdan" 
+    4039 "Tibetian Simbol Rdo Rje Rgya Gram" 
+    4040 "Tibetian Simbol Phur Pa" 
+    4041 "Tibetian Simbol As Bu" 
+    4042 "Tibetian Simbol As Bu Nyis -Khyil" 
+    4043 "Tibetian Simbol As Bu Gsum -Khyil" 
+    4044 "Tibetian Simbol As Bu Bzhi -Khyil" 
+    4046 "Tibetian ShenjÃ« Rdel Nag Rdel Dkar" 
+    4047 "Tibetian ShenjÃ« Rdel Nag Gsum" 
+    4048 "Tibetian ShenjÃ« Bska- Shog Gi Mgo Rgyan" 
+    4049 "Tibetian ShenjÃ« Mnyam Yig Gi Mgo Rgyan" 
+    4050 "Tibetian ShenjÃ« Nyis Tsheg" 
+    4051 "Tibetian ShenjÃ« Fillestar Brda Rnying Yig Mgo Mdun Ma" 
+    4052 "Tibetian ShenjÃ« Closing Brda Rnying Yig Mgo Sgab Ma" 
+    4053 "Drejtim-DjathtÃ« Svasti ShenjÃ«" 
+    4054 "Drejtim-MajtÃ« Svasti ShenjÃ«" 
+    4055 "Drejtim-DjathtÃ« Svasti ShenjÃ« Me PikÃ«" 
+    4056 "Drejtim-MajtÃ« Svasti ShenjÃ« Me PikÃ«" 
+    4057 "Tibetian ShenjÃ« Drejtim Mchan Rtags" 
+    4058 "Tibetian ShenjÃ« Zvarritje Mchan Rtags" 
+    4096 "Myanmar ShkronjÃ« Ka" 
+    4097 "Myanmar ShkronjÃ« Kha" 
+    4098 "Myanmar ShkronjÃ« Ga" 
+    4099 "Myanmar ShkronjÃ« Gha" 
+    4100 "Myanmar ShkronjÃ« Nga" 
+    4101 "Myanmar ShkronjÃ« Ca" 
+    4102 "Myanmar ShkronjÃ« Cha" 
+    4103 "Myanmar ShkronjÃ« Ja" 
+    4104 "Myanmar ShkronjÃ« Jha" 
+    4105 "Myanmar ShkronjÃ« Nya" 
+    4106 "Myanmar ShkronjÃ« Nnya" 
+    4107 "Myanmar ShkronjÃ« Tta" 
+    4108 "Myanmar ShkronjÃ« Ttha" 
+    4109 "Myanmar ShkronjÃ« Dda" 
+    4110 "Myanmar ShkronjÃ« Ddha" 
+    4111 "Myanmar ShkronjÃ« Nna" 
+    4112 "Myanmar ShkronjÃ« Ta" 
+    4113 "Myanmar ShkronjÃ« Tha" 
+    4114 "Myanmar ShkronjÃ« Da" 
+    4115 "Myanmar ShkronjÃ« Dha" 
+    4116 "Myanmar ShkronjÃ« Na" 
+    4117 "Myanmar ShkronjÃ« Pa" 
+    4118 "Myanmar ShkronjÃ« Pha" 
+    4119 "Myanmar ShkronjÃ« Ba" 
+    4120 "Myanmar ShkronjÃ« Bha" 
+    4121 "Myanmar ShkronjÃ« Ma" 
+    4122 "Myanmar ShkronjÃ« Ya" 
+    4123 "Myanmar ShkronjÃ« Ra" 
+    4124 "Myanmar ShkronjÃ« La" 
+    4125 "Myanmar ShkronjÃ« Wa" 
+    4126 "Myanmar ShkronjÃ« Sa" 
+    4127 "Myanmar ShkronjÃ« Ha" 
+    4128 "Myanmar ShkronjÃ« Lla" 
+    4129 "Myanmar ShkronjÃ« A" 
+    4130 "Myanmar ShkronjÃ« Shan A" 
+    4131 "Myanmar ShkronjÃ« I" 
+    4132 "Myanmar ShkronjÃ« Ii" 
+    4133 "Myanmar ShkronjÃ« U" 
+    4134 "Myanmar ShkronjÃ« Uu" 
+    4135 "Myanmar ShkronjÃ« E" 
+    4136 "Myanmar ShkronjÃ« Mon E" 
+    4137 "Myanmar ShkronjÃ« O" 
+    4138 "Myanmar ShkronjÃ« Au" 
+    4139 "Myanmar Zanore ShenjÃ« Tall Aa" 
+    4140 "Myanmar Zanore ShenjÃ« Aa" 
+    4141 "Myanmar Zanore ShenjÃ« I" 
+    4142 "Myanmar Zanore ShenjÃ« Ii" 
+    4143 "Myanmar Zanore ShenjÃ« U" 
+    4144 "Myanmar Zanore ShenjÃ« Uu" 
+    4145 "Myanmar Zanore ShenjÃ« E" 
+    4146 "Myanmar Zanore ShenjÃ« Ai" 
+    4147 "Myanmar Zanore ShenjÃ« Mon Ii" 
+    4148 "Myanmar Zanore ShenjÃ« Mon O" 
+    4149 "Myanmar Zanore ShenjÃ« E Lart" 
+    4150 "Myanmar ShenjÃ« Anusvara" 
+    4151 "Myanmar ShenjÃ« PikÃ« PoshtÃ«" 
+    4152 "Myanmar ShenjÃ« Visarga" 
+    4153 "Myanmar ShenjÃ« Virama" 
+    4154 "Myanmar ShenjÃ« Asat" 
+    4155 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mesor Ya" 
+    4156 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mesor Ra" 
+    4157 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mesor Wa" 
+    4158 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mesor Ha" 
+    4159 "Myanmar ShkronjÃ« Great Sa" 
+    4160 "Myanmar ShifÃ«r Zero" 
+    4161 "Myanmar ShifÃ«r NjÃ«" 
+    4162 "Myanmar ShifÃ«r Dy" 
+    4163 "Myanmar ShifÃ«r Tre" 
+    4164 "Myanmar ShifÃ«r KatÃ«r" 
+    4165 "Myanmar ShifÃ«r PesÃ«" 
+    4166 "Myanmar ShifÃ«r GjashtÃ«" 
+    4167 "Myanmar ShifÃ«r ShtatÃ«" 
+    4168 "Myanmar ShifÃ«r TetÃ«" 
+    4169 "Myanmar ShifÃ«r NÃ«ntÃ«" 
+    4170 "Myanmar ShenjÃ« Pak Section" 
+    4171 "Myanmar ShenjÃ« Section" 
+    4172 "Myanmar Simbol Locative" 
+    4173 "Myanmar Simbol Completed" 
+    4174 "Myanmar Simbol Aforementioned" 
+    4175 "Myanmar Simbol Genitive" 
+    4176 "Myanmar ShkronjÃ« Sha" 
+    4177 "Myanmar ShkronjÃ« Ssa" 
+    4178 "Myanmar ShkronjÃ« Vocalic R" 
+    4179 "Myanmar ShkronjÃ« Vocalic Rr" 
+    4180 "Myanmar ShkronjÃ« Vocalic L" 
+    4181 "Myanmar ShkronjÃ« Vocalic Ll" 
+    4182 "Myanmar Zanore ShenjÃ« Vocalic R" 
+    4183 "Myanmar Zanore ShenjÃ« Vocalic Rr" 
+    4184 "Myanmar Zanore ShenjÃ« Vocalic L" 
+    4185 "Myanmar Zanore ShenjÃ« Vocalic Ll" 
+    4186 "Myanmar ShkronjÃ« Mon Nga" 
+    4187 "Myanmar ShkronjÃ« Mon Jha" 
+    4188 "Myanmar ShkronjÃ« Mon Bba" 
+    4189 "Myanmar ShkronjÃ« Mon Bbe" 
+    4190 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mon Mesor Na" 
+    4191 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mon Mesor Ma" 
+    4192 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Mon Mesor La" 
+    4193 "Myanmar ShkronjÃ« Sgaw Karen Sha" 
+    4194 "Myanmar Zanore ShenjÃ« Sgaw Karen Eu" 
+    4195 "Myanmar Tone ShenjÃ« Sgaw Karen Hathi" 
+    4196 "Myanmar Tone ShenjÃ« Sgaw Karen Ke Pho" 
+    4197 "Myanmar ShkronjÃ« PerÃ«ndimor Pwo Karen Tha" 
+    4198 "Myanmar ShkronjÃ« PerÃ«ndimor Pwo Karen Pwa" 
+    4199 "Myanmar Zanore ShenjÃ« PerÃ«ndimor Pwo Karen Eu" 
+    4200 "Myanmar Zanore ShenjÃ« PerÃ«ndimor Pwo Karen Ue" 
+    4201 "Myanmar ShenjÃ« PerÃ«ndimor Pwo Karen Tone-1" 
+    4202 "Myanmar ShenjÃ« PerÃ«ndimor Pwo Karen Tone-2" 
+    4203 "Myanmar ShenjÃ« PerÃ«ndimor Pwo Karen Tone-3" 
+    4204 "Myanmar ShenjÃ« PerÃ«ndimor Pwo Karen Tone-4" 
+    4205 "Myanmar ShenjÃ« PerÃ«ndimor Pwo Karen Tone-5" 
+    4206 "Myanmar ShkronjÃ« Lindor Pwo Karen Nna" 
+    4207 "Myanmar ShkronjÃ« Lindor Pwo Karen Ywa" 
+    4208 "Myanmar ShkronjÃ« Lindor Pwo Karen Ghwa" 
+    4209 "Myanmar Zanore ShenjÃ« Geba Karen I" 
+    4210 "Myanmar Zanore ShenjÃ« Kayah Oe" 
+    4211 "Myanmar Zanore ShenjÃ« Kayah U" 
+    4212 "Myanmar Zanore ShenjÃ« Kayah Ee" 
+    4213 "Myanmar ShkronjÃ« Shan Ka" 
+    4214 "Myanmar ShkronjÃ« Shan Kha" 
+    4215 "Myanmar ShkronjÃ« Shan Ga" 
+    4216 "Myanmar ShkronjÃ« Shan Ca" 
+    4217 "Myanmar ShkronjÃ« Shan Za" 
+    4218 "Myanmar ShkronjÃ« Shan Nya" 
+    4219 "Myanmar ShkronjÃ« Shan Da" 
+    4220 "Myanmar ShkronjÃ« Shan Na" 
+    4221 "Myanmar ShkronjÃ« Shan Pha" 
+    4222 "Myanmar ShkronjÃ« Shan Fa" 
+    4223 "Myanmar ShkronjÃ« Shan Ba" 
+    4224 "Myanmar ShkronjÃ« Shan Tha" 
+    4225 "Myanmar ShkronjÃ« Shan Ha" 
+    4226 "Myanmar BashkÃ«tingÃ«llore ShenjÃ« Shan Mesor Wa" 
+    4227 "Myanmar Zanore ShenjÃ« Shan Aa" 
+    4228 "Myanmar Zanore ShenjÃ« Shan E" 
+    4229 "Myanmar Zanore ShenjÃ« Shan E Lart" 
+    4230 "Myanmar Zanore ShenjÃ« Shan PÃ«rfundimtare Y" 
+    4231 "Myanmar ShenjÃ« Shan Tone-2" 
+    4232 "Myanmar ShenjÃ« Shan Tone-3" 
+    4233 "Myanmar ShenjÃ« Shan Tone-5" 
+    4234 "Myanmar ShenjÃ« Shan Tone-6" 
+    4235 "Myanmar ShenjÃ« Shan Council Tone-2" 
+    4236 "Myanmar ShenjÃ« Shan Council Tone-3" 
+    4237 "Myanmar ShenjÃ« Shan Council Emphatic Tone" 
+    4238 "Myanmar ShkronjÃ« Rumai Palaung Fa" 
+    4239 "Myanmar ShenjÃ« Rumai Palaung Tone-5" 
+    4240 "Myanmar Shan ShifÃ«r Zero" 
+    4241 "Myanmar Shan ShifÃ«r NjÃ«" 
+    4242 "Myanmar Shan ShifÃ«r Dy" 
+    4243 "Myanmar Shan ShifÃ«r Tre" 
+    4244 "Myanmar Shan ShifÃ«r KatÃ«r" 
+    4245 "Myanmar Shan ShifÃ«r PesÃ«" 
+    4246 "Myanmar Shan ShifÃ«r GjashtÃ«" 
+    4247 "Myanmar Shan ShifÃ«r ShtatÃ«" 
+    4248 "Myanmar Shan ShifÃ«r TetÃ«" 
+    4249 "Myanmar Shan ShifÃ«r NÃ«ntÃ«" 
+    4250 "Myanmar ShenjÃ« Khamti Tone-1" 
+    4251 "Myanmar ShenjÃ« Khamti Tone-3" 
+    4252 "Myanmar Zanore ShenjÃ« Aiton A" 
+    4253 "Myanmar Zanore ShenjÃ« Aiton Ai" 
+    4254 "Myanmar Simbol Shan NjÃ«" 
+    4255 "Myanmar Simbol Shan Thirrje" 
+    4256 "GjeorgjisÃ« ShkronjÃ« e Madhe An" 
+    4257 "GjeorgjisÃ« ShkronjÃ« e Madhe Ban" 
+    4258 "GjeorgjisÃ« ShkronjÃ« e Madhe Gan" 
+    4259 "GjeorgjisÃ« ShkronjÃ« e Madhe Don" 
+    4260 "GjeorgjisÃ« ShkronjÃ« e Madhe En" 
+    4261 "GjeorgjisÃ« ShkronjÃ« e Madhe Vin" 
+    4262 "GjeorgjisÃ« ShkronjÃ« e Madhe Zen" 
+    4263 "GjeorgjisÃ« ShkronjÃ« e Madhe Tan" 
+    4264 "GjeorgjisÃ« ShkronjÃ« e Madhe In" 
+    4265 "GjeorgjisÃ« ShkronjÃ« e Madhe Kan" 
+    4266 "GjeorgjisÃ« ShkronjÃ« e Madhe Las" 
+    4267 "GjeorgjisÃ« ShkronjÃ« e Madhe Man" 
+    4268 "GjeorgjisÃ« ShkronjÃ« e Madhe Nar" 
+    4269 "GjeorgjisÃ« ShkronjÃ« e Madhe On" 
+    4270 "GjeorgjisÃ« ShkronjÃ« e Madhe Par" 
+    4271 "GjeorgjisÃ« ShkronjÃ« e Madhe Zhar" 
+    4272 "GjeorgjisÃ« ShkronjÃ« e Madhe Rae" 
+    4273 "GjeorgjisÃ« ShkronjÃ« e Madhe San" 
+    4274 "GjeorgjisÃ« ShkronjÃ« e Madhe Tar" 
+    4275 "GjeorgjisÃ« ShkronjÃ« e Madhe Un" 
+    4276 "GjeorgjisÃ« ShkronjÃ« e Madhe Phar" 
+    4277 "GjeorgjisÃ« ShkronjÃ« e Madhe Khar" 
+    4278 "GjeorgjisÃ« ShkronjÃ« e Madhe Ghan" 
+    4279 "GjeorgjisÃ« ShkronjÃ« e Madhe Qar" 
+    4280 "GjeorgjisÃ« ShkronjÃ« e Madhe Shin" 
+    4281 "GjeorgjisÃ« ShkronjÃ« e Madhe Chin" 
+    4282 "GjeorgjisÃ« ShkronjÃ« e Madhe Can" 
+    4283 "GjeorgjisÃ« ShkronjÃ« e Madhe Jil" 
+    4284 "GjeorgjisÃ« ShkronjÃ« e Madhe Cil" 
+    4285 "GjeorgjisÃ« ShkronjÃ« e Madhe Char" 
+    4286 "GjeorgjisÃ« ShkronjÃ« e Madhe Xan" 
+    4287 "GjeorgjisÃ« ShkronjÃ« e Madhe Jhan" 
+    4288 "GjeorgjisÃ« ShkronjÃ« e Madhe Hae" 
+    4289 "GjeorgjisÃ« ShkronjÃ« e Madhe He" 
+    4290 "GjeorgjisÃ« ShkronjÃ« e Madhe Hie" 
+    4291 "GjeorgjisÃ« ShkronjÃ« e Madhe We" 
+    4292 "GjeorgjisÃ« ShkronjÃ« e Madhe Har" 
+    4293 "GjeorgjisÃ« ShkronjÃ« e Madhe Hoe" 
+    4295 "GjeorgjisÃ« ShkronjÃ« e Madhe Yn" 
+    4301 "GjeorgjisÃ« ShkronjÃ« e Madhe Aen" 
+    4304 "GjeorgjisÃ« ShkronjÃ« An" 
+    4305 "GjeorgjisÃ« ShkronjÃ« Ban" 
+    4306 "GjeorgjisÃ« ShkronjÃ« Gan" 
+    4307 "GjeorgjisÃ« ShkronjÃ« Don" 
+    4308 "GjeorgjisÃ« ShkronjÃ« En" 
+    4309 "GjeorgjisÃ« ShkronjÃ« Vin" 
+    4310 "GjeorgjisÃ« ShkronjÃ« Zen" 
+    4311 "GjeorgjisÃ« ShkronjÃ« Tan" 
+    4312 "GjeorgjisÃ« ShkronjÃ« In" 
+    4313 "GjeorgjisÃ« ShkronjÃ« Kan" 
+    4314 "GjeorgjisÃ« ShkronjÃ« Las" 
+    4315 "GjeorgjisÃ« ShkronjÃ« Man" 
+    4316 "GjeorgjisÃ« ShkronjÃ« Nar" 
+    4317 "GjeorgjisÃ« ShkronjÃ« On" 
+    4318 "GjeorgjisÃ« ShkronjÃ« Par" 
+    4319 "GjeorgjisÃ« ShkronjÃ« Zhar" 
+    4320 "GjeorgjisÃ« ShkronjÃ« Rae" 
+    4321 "GjeorgjisÃ« ShkronjÃ« San" 
+    4322 "GjeorgjisÃ« ShkronjÃ« Tar" 
+    4323 "GjeorgjisÃ« ShkronjÃ« Un" 
+    4324 "GjeorgjisÃ« ShkronjÃ« Phar" 
+    4325 "GjeorgjisÃ« ShkronjÃ« Khar" 
+    4326 "GjeorgjisÃ« ShkronjÃ« Ghan" 
+    4327 "GjeorgjisÃ« ShkronjÃ« Qar" 
+    4328 "GjeorgjisÃ« ShkronjÃ« Shin" 
+    4329 "GjeorgjisÃ« ShkronjÃ« Chin" 
+    4330 "GjeorgjisÃ« ShkronjÃ« Can" 
+    4331 "GjeorgjisÃ« ShkronjÃ« Jil" 
+    4332 "GjeorgjisÃ« ShkronjÃ« Cil" 
+    4333 "GjeorgjisÃ« ShkronjÃ« Char" 
+    4334 "GjeorgjisÃ« ShkronjÃ« Xan" 
+    4335 "GjeorgjisÃ« ShkronjÃ« Jhan" 
+    4336 "GjeorgjisÃ« ShkronjÃ« Hae" 
+    4337 "GjeorgjisÃ« ShkronjÃ« He" 
+    4338 "GjeorgjisÃ« ShkronjÃ« Hie" 
+    4339 "GjeorgjisÃ« ShkronjÃ« We" 
+    4340 "GjeorgjisÃ« ShkronjÃ« Har" 
+    4341 "GjeorgjisÃ« ShkronjÃ« Hoe" 
+    4342 "GjeorgjisÃ« ShkronjÃ« Fi" 
+    4343 "GjeorgjisÃ« ShkronjÃ« Yn" 
+    4344 "GjeorgjisÃ« ShkronjÃ« Elifi" 
+    4345 "GjeorgjisÃ« ShkronjÃ« Kthyer Gan" 
+    4346 "GjeorgjisÃ« ShkronjÃ« Ain" 
+    4347 "GjeorgjisÃ« Paragraph NdarÃ«s" 
+    4348 "Modifiko ShkronjÃ« GjeorgjisÃ« Nar" 
+    4349 "GjeorgjisÃ« ShkronjÃ« Aen" 
+    4350 "GjeorgjisÃ« ShkronjÃ« Hard ShenjÃ«" 
+    4351 "GjeorgjisÃ« ShkronjÃ« Labial ShenjÃ«" 
+    4352 "Hangul Choseong Kiyeok" 
+    4353 "Hangul Choseong Ssangkiyeok" 
+    4354 "Hangul Choseong Nieun" 
+    4355 "Hangul Choseong Tikeut" 
+    4356 "Hangul Choseong Ssangtikeut" 
+    4357 "Hangul Choseong Rieul" 
+    4358 "Hangul Choseong Mieum" 
+    4359 "Hangul Choseong Pieup" 
+    4360 "Hangul Choseong Ssangpieup" 
+    4361 "Hangul Choseong Sios" 
+    4362 "Hangul Choseong Ssangsios" 
+    4363 "Hangul Choseong Ieung" 
+    4364 "Hangul Choseong Cieuc" 
+    4365 "Hangul Choseong Ssangcieuc" 
+    4366 "Hangul Choseong Chieuch" 
+    4367 "Hangul Choseong Khieukh" 
+    4368 "Hangul Choseong Thieuth" 
+    4369 "Hangul Choseong Phieuph" 
+    4370 "Hangul Choseong Hieuh" 
+    4371 "Hangul Choseong Nieun-Kiyeok" 
+    4372 "Hangul Choseong Ssangnieun" 
+    4373 "Hangul Choseong Nieun-Tikeut" 
+    4374 "Hangul Choseong Nieun-Pieup" 
+    4375 "Hangul Choseong Tikeut-Kiyeok" 
+    4376 "Hangul Choseong Rieul-Nieun" 
+    4377 "Hangul Choseong Ssangrieul" 
+    4378 "Hangul Choseong Rieul-Hieuh" 
+    4379 "Hangul Choseong Kapyeounrieul" 
+    4380 "Hangul Choseong Mieum-Pieup" 
+    4381 "Hangul Choseong Kapyeounmieum" 
+    4382 "Hangul Choseong Pieup-Kiyeok" 
+    4383 "Hangul Choseong Pieup-Nieun" 
+    4384 "Hangul Choseong Pieup-Tikeut" 
+    4385 "Hangul Choseong Pieup-Sios" 
+    4386 "Hangul Choseong Pieup-Sios-Kiyeok" 
+    4387 "Hangul Choseong Pieup-Sios-Tikeut" 
+    4388 "Hangul Choseong Pieup-Sios-Pieup" 
+    4389 "Hangul Choseong Pieup-Ssangsios" 
+    4390 "Hangul Choseong Pieup-Sios-Cieuc" 
+    4391 "Hangul Choseong Pieup-Cieuc" 
+    4392 "Hangul Choseong Pieup-Chieuch" 
+    4393 "Hangul Choseong Pieup-Thieuth" 
+    4394 "Hangul Choseong Pieup-Phieuph" 
+    4395 "Hangul Choseong Kapyeounpieup" 
+    4396 "Hangul Choseong Kapyeounssangpieup" 
+    4397 "Hangul Choseong Sios-Kiyeok" 
+    4398 "Hangul Choseong Sios-Nieun" 
+    4399 "Hangul Choseong Sios-Tikeut" 
+    4400 "Hangul Choseong Sios-Rieul" 
+    4401 "Hangul Choseong Sios-Mieum" 
+    4402 "Hangul Choseong Sios-Pieup" 
+    4403 "Hangul Choseong Sios-Pieup-Kiyeok" 
+    4404 "Hangul Choseong Sios-Ssangsios" 
+    4405 "Hangul Choseong Sios-Ieung" 
+    4406 "Hangul Choseong Sios-Cieuc" 
+    4407 "Hangul Choseong Sios-Chieuch" 
+    4408 "Hangul Choseong Sios-Khieukh" 
+    4409 "Hangul Choseong Sios-Thieuth" 
+    4410 "Hangul Choseong Sios-Phieuph" 
+    4411 "Hangul Choseong Sios-Hieuh" 
+    4412 "Hangul Choseong Chitueumsios" 
+    4413 "Hangul Choseong Chitueumssangsios" 
+    4414 "Hangul Choseong Ceongchieumsios" 
+    4415 "Hangul Choseong Ceongchieumssangsios" 
+    4416 "Hangul Choseong Pansios" 
+    4417 "Hangul Choseong Ieung-Kiyeok" 
+    4418 "Hangul Choseong Ieung-Tikeut" 
+    4419 "Hangul Choseong Ieung-Mieum" 
+    4420 "Hangul Choseong Ieung-Pieup" 
+    4421 "Hangul Choseong Ieung-Sios" 
+    4422 "Hangul Choseong Ieung-Pansios" 
+    4423 "Hangul Choseong Ssangieung" 
+    4424 "Hangul Choseong Ieung-Cieuc" 
+    4425 "Hangul Choseong Ieung-Chieuch" 
+    4426 "Hangul Choseong Ieung-Thieuth" 
+    4427 "Hangul Choseong Ieung-Phieuph" 
+    4428 "Hangul Choseong Yesieung" 
+    4429 "Hangul Choseong Cieuc-Ieung" 
+    4430 "Hangul Choseong Chitueumcieuc" 
+    4431 "Hangul Choseong Chitueumssangcieuc" 
+    4432 "Hangul Choseong Ceongchieumcieuc" 
+    4433 "Hangul Choseong Ceongchieumssangcieuc" 
+    4434 "Hangul Choseong Chieuch-Khieukh" 
+    4435 "Hangul Choseong Chieuch-Hieuh" 
+    4436 "Hangul Choseong Chitueumchieuch" 
+    4437 "Hangul Choseong Ceongchieumchieuch" 
+    4438 "Hangul Choseong Phieuph-Pieup" 
+    4439 "Hangul Choseong Kapyeounphieuph" 
+    4440 "Hangul Choseong Ssanghieuh" 
+    4441 "Hangul Choseong Yeorinhieuh" 
+    4442 "Hangul Choseong Kiyeok-Tikeut" 
+    4443 "Hangul Choseong Nieun-Sios" 
+    4444 "Hangul Choseong Nieun-Cieuc" 
+    4445 "Hangul Choseong Nieun-Hieuh" 
+    4446 "Hangul Choseong Tikeut-Rieul" 
+    4447 "Hangul Choseong Filler" 
+    4448 "Hangul Jungseong Filler" 
+    4449 "Hangul Jungseong A" 
+    4450 "Hangul Jungseong Ae" 
+    4451 "Hangul Jungseong Ya" 
+    4452 "Hangul Jungseong Yae" 
+    4453 "Hangul Jungseong Eo" 
+    4454 "Hangul Jungseong E" 
+    4455 "Hangul Jungseong Yeo" 
+    4456 "Hangul Jungseong Ye" 
+    4457 "Hangul Jungseong O" 
+    4458 "Hangul Jungseong Wa" 
+    4459 "Hangul Jungseong Wae" 
+    4460 "Hangul Jungseong Oe" 
+    4461 "Hangul Jungseong Yo" 
+    4462 "Hangul Jungseong U" 
+    4463 "Hangul Jungseong Weo" 
+    4464 "Hangul Jungseong We" 
+    4465 "Hangul Jungseong Wi" 
+    4466 "Hangul Jungseong Yu" 
+    4467 "Hangul Jungseong Eu" 
+    4468 "Hangul Jungseong Yi" 
+    4469 "Hangul Jungseong I" 
+    4470 "Hangul Jungseong A-O" 
+    4471 "Hangul Jungseong A-U" 
+    4472 "Hangul Jungseong Ya-O" 
+    4473 "Hangul Jungseong Ya-Yo" 
+    4474 "Hangul Jungseong Eo-O" 
+    4475 "Hangul Jungseong Eo-U" 
+    4476 "Hangul Jungseong Eo-Eu" 
+    4477 "Hangul Jungseong Yeo-O" 
+    4478 "Hangul Jungseong Yeo-U" 
+    4479 "Hangul Jungseong O-Eo" 
+    4480 "Hangul Jungseong O-E" 
+    4481 "Hangul Jungseong O-Ye" 
+    4482 "Hangul Jungseong O-O" 
+    4483 "Hangul Jungseong O-U" 
+    4484 "Hangul Jungseong Yo-Ya" 
+    4485 "Hangul Jungseong Yo-Yae" 
+    4486 "Hangul Jungseong Yo-Yeo" 
+    4487 "Hangul Jungseong Yo-O" 
+    4488 "Hangul Jungseong Yo-I" 
+    4489 "Hangul Jungseong U-A" 
+    4490 "Hangul Jungseong U-Ae" 
+    4491 "Hangul Jungseong U-Eo-Eu" 
+    4492 "Hangul Jungseong U-Ye" 
+    4493 "Hangul Jungseong U-U" 
+    4494 "Hangul Jungseong Yu-A" 
+    4495 "Hangul Jungseong Yu-Eo" 
+    4496 "Hangul Jungseong Yu-E" 
+    4497 "Hangul Jungseong Yu-Yeo" 
+    4498 "Hangul Jungseong Yu-Ye" 
+    4499 "Hangul Jungseong Yu-U" 
+    4500 "Hangul Jungseong Yu-I" 
+    4501 "Hangul Jungseong Eu-U" 
+    4502 "Hangul Jungseong Eu-Eu" 
+    4503 "Hangul Jungseong Yi-U" 
+    4504 "Hangul Jungseong I-A" 
+    4505 "Hangul Jungseong I-Ya" 
+    4506 "Hangul Jungseong I-O" 
+    4507 "Hangul Jungseong I-U" 
+    4508 "Hangul Jungseong I-Eu" 
+    4509 "Hangul Jungseong I-Araea" 
+    4510 "Hangul Jungseong Araea" 
+    4511 "Hangul Jungseong Araea-Eo" 
+    4512 "Hangul Jungseong Araea-U" 
+    4513 "Hangul Jungseong Araea-I" 
+    4514 "Hangul Jungseong Ssangaraea" 
+    4515 "Hangul Jungseong A-Eu" 
+    4516 "Hangul Jungseong Ya-U" 
+    4517 "Hangul Jungseong Yeo-Ya" 
+    4518 "Hangul Jungseong O-Ya" 
+    4519 "Hangul Jungseong O-Yae" 
+    4520 "Hangul Jongseong Kiyeok" 
+    4521 "Hangul Jongseong Ssangkiyeok" 
+    4522 "Hangul Jongseong Kiyeok-Sios" 
+    4523 "Hangul Jongseong Nieun" 
+    4524 "Hangul Jongseong Nieun-Cieuc" 
+    4525 "Hangul Jongseong Nieun-Hieuh" 
+    4526 "Hangul Jongseong Tikeut" 
+    4527 "Hangul Jongseong Rieul" 
+    4528 "Hangul Jongseong Rieul-Kiyeok" 
+    4529 "Hangul Jongseong Rieul-Mieum" 
+    4530 "Hangul Jongseong Rieul-Pieup" 
+    4531 "Hangul Jongseong Rieul-Sios" 
+    4532 "Hangul Jongseong Rieul-Thieuth" 
+    4533 "Hangul Jongseong Rieul-Phieuph" 
+    4534 "Hangul Jongseong Rieul-Hieuh" 
+    4535 "Hangul Jongseong Mieum" 
+    4536 "Hangul Jongseong Pieup" 
+    4537 "Hangul Jongseong Pieup-Sios" 
+    4538 "Hangul Jongseong Sios" 
+    4539 "Hangul Jongseong Ssangsios" 
+    4540 "Hangul Jongseong Ieung" 
+    4541 "Hangul Jongseong Cieuc" 
+    4542 "Hangul Jongseong Chieuch" 
+    4543 "Hangul Jongseong Khieukh" 
+    4544 "Hangul Jongseong Thieuth" 
+    4545 "Hangul Jongseong Phieuph" 
+    4546 "Hangul Jongseong Hieuh" 
+    4547 "Hangul Jongseong Kiyeok-Rieul" 
+    4548 "Hangul Jongseong Kiyeok-Sios-Kiyeok" 
+    4549 "Hangul Jongseong Nieun-Kiyeok" 
+    4550 "Hangul Jongseong Nieun-Tikeut" 
+    4551 "Hangul Jongseong Nieun-Sios" 
+    4552 "Hangul Jongseong Nieun-Pansios" 
+    4553 "Hangul Jongseong Nieun-Thieuth" 
+    4554 "Hangul Jongseong Tikeut-Kiyeok" 
+    4555 "Hangul Jongseong Tikeut-Rieul" 
+    4556 "Hangul Jongseong Rieul-Kiyeok-Sios" 
+    4557 "Hangul Jongseong Rieul-Nieun" 
+    4558 "Hangul Jongseong Rieul-Tikeut" 
+    4559 "Hangul Jongseong Rieul-Tikeut-Hieuh" 
+    4560 "Hangul Jongseong Ssangrieul" 
+    4561 "Hangul Jongseong Rieul-Mieum-Kiyeok" 
+    4562 "Hangul Jongseong Rieul-Mieum-Sios" 
+    4563 "Hangul Jongseong Rieul-Pieup-Sios" 
+    4564 "Hangul Jongseong Rieul-Pieup-Hieuh" 
+    4565 "Hangul Jongseong Rieul-Kapyeounpieup" 
+    4566 "Hangul Jongseong Rieul-Ssangsios" 
+    4567 "Hangul Jongseong Rieul-Pansios" 
+    4568 "Hangul Jongseong Rieul-Khieukh" 
+    4569 "Hangul Jongseong Rieul-Yeorinhieuh" 
+    4570 "Hangul Jongseong Mieum-Kiyeok" 
+    4571 "Hangul Jongseong Mieum-Rieul" 
+    4572 "Hangul Jongseong Mieum-Pieup" 
+    4573 "Hangul Jongseong Mieum-Sios" 
+    4574 "Hangul Jongseong Mieum-Ssangsios" 
+    4575 "Hangul Jongseong Mieum-Pansios" 
+    4576 "Hangul Jongseong Mieum-Chieuch" 
+    4577 "Hangul Jongseong Mieum-Hieuh" 
+    4578 "Hangul Jongseong Kapyeounmieum" 
+    4579 "Hangul Jongseong Pieup-Rieul" 
+    4580 "Hangul Jongseong Pieup-Phieuph" 
+    4581 "Hangul Jongseong Pieup-Hieuh" 
+    4582 "Hangul Jongseong Kapyeounpieup" 
+    4583 "Hangul Jongseong Sios-Kiyeok" 
+    4584 "Hangul Jongseong Sios-Tikeut" 
+    4585 "Hangul Jongseong Sios-Rieul" 
+    4586 "Hangul Jongseong Sios-Pieup" 
+    4587 "Hangul Jongseong Pansios" 
+    4588 "Hangul Jongseong Ieung-Kiyeok" 
+    4589 "Hangul Jongseong Ieung-Ssangkiyeok" 
+    4590 "Hangul Jongseong Ssangieung" 
+    4591 "Hangul Jongseong Ieung-Khieukh" 
+    4592 "Hangul Jongseong Yesieung" 
+    4593 "Hangul Jongseong Yesieung-Sios" 
+    4594 "Hangul Jongseong Yesieung-Pansios" 
+    4595 "Hangul Jongseong Phieuph-Pieup" 
+    4596 "Hangul Jongseong Kapyeounphieuph" 
+    4597 "Hangul Jongseong Hieuh-Nieun" 
+    4598 "Hangul Jongseong Hieuh-Rieul" 
+    4599 "Hangul Jongseong Hieuh-Mieum" 
+    4600 "Hangul Jongseong Hieuh-Pieup" 
+    4601 "Hangul Jongseong Yeorinhieuh" 
+    4602 "Hangul Jongseong Kiyeok-Nieun" 
+    4603 "Hangul Jongseong Kiyeok-Pieup" 
+    4604 "Hangul Jongseong Kiyeok-Chieuch" 
+    4605 "Hangul Jongseong Kiyeok-Khieukh" 
+    4606 "Hangul Jongseong Kiyeok-Hieuh" 
+    4607 "Hangul Jongseong Ssangnieun" 
+    4608 "Ethiopic Rrokje Ha" 
+    4609 "Ethiopic Rrokje Hu" 
+    4610 "Ethiopic Rrokje Hi" 
+    4611 "Ethiopic Rrokje Haa" 
+    4612 "Ethiopic Rrokje Hee" 
+    4613 "Ethiopic Rrokje He" 
+    4614 "Ethiopic Rrokje Ho" 
+    4615 "Ethiopic Rrokje Hoa" 
+    4616 "Ethiopic Rrokje La" 
+    4617 "Ethiopic Rrokje Lu" 
+    4618 "Ethiopic Rrokje Li" 
+    4619 "Ethiopic Rrokje Laa" 
+    4620 "Ethiopic Rrokje Lee" 
+    4621 "Ethiopic Rrokje Le" 
+    4622 "Ethiopic Rrokje Lo" 
+    4623 "Ethiopic Rrokje Lwa" 
+    4624 "Ethiopic Rrokje Hha" 
+    4625 "Ethiopic Rrokje Hhu" 
+    4626 "Ethiopic Rrokje Hhi" 
+    4627 "Ethiopic Rrokje Hhaa" 
+    4628 "Ethiopic Rrokje Hhee" 
+    4629 "Ethiopic Rrokje Hhe" 
+    4630 "Ethiopic Rrokje Hho" 
+    4631 "Ethiopic Rrokje Hhwa" 
+    4632 "Ethiopic Rrokje Ma" 
+    4633 "Ethiopic Rrokje Mu" 
+    4634 "Ethiopic Rrokje Mi" 
+    4635 "Ethiopic Rrokje Maa" 
+    4636 "Ethiopic Rrokje Mee" 
+    4637 "Ethiopic Rrokje Me" 
+    4638 "Ethiopic Rrokje Mo" 
+    4639 "Ethiopic Rrokje Mwa" 
+    4640 "Ethiopic Rrokje Sza" 
+    4641 "Ethiopic Rrokje Szu" 
+    4642 "Ethiopic Rrokje Szi" 
+    4643 "Ethiopic Rrokje Szaa" 
+    4644 "Ethiopic Rrokje Szee" 
+    4645 "Ethiopic Rrokje Sze" 
+    4646 "Ethiopic Rrokje Szo" 
+    4647 "Ethiopic Rrokje Szwa" 
+    4648 "Ethiopic Rrokje Ra" 
+    4649 "Ethiopic Rrokje Ru" 
+    4650 "Ethiopic Rrokje Ri" 
+    4651 "Ethiopic Rrokje Raa" 
+    4652 "Ethiopic Rrokje Ree" 
+    4653 "Ethiopic Rrokje Re" 
+    4654 "Ethiopic Rrokje Ro" 
+    4655 "Ethiopic Rrokje Rwa" 
+    4656 "Ethiopic Rrokje Sa" 
+    4657 "Ethiopic Rrokje Su" 
+    4658 "Ethiopic Rrokje Si" 
+    4659 "Ethiopic Rrokje Saa" 
+    4660 "Ethiopic Rrokje See" 
+    4661 "Ethiopic Rrokje Se" 
+    4662 "Ethiopic Rrokje So" 
+    4663 "Ethiopic Rrokje Swa" 
+    4664 "Ethiopic Rrokje Sha" 
+    4665 "Ethiopic Rrokje Shu" 
+    4666 "Ethiopic Rrokje Shi" 
+    4667 "Ethiopic Rrokje Shaa" 
+    4668 "Ethiopic Rrokje Shee" 
+    4669 "Ethiopic Rrokje She" 
+    4670 "Ethiopic Rrokje Sho" 
+    4671 "Ethiopic Rrokje Shwa" 
+    4672 "Ethiopic Rrokje Qa" 
+    4673 "Ethiopic Rrokje Qu" 
+    4674 "Ethiopic Rrokje Qi" 
+    4675 "Ethiopic Rrokje Qaa" 
+    4676 "Ethiopic Rrokje Qee" 
+    4677 "Ethiopic Rrokje Qe" 
+    4678 "Ethiopic Rrokje Qo" 
+    4679 "Ethiopic Rrokje Qoa" 
+    4680 "Ethiopic Rrokje Qwa" 
+    4682 "Ethiopic Rrokje Qwi" 
+    4683 "Ethiopic Rrokje Qwaa" 
+    4684 "Ethiopic Rrokje Qwee" 
+    4685 "Ethiopic Rrokje Qwe" 
+    4688 "Ethiopic Rrokje Qha" 
+    4689 "Ethiopic Rrokje Qhu" 
+    4690 "Ethiopic Rrokje Qhi" 
+    4691 "Ethiopic Rrokje Qhaa" 
+    4692 "Ethiopic Rrokje Qhee" 
+    4693 "Ethiopic Rrokje Qhe" 
+    4694 "Ethiopic Rrokje Qho" 
+    4696 "Ethiopic Rrokje Qhwa" 
+    4698 "Ethiopic Rrokje Qhwi" 
+    4699 "Ethiopic Rrokje Qhwaa" 
+    4700 "Ethiopic Rrokje Qhwee" 
+    4701 "Ethiopic Rrokje Qhwe" 
+    4704 "Ethiopic Rrokje Ba" 
+    4705 "Ethiopic Rrokje Bu" 
+    4706 "Ethiopic Rrokje Bi" 
+    4707 "Ethiopic Rrokje Baa" 
+    4708 "Ethiopic Rrokje Bee" 
+    4709 "Ethiopic Rrokje Be" 
+    4710 "Ethiopic Rrokje Bo" 
+    4711 "Ethiopic Rrokje Bwa" 
+    4712 "Ethiopic Rrokje Va" 
+    4713 "Ethiopic Rrokje Vu" 
+    4714 "Ethiopic Rrokje Vi" 
+    4715 "Ethiopic Rrokje Vaa" 
+    4716 "Ethiopic Rrokje Vee" 
+    4717 "Ethiopic Rrokje Ve" 
+    4718 "Ethiopic Rrokje Vo" 
+    4719 "Ethiopic Rrokje Vwa" 
+    4720 "Ethiopic Rrokje Ta" 
+    4721 "Ethiopic Rrokje Tu" 
+    4722 "Ethiopic Rrokje Ti" 
+    4723 "Ethiopic Rrokje Taa" 
+    4724 "Ethiopic Rrokje Tee" 
+    4725 "Ethiopic Rrokje Te" 
+    4726 "Ethiopic Rrokje To" 
+    4727 "Ethiopic Rrokje Twa" 
+    4728 "Ethiopic Rrokje Ca" 
+    4729 "Ethiopic Rrokje Cu" 
+    4730 "Ethiopic Rrokje Ci" 
+    4731 "Ethiopic Rrokje Caa" 
+    4732 "Ethiopic Rrokje Cee" 
+    4733 "Ethiopic Rrokje Ce" 
+    4734 "Ethiopic Rrokje Co" 
+    4735 "Ethiopic Rrokje Cwa" 
+    4736 "Ethiopic Rrokje Xa" 
+    4737 "Ethiopic Rrokje Xu" 
+    4738 "Ethiopic Rrokje Xi" 
+    4739 "Ethiopic Rrokje Xaa" 
+    4740 "Ethiopic Rrokje Xee" 
+    4741 "Ethiopic Rrokje Xe" 
+    4742 "Ethiopic Rrokje Xo" 
+    4743 "Ethiopic Rrokje Xoa" 
+    4744 "Ethiopic Rrokje Xwa" 
+    4746 "Ethiopic Rrokje Xwi" 
+    4747 "Ethiopic Rrokje Xwaa" 
+    4748 "Ethiopic Rrokje Xwee" 
+    4749 "Ethiopic Rrokje Xwe" 
+    4752 "Ethiopic Rrokje Na" 
+    4753 "Ethiopic Rrokje Nu" 
+    4754 "Ethiopic Rrokje Ni" 
+    4755 "Ethiopic Rrokje Naa" 
+    4756 "Ethiopic Rrokje Nee" 
+    4757 "Ethiopic Rrokje Ne" 
+    4758 "Ethiopic Rrokje No" 
+    4759 "Ethiopic Rrokje Nwa" 
+    4760 "Ethiopic Rrokje Nya" 
+    4761 "Ethiopic Rrokje Nyu" 
+    4762 "Ethiopic Rrokje Nyi" 
+    4763 "Ethiopic Rrokje Nyaa" 
+    4764 "Ethiopic Rrokje Nyee" 
+    4765 "Ethiopic Rrokje Nye" 
+    4766 "Ethiopic Rrokje Nyo" 
+    4767 "Ethiopic Rrokje Nywa" 
+    4768 "Ethiopic Rrokje Glottal A" 
+    4769 "Ethiopic Rrokje Glottal U" 
+    4770 "Ethiopic Rrokje Glottal I" 
+    4771 "Ethiopic Rrokje Glottal Aa" 
+    4772 "Ethiopic Rrokje Glottal Ee" 
+    4773 "Ethiopic Rrokje Glottal E" 
+    4774 "Ethiopic Rrokje Glottal O" 
+    4775 "Ethiopic Rrokje Glottal Wa" 
+    4776 "Ethiopic Rrokje Ka" 
+    4777 "Ethiopic Rrokje Ku" 
+    4778 "Ethiopic Rrokje Ki" 
+    4779 "Ethiopic Rrokje Kaa" 
+    4780 "Ethiopic Rrokje Kee" 
+    4781 "Ethiopic Rrokje Ke" 
+    4782 "Ethiopic Rrokje Ko" 
+    4783 "Ethiopic Rrokje Koa" 
+    4784 "Ethiopic Rrokje Kwa" 
+    4786 "Ethiopic Rrokje Kwi" 
+    4787 "Ethiopic Rrokje Kwaa" 
+    4788 "Ethiopic Rrokje Kwee" 
+    4789 "Ethiopic Rrokje Kwe" 
+    4792 "Ethiopic Rrokje Kxa" 
+    4793 "Ethiopic Rrokje Kxu" 
+    4794 "Ethiopic Rrokje Kxi" 
+    4795 "Ethiopic Rrokje Kxaa" 
+    4796 "Ethiopic Rrokje Kxee" 
+    4797 "Ethiopic Rrokje Kxe" 
+    4798 "Ethiopic Rrokje Kxo" 
+    4800 "Ethiopic Rrokje Kxwa" 
+    4802 "Ethiopic Rrokje Kxwi" 
+    4803 "Ethiopic Rrokje Kxwaa" 
+    4804 "Ethiopic Rrokje Kxwee" 
+    4805 "Ethiopic Rrokje Kxwe" 
+    4808 "Ethiopic Rrokje Wa" 
+    4809 "Ethiopic Rrokje Wu" 
+    4810 "Ethiopic Rrokje Wi" 
+    4811 "Ethiopic Rrokje Waa" 
+    4812 "Ethiopic Rrokje Wee" 
+    4813 "Ethiopic Rrokje We" 
+    4814 "Ethiopic Rrokje Wo" 
+    4815 "Ethiopic Rrokje Woa" 
+    4816 "Ethiopic Rrokje Pharyngeal A" 
+    4817 "Ethiopic Rrokje Pharyngeal U" 
+    4818 "Ethiopic Rrokje Pharyngeal I" 
+    4819 "Ethiopic Rrokje Pharyngeal Aa" 
+    4820 "Ethiopic Rrokje Pharyngeal Ee" 
+    4821 "Ethiopic Rrokje Pharyngeal E" 
+    4822 "Ethiopic Rrokje Pharyngeal O" 
+    4824 "Ethiopic Rrokje Za" 
+    4825 "Ethiopic Rrokje Zu" 
+    4826 "Ethiopic Rrokje Zi" 
+    4827 "Ethiopic Rrokje Zaa" 
+    4828 "Ethiopic Rrokje Zee" 
+    4829 "Ethiopic Rrokje Ze" 
+    4830 "Ethiopic Rrokje Zo" 
+    4831 "Ethiopic Rrokje Zwa" 
+    4832 "Ethiopic Rrokje Zha" 
+    4833 "Ethiopic Rrokje Zhu" 
+    4834 "Ethiopic Rrokje Zhi" 
+    4835 "Ethiopic Rrokje Zhaa" 
+    4836 "Ethiopic Rrokje Zhee" 
+    4837 "Ethiopic Rrokje Zhe" 
+    4838 "Ethiopic Rrokje Zho" 
+    4839 "Ethiopic Rrokje Zhwa" 
+    4840 "Ethiopic Rrokje Ya" 
+    4841 "Ethiopic Rrokje Yu" 
+    4842 "Ethiopic Rrokje Yi" 
+    4843 "Ethiopic Rrokje Yaa" 
+    4844 "Ethiopic Rrokje Yee" 
+    4845 "Ethiopic Rrokje Ye" 
+    4846 "Ethiopic Rrokje Yo" 
+    4847 "Ethiopic Rrokje Yoa" 
+    4848 "Ethiopic Rrokje Da" 
+    4849 "Ethiopic Rrokje Du" 
+    4850 "Ethiopic Rrokje Di" 
+    4851 "Ethiopic Rrokje Daa" 
+    4852 "Ethiopic Rrokje Dee" 
+    4853 "Ethiopic Rrokje De" 
+    4854 "Ethiopic Rrokje Do" 
+    4855 "Ethiopic Rrokje Dwa" 
+    4856 "Ethiopic Rrokje Dda" 
+    4857 "Ethiopic Rrokje Ddu" 
+    4858 "Ethiopic Rrokje Ddi" 
+    4859 "Ethiopic Rrokje Ddaa" 
+    4860 "Ethiopic Rrokje Ddee" 
+    4861 "Ethiopic Rrokje Dde" 
+    4862 "Ethiopic Rrokje Ddo" 
+    4863 "Ethiopic Rrokje Ddwa" 
+    4864 "Ethiopic Rrokje Ja" 
+    4865 "Ethiopic Rrokje Ju" 
+    4866 "Ethiopic Rrokje Ji" 
+    4867 "Ethiopic Rrokje Jaa" 
+    4868 "Ethiopic Rrokje Jee" 
+    4869 "Ethiopic Rrokje Je" 
+    4870 "Ethiopic Rrokje Jo" 
+    4871 "Ethiopic Rrokje Jwa" 
+    4872 "Ethiopic Rrokje Ga" 
+    4873 "Ethiopic Rrokje Gu" 
+    4874 "Ethiopic Rrokje Gi" 
+    4875 "Ethiopic Rrokje Gaa" 
+    4876 "Ethiopic Rrokje Gee" 
+    4877 "Ethiopic Rrokje Ge" 
+    4878 "Ethiopic Rrokje Go" 
+    4879 "Ethiopic Rrokje Goa" 
+    4880 "Ethiopic Rrokje Gwa" 
+    4882 "Ethiopic Rrokje Gwi" 
+    4883 "Ethiopic Rrokje Gwaa" 
+    4884 "Ethiopic Rrokje Gwee" 
+    4885 "Ethiopic Rrokje Gwe" 
+    4888 "Ethiopic Rrokje Gga" 
+    4889 "Ethiopic Rrokje Ggu" 
+    4890 "Ethiopic Rrokje Ggi" 
+    4891 "Ethiopic Rrokje Ggaa" 
+    4892 "Ethiopic Rrokje Ggee" 
+    4893 "Ethiopic Rrokje Gge" 
+    4894 "Ethiopic Rrokje Ggo" 
+    4895 "Ethiopic Rrokje Ggwaa" 
+    4896 "Ethiopic Rrokje Tha" 
+    4897 "Ethiopic Rrokje Thu" 
+    4898 "Ethiopic Rrokje Thi" 
+    4899 "Ethiopic Rrokje Thaa" 
+    4900 "Ethiopic Rrokje Thee" 
+    4901 "Ethiopic Rrokje The" 
+    4902 "Ethiopic Rrokje Tho" 
+    4903 "Ethiopic Rrokje Thwa" 
+    4904 "Ethiopic Rrokje Cha" 
+    4905 "Ethiopic Rrokje Chu" 
+    4906 "Ethiopic Rrokje Chi" 
+    4907 "Ethiopic Rrokje Chaa" 
+    4908 "Ethiopic Rrokje Chee" 
+    4909 "Ethiopic Rrokje Che" 
+    4910 "Ethiopic Rrokje Cho" 
+    4911 "Ethiopic Rrokje Chwa" 
+    4912 "Ethiopic Rrokje Pha" 
+    4913 "Ethiopic Rrokje Phu" 
+    4914 "Ethiopic Rrokje Phi" 
+    4915 "Ethiopic Rrokje Phaa" 
+    4916 "Ethiopic Rrokje Phee" 
+    4917 "Ethiopic Rrokje Phe" 
+    4918 "Ethiopic Rrokje Pho" 
+    4919 "Ethiopic Rrokje Phwa" 
+    4920 "Ethiopic Rrokje Tsa" 
+    4921 "Ethiopic Rrokje Tsu" 
+    4922 "Ethiopic Rrokje Tsi" 
+    4923 "Ethiopic Rrokje Tsaa" 
+    4924 "Ethiopic Rrokje Tsee" 
+    4925 "Ethiopic Rrokje Tse" 
+    4926 "Ethiopic Rrokje Tso" 
+    4927 "Ethiopic Rrokje Tswa" 
+    4928 "Ethiopic Rrokje Tza" 
+    4929 "Ethiopic Rrokje Tzu" 
+    4930 "Ethiopic Rrokje Tzi" 
+    4931 "Ethiopic Rrokje Tzaa" 
+    4932 "Ethiopic Rrokje Tzee" 
+    4933 "Ethiopic Rrokje Tze" 
+    4934 "Ethiopic Rrokje Tzo" 
+    4935 "Ethiopic Rrokje Tzoa" 
+    4936 "Ethiopic Rrokje Fa" 
+    4937 "Ethiopic Rrokje Fu" 
+    4938 "Ethiopic Rrokje Fi" 
+    4939 "Ethiopic Rrokje Faa" 
+    4940 "Ethiopic Rrokje Fee" 
+    4941 "Ethiopic Rrokje Fe" 
+    4942 "Ethiopic Rrokje Fo" 
+    4943 "Ethiopic Rrokje Fwa" 
+    4944 "Ethiopic Rrokje Pa" 
+    4945 "Ethiopic Rrokje Pu" 
+    4946 "Ethiopic Rrokje Pi" 
+    4947 "Ethiopic Rrokje Paa" 
+    4948 "Ethiopic Rrokje Pee" 
+    4949 "Ethiopic Rrokje Pe" 
+    4950 "Ethiopic Rrokje Po" 
+    4951 "Ethiopic Rrokje Pwa" 
+    4952 "Ethiopic Rrokje Rya" 
+    4953 "Ethiopic Rrokje Mya" 
+    4954 "Ethiopic Rrokje Fya" 
+    4957 "Ethiopic Kombinuar Dyfishim dhe Zanore GjatÃ«si ShenjÃ«" 
+    4958 "Ethiopic Kombinuar Zanore GjatÃ«si ShenjÃ«" 
+    4959 "Ethiopic Kombinuar Dyfishim ShenjÃ«" 
+    4960 "Ethiopic Seksion ShenjÃ«" 
+    4961 "Ethiopic Vend-pune" 
+    4962 "Ethiopic PikÃ«" 
+    4963 "Ethiopic Presje" 
+    4964 "Ethiopic PikÃ«presje" 
+    4965 "Ethiopic Dy Pika" 
+    4966 "Ethiopic ParathÃ«nie Dy Pika" 
+    4967 "Ethiopic Pyetje ShenjÃ«" 
+    4968 "Ethiopic Paragraf NdarÃ«s" 
+    4969 "Ethiopic ShifÃ«r NjÃ«" 
+    4970 "Ethiopic ShifÃ«r Dy" 
+    4971 "Ethiopic ShifÃ«r Tre" 
+    4972 "Ethiopic ShifÃ«r KatÃ«r" 
+    4973 "Ethiopic ShifÃ«r PesÃ«" 
+    4974 "Ethiopic ShifÃ«r GjashtÃ«" 
+    4975 "Ethiopic ShifÃ«r ShtatÃ«" 
+    4976 "Ethiopic ShifÃ«r TetÃ«" 
+    4977 "Ethiopic ShifÃ«r NÃ«ntÃ«" 
+    4978 "Ethiopic NumÃ«r DhjetÃ«" 
+    4979 "Ethiopic NumÃ«r NjÃ«zet" 
+    4980 "Ethiopic NumÃ«r TridhjetÃ«" 
+    4981 "Ethiopic NumÃ«r DyzetÃ«" 
+    4982 "Ethiopic NumÃ«r PesÃ«dhjetÃ«" 
+    4983 "Ethiopic NumÃ«r GjashtÃ«dhjetÃ«" 
+    4984 "Ethiopic NumÃ«r ShtatÃ«dhjetÃ«" 
+    4985 "Ethiopic NumÃ«r Eighty" 
+    4986 "Ethiopic NumÃ«r Ninety" 
+    4987 "Ethiopic NumÃ«r NjÃ«qind" 
+    4988 "Ethiopic NumÃ«r DhjetÃ« MijÃ«" 
+    4992 "Ethiopic Rrokje Sebatbeit Mwa" 
+    4993 "Ethiopic Rrokje Mwi" 
+    4994 "Ethiopic Rrokje Mwee" 
+    4995 "Ethiopic Rrokje Mwe" 
+    4996 "Ethiopic Rrokje Sebatbeit Bwa" 
+    4997 "Ethiopic Rrokje Bwi" 
+    4998 "Ethiopic Rrokje Bwee" 
+    4999 "Ethiopic Rrokje Bwe" 
+    5000 "Ethiopic Rrokje Sebatbeit Fwa" 
+    5001 "Ethiopic Rrokje Fwi" 
+    5002 "Ethiopic Rrokje Fwee" 
+    5003 "Ethiopic Rrokje Fwe" 
+    5004 "Ethiopic Rrokje Sebatbeit Pwa" 
+    5005 "Ethiopic Rrokje Pwi" 
+    5006 "Ethiopic Rrokje Pwee" 
+    5007 "Ethiopic Rrokje Pwe" 
+    5008 "Ethiopic Tonal ShenjÃ« Yizet" 
+    5009 "Ethiopic Tonal ShenjÃ« Deret" 
+    5010 "Ethiopic Tonal ShenjÃ« Rikrik" 
+    5011 "Ethiopic Tonal ShenjÃ« ShkurtÃ«r Rikrik" 
+    5012 "Ethiopic Tonal ShenjÃ« Difat" 
+    5013 "Ethiopic Tonal ShenjÃ« Kenat" 
+    5014 "Ethiopic Tonal ShenjÃ« Chiret" 
+    5015 "Ethiopic Tonal ShenjÃ« Hidet" 
+    5016 "Ethiopic Tonal ShenjÃ« Deret-Hidet" 
+    5017 "Ethiopic Tonal ShenjÃ« Kurt" 
+    5024 "Cherokee ShkronjÃ« A" 
+    5025 "Cherokee ShkronjÃ« E" 
+    5026 "Cherokee ShkronjÃ« I" 
+    5027 "Cherokee ShkronjÃ« O" 
+    5028 "Cherokee ShkronjÃ« U" 
+    5029 "Cherokee ShkronjÃ« V" 
+    5030 "Cherokee ShkronjÃ« Ga" 
+    5031 "Cherokee ShkronjÃ« Ka" 
+    5032 "Cherokee ShkronjÃ« Ge" 
+    5033 "Cherokee ShkronjÃ« Gi" 
+    5034 "Cherokee ShkronjÃ« Go" 
+    5035 "Cherokee ShkronjÃ« Gu" 
+    5036 "Cherokee ShkronjÃ« Gv" 
+    5037 "Cherokee ShkronjÃ« Ha" 
+    5038 "Cherokee ShkronjÃ« He" 
+    5039 "Cherokee ShkronjÃ« Hi" 
+    5040 "Cherokee ShkronjÃ« Ho" 
+    5041 "Cherokee ShkronjÃ« Hu" 
+    5042 "Cherokee ShkronjÃ« Hv" 
+    5043 "Cherokee ShkronjÃ« La" 
+    5044 "Cherokee ShkronjÃ« Le" 
+    5045 "Cherokee ShkronjÃ« Li" 
+    5046 "Cherokee ShkronjÃ« Lo" 
+    5047 "Cherokee ShkronjÃ« Lu" 
+    5048 "Cherokee ShkronjÃ« Lv" 
+    5049 "Cherokee ShkronjÃ« Ma" 
+    5050 "Cherokee ShkronjÃ« Me" 
+    5051 "Cherokee ShkronjÃ« Mi" 
+    5052 "Cherokee ShkronjÃ« Mo" 
+    5053 "Cherokee ShkronjÃ« Mu" 
+    5054 "Cherokee ShkronjÃ« Na" 
+    5055 "Cherokee ShkronjÃ« Hna" 
+    5056 "Cherokee ShkronjÃ« Nah" 
+    5057 "Cherokee ShkronjÃ« Ne" 
+    5058 "Cherokee ShkronjÃ« Ni" 
+    5059 "Cherokee ShkronjÃ« No" 
+    5060 "Cherokee ShkronjÃ« Nu" 
+    5061 "Cherokee ShkronjÃ« Nv" 
+    5062 "Cherokee ShkronjÃ« Qua" 
+    5063 "Cherokee ShkronjÃ« Que" 
+    5064 "Cherokee ShkronjÃ« Qui" 
+    5065 "Cherokee ShkronjÃ« Quo" 
+    5066 "Cherokee ShkronjÃ« Quu" 
+    5067 "Cherokee ShkronjÃ« Quv" 
+    5068 "Cherokee ShkronjÃ« Sa" 
+    5069 "Cherokee ShkronjÃ« S" 
+    5070 "Cherokee ShkronjÃ« Se" 
+    5071 "Cherokee ShkronjÃ« Si" 
+    5072 "Cherokee ShkronjÃ« So" 
+    5073 "Cherokee ShkronjÃ« Su" 
+    5074 "Cherokee ShkronjÃ« Sv" 
+    5075 "Cherokee ShkronjÃ« Da" 
+    5076 "Cherokee ShkronjÃ« Ta" 
+    5077 "Cherokee ShkronjÃ« De" 
+    5078 "Cherokee ShkronjÃ« Te" 
+    5079 "Cherokee ShkronjÃ« Di" 
+    5080 "Cherokee ShkronjÃ« Ti" 
+    5081 "Cherokee ShkronjÃ« Do" 
+    5082 "Cherokee ShkronjÃ« Du" 
+    5083 "Cherokee ShkronjÃ« Dv" 
+    5084 "Cherokee ShkronjÃ« Dla" 
+    5085 "Cherokee ShkronjÃ« Tla" 
+    5086 "Cherokee ShkronjÃ« Tle" 
+    5087 "Cherokee ShkronjÃ« Tli" 
+    5088 "Cherokee ShkronjÃ« Tlo" 
+    5089 "Cherokee ShkronjÃ« Tlu" 
+    5090 "Cherokee ShkronjÃ« Tlv" 
+    5091 "Cherokee ShkronjÃ« Tsa" 
+    5092 "Cherokee ShkronjÃ« Tse" 
+    5093 "Cherokee ShkronjÃ« Tsi" 
+    5094 "Cherokee ShkronjÃ« Tso" 
+    5095 "Cherokee ShkronjÃ« Tsu" 
+    5096 "Cherokee ShkronjÃ« Tsv" 
+    5097 "Cherokee ShkronjÃ« Wa" 
+    5098 "Cherokee ShkronjÃ« We" 
+    5099 "Cherokee ShkronjÃ« Wi" 
+    5100 "Cherokee ShkronjÃ« Wo" 
+    5101 "Cherokee ShkronjÃ« Wu" 
+    5102 "Cherokee ShkronjÃ« Wv" 
+    5103 "Cherokee ShkronjÃ« Ya" 
+    5104 "Cherokee ShkronjÃ« Ye" 
+    5105 "Cherokee ShkronjÃ« Yi" 
+    5106 "Cherokee ShkronjÃ« Yo" 
+    5107 "Cherokee ShkronjÃ« Yu" 
+    5108 "Cherokee ShkronjÃ« Yv" 
+    5120 "Kanadeze Syllabics Hyphen" 
+    5121 "Kanadeze Syllabics E" 
+    5122 "Kanadeze Syllabics Aai" 
+    5123 "Kanadeze Syllabics I" 
+    5124 "Kanadeze Syllabics Ii" 
+    5125 "Kanadeze Syllabics O" 
+    5126 "Kanadeze Syllabics Oo" 
+    5127 "Kanadeze Syllabics Y-Cree Oo" 
+    5128 "Kanadeze Syllabics Carrier Ee" 
+    5129 "Kanadeze Syllabics Carrier I" 
+    5130 "Kanadeze Syllabics A" 
+    5131 "Kanadeze Syllabics Aa" 
+    5132 "Kanadeze Syllabics We" 
+    5133 "Kanadeze Syllabics West-Cree We" 
+    5134 "Kanadeze Syllabics Wi" 
+    5135 "Kanadeze Syllabics West-Cree Wi" 
+    5136 "Kanadeze Syllabics Wii" 
+    5137 "Kanadeze Syllabics West-Cree Wii" 
+    5138 "Kanadeze Syllabics Wo" 
+    5139 "Kanadeze Syllabics West-Cree Wo" 
+    5140 "Kanadeze Syllabics Woo" 
+    5141 "Kanadeze Syllabics West-Cree Woo" 
+    5142 "Kanadeze Syllabics Naskapi Woo" 
+    5143 "Kanadeze Syllabics Wa" 
+    5144 "Kanadeze Syllabics West-Cree Wa" 
+    5145 "Kanadeze Syllabics Waa" 
+    5146 "Kanadeze Syllabics West-Cree Waa" 
+    5147 "Kanadeze Syllabics Naskapi Waa" 
+    5148 "Kanadeze Syllabics Ai" 
+    5149 "Kanadeze Syllabics Y-Cree W" 
+    5150 "Kanadeze Syllabics Glottal Stop" 
+    5151 "Kanadeze Syllabics PÃ«rfundimtare MprehtÃ«" 
+    5152 "Kanadeze Syllabics PÃ«rfundimtare RÃ«ndÃ«" 
+    5153 "Kanadeze Syllabics PÃ«rfundimtare Fund GjysmÃ« Rreth" 
+    5154 "Kanadeze Syllabics PÃ«rfundimtare SipÃ«rm GjysmÃ« Rreth" 
+    5155 "Kanadeze Syllabics PÃ«rfundimtare DjathtÃ« GjysmÃ« Rreth" 
+    5156 "Kanadeze Syllabics PÃ«rfundimtare Rreth" 
+    5157 "Kanadeze Syllabics PÃ«rfundimtare Dyshe MprehtÃ«" 
+    5158 "Kanadeze Syllabics PÃ«rfundimtare Dyshe ShkurtÃ«r Vertikale Goditje" 
+    5159 "Kanadeze Syllabics PÃ«rfundimtare Mesit PikÃ«" 
+    5160 "Kanadeze Syllabics PÃ«rfundimtare ShkurtÃ«r Horizontal Goditje" 
+    5161 "Kanadeze Syllabics PÃ«rfundimtare Plus" 
+    5162 "Kanadeze Syllabics PÃ«rfundimtare PoshtÃ« Litar" 
+    5163 "Kanadeze Syllabics En" 
+    5164 "Kanadeze Syllabics In" 
+    5165 "Kanadeze Syllabics On" 
+    5166 "Kanadeze Syllabics An" 
+    5167 "Kanadeze Syllabics Pe" 
+    5168 "Kanadeze Syllabics Paai" 
+    5169 "Kanadeze Syllabics Pi" 
+    5170 "Kanadeze Syllabics Pii" 
+    5171 "Kanadeze Syllabics Po" 
+    5172 "Kanadeze Syllabics Poo" 
+    5173 "Kanadeze Syllabics Y-Cree Poo" 
+    5174 "Kanadeze Syllabics Carrier Hee" 
+    5175 "Kanadeze Syllabics Carrier Hi" 
+    5176 "Kanadeze Syllabics Pa" 
+    5177 "Kanadeze Syllabics Paa" 
+    5178 "Kanadeze Syllabics Pwe" 
+    5179 "Kanadeze Syllabics West-Cree Pwe" 
+    5180 "Kanadeze Syllabics Pwi" 
+    5181 "Kanadeze Syllabics West-Cree Pwi" 
+    5182 "Kanadeze Syllabics Pwii" 
+    5183 "Kanadeze Syllabics West-Cree Pwii" 
+    5184 "Kanadeze Syllabics Pwo" 
+    5185 "Kanadeze Syllabics West-Cree Pwo" 
+    5186 "Kanadeze Syllabics Pwoo" 
+    5187 "Kanadeze Syllabics West-Cree Pwoo" 
+    5188 "Kanadeze Syllabics Pwa" 
+    5189 "Kanadeze Syllabics West-Cree Pwa" 
+    5190 "Kanadeze Syllabics Pwaa" 
+    5191 "Kanadeze Syllabics West-Cree Pwaa" 
+    5192 "Kanadeze Syllabics Y-Cree Pwaa" 
+    5193 "Kanadeze Syllabics P" 
+    5194 "Kanadeze Syllabics West-Cree P" 
+    5195 "Kanadeze Syllabics Carrier H" 
+    5196 "Kanadeze Syllabics Te" 
+    5197 "Kanadeze Syllabics Taai" 
+    5198 "Kanadeze Syllabics Ti" 
+    5199 "Kanadeze Syllabics Tii" 
+    5200 "Kanadeze Syllabics To" 
+    5201 "Kanadeze Syllabics Too" 
+    5202 "Kanadeze Syllabics Y-Cree Too" 
+    5203 "Kanadeze Syllabics Carrier Dee" 
+    5204 "Kanadeze Syllabics Carrier Di" 
+    5205 "Kanadeze Syllabics Ta" 
+    5206 "Kanadeze Syllabics Taa" 
+    5207 "Kanadeze Syllabics Twe" 
+    5208 "Kanadeze Syllabics West-Cree Twe" 
+    5209 "Kanadeze Syllabics Twi" 
+    5210 "Kanadeze Syllabics West-Cree Twi" 
+    5211 "Kanadeze Syllabics Twii" 
+    5212 "Kanadeze Syllabics West-Cree Twii" 
+    5213 "Kanadeze Syllabics Dy" 
+    5214 "Kanadeze Syllabics West-Cree Dy" 
+    5215 "Kanadeze Syllabics Twoo" 
+    5216 "Kanadeze Syllabics West-Cree Twoo" 
+    5217 "Kanadeze Syllabics Twa" 
+    5218 "Kanadeze Syllabics West-Cree Twa" 
+    5219 "Kanadeze Syllabics Twaa" 
+    5220 "Kanadeze Syllabics West-Cree Twaa" 
+    5221 "Kanadeze Syllabics Naskapi Twaa" 
+    5222 "Kanadeze Syllabics T" 
+    5223 "Kanadeze Syllabics Tte" 
+    5224 "Kanadeze Syllabics Tti" 
+    5225 "Kanadeze Syllabics Tto" 
+    5226 "Kanadeze Syllabics Tta" 
+    5227 "Kanadeze Syllabics Ke" 
+    5228 "Kanadeze Syllabics Kaai" 
+    5229 "Kanadeze Syllabics Ki" 
+    5230 "Kanadeze Syllabics Kii" 
+    5231 "Kanadeze Syllabics Ko" 
+    5232 "Kanadeze Syllabics Koo" 
+    5233 "Kanadeze Syllabics Y-Cree Koo" 
+    5234 "Kanadeze Syllabics Ka" 
+    5235 "Kanadeze Syllabics Kaa" 
+    5236 "Kanadeze Syllabics Kwe" 
+    5237 "Kanadeze Syllabics West-Cree Kwe" 
+    5238 "Kanadeze Syllabics Kwi" 
+    5239 "Kanadeze Syllabics West-Cree Kwi" 
+    5240 "Kanadeze Syllabics Kwii" 
+    5241 "Kanadeze Syllabics West-Cree Kwii" 
+    5242 "Kanadeze Syllabics Kwo" 
+    5243 "Kanadeze Syllabics West-Cree Kwo" 
+    5244 "Kanadeze Syllabics Kwoo" 
+    5245 "Kanadeze Syllabics West-Cree Kwoo" 
+    5246 "Kanadeze Syllabics Kwa" 
+    5247 "Kanadeze Syllabics West-Cree Kwa" 
+    5248 "Kanadeze Syllabics Kwaa" 
+    5249 "Kanadeze Syllabics West-Cree Kwaa" 
+    5250 "Kanadeze Syllabics Naskapi Kwaa" 
+    5251 "Kanadeze Syllabics K" 
+    5252 "Kanadeze Syllabics Kw" 
+    5253 "Kanadeze Syllabics South-Slavey Keh" 
+    5254 "Kanadeze Syllabics South-Slavey Kih" 
+    5255 "Kanadeze Syllabics South-Slavey Koh" 
+    5256 "Kanadeze Syllabics South-Slavey Kah" 
+    5257 "Kanadeze Syllabics Ce" 
+    5258 "Kanadeze Syllabics Caai" 
+    5259 "Kanadeze Syllabics Ci" 
+    5260 "Kanadeze Syllabics Cii" 
+    5261 "Kanadeze Syllabics Co" 
+    5262 "Kanadeze Syllabics Coo" 
+    5263 "Kanadeze Syllabics Y-Cree Coo" 
+    5264 "Kanadeze Syllabics Ca" 
+    5265 "Kanadeze Syllabics Caa" 
+    5266 "Kanadeze Syllabics Cwe" 
+    5267 "Kanadeze Syllabics West-Cree Cwe" 
+    5268 "Kanadeze Syllabics Cwi" 
+    5269 "Kanadeze Syllabics West-Cree Cwi" 
+    5270 "Kanadeze Syllabics Cwii" 
+    5271 "Kanadeze Syllabics West-Cree Cwii" 
+    5272 "Kanadeze Syllabics Cwo" 
+    5273 "Kanadeze Syllabics West-Cree Cwo" 
+    5274 "Kanadeze Syllabics Cwoo" 
+    5275 "Kanadeze Syllabics West-Cree Cwoo" 
+    5276 "Kanadeze Syllabics Cwa" 
+    5277 "Kanadeze Syllabics West-Cree Cwa" 
+    5278 "Kanadeze Syllabics Cwaa" 
+    5279 "Kanadeze Syllabics West-Cree Cwaa" 
+    5280 "Kanadeze Syllabics Naskapi Cwaa" 
+    5281 "Kanadeze Syllabics C" 
+    5282 "Kanadeze Syllabics Sayisi Th" 
+    5283 "Kanadeze Syllabics Me" 
+    5284 "Kanadeze Syllabics Maai" 
+    5285 "Kanadeze Syllabics Mi" 
+    5286 "Kanadeze Syllabics Mii" 
+    5287 "Kanadeze Syllabics Mo" 
+    5288 "Kanadeze Syllabics Moo" 
+    5289 "Kanadeze Syllabics Y-Cree Moo" 
+    5290 "Kanadeze Syllabics Ma" 
+    5291 "Kanadeze Syllabics Maa" 
+    5292 "Kanadeze Syllabics Mwe" 
+    5293 "Kanadeze Syllabics West-Cree Mwe" 
+    5294 "Kanadeze Syllabics Mwi" 
+    5295 "Kanadeze Syllabics West-Cree Mwi" 
+    5296 "Kanadeze Syllabics Mwii" 
+    5297 "Kanadeze Syllabics West-Cree Mwii" 
+    5298 "Kanadeze Syllabics Mwo" 
+    5299 "Kanadeze Syllabics West-Cree Mwo" 
+    5300 "Kanadeze Syllabics Mwoo" 
+    5301 "Kanadeze Syllabics West-Cree Mwoo" 
+    5302 "Kanadeze Syllabics Mwa" 
+    5303 "Kanadeze Syllabics West-Cree Mwa" 
+    5304 "Kanadeze Syllabics Mwaa" 
+    5305 "Kanadeze Syllabics West-Cree Mwaa" 
+    5306 "Kanadeze Syllabics Naskapi Mwaa" 
+    5307 "Kanadeze Syllabics M" 
+    5308 "Kanadeze Syllabics West-Cree M" 
+    5309 "Kanadeze Syllabics Mh" 
+    5310 "Kanadeze Syllabics Athapascan M" 
+    5311 "Kanadeze Syllabics Sayisi M" 
+    5312 "Kanadeze Syllabics Ne" 
+    5313 "Kanadeze Syllabics Naai" 
+    5314 "Kanadeze Syllabics Ni" 
+    5315 "Kanadeze Syllabics Nii" 
+    5316 "Kanadeze Syllabics No" 
+    5317 "Kanadeze Syllabics Noo" 
+    5318 "Kanadeze Syllabics Y-Cree Noo" 
+    5319 "Kanadeze Syllabics Na" 
+    5320 "Kanadeze Syllabics Naa" 
+    5321 "Kanadeze Syllabics Nwe" 
+    5322 "Kanadeze Syllabics West-Cree Nwe" 
+    5323 "Kanadeze Syllabics Nwa" 
+    5324 "Kanadeze Syllabics West-Cree Nwa" 
+    5325 "Kanadeze Syllabics Nwaa" 
+    5326 "Kanadeze Syllabics West-Cree Nwaa" 
+    5327 "Kanadeze Syllabics Naskapi Nwaa" 
+    5328 "Kanadeze Syllabics N" 
+    5329 "Kanadeze Syllabics Carrier Ng" 
+    5330 "Kanadeze Syllabics Nh" 
+    5331 "Kanadeze Syllabics Le" 
+    5332 "Kanadeze Syllabics Laai" 
+    5333 "Kanadeze Syllabics Li" 
+    5334 "Kanadeze Syllabics Lii" 
+    5335 "Kanadeze Syllabics Lo" 
+    5336 "Kanadeze Syllabics Loo" 
+    5337 "Kanadeze Syllabics Y-Cree Loo" 
+    5338 "Kanadeze Syllabics La" 
+    5339 "Kanadeze Syllabics Laa" 
+    5340 "Kanadeze Syllabics Lwe" 
+    5341 "Kanadeze Syllabics West-Cree Lwe" 
+    5342 "Kanadeze Syllabics Lwi" 
+    5343 "Kanadeze Syllabics West-Cree Lwi" 
+    5344 "Kanadeze Syllabics Lwii" 
+    5345 "Kanadeze Syllabics West-Cree Lwii" 
+    5346 "Kanadeze Syllabics Lwo" 
+    5347 "Kanadeze Syllabics West-Cree Lwo" 
+    5348 "Kanadeze Syllabics Lwoo" 
+    5349 "Kanadeze Syllabics West-Cree Lwoo" 
+    5350 "Kanadeze Syllabics Lwa" 
+    5351 "Kanadeze Syllabics West-Cree Lwa" 
+    5352 "Kanadeze Syllabics Lwaa" 
+    5353 "Kanadeze Syllabics West-Cree Lwaa" 
+    5354 "Kanadeze Syllabics L" 
+    5355 "Kanadeze Syllabics West-Cree L" 
+    5356 "Kanadeze Syllabics Mesor L" 
+    5357 "Kanadeze Syllabics Se" 
+    5358 "Kanadeze Syllabics Saai" 
+    5359 "Kanadeze Syllabics Si" 
+    5360 "Kanadeze Syllabics Sii" 
+    5361 "Kanadeze Syllabics So" 
+    5362 "Kanadeze Syllabics Soo" 
+    5363 "Kanadeze Syllabics Y-Cree Soo" 
+    5364 "Kanadeze Syllabics Sa" 
+    5365 "Kanadeze Syllabics Saa" 
+    5366 "Kanadeze Syllabics Swe" 
+    5367 "Kanadeze Syllabics West-Cree Swe" 
+    5368 "Kanadeze Syllabics Swi" 
+    5369 "Kanadeze Syllabics West-Cree Swi" 
+    5370 "Kanadeze Syllabics Swii" 
+    5371 "Kanadeze Syllabics West-Cree Swii" 
+    5372 "Kanadeze Syllabics Swo" 
+    5373 "Kanadeze Syllabics West-Cree Swo" 
+    5374 "Kanadeze Syllabics Swoo" 
+    5375 "Kanadeze Syllabics West-Cree Swoo" 
+    5376 "Kanadeze Syllabics Swa" 
+    5377 "Kanadeze Syllabics West-Cree Swa" 
+    5378 "Kanadeze Syllabics Swaa" 
+    5379 "Kanadeze Syllabics West-Cree Swaa" 
+    5380 "Kanadeze Syllabics Naskapi Swaa" 
+    5381 "Kanadeze Syllabics S" 
+    5382 "Kanadeze Syllabics Athapascan S" 
+    5383 "Kanadeze Syllabics Sw" 
+    5384 "Kanadeze Syllabics e ZezÃ«foot S" 
+    5385 "Kanadeze Syllabics Moose-Cree Sk" 
+    5386 "Kanadeze Syllabics Naskapi Skw" 
+    5387 "Kanadeze Syllabics Naskapi S-W" 
+    5388 "Kanadeze Syllabics Naskapi Spwa" 
+    5389 "Kanadeze Syllabics Naskapi Stwa" 
+    5390 "Kanadeze Syllabics Naskapi Skwa" 
+    5391 "Kanadeze Syllabics Naskapi Scwa" 
+    5392 "Kanadeze Syllabics She" 
+    5393 "Kanadeze Syllabics Shi" 
+    5394 "Kanadeze Syllabics Shii" 
+    5395 "Kanadeze Syllabics Sho" 
+    5396 "Kanadeze Syllabics Shoo" 
+    5397 "Kanadeze Syllabics Sha" 
+    5398 "Kanadeze Syllabics Shaa" 
+    5399 "Kanadeze Syllabics Shwe" 
+    5400 "Kanadeze Syllabics West-Cree Shwe" 
+    5401 "Kanadeze Syllabics Shwi" 
+    5402 "Kanadeze Syllabics West-Cree Shwi" 
+    5403 "Kanadeze Syllabics Shwii" 
+    5404 "Kanadeze Syllabics West-Cree Shwii" 
+    5405 "Kanadeze Syllabics Shwo" 
+    5406 "Kanadeze Syllabics West-Cree Shwo" 
+    5407 "Kanadeze Syllabics Shwoo" 
+    5408 "Kanadeze Syllabics West-Cree Shwoo" 
+    5409 "Kanadeze Syllabics Shwa" 
+    5410 "Kanadeze Syllabics West-Cree Shwa" 
+    5411 "Kanadeze Syllabics Shwaa" 
+    5412 "Kanadeze Syllabics West-Cree Shwaa" 
+    5413 "Kanadeze Syllabics Sh" 
+    5414 "Kanadeze Syllabics Ye" 
+    5415 "Kanadeze Syllabics Yaai" 
+    5416 "Kanadeze Syllabics Yi" 
+    5417 "Kanadeze Syllabics Yii" 
+    5418 "Kanadeze Syllabics Yo" 
+    5419 "Kanadeze Syllabics Yoo" 
+    5420 "Kanadeze Syllabics Y-Cree Yoo" 
+    5421 "Kanadeze Syllabics Ya" 
+    5422 "Kanadeze Syllabics Yaa" 
+    5423 "Kanadeze Syllabics Ywe" 
+    5424 "Kanadeze Syllabics West-Cree Ywe" 
+    5425 "Kanadeze Syllabics Ywi" 
+    5426 "Kanadeze Syllabics West-Cree Ywi" 
+    5427 "Kanadeze Syllabics Ywii" 
+    5428 "Kanadeze Syllabics West-Cree Ywii" 
+    5429 "Kanadeze Syllabics Ywo" 
+    5430 "Kanadeze Syllabics West-Cree Ywo" 
+    5431 "Kanadeze Syllabics Ywoo" 
+    5432 "Kanadeze Syllabics West-Cree Ywoo" 
+    5433 "Kanadeze Syllabics Ywa" 
+    5434 "Kanadeze Syllabics West-Cree Ywa" 
+    5435 "Kanadeze Syllabics Ywaa" 
+    5436 "Kanadeze Syllabics West-Cree Ywaa" 
+    5437 "Kanadeze Syllabics Naskapi Ywaa" 
+    5438 "Kanadeze Syllabics Y" 
+    5439 "Kanadeze Syllabics Bible-Cree Y" 
+    5440 "Kanadeze Syllabics West-Cree Y" 
+    5441 "Kanadeze Syllabics Sayisi Yi" 
+    5442 "Kanadeze Syllabics Re" 
+    5443 "Kanadeze Syllabics R-Cree Re" 
+    5444 "Kanadeze Syllabics West-Cree Le" 
+    5445 "Kanadeze Syllabics Raai" 
+    5446 "Kanadeze Syllabics Ri" 
+    5447 "Kanadeze Syllabics Rii" 
+    5448 "Kanadeze Syllabics Ro" 
+    5449 "Kanadeze Syllabics Roo" 
+    5450 "Kanadeze Syllabics West-Cree Lo" 
+    5451 "Kanadeze Syllabics Ra" 
+    5452 "Kanadeze Syllabics Raa" 
+    5453 "Kanadeze Syllabics West-Cree La" 
+    5454 "Kanadeze Syllabics Rwaa" 
+    5455 "Kanadeze Syllabics West-Cree Rwaa" 
+    5456 "Kanadeze Syllabics R" 
+    5457 "Kanadeze Syllabics West-Cree R" 
+    5458 "Kanadeze Syllabics Mesor R" 
+    5459 "Kanadeze Syllabics Fe" 
+    5460 "Kanadeze Syllabics Faai" 
+    5461 "Kanadeze Syllabics Fi" 
+    5462 "Kanadeze Syllabics Fii" 
+    5463 "Kanadeze Syllabics Fo" 
+    5464 "Kanadeze Syllabics Foo" 
+    5465 "Kanadeze Syllabics Fa" 
+    5466 "Kanadeze Syllabics Faa" 
+    5467 "Kanadeze Syllabics Fwaa" 
+    5468 "Kanadeze Syllabics West-Cree Fwaa" 
+    5469 "Kanadeze Syllabics F" 
+    5470 "Kanadeze Syllabics The" 
+    5471 "Kanadeze Syllabics N-Cree The" 
+    5472 "Kanadeze Syllabics Thi" 
+    5473 "Kanadeze Syllabics N-Cree Thi" 
+    5474 "Kanadeze Syllabics Thii" 
+    5475 "Kanadeze Syllabics N-Cree Thii" 
+    5476 "Kanadeze Syllabics Tho" 
+    5477 "Kanadeze Syllabics Thoo" 
+    5478 "Kanadeze Syllabics Tha" 
+    5479 "Kanadeze Syllabics Thaa" 
+    5480 "Kanadeze Syllabics Thwaa" 
+    5481 "Kanadeze Syllabics West-Cree Thwaa" 
+    5482 "Kanadeze Syllabics Th" 
+    5483 "Kanadeze Syllabics Tthe" 
+    5484 "Kanadeze Syllabics Tthi" 
+    5485 "Kanadeze Syllabics Ttho" 
+    5486 "Kanadeze Syllabics Ttha" 
+    5487 "Kanadeze Syllabics Tth" 
+    5488 "Kanadeze Syllabics Tye" 
+    5489 "Kanadeze Syllabics Tyi" 
+    5490 "Kanadeze Syllabics Tyo" 
+    5491 "Kanadeze Syllabics Tya" 
+    5492 "Kanadeze Syllabics Nunavik He" 
+    5493 "Kanadeze Syllabics Nunavik Hi" 
+    5494 "Kanadeze Syllabics Nunavik Hii" 
+    5495 "Kanadeze Syllabics Nunavik Ho" 
+    5496 "Kanadeze Syllabics Nunavik Hoo" 
+    5497 "Kanadeze Syllabics Nunavik Ha" 
+    5498 "Kanadeze Syllabics Nunavik Haa" 
+    5499 "Kanadeze Syllabics Nunavik H" 
+    5500 "Kanadeze Syllabics Nunavut H" 
+    5501 "Kanadeze Syllabics Hk" 
+    5502 "Kanadeze Syllabics Qaai" 
+    5503 "Kanadeze Syllabics Qi" 
+    5504 "Kanadeze Syllabics Qii" 
+    5505 "Kanadeze Syllabics Qo" 
+    5506 "Kanadeze Syllabics Qoo" 
+    5507 "Kanadeze Syllabics Qa" 
+    5508 "Kanadeze Syllabics Qaa" 
+    5509 "Kanadeze Syllabics Q" 
+    5510 "Kanadeze Syllabics Tlhe" 
+    5511 "Kanadeze Syllabics Tlhi" 
+    5512 "Kanadeze Syllabics Tlho" 
+    5513 "Kanadeze Syllabics Tlha" 
+    5514 "Kanadeze Syllabics West-Cree Re" 
+    5515 "Kanadeze Syllabics West-Cree Ri" 
+    5516 "Kanadeze Syllabics West-Cree Ro" 
+    5517 "Kanadeze Syllabics West-Cree Ra" 
+    5518 "Kanadeze Syllabics Ngaai" 
+    5519 "Kanadeze Syllabics Ngi" 
+    5520 "Kanadeze Syllabics Ngii" 
+    5521 "Kanadeze Syllabics Ngo" 
+    5522 "Kanadeze Syllabics Ngoo" 
+    5523 "Kanadeze Syllabics Nga" 
+    5524 "Kanadeze Syllabics Ngaa" 
+    5525 "Kanadeze Syllabics Ng" 
+    5526 "Kanadeze Syllabics Nng" 
+    5527 "Kanadeze Syllabics Sayisi She" 
+    5528 "Kanadeze Syllabics Sayisi Shi" 
+    5529 "Kanadeze Syllabics Sayisi Sho" 
+    5530 "Kanadeze Syllabics Sayisi Sha" 
+    5531 "Kanadeze Syllabics Woods-Cree The" 
+    5532 "Kanadeze Syllabics Woods-Cree Thi" 
+    5533 "Kanadeze Syllabics Woods-Cree Tho" 
+    5534 "Kanadeze Syllabics Woods-Cree Tha" 
+    5535 "Kanadeze Syllabics Woods-Cree Th" 
+    5536 "Kanadeze Syllabics Lhi" 
+    5537 "Kanadeze Syllabics Lhii" 
+    5538 "Kanadeze Syllabics Lho" 
+    5539 "Kanadeze Syllabics Lhoo" 
+    5540 "Kanadeze Syllabics Lha" 
+    5541 "Kanadeze Syllabics Lhaa" 
+    5542 "Kanadeze Syllabics Lh" 
+    5543 "Kanadeze Syllabics Th-Cree The" 
+    5544 "Kanadeze Syllabics Th-Cree Thi" 
+    5545 "Kanadeze Syllabics Th-Cree Thii" 
+    5546 "Kanadeze Syllabics Th-Cree Tho" 
+    5547 "Kanadeze Syllabics Th-Cree Thoo" 
+    5548 "Kanadeze Syllabics Th-Cree Tha" 
+    5549 "Kanadeze Syllabics Th-Cree Thaa" 
+    5550 "Kanadeze Syllabics Th-Cree Th" 
+    5551 "Kanadeze Syllabics Aivilik B" 
+    5552 "Kanadeze Syllabics Blackfoot E" 
+    5553 "Kanadeze Syllabics Blackfoot I" 
+    5554 "Kanadeze Syllabics Blackfoot O" 
+    5555 "Kanadeze Syllabics Blackfoot A" 
+    5556 "Kanadeze Syllabics Blackfoot We" 
+    5557 "Kanadeze Syllabics Blackfoot Wi" 
+    5558 "Kanadeze Syllabics Blackfoot Wo" 
+    5559 "Kanadeze Syllabics Blackfoot Wa" 
+    5560 "Kanadeze Syllabics Blackfoot Ne" 
+    5561 "Kanadeze Syllabics Blackfoot Ni" 
+    5562 "Kanadeze Syllabics Blackfoot No" 
+    5563 "Kanadeze Syllabics Blackfoot Na" 
+    5564 "Kanadeze Syllabics Blackfoot Ke" 
+    5565 "Kanadeze Syllabics Blackfoot Ki" 
+    5566 "Kanadeze Syllabics Blackfoot Ko" 
+    5567 "Kanadeze Syllabics Blackfoot Ka" 
+    5568 "Kanadeze Syllabics Sayisi He" 
+    5569 "Kanadeze Syllabics Sayisi Hi" 
+    5570 "Kanadeze Syllabics Sayisi Ho" 
+    5571 "Kanadeze Syllabics Sayisi Ha" 
+    5572 "Kanadeze Syllabics Carrier Ghu" 
+    5573 "Kanadeze Syllabics Carrier Gho" 
+    5574 "Kanadeze Syllabics Carrier Ghe" 
+    5575 "Kanadeze Syllabics Carrier Ghee" 
+    5576 "Kanadeze Syllabics Carrier Ghi" 
+    5577 "Kanadeze Syllabics Carrier Gha" 
+    5578 "Kanadeze Syllabics Carrier Ru" 
+    5579 "Kanadeze Syllabics Carrier Ro" 
+    5580 "Kanadeze Syllabics Carrier Re" 
+    5581 "Kanadeze Syllabics Carrier Ree" 
+    5582 "Kanadeze Syllabics Carrier Ri" 
+    5583 "Kanadeze Syllabics Carrier Ra" 
+    5584 "Kanadeze Syllabics Carrier Wu" 
+    5585 "Kanadeze Syllabics Carrier Wo" 
+    5586 "Kanadeze Syllabics Carrier We" 
+    5587 "Kanadeze Syllabics Carrier Wee" 
+    5588 "Kanadeze Syllabics Carrier Wi" 
+    5589 "Kanadeze Syllabics Carrier Wa" 
+    5590 "Kanadeze Syllabics Carrier Hwu" 
+    5591 "Kanadeze Syllabics Carrier Hwo" 
+    5592 "Kanadeze Syllabics Carrier Hwe" 
+    5593 "Kanadeze Syllabics Carrier Hwee" 
+    5594 "Kanadeze Syllabics Carrier Hwi" 
+    5595 "Kanadeze Syllabics Carrier Hwa" 
+    5596 "Kanadeze Syllabics Carrier Thu" 
+    5597 "Kanadeze Syllabics Carrier Tho" 
+    5598 "Kanadeze Syllabics Carrier The" 
+    5599 "Kanadeze Syllabics Carrier Thee" 
+    5600 "Kanadeze Syllabics Carrier Thi" 
+    5601 "Kanadeze Syllabics Carrier Tha" 
+    5602 "Kanadeze Syllabics Carrier Ttu" 
+    5603 "Kanadeze Syllabics Carrier Tto" 
+    5604 "Kanadeze Syllabics Carrier Tte" 
+    5605 "Kanadeze Syllabics Carrier Ttee" 
+    5606 "Kanadeze Syllabics Carrier Tti" 
+    5607 "Kanadeze Syllabics Carrier Tta" 
+    5608 "Kanadeze Syllabics Carrier Pu" 
+    5609 "Kanadeze Syllabics Carrier Po" 
+    5610 "Kanadeze Syllabics Carrier Pe" 
+    5611 "Kanadeze Syllabics Carrier Pee" 
+    5612 "Kanadeze Syllabics Carrier Pi" 
+    5613 "Kanadeze Syllabics Carrier Pa" 
+    5614 "Kanadeze Syllabics Carrier P" 
+    5615 "Kanadeze Syllabics Carrier Gu" 
+    5616 "Kanadeze Syllabics Carrier Go" 
+    5617 "Kanadeze Syllabics Carrier Ge" 
+    5618 "Kanadeze Syllabics Carrier Gee" 
+    5619 "Kanadeze Syllabics Carrier Gi" 
+    5620 "Kanadeze Syllabics Carrier Ga" 
+    5621 "Kanadeze Syllabics Carrier Khu" 
+    5622 "Kanadeze Syllabics Carrier Kho" 
+    5623 "Kanadeze Syllabics Carrier Khe" 
+    5624 "Kanadeze Syllabics Carrier Khee" 
+    5625 "Kanadeze Syllabics Carrier Khi" 
+    5626 "Kanadeze Syllabics Carrier Kha" 
+    5627 "Kanadeze Syllabics Carrier Kku" 
+    5628 "Kanadeze Syllabics Carrier Kko" 
+    5629 "Kanadeze Syllabics Carrier Kke" 
+    5630 "Kanadeze Syllabics Carrier Kkee" 
+    5631 "Kanadeze Syllabics Carrier Kki" 
+    5632 "Kanadeze Syllabics Carrier Kka" 
+    5633 "Kanadeze Syllabics Carrier Kk" 
+    5634 "Kanadeze Syllabics Carrier Nu" 
+    5635 "Kanadeze Syllabics Carrier No" 
+    5636 "Kanadeze Syllabics Carrier Ne" 
+    5637 "Kanadeze Syllabics Carrier Nee" 
+    5638 "Kanadeze Syllabics Carrier Ni" 
+    5639 "Kanadeze Syllabics Carrier Na" 
+    5640 "Kanadeze Syllabics Carrier Mu" 
+    5641 "Kanadeze Syllabics Carrier Mo" 
+    5642 "Kanadeze Syllabics Carrier Me" 
+    5643 "Kanadeze Syllabics Carrier Mee" 
+    5644 "Kanadeze Syllabics Carrier Mi" 
+    5645 "Kanadeze Syllabics Carrier Ma" 
+    5646 "Kanadeze Syllabics Carrier Yu" 
+    5647 "Kanadeze Syllabics Carrier Yo" 
+    5648 "Kanadeze Syllabics Carrier Ye" 
+    5649 "Kanadeze Syllabics Carrier Yee" 
+    5650 "Kanadeze Syllabics Carrier Yi" 
+    5651 "Kanadeze Syllabics Carrier Ya" 
+    5652 "Kanadeze Syllabics Carrier Ju" 
+    5653 "Kanadeze Syllabics Sayisi Ju" 
+    5654 "Kanadeze Syllabics Carrier Jo" 
+    5655 "Kanadeze Syllabics Carrier Je" 
+    5656 "Kanadeze Syllabics Carrier Jee" 
+    5657 "Kanadeze Syllabics Carrier Ji" 
+    5658 "Kanadeze Syllabics Sayisi Ji" 
+    5659 "Kanadeze Syllabics Carrier Ja" 
+    5660 "Kanadeze Syllabics Carrier Jju" 
+    5661 "Kanadeze Syllabics Carrier Jjo" 
+    5662 "Kanadeze Syllabics Carrier Jje" 
+    5663 "Kanadeze Syllabics Carrier Jjee" 
+    5664 "Kanadeze Syllabics Carrier Jji" 
+    5665 "Kanadeze Syllabics Carrier Jja" 
+    5666 "Kanadeze Syllabics Carrier Lu" 
+    5667 "Kanadeze Syllabics Carrier Lo" 
+    5668 "Kanadeze Syllabics Carrier Le" 
+    5669 "Kanadeze Syllabics Carrier Lee" 
+    5670 "Kanadeze Syllabics Carrier Li" 
+    5671 "Kanadeze Syllabics Carrier La" 
+    5672 "Kanadeze Syllabics Carrier Dlu" 
+    5673 "Kanadeze Syllabics Carrier Dlo" 
+    5674 "Kanadeze Syllabics Carrier Dle" 
+    5675 "Kanadeze Syllabics Carrier Dlee" 
+    5676 "Kanadeze Syllabics Carrier Dli" 
+    5677 "Kanadeze Syllabics Carrier Dla" 
+    5678 "Kanadeze Syllabics Carrier Lhu" 
+    5679 "Kanadeze Syllabics Carrier Lho" 
+    5680 "Kanadeze Syllabics Carrier Lhe" 
+    5681 "Kanadeze Syllabics Carrier Lhee" 
+    5682 "Kanadeze Syllabics Carrier Lhi" 
+    5683 "Kanadeze Syllabics Carrier Lha" 
+    5684 "Kanadeze Syllabics Carrier Tlhu" 
+    5685 "Kanadeze Syllabics Carrier Tlho" 
+    5686 "Kanadeze Syllabics Carrier Tlhe" 
+    5687 "Kanadeze Syllabics Carrier Tlhee" 
+    5688 "Kanadeze Syllabics Carrier Tlhi" 
+    5689 "Kanadeze Syllabics Carrier Tlha" 
+    5690 "Kanadeze Syllabics Carrier Tlu" 
+    5691 "Kanadeze Syllabics Carrier Tlo" 
+    5692 "Kanadeze Syllabics Carrier Tle" 
+    5693 "Kanadeze Syllabics Carrier Tlee" 
+    5694 "Kanadeze Syllabics Carrier Tli" 
+    5695 "Kanadeze Syllabics Carrier Tla" 
+    5696 "Kanadeze Syllabics Carrier Zu" 
+    5697 "Kanadeze Syllabics Carrier Zo" 
+    5698 "Kanadeze Syllabics Carrier Ze" 
+    5699 "Kanadeze Syllabics Carrier Zee" 
+    5700 "Kanadeze Syllabics Carrier Zi" 
+    5701 "Kanadeze Syllabics Carrier Za" 
+    5702 "Kanadeze Syllabics Carrier Z" 
+    5703 "Kanadeze Syllabics Carrier Fillestar Z" 
+    5704 "Kanadeze Syllabics Carrier Dzu" 
+    5705 "Kanadeze Syllabics Carrier Dzo" 
+    5706 "Kanadeze Syllabics Carrier Dze" 
+    5707 "Kanadeze Syllabics Carrier Dzee" 
+    5708 "Kanadeze Syllabics Carrier Dzi" 
+    5709 "Kanadeze Syllabics Carrier Dza" 
+    5710 "Kanadeze Syllabics Carrier Su" 
+    5711 "Kanadeze Syllabics Carrier So" 
+    5712 "Kanadeze Syllabics Carrier Se" 
+    5713 "Kanadeze Syllabics Carrier See" 
+    5714 "Kanadeze Syllabics Carrier Si" 
+    5715 "Kanadeze Syllabics Carrier Sa" 
+    5716 "Kanadeze Syllabics Carrier Shu" 
+    5717 "Kanadeze Syllabics Carrier Sho" 
+    5718 "Kanadeze Syllabics Carrier She" 
+    5719 "Kanadeze Syllabics Carrier Shee" 
+    5720 "Kanadeze Syllabics Carrier Shi" 
+    5721 "Kanadeze Syllabics Carrier Sha" 
+    5722 "Kanadeze Syllabics Carrier Sh" 
+    5723 "Kanadeze Syllabics Carrier Tsu" 
+    5724 "Kanadeze Syllabics Carrier Tso" 
+    5725 "Kanadeze Syllabics Carrier Tse" 
+    5726 "Kanadeze Syllabics Carrier Tsee" 
+    5727 "Kanadeze Syllabics Carrier Tsi" 
+    5728 "Kanadeze Syllabics Carrier Tsa" 
+    5729 "Kanadeze Syllabics Carrier Chu" 
+    5730 "Kanadeze Syllabics Carrier Cho" 
+    5731 "Kanadeze Syllabics Carrier Che" 
+    5732 "Kanadeze Syllabics Carrier Chee" 
+    5733 "Kanadeze Syllabics Carrier Chi" 
+    5734 "Kanadeze Syllabics Carrier Cha" 
+    5735 "Kanadeze Syllabics Carrier Ttsu" 
+    5736 "Kanadeze Syllabics Carrier Ttso" 
+    5737 "Kanadeze Syllabics Carrier Ttse" 
+    5738 "Kanadeze Syllabics Carrier Ttsee" 
+    5739 "Kanadeze Syllabics Carrier Ttsi" 
+    5740 "Kanadeze Syllabics Carrier Ttsa" 
+    5741 "Kanadeze Syllabics Chi ShenjÃ«" 
+    5742 "Kanadeze Syllabics PikÃ«" 
+    5743 "Kanadeze Syllabics Qai" 
+    5744 "Kanadeze Syllabics Ngai" 
+    5745 "Kanadeze Syllabics Nngi" 
+    5746 "Kanadeze Syllabics Nngii" 
+    5747 "Kanadeze Syllabics Nngo" 
+    5748 "Kanadeze Syllabics Nngoo" 
+    5749 "Kanadeze Syllabics Nnga" 
+    5750 "Kanadeze Syllabics Nngaa" 
+    5751 "Kanadeze Syllabics Woods-Cree Thwee" 
+    5752 "Kanadeze Syllabics Woods-Cree Thwi" 
+    5753 "Kanadeze Syllabics Woods-Cree Thwii" 
+    5754 "Kanadeze Syllabics Woods-Cree Thwo" 
+    5755 "Kanadeze Syllabics Woods-Cree Thwoo" 
+    5756 "Kanadeze Syllabics Woods-Cree Thwa" 
+    5757 "Kanadeze Syllabics Woods-Cree Thwaa" 
+    5758 "Kanadeze Syllabics Woods-Cree PÃ«rfundimtare Th" 
+    5759 "Kanadeze Syllabics Blackfoot W" 
+    5760 "Ogham HapÃ«sirÃ« ShenjÃ«" 
+    5761 "Ogham ShkronjÃ« Beith" 
+    5762 "Ogham ShkronjÃ« Luis" 
+    5763 "Ogham ShkronjÃ« Fearn" 
+    5764 "Ogham ShkronjÃ« Sail" 
+    5765 "Ogham ShkronjÃ« Nion" 
+    5766 "Ogham ShkronjÃ« Uath" 
+    5767 "Ogham ShkronjÃ« Dair" 
+    5768 "Ogham ShkronjÃ« Tinne" 
+    5769 "Ogham ShkronjÃ« Coll" 
+    5770 "Ogham ShkronjÃ« Ceirt" 
+    5771 "Ogham ShkronjÃ« Muin" 
+    5772 "Ogham ShkronjÃ« Gort" 
+    5773 "Ogham ShkronjÃ« Ngeadal" 
+    5774 "Ogham ShkronjÃ« Straif" 
+    5775 "Ogham ShkronjÃ« Ruis" 
+    5776 "Ogham ShkronjÃ« Ailm" 
+    5777 "Ogham ShkronjÃ« Onn" 
+    5778 "Ogham ShkronjÃ« Ur" 
+    5779 "Ogham ShkronjÃ« Eadhadh" 
+    5780 "Ogham ShkronjÃ« Iodhadh" 
+    5781 "Ogham ShkronjÃ« Eabhadh" 
+    5782 "Ogham ShkronjÃ« ose" 
+    5783 "Ogham ShkronjÃ« Uilleann" 
+    5784 "Ogham ShkronjÃ« Ifin" 
+    5785 "Ogham ShkronjÃ« Eamhancholl" 
+    5786 "Ogham ShkronjÃ« Peith" 
+    5787 "Ogham PendÃ« ShenjÃ«" 
+    5788 "Ogham KundÃ«rt PendÃ« ShenjÃ«" 
+    5792 "Runic ShkronjÃ« Fehu Feoh Fe F" 
+    5793 "Runic ShkronjÃ« V" 
+    5794 "Runic ShkronjÃ« Uruz Ur U" 
+    5795 "Runic ShkronjÃ« Yr" 
+    5796 "Runic ShkronjÃ« Y" 
+    5797 "Runic ShkronjÃ« W" 
+    5798 "Runic ShkronjÃ« Thurisaz Thurs Gjemb" 
+    5799 "Runic ShkronjÃ« Eth" 
+    5800 "Runic ShkronjÃ« Ansuz A" 
+    5801 "Runic ShkronjÃ« Os O" 
+    5802 "Runic ShkronjÃ« Ac A" 
+    5803 "Runic ShkronjÃ« Aesc" 
+    5804 "Runic ShkronjÃ« GjatÃ«-Branch-Oss O" 
+    5805 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Oss O" 
+    5806 "Runic ShkronjÃ« O" 
+    5807 "Runic ShkronjÃ« Oe" 
+    5808 "Runic ShkronjÃ« On" 
+    5809 "Runic ShkronjÃ« Raido Rad Reid R" 
+    5810 "Runic ShkronjÃ« Kauna" 
+    5811 "Runic ShkronjÃ« Cen" 
+    5812 "Runic ShkronjÃ« Kaun K" 
+    5813 "Runic ShkronjÃ« G" 
+    5814 "Runic ShkronjÃ« Eng" 
+    5815 "Runic ShkronjÃ« Gebo Gyfu G" 
+    5816 "Runic ShkronjÃ« Gar" 
+    5817 "Runic ShkronjÃ« Wunjo Wynn W" 
+    5818 "Runic ShkronjÃ« Haglaz H" 
+    5819 "Runic ShkronjÃ« Haegl H" 
+    5820 "Runic ShkronjÃ« GjatÃ«-Branch-Hagall H" 
+    5821 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Hagall H" 
+    5822 "Runic ShkronjÃ« Naudiz Nyd Naud N" 
+    5823 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Naud N" 
+    5824 "Runic ShkronjÃ« Pika-Pika-N" 
+    5825 "Runic ShkronjÃ« Isaz Is Iss I" 
+    5826 "Runic ShkronjÃ« E" 
+    5827 "Runic ShkronjÃ« Jeran J" 
+    5828 "Runic ShkronjÃ« Ger" 
+    5829 "Runic ShkronjÃ« GjatÃ«-Branch-Ar Ae" 
+    5830 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Ar A" 
+    5831 "Runic ShkronjÃ« Iwaz Eoh" 
+    5832 "Runic ShkronjÃ« Pertho Peorth P" 
+    5833 "Runic ShkronjÃ« Algiz Eolhx" 
+    5834 "Runic ShkronjÃ« Sowilo S" 
+    5835 "Runic ShkronjÃ« Sigel GjatÃ«-Branch-Sol S" 
+    5836 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Sol S" 
+    5837 "Runic ShkronjÃ« C" 
+    5838 "Runic ShkronjÃ« Z" 
+    5839 "Runic ShkronjÃ« Tiwaz Tir Tyr T" 
+    5840 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Tyr T" 
+    5841 "Runic ShkronjÃ« D" 
+    5842 "Runic ShkronjÃ« Berkanan Beorc Bjarkan B" 
+    5843 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Bjarkan B" 
+    5844 "Runic ShkronjÃ« Pika-Pika-P" 
+    5845 "Runic ShkronjÃ« Hap-P" 
+    5846 "Runic ShkronjÃ« Ehwaz Eh E" 
+    5847 "Runic ShkronjÃ« Mannaz Man M" 
+    5848 "Runic ShkronjÃ« GjatÃ«-Branch-Madr M" 
+    5849 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Madr M" 
+    5850 "Runic ShkronjÃ« Laukaz Lagu Logr L" 
+    5851 "Runic ShkronjÃ« Pika-Pika-L" 
+    5852 "Runic ShkronjÃ« Ingwaz" 
+    5853 "Runic ShkronjÃ« Ing" 
+    5854 "Runic ShkronjÃ« Dagaz Daeg D" 
+    5855 "Runic ShkronjÃ« Othalan Ethel O" 
+    5856 "Runic ShkronjÃ« Ear" 
+    5857 "Runic ShkronjÃ« Ior" 
+    5858 "Runic ShkronjÃ« Cweorth" 
+    5859 "Runic ShkronjÃ« Calc" 
+    5860 "Runic ShkronjÃ« Cealc" 
+    5861 "Runic ShkronjÃ« Stan" 
+    5862 "Runic ShkronjÃ« GjatÃ«-Branch-Yr" 
+    5863 "Runic ShkronjÃ« ShkurtÃ«r-Twig-Yr" 
+    5864 "Runic ShkronjÃ« Icelandic-Yr" 
+    5865 "Runic ShkronjÃ« Q" 
+    5866 "Runic ShkronjÃ« X" 
+    5867 "Runic VetÃ«m PikÃ«sim" 
+    5868 "Runic ShumÃ«fishtÃ« PikÃ«sim" 
+    5869 "Runic Kryq PikÃ«sim" 
+    5870 "Runic Arlaug Simbol" 
+    5871 "Runic Tvimadur Simbol" 
+    5872 "Runic Belgthor Simbol" 
+    5888 "Tagalog ShkronjÃ« A" 
+    5889 "Tagalog ShkronjÃ« I" 
+    5890 "Tagalog ShkronjÃ« U" 
+    5891 "Tagalog ShkronjÃ« Ka" 
+    5892 "Tagalog ShkronjÃ« Ga" 
+    5893 "Tagalog ShkronjÃ« Nga" 
+    5894 "Tagalog ShkronjÃ« Ta" 
+    5895 "Tagalog ShkronjÃ« Da" 
+    5896 "Tagalog ShkronjÃ« Na" 
+    5897 "Tagalog ShkronjÃ« Pa" 
+    5898 "Tagalog ShkronjÃ« Ba" 
+    5899 "Tagalog ShkronjÃ« Ma" 
+    5900 "Tagalog ShkronjÃ« Ya" 
+    5902 "Tagalog ShkronjÃ« La" 
+    5903 "Tagalog ShkronjÃ« Wa" 
+    5904 "Tagalog ShkronjÃ« Sa" 
+    5905 "Tagalog ShkronjÃ« Ha" 
+    5906 "Tagalog Zanore ShenjÃ« I" 
+    5907 "Tagalog Zanore ShenjÃ« U" 
+    5908 "Tagalog ShenjÃ« Virama" 
+    5920 "Hanunoo ShkronjÃ« A" 
+    5921 "Hanunoo ShkronjÃ« I" 
+    5922 "Hanunoo ShkronjÃ« U" 
+    5923 "Hanunoo ShkronjÃ« Ka" 
+    5924 "Hanunoo ShkronjÃ« Ga" 
+    5925 "Hanunoo ShkronjÃ« Nga" 
+    5926 "Hanunoo ShkronjÃ« Ta" 
+    5927 "Hanunoo ShkronjÃ« Da" 
+    5928 "Hanunoo ShkronjÃ« Na" 
+    5929 "Hanunoo ShkronjÃ« Pa" 
+    5930 "Hanunoo ShkronjÃ« Ba" 
+    5931 "Hanunoo ShkronjÃ« Ma" 
+    5932 "Hanunoo ShkronjÃ« Ya" 
+    5933 "Hanunoo ShkronjÃ« Ra" 
+    5934 "Hanunoo ShkronjÃ« La" 
+    5935 "Hanunoo ShkronjÃ« Wa" 
+    5936 "Hanunoo ShkronjÃ« Sa" 
+    5937 "Hanunoo ShkronjÃ« Ha" 
+    5938 "Hanunoo Zanore ShenjÃ« I" 
+    5939 "Hanunoo Zanore ShenjÃ« U" 
+    5940 "Hanunoo ShenjÃ« Pamudpod" 
+    5941 "Filipine VetÃ«m PikÃ«sim" 
+    5942 "Filipine Dyshe PikÃ«sim" 
+    5952 "Buhid ShkronjÃ« A" 
+    5953 "Buhid ShkronjÃ« I" 
+    5954 "Buhid ShkronjÃ« U" 
+    5955 "Buhid ShkronjÃ« Ka" 
+    5956 "Buhid ShkronjÃ« Ga" 
+    5957 "Buhid ShkronjÃ« Nga" 
+    5958 "Buhid ShkronjÃ« Ta" 
+    5959 "Buhid ShkronjÃ« Da" 
+    5960 "Buhid ShkronjÃ« Na" 
+    5961 "Buhid ShkronjÃ« Pa" 
+    5962 "Buhid ShkronjÃ« Ba" 
+    5963 "Buhid ShkronjÃ« Ma" 
+    5964 "Buhid ShkronjÃ« Ya" 
+    5965 "Buhid ShkronjÃ« Ra" 
+    5966 "Buhid ShkronjÃ« La" 
+    5967 "Buhid ShkronjÃ« Wa" 
+    5968 "Buhid ShkronjÃ« Sa" 
+    5969 "Buhid ShkronjÃ« Ha" 
+    5970 "Buhid Zanore ShenjÃ« I" 
+    5971 "Buhid Zanore ShenjÃ« U" 
+    5984 "Tagbanwa ShkronjÃ« A" 
+    5985 "Tagbanwa ShkronjÃ« I" 
+    5986 "Tagbanwa ShkronjÃ« U" 
+    5987 "Tagbanwa ShkronjÃ« Ka" 
+    5988 "Tagbanwa ShkronjÃ« Ga" 
+    5989 "Tagbanwa ShkronjÃ« Nga" 
+    5990 "Tagbanwa ShkronjÃ« Ta" 
+    5991 "Tagbanwa ShkronjÃ« Da" 
+    5992 "Tagbanwa ShkronjÃ« Na" 
+    5993 "Tagbanwa ShkronjÃ« Pa" 
+    5994 "Tagbanwa ShkronjÃ« Ba" 
+    5995 "Tagbanwa ShkronjÃ« Ma" 
+    5996 "Tagbanwa ShkronjÃ« Ya" 
+    5998 "Tagbanwa ShkronjÃ« La" 
+    5999 "Tagbanwa ShkronjÃ« Wa" 
+    6000 "Tagbanwa ShkronjÃ« Sa" 
+    6002 "Tagbanwa Zanore ShenjÃ« I" 
+    6003 "Tagbanwa Zanore ShenjÃ« U" 
+    6016 "Khmer ShkronjÃ« Ka" 
+    6017 "Khmer ShkronjÃ« Kha" 
+    6018 "Khmer ShkronjÃ« Ko" 
+    6019 "Khmer ShkronjÃ« Kho" 
+    6020 "Khmer ShkronjÃ« Ngo" 
+    6021 "Khmer ShkronjÃ« Ca" 
+    6022 "Khmer ShkronjÃ« Cha" 
+    6023 "Khmer ShkronjÃ« Co" 
+    6024 "Khmer ShkronjÃ« Cho" 
+    6025 "Khmer ShkronjÃ« Nyo" 
+    6026 "Khmer ShkronjÃ« Da" 
+    6027 "Khmer ShkronjÃ« Ttha" 
+    6028 "Khmer ShkronjÃ« Do" 
+    6029 "Khmer ShkronjÃ« Ttho" 
+    6030 "Khmer ShkronjÃ« Nno" 
+    6031 "Khmer ShkronjÃ« Ta" 
+    6032 "Khmer ShkronjÃ« Tha" 
+    6033 "Khmer ShkronjÃ« To" 
+    6034 "Khmer ShkronjÃ« Tho" 
+    6035 "Khmer ShkronjÃ« No" 
+    6036 "Khmer ShkronjÃ« Ba" 
+    6037 "Khmer ShkronjÃ« Pha" 
+    6038 "Khmer ShkronjÃ« Po" 
+    6039 "Khmer ShkronjÃ« Pho" 
+    6040 "Khmer ShkronjÃ« Mo" 
+    6041 "Khmer ShkronjÃ« Yo" 
+    6042 "Khmer ShkronjÃ« Ro" 
+    6043 "Khmer ShkronjÃ« Lo" 
+    6044 "Khmer ShkronjÃ« Vo" 
+    6045 "Khmer ShkronjÃ« Sha" 
+    6046 "Khmer ShkronjÃ« Sso" 
+    6047 "Khmer ShkronjÃ« Sa" 
+    6048 "Khmer ShkronjÃ« Ha" 
+    6049 "Khmer ShkronjÃ« La" 
+    6050 "Khmer ShkronjÃ« Qa" 
+    6051 "Khmer Zanore Pavarur Qaq" 
+    6052 "Khmer Zanore Pavarur Qaa" 
+    6053 "Khmer Zanore Pavarur Qi" 
+    6054 "Khmer Zanore Pavarur Qii" 
+    6055 "Khmer Zanore Pavarur Qu" 
+    6056 "Khmer Zanore Pavarur Quk" 
+    6057 "Khmer Zanore Pavarur Quu" 
+    6058 "Khmer Zanore Pavarur Quuv" 
+    6059 "Khmer Zanore Pavarur Ry" 
+    6060 "Khmer Zanore Pavarur Ryy" 
+    6061 "Khmer Zanore Pavarur Ly" 
+    6062 "Khmer Zanore Pavarur Lyy" 
+    6063 "Khmer Zanore Pavarur Qe" 
+    6064 "Khmer Zanore Pavarur Qai" 
+    6065 "Khmer Zanore Pavarur Qoo Tipi NjÃ«" 
+    6066 "Khmer Zanore Pavarur Qoo Tipi Dy" 
+    6067 "Khmer Zanore Pavarur Qau" 
+    6068 "Khmer Zanore Inherent Aq" 
+    6069 "Khmer Zanore Inherent Aa" 
+    6070 "Khmer Zanore ShenjÃ« Aa" 
+    6071 "Khmer Zanore ShenjÃ« I" 
+    6072 "Khmer Zanore ShenjÃ« Ii" 
+    6073 "Khmer Zanore ShenjÃ« Y" 
+    6074 "Khmer Zanore ShenjÃ« Yy" 
+    6075 "Khmer Zanore ShenjÃ« U" 
+    6076 "Khmer Zanore ShenjÃ« Uu" 
+    6077 "Khmer Zanore ShenjÃ« Ua" 
+    6078 "Khmer Zanore ShenjÃ« Oe" 
+    6079 "Khmer Zanore ShenjÃ« Ya" 
+    6080 "Khmer Zanore ShenjÃ« Ie" 
+    6081 "Khmer Zanore ShenjÃ« E" 
+    6082 "Khmer Zanore ShenjÃ« Ae" 
+    6083 "Khmer Zanore ShenjÃ« Ai" 
+    6084 "Khmer Zanore ShenjÃ« Oo" 
+    6085 "Khmer Zanore ShenjÃ« Au" 
+    6086 "Khmer ShenjÃ« Nikahit" 
+    6087 "Khmer ShenjÃ« Reahmuk" 
+    6088 "Khmer ShenjÃ« Yuukaleapintu" 
+    6089 "Khmer ShenjÃ« Muusikatoan" 
+    6090 "Khmer ShenjÃ« Triisap" 
+    6091 "Khmer ShenjÃ« Bantoc" 
+    6092 "Khmer ShenjÃ« Robat" 
+    6093 "Khmer ShenjÃ« Toandakhiat" 
+    6094 "Khmer ShenjÃ« Kakabat" 
+    6095 "Khmer ShenjÃ« Ahsda" 
+    6096 "Khmer ShenjÃ« Samyok Sannya" 
+    6097 "Khmer ShenjÃ« Viriam" 
+    6098 "Khmer ShenjÃ« Coeng" 
+    6099 "Khmer ShenjÃ« Bathamasat" 
+    6100 "Khmer ShenjÃ« Khan" 
+    6101 "Khmer ShenjÃ« Bariyoosan" 
+    6102 "Khmer ShenjÃ« Camnuc Pii Kuuh" 
+    6103 "Khmer ShenjÃ« Lek Too" 
+    6104 "Khmer ShenjÃ« Beyyal" 
+    6105 "Khmer ShenjÃ« Phnaek Muan" 
+    6106 "Khmer ShenjÃ« Koomuut" 
+    6107 "Khmer MonedhÃ« Simbol Riel" 
+    6108 "Khmer ShenjÃ« Avakrahasanya" 
+    6109 "Khmer ShenjÃ« Atthacan" 
+    6112 "Khmer ShifÃ«r Zero" 
+    6113 "Khmer ShifÃ«r NjÃ«" 
+    6114 "Khmer ShifÃ«r Dy" 
+    6115 "Khmer ShifÃ«r Tre" 
+    6116 "Khmer ShifÃ«r KatÃ«r" 
+    6117 "Khmer ShifÃ«r PesÃ«" 
+    6118 "Khmer ShifÃ«r GjashtÃ«" 
+    6119 "Khmer ShifÃ«r ShtatÃ«" 
+    6120 "Khmer ShifÃ«r TetÃ«" 
+    6121 "Khmer ShifÃ«r NÃ«ntÃ«" 
+    6128 "Khmer Simbol Lek Attak Son" 
+    6129 "Khmer Simbol Lek Attak Muoy" 
+    6130 "Khmer Simbol Lek Attak Pii" 
+    6131 "Khmer Simbol Lek Attak Bei" 
+    6132 "Khmer Simbol Lek Attak Buon" 
+    6133 "Khmer Simbol Lek Attak Pram" 
+    6134 "Khmer Simbol Lek Attak Pram-Muoy" 
+    6135 "Khmer Simbol Lek Attak Pram-Pii" 
+    6136 "Khmer Simbol Lek Attak Pram-Bei" 
+    6137 "Khmer Simbol Lek Attak Pram-Buon" 
+    6144 "Mongole Birga" 
+    6145 "Mongole Ellipsis" 
+    6146 "Mongole Presje" 
+    6147 "Mongole PikÃ«" 
+    6148 "Mongole Dy Pika" 
+    6149 "Mongole KatÃ«r PikÃ«" 
+    6150 "Mongole Todo Soft Hyphen" 
+    6151 "Mongole Sibe Rrokje Boundary ShÃ«nues" 
+    6152 "Mongole Manchu Presje" 
+    6153 "Mongole Manchu PikÃ«" 
+    6154 "Mongole Nirugu" 
+    6155 "Mongole Variacion PÃ«rzgjedhur Falas NjÃ«" 
+    6156 "Mongole Variacion PÃ«rzgjedhur Falas Dy" 
+    6157 "Mongole Variacion PÃ«rzgjedhur Falas Tre" 
+    6158 "Mongole Zanore NdarÃ«s" 
+    6160 "Mongole ShifÃ«r Zero" 
+    6161 "Mongole ShifÃ«r NjÃ«" 
+    6162 "Mongole ShifÃ«r Dy" 
+    6163 "Mongole ShifÃ«r Tre" 
+    6164 "Mongole ShifÃ«r KatÃ«r" 
+    6165 "Mongole ShifÃ«r PesÃ«" 
+    6166 "Mongole ShifÃ«r GjashtÃ«" 
+    6167 "Mongole ShifÃ«r ShtatÃ«" 
+    6168 "Mongole ShifÃ«r TetÃ«" 
+    6169 "Mongole ShifÃ«r NÃ«ntÃ«" 
+    6176 "Mongole ShkronjÃ« A" 
+    6177 "Mongole ShkronjÃ« E" 
+    6178 "Mongole ShkronjÃ« I" 
+    6179 "Mongole ShkronjÃ« O" 
+    6180 "Mongole ShkronjÃ« U" 
+    6181 "Mongole ShkronjÃ« Oe" 
+    6182 "Mongole ShkronjÃ« Ue" 
+    6183 "Mongole ShkronjÃ« Ee" 
+    6184 "Mongole ShkronjÃ« Na" 
+    6185 "Mongole ShkronjÃ« Ang" 
+    6186 "Mongole ShkronjÃ« Ba" 
+    6187 "Mongole ShkronjÃ« Pa" 
+    6188 "Mongole ShkronjÃ« Qa" 
+    6189 "Mongole ShkronjÃ« Ga" 
+    6190 "Mongole ShkronjÃ« Ma" 
+    6191 "Mongole ShkronjÃ« La" 
+    6192 "Mongole ShkronjÃ« Sa" 
+    6193 "Mongole ShkronjÃ« Sha" 
+    6194 "Mongole ShkronjÃ« Ta" 
+    6195 "Mongole ShkronjÃ« Da" 
+    6196 "Mongole ShkronjÃ« Cha" 
+    6197 "Mongole ShkronjÃ« Ja" 
+    6198 "Mongole ShkronjÃ« Ya" 
+    6199 "Mongole ShkronjÃ« Ra" 
+    6200 "Mongole ShkronjÃ« Wa" 
+    6201 "Mongole ShkronjÃ« Fa" 
+    6202 "Mongole ShkronjÃ« Ka" 
+    6203 "Mongole ShkronjÃ« Kha" 
+    6204 "Mongole ShkronjÃ« Tsa" 
+    6205 "Mongole ShkronjÃ« Za" 
+    6206 "Mongole ShkronjÃ« Haa" 
+    6207 "Mongole ShkronjÃ« Zra" 
+    6208 "Mongole ShkronjÃ« Lha" 
+    6209 "Mongole ShkronjÃ« Zhi" 
+    6210 "Mongole ShkronjÃ« Chi" 
+    6211 "Mongole ShkronjÃ« Todo GjatÃ« Zanore ShenjÃ«" 
+    6212 "Mongole ShkronjÃ« Todo E" 
+    6213 "Mongole ShkronjÃ« Todo I" 
+    6214 "Mongole ShkronjÃ« Todo O" 
+    6215 "Mongole ShkronjÃ« Todo U" 
+    6216 "Mongole ShkronjÃ« Todo Oe" 
+    6217 "Mongole ShkronjÃ« Todo Ue" 
+    6218 "Mongole ShkronjÃ« Todo Ang" 
+    6219 "Mongole ShkronjÃ« Todo Ba" 
+    6220 "Mongole ShkronjÃ« Todo Pa" 
+    6221 "Mongole ShkronjÃ« Todo Qa" 
+    6222 "Mongole ShkronjÃ« Todo Ga" 
+    6223 "Mongole ShkronjÃ« Todo Ma" 
+    6224 "Mongole ShkronjÃ« Todo Ta" 
+    6225 "Mongole ShkronjÃ« Todo Da" 
+    6226 "Mongole ShkronjÃ« Todo Cha" 
+    6227 "Mongole ShkronjÃ« Todo Ja" 
+    6228 "Mongole ShkronjÃ« Todo Tsa" 
+    6229 "Mongole ShkronjÃ« Todo Ya" 
+    6230 "Mongole ShkronjÃ« Todo Wa" 
+    6231 "Mongole ShkronjÃ« Todo Ka" 
+    6232 "Mongole ShkronjÃ« Todo Gaa" 
+    6233 "Mongole ShkronjÃ« Todo Haa" 
+    6234 "Mongole ShkronjÃ« Todo Jia" 
+    6235 "Mongole ShkronjÃ« Todo Nia" 
+    6236 "Mongole ShkronjÃ« Todo Dza" 
+    6237 "Mongole ShkronjÃ« Sibe E" 
+    6238 "Mongole ShkronjÃ« Sibe I" 
+    6239 "Mongole ShkronjÃ« Sibe Iy" 
+    6240 "Mongole ShkronjÃ« Sibe Ue" 
+    6241 "Mongole ShkronjÃ« Sibe U" 
+    6242 "Mongole ShkronjÃ« Sibe Ang" 
+    6243 "Mongole ShkronjÃ« Sibe Ka" 
+    6244 "Mongole ShkronjÃ« Sibe Ga" 
+    6245 "Mongole ShkronjÃ« Sibe Ha" 
+    6246 "Mongole ShkronjÃ« Sibe Pa" 
+    6247 "Mongole ShkronjÃ« Sibe Sha" 
+    6248 "Mongole ShkronjÃ« Sibe Ta" 
+    6249 "Mongole ShkronjÃ« Sibe Da" 
+    6250 "Mongole ShkronjÃ« Sibe Ja" 
+    6251 "Mongole ShkronjÃ« Sibe Fa" 
+    6252 "Mongole ShkronjÃ« Sibe Gaa" 
+    6253 "Mongole ShkronjÃ« Sibe Haa" 
+    6254 "Mongole ShkronjÃ« Sibe Tsa" 
+    6255 "Mongole ShkronjÃ« Sibe Za" 
+    6256 "Mongole ShkronjÃ« Sibe Raa" 
+    6257 "Mongole ShkronjÃ« Sibe Cha" 
+    6258 "Mongole ShkronjÃ« Sibe Zha" 
+    6259 "Mongole ShkronjÃ« Manchu I" 
+    6260 "Mongole ShkronjÃ« Manchu Ka" 
+    6261 "Mongole ShkronjÃ« Manchu Ra" 
+    6262 "Mongole ShkronjÃ« Manchu Fa" 
+    6263 "Mongole ShkronjÃ« Manchu Zha" 
+    6272 "Mongole ShkronjÃ« Ali Gali Anusvara NjÃ«" 
+    6273 "Mongole ShkronjÃ« Ali Gali Visarga NjÃ«" 
+    6274 "Mongole ShkronjÃ« Ali Gali Damaru" 
+    6275 "Mongole ShkronjÃ« Ali Gali Ubadama" 
+    6276 "Mongole ShkronjÃ« Ali Gali Kthyer Ubadama" 
+    6277 "Mongole ShkronjÃ« Ali Gali Baluda" 
+    6278 "Mongole ShkronjÃ« Ali Gali Tre Baluda" 
+    6279 "Mongole ShkronjÃ« Ali Gali A" 
+    6280 "Mongole ShkronjÃ« Ali Gali I" 
+    6281 "Mongole ShkronjÃ« Ali Gali Ka" 
+    6282 "Mongole ShkronjÃ« Ali Gali Nga" 
+    6283 "Mongole ShkronjÃ« Ali Gali Ca" 
+    6284 "Mongole ShkronjÃ« Ali Gali Tta" 
+    6285 "Mongole ShkronjÃ« Ali Gali Ttha" 
+    6286 "Mongole ShkronjÃ« Ali Gali Dda" 
+    6287 "Mongole ShkronjÃ« Ali Gali Nna" 
+    6288 "Mongole ShkronjÃ« Ali Gali Ta" 
+    6289 "Mongole ShkronjÃ« Ali Gali Da" 
+    6290 "Mongole ShkronjÃ« Ali Gali Pa" 
+    6291 "Mongole ShkronjÃ« Ali Gali Pha" 
+    6292 "Mongole ShkronjÃ« Ali Gali Ssa" 
+    6293 "Mongole ShkronjÃ« Ali Gali Zha" 
+    6294 "Mongole ShkronjÃ« Ali Gali Za" 
+    6295 "Mongole ShkronjÃ« Ali Gali Ah" 
+    6296 "Mongole ShkronjÃ« Todo Ali Gali Ta" 
+    6297 "Mongole ShkronjÃ« Todo Ali Gali Zha" 
+    6298 "Mongole ShkronjÃ« Manchu Ali Gali Gha" 
+    6299 "Mongole ShkronjÃ« Manchu Ali Gali Nga" 
+    6300 "Mongole ShkronjÃ« Manchu Ali Gali Ca" 
+    6301 "Mongole ShkronjÃ« Manchu Ali Gali Jha" 
+    6302 "Mongole ShkronjÃ« Manchu Ali Gali Tta" 
+    6303 "Mongole ShkronjÃ« Manchu Ali Gali Ddha" 
+    6304 "Mongole ShkronjÃ« Manchu Ali Gali Ta" 
+    6305 "Mongole ShkronjÃ« Manchu Ali Gali Dha" 
+    6306 "Mongole ShkronjÃ« Manchu Ali Gali Ssa" 
+    6307 "Mongole ShkronjÃ« Manchu Ali Gali Cya" 
+    6308 "Mongole ShkronjÃ« Manchu Ali Gali Zha" 
+    6309 "Mongole ShkronjÃ« Manchu Ali Gali Za" 
+    6310 "Mongole ShkronjÃ« Ali Gali GjysmÃ« U" 
+    6311 "Mongole ShkronjÃ« Ali Gali GjysmÃ« Ya" 
+    6312 "Mongole ShkronjÃ« Manchu Ali Gali Bha" 
+    6313 "Mongole ShkronjÃ« Ali Gali Dagalga" 
+    6314 "Mongole ShkronjÃ« Manchu Ali Gali Lha" 
+    6320 "Kanadeze Syllabics Oy" 
+    6321 "Kanadeze Syllabics Ay" 
+    6322 "Kanadeze Syllabics Aay" 
+    6323 "Kanadeze Syllabics RrugÃ«" 
+    6324 "Kanadeze Syllabics Poy" 
+    6325 "Kanadeze Syllabics Pay" 
+    6326 "Kanadeze Syllabics Pwoy" 
+    6327 "Kanadeze Syllabics Tay" 
+    6328 "Kanadeze Syllabics Kay" 
+    6329 "Kanadeze Syllabics Kway" 
+    6330 "Kanadeze Syllabics May" 
+    6331 "Kanadeze Syllabics Noy" 
+    6332 "Kanadeze Syllabics Nay" 
+    6333 "Kanadeze Syllabics Lay" 
+    6334 "Kanadeze Syllabics Soy" 
+    6335 "Kanadeze Syllabics Say" 
+    6336 "Kanadeze Syllabics Shoy" 
+    6337 "Kanadeze Syllabics Shay" 
+    6338 "Kanadeze Syllabics Shwoy" 
+    6339 "Kanadeze Syllabics Yoy" 
+    6340 "Kanadeze Syllabics Yay" 
+    6341 "Kanadeze Syllabics Ray" 
+    6342 "Kanadeze Syllabics Nwi" 
+    6343 "Kanadeze Syllabics Ojibway Nwi" 
+    6344 "Kanadeze Syllabics Nwii" 
+    6345 "Kanadeze Syllabics Ojibway Nwii" 
+    6346 "Kanadeze Syllabics Nwo" 
+    6347 "Kanadeze Syllabics Ojibway Nwo" 
+    6348 "Kanadeze Syllabics Nwoo" 
+    6349 "Kanadeze Syllabics Ojibway Nwoo" 
+    6350 "Kanadeze Syllabics Rwee" 
+    6351 "Kanadeze Syllabics Rwi" 
+    6352 "Kanadeze Syllabics Rwii" 
+    6353 "Kanadeze Syllabics Rwo" 
+    6354 "Kanadeze Syllabics Rwoo" 
+    6355 "Kanadeze Syllabics Rwa" 
+    6356 "Kanadeze Syllabics Ojibway P" 
+    6357 "Kanadeze Syllabics Ojibway T" 
+    6358 "Kanadeze Syllabics Ojibway K" 
+    6359 "Kanadeze Syllabics Ojibway C" 
+    6360 "Kanadeze Syllabics Ojibway M" 
+    6361 "Kanadeze Syllabics Ojibway N" 
+    6362 "Kanadeze Syllabics Ojibway S" 
+    6363 "Kanadeze Syllabics Ojibway Sh" 
+    6364 "Kanadeze Syllabics Lindor W" 
+    6365 "Kanadeze Syllabics PerÃ«ndimor W" 
+    6366 "Kanadeze Syllabics PÃ«rfundimtare e VogÃ«l Rreth" 
+    6367 "Kanadeze Syllabics PÃ«rfundimtare Ngritur PikÃ«" 
+    6368 "Kanadeze Syllabics R-Cree Rwe" 
+    6369 "Kanadeze Syllabics West-Cree Loo" 
+    6370 "Kanadeze Syllabics West-Cree Laa" 
+    6371 "Kanadeze Syllabics Thwe" 
+    6372 "Kanadeze Syllabics Thwa" 
+    6373 "Kanadeze Syllabics Tthwe" 
+    6374 "Kanadeze Syllabics Tthoo" 
+    6375 "Kanadeze Syllabics Tthaa" 
+    6376 "Kanadeze Syllabics Tlhwe" 
+    6377 "Kanadeze Syllabics Tlhoo" 
+    6378 "Kanadeze Syllabics Sayisi Shwe" 
+    6379 "Kanadeze Syllabics Sayisi Shoo" 
+    6380 "Kanadeze Syllabics Sayisi Hoo" 
+    6381 "Kanadeze Syllabics Carrier Gwu" 
+    6382 "Kanadeze Syllabics Carrier Dene Gee" 
+    6383 "Kanadeze Syllabics Carrier Gaa" 
+    6384 "Kanadeze Syllabics Carrier Gwa" 
+    6385 "Kanadeze Syllabics Sayisi Juu" 
+    6386 "Kanadeze Syllabics Carrier Jwa" 
+    6387 "Kanadeze Syllabics Beaver Dene L" 
+    6388 "Kanadeze Syllabics Beaver Dene R" 
+    6389 "Kanadeze Syllabics Carrier Dental S" 
+    6400 "Limbu Zanore-Carrier ShkronjÃ«" 
+    6401 "Limbu ShkronjÃ« Ka" 
+    6402 "Limbu ShkronjÃ« Kha" 
+    6403 "Limbu ShkronjÃ« Ga" 
+    6404 "Limbu ShkronjÃ« Gha" 
+    6405 "Limbu ShkronjÃ« Nga" 
+    6406 "Limbu ShkronjÃ« Ca" 
+    6407 "Limbu ShkronjÃ« Cha" 
+    6408 "Limbu ShkronjÃ« Ja" 
+    6409 "Limbu ShkronjÃ« Jha" 
+    6410 "Limbu ShkronjÃ« Yan" 
+    6411 "Limbu ShkronjÃ« Ta" 
+    6412 "Limbu ShkronjÃ« Tha" 
+    6413 "Limbu ShkronjÃ« Da" 
+    6414 "Limbu ShkronjÃ« Dha" 
+    6415 "Limbu ShkronjÃ« Na" 
+    6416 "Limbu ShkronjÃ« Pa" 
+    6417 "Limbu ShkronjÃ« Pha" 
+    6418 "Limbu ShkronjÃ« Ba" 
+    6419 "Limbu ShkronjÃ« Bha" 
+    6420 "Limbu ShkronjÃ« Ma" 
+    6421 "Limbu ShkronjÃ« Ya" 
+    6422 "Limbu ShkronjÃ« Ra" 
+    6423 "Limbu ShkronjÃ« La" 
+    6424 "Limbu ShkronjÃ« Wa" 
+    6425 "Limbu ShkronjÃ« Sha" 
+    6426 "Limbu ShkronjÃ« Ssa" 
+    6427 "Limbu ShkronjÃ« Sa" 
+    6428 "Limbu ShkronjÃ« Ha" 
+    6432 "Limbu Zanore ShenjÃ« A" 
+    6433 "Limbu Zanore ShenjÃ« I" 
+    6434 "Limbu Zanore ShenjÃ« U" 
+    6435 "Limbu Zanore ShenjÃ« Ee" 
+    6436 "Limbu Zanore ShenjÃ« Ai" 
+    6437 "Limbu Zanore ShenjÃ« Oo" 
+    6438 "Limbu Zanore ShenjÃ« Au" 
+    6439 "Limbu Zanore ShenjÃ« E" 
+    6440 "Limbu Zanore ShenjÃ« O" 
+    6441 "Limbu BashkÃ«ngjitur ShkronjÃ« Ya" 
+    6442 "Limbu BashkÃ«ngjitur ShkronjÃ« Ra" 
+    6443 "Limbu BashkÃ«ngjitur ShkronjÃ« Wa" 
+    6448 "Limbu ShkronjÃ« e VogÃ«l Ka" 
+    6449 "Limbu ShkronjÃ« e VogÃ«l Nga" 
+    6450 "Limbu ShkronjÃ« e VogÃ«l Anusvara" 
+    6451 "Limbu ShkronjÃ« e VogÃ«l Ta" 
+    6452 "Limbu ShkronjÃ« e VogÃ«l Na" 
+    6453 "Limbu ShkronjÃ« e VogÃ«l Pa" 
+    6454 "Limbu ShkronjÃ« e VogÃ«l Ma" 
+    6455 "Limbu ShkronjÃ« e VogÃ«l Ra" 
+    6456 "Limbu ShkronjÃ« e VogÃ«l La" 
+    6457 "Limbu ShenjÃ« Mukphreng" 
+    6458 "Limbu ShenjÃ« Kemphreng" 
+    6459 "Limbu ShenjÃ« Sa-I" 
+    6464 "Limbu ShenjÃ« Loo" 
+    6468 "Limbu Thirrje ShenjÃ«" 
+    6469 "Limbu Pyetje ShenjÃ«" 
+    6470 "Limbu ShifÃ«r Zero" 
+    6471 "Limbu ShifÃ«r One" 
+    6472 "Limbu ShifÃ«r Dy" 
+    6473 "Limbu ShifÃ«r Tre" 
+    6474 "Limbu ShifÃ«r KatÃ«r" 
+    6475 "Limbu ShifÃ«r PesÃ«" 
+    6476 "Limbu ShifÃ«r GjashtÃ«" 
+    6477 "Limbu ShifÃ«r ShtatÃ«" 
+    6478 "Limbu ShifÃ«r TetÃ«" 
+    6479 "Limbu ShifÃ«r NÃ«ntÃ«" 
+    6480 "Tai Le ShkronjÃ« Ka" 
+    6481 "Tai Le ShkronjÃ« Xa" 
+    6482 "Tai Le ShkronjÃ« Nga" 
+    6483 "Tai Le ShkronjÃ« Tsa" 
+    6484 "Tai Le ShkronjÃ« Sa" 
+    6485 "Tai Le ShkronjÃ« Ya" 
+    6486 "Tai Le ShkronjÃ« Ta" 
+    6487 "Tai Le ShkronjÃ« Tha" 
+    6488 "Tai Le ShkronjÃ« La" 
+    6489 "Tai Le ShkronjÃ« Pa" 
+    6490 "Tai Le ShkronjÃ« Pha" 
+    6491 "Tai Le ShkronjÃ« Ma" 
+    6492 "Tai Le ShkronjÃ« Fa" 
+    6493 "Tai Le ShkronjÃ« Va" 
+    6494 "Tai Le ShkronjÃ« Ha" 
+    6495 "Tai Le ShkronjÃ« Qa" 
+    6496 "Tai Le ShkronjÃ« Kha" 
+    6497 "Tai Le ShkronjÃ« Tsha" 
+    6498 "Tai Le ShkronjÃ« Na" 
+    6499 "Tai Le ShkronjÃ« A" 
+    6500 "Tai Le ShkronjÃ« I" 
+    6501 "Tai Le ShkronjÃ« Ee" 
+    6502 "Tai Le ShkronjÃ« Eh" 
+    6503 "Tai Le ShkronjÃ« U" 
+    6504 "Tai Le ShkronjÃ« Oo" 
+    6505 "Tai Le ShkronjÃ« O" 
+    6506 "Tai Le ShkronjÃ« Ue" 
+    6507 "Tai Le ShkronjÃ« E" 
+    6508 "Tai Le ShkronjÃ« Aue" 
+    6509 "Tai Le ShkronjÃ« Ai" 
+    6512 "Tai Le ShkronjÃ« Tone-2" 
+    6513 "Tai Le ShkronjÃ« Tone-3" 
+    6514 "Tai Le ShkronjÃ« Tone-4" 
+    6515 "Tai Le ShkronjÃ« Tone-5" 
+    6516 "Tai Le ShkronjÃ« Tone-6" 
+    6528 "E're Tai Lue ShkronjÃ« Lart Qa" 
+    6529 "E're Tai Lue ShkronjÃ« UlÃ«t Qa" 
+    6530 "E're Tai Lue ShkronjÃ« Lart Ka" 
+    6531 "E're Tai Lue ShkronjÃ« Lart Xa" 
+    6532 "E're Tai Lue ShkronjÃ« Lart Nga" 
+    6533 "E're Tai Lue ShkronjÃ« UlÃ«t Ka" 
+    6534 "E're Tai Lue ShkronjÃ« UlÃ«t Xa" 
+    6535 "E're Tai Lue ShkronjÃ« UlÃ«t Nga" 
+    6536 "E're Tai Lue ShkronjÃ« Lart Tsa" 
+    6537 "E're Tai Lue ShkronjÃ« Lart Sa" 
+    6538 "E're Tai Lue ShkronjÃ« Lart Ya" 
+    6539 "E're Tai Lue ShkronjÃ« UlÃ«t Tsa" 
+    6540 "E're Tai Lue ShkronjÃ« UlÃ«t Sa" 
+    6541 "E're Tai Lue ShkronjÃ« UlÃ«t Ya" 
+    6542 "E're Tai Lue ShkronjÃ« Lart Ta" 
+    6543 "E're Tai Lue ShkronjÃ« Lart Tha" 
+    6544 "E're Tai Lue ShkronjÃ« Lart Na" 
+    6545 "E're Tai Lue ShkronjÃ« UlÃ«t Ta" 
+    6546 "E're Tai Lue ShkronjÃ« UlÃ«t Tha" 
+    6547 "E're Tai Lue ShkronjÃ« UlÃ«t Na" 
+    6548 "E're Tai Lue ShkronjÃ« Lart Pa" 
+    6549 "E're Tai Lue ShkronjÃ« Lart Pha" 
+    6550 "E're Tai Lue ShkronjÃ« Lart Ma" 
+    6551 "E're Tai Lue ShkronjÃ« UlÃ«t Pa" 
+    6552 "E're Tai Lue ShkronjÃ« UlÃ«t Pha" 
+    6553 "E're Tai Lue ShkronjÃ« UlÃ«t Ma" 
+    6554 "E're Tai Lue ShkronjÃ« Lart Fa" 
+    6555 "E're Tai Lue ShkronjÃ« Lart Va" 
+    6556 "E're Tai Lue ShkronjÃ« Lart La" 
+    6557 "E're Tai Lue ShkronjÃ« UlÃ«t Fa" 
+    6558 "E're Tai Lue ShkronjÃ« UlÃ«t Va" 
+    6559 "E're Tai Lue ShkronjÃ« UlÃ«t La" 
+    6560 "E're Tai Lue ShkronjÃ« Lart Ha" 
+    6561 "E're Tai Lue ShkronjÃ« Lart Da" 
+    6562 "E're Tai Lue ShkronjÃ« Lart Ba" 
+    6563 "E're Tai Lue ShkronjÃ« UlÃ«t Ha" 
+    6564 "E're Tai Lue ShkronjÃ« UlÃ«t Da" 
+    6565 "E're Tai Lue ShkronjÃ« UlÃ«t Ba" 
+    6566 "E're Tai Lue ShkronjÃ« Lart Kva" 
+    6567 "E're Tai Lue ShkronjÃ« Lart Xva" 
+    6568 "E're Tai Lue ShkronjÃ« UlÃ«t Kva" 
+    6569 "E're Tai Lue ShkronjÃ« UlÃ«t Xva" 
+    6570 "E're Tai Lue ShkronjÃ« Lart Sua" 
+    6571 "E're Tai Lue ShkronjÃ« UlÃ«t Sua" 
+    6576 "E're Tai Lue Zanore ShenjÃ« Zanore Shortener" 
+    6577 "E're Tai Lue Zanore ShenjÃ« Aa" 
+    6578 "E're Tai Lue Zanore ShenjÃ« Ii" 
+    6579 "E're Tai Lue Zanore ShenjÃ« U" 
+    6580 "E're Tai Lue Zanore ShenjÃ« Uu" 
+    6581 "E're Tai Lue Zanore ShenjÃ« E" 
+    6582 "E're Tai Lue Zanore ShenjÃ« Ae" 
+    6583 "E're Tai Lue Zanore ShenjÃ« O" 
+    6584 "E're Tai Lue Zanore ShenjÃ« Oa" 
+    6585 "E're Tai Lue Zanore ShenjÃ« Ue" 
+    6586 "E're Tai Lue Zanore ShenjÃ« Ay" 
+    6587 "E're Tai Lue Zanore ShenjÃ« Aay" 
+    6588 "E're Tai Lue Zanore ShenjÃ« Uy" 
+    6589 "E're Tai Lue Zanore ShenjÃ« Oy" 
+    6590 "E're Tai Lue Zanore ShenjÃ« Oay" 
+    6591 "E're Tai Lue Zanore ShenjÃ« Uey" 
+    6592 "E're Tai Lue Zanore ShenjÃ« Iy" 
+    6593 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare V" 
+    6594 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare Ng" 
+    6595 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare N" 
+    6596 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare M" 
+    6597 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare K" 
+    6598 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare D" 
+    6599 "E're Tai Lue ShkronjÃ« PÃ«rfundimtare B" 
+    6600 "E're Tai Lue Tone ShenjÃ«-1" 
+    6601 "E're Tai Lue Tone ShenjÃ«-2" 
+    6608 "E're Tai Lue ShifÃ«r Zero" 
+    6609 "E're Tai Lue ShifÃ«r NjÃ«" 
+    6610 "E're Tai Lue ShifÃ«r Dy" 
+    6611 "E're Tai Lue ShifÃ«r Tre" 
+    6612 "E're Tai Lue ShifÃ«r KatÃ«r" 
+    6613 "E're Tai Lue ShifÃ«r PesÃ«" 
+    6614 "E're Tai Lue ShifÃ«r GjashtÃ«" 
+    6615 "E're Tai Lue ShifÃ«r ShtatÃ«" 
+    6616 "E're Tai Lue ShifÃ«r TetÃ«" 
+    6617 "E're Tai Lue ShifÃ«r NÃ«ntÃ«" 
+    6618 "E're Tai Lue Tham ShifÃ«r One" 
+    6622 "E're Tai Lue ShenjÃ« Lae" 
+    6623 "E're Tai Lue ShenjÃ« Laev" 
+    6624 "Khmer Simbol Pathamasat" 
+    6625 "Khmer Simbol Muoy Koet" 
+    6626 "Khmer Simbol Pii Koet" 
+    6627 "Khmer Simbol Bei Koet" 
+    6628 "Khmer Simbol Buon Koet" 
+    6629 "Khmer Simbol Pram Koet" 
+    6630 "Khmer Simbol Pram-Muoy Koet" 
+    6631 "Khmer Simbol Pram-Pii Koet" 
+    6632 "Khmer Simbol Pram-Bei Koet" 
+    6633 "Khmer Simbol Pram-Buon Koet" 
+    6634 "Khmer Simbol Dap Koet" 
+    6635 "Khmer Simbol Dap-Muoy Koet" 
+    6636 "Khmer Simbol Dap-Pii Koet" 
+    6637 "Khmer Simbol Dap-Bei Koet" 
+    6638 "Khmer Simbol Dap-Buon Koet" 
+    6639 "Khmer Simbol Dap-Pram Koet" 
+    6640 "Khmer Simbol Tuteyasat" 
+    6641 "Khmer Simbol Muoy Roc" 
+    6642 "Khmer Simbol Pii Roc" 
+    6643 "Khmer Simbol Bei Roc" 
+    6644 "Khmer Simbol Buon Roc" 
+    6645 "Khmer Simbol Pram Roc" 
+    6646 "Khmer Simbol Pram-Muoy Roc" 
+    6647 "Khmer Simbol Pram-Pii Roc" 
+    6648 "Khmer Simbol Pram-Bei Roc" 
+    6649 "Khmer Simbol Pram-Buon Roc" 
+    6650 "Khmer Simbol Dap Roc" 
+    6651 "Khmer Simbol Dap-Muoy Roc" 
+    6652 "Khmer Simbol Dap-Pii Roc" 
+    6653 "Khmer Simbol Dap-Bei Roc" 
+    6654 "Khmer Simbol Dap-Buon Roc" 
+    6655 "Khmer Simbol Dap-Pram Roc" 
+    6656 "Buginese ShkronjÃ« Ka" 
+    6657 "Buginese ShkronjÃ« Ga" 
+    6658 "Buginese ShkronjÃ« Nga" 
+    6659 "Buginese ShkronjÃ« Ngka" 
+    6660 "Buginese ShkronjÃ« Pa" 
+    6661 "Buginese ShkronjÃ« Ba" 
+    6662 "Buginese ShkronjÃ« Ma" 
+    6663 "Buginese ShkronjÃ« Mpa" 
+    6664 "Buginese ShkronjÃ« Ta" 
+    6665 "Buginese ShkronjÃ« Da" 
+    6666 "Buginese ShkronjÃ« Na" 
+    6667 "Buginese ShkronjÃ« Nra" 
+    6668 "Buginese ShkronjÃ« Ca" 
+    6669 "Buginese ShkronjÃ« Ja" 
+    6670 "Buginese ShkronjÃ« Nya" 
+    6671 "Buginese ShkronjÃ« Nyca" 
+    6672 "Buginese ShkronjÃ« Ya" 
+    6673 "Buginese ShkronjÃ« Ra" 
+    6674 "Buginese ShkronjÃ« La" 
+    6675 "Buginese ShkronjÃ« Va" 
+    6676 "Buginese ShkronjÃ« Sa" 
+    6677 "Buginese ShkronjÃ« A" 
+    6678 "Buginese ShkronjÃ« Ha" 
+    6679 "Buginese Zanore ShenjÃ« I" 
+    6680 "Buginese Zanore ShenjÃ« U" 
+    6681 "Buginese Zanore ShenjÃ« E" 
+    6682 "Buginese Zanore ShenjÃ« O" 
+    6683 "Buginese Zanore ShenjÃ« Ae" 
+    6686 "Buginese Pallawa" 
+    6687 "Buginese Mbarimi I Section" 
+    6688 "Tai Tham ShkronjÃ« Lart Ka" 
+    6689 "Tai Tham ShkronjÃ« Lart Kha" 
+    6690 "Tai Tham ShkronjÃ« Lart Kxa" 
+    6691 "Tai Tham ShkronjÃ« UlÃ«t Ka" 
+    6692 "Tai Tham ShkronjÃ« UlÃ«t Kxa" 
+    6693 "Tai Tham ShkronjÃ« UlÃ«t Kha" 
+    6694 "Tai Tham ShkronjÃ« Nga" 
+    6695 "Tai Tham ShkronjÃ« Lart Ca" 
+    6696 "Tai Tham ShkronjÃ« Lart Cha" 
+    6697 "Tai Tham ShkronjÃ« UlÃ«t Ca" 
+    6698 "Tai Tham ShkronjÃ« UlÃ«t Sa" 
+    6699 "Tai Tham ShkronjÃ« UlÃ«t Cha" 
+    6700 "Tai Tham ShkronjÃ« Nya" 
+    6701 "Tai Tham ShkronjÃ« Rata" 
+    6702 "Tai Tham ShkronjÃ« Lart Ratha" 
+    6703 "Tai Tham ShkronjÃ« Da" 
+    6704 "Tai Tham ShkronjÃ« UlÃ«t Ratha" 
+    6705 "Tai Tham ShkronjÃ« Rana" 
+    6706 "Tai Tham ShkronjÃ« Lart Ta" 
+    6707 "Tai Tham ShkronjÃ« Lart Tha" 
+    6708 "Tai Tham ShkronjÃ« UlÃ«t Ta" 
+    6709 "Tai Tham ShkronjÃ« UlÃ«t Tha" 
+    6710 "Tai Tham ShkronjÃ« Na" 
+    6711 "Tai Tham ShkronjÃ« Ba" 
+    6712 "Tai Tham ShkronjÃ« Lart Pa" 
+    6713 "Tai Tham ShkronjÃ« Lart Pha" 
+    6714 "Tai Tham ShkronjÃ« Lart Fa" 
+    6715 "Tai Tham ShkronjÃ« UlÃ«t Pa" 
+    6716 "Tai Tham ShkronjÃ« UlÃ«t Fa" 
+    6717 "Tai Tham ShkronjÃ« UlÃ«t Pha" 
+    6718 "Tai Tham ShkronjÃ« Ma" 
+    6719 "Tai Tham ShkronjÃ« UlÃ«t Ya" 
+    6720 "Tai Tham ShkronjÃ« Lart Ya" 
+    6721 "Tai Tham ShkronjÃ« Ra" 
+    6722 "Tai Tham ShkronjÃ« Rue" 
+    6723 "Tai Tham ShkronjÃ« La" 
+    6724 "Tai Tham ShkronjÃ« Lue" 
+    6725 "Tai Tham ShkronjÃ« Wa" 
+    6726 "Tai Tham ShkronjÃ« Lart Sha" 
+    6727 "Tai Tham ShkronjÃ« Lart Ssa" 
+    6728 "Tai Tham ShkronjÃ« Lart Sa" 
+    6729 "Tai Tham ShkronjÃ« Lart Ha" 
+    6730 "Tai Tham ShkronjÃ« Lla" 
+    6731 "Tai Tham ShkronjÃ« A" 
+    6732 "Tai Tham ShkronjÃ« UlÃ«t Ha" 
+    6733 "Tai Tham ShkronjÃ« I" 
+    6734 "Tai Tham ShkronjÃ« Ii" 
+    6735 "Tai Tham ShkronjÃ« U" 
+    6736 "Tai Tham ShkronjÃ« Uu" 
+    6737 "Tai Tham ShkronjÃ« Ee" 
+    6738 "Tai Tham ShkronjÃ« Oo" 
+    6739 "Tai Tham ShkronjÃ« Lae" 
+    6740 "Tai Tham ShkronjÃ« Great Sa" 
+    6741 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« Mesor Ra" 
+    6742 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« Mesor La" 
+    6743 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« La Tang Lai" 
+    6744 "Tai Tham ShenjÃ« Mai Kang Lai" 
+    6745 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« PÃ«rfundimtare Nga" 
+    6746 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« UlÃ«t Pa" 
+    6747 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« Lart Ratha ose UlÃ«t Pa" 
+    6748 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« Ma" 
+    6749 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« Ba" 
+    6750 "Tai Tham BashkÃ«tingÃ«llore ShenjÃ« Sa" 
+    6752 "Tai Tham ShenjÃ« Sakot" 
+    6753 "Tai Tham Zanore ShenjÃ« A" 
+    6754 "Tai Tham Zanore ShenjÃ« Mai Sat" 
+    6755 "Tai Tham Zanore ShenjÃ« Aa" 
+    6756 "Tai Tham Zanore ShenjÃ« Tall Aa" 
+    6757 "Tai Tham Zanore ShenjÃ« I" 
+    6758 "Tai Tham Zanore ShenjÃ« Ii" 
+    6759 "Tai Tham Zanore ShenjÃ« Ue" 
+    6760 "Tai Tham Zanore ShenjÃ« Uue" 
+    6761 "Tai Tham Zanore ShenjÃ« U" 
+    6762 "Tai Tham Zanore ShenjÃ« Uu" 
+    6763 "Tai Tham Zanore ShenjÃ« O" 
+    6764 "Tai Tham Zanore ShenjÃ« Oa PoshtÃ«" 
+    6765 "Tai Tham Zanore ShenjÃ« Oy" 
+    6766 "Tai Tham Zanore ShenjÃ« E" 
+    6767 "Tai Tham Zanore ShenjÃ« Ae" 
+    6768 "Tai Tham Zanore ShenjÃ« Oo" 
+    6769 "Tai Tham Zanore ShenjÃ« Ai" 
+    6770 "Tai Tham Zanore ShenjÃ« Tham Ai" 
+    6771 "Tai Tham Zanore ShenjÃ« Oa Lart" 
+    6772 "Tai Tham ShenjÃ« Mai Kang" 
+    6773 "Tai Tham ShenjÃ« Tone-1" 
+    6774 "Tai Tham ShenjÃ« Tone-2" 
+    6775 "Tai Tham ShenjÃ« Khuen Tone-3" 
+    6776 "Tai Tham ShenjÃ« Khuen Tone-4" 
+    6777 "Tai Tham ShenjÃ« Khuen Tone-5" 
+    6778 "Tai Tham ShenjÃ« Ra Haam" 
+    6779 "Tai Tham ShenjÃ« Mai Sam" 
+    6780 "Tai Tham ShenjÃ« Khuen-Lue Karan" 
+    6783 "Tai Tham Kombinuar Cryptogrammic PikÃ«" 
+    6784 "Tai Tham Hora ShifÃ«r Zero" 
+    6785 "Tai Tham Hora ShifÃ«r NjÃ«" 
+    6786 "Tai Tham Hora ShifÃ«r Dy" 
+    6787 "Tai Tham Hora ShifÃ«r Tre" 
+    6788 "Tai Tham Hora ShifÃ«r KatÃ«r" 
+    6789 "Tai Tham Hora ShifÃ«r PesÃ«" 
+    6790 "Tai Tham Hora ShifÃ«r GjashtÃ«" 
+    6791 "Tai Tham Hora ShifÃ«r ShtatÃ«" 
+    6792 "Tai Tham Hora ShifÃ«r TetÃ«" 
+    6793 "Tai Tham Hora ShifÃ«r NÃ«ntÃ«" 
+    6800 "Tai Tham Tham ShifÃ«r Zero" 
+    6801 "Tai Tham Tham ShifÃ«r NjÃ«" 
+    6802 "Tai Tham Tham ShifÃ«r Dy" 
+    6803 "Tai Tham Tham ShifÃ«r Tre" 
+    6804 "Tai Tham Tham ShifÃ«r KatÃ«r" 
+    6805 "Tai Tham Tham ShifÃ«r PesÃ«" 
+    6806 "Tai Tham Tham ShifÃ«r GjashtÃ«" 
+    6807 "Tai Tham Tham ShifÃ«r ShtatÃ«" 
+    6808 "Tai Tham Tham ShifÃ«r TetÃ«" 
+    6809 "Tai Tham Tham ShifÃ«r NÃ«ntÃ«" 
+    6816 "Tai Tham ShenjÃ« Wiang" 
+    6817 "Tai Tham ShenjÃ« Wiangwaak" 
+    6818 "Tai Tham ShenjÃ« Sawan" 
+    6819 "Tai Tham ShenjÃ« Keow" 
+    6820 "Tai Tham ShenjÃ« Hoy" 
+    6821 "Tai Tham ShenjÃ« Dokmai" 
+    6822 "Tai Tham ShenjÃ« KundÃ«rt Rrotulluar Rana" 
+    6823 "Tai Tham ShenjÃ« Mai Yamok" 
+    6824 "Tai Tham ShenjÃ« Kaan" 
+    6825 "Tai Tham ShenjÃ« Kaankuu" 
+    6826 "Tai Tham ShenjÃ« Satkaan" 
+    6827 "Tai Tham ShenjÃ« Satkaankuu" 
+    6828 "Tai Tham ShenjÃ« Hang" 
+    6829 "Tai Tham ShenjÃ« Caang" 
+    6912 "Balinese ShenjÃ« Ulu Ricem" 
+    6913 "Balinese ShenjÃ« Ulu Candra" 
+    6914 "Balinese ShenjÃ« Cecek" 
+    6915 "Balinese ShenjÃ« Surang" 
+    6916 "Balinese ShenjÃ« Bisah" 
+    6917 "Balinese ShkronjÃ« Akara" 
+    6918 "Balinese ShkronjÃ« Akara Tedung" 
+    6919 "Balinese ShkronjÃ« Ikara" 
+    6920 "Balinese ShkronjÃ« Ikara Tedung" 
+    6921 "Balinese ShkronjÃ« Ukara" 
+    6922 "Balinese ShkronjÃ« Ukara Tedung" 
+    6923 "Balinese ShkronjÃ« Ra Repa" 
+    6924 "Balinese ShkronjÃ« Ra Repa Tedung" 
+    6925 "Balinese ShkronjÃ« La Lenga" 
+    6926 "Balinese ShkronjÃ« La Lenga Tedung" 
+    6927 "Balinese ShkronjÃ« Ekara" 
+    6928 "Balinese ShkronjÃ« Aikara" 
+    6929 "Balinese ShkronjÃ« Okara" 
+    6930 "Balinese ShkronjÃ« Okara Tedung" 
+    6931 "Balinese ShkronjÃ« Ka" 
+    6932 "Balinese ShkronjÃ« Ka Mahaprana" 
+    6933 "Balinese ShkronjÃ« Ga" 
+    6934 "Balinese ShkronjÃ« Ga Gora" 
+    6935 "Balinese ShkronjÃ« Nga" 
+    6936 "Balinese ShkronjÃ« Ca" 
+    6937 "Balinese ShkronjÃ« Ca Laca" 
+    6938 "Balinese ShkronjÃ« Ja" 
+    6939 "Balinese ShkronjÃ« Ja Jera" 
+    6940 "Balinese ShkronjÃ« Nya" 
+    6941 "Balinese ShkronjÃ« Ta Latik" 
+    6942 "Balinese ShkronjÃ« Ta Murda Mahaprana" 
+    6943 "Balinese ShkronjÃ« Da Murda Alpaprana" 
+    6944 "Balinese ShkronjÃ« Da Murda Mahaprana" 
+    6945 "Balinese ShkronjÃ« Na Rambat" 
+    6946 "Balinese ShkronjÃ« Ta" 
+    6947 "Balinese ShkronjÃ« Ta Tawa" 
+    6948 "Balinese ShkronjÃ« Da" 
+    6949 "Balinese ShkronjÃ« Da Madu" 
+    6950 "Balinese ShkronjÃ« Na" 
+    6951 "Balinese ShkronjÃ« Pa" 
+    6952 "Balinese ShkronjÃ« Pa Kapal" 
+    6953 "Balinese ShkronjÃ« Ba" 
+    6954 "Balinese ShkronjÃ« Ba Kembang" 
+    6955 "Balinese ShkronjÃ« Ma" 
+    6956 "Balinese ShkronjÃ« Ya" 
+    6957 "Balinese ShkronjÃ« Ra" 
+    6958 "Balinese ShkronjÃ« La" 
+    6959 "Balinese ShkronjÃ« Wa" 
+    6960 "Balinese ShkronjÃ« Sa Saga" 
+    6961 "Balinese ShkronjÃ« Sa Sapa" 
+    6962 "Balinese ShkronjÃ« Sa" 
+    6963 "Balinese ShkronjÃ« Ha" 
+    6964 "Balinese ShenjÃ« Rerekan" 
+    6965 "Balinese Zanore ShenjÃ« Tedung" 
+    6966 "Balinese Zanore ShenjÃ« Ulu" 
+    6967 "Balinese Zanore ShenjÃ« Ulu Sari" 
+    6968 "Balinese Zanore ShenjÃ« Suku" 
+    6969 "Balinese Zanore ShenjÃ« Suku Ilut" 
+    6970 "Balinese Zanore ShenjÃ« Ra Repa" 
+    6971 "Balinese Zanore ShenjÃ« Ra Repa Tedung" 
+    6972 "Balinese Zanore ShenjÃ« La Lenga" 
+    6973 "Balinese Zanore ShenjÃ« La Lenga Tedung" 
+    6974 "Balinese Zanore ShenjÃ« Taling" 
+    6975 "Balinese Zanore ShenjÃ« Taling Repa" 
+    6976 "Balinese Zanore ShenjÃ« Taling Tedung" 
+    6977 "Balinese Zanore ShenjÃ« Taling Repa Tedung" 
+    6978 "Balinese Zanore ShenjÃ« Pepet" 
+    6979 "Balinese Zanore ShenjÃ« Pepet Tedung" 
+    6980 "Balinese Adeg Adeg" 
+    6981 "Balinese ShkronjÃ« Kaf Sasak" 
+    6982 "Balinese ShkronjÃ« Khot Sasak" 
+    6983 "Balinese ShkronjÃ« Tzir Sasak" 
+    6984 "Balinese ShkronjÃ« Ef Sasak" 
+    6985 "Balinese ShkronjÃ« Ve Sasak" 
+    6986 "Balinese ShkronjÃ« Zal Sasak" 
+    6987 "Balinese ShkronjÃ« Asyura Sasak" 
+    6992 "Balinese ShifÃ«r Zero" 
+    6993 "Balinese ShifÃ«r NjÃ«" 
+    6994 "Balinese ShifÃ«r Dy" 
+    6995 "Balinese ShifÃ«r Tre" 
+    6996 "Balinese ShifÃ«r KatÃ«r" 
+    6997 "Balinese ShifÃ«r PesÃ«" 
+    6998 "Balinese ShifÃ«r GjashtÃ«" 
+    6999 "Balinese ShifÃ«r ShtatÃ«" 
+    7000 "Balinese ShifÃ«r TetÃ«" 
+    7001 "Balinese ShifÃ«r NÃ«ntÃ«" 
+    7002 "Balinese Panti" 
+    7003 "Balinese Pamada" 
+    7004 "Balinese Windu" 
+    7005 "Balinese Carik Pamungkah" 
+    7006 "Balinese Carik Siki" 
+    7007 "Balinese Carik Pareren" 
+    7008 "Balinese Pameneng" 
+    7009 "Balinese Muzikor Simbol Dong" 
+    7010 "Balinese Muzikor Simbol Deng" 
+    7011 "Balinese Muzikor Simbol Dung" 
+    7012 "Balinese Muzikor Simbol Dang" 
+    7013 "Balinese Muzikor Simbol Dang Surang" 
+    7014 "Balinese Muzikor Simbol Ding" 
+    7015 "Balinese Muzikor Simbol Daeng" 
+    7016 "Balinese Muzikor Simbol Deung" 
+    7017 "Balinese Muzikor Simbol Daing" 
+    7018 "Balinese Muzikor Simbol Dang Gede" 
+    7019 "Balinese Muzikor Simbol Kombinuar Tegeh" 
+    7020 "Balinese Muzikor Simbol Kombinuar Endep" 
+    7021 "Balinese Muzikor Simbol Kombinuar Kempul" 
+    7022 "Balinese Muzikor Simbol Kombinuar Kempli" 
+    7023 "Balinese Muzikor Simbol Kombinuar Jegogan" 
+    7024 "Balinese Muzikor Simbol Kombinuar Kempul Me Jegogan" 
+    7025 "Balinese Muzikor Simbol Kombinuar Kempli Me Jegogan" 
+    7026 "Balinese Muzikor Simbol Kombinuar Bende" 
+    7027 "Balinese Muzikor Simbol Kombinuar Gong" 
+    7028 "Balinese Muzikor Simbol DjathtÃ«-DorÃ« Hap Dug" 
+    7029 "Balinese Muzikor Simbol DjathtÃ«-DorÃ« Hap Dag" 
+    7030 "Balinese Muzikor Simbol DjathtÃ«-DorÃ« Mbyllur Tuk" 
+    7031 "Balinese Muzikor Simbol DjathtÃ«-DorÃ« Mbyllur Tak" 
+    7032 "Balinese Muzikor Simbol MajtÃ«-DorÃ« Hap Pang" 
+    7033 "Balinese Muzikor Simbol MajtÃ«-DorÃ« Hap Pung" 
+    7034 "Balinese Muzikor Simbol MajtÃ«-DorÃ« Mbyllur Plak" 
+    7035 "Balinese Muzikor Simbol MajtÃ«-DorÃ« Mbyllur Pluk" 
+    7036 "Balinese Muzikor Simbol MajtÃ«-DorÃ« Hap Ping" 
+    7040 "Sudaneze ShenjÃ« Panyecek" 
+    7041 "Sudaneze ShenjÃ« Panglayar" 
+    7042 "Sudaneze ShenjÃ« Pangwisad" 
+    7043 "Sudaneze ShkronjÃ« A" 
+    7044 "Sudaneze ShkronjÃ« I" 
+    7045 "Sudaneze ShkronjÃ« U" 
+    7046 "Sudaneze ShkronjÃ« Ae" 
+    7047 "Sudaneze ShkronjÃ« O" 
+    7048 "Sudaneze ShkronjÃ« E" 
+    7049 "Sudaneze ShkronjÃ« Eu" 
+    7050 "Sudaneze ShkronjÃ« Ka" 
+    7051 "Sudaneze ShkronjÃ« Qa" 
+    7052 "Sudaneze ShkronjÃ« Ga" 
+    7053 "Sudaneze ShkronjÃ« Nga" 
+    7054 "Sudaneze ShkronjÃ« Ca" 
+    7055 "Sudaneze ShkronjÃ« Ja" 
+    7056 "Sudaneze ShkronjÃ« Za" 
+    7057 "Sudaneze ShkronjÃ« Nya" 
+    7058 "Sudaneze ShkronjÃ« Ta" 
+    7059 "Sudaneze ShkronjÃ« Da" 
+    7060 "Sudaneze ShkronjÃ« Na" 
+    7061 "Sudaneze ShkronjÃ« Pa" 
+    7062 "Sudaneze ShkronjÃ« Fa" 
+    7063 "Sudaneze ShkronjÃ« Va" 
+    7064 "Sudaneze ShkronjÃ« Ba" 
+    7065 "Sudaneze ShkronjÃ« Ma" 
+    7066 "Sudaneze ShkronjÃ« Ya" 
+    7067 "Sudaneze ShkronjÃ« Ra" 
+    7068 "Sudaneze ShkronjÃ« La" 
+    7069 "Sudaneze ShkronjÃ« Wa" 
+    7070 "Sudaneze ShkronjÃ« Sa" 
+    7071 "Sudaneze ShkronjÃ« Xa" 
+    7072 "Sudaneze ShkronjÃ« Ha" 
+    7073 "Sudaneze BashkÃ«tingÃ«llore ShenjÃ« Pamingkal" 
+    7074 "Sudaneze BashkÃ«tingÃ«llore ShenjÃ« Panyakra" 
+    7075 "Sudaneze BashkÃ«tingÃ«llore ShenjÃ« Panyiku" 
+    7076 "Sudaneze Zanore ShenjÃ« Panghulu" 
+    7077 "Sudaneze Zanore ShenjÃ« Panyuku" 
+    7078 "Sudaneze Zanore ShenjÃ« Panaelaeng" 
+    7079 "Sudaneze Zanore ShenjÃ« Panolong" 
+    7080 "Sudaneze Zanore ShenjÃ« Pamepet" 
+    7081 "Sudaneze Zanore ShenjÃ« Paneuleung" 
+    7082 "Sudaneze ShenjÃ« Pamaaeh" 
+    7083 "Sudaneze ShenjÃ« Virama" 
+    7084 "Sudaneze BashkÃ«tingÃ«llore ShenjÃ« Pasangan Ma" 
+    7085 "Sudaneze BashkÃ«tingÃ«llore ShenjÃ« Pasangan Wa" 
+    7086 "Sudaneze ShkronjÃ« Kha" 
+    7087 "Sudaneze ShkronjÃ« Sya" 
+    7088 "Sudaneze ShifÃ«r Zero" 
+    7089 "Sudaneze ShifÃ«r NjÃ«" 
+    7090 "Sudaneze ShifÃ«r Dy" 
+    7091 "Sudaneze ShifÃ«r Tre" 
+    7092 "Sudaneze ShifÃ«r KatÃ«r" 
+    7093 "Sudaneze ShifÃ«r PesÃ«" 
+    7094 "Sudaneze ShifÃ«r GjashtÃ«" 
+    7095 "Sudaneze ShifÃ«r ShtatÃ«" 
+    7096 "Sudaneze ShifÃ«r TetÃ«" 
+    7097 "Sudaneze ShifÃ«r NÃ«ntÃ«" 
+    7098 "Sudaneze Avagraha" 
+    7099 "Sudaneze ShkronjÃ« Reu" 
+    7100 "Sudaneze ShkronjÃ« Leu" 
+    7101 "Sudaneze ShkronjÃ« Bha" 
+    7102 "Sudaneze ShkronjÃ« PÃ«rfundimtare K" 
+    7103 "Sudaneze ShkronjÃ« PÃ«rfundimtare M" 
+    7104 "Batak ShkronjÃ« A" 
+    7105 "Batak ShkronjÃ« Simalungun A" 
+    7106 "Batak ShkronjÃ« Ha" 
+    7107 "Batak ShkronjÃ« Simalungun Ha" 
+    7108 "Batak ShkronjÃ« Mandailing Ha" 
+    7109 "Batak ShkronjÃ« Ba" 
+    7110 "Batak ShkronjÃ« Karo Ba" 
+    7111 "Batak ShkronjÃ« Pa" 
+    7112 "Batak ShkronjÃ« Simalungun Pa" 
+    7113 "Batak ShkronjÃ« Na" 
+    7114 "Batak ShkronjÃ« Mandailing Na" 
+    7115 "Batak ShkronjÃ« Wa" 
+    7116 "Batak ShkronjÃ« Simalungun Wa" 
+    7117 "Batak ShkronjÃ« Pakpak Wa" 
+    7118 "Batak ShkronjÃ« Ga" 
+    7119 "Batak ShkronjÃ« Simalungun Ga" 
+    7120 "Batak ShkronjÃ« Ja" 
+    7121 "Batak ShkronjÃ« Da" 
+    7122 "Batak ShkronjÃ« Ra" 
+    7123 "Batak ShkronjÃ« Simalungun Ra" 
+    7124 "Batak ShkronjÃ« Ma" 
+    7125 "Batak ShkronjÃ« Simalungun Ma" 
+    7126 "Batak ShkronjÃ« Southern Ta" 
+    7127 "Batak ShkronjÃ« Northern Ta" 
+    7128 "Batak ShkronjÃ« Sa" 
+    7129 "Batak ShkronjÃ« Simalungun Sa" 
+    7130 "Batak ShkronjÃ« Mandailing Sa" 
+    7131 "Batak ShkronjÃ« Ya" 
+    7132 "Batak ShkronjÃ« Simalungun Ya" 
+    7133 "Batak ShkronjÃ« Nga" 
+    7134 "Batak ShkronjÃ« La" 
+    7135 "Batak ShkronjÃ« Simalungun La" 
+    7136 "Batak ShkronjÃ« Nya" 
+    7137 "Batak ShkronjÃ« Ca" 
+    7138 "Batak ShkronjÃ« Nda" 
+    7139 "Batak ShkronjÃ« Mba" 
+    7140 "Batak ShkronjÃ« I" 
+    7141 "Batak ShkronjÃ« U" 
+    7142 "Batak ShenjÃ« Tompi" 
+    7143 "Batak Zanore ShenjÃ« E" 
+    7144 "Batak Zanore ShenjÃ« Pakpak E" 
+    7145 "Batak Zanore ShenjÃ« Ee" 
+    7146 "Batak Zanore ShenjÃ« I" 
+    7147 "Batak Zanore ShenjÃ« Karo I" 
+    7148 "Batak Zanore ShenjÃ« O" 
+    7149 "Batak Zanore ShenjÃ« Karo O" 
+    7150 "Batak Zanore ShenjÃ« U" 
+    7151 "Batak Zanore ShenjÃ« U PÃ«r Simalungun Sa" 
+    7152 "Batak BashkÃ«tingÃ«llore ShenjÃ« Ng" 
+    7153 "Batak BashkÃ«tingÃ«llore ShenjÃ« H" 
+    7154 "Batak Pangolat" 
+    7155 "Batak Panongonan" 
+    7164 "Batak Simbol Bindu Na Metek" 
+    7165 "Batak Simbol Bindu Pinarboras" 
+    7166 "Batak Simbol Bindu Judul" 
+    7167 "Batak Simbol Bindu Pangolat" 
+    7168 "Lepcha ShkronjÃ« Ka" 
+    7169 "Lepcha ShkronjÃ« Kla" 
+    7170 "Lepcha ShkronjÃ« Kha" 
+    7171 "Lepcha ShkronjÃ« Ga" 
+    7172 "Lepcha ShkronjÃ« Gla" 
+    7173 "Lepcha ShkronjÃ« Nga" 
+    7174 "Lepcha ShkronjÃ« Ca" 
+    7175 "Lepcha ShkronjÃ« Cha" 
+    7176 "Lepcha ShkronjÃ« Ja" 
+    7177 "Lepcha ShkronjÃ« Nya" 
+    7178 "Lepcha ShkronjÃ« Ta" 
+    7179 "Lepcha ShkronjÃ« Tha" 
+    7180 "Lepcha ShkronjÃ« Da" 
+    7181 "Lepcha ShkronjÃ« Na" 
+    7182 "Lepcha ShkronjÃ« Pa" 
+    7183 "Lepcha ShkronjÃ« Pla" 
+    7184 "Lepcha ShkronjÃ« Pha" 
+    7185 "Lepcha ShkronjÃ« Fa" 
+    7186 "Lepcha ShkronjÃ« Fla" 
+    7187 "Lepcha ShkronjÃ« Ba" 
+    7188 "Lepcha ShkronjÃ« Bla" 
+    7189 "Lepcha ShkronjÃ« Ma" 
+    7190 "Lepcha ShkronjÃ« Mla" 
+    7191 "Lepcha ShkronjÃ« Tsa" 
+    7192 "Lepcha ShkronjÃ« Tsha" 
+    7193 "Lepcha ShkronjÃ« Dza" 
+    7194 "Lepcha ShkronjÃ« Ya" 
+    7195 "Lepcha ShkronjÃ« Ra" 
+    7196 "Lepcha ShkronjÃ« La" 
+    7197 "Lepcha ShkronjÃ« Ha" 
+    7198 "Lepcha ShkronjÃ« Hla" 
+    7199 "Lepcha ShkronjÃ« Va" 
+    7200 "Lepcha ShkronjÃ« Sa" 
+    7201 "Lepcha ShkronjÃ« Sha" 
+    7202 "Lepcha ShkronjÃ« Wa" 
+    7203 "Lepcha ShkronjÃ« A" 
+    7204 "Lepcha BashkÃ«ngjitur ShkronjÃ« Ya" 
+    7205 "Lepcha BashkÃ«ngjitur ShkronjÃ« Ra" 
+    7206 "Lepcha Zanore ShenjÃ« Aa" 
+    7207 "Lepcha Zanore ShenjÃ« I" 
+    7208 "Lepcha Zanore ShenjÃ« O" 
+    7209 "Lepcha Zanore ShenjÃ« Oo" 
+    7210 "Lepcha Zanore ShenjÃ« U" 
+    7211 "Lepcha Zanore ShenjÃ« Uu" 
+    7212 "Lepcha Zanore ShenjÃ« E" 
+    7213 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« K" 
+    7214 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« M" 
+    7215 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« L" 
+    7216 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« N" 
+    7217 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« P" 
+    7218 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« R" 
+    7219 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« T" 
+    7220 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« Nyin-Do" 
+    7221 "Lepcha BashkÃ«tingÃ«llore ShenjÃ« Kang" 
+    7222 "Lepcha ShenjÃ« Ran" 
+    7223 "Lepcha ShenjÃ« Nukta" 
+    7227 "Lepcha PikÃ«sim Ta-Rol" 
+    7228 "Lepcha PikÃ«sim Nyet Thyoom Ta-Rol" 
+    7229 "Lepcha PikÃ«sim Cer-Wa" 
+    7230 "Lepcha PikÃ«sim Tshook Cer-Wa" 
+    7231 "Lepcha PikÃ«sim Tshook" 
+    7232 "Lepcha ShifÃ«r Zero" 
+    7233 "Lepcha ShifÃ«r NjÃ«" 
+    7234 "Lepcha ShifÃ«r Dy" 
+    7235 "Lepcha ShifÃ«r Tre" 
+    7236 "Lepcha ShifÃ«r KatÃ«r" 
+    7237 "Lepcha ShifÃ«r PesÃ«" 
+    7238 "Lepcha ShifÃ«r GjashtÃ«" 
+    7239 "Lepcha ShifÃ«r ShtatÃ«" 
+    7240 "Lepcha ShifÃ«r TetÃ«" 
+    7241 "Lepcha ShifÃ«r NÃ«ntÃ«" 
+    7245 "Lepcha ShkronjÃ« Tta" 
+    7246 "Lepcha ShkronjÃ« Ttha" 
+    7247 "Lepcha ShkronjÃ« Dda" 
+    7248 "Ol Chiki ShifÃ«r Zero" 
+    7249 "Ol Chiki ShifÃ«r One" 
+    7250 "Ol Chiki ShifÃ«r Dy" 
+    7251 "Ol Chiki ShifÃ«r Tre" 
+    7252 "Ol Chiki ShifÃ«r KatÃ«r" 
+    7253 "Ol Chiki ShifÃ«r PesÃ«" 
+    7254 "Ol Chiki ShifÃ«r GjashtÃ«" 
+    7255 "Ol Chiki ShifÃ«r ShtatÃ«" 
+    7256 "Ol Chiki ShifÃ«r TetÃ«" 
+    7257 "Ol Chiki ShifÃ«r NÃ«ntÃ«" 
+    7258 "Ol Chiki ShkronjÃ« La" 
+    7259 "Ol Chiki ShkronjÃ« At" 
+    7260 "Ol Chiki ShkronjÃ« Ag" 
+    7261 "Ol Chiki ShkronjÃ« Ang" 
+    7262 "Ol Chiki ShkronjÃ« Al" 
+    7263 "Ol Chiki ShkronjÃ« Laa" 
+    7264 "Ol Chiki ShkronjÃ« Aak" 
+    7265 "Ol Chiki ShkronjÃ« Aaj" 
+    7266 "Ol Chiki ShkronjÃ« Aam" 
+    7267 "Ol Chiki ShkronjÃ« Aaw" 
+    7268 "Ol Chiki ShkronjÃ« Li" 
+    7269 "Ol Chiki ShkronjÃ« Is" 
+    7270 "Ol Chiki ShkronjÃ« Ih" 
+    7271 "Ol Chiki ShkronjÃ« Iny" 
+    7272 "Ol Chiki ShkronjÃ« Ir" 
+    7273 "Ol Chiki ShkronjÃ« Lu" 
+    7274 "Ol Chiki ShkronjÃ« Uc" 
+    7275 "Ol Chiki ShkronjÃ« Ud" 
+    7276 "Ol Chiki ShkronjÃ« Unn" 
+    7277 "Ol Chiki ShkronjÃ« Uy" 
+    7278 "Ol Chiki ShkronjÃ« Le" 
+    7279 "Ol Chiki ShkronjÃ« Ep" 
+    7280 "Ol Chiki ShkronjÃ« Edd" 
+    7281 "Ol Chiki ShkronjÃ« En" 
+    7282 "Ol Chiki ShkronjÃ« Err" 
+    7283 "Ol Chiki ShkronjÃ« Lo" 
+    7284 "Ol Chiki ShkronjÃ« Ott" 
+    7285 "Ol Chiki ShkronjÃ« Ob" 
+    7286 "Ol Chiki ShkronjÃ« Ov" 
+    7287 "Ol Chiki ShkronjÃ« Oh" 
+    7288 "Ol Chiki Mu Ttuddag" 
+    7289 "Ol Chiki Gaahlaa Ttuddaag" 
+    7290 "Ol Chiki Mu-Gaahlaa Ttuddaag" 
+    7291 "Ol Chiki Relaa" 
+    7292 "Ol Chiki Phaarkaa" 
+    7293 "Ol Chiki Ahad" 
+    7294 "Ol Chiki PikÃ«sim Mucaad" 
+    7295 "Ol Chiki PikÃ«sim Dyshe Mucaad" 
+    7360 "Sudaneze PikÃ«sim Bindu Surya" 
+    7361 "Sudaneze PikÃ«sim Bindu Panglong" 
+    7362 "Sudaneze PikÃ«sim Bindu Purnama" 
+    7363 "Sudaneze PikÃ«sim Bindu Cakra" 
+    7364 "Sudaneze PikÃ«sim Bindu Leu Satanga" 
+    7365 "Sudaneze PikÃ«sim Bindu Ka Satanga" 
+    7366 "Sudaneze PikÃ«sim Bindu Da Satanga" 
+    7367 "Sudaneze PikÃ«sim Bindu Ba Satanga" 
+    7376 "Vedic Tone Karshana" 
+    7377 "Vedic Tone Shara" 
+    7378 "Vedic Tone Prenkha" 
+    7379 "Vedic ShenjÃ« Nihshvasa" 
+    7380 "Vedic ShenjÃ« Yajurvedic Midline Svarita" 
+    7381 "Vedic Tone Yajurvedic Aggravated Pavarur Svarita" 
+    7382 "Vedic Tone Yajurvedic Pavarur Svarita" 
+    7383 "Vedic Tone Yajurvedic Kathaka Pavarur Svarita" 
+    7384 "Vedic Tone Candra PoshtÃ«" 
+    7385 "Vedic Tone Yajurvedic Kathaka Pavarur Svarita Schroeder" 
+    7386 "Vedic Tone Dyshe Svarita" 
+    7387 "Vedic Tone Trefish Svarita" 
+    7388 "Vedic Tone Kathaka Anudatta" 
+    7389 "Vedic Tone PikÃ« PoshtÃ«" 
+    7390 "Vedic Tone Dy PikÃ« PoshtÃ«" 
+    7391 "Vedic Tone Tre PikÃ« PoshtÃ«" 
+    7392 "Vedic Tone Rigvedic Kashmiri Pavarur Svarita" 
+    7393 "Vedic Tone Atharvavedic Pavarur Svarita" 
+    7394 "Vedic ShenjÃ« Visarga Svarita" 
+    7395 "Vedic ShenjÃ« Visarga Udatta" 
+    7396 "Vedic ShenjÃ« KundÃ«rt Visarga Udatta" 
+    7397 "Vedic ShenjÃ« Visarga Anudatta" 
+    7398 "Vedic ShenjÃ« KundÃ«rt Visarga Anudatta" 
+    7399 "Vedic ShenjÃ« Visarga Udatta Me Bisht" 
+    7400 "Vedic ShenjÃ« Visarga Anudatta Me Bisht" 
+    7401 "Vedic ShenjÃ« Anusvara Antargomukha" 
+    7402 "Vedic ShenjÃ« Anusvara Bahirgomukha" 
+    7403 "Vedic ShenjÃ« Anusvara Vamagomukha" 
+    7404 "Vedic ShenjÃ« Anusvara Vamagomukha Me Bisht" 
+    7405 "Vedic ShenjÃ« Tiryak" 
+    7406 "Vedic ShenjÃ« Hexiform GjatÃ« Anusvara" 
+    7407 "Vedic ShenjÃ« GjatÃ« Anusvara" 
+    7408 "Vedic ShenjÃ« Rthang GjatÃ« Anusvara" 
+    7409 "Vedic ShenjÃ« Anusvara Ubhayato Mukha" 
+    7410 "Vedic ShenjÃ« Ardhavisarga" 
+    7411 "Vedic ShenjÃ« Rrotulluar Ardhavisarga" 
+    7412 "Vedic Tone Candra Lart" 
+    7413 "Vedic ShenjÃ« Jihvamuliya" 
+    7414 "Vedic ShenjÃ« Upadhmaniya" 
+    7424 "Latin ShkronjÃ« e VogÃ«l e Madhe A" 
+    7425 "Latin ShkronjÃ« e VogÃ«l e Madhe Ae" 
+    7426 "ShkronjÃ« e VogÃ«l Latine Kthyer Ae" 
+    7427 "Latin ShkronjÃ« e VogÃ«l e Madhe Mbrojtur B" 
+    7428 "Latin ShkronjÃ« e VogÃ«l e Madhe C" 
+    7429 "Latin ShkronjÃ« e VogÃ«l e Madhe D" 
+    7430 "Latin ShkronjÃ« e VogÃ«l e Madhe Eth" 
+    7431 "Latin ShkronjÃ« e VogÃ«l e Madhe E" 
+    7432 "ShkronjÃ« e VogÃ«l Latine Kthyer Hap E" 
+    7433 "ShkronjÃ« e VogÃ«l Latine Kthyer I" 
+    7434 "Latin ShkronjÃ« e VogÃ«l e Madhe J" 
+    7435 "Latin ShkronjÃ« e VogÃ«l e Madhe K" 
+    7436 "Latin ShkronjÃ« e VogÃ«l e Madhe L Me Goditje" 
+    7437 "Latin ShkronjÃ« e VogÃ«l e Madhe M" 
+    7438 "Latin ShkronjÃ« e VogÃ«l e Madhe KundÃ«rt N" 
+    7439 "Latin ShkronjÃ« e VogÃ«l e Madhe O" 
+    7440 "Latin ShkronjÃ« e VogÃ«l e Madhe Hap O" 
+    7441 "ShkronjÃ« e VogÃ«l Latine Anash O" 
+    7442 "ShkronjÃ« e VogÃ«l Latine Anash Hap O" 
+    7443 "ShkronjÃ« e VogÃ«l Latine Anash O Me Goditje" 
+    7444 "ShkronjÃ« e VogÃ«l Latine Kthyer Oe" 
+    7445 "Latin ShkronjÃ« e VogÃ«l e Madhe Ou" 
+    7446 "ShkronjÃ« e VogÃ«l Latine SipÃ«rm GjysmÃ« O" 
+    7447 "ShkronjÃ« e VogÃ«l Latine Fund GjysmÃ« O" 
+    7448 "Latin ShkronjÃ« e VogÃ«l e Madhe P" 
+    7449 "Latin ShkronjÃ« e VogÃ«l e Madhe KundÃ«rt R" 
+    7450 "Latin ShkronjÃ« e VogÃ«l e Madhe Kthyer R" 
+    7451 "Latin ShkronjÃ« e VogÃ«l e Madhe T" 
+    7452 "Latin ShkronjÃ« e VogÃ«l e Madhe U" 
+    7453 "ShkronjÃ« e VogÃ«l Latine Anash U" 
+    7454 "ShkronjÃ« e VogÃ«l Latine Anash Diaeresized U" 
+    7455 "ShkronjÃ« e VogÃ«l Latine Anash Kthyer M" 
+    7456 "Latin ShkronjÃ« e VogÃ«l e Madhe V" 
+    7457 "Latin ShkronjÃ« e VogÃ«l e Madhe W" 
+    7458 "Latin ShkronjÃ« e VogÃ«l e Madhe Z" 
+    7459 "Latin ShkronjÃ« e VogÃ«l e Madhe Ezh" 
+    7460 "Latin ShkronjÃ« Voiced Laryngeal Spirant" 
+    7461 "Latin ShkronjÃ« Ain" 
+    7462 "Greke ShkronjÃ« e VogÃ«l e Madhe Gamma" 
+    7463 "Greke ShkronjÃ« e VogÃ«l e Madhe Lamda" 
+    7464 "Greke ShkronjÃ« e VogÃ«l e Madhe Pi" 
+    7465 "Greke ShkronjÃ« e VogÃ«l e Madhe Rho" 
+    7466 "Greke ShkronjÃ« e VogÃ«l e Madhe Psi" 
+    7467 "Cyrillic ShkronjÃ« e VogÃ«l e Madhe El" 
+    7468 "Modifiko ShkronjÃ« e Madhe A" 
+    7469 "Modifiko ShkronjÃ« e Madhe Ae" 
+    7470 "Modifiko ShkronjÃ« e Madhe B" 
+    7471 "Modifiko ShkronjÃ« e Madhe Mbrojtur B" 
+    7472 "Modifiko ShkronjÃ« e Madhe D" 
+    7473 "Modifiko ShkronjÃ« e Madhe E" 
+    7474 "Modifiko ShkronjÃ« e Madhe KundÃ«rt E" 
+    7475 "Modifiko ShkronjÃ« e Madhe G" 
+    7476 "Modifiko ShkronjÃ« e Madhe H" 
+    7477 "Modifiko ShkronjÃ« e Madhe I" 
+    7478 "Modifiko ShkronjÃ« e Madhe J" 
+    7479 "Modifiko ShkronjÃ« e Madhe K" 
+    7480 "Modifiko ShkronjÃ« e Madhe L" 
+    7481 "Modifiko ShkronjÃ« e Madhe M" 
+    7482 "Modifiko ShkronjÃ« e Madhe N" 
+    7483 "Modifiko ShkronjÃ« e Madhe KundÃ«rt N" 
+    7484 "Modifiko ShkronjÃ« e Madhe O" 
+    7485 "Modifiko ShkronjÃ« e Madhe Ou" 
+    7486 "Modifiko ShkronjÃ« e Madhe P" 
+    7487 "Modifiko ShkronjÃ« e Madhe R" 
+    7488 "Modifiko ShkronjÃ« e Madhe T" 
+    7489 "Modifiko ShkronjÃ« e Madhe U" 
+    7490 "Modifiko ShkronjÃ« e Madhe W" 
+    7491 "Modifiko ShkronjÃ« e VogÃ«l A" 
+    7492 "Modifiko ShkronjÃ« e VogÃ«l Kthyer A" 
+    7493 "Modifiko ShkronjÃ« e VogÃ«l Alpha" 
+    7494 "Modifiko ShkronjÃ« e VogÃ«l Kthyer Ae" 
+    7495 "Modifiko ShkronjÃ« e VogÃ«l B" 
+    7496 "Modifiko ShkronjÃ« e VogÃ«l D" 
+    7497 "Modifiko ShkronjÃ« e VogÃ«l E" 
+    7498 "Modifiko ShkronjÃ« e VogÃ«l Schwa" 
+    7499 "Modifiko ShkronjÃ« e VogÃ«l Hap E" 
+    7500 "Modifiko ShkronjÃ« e VogÃ«l Kthyer Hap E" 
+    7501 "Modifiko ShkronjÃ« e VogÃ«l G" 
+    7502 "Modifiko ShkronjÃ« e VogÃ«l Kthyer I" 
+    7503 "Modifiko ShkronjÃ« e VogÃ«l K" 
+    7504 "Modifiko ShkronjÃ« e VogÃ«l M" 
+    7505 "Modifiko ShkronjÃ« e VogÃ«l Eng" 
+    7506 "Modifiko ShkronjÃ« e VogÃ«l O" 
+    7507 "Modifiko ShkronjÃ« e VogÃ«l Hap O" 
+    7508 "Modifiko ShkronjÃ« e VogÃ«l SipÃ«rm GjysmÃ« O" 
+    7509 "Modifiko ShkronjÃ« e VogÃ«l Fund GjysmÃ« O" 
+    7510 "Modifiko ShkronjÃ« e VogÃ«l P" 
+    7511 "Modifiko ShkronjÃ« e VogÃ«l T" 
+    7512 "Modifiko ShkronjÃ« e VogÃ«l U" 
+    7513 "Modifiko ShkronjÃ« e VogÃ«l Anash U" 
+    7514 "Modifiko ShkronjÃ« e VogÃ«l Kthyer M" 
+    7515 "Modifiko ShkronjÃ« e VogÃ«l V" 
+    7516 "Modifiko ShkronjÃ« e VogÃ«l Ain" 
+    7517 "Modifiko ShkronjÃ« e VogÃ«l Beta" 
+    7518 "Modifiko ShkronjÃ« e VogÃ«l Greke Gamma" 
+    7519 "Modifiko ShkronjÃ« e VogÃ«l Delta" 
+    7520 "Modifiko ShkronjÃ« e VogÃ«l Greke Phi" 
+    7521 "Modifiko ShkronjÃ« e VogÃ«l Chi" 
+    7522 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l I" 
+    7523 "Latine NÃ«nshkrim ShkronjÃ« e VogÃ«l R" 
+    7524 "Latine NÃ«nshkrim ShkronjÃ« e VogÃ«l U" 
+    7525 "Latine NÃ«nshkrim ShkronjÃ« e VogÃ«l V" 
+    7526 "Greke NÃ«nshkrim ShkronjÃ« e VogÃ«l Beta" 
+    7527 "Greke NÃ«nshkrim ShkronjÃ« e VogÃ«l Gamma" 
+    7528 "Greke NÃ«nshkrim ShkronjÃ« e VogÃ«l Rho" 
+    7529 "Greke NÃ«nshkrim ShkronjÃ« e VogÃ«l Phi" 
+    7530 "Greke NÃ«nshkrim ShkronjÃ« e VogÃ«l Chi" 
+    7531 "ShkronjÃ« e VogÃ«l Latine Ue" 
+    7532 "ShkronjÃ« e VogÃ«l Latine B Me Mesit TildÃ«" 
+    7533 "ShkronjÃ« e VogÃ«l Latine D Me Mesit TildÃ«" 
+    7534 "ShkronjÃ« e VogÃ«l Latine F Me Mesit TildÃ«" 
+    7535 "ShkronjÃ« e VogÃ«l Latine M Me Mesit TildÃ«" 
+    7536 "ShkronjÃ« e VogÃ«l Latine N Me Mesit TildÃ«" 
+    7537 "ShkronjÃ« e VogÃ«l Latine P Me Mesit TildÃ«" 
+    7538 "ShkronjÃ« e VogÃ«l Latine R Me Mesit TildÃ«" 
+    7539 "ShkronjÃ« e VogÃ«l Latine R Me FishKapje dhe Mesit TildÃ«" 
+    7540 "ShkronjÃ« e VogÃ«l Latine S Me Mesit TildÃ«" 
+    7541 "ShkronjÃ« e VogÃ«l Latine T Me Mesit TildÃ«" 
+    7542 "ShkronjÃ« e VogÃ«l Latine Z Me Mesit TildÃ«" 
+    7543 "ShkronjÃ« e VogÃ«l Latine Kthyer G" 
+    7544 "Modifiko ShkronjÃ« Cyrillic En" 
+    7545 "ShkronjÃ« e VogÃ«l Latine Insular G" 
+    7546 "ShkronjÃ« e VogÃ«l Latine Th Me Strikethrough" 
+    7547 "Latine e VogÃ«l ShkronjÃ« e Madhe I Me Goditje" 
+    7548 "ShkronjÃ« e VogÃ«l Latine Iota Me Goditje" 
+    7549 "ShkronjÃ« e VogÃ«l Latine P Me Goditje" 
+    7550 "Latine e VogÃ«l ShkronjÃ« e Madhe U Me Goditje" 
+    7551 "ShkronjÃ« e VogÃ«l Latine Upsilon Me Goditje" 
+    7552 "ShkronjÃ« e VogÃ«l Latine B Me Palatal Kapje" 
+    7553 "ShkronjÃ« e VogÃ«l Latine D Me Palatal Kapje" 
+    7554 "ShkronjÃ« e VogÃ«l Latine F Me Palatal Kapje" 
+    7555 "ShkronjÃ« e VogÃ«l Latine G Me Palatal Kapje" 
+    7556 "ShkronjÃ« e VogÃ«l Latine K Me Palatal Kapje" 
+    7557 "ShkronjÃ« e VogÃ«l Latine L Me Palatal Kapje" 
+    7558 "ShkronjÃ« e VogÃ«l Latine M Me Palatal Kapje" 
+    7559 "ShkronjÃ« e VogÃ«l Latine N Me Palatal Kapje" 
+    7560 "ShkronjÃ« e VogÃ«l Latine P Me Palatal Kapje" 
+    7561 "ShkronjÃ« e VogÃ«l Latine R Me Palatal Kapje" 
+    7562 "ShkronjÃ« e VogÃ«l Latine S Me Palatal Kapje" 
+    7563 "ShkronjÃ« e VogÃ«l Latine Esh Me Palatal Kapje" 
+    7564 "ShkronjÃ« e VogÃ«l Latine V Me Palatal Kapje" 
+    7565 "ShkronjÃ« e VogÃ«l Latine X Me Palatal Kapje" 
+    7566 "ShkronjÃ« e VogÃ«l Latine Z Me Palatal Kapje" 
+    7567 "ShkronjÃ« e VogÃ«l Latine A Me Retroflex Kapje" 
+    7568 "ShkronjÃ« e VogÃ«l Latine Alpha Me Retroflex Kapje" 
+    7569 "ShkronjÃ« e VogÃ«l Latine D Me Kapje dhe Bisht" 
+    7570 "ShkronjÃ« e VogÃ«l Latine E Me Retroflex Kapje" 
+    7571 "ShkronjÃ« e VogÃ«l Latine Hap E Me Retroflex Kapje" 
+    7572 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt Hap E Me Retroflex Kapje" 
+    7573 "ShkronjÃ« e VogÃ«l Latine Schwa Me Retroflex Kapje" 
+    7574 "ShkronjÃ« e VogÃ«l Latine I Me Retroflex Kapje" 
+    7575 "ShkronjÃ« e VogÃ«l Latine Hap O Me Retroflex Kapje" 
+    7576 "ShkronjÃ« e VogÃ«l Latine Esh Me Retroflex Kapje" 
+    7577 "ShkronjÃ« e VogÃ«l Latine U Me Retroflex Kapje" 
+    7578 "ShkronjÃ« e VogÃ«l Latine Ezh Me Retroflex Kapje" 
+    7579 "Modifiko ShkronjÃ« e VogÃ«l Kthyer Alpha" 
+    7580 "Modifiko ShkronjÃ« e VogÃ«l C" 
+    7581 "Modifiko ShkronjÃ« e VogÃ«l C Me PÃ«rdredhje" 
+    7582 "Modifiko ShkronjÃ« e VogÃ«l Eth" 
+    7583 "Modifiko ShkronjÃ« e VogÃ«l KundÃ«rt Hap E" 
+    7584 "Modifiko ShkronjÃ« e VogÃ«l F" 
+    7585 "Modifiko ShkronjÃ« e VogÃ«l Pa-Pika J Me Goditje" 
+    7586 "Modifiko ShkronjÃ« e VogÃ«l DorÃ«shkrim G" 
+    7587 "Modifiko ShkronjÃ« e VogÃ«l Kthyer H" 
+    7588 "Modifiko ShkronjÃ« e VogÃ«l I Me Goditje" 
+    7589 "Modifiko ShkronjÃ« e VogÃ«l Iota" 
+    7590 "Modifiko ShkronjÃ« e VogÃ«l e Madhe I" 
+    7591 "Modifiko ShkronjÃ« e VogÃ«l e Madhe I Me Goditje" 
+    7592 "Modifiko ShkronjÃ« e VogÃ«l J Me Kaluar-Bisht" 
+    7593 "Modifiko ShkronjÃ« e VogÃ«l L Me Retroflex Kapje" 
+    7594 "Modifiko ShkronjÃ« e VogÃ«l L Me Palatal Kapje" 
+    7595 "Modifiko ShkronjÃ« e VogÃ«l e Madhe L" 
+    7596 "Modifiko ShkronjÃ« e VogÃ«l M Me Kapje" 
+    7597 "Modifiko ShkronjÃ« e VogÃ«l Kthyer M Me KÃ«mbÃ« GjatÃ«" 
+    7598 "Modifiko ShkronjÃ« e VogÃ«l N Me MajtÃ« Kapje" 
+    7599 "Modifiko ShkronjÃ« e VogÃ«l N Me Retroflex Kapje" 
+    7600 "Modifiko ShkronjÃ« e VogÃ«l e Madhe N" 
+    7601 "Modifiko ShkronjÃ« e VogÃ«l Mbrojtur O" 
+    7602 "Modifiko ShkronjÃ« e VogÃ«l Phi" 
+    7603 "Modifiko ShkronjÃ« e VogÃ«l S Me Kapje" 
+    7604 "Modifiko ShkronjÃ« e VogÃ«l Esh" 
+    7605 "Modifiko ShkronjÃ« e VogÃ«l T Me Palatal Kapje" 
+    7606 "Modifiko ShkronjÃ« e VogÃ«l U Bar" 
+    7607 "Modifiko ShkronjÃ« e VogÃ«l Upsilon" 
+    7608 "Modifiko ShkronjÃ« e VogÃ«l e Madhe U" 
+    7609 "Modifiko ShkronjÃ« e VogÃ«l V Me Kapje" 
+    7610 "Modifiko ShkronjÃ« e VogÃ«l Kthyer V" 
+    7611 "Modifiko ShkronjÃ« e VogÃ«l Z" 
+    7612 "Modifiko ShkronjÃ« e VogÃ«l Z Me Retroflex Kapje" 
+    7613 "Modifiko ShkronjÃ« e VogÃ«l Z Me PÃ«rdredhje" 
+    7614 "Modifiko ShkronjÃ« e VogÃ«l Ezh" 
+    7615 "Modifiko ShkronjÃ« e VogÃ«l Theta" 
+    7616 "Kombinuar Pika-Pika RÃ«ndÃ« Theks" 
+    7617 "Kombinuar Pika-Pika Theks i MprehtÃ«" 
+    7618 "Kombinuar GjarpÃ«r PoshtÃ«" 
+    7619 "Kombinuar Pezullim ShenjÃ«" 
+    7620 "Kombinuar Macron-MprehtÃ«" 
+    7621 "Kombinuar RÃ«ndÃ«-Macron" 
+    7622 "Kombinuar Macron-RÃ«ndÃ«" 
+    7623 "Kombinuar MprehtÃ«-Macron" 
+    7624 "Kombinuar RÃ«ndÃ«-MprehtÃ«-RÃ«ndÃ«" 
+    7625 "Kombinuar MprehtÃ«-RÃ«ndÃ«-MprehtÃ«" 
+    7626 "Kombinuar ShkronjÃ« e VogÃ«l Latine R PoshtÃ«" 
+    7627 "Kombinuar Breve-Macron" 
+    7628 "Kombinuar Macron-Breve" 
+    7629 "Kombinuar Dyshe Theks-lakor Lart" 
+    7630 "Kombinuar Ogonek Lart" 
+    7631 "Kombinuar Zigzag PoshtÃ«" 
+    7632 "Kombinuar Is PoshtÃ«" 
+    7633 "Kombinuar Ur Lart" 
+    7634 "Kombinuar Us Lart" 
+    7635 "Kombinuar ShkronjÃ« e VogÃ«l Latine Rrafshuar Hap A Lart" 
+    7636 "Kombinuar ShkronjÃ« e VogÃ«l Latine Ae" 
+    7637 "Kombinuar ShkronjÃ« e VogÃ«l Latine Ao" 
+    7638 "Kombinuar ShkronjÃ« e VogÃ«l Latine Av" 
+    7639 "Kombinuar ShkronjÃ« e VogÃ«l Latine C Cedilla" 
+    7640 "Kombinuar ShkronjÃ« e VogÃ«l Latine Insular D" 
+    7641 "Kombinuar ShkronjÃ« e VogÃ«l Latine Eth" 
+    7642 "Kombinuar ShkronjÃ« e VogÃ«l Latine G" 
+    7643 "Kombinuar Latine ShkronjÃ« e VogÃ«l e Madhe G" 
+    7644 "Kombinuar ShkronjÃ« e VogÃ«l Latine K" 
+    7645 "Kombinuar ShkronjÃ« e VogÃ«l Latine L" 
+    7646 "Kombinuar Latine ShkronjÃ« e VogÃ«l e Madhe L" 
+    7647 "Kombinuar Latine ShkronjÃ« e VogÃ«l e Madhe M" 
+    7648 "Kombinuar ShkronjÃ« e VogÃ«l Latine N" 
+    7649 "Kombinuar Latine ShkronjÃ« e VogÃ«l e Madhe N" 
+    7650 "Kombinuar Latine ShkronjÃ« e VogÃ«l e Madhe R" 
+    7651 "Kombinuar ShkronjÃ« e VogÃ«l Latine R Rotunda" 
+    7652 "Kombinuar ShkronjÃ« e VogÃ«l Latine S" 
+    7653 "Kombinuar ShkronjÃ« e VogÃ«l Latine GjatÃ« S" 
+    7654 "Kombinuar ShkronjÃ« e VogÃ«l Latine Z" 
+    7676 "Kombinuar Dyshe Kthyer Breve PoshtÃ«" 
+    7677 "Kombinuar Pothuajse e BarabartÃ« Me PoshtÃ«" 
+    7678 "Kombinuar MajtÃ« kokÃ«-Shigjete Lart" 
+    7679 "Kombinuar DjathtÃ« kokÃ«-Shigjete dhe PoshtÃ« kokÃ«-Shigjete PoshtÃ«" 
+    7680 "ShkronjÃ« e Madhe Latine A Me Rreth PoshtÃ«" 
+    7681 "ShkronjÃ« e VogÃ«l Latine A Me Rreth PoshtÃ«" 
+    7682 "ShkronjÃ« e Madhe Latine B Me PikÃ« Mbi" 
+    7683 "ShkronjÃ« e VogÃ«l Latine B Me PikÃ« Mbi" 
+    7684 "ShkronjÃ« e Madhe Latine B Me PikÃ« PoshtÃ«" 
+    7685 "ShkronjÃ« e VogÃ«l Latine B Me PikÃ« PoshtÃ«" 
+    7686 "ShkronjÃ« e Madhe Latine B Me LinjÃ« PoshtÃ«" 
+    7687 "ShkronjÃ« e VogÃ«l Latine B Me LinjÃ« PoshtÃ«" 
+    7688 "ShkronjÃ« e Madhe Latine C Me Cedilla dhe MprehtÃ«" 
+    7689 "ShkronjÃ« e VogÃ«l Latine C Me Cedilla dhe MprehtÃ«" 
+    7690 "ShkronjÃ« e Madhe Latine D Me PikÃ« Mbi" 
+    7691 "ShkronjÃ« e VogÃ«l Latine D Me PikÃ« Mbi" 
+    7692 "ShkronjÃ« e Madhe Latine D Me PikÃ« PoshtÃ«" 
+    7693 "ShkronjÃ« e VogÃ«l Latine D Me PikÃ« PoshtÃ«" 
+    7694 "ShkronjÃ« e Madhe Latine D Me LinjÃ« PoshtÃ«" 
+    7695 "ShkronjÃ« e VogÃ«l Latine D Me LinjÃ« PoshtÃ«" 
+    7696 "ShkronjÃ« e Madhe Latine D Me Cedilla" 
+    7697 "ShkronjÃ« e VogÃ«l Latine D Me Cedilla" 
+    7698 "ShkronjÃ« e Madhe Latine D Me Theks-lakor PoshtÃ«" 
+    7699 "ShkronjÃ« e VogÃ«l Latine D Me Theks-lakor PoshtÃ«" 
+    7700 "ShkronjÃ« e Madhe Latine E Me Macron dhe RÃ«ndÃ«" 
+    7701 "ShkronjÃ« e VogÃ«l Latine E Me Macron dhe RÃ«ndÃ«" 
+    7702 "ShkronjÃ« e Madhe Latine E Me Macron dhe MprehtÃ«" 
+    7703 "ShkronjÃ« e VogÃ«l Latine E Me Macron dhe MprehtÃ«" 
+    7704 "ShkronjÃ« e Madhe Latine E Me Theks-lakor PoshtÃ«" 
+    7705 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor PoshtÃ«" 
+    7706 "ShkronjÃ« e Madhe Latine E Me TildÃ« PoshtÃ«" 
+    7707 "ShkronjÃ« e VogÃ«l Latine E Me TildÃ« PoshtÃ«" 
+    7708 "ShkronjÃ« e Madhe Latine E Me Cedilla dhe Breve" 
+    7709 "ShkronjÃ« e VogÃ«l Latine E Me Cedilla dhe Breve" 
+    7710 "ShkronjÃ« e Madhe Latine F Me PikÃ« Mbi" 
+    7711 "ShkronjÃ« e VogÃ«l Latine F Me PikÃ« Mbi" 
+    7712 "ShkronjÃ« e Madhe Latine G Me Macron" 
+    7713 "ShkronjÃ« e VogÃ«l Latine G Me Macron" 
+    7714 "ShkronjÃ« e Madhe Latine H Me PikÃ« Mbi" 
+    7715 "ShkronjÃ« e VogÃ«l Latine H Me PikÃ« Mbi" 
+    7716 "ShkronjÃ« e Madhe Latine H Me PikÃ« PoshtÃ«" 
+    7717 "ShkronjÃ« e VogÃ«l Latine H Me PikÃ« PoshtÃ«" 
+    7718 "ShkronjÃ« e Madhe Latine H Me Diaeresis" 
+    7719 "ShkronjÃ« e VogÃ«l Latine H Me Diaeresis" 
+    7720 "ShkronjÃ« e Madhe Latine H Me Cedilla" 
+    7721 "ShkronjÃ« e VogÃ«l Latine H Me Cedilla" 
+    7722 "ShkronjÃ« e Madhe Latine H Me Breve PoshtÃ«" 
+    7723 "ShkronjÃ« e VogÃ«l Latine H Me Breve PoshtÃ«" 
+    7724 "ShkronjÃ« e Madhe Latine I Me TildÃ« PoshtÃ«" 
+    7725 "ShkronjÃ« e VogÃ«l Latine I Me TildÃ« PoshtÃ«" 
+    7726 "ShkronjÃ« e Madhe Latine I Me Diaeresis dhe MprehtÃ«" 
+    7727 "ShkronjÃ« e VogÃ«l Latine I Me Diaeresis dhe MprehtÃ«" 
+    7728 "ShkronjÃ« e Madhe Latine K Me MprehtÃ«" 
+    7729 "ShkronjÃ« e VogÃ«l Latine K Me MprehtÃ«" 
+    7730 "ShkronjÃ« e Madhe Latine K Me PikÃ« PoshtÃ«" 
+    7731 "ShkronjÃ« e VogÃ«l Latine K Me PikÃ« PoshtÃ«" 
+    7732 "ShkronjÃ« e Madhe Latine K Me LinjÃ« PoshtÃ«" 
+    7733 "ShkronjÃ« e VogÃ«l Latine K Me LinjÃ« PoshtÃ«" 
+    7734 "ShkronjÃ« e Madhe Latine L Me PikÃ« PoshtÃ«" 
+    7735 "ShkronjÃ« e VogÃ«l Latine L Me PikÃ« PoshtÃ«" 
+    7736 "ShkronjÃ« e Madhe Latine L Me PikÃ« PoshtÃ« dhe Macron" 
+    7737 "ShkronjÃ« e VogÃ«l Latine L Me PikÃ« PoshtÃ« dhe Macron" 
+    7738 "ShkronjÃ« e Madhe Latine L Me LinjÃ« PoshtÃ«" 
+    7739 "ShkronjÃ« e VogÃ«l Latine L Me LinjÃ« PoshtÃ«" 
+    7740 "ShkronjÃ« e Madhe Latine L Me Theks-lakor PoshtÃ«" 
+    7741 "ShkronjÃ« e VogÃ«l Latine L Me Theks-lakor PoshtÃ«" 
+    7742 "ShkronjÃ« e Madhe Latine M Me MprehtÃ«" 
+    7743 "ShkronjÃ« e VogÃ«l Latine M Me MprehtÃ«" 
+    7744 "ShkronjÃ« e Madhe Latine M Me PikÃ« Mbi" 
+    7745 "ShkronjÃ« e VogÃ«l Latine M Me PikÃ« Mbi" 
+    7746 "ShkronjÃ« e Madhe Latine M Me PikÃ« PoshtÃ«" 
+    7747 "ShkronjÃ« e VogÃ«l Latine M Me PikÃ« PoshtÃ«" 
+    7748 "ShkronjÃ« e Madhe Latine N Me PikÃ« Mbi" 
+    7749 "ShkronjÃ« e VogÃ«l Latine N Me PikÃ« Mbi" 
+    7750 "ShkronjÃ« e Madhe Latine N Me PikÃ« PoshtÃ«" 
+    7751 "ShkronjÃ« e VogÃ«l Latine N Me PikÃ« PoshtÃ«" 
+    7752 "ShkronjÃ« e Madhe Latine N Me LinjÃ« PoshtÃ«" 
+    7753 "ShkronjÃ« e VogÃ«l Latine N Me LinjÃ« PoshtÃ«" 
+    7754 "ShkronjÃ« e Madhe Latine N Me Theks-lakor PoshtÃ«" 
+    7755 "ShkronjÃ« e VogÃ«l Latine N Me Theks-lakor PoshtÃ«" 
+    7756 "ShkronjÃ« e Madhe Latine O Me TildÃ« dhe MprehtÃ«" 
+    7757 "ShkronjÃ« e VogÃ«l Latine O Me TildÃ« dhe MprehtÃ«" 
+    7758 "ShkronjÃ« e Madhe Latine O Me TildÃ« dhe Diaeresis" 
+    7759 "ShkronjÃ« e VogÃ«l Latine O Me TildÃ« dhe Diaeresis" 
+    7760 "ShkronjÃ« e Madhe Latine O Me Macron dhe RÃ«ndÃ«" 
+    7761 "ShkronjÃ« e VogÃ«l Latine O Me Macron dhe RÃ«ndÃ«" 
+    7762 "ShkronjÃ« e Madhe Latine O Me Macron dhe MprehtÃ«" 
+    7763 "ShkronjÃ« e VogÃ«l Latine O Me Macron dhe MprehtÃ«" 
+    7764 "ShkronjÃ« e Madhe Latine P Me MprehtÃ«" 
+    7765 "ShkronjÃ« e VogÃ«l Latine P Me MprehtÃ«" 
+    7766 "ShkronjÃ« e Madhe Latine P Me PikÃ« Mbi" 
+    7767 "ShkronjÃ« e VogÃ«l Latine P Me PikÃ« Mbi" 
+    7768 "ShkronjÃ« e Madhe Latine R Me PikÃ« Mbi" 
+    7769 "ShkronjÃ« e VogÃ«l Latine R Me PikÃ« Mbi" 
+    7770 "ShkronjÃ« e Madhe Latine R Me PikÃ« PoshtÃ«" 
+    7771 "ShkronjÃ« e VogÃ«l Latine R Me PikÃ« PoshtÃ«" 
+    7772 "ShkronjÃ« e Madhe Latine R Me PikÃ« PoshtÃ« dhe Macron" 
+    7773 "ShkronjÃ« e VogÃ«l Latine R Me PikÃ« PoshtÃ« dhe Macron" 
+    7774 "ShkronjÃ« e Madhe Latine R Me LinjÃ« PoshtÃ«" 
+    7775 "ShkronjÃ« e VogÃ«l Latine R Me LinjÃ« PoshtÃ«" 
+    7776 "ShkronjÃ« e Madhe Latine S Me PikÃ« Mbi" 
+    7777 "ShkronjÃ« e VogÃ«l Latine S Me PikÃ« Mbi" 
+    7778 "ShkronjÃ« e Madhe Latine S Me PikÃ« PoshtÃ«" 
+    7779 "ShkronjÃ« e VogÃ«l Latine S Me PikÃ« PoshtÃ«" 
+    7780 "ShkronjÃ« e Madhe Latine S Me MprehtÃ« dhe PikÃ« Mbi" 
+    7781 "ShkronjÃ« e VogÃ«l Latine S Me MprehtÃ« dhe PikÃ« Mbi" 
+    7782 "ShkronjÃ« e Madhe Latine S Me Caron dhe PikÃ« Mbi" 
+    7783 "ShkronjÃ« e VogÃ«l Latine S Me Caron dhe PikÃ« Mbi" 
+    7784 "ShkronjÃ« e Madhe Latine S Me PikÃ« PoshtÃ« dhe PikÃ« Mbi" 
+    7785 "ShkronjÃ« e VogÃ«l Latine S Me PikÃ« PoshtÃ« dhe PikÃ« Mbi" 
+    7786 "ShkronjÃ« e Madhe Latine T Me PikÃ« Mbi" 
+    7787 "ShkronjÃ« e VogÃ«l Latine T Me PikÃ« Mbi" 
+    7788 "ShkronjÃ« e Madhe Latine T Me PikÃ« PoshtÃ«" 
+    7789 "ShkronjÃ« e VogÃ«l Latine T Me PikÃ« PoshtÃ«" 
+    7790 "ShkronjÃ« e Madhe Latine T Me LinjÃ« PoshtÃ«" 
+    7791 "ShkronjÃ« e VogÃ«l Latine T Me LinjÃ« PoshtÃ«" 
+    7792 "ShkronjÃ« e Madhe Latine T Me Theks-lakor PoshtÃ«" 
+    7793 "ShkronjÃ« e VogÃ«l Latine T Me Theks-lakor PoshtÃ«" 
+    7794 "ShkronjÃ« e Madhe Latine U Me Diaeresis PoshtÃ«" 
+    7795 "ShkronjÃ« e VogÃ«l Latine U Me Diaeresis PoshtÃ«" 
+    7796 "ShkronjÃ« e Madhe Latine U Me TildÃ« PoshtÃ«" 
+    7797 "ShkronjÃ« e VogÃ«l Latine U Me TildÃ« PoshtÃ«" 
+    7798 "ShkronjÃ« e Madhe Latine U Me Theks-lakor PoshtÃ«" 
+    7799 "ShkronjÃ« e VogÃ«l Latine U Me Theks-lakor PoshtÃ«" 
+    7800 "ShkronjÃ« e Madhe Latine U Me TildÃ« dhe MprehtÃ«" 
+    7801 "ShkronjÃ« e VogÃ«l Latine U Me TildÃ« dhe MprehtÃ«" 
+    7802 "ShkronjÃ« e Madhe Latine U Me Macron dhe Diaeresis" 
+    7803 "ShkronjÃ« e VogÃ«l Latine U Me Macron dhe Diaeresis" 
+    7804 "ShkronjÃ« e Madhe Latine V Me TildÃ«" 
+    7805 "ShkronjÃ« e VogÃ«l Latine V Me TildÃ«" 
+    7806 "ShkronjÃ« e Madhe Latine V Me PikÃ« PoshtÃ«" 
+    7807 "ShkronjÃ« e VogÃ«l Latine V Me PikÃ« PoshtÃ«" 
+    7808 "ShkronjÃ« e Madhe Latine W Me RÃ«ndÃ«" 
+    7809 "ShkronjÃ« e VogÃ«l Latine W Me RÃ«ndÃ«" 
+    7810 "ShkronjÃ« e Madhe Latine W Me MprehtÃ«" 
+    7811 "ShkronjÃ« e VogÃ«l Latine W Me MprehtÃ«" 
+    7812 "ShkronjÃ« e Madhe Latine W Me Diaeresis" 
+    7813 "ShkronjÃ« e VogÃ«l Latine W Me Diaeresis" 
+    7814 "ShkronjÃ« e Madhe Latine W Me PikÃ« Mbi" 
+    7815 "ShkronjÃ« e VogÃ«l Latine W Me PikÃ« Mbi" 
+    7816 "ShkronjÃ« e Madhe Latine W Me PikÃ« PoshtÃ«" 
+    7817 "ShkronjÃ« e VogÃ«l Latine W Me PikÃ« PoshtÃ«" 
+    7818 "ShkronjÃ« e Madhe Latine X Me PikÃ« Mbi" 
+    7819 "ShkronjÃ« e VogÃ«l Latine X Me PikÃ« Mbi" 
+    7820 "ShkronjÃ« e Madhe Latine X Me Diaeresis" 
+    7821 "ShkronjÃ« e VogÃ«l Latine X Me Diaeresis" 
+    7822 "ShkronjÃ« e Madhe Latine Y Me PikÃ« Mbi" 
+    7823 "ShkronjÃ« e VogÃ«l Latine Y Me PikÃ« Mbi" 
+    7824 "ShkronjÃ« e Madhe Latine Z Me Theks-lakor" 
+    7825 "ShkronjÃ« e VogÃ«l Latine Z Me Theks-lakor" 
+    7826 "ShkronjÃ« e Madhe Latine Z Me PikÃ« PoshtÃ«" 
+    7827 "ShkronjÃ« e VogÃ«l Latine Z Me PikÃ« PoshtÃ«" 
+    7828 "ShkronjÃ« e Madhe Latine Z Me LinjÃ« PoshtÃ«" 
+    7829 "ShkronjÃ« e VogÃ«l Latine Z Me LinjÃ« PoshtÃ«" 
+    7830 "ShkronjÃ« e VogÃ«l Latine H Me LinjÃ« PoshtÃ«" 
+    7831 "ShkronjÃ« e VogÃ«l Latine T Me Diaeresis" 
+    7832 "ShkronjÃ« e VogÃ«l Latine W Me Rreth Mbi" 
+    7833 "ShkronjÃ« e VogÃ«l Latine Y Me Rreth Mbi" 
+    7834 "ShkronjÃ« e VogÃ«l Latine A Me DjathtÃ« GjysmÃ« Rreth" 
+    7835 "ShkronjÃ« e VogÃ«l Latine GjatÃ« S Me PikÃ« Mbi" 
+    7836 "ShkronjÃ« e VogÃ«l Latine GjatÃ« S Me Diagonal Goditje" 
+    7837 "ShkronjÃ« e VogÃ«l Latine GjatÃ« S Me Lart Goditje" 
+    7838 "ShkronjÃ« e Madhe Latine FortÃ« S" 
+    7839 "ShkronjÃ« e VogÃ«l Latine Delta" 
+    7840 "ShkronjÃ« e Madhe Latine A Me PikÃ« PoshtÃ«" 
+    7841 "ShkronjÃ« e VogÃ«l Latine A Me PikÃ« PoshtÃ«" 
+    7842 "ShkronjÃ« e Madhe Latine A Me Kapje Lart" 
+    7843 "ShkronjÃ« e VogÃ«l Latine A Me Kapje Lart" 
+    7844 "ShkronjÃ« e Madhe Latine A Me Theks-lakor dhe MprehtÃ«" 
+    7845 "ShkronjÃ« e VogÃ«l Latine A Me Theks-lakor dhe MprehtÃ«" 
+    7846 "ShkronjÃ« e Madhe Latine A Me Theks-lakor dhe RÃ«ndÃ«" 
+    7847 "ShkronjÃ« e VogÃ«l Latine A Me Theks-lakor dhe RÃ«ndÃ«" 
+    7848 "ShkronjÃ« e Madhe Latine A Me Theks-lakor dhe Kapje Lart" 
+    7849 "ShkronjÃ« e VogÃ«l Latine A Me Theks-lakor dhe Kapje Lart" 
+    7850 "ShkronjÃ« e Madhe Latine A Me Theks-lakor dhe TildÃ«" 
+    7851 "ShkronjÃ« e VogÃ«l Latine A Me Theks-lakor dhe TildÃ«" 
+    7852 "ShkronjÃ« e Madhe Latine A Me Theks-lakor dhe PikÃ« PoshtÃ«" 
+    7853 "ShkronjÃ« e VogÃ«l Latine A Me Theks-lakor dhe PikÃ« PoshtÃ«" 
+    7854 "ShkronjÃ« e Madhe Latine A Me Breve dhe MprehtÃ«" 
+    7855 "ShkronjÃ« e VogÃ«l Latine A Me Breve dhe MprehtÃ«" 
+    7856 "ShkronjÃ« e Madhe Latine A Me Breve dhe RÃ«ndÃ«" 
+    7857 "ShkronjÃ« e VogÃ«l Latine A Me Breve dhe RÃ«ndÃ«" 
+    7858 "ShkronjÃ« e Madhe Latine A Me Breve dhe Kapje Lart" 
+    7859 "ShkronjÃ« e VogÃ«l Latine A Me Breve dhe Kapje Lart" 
+    7860 "ShkronjÃ« e Madhe Latine A Me Breve dhe TildÃ«" 
+    7861 "ShkronjÃ« e VogÃ«l Latine A Me Breve dhe TildÃ«" 
+    7862 "ShkronjÃ« e Madhe Latine A Me Breve dhe PikÃ« PoshtÃ«" 
+    7863 "ShkronjÃ« e VogÃ«l Latine A Me Breve dhe PikÃ« PoshtÃ«" 
+    7864 "ShkronjÃ« e Madhe Latine E Me PikÃ« PoshtÃ«" 
+    7865 "ShkronjÃ« e VogÃ«l Latine E Me PikÃ« PoshtÃ«" 
+    7866 "ShkronjÃ« e Madhe Latine E Me Kapje Lart" 
+    7867 "ShkronjÃ« e VogÃ«l Latine E Me Kapje Lart" 
+    7868 "ShkronjÃ« e Madhe Latine E Me TildÃ«" 
+    7869 "ShkronjÃ« e VogÃ«l Latine E Me TildÃ«" 
+    7870 "ShkronjÃ« e Madhe Latine E Me Theks-lakor dhe MprehtÃ«" 
+    7871 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor dhe MprehtÃ«" 
+    7872 "ShkronjÃ« e Madhe Latine E Me Theks-lakor dhe RÃ«ndÃ«" 
+    7873 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor dhe RÃ«ndÃ«" 
+    7874 "ShkronjÃ« e Madhe Latine E Me Theks-lakor dhe Kapje Lart" 
+    7875 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor dhe Kapje Lart" 
+    7876 "ShkronjÃ« e Madhe Latine E Me Theks-lakor dhe TildÃ«" 
+    7877 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor dhe TildÃ«" 
+    7878 "ShkronjÃ« e Madhe Latine E Me Theks-lakor dhe PikÃ« PoshtÃ«" 
+    7879 "ShkronjÃ« e VogÃ«l Latine E Me Theks-lakor dhe PikÃ« PoshtÃ«" 
+    7880 "ShkronjÃ« e Madhe Latine I Me Kapje Lart" 
+    7881 "ShkronjÃ« e VogÃ«l Latine I Me Kapje Lart" 
+    7882 "ShkronjÃ« e Madhe Latine I Me PikÃ« PoshtÃ«" 
+    7883 "ShkronjÃ« e VogÃ«l Latine I Me PikÃ« PoshtÃ«" 
+    7884 "ShkronjÃ« e Madhe Latine O Me PikÃ« PoshtÃ«" 
+    7885 "ShkronjÃ« e VogÃ«l Latine O Me PikÃ« PoshtÃ«" 
+    7886 "ShkronjÃ« e Madhe Latine O Me Kapje Lart" 
+    7887 "ShkronjÃ« e VogÃ«l Latine O Me Kapje Lart" 
+    7888 "ShkronjÃ« e Madhe Latine O Me Theks-lakor dhe MprehtÃ«" 
+    7889 "ShkronjÃ« e VogÃ«l Latine O Me Theks-lakor dhe MprehtÃ«" 
+    7890 "ShkronjÃ« e Madhe Latine O Me Theks-lakor dhe RÃ«ndÃ«" 
+    7891 "ShkronjÃ« e VogÃ«l Latine O Me Theks-lakor dhe RÃ«ndÃ«" 
+    7892 "ShkronjÃ« e Madhe Latine O Me Theks-lakor dhe Kapje Lart" 
+    7893 "ShkronjÃ« e VogÃ«l Latine O Me Theks-lakor dhe Kapje Lart" 
+    7894 "ShkronjÃ« e Madhe Latine O Me Theks-lakor dhe TildÃ«" 
+    7895 "ShkronjÃ« e VogÃ«l Latine O Me Theks-lakor dhe TildÃ«" 
+    7896 "ShkronjÃ« e Madhe Latine O Me Theks-lakor dhe PikÃ« PoshtÃ«" 
+    7897 "ShkronjÃ« e VogÃ«l Latine O Me Theks-lakor dhe PikÃ« PoshtÃ«" 
+    7898 "ShkronjÃ« e Madhe Latine O Me Bri dhe MprehtÃ«" 
+    7899 "ShkronjÃ« e VogÃ«l Latine O Me Bri dhe MprehtÃ«" 
+    7900 "ShkronjÃ« e Madhe Latine O Me Bri dhe RÃ«ndÃ«" 
+    7901 "ShkronjÃ« e VogÃ«l Latine O Me Bri dhe RÃ«ndÃ«" 
+    7902 "ShkronjÃ« e Madhe Latine O Me Bri dhe Kapje Lart" 
+    7903 "ShkronjÃ« e VogÃ«l Latine O Me Bri dhe Kapje Lart" 
+    7904 "ShkronjÃ« e Madhe Latine O Me Bri dhe TildÃ«" 
+    7905 "ShkronjÃ« e VogÃ«l Latine O Me Bri dhe TildÃ«" 
+    7906 "ShkronjÃ« e Madhe Latine O Me Bri dhe PikÃ« PoshtÃ«" 
+    7907 "ShkronjÃ« e VogÃ«l Latine O Me Bri dhe PikÃ« PoshtÃ«" 
+    7908 "ShkronjÃ« e Madhe Latine U Me PikÃ« PoshtÃ«" 
+    7909 "ShkronjÃ« e VogÃ«l Latine U Me PikÃ« PoshtÃ«" 
+    7910 "ShkronjÃ« e Madhe Latine U Me Kapje Lart" 
+    7911 "ShkronjÃ« e VogÃ«l Latine U Me Kapje Lart" 
+    7912 "ShkronjÃ« e Madhe Latine U Me Bri dhe MprehtÃ«" 
+    7913 "ShkronjÃ« e VogÃ«l Latine U Me Bri dhe MprehtÃ«" 
+    7914 "ShkronjÃ« e Madhe Latine U Me Bri dhe RÃ«ndÃ«" 
+    7915 "ShkronjÃ« e VogÃ«l Latine U Me Bri dhe RÃ«ndÃ«" 
+    7916 "ShkronjÃ« e Madhe Latine U Me Bri dhe Kapje Lart" 
+    7917 "ShkronjÃ« e VogÃ«l Latine U Me Bri dhe Kapje Lart" 
+    7918 "ShkronjÃ« e Madhe Latine U Me Bri dhe TildÃ«" 
+    7919 "ShkronjÃ« e VogÃ«l Latine U Me Bri dhe TildÃ«" 
+    7920 "ShkronjÃ« e Madhe Latine U Me Bri dhe PikÃ« PoshtÃ«" 
+    7921 "ShkronjÃ« e VogÃ«l Latine U Me Bri dhe PikÃ« PoshtÃ«" 
+    7922 "ShkronjÃ« e Madhe Latine Y Me RÃ«ndÃ«" 
+    7923 "ShkronjÃ« e VogÃ«l Latine Y Me RÃ«ndÃ«" 
+    7924 "ShkronjÃ« e Madhe Latine Y Me PikÃ« PoshtÃ«" 
+    7925 "ShkronjÃ« e VogÃ«l Latine Y Me PikÃ« PoshtÃ«" 
+    7926 "ShkronjÃ« e Madhe Latine Y Me Kapje Lart" 
+    7927 "ShkronjÃ« e VogÃ«l Latine Y Me Kapje Lart" 
+    7928 "ShkronjÃ« e Madhe Latine Y Me TildÃ«" 
+    7929 "ShkronjÃ« e VogÃ«l Latine Y Me TildÃ«" 
+    7930 "ShkronjÃ« e Madhe Latine Mesit-Welsh Ll" 
+    7931 "ShkronjÃ« e VogÃ«l Latine Mesit-Welsh Ll" 
+    7932 "ShkronjÃ« e Madhe Latine Mesit-Welsh V" 
+    7933 "ShkronjÃ« e VogÃ«l Latine Mesit-Welsh V" 
+    7934 "ShkronjÃ« e Madhe Latine Y Me Loop" 
+    7935 "ShkronjÃ« e VogÃ«l Latine Y Me Loop" 
+    7936 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili" 
+    7937 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia" 
+    7938 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Varia" 
+    7939 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Varia" 
+    7940 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Oxia" 
+    7941 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Oxia" 
+    7942 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Perispomeni" 
+    7943 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Perispomeni" 
+    7944 "Greke ShkronjÃ« e Madhe Alpha Me Psili" 
+    7945 "Greke ShkronjÃ« e Madhe Alpha Me Dasia" 
+    7946 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Varia" 
+    7947 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Varia" 
+    7948 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Oxia" 
+    7949 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Oxia" 
+    7950 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Perispomeni" 
+    7951 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Perispomeni" 
+    7952 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Psili" 
+    7953 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Dasia" 
+    7954 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Psili dhe Varia" 
+    7955 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Dasia dhe Varia" 
+    7956 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Psili dhe Oxia" 
+    7957 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Dasia dhe Oxia" 
+    7960 "Greke ShkronjÃ« e Madhe Epsilon Me Psili" 
+    7961 "Greke ShkronjÃ« e Madhe Epsilon Me Dasia" 
+    7962 "Greke ShkronjÃ« e Madhe Epsilon Me Psili dhe Varia" 
+    7963 "Greke ShkronjÃ« e Madhe Epsilon Me Dasia dhe Varia" 
+    7964 "Greke ShkronjÃ« e Madhe Epsilon Me Psili dhe Oxia" 
+    7965 "Greke ShkronjÃ« e Madhe Epsilon Me Dasia dhe Oxia" 
+    7968 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili" 
+    7969 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia" 
+    7970 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Varia" 
+    7971 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Varia" 
+    7972 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Oxia" 
+    7973 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Oxia" 
+    7974 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Perispomeni" 
+    7975 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Perispomeni" 
+    7976 "Greke ShkronjÃ« e Madhe Eta Me Psili" 
+    7977 "Greke ShkronjÃ« e Madhe Eta Me Dasia" 
+    7978 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Varia" 
+    7979 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Varia" 
+    7980 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Oxia" 
+    7981 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Oxia" 
+    7982 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Perispomeni" 
+    7983 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Perispomeni" 
+    7984 "Greke ShkronjÃ« e VogÃ«l Iota Me Psili" 
+    7985 "Greke ShkronjÃ« e VogÃ«l Iota Me Dasia" 
+    7986 "Greke ShkronjÃ« e VogÃ«l Iota Me Psili dhe Varia" 
+    7987 "Greke ShkronjÃ« e VogÃ«l Iota Me Dasia dhe Varia" 
+    7988 "Greke ShkronjÃ« e VogÃ«l Iota Me Psili dhe Oxia" 
+    7989 "Greke ShkronjÃ« e VogÃ«l Iota Me Dasia dhe Oxia" 
+    7990 "Greke ShkronjÃ« e VogÃ«l Iota Me Psili dhe Perispomeni" 
+    7991 "Greke ShkronjÃ« e VogÃ«l Iota Me Dasia dhe Perispomeni" 
+    7992 "Greke ShkronjÃ« e Madhe Iota Me Psili" 
+    7993 "Greke ShkronjÃ« e Madhe Iota Me Dasia" 
+    7994 "Greke ShkronjÃ« e Madhe Iota Me Psili dhe Varia" 
+    7995 "Greke ShkronjÃ« e Madhe Iota Me Dasia dhe Varia" 
+    7996 "Greke ShkronjÃ« e Madhe Iota Me Psili dhe Oxia" 
+    7997 "Greke ShkronjÃ« e Madhe Iota Me Dasia dhe Oxia" 
+    7998 "Greke ShkronjÃ« e Madhe Iota Me Psili dhe Perispomeni" 
+    7999 "Greke ShkronjÃ« e Madhe Iota Me Dasia dhe Perispomeni" 
+    8000 "Greke ShkronjÃ« e VogÃ«l Omicron Me Psili" 
+    8001 "Greke ShkronjÃ« e VogÃ«l Omicron Me Dasia" 
+    8002 "Greke ShkronjÃ« e VogÃ«l Omicron Me Psili dhe Varia" 
+    8003 "Greke ShkronjÃ« e VogÃ«l Omicron Me Dasia dhe Varia" 
+    8004 "Greke ShkronjÃ« e VogÃ«l Omicron Me Psili dhe Oxia" 
+    8005 "Greke ShkronjÃ« e VogÃ«l Omicron Me Dasia dhe Oxia" 
+    8008 "Greke ShkronjÃ« e Madhe Omicron Me Psili" 
+    8009 "Greke ShkronjÃ« e Madhe Omicron Me Dasia" 
+    8010 "Greke ShkronjÃ« e Madhe Omicron Me Psili dhe Varia" 
+    8011 "Greke ShkronjÃ« e Madhe Omicron Me Dasia dhe Varia" 
+    8012 "Greke ShkronjÃ« e Madhe Omicron Me Psili dhe Oxia" 
+    8013 "Greke ShkronjÃ« e Madhe Omicron Me Dasia dhe Oxia" 
+    8016 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Psili" 
+    8017 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dasia" 
+    8018 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Psili dhe Varia" 
+    8019 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dasia dhe Varia" 
+    8020 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Psili dhe Oxia" 
+    8021 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dasia dhe Oxia" 
+    8022 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Psili dhe Perispomeni" 
+    8023 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dasia dhe Perispomeni" 
+    8025 "Greke ShkronjÃ« e Madhe Upsilon Me Dasia" 
+    8027 "Greke ShkronjÃ« e Madhe Upsilon Me Dasia dhe Varia" 
+    8029 "Greke ShkronjÃ« e Madhe Upsilon Me Dasia dhe Oxia" 
+    8031 "Greke ShkronjÃ« e Madhe Upsilon Me Dasia dhe Perispomeni" 
+    8032 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili" 
+    8033 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia" 
+    8034 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Varia" 
+    8035 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Varia" 
+    8036 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Oxia" 
+    8037 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Oxia" 
+    8038 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Perispomeni" 
+    8039 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Perispomeni" 
+    8040 "Greke ShkronjÃ« e Madhe Omega Me Psili" 
+    8041 "Greke ShkronjÃ« e Madhe Omega Me Dasia" 
+    8042 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Varia" 
+    8043 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Varia" 
+    8044 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Oxia" 
+    8045 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Oxia" 
+    8046 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Perispomeni" 
+    8047 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Perispomeni" 
+    8048 "Greke ShkronjÃ« e VogÃ«l Alpha Me Varia" 
+    8049 "Greke ShkronjÃ« e VogÃ«l Alpha Me Oxia" 
+    8050 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Varia" 
+    8051 "Greke ShkronjÃ« e VogÃ«l Epsilon Me Oxia" 
+    8052 "Greke ShkronjÃ« e VogÃ«l Eta Me Varia" 
+    8053 "Greke ShkronjÃ« e VogÃ«l Eta Me Oxia" 
+    8054 "Greke ShkronjÃ« e VogÃ«l Iota Me Varia" 
+    8055 "Greke ShkronjÃ« e VogÃ«l Iota Me Oxia" 
+    8056 "Greke ShkronjÃ« e VogÃ«l Omicron Me Varia" 
+    8057 "Greke ShkronjÃ« e VogÃ«l Omicron Me Oxia" 
+    8058 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Varia" 
+    8059 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Oxia" 
+    8060 "Greke ShkronjÃ« e VogÃ«l Omega Me Varia" 
+    8061 "Greke ShkronjÃ« e VogÃ«l Omega Me Oxia" 
+    8064 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Ypogegrammeni" 
+    8065 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Ypogegrammeni" 
+    8066 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Varia dhe Ypogegrammeni" 
+    8067 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Varia dhe Ypogegrammeni" 
+    8068 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Oxia dhe Ypogegrammeni" 
+    8069 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Oxia dhe Ypogegrammeni" 
+    8070 "Greke ShkronjÃ« e VogÃ«l Alpha Me Psili dhe Perispomeni dhe Ypogegrammeni" 
+    8071 "Greke ShkronjÃ« e VogÃ«l Alpha Me Dasia dhe Perispomeni dhe Ypogegrammeni" 
+    8072 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Prosgegrammeni" 
+    8073 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Prosgegrammeni" 
+    8074 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Varia dhe Prosgegrammeni" 
+    8075 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Varia dhe Prosgegrammeni" 
+    8076 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Oxia dhe Prosgegrammeni" 
+    8077 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Oxia dhe Prosgegrammeni" 
+    8078 "Greke ShkronjÃ« e Madhe Alpha Me Psili dhe Perispomeni dhe Prosgegrammeni" 
+    8079 "Greke ShkronjÃ« e Madhe Alpha Me Dasia dhe Perispomeni dhe Prosgegrammeni" 
+    8080 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Ypogegrammeni" 
+    8081 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Ypogegrammeni" 
+    8082 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Varia dhe Ypogegrammeni" 
+    8083 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Varia dhe Ypogegrammeni" 
+    8084 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Oxia dhe Ypogegrammeni" 
+    8085 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Oxia dhe Ypogegrammeni" 
+    8086 "Greke ShkronjÃ« e VogÃ«l Eta Me Psili dhe Perispomeni dhe Ypogegrammeni" 
+    8087 "Greke ShkronjÃ« e VogÃ«l Eta Me Dasia dhe Perispomeni dhe Ypogegrammeni" 
+    8088 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Prosgegrammeni" 
+    8089 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Prosgegrammeni" 
+    8090 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Varia dhe Prosgegrammeni" 
+    8091 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Varia dhe Prosgegrammeni" 
+    8092 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Oxia dhe Prosgegrammeni" 
+    8093 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Oxia dhe Prosgegrammeni" 
+    8094 "Greke ShkronjÃ« e Madhe Eta Me Psili dhe Perispomeni dhe Prosgegrammeni" 
+    8095 "Greke ShkronjÃ« e Madhe Eta Me Dasia dhe Perispomeni dhe Prosgegrammeni" 
+    8096 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Ypogegrammeni" 
+    8097 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Ypogegrammeni" 
+    8098 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Varia dhe Ypogegrammeni" 
+    8099 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Varia dhe Ypogegrammeni" 
+    8100 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Oxia dhe Ypogegrammeni" 
+    8101 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Oxia dhe Ypogegrammeni" 
+    8102 "Greke ShkronjÃ« e VogÃ«l Omega Me Psili dhe Perispomeni dhe Ypogegrammeni" 
+    8103 "Greke ShkronjÃ« e VogÃ«l Omega Me Dasia dhe Perispomeni dhe Ypogegrammeni" 
+    8104 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Prosgegrammeni" 
+    8105 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Prosgegrammeni" 
+    8106 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Varia dhe Prosgegrammeni" 
+    8107 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Varia dhe Prosgegrammeni" 
+    8108 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Oxia dhe Prosgegrammeni" 
+    8109 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Oxia dhe Prosgegrammeni" 
+    8110 "Greke ShkronjÃ« e Madhe Omega Me Psili dhe Perispomeni dhe Prosgegrammeni" 
+    8111 "Greke ShkronjÃ« e Madhe Omega Me Dasia dhe Perispomeni dhe Prosgegrammeni" 
+    8112 "Greke ShkronjÃ« e VogÃ«l Alpha Me Vrachy" 
+    8113 "Greke ShkronjÃ« e VogÃ«l Alpha Me Macron" 
+    8114 "Greke ShkronjÃ« e VogÃ«l Alpha Me Varia dhe Ypogegrammeni" 
+    8115 "Greke ShkronjÃ« e VogÃ«l Alpha Me Ypogegrammeni" 
+    8116 "Greke ShkronjÃ« e VogÃ«l Alpha Me Oxia dhe Ypogegrammeni" 
+    8118 "Greke ShkronjÃ« e VogÃ«l Alpha Me Perispomeni" 
+    8119 "Greke ShkronjÃ« e VogÃ«l Alpha Me Perispomeni dhe Ypogegrammeni" 
+    8120 "Greke ShkronjÃ« e Madhe Alpha Me Vrachy" 
+    8121 "Greke ShkronjÃ« e Madhe Alpha Me Macron" 
+    8122 "Greke ShkronjÃ« e Madhe Alpha Me Varia" 
+    8123 "Greke ShkronjÃ« e Madhe Alpha Me Oxia" 
+    8124 "Greke ShkronjÃ« e Madhe Alpha Me Prosgegrammeni" 
+    8125 "Greke Koronis" 
+    8126 "Greke Prosgegrammeni" 
+    8127 "Greke Psili" 
+    8128 "Greke Perispomeni" 
+    8129 "Greke Dialytika dhe Perispomeni" 
+    8130 "Greke ShkronjÃ« e VogÃ«l Eta Me Varia dhe Ypogegrammeni" 
+    8131 "Greke ShkronjÃ« e VogÃ«l Eta Me Ypogegrammeni" 
+    8132 "Greke ShkronjÃ« e VogÃ«l Eta Me Oxia dhe Ypogegrammeni" 
+    8134 "Greke ShkronjÃ« e VogÃ«l Eta Me Perispomeni" 
+    8135 "Greke ShkronjÃ« e VogÃ«l Eta Me Perispomeni dhe Ypogegrammeni" 
+    8136 "Greke ShkronjÃ« e Madhe Epsilon Me Varia" 
+    8137 "Greke ShkronjÃ« e Madhe Epsilon Me Oxia" 
+    8138 "Greke ShkronjÃ« e Madhe Eta Me Varia" 
+    8139 "Greke ShkronjÃ« e Madhe Eta Me Oxia" 
+    8140 "Greke ShkronjÃ« e Madhe Eta Me Prosgegrammeni" 
+    8141 "Greke Psili dhe Varia" 
+    8142 "Greke Psili dhe Oxia" 
+    8143 "Greke Psili dhe Perispomeni" 
+    8144 "Greke ShkronjÃ« e VogÃ«l Iota Me Vrachy" 
+    8145 "Greke ShkronjÃ« e VogÃ«l Iota Me Macron" 
+    8146 "Greke ShkronjÃ« e VogÃ«l Iota Me Dialytika dhe Varia" 
+    8147 "Greke ShkronjÃ« e VogÃ«l Iota Me Dialytika dhe Oxia" 
+    8150 "Greke ShkronjÃ« e VogÃ«l Iota Me Perispomeni" 
+    8151 "Greke ShkronjÃ« e VogÃ«l Iota Me Dialytika dhe Perispomeni" 
+    8152 "Greke ShkronjÃ« e Madhe Iota Me Vrachy" 
+    8153 "Greke ShkronjÃ« e Madhe Iota Me Macron" 
+    8154 "Greke ShkronjÃ« e Madhe Iota Me Varia" 
+    8155 "Greke ShkronjÃ« e Madhe Iota Me Oxia" 
+    8157 "Greke Dasia dhe Varia" 
+    8158 "Greke Dasia dhe Oxia" 
+    8159 "Greke Dasia dhe Perispomeni" 
+    8160 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Vrachy" 
+    8161 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Macron" 
+    8162 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dialytika dhe Varia" 
+    8163 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dialytika dhe Oxia" 
+    8164 "Greke ShkronjÃ« e VogÃ«l Rho Me Psili" 
+    8165 "Greke ShkronjÃ« e VogÃ«l Rho Me Dasia" 
+    8166 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Perispomeni" 
+    8167 "Greke ShkronjÃ« e VogÃ«l Upsilon Me Dialytika dhe Perispomeni" 
+    8168 "Greke ShkronjÃ« e Madhe Upsilon Me Vrachy" 
+    8169 "Greke ShkronjÃ« e Madhe Upsilon Me Macron" 
+    8170 "Greke ShkronjÃ« e Madhe Upsilon Me Varia" 
+    8171 "Greke ShkronjÃ« e Madhe Upsilon Me Oxia" 
+    8172 "Greke ShkronjÃ« e Madhe Rho Me Dasia" 
+    8173 "Greke Dialytika dhe Varia" 
+    8174 "Greke Dialytika dhe Oxia" 
+    8175 "Greke Varia" 
+    8178 "Greke ShkronjÃ« e VogÃ«l Omega Me Varia dhe Ypogegrammeni" 
+    8179 "Greke ShkronjÃ« e VogÃ«l Omega Me Ypogegrammeni" 
+    8180 "Greke ShkronjÃ« e VogÃ«l Omega Me Oxia dhe Ypogegrammeni" 
+    8182 "Greke ShkronjÃ« e VogÃ«l Omega Me Perispomeni" 
+    8183 "Greke ShkronjÃ« e VogÃ«l Omega Me Perispomeni dhe Ypogegrammeni" 
+    8184 "Greke ShkronjÃ« e Madhe Omicron Me Varia" 
+    8185 "Greke ShkronjÃ« e Madhe Omicron Me Oxia" 
+    8186 "Greke ShkronjÃ« e Madhe Omega Me Varia" 
+    8187 "Greke ShkronjÃ« e Madhe Omega Me Oxia" 
+    8188 "Greke ShkronjÃ« e Madhe Omega Me Prosgegrammeni" 
+    8189 "Greke Oxia" 
+    8190 "Greke Dasia" 
+    8192 "En Kuadrat" 
+    8193 "Em Kuadrat" 
+    8194 "En HapÃ«sirÃ«" 
+    8195 "Em HapÃ«sirÃ«" 
+    8196 "Tre-Per-Em HapÃ«sirÃ«" 
+    8197 "KatÃ«r-Per-Em HapÃ«sirÃ«" 
+    8198 "GjashtÃ«-Per-Em HapÃ«sirÃ«" 
+    8199 "Figure HapÃ«sirÃ«" 
+    8200 "PikÃ«sim HapÃ«sirÃ«" 
+    8201 "Thin HapÃ«sirÃ«" 
+    8202 "Hair HapÃ«sirÃ«" 
+    8203 "Zero GjerÃ«si HapÃ«sirÃ«" 
+    8204 "Zero GjerÃ«si Jo-Bashkues" 
+    8205 "Zero GjerÃ«si Bashkuese" 
+    8206 "MajtÃ«-Me-DjathtÃ« ShenjÃ«" 
+    8207 "DjathtÃ«-Me-MajtÃ« ShenjÃ«" 
+    8208 "Hyphen" 
+    8209 "Jo-Thyese Hyphen" 
+    8210 "Figure Dash" 
+    8211 "En Dash" 
+    8212 "Em Dash" 
+    8213 "Horizontal TabelÃ«" 
+    8214 "Dyshe Vertikale LinjÃ«" 
+    8215 "Dyshe UlÃ«t LinjÃ«" 
+    8216 "MajtÃ« E VetÃ«m Citat ShenjÃ«" 
+    8217 "Djathtas Teke Citat ShenjÃ«" 
+    8218 "e VetÃ«m UlÃ«t-9 Citat ShenjÃ«" 
+    8219 "e VetÃ«m Lart-KundÃ«rt-9 Citat ShenjÃ«" 
+    8220 "Majtas Dyshe Citat ShenjÃ«" 
+    8221 "Djathtas Dyshe Citat ShenjÃ«" 
+    8222 "Dyshe UlÃ«t-9 Citat ShenjÃ«" 
+    8223 "Dyshe Lart-KundÃ«rt-9 Citat ShenjÃ«" 
+    8224 "KamÃ«" 
+    8225 "KamÃ« Dyshe" 
+    8226 "Plumb" 
+    8227 "TrekÃ«ndÃ«sh Plumb" 
+    8228 "NjÃ« PikÃ« UdhÃ«heqÃ«se" 
+    8229 "Dy PikÃ« UdhÃ«heqÃ«se" 
+    8230 "Horizontal Ellipsis" 
+    8231 "Hyphenation Point" 
+    8232 "LinjÃ« NdarÃ«s" 
+    8233 "Paragraph NdarÃ«s" 
+    8234 "MajtÃ«-Me-DjathtÃ« Mbjellje" 
+    8235 "DjathtÃ«-Me-MajtÃ« Mbjellje" 
+    8236 "Pop Formatim i Drejtuar" 
+    8237 "MajtÃ«-Me-DjathtÃ« Mbishkruar" 
+    8238 "DjathtÃ«-Me-MajtÃ« Mbishkruar" 
+    8239 "Kufizim Jo-Ndarje HapÃ«sirÃ«" 
+    8240 "PÃ«r NjÃ«mijÃ« ShenjÃ«" 
+    8241 "PÃ«r DhjetÃ« MijÃ« ShenjÃ«" 
+    8242 "Prime" 
+    8243 "Dyshe Prime" 
+    8244 "Trefish Prime" 
+    8245 "KundÃ«rt Prime" 
+    8246 "KundÃ«rt Dyshe Prime" 
+    8247 "KundÃ«rt Trefish Prime" 
+    8248 "Caret" 
+    8249 "E VetÃ«m MajtÃ«-Treguese KÃ«nd Citat ShenjÃ«" 
+    8250 "E VetÃ«m DjathtÃ«-Treguese KÃ«nd Citat ShenjÃ«" 
+    8251 "Reference ShenjÃ«" 
+    8252 "Dyshe Thirrje ShenjÃ«" 
+    8253 "Interrobang" 
+    8254 "Mbi-linjÃ«" 
+    8255 "NÃ«n-Krevate" 
+    8256 "Karakter Lidh" 
+    8257 "Caret Insertion Point" 
+    8258 "Asterism" 
+    8259 "Hyphen Plumb" 
+    8260 "Fraksion Slash" 
+    8261 "KllapÃ« Rrumbullake Majtas Me Quill" 
+    8262 "DjathtÃ« Katror Kllapa Me Quill" 
+    8263 "Dyshe Pyetje ShenjÃ«" 
+    8264 "Pyetje Thirrje ShenjÃ«" 
+    8265 "Thirrje Pyetje ShenjÃ«" 
+    8266 "Tironian ShenjÃ« Et" 
+    8267 "KundÃ«rt Pilcrow ShenjÃ«" 
+    8268 "E ZezÃ« Majtas Plumb" 
+    8269 "E ZezÃ« Djathtas Plumb" 
+    8270 "UlÃ«t Yll" 
+    8271 "KundÃ«rt PikÃ«presje" 
+    8272 "Mbyll" 
+    8273 "Dy Asterisks Aligned Vertikale" 
+    8274 "Komercial Minus ShenjÃ«" 
+    8275 "Swung Dash" 
+    8276 "Kthyer NÃ«n-Krevate" 
+    8277 "FUlÃ«ter PikÃ«sim ShenjÃ«" 
+    8278 "Tre PikÃ« PikÃ«sim" 
+    8279 "KatÃ«rfish Prime" 
+    8280 "KatÃ«r PikÃ« PikÃ«sim" 
+    8281 "PesÃ« PikÃ« PikÃ«sim" 
+    8282 "Dy PikÃ« PikÃ«sim" 
+    8283 "KatÃ«r PikÃ« ShenjÃ«" 
+    8284 "Pika-Pika Kryq" 
+    8285 "Tricolon" 
+    8286 "Vertikale KatÃ«r PikÃ«" 
+    8287 "Medium Matematik HapÃ«sirÃ«" 
+    8288 "FjalÃ« Bashkuese" 
+    8289 "Aplikacion Funksional" 
+    8290 "KohÃ« Padukshme" 
+    8291 "Padukshme NdarÃ«s" 
+    8292 "Padukshme Plus" 
+    8298 "PengojnÃ« Simetrike ShkÃ«mbejnÃ«" 
+    8299 "Aktivizo Simetrike ShkÃ«mbejnÃ«" 
+    8300 "PengojnÃ« Arabe FormÃ« Formim" 
+    8301 "Aktivizo Arabe FormÃ« Formim" 
+    8302 "KombÃ«tar ShifÃ«r Forma" 
+    8303 "Nominal ShifÃ«r Forma" 
+    8304 "Indeks i SipÃ«rm Zero" 
+    8305 "Indeks i SipÃ«rm ShkronjÃ« e VogÃ«l Latine I" 
+    8308 "Indeks i SipÃ«rm KatÃ«r" 
+    8309 "Indeks i SipÃ«rm PesÃ«" 
+    8310 "Indeks i SipÃ«rm GjashtÃ«" 
+    8311 "Indeks i SipÃ«rm ShtatÃ«" 
+    8312 "Indeks i SipÃ«rm TetÃ«" 
+    8313 "Indeks i SipÃ«rm NÃ«ntÃ«" 
+    8314 "Indeks i SipÃ«rm Plus ShenjÃ«" 
+    8315 "Indeks i SipÃ«rm Minus" 
+    8316 "Indeks i SipÃ«rm ShenjÃ« Barazi" 
+    8317 "Indeks i SipÃ«rm MajtÃ« KllapÃ«" 
+    8318 "Indeks i SipÃ«rm DjathtÃ« KllapÃ«" 
+    8319 "Indeks i SipÃ«rm ShkronjÃ« e VogÃ«l Latine N" 
+    8320 "NÃ«nshkrim Zero" 
+    8321 "NÃ«nshkrim NjÃ«" 
+    8322 "NÃ«nshkrim Dy" 
+    8323 "NÃ«nshkrim Tre" 
+    8324 "NÃ«nshkrim KatÃ«r" 
+    8325 "NÃ«nshkrim PesÃ«" 
+    8326 "NÃ«nshkrim GjashtÃ«" 
+    8327 "NÃ«nshkrim ShtatÃ«" 
+    8328 "NÃ«nshkrim TetÃ«" 
+    8329 "NÃ«nshkrim NÃ«ntÃ«" 
+    8330 "NÃ«nshkrim Plus ShenjÃ«" 
+    8331 "NÃ«nshkrim Minus" 
+    8332 "NÃ«nshkrim ShenjÃ« Barazi" 
+    8333 "NÃ«nshkrim MajtÃ« KllapÃ«" 
+    8334 "NÃ«nshkrim DjathtÃ« KllapÃ«" 
+    8336 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l A" 
+    8337 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l E" 
+    8338 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l O" 
+    8339 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l X" 
+    8340 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l Schwa" 
+    8341 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l H" 
+    8342 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l K" 
+    8343 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l L" 
+    8344 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l M" 
+    8345 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l N" 
+    8346 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l P" 
+    8347 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l S" 
+    8348 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l T" 
+    8352 "Euro-MonedhÃ« ShenjÃ«" 
+    8353 "Dy Pika ShenjÃ«" 
+    8354 "Cruzeiro ShenjÃ«" 
+    8355 "Franceze Frang ShenjÃ«" 
+    8356 "Lira ShenjÃ«" 
+    8357 "Mill ShenjÃ«" 
+    8358 "Naira ShenjÃ«" 
+    8359 "Peseta ShenjÃ«" 
+    8360 "Rupee ShenjÃ«" 
+    8361 "Won ShenjÃ«" 
+    8362 "E're Sheqel ShenjÃ«" 
+    8363 "Dong ShenjÃ«" 
+    8364 "Euro ShenjÃ«" 
+    8365 "Kip ShenjÃ«" 
+    8366 "Tugrik ShenjÃ«" 
+    8367 "Drachma ShenjÃ«" 
+    8368 "German Penny ShenjÃ«" 
+    8369 "Peso ShenjÃ«" 
+    8370 "Guarani ShenjÃ«" 
+    8371 "Australi ShenjÃ«" 
+    8372 "Hryvnia ShenjÃ«" 
+    8373 "Cedi ShenjÃ«" 
+    8374 "Livre Tournois ShenjÃ«" 
+    8375 "Spesmilo ShenjÃ«" 
+    8376 "Tenge ShenjÃ«" 
+    8377 "Indian Rupee ShenjÃ«" 
+    8378 "Turke Lira ShenjÃ«" 
+    8400 "Kombinuar MajtÃ« FuzhnjÃ« Lart" 
+    8401 "Kombinuar DjathtÃ« FuzhnjÃ« Lart" 
+    8402 "Kombinuar GjatÃ« Vertikale LinjÃ« Mbulim" 
+    8403 "Kombinuar ShkurtÃ«r Vertikale LinjÃ« Mbulim" 
+    8404 "Kombinuar KundÃ«r-Akrepa ShigjetÃ« Lart" 
+    8405 "Kombinuar Drejtim-Akrepa ShigjetÃ« Lart" 
+    8406 "Kombinuar MajtÃ« ShigjetÃ« Lart" 
+    8407 "Kombinuar DjathtÃ« ShigjetÃ« Lart" 
+    8408 "Kombinuar Rreth Mbulim" 
+    8409 "Kombinuar Drejtim-Akrepa Rreth Mbulim" 
+    8410 "Kombinuar KundÃ«r-Akrepa Rreth Mbulim" 
+    8411 "Kombinuar Tre PikÃ« Lart" 
+    8412 "Kombinuar KatÃ«r PikÃ« Lart" 
+    8413 "Kombinuar BashkÃ«ngjitur Rreth" 
+    8414 "Kombinuar BashkÃ«ngjitur Katror" 
+    8415 "Kombinuar BashkÃ«ngjitur Diamant" 
+    8416 "Kombinuar BashkÃ«ngjitur Rreth VizÃ«-Mbrapsht" 
+    8417 "Kombinuar Majtas Djathtas ShigjetÃ« Lart" 
+    8418 "Kombinuar BashkÃ«ngjitur Ekran" 
+    8419 "Kombinuar BashkÃ«ngjitur Keycap" 
+    8420 "Kombinuar BashkÃ«ngjitur Upward Treguese TrekÃ«ndÃ«sh" 
+    8421 "Kombinuar Kthe-Mrapsht Solidus Mbulim" 
+    8422 "Kombinuar Dyshe Vertikale Goditje Mbulim" 
+    8423 "Kombinuar Annuity Simbol" 
+    8424 "Kombinuar Trefish Underdot" 
+    8425 "Kombinuar GjerÃ« UrÃ« Lart" 
+    8426 "Kombinuar Majtas ShigjetÃ« Mbulim" 
+    8427 "Kombinuar GjatÃ« Dyshe Solidus Mbulim" 
+    8428 "Kombinuar Djathtas FuzhnjÃ« Me Gjemb TeposhtÃ«" 
+    8429 "Kombinuar Majtas FuzhnjÃ« Me Gjemb TeposhtÃ«" 
+    8430 "Kombinuar MajtÃ« ShigjetÃ« PoshtÃ«" 
+    8431 "Kombinuar DjathtÃ« ShigjetÃ« PoshtÃ«" 
+    8432 "Kombinuar Yll Lart" 
+    8448 "Llogaria e" 
+    8449 "NÃ« AdresÃ« tÃ« Subjektit" 
+    8450 "Dyshe-i Goditur e Madhe C" 
+    8451 "GradÃ« Celsius" 
+    8452 "QendÃ«r LinjÃ« Simboli" 
+    8453 "NÃ« ngarkim tÃ«" 
+    8454 "Cada Una" 
+    8455 "Euler Konstante" 
+    8456 "Skrupull" 
+    8457 "GradÃ« Fahrenheit" 
+    8458 "DorÃ«shkrim e VogÃ«l G" 
+    8459 "DorÃ«shkrim e Madhe H" 
+    8460 "e ZezÃ«-ShkronjÃ« e Madhe H" 
+    8461 "Dyshe-i Goditur e Madhe H" 
+    8462 "Planck Konstante" 
+    8463 "Planck Konstante Mbi Dy Pi" 
+    8464 "DorÃ«shkrim e Madhe I" 
+    8465 "e ZezÃ«-ShkronjÃ« e Madhe I" 
+    8466 "DorÃ«shkrim e Madhe L" 
+    8467 "DorÃ«shkrim e VogÃ«l L" 
+    8468 "L B Bar Simbol" 
+    8469 "Dyshe-i Goditur e Madhe N" 
+    8470 "ShenjÃ« NumÃ«rore" 
+    8471 "Regjistrim ZÃ«ri drejtÃ«n e autorit" 
+    8472 "DorÃ«shkrim e Madhe P" 
+    8473 "Dyshe-i Goditur e Madhe P" 
+    8474 "Dyshe-i Goditur e Madhe Q" 
+    8475 "DorÃ«shkrim e Madhe R" 
+    8476 "e ZezÃ«-ShkronjÃ« e Madhe R" 
+    8477 "Dyshe-i Goditur e Madhe R" 
+    8478 "RecetÃ« Take" 
+    8479 "PÃ«rgjigje" 
+    8480 "ShenjÃ« ShÃ«rbimi" 
+    8481 "ShenjÃ« Telefoni" 
+    8482 "ShenjÃ« Tregtie" 
+    8483 "Versicle" 
+    8484 "Dyshe-i Goditur e Madhe Z" 
+    8485 "ShenjÃ« NjÃ«she" 
+    8486 "Ohm ShenjÃ«" 
+    8487 "ShenjÃ« Ohm Kthyer" 
+    8488 "ShkronjÃ« e Madhe Z E ZezÃ« " 
+    8489 "Kthyer Greke ShkronjÃ« e VogÃ«l Iota" 
+    8490 "Kelvin ShenjÃ«" 
+    8491 "Angstrom ShenjÃ«" 
+    8492 "DorÃ«shkrim e Madhe B" 
+    8493 "e ZezÃ«-ShkronjÃ« e Madhe C" 
+    8494 "Simbol Pre-llogaritur" 
+    8495 "DorÃ«shkrim e VogÃ«l E" 
+    8496 "DorÃ«shkrim e Madhe E" 
+    8497 "DorÃ«shkrim e Madhe F" 
+    8498 "Kthyer e Madhe F" 
+    8499 "DorÃ«shkrim e Madhe M" 
+    8500 "DorÃ«shkrim e VogÃ«l O" 
+    8501 "Alef Simbol" 
+    8502 "Bet Simbol" 
+    8503 "Gimel Simbol" 
+    8504 "Dalet Simbol" 
+    8505 "Burimi Informacionit" 
+    8506 "Rrotulluar e Madhe Q" 
+    8507 "Facsimile ShenjÃ«" 
+    8508 "Dyshe-i Goditur e VogÃ«l Pi" 
+    8509 "Dyshe-i Goditur e VogÃ«l Gama" 
+    8510 "Dyshe-i Goditur e Madhe Gama" 
+    8511 "Dyshe-i Goditur e Madhe Pi" 
+    8512 "Dyshe-i Goditur N-Ary Mbledhje" 
+    8513 "Kthyer Sans-Serif e Madhe G" 
+    8514 "Kthyer Sans-Serif e Madhe L" 
+    8515 "KundÃ«rt Sans-Serif e Madhe L" 
+    8516 "Kthyer Sans-Serif e Madhe Y" 
+    8517 "Dyshe-i Goditur Italic e Madhe D" 
+    8518 "Dyshe-i Goditur Italic e VogÃ«l D" 
+    8519 "Dyshe-i Goditur Italic e VogÃ«l E" 
+    8520 "Dyshe-i Goditur Italic e VogÃ«l I" 
+    8521 "Dyshe-i Goditur Italic e VogÃ«l J" 
+    8522 "CilÃ«sime LinjÃ«" 
+    8523 "Kthyer Ampersand" 
+    8524 "PÃ«r ShenjÃ«" 
+    8525 "Aktieselskab" 
+    8526 "Kthyer e VogÃ«l F" 
+    8527 "Simbol PÃ«r Samaritan Burim" 
+    8528 "Vulgar Fraksion NjÃ« i ShtatÃ«" 
+    8529 "Vulgar Fraksion NjÃ« i NÃ«ntÃ«" 
+    8530 "Vulgar Fraksion NjÃ« i DhjetÃ«" 
+    8531 "Vulgar Fraksion NjÃ« i TretÃ«" 
+    8532 "Vulgar Fraksion Dy tÃ« TretÃ«" 
+    8533 "Vulgar Fraksion NjÃ« i PestÃ«" 
+    8534 "Vulgar Fraksion Dy tÃ« PestÃ«" 
+    8535 "Vulgar Fraksion Tre tÃ« PestÃ«" 
+    8536 "Vulgar Fraksion KatÃ«r tÃ« PestÃ«" 
+    8537 "Vulgar Fraksion NjÃ« GjashtÃ«" 
+    8538 "Vulgar Fraksion PesÃ« tÃ« GjashtÃ«" 
+    8539 "Vulgar Fraksion NjÃ« i TetÃ«" 
+    8540 "Vulgar Fraksion Tre tÃ« TetÃ«" 
+    8541 "Vulgar Fraksion PesÃ« tÃ« TetÃ«" 
+    8542 "Vulgar Fraksion ShtatÃ« tÃ« TetÃ«" 
+    8543 "Fraksion NumÃ«ratori NjÃ«" 
+    8544 "Roman NumÃ«ror NjÃ«" 
+    8545 "Roman NumÃ«ror Dy" 
+    8546 "Roman NumÃ«ror Tre" 
+    8547 "Roman NumÃ«ror KatÃ«r" 
+    8548 "Roman NumÃ«ror PesÃ«" 
+    8549 "Roman NumÃ«ror GjashtÃ«" 
+    8550 "Roman NumÃ«ror ShtatÃ«" 
+    8551 "Roman NumÃ«ror TetÃ«" 
+    8552 "Roman NumÃ«ror NÃ«ntÃ«" 
+    8553 "Roman NumÃ«ror DhjetÃ«" 
+    8554 "Roman NumÃ«ror NjÃ«mbÃ«dhjetÃ«" 
+    8555 "Roman NumÃ«ror DymbÃ«dhjetÃ«" 
+    8556 "Roman NumÃ«ror PesÃ«dhjetÃ«" 
+    8557 "Roman NumÃ«ror NjÃ« NjÃ«qind" 
+    8558 "Roman NumÃ«ror PesÃ« NjÃ«qind" 
+    8559 "Roman NumÃ«ror NjÃ« MijÃ«" 
+    8560 "e VogÃ«l Roman NumÃ«ror NjÃ«" 
+    8561 "e VogÃ«l Roman NumÃ«ror Dy" 
+    8562 "e VogÃ«l Roman NumÃ«ror Tre" 
+    8563 "e VogÃ«l Roman NumÃ«ror KatÃ«r" 
+    8564 "e VogÃ«l Roman NumÃ«ror PesÃ«" 
+    8565 "e VogÃ«l Roman NumÃ«ror GjashtÃ«" 
+    8566 "e VogÃ«l Roman NumÃ«ror ShtatÃ«" 
+    8567 "e VogÃ«l Roman NumÃ«ror TetÃ«" 
+    8568 "e VogÃ«l Roman NumÃ«ror NÃ«ntÃ«" 
+    8569 "e VogÃ«l Roman NumÃ«ror DhjetÃ«" 
+    8570 "e VogÃ«l Roman NumÃ«ror NjÃ«mbÃ«dhjetÃ«" 
+    8571 "e VogÃ«l Roman NumÃ«ror DymbÃ«dhjetÃ«" 
+    8572 "e VogÃ«l Roman NumÃ«ror PesÃ«dhjetÃ«" 
+    8573 "e VogÃ«l Roman NumÃ«ror NjÃ« NjÃ«qind" 
+    8574 "e VogÃ«l Roman NumÃ«ror PesÃ« NjÃ«qind" 
+    8575 "e VogÃ«l Roman NumÃ«ror NjÃ« MijÃ«" 
+    8576 "Roman NumÃ«ror NjÃ« MijÃ« C D" 
+    8577 "Roman NumÃ«ror PesÃ« MijÃ«" 
+    8578 "Roman NumÃ«ror DhjetÃ« MijÃ«" 
+    8579 "Roman NumÃ«ror KundÃ«rt NjÃ« NjÃ«qind" 
+    8580 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt C" 
+    8581 "Roman NumÃ«ror GjashtÃ« Late FormÃ«" 
+    8582 "Roman NumÃ«ror PesÃ«dhjetÃ« Fillim FormÃ«" 
+    8583 "Roman NumÃ«ror PesÃ«dhjetÃ« MijÃ«" 
+    8584 "Roman NumÃ«ror NjÃ« NjÃ«qind MijÃ«" 
+    8585 "Vulgar Fraksion Zero Tretat" 
+    8592 "Majtas ShigjetÃ«" 
+    8593 "PÃ«rpjetÃ« ShigjetÃ«" 
+    8594 "Djathtas ShigjetÃ«" 
+    8595 "TeposhtÃ« ShigjetÃ«" 
+    8596 "Majtas Djathtas ShigjetÃ«" 
+    8597 "Lart PoshtÃ« ShigjetÃ«" 
+    8598 "VeriperÃ«ndim ShigjetÃ«" 
+    8599 "Verilindje ShigjetÃ«" 
+    8600 "Juglindje ShigjetÃ«" 
+    8601 "Jug-PerÃ«ndim ShigjetÃ«" 
+    8602 "Majtas ShigjetÃ« Me Goditje" 
+    8603 "Djathtas ShigjetÃ« Me Goditje" 
+    8604 "Majtas ValÃ« ShigjetÃ«" 
+    8605 "Djathtas ValÃ« ShigjetÃ«" 
+    8606 "Majtas Dy KokÃ« ShigjetÃ«" 
+    8607 "PÃ«rpjetÃ« Dy KokÃ« ShigjetÃ«" 
+    8608 "Djathtas Dy KokÃ« ShigjetÃ«" 
+    8609 "TeposhtÃ« Dy KokÃ« ShigjetÃ«" 
+    8610 "Majtas ShigjetÃ« Me Bisht" 
+    8611 "Djathtas ShigjetÃ« Me Bisht" 
+    8612 "Majtas ShigjetÃ« Nga Bar" 
+    8613 "PÃ«rpjetÃ« ShigjetÃ« Nga Bar" 
+    8614 "Djathtas ShigjetÃ« Nga Bar" 
+    8615 "TeposhtÃ« ShigjetÃ« Nga Bar" 
+    8616 "Lart PoshtÃ« ShigjetÃ« Me BazÃ«" 
+    8617 "Majtas ShigjetÃ« Me Kapje" 
+    8618 "Djathtas ShigjetÃ« Me Kapje" 
+    8619 "Majtas ShigjetÃ« Me Loop" 
+    8620 "Djathtas ShigjetÃ« Me Loop" 
+    8621 "Majtas Djathtas ValÃ« ShigjetÃ«" 
+    8622 "Majtas Djathtas ShigjetÃ« Me Goditje" 
+    8623 "TeposhtÃ« Zigzag ShigjetÃ«" 
+    8624 "PÃ«rpjetÃ« ShigjetÃ« Me Tip Majtas" 
+    8625 "PÃ«rpjetÃ« ShigjetÃ« Me Tip Djathtas" 
+    8626 "TeposhtÃ« ShigjetÃ« Me Tip Majtas" 
+    8627 "TeposhtÃ« ShigjetÃ« Me Tip Djathtas" 
+    8628 "Djathtas ShigjetÃ« Me KÃ«nd TeposhtÃ«" 
+    8629 "TeposhtÃ« ShigjetÃ« Me KÃ«nd Majtas" 
+    8630 "KundÃ«r-Akrepa SipÃ«rm GjysmÃ«rreth ShigjetÃ«" 
+    8631 "Drejtim-Akrepa SipÃ«rm GjysmÃ«rreth ShigjetÃ«" 
+    8632 "VeriperÃ«ndim ShigjetÃ« Me GjatÃ« Bar" 
+    8633 "Majtas ShigjetÃ« TabelÃ« Mbi Djathtas ShigjetÃ« TabelÃ«" 
+    8634 "KundÃ«r-Akrepa Hap Rreth ShigjetÃ«" 
+    8635 "Drejtim-Akrepa Hap Rreth ShigjetÃ«" 
+    8636 "Majtas FuzhnjÃ« Me Gjemb PÃ«rpjetÃ«" 
+    8637 "Majtas FuzhnjÃ« Me Gjemb TeposhtÃ«" 
+    8638 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb Djathtas" 
+    8639 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb Majtas" 
+    8640 "Djathtas FuzhnjÃ« Me Gjemb PÃ«rpjetÃ«" 
+    8641 "Djathtas FuzhnjÃ« Me Gjemb TeposhtÃ«" 
+    8642 "TeposhtÃ« FuzhnjÃ« Me Gjemb Djathtas" 
+    8643 "TeposhtÃ« FuzhnjÃ« Me Gjemb Majtas" 
+    8644 "Djathtas ShigjetÃ« Mbi Majtas ShigjetÃ«" 
+    8645 "PÃ«rpjetÃ« ShigjetÃ« Majtas Mbi TeposhtÃ« ShigjetÃ«" 
+    8646 "Majtas ShigjetÃ« Mbi Djathtas ShigjetÃ«" 
+    8647 "Majtas Ã‡iftÃ«zohet Shigjeta" 
+    8648 "PÃ«rpjetÃ« Ã‡iftÃ«zohet Shigjeta" 
+    8649 "Djathtas Ã‡iftÃ«zohet Shigjeta" 
+    8650 "TeposhtÃ« Ã‡iftÃ«zohet Shigjeta" 
+    8651 "Majtas FuzhnjÃ« Mbi Djathtas FuzhnjÃ«" 
+    8652 "Djathtas FuzhnjÃ« Mbi Majtas FuzhnjÃ«" 
+    8653 "Majtas Dyshe ShigjetÃ« Me Goditje" 
+    8654 "MajtÃ« Djathtas Dyshe ShigjetÃ« Me Goditje" 
+    8655 "Djathtas Dyshe ShigjetÃ« Me Goditje" 
+    8656 "Majtas Dyshe ShigjetÃ«" 
+    8657 "PÃ«rpjetÃ« Dyshe ShigjetÃ«" 
+    8658 "Djathtas Dyshe ShigjetÃ«" 
+    8659 "TeposhtÃ« Dyshe ShigjetÃ«" 
+    8660 "MajtÃ« Djathtas Dyshe ShigjetÃ«" 
+    8661 "Lart PoshtÃ« Dyshe ShigjetÃ«" 
+    8662 "VeriperÃ«ndim Dyshe ShigjetÃ«" 
+    8663 "Verilindje Dyshe ShigjetÃ«" 
+    8664 "Juglindje Dyshe ShigjetÃ«" 
+    8665 "Jug-PerÃ«ndim Dyshe ShigjetÃ«" 
+    8666 "Majtas Trefish ShigjetÃ«" 
+    8667 "Djathtas Trefish ShigjetÃ«" 
+    8668 "Majtas Squiggle ShigjetÃ«" 
+    8669 "Djathtas Squiggle ShigjetÃ«" 
+    8670 "PÃ«rpjetÃ« ShigjetÃ« Me Dyshe Goditje" 
+    8671 "TeposhtÃ« ShigjetÃ« Me Dyshe Goditje" 
+    8672 "Majtas Thye ShigjetÃ«" 
+    8673 "PÃ«rpjetÃ« Thye ShigjetÃ«" 
+    8674 "Djathtas Thye ShigjetÃ«" 
+    8675 "TeposhtÃ« Thye ShigjetÃ«" 
+    8676 "Majtas ShigjetÃ« Me Bar" 
+    8677 "Djathtas ShigjetÃ« Me Bar" 
+    8678 "Majtas e BardhÃ« ShigjetÃ«" 
+    8679 "PÃ«rpjetÃ« e BardhÃ« ShigjetÃ«" 
+    8680 "Djathtas e BardhÃ« ShigjetÃ«" 
+    8681 "TeposhtÃ« e BardhÃ« ShigjetÃ«" 
+    8682 "PÃ«rpjetÃ« e BardhÃ« ShigjetÃ« Nga Bar" 
+    8683 "PÃ«rpjetÃ« e BardhÃ« ShigjetÃ« NÃ« piedestal" 
+    8684 "PÃ«rpjetÃ« e BardhÃ« ShigjetÃ« NÃ« piedestal Me Horizontal Bar" 
+    8685 "PÃ«rpjetÃ« e BardhÃ« ShigjetÃ« NÃ« piedestal Me Vertikale Bar" 
+    8686 "PÃ«rpjetÃ« e BardhÃ« Dyshe ShigjetÃ«" 
+    8687 "PÃ«rpjetÃ« e BardhÃ« Dyshe ShigjetÃ« NÃ« piedestal" 
+    8688 "Djathtas e BardhÃ« ShigjetÃ« Nga MurÃ«" 
+    8689 "VeriperÃ«ndim ShigjetÃ« Me KÃ«nd" 
+    8690 "Juglindje ShigjetÃ« Me KÃ«nd" 
+    8691 "Lart PoshtÃ« e BardhÃ« ShigjetÃ«" 
+    8692 "DjathtÃ« ShigjetÃ« Me e VogÃ«l Rreth" 
+    8693 "TeposhtÃ« ShigjetÃ« Majtas e PÃ«rpjetÃ« ShigjetÃ«" 
+    8694 "Tre Djathtas ShigjetÃ«" 
+    8695 "Majtas ShigjetÃ« Me Vertikale Goditje" 
+    8696 "Djathtas ShigjetÃ« Me Vertikale Goditje" 
+    8697 "Majtas Djathtas ShigjetÃ« Me Vertikale Goditje" 
+    8698 "Majtas ShigjetÃ« Me Dyshe Vertikale Goditje" 
+    8699 "Djathtas ShigjetÃ« Me Dyshe Vertikale Goditje" 
+    8700 "Majtas Djathtas ShigjetÃ« Me Dyshe Vertikale Goditje" 
+    8701 "Majtas Hap-KokÃ« ShigjetÃ«" 
+    8702 "Djathtas Hap-KokÃ« ShigjetÃ«" 
+    8703 "Majtas Djathtas Hap-KokÃ« ShigjetÃ«" 
+    8704 "PÃ«r All" 
+    8705 "PlotÃ«sues" 
+    8706 "Diferenciale tÃ« Pjesshme" 
+    8707 "Aty ekziston" 
+    8708 "Aty nuk ekziston" 
+    8709 "Vendosje Bosh" 
+    8710 "Rritje" 
+    8711 "Nabla" 
+    8712 "Element i" 
+    8713 "Jo An Element i" 
+    8714 "E VogÃ«l Element i" 
+    8715 "PÃ«rmban Si AnÃ«tar" 
+    8716 "Nuk PÃ«rmban si  AnÃ«tar" 
+    8717 "E VogÃ«l PÃ«rmban si AnÃ«tar" 
+    8718 "Mbarimi I provÃ«s" 
+    8719 "N-Ary Produkt" 
+    8720 "N-Ary BashkÃ«prodhimit" 
+    8721 "N-Ary Mbledhje" 
+    8722 "Minus ShenjÃ«" 
+    8723 "Minus-ose-Plus ShenjÃ«" 
+    8724 "PikÃ« Plus" 
+    8725 "VizÃ« NdarÃ«se" 
+    8726 "Set Minus" 
+    8727 "Yll Operatori" 
+    8728 "Rreth Operator" 
+    8729 "Plumb Operator" 
+    8730 "Katror Root" 
+    8731 "Cube Root" 
+    8732 "KatÃ«r Root" 
+    8733 "Proporcional PÃ«r" 
+    8734 "PafundÃ«si" 
+    8735 "DjathtÃ« KÃ«nd" 
+    8736 "KÃ«nd" 
+    8737 "KÃ«nd Matur" 
+    8738 "Sferik KÃ«nd" 
+    8739 "Ndaj" 
+    8740 "Nuk Ndan" 
+    8741 "Paralelisht me" 
+    8742 "Jo Paralelisht" 
+    8743 "Logjike dhe" 
+    8744 "Logjike ose" 
+    8745 "NdÃ«rprerje" 
+    8746 "Union" 
+    8747 "Integral" 
+    8748 "Dyshe Integral" 
+    8749 "Trefish Integral" 
+    8750 "Kontur Integral" 
+    8751 "Mbi-faqe Integral" 
+    8752 "Volume Integral" 
+    8753 "Drejtim-Akrepa Integral" 
+    8754 "Drejtim-Akrepa Kontur Integral" 
+    8755 "KundÃ«r-Akrepa Kontur Integral" 
+    8756 "Prandaj" 
+    8757 "Sepse" 
+    8758 "Proporcion" 
+    8759 "Proporcion" 
+    8760 "PikÃ« Minus" 
+    8761 "Teprim" 
+    8762 "Proporcion Gjeometrik" 
+    8763 "Homothetic" 
+    8764 "TildÃ« Operator" 
+    8765 "KundÃ«rt TildÃ«" 
+    8766 "Kthyer Dembel S" 
+    8767 "Sinus ValÃ«" 
+    8768 "KurorÃ«n e Produktit" 
+    8769 "Jo TildÃ«" 
+    8770 "Minus TildÃ«" 
+    8771 "Asymptotically I BarabartÃ« Me" 
+    8772 "Jo Asymptotically I BarabartÃ« Me" 
+    8773 "PÃ«rafÃ«rsisht I BarabartÃ« Me" 
+    8774 "PÃ«rafÃ«rsisht But Jo Faktikisht I BarabartÃ« Me" 
+    8775 "As PÃ«rafÃ«rsisht As Faktikisht I BarabartÃ« Me" 
+    8776 "Pothuajse e BarabartÃ« Me" 
+    8777 "Jo Pothuajse e BarabartÃ« Me" 
+    8778 "Pothuajse I BarabartÃ« ose I BarabartÃ« Me" 
+    8779 "Trefish TildÃ«" 
+    8780 "All I BarabartÃ« Me" 
+    8781 "BarasvlershÃ«m Me" 
+    8782 "Gjeometri Barasvlershme Me" 
+    8783 "Diferenca Midis" 
+    8784 "Afrimi nÃ« Limit" 
+    8785 "Gjeometri e BarabartÃ« Me" 
+    8786 "PÃ«rafÃ«rsisht I BarabartÃ« Me ose Imazhet e" 
+    8787 "Imazhet e ose PÃ«rafÃ«rsisht I BarabartÃ« Me" 
+    8788 "Dy Pika BarabartÃ«" 
+    8789 "BarabartÃ« Dy Pika" 
+    8790 "Rreth In I BarabartÃ« Me" 
+    8791 "Rreth I BarabartÃ« Me" 
+    8792 "Korrespondon Me" 
+    8793 "VlerÃ«sim" 
+    8794 "BaraspeshÃ« Me" 
+    8795 "Fillo BarabartÃ«" 
+    8796 "Delta I BarabartÃ« Me" 
+    8797 "I BarabartÃ« Me PÃ«rcaktim" 
+    8798 "Matur nga" 
+    8799 "Pyetje e BarabartÃ« Me" 
+    8800 "Jo I BarabartÃ« Me" 
+    8801 "Identike Me" 
+    8802 "Jo Identike Me" 
+    8803 "SaktÃ«sisht BarasvlershÃ«m Me" 
+    8804 "MÃ« pak-se ose I BarabartÃ« Me" 
+    8805 "Madhe-se ose I BarabartÃ« Me" 
+    8806 "MÃ« pak-se Mbi I BarabartÃ« Me" 
+    8807 "Madhe-se Mbi I BarabartÃ« Me" 
+    8808 "MÃ« pak-se Por Jo I BarabartÃ« Me" 
+    8809 "Madhe-se Por Jo I BarabartÃ« Me" 
+    8810 "ShumÃ« MÃ« pak-se" 
+    8811 "ShumÃ« Madhe-se" 
+    8812 "NdÃ«rmjet" 
+    8813 "Jo BarasvlershÃ«m Me" 
+    8814 "Jo MÃ« pak-se" 
+    8815 "Jo Madhe-se" 
+    8816 "As MÃ« pak-se As I BarabartÃ« Me" 
+    8817 "As Madhe-se As I BarabartÃ« Me" 
+    8818 "MÃ« pak-se ose BarasvlershÃ«m Me" 
+    8819 "Madhe-se ose BarasvlershÃ«m Me" 
+    8820 "As MÃ« pak-se As BarasvlershÃ«m Me" 
+    8821 "As Madhe-se As BarasvlershÃ«m Me" 
+    8822 "MÃ« pak-se ose Madhe-se" 
+    8823 "Madhe-se ose MÃ« pak-se" 
+    8824 "As MÃ« pak-se As Madhe-se" 
+    8825 "As Madhe-se As MÃ« pak-se" 
+    8826 "Paraprin" 
+    8827 "Sukses" 
+    8828 "Paraprin ose I BarabartÃ« Me" 
+    8829 "Sukses ose I BarabartÃ« Me" 
+    8830 "Paraprin ose BarasvlershÃ«m Me" 
+    8831 "Sukses ose BarasvlershÃ«m Me" 
+    8832 "Nuk ParaprinÃ«" 
+    8833 "Nuk Kalon" 
+    8834 "Mesin e" 
+    8835 "Mbi-vendos i" 
+    8836 "Jo NjÃ« NÃ«n-vendos i" 
+    8837 "Jo NjÃ« Mbi-vendos i"
+    8838 "NÃ«n-vendos e ose I BarabartÃ« Me" 
+    8839 "Mbi-vendos e ose I BarabartÃ« Me" 
+    8840 "As A NÃ«n-vendos e As I BarabartÃ« Me" 
+    8841 "As A Mbi-vendos e As I BarabartÃ« Me" 
+    8842 "NÃ«n-vendos e Me Jo I BarabartÃ« Me" 
+    8843 "Mbi-vendos e Me Jo I BarabartÃ« Me" 
+    8844 "ShumÃ«-Vendos" 
+    8845 "ShumÃ«-Vendos ShumÃ«funksional" 
+    8846 "ShumÃ«-Vendos Union" 
+    8847 "Katror Imazhe i" 
+    8848 "Katror Origjinale e" 
+    8849 "Katror Imazhe i ose I BarabartÃ« Me" 
+    8850 "Katror Origjinale e ose I BarabartÃ« Me" 
+    8851 "Katror Cap" 
+    8852 "Katror Cup" 
+    8853 "Rrethuar Plus" 
+    8854 "Rrethuar Minus" 
+    8855 "Rrethuar KohÃ«t" 
+    8856 "Rrethuar VizÃ« Ndarje" 
+    8857 "Rrethuar PikÃ« Operator" 
+    8858 "Rrethuar Rreth Operator" 
+    8859 "Rrethuar Yll Operator" 
+    8860 "Rrethuar BarabartÃ«" 
+    8861 "Rrethuar Dash" 
+    8862 "Katror Plus" 
+    8863 "Katror Minus" 
+    8864 "Katror KohÃ«t" 
+    8865 "Katror PikÃ« Operator" 
+    8866 "DjathtÃ« Litar" 
+    8867 "MajtÃ« Litar" 
+    8868 "PoshtÃ« Litar" 
+    8869 "Lart Litar" 
+    8870 "Pohim" 
+    8871 "Model" 
+    8872 "VÃ«rtetÃ«" 
+    8873 "ForcÃ«" 
+    8874 "Trefish Vertikale Bar DjathtÃ« Timon" 
+    8875 "Dyshe Vertikale Bar Dyshe DjathtÃ« Timon" 
+    8876 "Jo Prove" 
+    8877 "Jo VÃ«rtetÃ«" 
+    8878 "Jo Force" 
+    8879 "Mohuar Dyshe Vertikale Bar Dyshe DjathtÃ« Timon" 
+    8880 "Paraprin nÃ«n Lidhje" 
+    8881 "Sukses nÃ«n Lidhje" 
+    8882 "Normal NÃ«n-Grup i" 
+    8883 "PÃ«rmban As Normal NÃ«n-Grup" 
+    8884 "Normal NÃ«n-Grup e ose I BarabartÃ« Me" 
+    8885 "PÃ«rmban As Normal NÃ«n-Grup ose I BarabartÃ« Me" 
+    8886 "Origjinal e" 
+    8887 "Imazhe o" 
+    8888 "Multimap" 
+    8889 "Hermitian Ã‡ift Matrix" 
+    8890 "Shtoj" 
+    8891 "Xor" 
+    8892 "Nand" 
+    8893 "As" 
+    8894 "DjathtÃ« KÃ«nd Me Arc" 
+    8895 "DjathtÃ« TrekÃ«ndÃ«sh" 
+    8896 "N-Ary Logjike dhe" 
+    8897 "N-Ary Logjike ose" 
+    8898 "N-Ary NdÃ«rprerje" 
+    8899 "N-Ary Union" 
+    8900 "Diamant Operator" 
+    8901 "PikÃ« Operator" 
+    8902 "Yll Operator" 
+    8903 "Ndarje KohÃ«t" 
+    8904 "Papion" 
+    8905 "MajtÃ« Normal Faktori GjysmÃ«-direkt Produkt" 
+    8906 "DjathtÃ« Normal Faktori GjysmÃ«-direkt Produkt" 
+    8907 "MajtÃ« GjysmÃ«-direkt Produkt" 
+    8908 "DjathtÃ« GjysmÃ«-direkt Produkt" 
+    8909 "KundÃ«rt TildÃ« BarabartÃ«" 
+    8910 "Dredhur Logjike ose" 
+    8911 "Dredhur Logjike dhe" 
+    8912 "Dyshe NÃ«n-vendos" 
+    8913 "Dyshe Mbi-vendos" 
+    8914 "Dyshe NdÃ«rprerje" 
+    8915 "Dyshe Union" 
+    8916 "Pitchfork" 
+    8917 "I BarabartÃ« dhe Paralel Me" 
+    8918 "MÃ« pak-se Me PikÃ«" 
+    8919 "Madhe-se Me PikÃ«" 
+    8920 "ShumÃ« MÃ« pak-se" 
+    8921 "ShumÃ« Madhe-se" 
+    8922 "MÃ« pak-se I BarabartÃ« Me ose Madhe-se" 
+    8923 "Madhe-se I BarabartÃ« Me ose MÃ« pak-se" 
+    8924 "I BarabartÃ« Me ose MÃ« pak-se" 
+    8925 "I BarabartÃ« Me ose Madhe-se" 
+    8926 "I BarabartÃ« Me ose Paraprin" 
+    8927 "I BarabartÃ« Me ose Sukses" 
+    8928 "Nuk Paraprin ose I BarabartÃ«" 
+    8929 "Nuk ka Sukses ose I BarabartÃ«" 
+    8930 "Jo Katror Imazhe  I BarabartÃ« Me" 
+    8931 "Jo Katror Origjinal e ose I BarabartÃ« Me" 
+    8932 "Katror Imazhe i ose Jo I BarabartÃ« Me" 
+    8933 "Katror Origjinal i ose Jo I BarabartÃ« Me" 
+    8934 "MÃ« pak-se But Jo BarasvlershÃ«m Me" 
+    8935 "Madhe-se But Jo BarasvlershÃ«m Me" 
+    8936 "Paraprin But Jo BarasvlershÃ«m Me" 
+    8937 "Sukses But Jo BarasvlershÃ«m Me" 
+    8938 "Jo Normal NÃ«n-Grup i" 
+    8939 "Nuk PÃ«rmban As Normal NÃ«n-Grup" 
+    8940 "Jo Normal NÃ«n-Grup e ose I BarabartÃ« Me" 
+    8941 "Nuk PÃ«rmban As Normal NÃ«n-Grup ose I BarabartÃ«" 
+    8942 "Vertikale Ellipsis" 
+    8943 "LinjÃ«-mesi Horizontale Ellipsis" 
+    8944 "Lart DjathtÃ« Diagonale Ellipsis" 
+    8945 "PoshtÃ« DjathtÃ« Diagonal Ellipsis" 
+    8946 "Element i Me GjatÃ« Horizontal Goditje" 
+    8947 "Element i Me Vertikale Bar At Mbarimi I Horizontal Goditje" 
+    8948 "e VogÃ«l Element i Me Vertikale Bar At Mbarimi I Horizontal Goditje" 
+    8949 "Element i Me PikÃ« Mbi" 
+    8950 "Element i Me Mbi-tabelÃ«" 
+    8951 "e VogÃ«l Element i Me Mbi-tabelÃ«" 
+    8952 "Element i Me NÃ«n-tabelÃ«" 
+    8953 "Element i Me Dy Horizontal Goditjes" 
+    8954 "PÃ«rmban Me GjatÃ« Horizontal Goditje" 
+    8955 "PÃ«rmban Me Vertikale Bar At Mbarimi I Horizontal Goditje" 
+    8956 "e VogÃ«l PÃ«rmban Me Vertikale Bar At Mbarimi I Horizontal Goditje" 
+    8957 "PÃ«rmban Me Mbi-tabelÃ«" 
+    8958 "e VogÃ«l PÃ«rmban Me Mbi-tabelÃ«" 
+    8959 "Z ShÃ«nim Ã‡antÃ« AnÃ«tarÃ«sia" 
+    8960 "DiametÃ«r ShenjÃ«" 
+    8961 "Elektricist ShigjetÃ«" 
+    8962 "Shpi" 
+    8963 "Lart kokÃ«-Shigjete" 
+    8964 "PoshtÃ« kokÃ«-Shigjete" 
+    8965 "Projektove" 
+    8966 "Perspektive" 
+    8967 "ValÃ« LinjÃ«" 
+    8968 "MajtÃ« Tavan" 
+    8969 "DjathtÃ« Tavan" 
+    8970 "MajtÃ« Dysheme" 
+    8971 "DjathtÃ« Dysheme" 
+    8972 "Fund DjathtÃ« Prodhim" 
+    8973 "Fund MajtÃ« Prodhim" 
+    8974 "SipÃ«rm DjathtÃ« Prodhim" 
+    8975 "SipÃ«rm MajtÃ« Prodhim" 
+    8976 "KundÃ«rt Jo ShenjÃ«" 
+    8977 "Katror TabletÃ«" 
+    8978 "Arc" 
+    8979 "Segment" 
+    8980 "Sektor" 
+    8981 "Regjistrues Telefoni" 
+    8982 "Tregues Pozicioni" 
+    8983 "Shih data Katror" 
+    8984 "Vend tÃ« interesit ShenjÃ«" 
+    8985 "Kthyer Jo ShenjÃ«" 
+    8986 "VÃ«zhgim" 
+    8987 "OrÃ«-Qelqi" 
+    8988 "SipÃ«rm MajtÃ« KÃ«nd" 
+    8989 "SipÃ«rm DjathtÃ« KÃ«nd" 
+    8990 "Fund MajtÃ« KÃ«nd" 
+    8991 "Fund DjathtÃ« KÃ«nd" 
+    8992 "SipÃ«rm GjysmÃ« Integral" 
+    8993 "Fund GjysmÃ« Integral" 
+    8994 "Vrenjt" 
+    8995 "BuzÃ«qeshje" 
+    8996 "Lart kokÃ«-Shigjete NdÃ«rmjet Dy Horizontal TabelÃ«" 
+    8997 "Ã‡elÃ«s Opsioni" 
+    8998 "Fshi Me TÃ« DjathtÃ«n" 
+    8999 "X In A DrejtkÃ«ndÃ«sh Kuti" 
+    9000 "TastierÃ«" 
+    9001 "MajtÃ«-Treguese KÃ«nd Kllapa" 
+    9002 "DjathtÃ«-Treguese KÃ«nd Kllapa" 
+    9003 "Fshi Me TÃ« MajtÃ«" 
+    9004 "Benzine Rreth" 
+    9005 "Cilindrit" 
+    9006 "All PÃ«rreth-Profile" 
+    9007 "Simetrie" 
+    9008 "Total Runout" 
+    9009 "Dimension OrigjinÃ«" 
+    9010 "Konikal RÃ«nie" 
+    9011 "Shpat" 
+    9012 "Counterbore" 
+    9013 "Countersink" 
+    9014 "Apl Funksional Simbol I-Beam" 
+    9015 "Apl Funksional Simbol Squish Kuadrat" 
+    9016 "Apl Funksional Simbol Kuadrat I BarabartÃ«" 
+    9017 "Apl Funksional Simbol Kuadrat Ndahet" 
+    9018 "Apl Funksional Simbol Kuadrat Diamant" 
+    9019 "Apl Funksional Simbol Kuadrat Jot" 
+    9020 "Apl Funksional Simbol Kuadrat Rreth" 
+    9021 "Apl Funksional Simbol Rreth Stile" 
+    9022 "Apl Funksional Simbol Rreth Jot" 
+    9023 "Apl Funksional Simbol VijÃ« Bar" 
+    9024 "Apl Funksional Simbol VizÃ«-Mbrapsht Bar" 
+    9025 "Apl Funksional Simbol Kuadrat VijÃ«" 
+    9026 "Apl Funksional Simbol Kuadrat VizÃ«-Mbrapsht" 
+    9027 "Apl Funksional Simbol Kuadrat MÃ« pak-se" 
+    9028 "Apl Funksional Simbol Kuadrat Madhe-se" 
+    9029 "Apl Funksional Simbol Majtas Vane" 
+    9030 "Apl Funksional Simbol Djathtas Vane" 
+    9031 "Apl Funksional Simbol Kuadrat Majtas ShigjetÃ«" 
+    9032 "Apl Funksional Simbol Kuadrat Djathtas ShigjetÃ«" 
+    9033 "Apl Funksional Simbol Rreth VizÃ«-Mbrapsht" 
+    9034 "Apl Funksional Simbol PoshtÃ« Litar NÃ«n-tabelÃ«" 
+    9035 "Apl Funksional Simbol Delta Stile" 
+    9036 "Apl Funksional Simbol Kuadrat PoshtÃ« PÃ«rfshij" 
+    9037 "Apl Funksional Simbol Kuadrat Delta" 
+    9038 "Apl Funksional Simbol PoshtÃ« Litar Jot" 
+    9039 "Apl Funksional Simbol PÃ«rpjetÃ« Vane" 
+    9040 "Apl Funksional Simbol Kuadrat PÃ«rpjetÃ« ShigjetÃ«" 
+    9041 "Apl Funksional Simbol Lart Litar Mbi-tabelÃ«" 
+    9042 "Apl Funksional Simbol Del Stile" 
+    9043 "Apl Funksional Simbol Kuadrat Lart pÃ«rfshij" 
+    9044 "Apl Funksional Simbol Kuadrat Del" 
+    9045 "Apl Funksional Simbol Lart Litar Jot" 
+    9046 "Apl Funksional Simbol TeposhtÃ« Vane" 
+    9047 "Apl Funksional Simbol Kuadrat TeposhtÃ« ShigjetÃ«" 
+    9048 "Apl Funksional Simbol Citat NÃ«n-tabelÃ«" 
+    9049 "Apl Funksional Simbol Delta NÃ«n-tabelÃ«" 
+    9050 "Apl Funksional Simbol Diamant NÃ«n-tabelÃ«" 
+    9051 "Apl Funksional Simbol Jot NÃ«n-tabelÃ«" 
+    9052 "Apl Funksional Simbol Rreth NÃ«n-tabelÃ«" 
+    9053 "Apl Funksional Simbol Lart KÃ«puca Jote" 
+    9054 "Apl Funksional Simbol Citat Kuadrat" 
+    9055 "Apl Funksional Simbol Rreth Yll" 
+    9056 "Apl Funksional Simbol Kuadrat Dy Pika" 
+    9057 "Apl Funksional Simbol Lart Litar Diaeresis" 
+    9058 "Apl Funksional Simbol Del Diaeresis" 
+    9059 "Apl Funksional Simbol Yll Diaeresis" 
+    9060 "Apl Funksional Simbol Jot Diaeresis" 
+    9061 "Apl Funksional Simbol Rreth Diaeresis" 
+    9062 "Apl Funksional Simbol PoshtÃ« Stil KÃ«puce" 
+    9063 "Apl Funksional Simbol MajtÃ« Stil KÃ«puce" 
+    9064 "Apl Funksional Simbol TildÃ« Diaeresis" 
+    9065 "Apl Funksional Simbol Madhe-se Diaeresis" 
+    9066 "Apl Funksional Simbol Presje Bar" 
+    9067 "Apl Funksional Simbol Del TildÃ«" 
+    9068 "Apl Funksional Simbol Zilde" 
+    9069 "Apl Funksional Simbol Stile TildÃ«" 
+    9070 "Apl Funksional Simbol PikÃ«presje NÃ«n-tabelÃ«" 
+    9071 "Apl Funksional Simbol Kuadrat Jo I BarabartÃ«" 
+    9072 "Apl Funksional Simbol Kuadrat Pyetje" 
+    9073 "Apl Funksional Simbol PoshtÃ« PÃ«rfshij TildÃ«" 
+    9074 "Apl Funksional Simbol Lart pÃ«rfshij TildÃ«" 
+    9075 "Apl Funksional Simbol Iota" 
+    9076 "Apl Funksional Simbol Rho" 
+    9077 "Apl Funksional Simbol Omega" 
+    9078 "Apl Funksional Simbol Alpha NÃ«n-tabelÃ«" 
+    9079 "Apl Funksional Simbol Epsilon NÃ«n-tabelÃ«" 
+    9080 "Apl Funksional Simbol Iota NÃ«n-tabelÃ«" 
+    9081 "Apl Funksional Simbol Omega NÃ«n-tabelÃ«" 
+    9082 "Apl Funksional Simbol Alpha" 
+    9083 "Jo Kontroll ShenjÃ«" 
+    9084 "DjathtÃ« KÃ«nd Me TeposhtÃ« Zigzag ShigjetÃ«" 
+    9085 "Shouldered Hap Kuti" 
+    9086 "Zile Simbol" 
+    9087 "Vertikale LinjÃ« Me Mesit PikÃ«" 
+    9088 "Futje Simboli" 
+    9089 "NÃ«nvizim VazhdueshÃ«m Simboli" 
+    9090 "NÃ«nvizim Jo VazhdueshÃ«m Simboli" 
+    9091 "Theksim Simbol" 
+    9092 "PÃ«rbÃ«rje Simbol" 
+    9093 "e BardhÃ« Katror Me QendÃ«r Vertikale LinjÃ«" 
+    9094 "Fut Simbol" 
+    9095 "Alternative Ã‡elÃ«s Simbol" 
+    9096 "Helm Simbol" 
+    9097 "Rrethuar Horizontal Bar Me Notch" 
+    9098 "Rrethuar TrekÃ«ndÃ«sh PoshtÃ«" 
+    9099 "Thyer Rreth Me VeriperÃ«ndim ShigjetÃ«" 
+    9100 "Ã‡'bÃ«j Simbol" 
+    9101 "Monostable Simbol" 
+    9102 "Hysteresis Simbol" 
+    9103 "Hap-Ã‡ark-Nxjerrje H-Tipi Simbol" 
+    9104 "Hap-Ã‡ark-Nxjerrje L-Tipi Simbol" 
+    9105 "Pasive-TÃ«rheq-PoshtÃ«-Nxjerrje Simbol" 
+    9106 "Pasive-TÃ«rheq-Lart-Nxjerrje Simbol" 
+    9107 "Direkt Simbol Aktual FormÃ« Dy" 
+    9108 "Program-Funksion Simbol" 
+    9109 "Apl Funksional Simbol Kuadrat" 
+    9110 "Decimal NdarÃ«s Ã‡elÃ«s Simbol" 
+    9111 "MÃ«parshme Faqe" 
+    9112 "MÃ«tejshme Faqe" 
+    9113 "Printo Ekranin Simbol" 
+    9114 "Pastro Ekranin Simbol" 
+    9115 "MajtÃ« KllapÃ« SipÃ«rm Kapje" 
+    9116 "MajtÃ« KllapÃ« Zgjatje" 
+    9117 "MajtÃ« KllapÃ« MÃ« i'ulÃ«t Kapje" 
+    9118 "DjathtÃ« KllapÃ« SipÃ«rm Kapje" 
+    9119 "DjathtÃ« KllapÃ« Zgjatje" 
+    9120 "DjathtÃ« KllapÃ« MÃ« i'ulÃ«t Kapje" 
+    9121 "KllapÃ« Rrumbullake Majtas SipÃ«rm KÃ«nd" 
+    9122 "KllapÃ« Rrumbullake Majtas Zgjatje" 
+    9123 "KllapÃ« Rrumbullake Majtas MÃ« i'ulÃ«t KÃ«nd" 
+    9124 "DjathtÃ« Katror Kllapa SipÃ«rm KÃ«nd" 
+    9125 "DjathtÃ« Katror Kllapa Zgjatje" 
+    9126 "DjathtÃ« Katror Kllapa MÃ« i'ulÃ«t KÃ«nd" 
+    9127 "MajtÃ« Dredhur Kllapa SipÃ«rm Kapje" 
+    9128 "MajtÃ« Dredhur Kllapa Mesit CopÃ«" 
+    9129 "MajtÃ« Dredhur Kllapa MÃ« i'ulÃ«t Kapje" 
+    9130 "Dredhur Kllapa Zgjatje" 
+    9131 "DjathtÃ« Dredhur Kllapa SipÃ«rm Kapje" 
+    9132 "DjathtÃ« Dredhur Kllapa Mesit CopÃ«" 
+    9133 "DjathtÃ« Dredhur Kllapa MÃ« i'ulÃ«t Kapje" 
+    9134 "Integral Zgjatje" 
+    9135 "Horizontal LinjÃ« Zgjatje" 
+    9136 "SipÃ«rm MajtÃ« ose MÃ« i'ulÃ«t DjathtÃ« Dredhur Kllapa Seksion" 
+    9137 "SipÃ«rm DjathtÃ« ose MÃ« i'ulÃ«t MajtÃ« Dredhur Kllapa Seksion" 
+    9138 "Mbledhje SipÃ«rm" 
+    9139 "Mbledhje Fund" 
+    9140 "SipÃ«rm Katror Kllapa" 
+    9141 "Fund Katror Kllapa" 
+    9142 "Fund Katror Kllapa Mbi SipÃ«rm Katror Kllapa" 
+    9143 "Radikal Simbol Fund" 
+    9144 "MajtÃ« Vertikale Kuti LinjÃ«" 
+    9145 "DjathtÃ« Vertikale Kuti LinjÃ«" 
+    9146 "Horizontal Skanim LinjÃ«-1" 
+    9147 "Horizontal Skanim LinjÃ«-3" 
+    9148 "Horizontal Skanim LinjÃ«-7" 
+    9149 "Horizontal Skanim LinjÃ«-9" 
+    9150 "Stomatologji Simbol LehtÃ« Vertikale dhe SipÃ«rm DjathtÃ«" 
+    9151 "Stomatologji Simbol LehtÃ« Vertikale dhe Fund DjathtÃ«" 
+    9152 "Stomatologji Simbol LehtÃ« Vertikale Me Rreth" 
+    9153 "Stomatologji Simbol LehtÃ« PoshtÃ« dhe Horizontal Me Rreth" 
+    9154 "Stomatologji Simbol LehtÃ« Lart dhe Horizontal Me Rreth" 
+    9155 "Stomatologji Simbol LehtÃ« Vertikale Me TrekÃ«ndÃ«sh" 
+    9156 "Stomatologji Simbol LehtÃ« PoshtÃ« dhe Horizontal Me TrekÃ«ndÃ«sh" 
+    9157 "Stomatologji Simbol LehtÃ« Lart dhe Horizontal Me TrekÃ«ndÃ«sh" 
+    9158 "Stomatologji Simbol LehtÃ« Vertikale dhe ValÃ«" 
+    9159 "Stomatologji Simbol LehtÃ« PoshtÃ« dhe Horizontal Me ValÃ«" 
+    9160 "Stomatologji Simbol LehtÃ« Lart dhe Horizontal Me ValÃ«" 
+    9161 "Stomatologji Simbol LehtÃ« PoshtÃ« dhe Horizontal" 
+    9162 "Stomatologji Simbol LehtÃ« Lart dhe Horizontal" 
+    9163 "Stomatologji Simbol LehtÃ« Vertikale dhe SipÃ«rm MajtÃ«" 
+    9164 "Stomatologji Simbol LehtÃ« Vertikale dhe Fund MajtÃ«" 
+    9165 "Katror Foot" 
+    9166 "Kthe Simbol" 
+    9167 "Nxirr Simbol" 
+    9168 "Vertikale LinjÃ« Zgjatje" 
+    9169 "Metrik Breve" 
+    9170 "Metrik GjatÃ« Mbi ShkurtÃ«r" 
+    9171 "Metrik ShkurtÃ«r Mbi GjatÃ«" 
+    9172 "Metrik GjatÃ« Mbi Dy ShkurtÃ«r" 
+    9173 "Metrik Dy ShkurtÃ«r Mbi GjatÃ«" 
+    9174 "Metrik Dy ShkurtÃ«r Hyrje" 
+    9175 "Metrik Triseme" 
+    9176 "Metrik Tetraseme" 
+    9177 "Metrik Pentaseme" 
+    9178 "Terren Toke" 
+    9179 "fITIL" 
+    9180 "SipÃ«rm KllapÃ«" 
+    9181 "Fund KllapÃ«" 
+    9182 "SipÃ«rm Dredhur Kllapa" 
+    9183 "Fund Dredhur Kllapa" 
+    9184 "SipÃ«rm Tortoise Shell Kllapa" 
+    9185 "Fund Tortoise Shell Kllapa" 
+    9186 "e BardhÃ« Trapezium" 
+    9187 "Benzene Rreth Me Rreth" 
+    9188 "Drejtim" 
+    9189 "SheshtÃ«" 
+    9190 "Ac RrymÃ«" 
+    9191 "Elektrike NdÃ«rprerje" 
+    9192 "Decimal Shpjegues Simbol" 
+    9193 "e ZezÃ« DjathtÃ«-Treguese Dyshe TrekÃ«ndÃ«sh" 
+    9194 "e ZezÃ« MajtÃ«-Treguese Dyshe TrekÃ«ndÃ«sh" 
+    9195 "e ZezÃ« Lart-Treguese Dyshe TrekÃ«ndÃ«sh" 
+    9196 "e ZezÃ« PoshtÃ«-Treguese Dyshe TrekÃ«ndÃ«sh" 
+    9197 "e ZezÃ« DjathtÃ«-Treguese Dyshe TrekÃ«ndÃ«sh Me Vertikale Bar" 
+    9198 "e ZezÃ« MajtÃ«-Treguese Dyshe TrekÃ«ndÃ«sh Me Vertikale Bar" 
+    9199 "e ZezÃ« DjathtÃ«-Treguese TrekÃ«ndÃ«sh Me Dyshe Vertikale Bar" 
+    9200 "Alarm Ore" 
+    9201 "KronometÃ«r" 
+    9202 "OrÃ« Sahati" 
+    9203 "OrÃ«-Qelqi Me Rrjedhin RÃ«rÃ«" 
+    9216 "Simbol PÃ«r Nul" 
+    9217 "Simbol PÃ«r Start e Kreut" 
+    9218 "Simbol PÃ«r Start E Tekstit" 
+    9219 "Simbol PÃ«r Mbarimi I Tekst" 
+    9220 "Simbol PÃ«r Mbarimi I Transmision" 
+    9221 "Simbol PÃ«r Hetim" 
+    9222 "Simbol PÃ«r FalÃ«nderime" 
+    9223 "Simbol PÃ«r Zile" 
+    9224 "Simbol PÃ«r Mbrapa" 
+    9225 "Simbol PÃ«r Horizontal Hedhje TabelÃ«" 
+    9226 "Simbol PÃ«r LinjÃ« Ushqej" 
+    9227 "Simbol PÃ«r Vertikale Hedhje TabelÃ«" 
+    9228 "Simbol PÃ«r FormÃ« Ushqej" 
+    9229 "Simbol PÃ«r Transporti Kthehu" 
+    9230 "Simbol PÃ«r Nxjerr JashtÃ«" 
+    9231 "Simbol PÃ«r Fut Brenda" 
+    9232 "Simbol PÃ«r Data Arratisje Lidhje" 
+    9233 "Simbol PÃ«r Kontroll Pajisje NjÃ«" 
+    9234 "Simbol PÃ«r Kontroll Pajisje Dy" 
+    9235 "Simbol PÃ«r Kontroll Pajisje Tre" 
+    9236 "Simbol PÃ«r Kontroll Pajisje KatÃ«r" 
+    9237 "Simbol PÃ«r Negative FalÃ«nderime" 
+    9238 "Simbol PÃ«r Sinkron Pushim" 
+    9239 "Simbol PÃ«r Mbarimi I Transmision Bllok" 
+    9240 "Simbol PÃ«r Anulo" 
+    9241 "Simbol PÃ«r Mbarimi I Medium" 
+    9242 "Simbol PÃ«r ZÃ«vendÃ«sim" 
+    9243 "Simbol PÃ«r Arratisje" 
+    9244 "Simbol PÃ«r File NdarÃ«s" 
+    9245 "Simbol PÃ«r Grup NdarÃ«s" 
+    9246 "Simbol PÃ«r Regjistro NdarÃ«s" 
+    9247 "Simbol PÃ«r Unit NdarÃ«s" 
+    9248 "Simbol PÃ«r HapÃ«sirÃ«" 
+    9249 "Simbol PÃ«r Fshi" 
+    9250 "Simbol Bosh" 
+    9251 "Hap Kuti" 
+    9252 "Simbol PÃ«r LinjÃ«-E're" 
+    9253 "Simbol PÃ«r Fshi FormÃ« Dy" 
+    9254 "Simbol PÃ«r ZÃ«vendÃ«sim FormÃ« Dy" 
+    9280 "Ocr Kapje" 
+    9281 "Ocr Karrige" 
+    9282 "Ocr Piru" 
+    9283 "Ocr Kthyer Piru" 
+    9284 "Ocr Rrip ShtrÃ«ngoj" 
+    9285 "Ocr PÃ«rkulni" 
+    9286 "Ocr Identifikim Dege Banke" 
+    9287 "Ocr Sasia e Kontrollit" 
+    9288 "Ocr Dash" 
+    9289 "Ocr Llogaria Klientit NumÃ«r" 
+    9290 "Ocr Dyshe VizÃ«-Mbrapsht" 
+    9312 "Rrethuar ShifÃ«r NjÃ«" 
+    9313 "Rrethuar ShifÃ«r Dy" 
+    9314 "Rrethuar ShifÃ«r Tre" 
+    9315 "Rrethuar ShifÃ«r KatÃ«r" 
+    9316 "Rrethuar ShifÃ«r PesÃ«" 
+    9317 "Rrethuar ShifÃ«r GjashtÃ«" 
+    9318 "Rrethuar ShifÃ«r ShtatÃ«" 
+    9319 "Rrethuar ShifÃ«r TetÃ«" 
+    9320 "Rrethuar ShifÃ«r NÃ«ntÃ«" 
+    9321 "Rrethuar NumÃ«r DhjetÃ«" 
+    9322 "Rrethuar NumÃ«r NjÃ«mbÃ«dhjetÃ«" 
+    9323 "Rrethuar NumÃ«r DymbÃ«dhjetÃ«" 
+    9324 "Rrethuar NumÃ«r TrembÃ«dhjetÃ«" 
+    9325 "Rrethuar NumÃ«r KatÃ«rmbÃ«dhjetÃ«" 
+    9326 "Rrethuar NumÃ«r PesÃ«mbÃ«dhjetÃ«" 
+    9327 "Rrethuar NumÃ«r GjashtÃ«mbÃ«dhjetÃ«" 
+    9328 "Rrethuar NumÃ«r ShtatÃ«mbÃ«dhjetÃ«" 
+    9329 "Rrethuar NumÃ«r TetÃ«mbÃ«dhjetÃ«" 
+    9330 "Rrethuar NumÃ«r NÃ«ntÃ«mbÃ«dhjetÃ«" 
+    9331 "Rrethuar NumÃ«r NjÃ«zet" 
+    9332 "NÃ«-kllapa ShifÃ«r NjÃ«" 
+    9333 "NÃ«-kllapa ShifÃ«r Dy" 
+    9334 "NÃ«-kllapa ShifÃ«r Tre" 
+    9335 "NÃ«-kllapa ShifÃ«r KatÃ«r" 
+    9336 "NÃ«-kllapa ShifÃ«r PesÃ«" 
+    9337 "NÃ«-kllapa ShifÃ«r GjashtÃ«" 
+    9338 "NÃ«-kllapa ShifÃ«r ShtatÃ«" 
+    9339 "NÃ«-kllapa ShifÃ«r TetÃ«" 
+    9340 "NÃ«-kllapa ShifÃ«r NÃ«ntÃ«" 
+    9341 "NÃ«-kllapa NumÃ«r DhjetÃ«" 
+    9342 "NÃ«-kllapa NumÃ«r NjÃ«mbÃ«dhjetÃ«" 
+    9343 "NÃ«-kllapa NumÃ«r DymbÃ«dhjetÃ«" 
+    9344 "NÃ«-kllapa NumÃ«r TrembÃ«dhjetÃ«" 
+    9345 "NÃ«-kllapa NumÃ«r KatÃ«rmbÃ«dhjetÃ«" 
+    9346 "NÃ«-kllapa NumÃ«r PesÃ«mbÃ«dhjetÃ«" 
+    9347 "NÃ«-kllapa NumÃ«r GjashtÃ«mbÃ«dhjetÃ«" 
+    9348 "NÃ«-kllapa NumÃ«r ShtatÃ«mbÃ«dhjetÃ«" 
+    9349 "NÃ«-kllapa NumÃ«r TetÃ«mbÃ«dhjetÃ«" 
+    9350 "NÃ«-kllapa NumÃ«r NÃ«ntÃ«mbÃ«dhjetÃ«" 
+    9351 "NÃ«-kllapa NumÃ«r NjÃ«zet" 
+    9352 "ShifÃ«r NjÃ« PikÃ«" 
+    9353 "ShifÃ«r Dy PikÃ«" 
+    9354 "ShifÃ«r Tre PikÃ«" 
+    9355 "ShifÃ«r KatÃ«r PikÃ«" 
+    9356 "ShifÃ«r PesÃ« PikÃ«" 
+    9357 "ShifÃ«r GjashtÃ« PikÃ«" 
+    9358 "ShifÃ«r ShtatÃ« PikÃ«" 
+    9359 "ShifÃ«r TetÃ« PikÃ«" 
+    9360 "ShifÃ«r NÃ«ntÃ« PikÃ«" 
+    9361 "NumÃ«r DhjetÃ« PikÃ«" 
+    9362 "NumÃ«r NjÃ«mbÃ«dhjetÃ« PikÃ«" 
+    9363 "NumÃ«r DymbÃ«dhjetÃ« PikÃ«" 
+    9364 "NumÃ«r TrembÃ«dhjetÃ« PikÃ«" 
+    9365 "NumÃ«r KatÃ«rmbÃ«dhjetÃ« PikÃ«" 
+    9366 "NumÃ«r PesÃ«mbÃ«dhjetÃ« PikÃ«" 
+    9367 "NumÃ«r GjashtÃ«mbÃ«dhjetÃ« PikÃ«" 
+    9368 "NumÃ«r ShtatÃ«mbÃ«dhjetÃ« PikÃ«" 
+    9369 "NumÃ«r TetÃ«mbÃ«dhjetÃ« PikÃ«" 
+    9370 "NumÃ«r NÃ«ntÃ«mbÃ«dhjetÃ« PikÃ«" 
+    9371 "NumÃ«r NjÃ«zet PikÃ«" 
+    9372 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine A" 
+    9373 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine B" 
+    9374 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine C" 
+    9375 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine D" 
+    9376 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine E" 
+    9377 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine F" 
+    9378 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine G" 
+    9379 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine H" 
+    9380 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine I" 
+    9381 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine J" 
+    9382 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine K" 
+    9383 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine L" 
+    9384 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine M" 
+    9385 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine N" 
+    9386 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine O" 
+    9387 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine P" 
+    9388 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine Q" 
+    9389 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine R" 
+    9390 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine S" 
+    9391 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine T" 
+    9392 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine U" 
+    9393 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine V" 
+    9394 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine W" 
+    9395 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine X" 
+    9396 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine Y" 
+    9397 "NÃ«-kllapa ShkronjÃ« e VogÃ«l Latine Z" 
+    9398 "Rrethuar ShkronjÃ« e Madhe Latine A" 
+    9399 "Rrethuar ShkronjÃ« e Madhe Latine B" 
+    9400 "Rrethuar ShkronjÃ« e Madhe Latine C" 
+    9401 "Rrethuar ShkronjÃ« e Madhe Latine D" 
+    9402 "Rrethuar ShkronjÃ« e Madhe Latine E" 
+    9403 "Rrethuar ShkronjÃ« e Madhe Latine F" 
+    9404 "Rrethuar ShkronjÃ« e Madhe Latine G" 
+    9405 "Rrethuar ShkronjÃ« e Madhe Latine H" 
+    9406 "Rrethuar ShkronjÃ« e Madhe Latine I" 
+    9407 "Rrethuar ShkronjÃ« e Madhe Latine J" 
+    9408 "Rrethuar ShkronjÃ« e Madhe Latine K" 
+    9409 "Rrethuar ShkronjÃ« e Madhe Latine L" 
+    9410 "Rrethuar ShkronjÃ« e Madhe Latine M" 
+    9411 "Rrethuar ShkronjÃ« e Madhe Latine N" 
+    9412 "Rrethuar ShkronjÃ« e Madhe Latine O" 
+    9413 "Rrethuar ShkronjÃ« e Madhe Latine P" 
+    9414 "Rrethuar ShkronjÃ« e Madhe Latine Q" 
+    9415 "Rrethuar ShkronjÃ« e Madhe Latine R" 
+    9416 "Rrethuar ShkronjÃ« e Madhe Latine S" 
+    9417 "Rrethuar ShkronjÃ« e Madhe Latine T" 
+    9418 "Rrethuar ShkronjÃ« e Madhe Latine U" 
+    9419 "Rrethuar ShkronjÃ« e Madhe Latine V" 
+    9420 "Rrethuar ShkronjÃ« e Madhe Latine W" 
+    9421 "Rrethuar ShkronjÃ« e Madhe Latine X" 
+    9422 "Rrethuar ShkronjÃ« e Madhe Latine Y" 
+    9423 "Rrethuar ShkronjÃ« e Madhe Latine Z" 
+    9424 "Rrethuar ShkronjÃ« e VogÃ«l Latine A" 
+    9425 "Rrethuar ShkronjÃ« e VogÃ«l Latine B" 
+    9426 "Rrethuar ShkronjÃ« e VogÃ«l Latine C" 
+    9427 "Rrethuar ShkronjÃ« e VogÃ«l Latine D" 
+    9428 "Rrethuar ShkronjÃ« e VogÃ«l Latine E" 
+    9429 "Rrethuar ShkronjÃ« e VogÃ«l Latine F" 
+    9430 "Rrethuar ShkronjÃ« e VogÃ«l Latine G" 
+    9431 "Rrethuar ShkronjÃ« e VogÃ«l Latine H" 
+    9432 "Rrethuar ShkronjÃ« e VogÃ«l Latine I" 
+    9433 "Rrethuar ShkronjÃ« e VogÃ«l Latine J" 
+    9434 "Rrethuar ShkronjÃ« e VogÃ«l Latine K" 
+    9435 "Rrethuar ShkronjÃ« e VogÃ«l Latine L" 
+    9436 "Rrethuar ShkronjÃ« e VogÃ«l Latine M" 
+    9437 "Rrethuar ShkronjÃ« e VogÃ«l Latine N" 
+    9438 "Rrethuar ShkronjÃ« e VogÃ«l Latine O" 
+    9439 "Rrethuar ShkronjÃ« e VogÃ«l Latine P" 
+    9440 "Rrethuar ShkronjÃ« e VogÃ«l Latine Q" 
+    9441 "Rrethuar ShkronjÃ« e VogÃ«l Latine R" 
+    9442 "Rrethuar ShkronjÃ« e VogÃ«l Latine S" 
+    9443 "Rrethuar ShkronjÃ« e VogÃ«l Latine T" 
+    9444 "Rrethuar ShkronjÃ« e VogÃ«l Latine U" 
+    9445 "Rrethuar ShkronjÃ« e VogÃ«l Latine V" 
+    9446 "Rrethuar ShkronjÃ« e VogÃ«l Latine W" 
+    9447 "Rrethuar ShkronjÃ« e VogÃ«l Latine X" 
+    9448 "Rrethuar ShkronjÃ« e VogÃ«l Latine Y" 
+    9449 "Rrethuar ShkronjÃ« e VogÃ«l Latine Z" 
+    9450 "Rrethuar ShifÃ«r Zero" 
+    9451 "Negative Rrethuar NumÃ«r NjÃ«mbÃ«dhjetÃ«" 
+    9452 "Negative Rrethuar NumÃ«r DymbÃ«dhjetÃ«" 
+    9453 "Negative Rrethuar NumÃ«r TrembÃ«dhjetÃ«" 
+    9454 "Negative Rrethuar NumÃ«r KatÃ«rmbÃ«dhjetÃ«" 
+    9455 "Negative Rrethuar NumÃ«r PesÃ«mbÃ«dhjetÃ«" 
+    9456 "Negative Rrethuar NumÃ«r GjashtÃ«mbÃ«dhjetÃ«" 
+    9457 "Negative Rrethuar NumÃ«r ShtatÃ«mbÃ«dhjetÃ«" 
+    9458 "Negative Rrethuar NumÃ«r TetÃ«mbÃ«dhjetÃ«" 
+    9459 "Negative Rrethuar NumÃ«r NÃ«ntÃ«mbÃ«dhjetÃ«" 
+    9460 "Negative Rrethuar NumÃ«r NjÃ«zet" 
+    9461 "Dyshe Rrethuar ShifÃ«r NjÃ«" 
+    9462 "Dyshe Rrethuar ShifÃ«r Dy" 
+    9463 "Dyshe Rrethuar ShifÃ«r Tre" 
+    9464 "Dyshe Rrethuar ShifÃ«r KatÃ«r" 
+    9465 "Dyshe Rrethuar ShifÃ«r PesÃ«" 
+    9466 "Dyshe Rrethuar ShifÃ«r GjashtÃ«" 
+    9467 "Dyshe Rrethuar ShifÃ«r ShtatÃ«" 
+    9468 "Dyshe Rrethuar ShifÃ«r TetÃ«" 
+    9469 "Dyshe Rrethuar ShifÃ«r NÃ«ntÃ«" 
+    9470 "Dyshe Rrethuar NumÃ«r DhjetÃ«" 
+    9471 "Negative Rrethuar ShifÃ«r Zero" 
+    9472 "Kuti Vizatimi LehtÃ« Horizontal" 
+    9473 "Kuti Vizatimi RÃ«ndÃ« Horizontal" 
+    9474 "Kuti Vizatimi LehtÃ« Vertikale" 
+    9475 "Kuti Vizatimi RÃ«ndÃ« Vertikale" 
+    9476 "Kuti Vizatimi LehtÃ« Trefish Dash Horizontal" 
+    9477 "Kuti Vizatimi RÃ«ndÃ« Trefish Dash Horizontal" 
+    9478 "Kuti Vizatimi LehtÃ« Trefish Dash Vertikale" 
+    9479 "Kuti Vizatimi RÃ«ndÃ« Trefish Dash Vertikale" 
+    9480 "Kuti Vizatimi LehtÃ« KatÃ«rfish Dash Horizontal" 
+    9481 "Kuti Vizatimi RÃ«ndÃ« KatÃ«rfish Dash Horizontal" 
+    9482 "Kuti Vizatimi LehtÃ« KatÃ«rfish Dash Vertikale" 
+    9483 "Kuti Vizatimi RÃ«ndÃ« KatÃ«rfish Dash Vertikale" 
+    9484 "Kuti Vizatimi LehtÃ« PoshtÃ« dhe DjathtÃ«" 
+    9485 "Kuti Vizatimi PoshtÃ« LehtÃ« dhe DjathtÃ« RÃ«ndÃ«" 
+    9486 "Kuti Vizatimi PoshtÃ« RÃ«ndÃ« dhe DjathtÃ« LehtÃ«" 
+    9487 "Kuti Vizatimi RÃ«ndÃ« PoshtÃ« dhe DjathtÃ«" 
+    9488 "Kuti Vizatimi LehtÃ« PoshtÃ« dhe MajtÃ«" 
+    9489 "Kuti Vizatimi PoshtÃ« LehtÃ« dhe MajtÃ« RÃ«ndÃ«" 
+    9490 "Kuti Vizatimi PoshtÃ« RÃ«ndÃ« dhe MajtÃ« LehtÃ«" 
+    9491 "Kuti Vizatimi RÃ«ndÃ« PoshtÃ« dhe MajtÃ«" 
+    9492 "Kuti Vizatimi LehtÃ« Lart dhe DjathtÃ«" 
+    9493 "Kuti Vizatimi Lart LehtÃ« dhe DjathtÃ« RÃ«ndÃ«" 
+    9494 "Kuti Vizatimi Lart RÃ«ndÃ« dhe DjathtÃ« LehtÃ«" 
+    9495 "Kuti Vizatimi RÃ«ndÃ« Lart dhe DjathtÃ«" 
+    9496 "Kuti Vizatimi LehtÃ« Lart dhe MajtÃ«" 
+    9497 "Kuti Vizatimi Lart LehtÃ« dhe MajtÃ« RÃ«ndÃ«" 
+    9498 "Kuti Vizatimi Lart RÃ«ndÃ« dhe MajtÃ« LehtÃ«" 
+    9499 "Kuti Vizatimi RÃ«ndÃ« Lart dhe MajtÃ«" 
+    9500 "Kuti Vizatimi LehtÃ« Vertikale dhe DjathtÃ«" 
+    9501 "Kuti Vizatimi Vertikale LehtÃ« dhe DjathtÃ« RÃ«ndÃ«" 
+    9502 "Kuti Vizatimi Lart RÃ«ndÃ« dhe DjathtÃ« PoshtÃ« LehtÃ«" 
+    9503 "Kuti Vizatimi PoshtÃ« RÃ«ndÃ« dhe DjathtÃ« Lart LehtÃ«" 
+    9504 "Kuti Vizatimi Vertikale RÃ«ndÃ« dhe DjathtÃ« LehtÃ«" 
+    9505 "Kuti Vizatimi PoshtÃ« LehtÃ« dhe DjathtÃ« Lart RÃ«ndÃ«" 
+    9506 "Kuti Vizatimi Lart LehtÃ« dhe DjathtÃ« PoshtÃ« RÃ«ndÃ«" 
+    9507 "Kuti Vizatimi RÃ«ndÃ« Vertikale dhe DjathtÃ«" 
+    9508 "Kuti Vizatimi LehtÃ« Vertikale dhe MajtÃ«" 
+    9509 "Kuti Vizatimi Vertikale LehtÃ« dhe MajtÃ« RÃ«ndÃ«" 
+    9510 "Kuti Vizatimi Lart RÃ«ndÃ« dhe MajtÃ« PoshtÃ« LehtÃ«" 
+    9511 "Kuti Vizatimi PoshtÃ« RÃ«ndÃ« dhe MajtÃ« Lart LehtÃ«" 
+    9512 "Kuti Vizatimi Vertikale RÃ«ndÃ« dhe MajtÃ« LehtÃ«" 
+    9513 "Kuti Vizatimi PoshtÃ« LehtÃ« dhe MajtÃ« Lart RÃ«ndÃ«" 
+    9514 "Kuti Vizatimi Lart LehtÃ« dhe MajtÃ« PoshtÃ« RÃ«ndÃ«" 
+    9515 "Kuti Vizatimi RÃ«ndÃ« Vertikale dhe MajtÃ«" 
+    9516 "Kuti Vizatimi LehtÃ« PoshtÃ« dhe Horizontal" 
+    9517 "Kuti Vizatimi MajtÃ« RÃ«ndÃ« dhe DjathtÃ« PoshtÃ« LehtÃ«" 
+    9518 "Kuti Vizatimi DjathtÃ« RÃ«ndÃ« dhe MajtÃ« PoshtÃ« LehtÃ«" 
+    9519 "Kuti Vizatimi PoshtÃ« LehtÃ« dhe Horizontal RÃ«ndÃ«" 
+    9520 "Kuti Vizatimi PoshtÃ« RÃ«ndÃ« dhe Horizontal LehtÃ«" 
+    9521 "Kuti Vizatimi DjathtÃ« LehtÃ« dhe MajtÃ« PoshtÃ« RÃ«ndÃ«" 
+    9522 "Kuti Vizatimi MajtÃ« LehtÃ« dhe DjathtÃ« PoshtÃ« RÃ«ndÃ«" 
+    9523 "Kuti Vizatimi RÃ«ndÃ« PoshtÃ« dhe Horizontal" 
+    9524 "Kuti Vizatimi LehtÃ« Lart dhe Horizontal" 
+    9525 "Kuti Vizatimi MajtÃ« RÃ«ndÃ« dhe DjathtÃ« Lart LehtÃ«" 
+    9526 "Kuti Vizatimi DjathtÃ« RÃ«ndÃ« dhe MajtÃ« Lart LehtÃ«" 
+    9527 "Kuti Vizatimi Lart LehtÃ« dhe Horizontal RÃ«ndÃ«" 
+    9528 "Kuti Vizatimi Lart RÃ«ndÃ« dhe Horizontal LehtÃ«" 
+    9529 "Kuti Vizatimi DjathtÃ« LehtÃ« dhe MajtÃ« Lart RÃ«ndÃ«" 
+    9530 "Kuti Vizatimi MajtÃ« LehtÃ« dhe DjathtÃ« Lart RÃ«ndÃ«" 
+    9531 "Kuti Vizatimi RÃ«ndÃ« Lart dhe Horizontal" 
+    9532 "Kuti Vizatimi LehtÃ« Vertikale dhe Horizontal" 
+    9533 "Kuti Vizatimi MajtÃ« RÃ«ndÃ« dhe DjathtÃ« Vertikale LehtÃ«" 
+    9534 "Kuti Vizatimi DjathtÃ« RÃ«ndÃ« dhe MajtÃ« Vertikale LehtÃ«" 
+    9535 "Kuti Vizatimi Vertikale LehtÃ« dhe Horizontal RÃ«ndÃ«" 
+    9536 "Kuti Vizatimi Lart RÃ«ndÃ« dhe PoshtÃ« Horizontal LehtÃ«" 
+    9537 "Kuti Vizatimi PoshtÃ« RÃ«ndÃ« dhe Lart Horizontal LehtÃ«" 
+    9538 "Kuti Vizatimi Vertikale RÃ«ndÃ« dhe Horizontal LehtÃ«" 
+    9539 "Kuti Vizatimi MajtÃ« Lart RÃ«ndÃ« dhe DjathtÃ« PoshtÃ« LehtÃ«" 
+    9540 "Kuti Vizatimi DjathtÃ« Lart RÃ«ndÃ« dhe MajtÃ« PoshtÃ« LehtÃ«" 
+    9541 "Kuti Vizatimi MajtÃ« PoshtÃ« RÃ«ndÃ« dhe DjathtÃ« Lart LehtÃ«" 
+    9542 "Kuti Vizatimi DjathtÃ« PoshtÃ« RÃ«ndÃ« dhe MajtÃ« Lart LehtÃ«" 
+    9543 "Kuti Vizatimi PoshtÃ« LehtÃ« dhe Lart Horizontal RÃ«ndÃ«" 
+    9544 "Kuti Vizatimi Lart LehtÃ« dhe PoshtÃ« Horizontal RÃ«ndÃ«" 
+    9545 "Kuti Vizatimi DjathtÃ« LehtÃ« dhe MajtÃ« Vertikale RÃ«ndÃ«" 
+    9546 "Kuti Vizatimi MajtÃ« LehtÃ« dhe DjathtÃ« Vertikale RÃ«ndÃ«" 
+    9547 "Kuti Vizatimi RÃ«ndÃ« Vertikale dhe Horizontal" 
+    9548 "Kuti Vizatimi LehtÃ« Dyshe Dash Horizontal" 
+    9549 "Kuti Vizatimi RÃ«ndÃ« Dyshe Dash Horizontal" 
+    9550 "Kuti Vizatimi LehtÃ« Dyshe Dash Vertikale" 
+    9551 "Kuti Vizatimi RÃ«ndÃ« Dyshe Dash Vertikale" 
+    9552 "Kuti Vizatimi Dyshe Horizontal" 
+    9553 "Kuti Vizatimi Dyshe Vertikale" 
+    9554 "Kuti Vizatimi PoshtÃ« E VetÃ«m dhe Djathtas Dyshe" 
+    9555 "Kuti Vizatimi PoshtÃ« Dyshe dhe Djathtas Teke" 
+    9556 "Kuti Vizatimi Dyshe PoshtÃ« dhe DjathtÃ«" 
+    9557 "Kuti Vizatimi PoshtÃ« E VetÃ«m dhe Majtas Dyshe" 
+    9558 "Kuti Vizatimi PoshtÃ« Dyshe dhe MajtÃ« E VetÃ«m" 
+    9559 "Kuti Vizatimi Dyshe PoshtÃ« dhe MajtÃ«" 
+    9560 "Kuti Vizatimi Lart Teke dhe Djathtas Dyshe" 
+    9561 "Kuti Vizatimi Lart Dyshe dhe Djathtas Teke" 
+    9562 "Kuti Vizatimi Dyshe Lart dhe DjathtÃ«" 
+    9563 "Kuti Vizatimi Lart Teke dhe Majtas Dyshe" 
+    9564 "Kuti Vizatimi Lart Dyshe dhe MajtÃ« E VetÃ«m" 
+    9565 "Kuti Vizatimi Dyshe Lart dhe MajtÃ«" 
+    9566 "Kuti Vizatimi Vertikale E VetÃ«m dhe Djathtas Dyshe" 
+    9567 "Kuti Vizatimi Vertikale Dyshe dhe Djathtas Teke" 
+    9568 "Kuti Vizatimi Dyshe Vertikale dhe DjathtÃ«" 
+    9569 "Kuti Vizatimi Vertikale E VetÃ«m dhe Majtas Dyshe" 
+    9570 "Kuti Vizatimi Vertikale Dyshe dhe MajtÃ« E VetÃ«m" 
+    9571 "Kuti Vizatimi Dyshe Vertikale dhe MajtÃ«" 
+    9572 "Kuti Vizatimi PoshtÃ« E VetÃ«m dhe Horizontal Dyshe" 
+    9573 "Kuti Vizatimi PoshtÃ« Dyshe dhe Horizontal E VetÃ«m" 
+    9574 "Kuti Vizatimi Dyshe PoshtÃ« dhe Horizontal" 
+    9575 "Kuti Vizatimi Lart Teke dhe Horizontal Dyshe" 
+    9576 "Kuti Vizatimi Lart Dyshe dhe Horizontal E VetÃ«m" 
+    9577 "Kuti Vizatimi Dyshe Lart dhe Horizontal" 
+    9578 "Kuti Vizatimi Vertikale E VetÃ«m dhe Horizontal Dyshe" 
+    9579 "Kuti Vizatimi Vertikale Dyshe dhe Horizontal E VetÃ«m" 
+    9580 "Kuti Vizatimi Dyshe Vertikale dhe Horizontal" 
+    9581 "Kuti Vizatimi LehtÃ« Arc PoshtÃ« dhe DjathtÃ«" 
+    9582 "Kuti Vizatimi LehtÃ« Arc PoshtÃ« dhe MajtÃ«" 
+    9583 "Kuti Vizatimi LehtÃ« Arc Lart dhe MajtÃ«" 
+    9584 "Kuti Vizatimi LehtÃ« Arc Lart dhe DjathtÃ«" 
+    9585 "Kuti Vizatimi LehtÃ« Diagonal SipÃ«rm DjathtÃ« Me MÃ« i'ulÃ«t MajtÃ«" 
+    9586 "Kuti Vizatimi LehtÃ« Diagonal SipÃ«rm MajtÃ« Me MÃ« i'ulÃ«t DjathtÃ«" 
+    9587 "Kuti Vizatimi LehtÃ« Diagonal Kryq" 
+    9588 "Kuti Vizatimi LehtÃ« MajtÃ«" 
+    9589 "Kuti Vizatimi LehtÃ« Lart" 
+    9590 "Kuti Vizatimi LehtÃ« DjathtÃ«" 
+    9591 "Kuti Vizatimi LehtÃ« PoshtÃ«" 
+    9592 "Kuti Vizatimi RÃ«ndÃ« MajtÃ«" 
+    9593 "Kuti Vizatimi RÃ«ndÃ« Lart" 
+    9594 "Kuti Vizatimi RÃ«ndÃ« DjathtÃ«" 
+    9595 "Kuti Vizatimi RÃ«ndÃ« PoshtÃ«" 
+    9596 "Kuti Vizatimi LehtÃ« MajtÃ« dhe RÃ«ndÃ« DjathtÃ«" 
+    9597 "Kuti Vizatimi LehtÃ« Lart dhe RÃ«ndÃ« PoshtÃ«" 
+    9598 "Kuti Vizatimi RÃ«ndÃ« MajtÃ« dhe LehtÃ« DjathtÃ«" 
+    9599 "Kuti Vizatimi RÃ«ndÃ« Lart dhe LehtÃ« PoshtÃ«" 
+    9600 "SipÃ«rm GjysmÃ« Bllok" 
+    9601 "MÃ« i'ulÃ«t NjÃ« TetÃ« Bllok" 
+    9602 "MÃ« i'ulÃ«t NjÃ« Ã‡erek Bllok" 
+    9603 "MÃ« i'ulÃ«t Tre i TetÃ« Bllok" 
+    9604 "MÃ« i'ulÃ«t GjysmÃ« Bllok" 
+    9605 "MÃ« i'ulÃ«t PesÃ« i TetÃ« Bllok" 
+    9606 "MÃ« i'ulÃ«t Tre Ã‡erek Bllok" 
+    9607 "MÃ« i'ulÃ«t ShtatÃ« i TetÃ« Bllok" 
+    9608 "Bllok PlotÃ«" 
+    9609 "MajtÃ« ShtatÃ« i TetÃ« Bllok" 
+    9610 "MajtÃ« Tre Ã‡erek Bllok" 
+    9611 "MajtÃ« PesÃ« i TetÃ« Bllok" 
+    9612 "MajtÃ« GjysmÃ« Bllok" 
+    9613 "MajtÃ« Tre i TetÃ« Bllok" 
+    9614 "MajtÃ« NjÃ« Ã‡erek Bllok" 
+    9615 "MajtÃ« NjÃ« TetÃ« Bllok" 
+    9616 "DjathtÃ« GjysmÃ« Bllok" 
+    9617 "LehtÃ« Hije" 
+    9618 "Medium Hije" 
+    9619 "Dark Hije" 
+    9620 "SipÃ«rm NjÃ« TetÃ« Bllok" 
+    9621 "DjathtÃ« NjÃ« TetÃ« Bllok" 
+    9622 "Ã‡erek-rrethi MÃ« i'ulÃ«t MajtÃ«" 
+    9623 "Ã‡erek-rrethi MÃ« i'ulÃ«t DjathtÃ«" 
+    9624 "Ã‡erek-rrethi SipÃ«rm MajtÃ«" 
+    9625 "Ã‡erek-rrethi SipÃ«rm MajtÃ« dhe MÃ« i'ulÃ«t MajtÃ« dhe MÃ« i'ulÃ«t DjathtÃ«" 
+    9626 "Ã‡erek-rrethi SipÃ«rm MajtÃ« dhe MÃ« i'ulÃ«t DjathtÃ«" 
+    9627 "Ã‡erek-rrethi SipÃ«rm MajtÃ« dhe SipÃ«rm DjathtÃ« dhe MÃ« i'ulÃ«t MajtÃ«" 
+    9628 "Ã‡erek-rrethi SipÃ«rm MajtÃ« dhe SipÃ«rm DjathtÃ« dhe MÃ« i'ulÃ«t DjathtÃ«" 
+    9629 "Ã‡erek-rrethi SipÃ«rm DjathtÃ«" 
+    9630 "Ã‡erek-rrethi SipÃ«rm DjathtÃ« dhe MÃ« i'ulÃ«t MajtÃ«" 
+    9631 "Ã‡erek-rrethi SipÃ«rm DjathtÃ« dhe MÃ« i'ulÃ«t MajtÃ« dhe MÃ« i'ulÃ«t DjathtÃ«" 
+    9632 "e ZezÃ« Katror" 
+    9633 "e BardhÃ« Katror" 
+    9634 "e BardhÃ« Katror Me Rrethore KÃ«ndet" 
+    9635 "e BardhÃ« Katror PÃ«rmbaj e ZezÃ« e VogÃ«l Katror" 
+    9636 "Katror Me Horizontal Fill" 
+    9637 "Katror Me Vertikale Fill" 
+    9638 "Katror Me Ortogonal Crosshatch Fill" 
+    9639 "Katror Me SipÃ«rm MajtÃ« Me MÃ« i'ulÃ«t DjathtÃ« Fill" 
+    9640 "Katror Me SipÃ«rm DjathtÃ« Me MÃ« i'ulÃ«t MajtÃ« Fill" 
+    9641 "Katror Me Diagonal Crosshatch Fill" 
+    9642 "e ZezÃ« e VogÃ«l Katror" 
+    9643 "e BardhÃ« e VogÃ«l Katror" 
+    9644 "e ZezÃ« DrejtkÃ«ndÃ«sh" 
+    9645 "e BardhÃ« DrejtkÃ«ndÃ«sh" 
+    9646 "e ZezÃ« Vertikale DrejtkÃ«ndÃ«sh" 
+    9647 "e BardhÃ« Vertikale DrejtkÃ«ndÃ«sh" 
+    9648 "e ZezÃ« Parallelogram" 
+    9649 "e BardhÃ« Parallelogram" 
+    9650 "e ZezÃ« Lart-Treguese TrekÃ«ndÃ«sh" 
+    9651 "e BardhÃ« Lart-Treguese TrekÃ«ndÃ«sh" 
+    9652 "e ZezÃ« Lart-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9653 "e BardhÃ« Lart-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9654 "e ZezÃ« DjathtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9655 "e BardhÃ« DjathtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9656 "e ZezÃ« DjathtÃ«-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9657 "e BardhÃ« DjathtÃ«-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9658 "e ZezÃ« DjathtÃ«-Treguese Pointer" 
+    9659 "e BardhÃ« DjathtÃ«-Treguese Pointer" 
+    9660 "e ZezÃ« PoshtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9661 "e BardhÃ« PoshtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9662 "e ZezÃ« PoshtÃ«-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9663 "e BardhÃ« PoshtÃ«-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9664 "e ZezÃ« MajtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9665 "e BardhÃ« MajtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9666 "e ZezÃ« MajtÃ«-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9667 "e BardhÃ« MajtÃ«-Treguese e VogÃ«l TrekÃ«ndÃ«sh" 
+    9668 "e ZezÃ« MajtÃ«-Treguese Pointer" 
+    9669 "e BardhÃ« MajtÃ«-Treguese Pointer" 
+    9670 "e ZezÃ« Diamant" 
+    9671 "e BardhÃ« Diamant" 
+    9672 "e BardhÃ« Diamant PÃ«rmbaj e ZezÃ« e VogÃ«l Diamant" 
+    9673 "Fishek" 
+    9674 "Loz-enge" 
+    9675 "e BardhÃ« Rreth" 
+    9676 "Pika-Pika Rreth" 
+    9677 "Rreth Me Vertikale Fill" 
+    9678 "NÃ«-sy" 
+    9679 "e ZezÃ« Rreth" 
+    9680 "Rreth Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    9681 "Rreth Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    9682 "Rreth Me MÃ« i'ulÃ«t GjysmÃ« e ZezÃ«" 
+    9683 "Rreth Me SipÃ«rm GjysmÃ« e ZezÃ«" 
+    9684 "Rreth Me SipÃ«rm DjathtÃ« Ã‡erek-rrethi e ZezÃ«" 
+    9685 "Rreth Me All But SipÃ«rm MajtÃ« Ã‡erek-rrethi e ZezÃ«" 
+    9686 "MajtÃ« GjysmÃ« e ZezÃ« Rreth" 
+    9687 "DjathtÃ« GjysmÃ« e ZezÃ« Rreth" 
+    9688 "Inverse Plumb" 
+    9689 "Inverse e BardhÃ« Rreth" 
+    9690 "SipÃ«rm GjysmÃ« Inverse e BardhÃ« Rreth" 
+    9691 "MÃ« i'ulÃ«t GjysmÃ« Inverse e BardhÃ« Rreth" 
+    9692 "SipÃ«rm MajtÃ« Ã‡erek-rrethi Qarkore Arc" 
+    9693 "SipÃ«rm DjathtÃ« Ã‡erek-rrethi Qarkore Arc" 
+    9694 "MÃ« i'ulÃ«t DjathtÃ« Ã‡erek-rrethi Qarkore Arc" 
+    9695 "MÃ« i'ulÃ«t MajtÃ« Ã‡erek-rrethi Qarkore Arc" 
+    9696 "SipÃ«rm GjysmÃ« Rreth" 
+    9697 "MÃ« i'ulÃ«t GjysmÃ« Rreth" 
+    9698 "e ZezÃ« MÃ« i'ulÃ«t DjathtÃ« TrekÃ«ndÃ«sh" 
+    9699 "e ZezÃ« MÃ« i'ulÃ«t MajtÃ« TrekÃ«ndÃ«sh" 
+    9700 "e ZezÃ« SipÃ«rm MajtÃ« TrekÃ«ndÃ«sh" 
+    9701 "e ZezÃ« SipÃ«rm DjathtÃ« TrekÃ«ndÃ«sh" 
+    9702 "e BardhÃ« Plumb" 
+    9703 "Katror Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    9704 "Katror Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    9705 "Katror Me SipÃ«rm MajtÃ« Diagonal GjysmÃ« e ZezÃ«" 
+    9706 "Katror Me MÃ« i'ulÃ«t DjathtÃ« Diagonal GjysmÃ« e ZezÃ«" 
+    9707 "e BardhÃ« Katror Me Vertikale Bisecting LinjÃ«" 
+    9708 "e BardhÃ« Lart-Treguese TrekÃ«ndÃ«sh Me PikÃ«" 
+    9709 "Lart-Treguese TrekÃ«ndÃ«sh Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    9710 "Lart-Treguese TrekÃ«ndÃ«sh Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    9711 "Madhe Rreth" 
+    9712 "E BardhÃ« Katror Me SipÃ«rm MajtÃ« Ã‡erek-rrethi" 
+    9713 "E BardhÃ« Katror Me MÃ« i'ulÃ«t MajtÃ« Ã‡erek-rrethi" 
+    9714 "E BardhÃ« Katror Me MÃ« i'ulÃ«t DjathtÃ« Ã‡erek-rrethi" 
+    9715 "E BardhÃ« Katror Me SipÃ«rm DjathtÃ« Ã‡erek-rrethi" 
+    9716 "E BardhÃ« Rreth Me SipÃ«rm MajtÃ« Ã‡erek-rrethi" 
+    9717 "E BardhÃ« Rreth Me MÃ« i'ulÃ«t MajtÃ« Ã‡erek-rrethi" 
+    9718 "E BardhÃ« Rreth Me MÃ« i'ulÃ«t DjathtÃ« Ã‡erek-rrethi" 
+    9719 "E BardhÃ« Rreth Me SipÃ«rm DjathtÃ« Ã‡erek-rrethi" 
+    9720 "SipÃ«rm MajtÃ« TrekÃ«ndÃ«sh" 
+    9721 "SipÃ«rm DjathtÃ« TrekÃ«ndÃ«sh" 
+    9722 "MÃ« i'ulÃ«t MajtÃ« TrekÃ«ndÃ«sh" 
+    9723 "E BardhÃ« Medium Katror" 
+    9724 "E ZezÃ« Medium Katror" 
+    9725 "E BardhÃ« Medium e VogÃ«l Katror" 
+    9726 "E ZezÃ« Medium e VogÃ«l Katror" 
+    9727 "MÃ« i'ulÃ«t DjathtÃ« TrekÃ«ndÃ«sh" 
+    9728 "E ZezÃ« Sun Me Rays" 
+    9729 "Cloud" 
+    9730 "Ã‡adÃ«r" 
+    9731 "BurrÃ«-DÃ«bore" 
+    9732 "Komet" 
+    9733 "E ZezÃ« Yll" 
+    9734 "E BardhÃ« Yll" 
+    9735 "VetÃ«timÃ«" 
+    9736 "Stuhi" 
+    9737 "Diell" 
+    9738 "Nyje nÃ« Ngjitje" 
+    9739 "Nyje nÃ« Zbritje" 
+    9740 "Lidhje" 
+    9741 "OpozitÃ«" 
+    9742 "E ZezÃ« Telefon" 
+    9743 "E BardhÃ« Telefon" 
+    9744 "Ballot Kuti" 
+    9745 "Ballot Kuti Me Kontrollo" 
+    9746 "Ballot Kuti Me X" 
+    9747 "Saltire" 
+    9748 "Ã‡adÃ«r Me Pika Shiu" 
+    9749 "Pije NxehtÃ«" 
+    9750 "E BardhÃ« Shogi CopÃ«" 
+    9751 "E ZezÃ« Shogi CopÃ«" 
+    9752 "Shamrock" 
+    9753 "KundÃ«rt Rrotulluar Zemra Lule Plumb" 
+    9754 "E ZezÃ« MajtÃ« Treguese Indeks" 
+    9755 "E ZezÃ« DjathtÃ« Treguese Indeks" 
+    9756 "E BardhÃ« MajtÃ« Treguese Indeks" 
+    9757 "E BardhÃ« Lart Treguese Indeks" 
+    9758 "E BardhÃ« DjathtÃ« Treguese Indeks" 
+    9759 "E BardhÃ« PoshtÃ« Treguese Indeks" 
+    9760 "KafkÃ« dhe Crossbones" 
+    9761 "Kujdes ShenjÃ«" 
+    9762 "Radioaktiv ShenjÃ«" 
+    9763 "Biohazard ShenjÃ«" 
+    9764 "Caduceus" 
+    9765 "Ankh" 
+    9766 "Ortodoks Kryq" 
+    9767 "Chi Rho" 
+    9768 "Kryq i Lorraine" 
+    9769 "Kryq i Jerusalem" 
+    9770 "Yll dhe HÃ«nÃ« e Re" 
+    9771 "Farsi Simbol" 
+    9772 "Adi Shakti" 
+    9773 "Ã‡ekiÃ§ dhe DrapÃ«r" 
+    9774 "Simbol Paqe" 
+    9775 "Yin Yang" 
+    9776 "Trigram PÃ«r Qiell" 
+    9777 "Trigram PÃ«r Lake" 
+    9778 "Trigram PÃ«r Fire" 
+    9779 "Trigram PÃ«r BubullimÃ«" 
+    9780 "Trigram PÃ«r ErÃ«" 
+    9781 "Trigram PÃ«r UjÃ«" 
+    9782 "Trigram PÃ«r Male" 
+    9783 "Trigram PÃ«r Toka" 
+    9784 "Wheel Of Dharma" 
+    9785 "e BardhÃ« Vrenjt FytyrÃ«" 
+    9786 "E BardhÃ« Qeshur FytyrÃ«" 
+    9787 "E ZezÃ« Qeshur FytyrÃ«" 
+    9788 "e BardhÃ« Sun Me Rays" 
+    9789 "HÃ«na e ParÃ« Ã‡erek" 
+    9790 "HÃ«na e Fundit Ã‡erek" 
+    9791 "Merkuri" 
+    9792 "ShenjÃ« FemÃ«rore" 
+    9793 "Toka" 
+    9794 "Male ShenjÃ«" 
+    9795 "Jupiteri" 
+    9796 "Saturn" 
+    9797 "Uranus" 
+    9798 "Neptune" 
+    9799 "Pluto" 
+    9800 "Aries" 
+    9801 "Demi" 
+    9802 "BinjakÃ«t" 
+    9803 "Gaforrja" 
+    9804 "Luani" 
+    9805 "VirgjÃ«resha" 
+    9806 "Peshorja" 
+    9807 "Akrepi" 
+    9808 "Shigjetari" 
+    9809 "Bricjapi" 
+    9810 "Ujori" 
+    9811 "Peshqit" 
+    9812 "E BardhÃ« Shah Mbret" 
+    9813 "E BardhÃ« Shah MbretÃ«reshÃ«" 
+    9814 "E BardhÃ« Shah TorrÃ«" 
+    9815 "E BardhÃ« Shah Oficer" 
+    9816 "E BardhÃ« Shah KalÃ«" 
+    9817 "E BardhÃ« Shah UshtarÃ«" 
+    9818 "E ZezÃ« Shah Mbret" 
+    9819 "E ZezÃ« Shah MbretÃ«reshÃ«" 
+    9820 "E ZezÃ« Shah TorrÃ«" 
+    9821 "E ZezÃ« Shah Oficer" 
+    9822 "E ZezÃ« Shah KalÃ«" 
+    9823 "E ZezÃ« Shah UshtarÃ«" 
+    9824 "E ZezÃ« Spade Suit" 
+    9825 "E BardhÃ« ZemÃ«r Suit" 
+    9826 "E BardhÃ« Diamant Suit" 
+    9827 "E ZezÃ« Club Suit" 
+    9828 "E BardhÃ« Spade Suit" 
+    9829 "E ZezÃ« ZemÃ«r Suit" 
+    9830 "E ZezÃ« Diamant Suit" 
+    9831 "E BardhÃ« Club Suit" 
+    9832 "Hot Springs" 
+    9833 "Ã‡erek Note" 
+    9834 "TetÃ« Note" 
+    9835 "Beamed TetÃ« Notes" 
+    9836 "Beamed gjashtÃ«mbÃ«dhjetÃ« Notes" 
+    9837 "MuzikÃ« sheshtÃ« ShenjÃ«" 
+    9838 "MuzikÃ« Natyrale ShenjÃ«" 
+    9839 "MuzikÃ« FortÃ« ShenjÃ«" 
+    9840 "PerÃ«ndimi Siriane Kryq" 
+    9841 "Lindja Siriane Kryq" 
+    9842 "Universal Riciklimit Simbol" 
+    9843 "Riciklimit Simbol PÃ«r Tipi-1 Plastika" 
+    9844 "Riciklimit Simbol PÃ«r Tipi-2 Plastika" 
+    9845 "Riciklimit Simbol PÃ«r Tipi-3 Plastika" 
+    9846 "Riciklimit Simbol PÃ«r Tipi-4 Plastika" 
+    9847 "Riciklimit Simbol PÃ«r Tipi-5 Plastika" 
+    9848 "Riciklimit Simbol PÃ«r Tipi-6 Plastika" 
+    9849 "Riciklimit Simbol PÃ«r Tipi-7 Plastika" 
+    9850 "Riciklimit Simbol PÃ«r Gjenerim Material" 
+    9851 "e ZezÃ« Universal Riciklimit Simbol" 
+    9852 "Ricikluar LetÃ«r Simbol" 
+    9853 "PjesÃ«risht-Ricikluar LetÃ«r Simbol" 
+    9854 "Permanent LetÃ«r ShenjÃ«" 
+    9855 "KarrocÃ« Simbol" 
+    9856 "Vdes FytyrÃ«-1" 
+    9857 "Vdes FytyrÃ«-2" 
+    9858 "Vdes FytyrÃ«-3" 
+    9859 "Vdes FytyrÃ«-4" 
+    9860 "Vdes FytyrÃ«-5" 
+    9861 "Vdes FytyrÃ«-6" 
+    9862 "e BardhÃ« Rreth Me PikÃ« DjathtÃ«" 
+    9863 "e BardhÃ« Rreth Me Dy PikÃ«" 
+    9864 "e ZezÃ« Rreth Me e BardhÃ« PikÃ« DjathtÃ«" 
+    9865 "e ZezÃ« Rreth Me Dy e BardhÃ« PikÃ«" 
+    9866 "Monogram PÃ«r Yang" 
+    9867 "Monogram PÃ«r Yin" 
+    9868 "Diagram PÃ«r Madhe Yang" 
+    9869 "Diagram PÃ«r VogÃ«l Yin" 
+    9870 "Diagram PÃ«r VogÃ«l Yang" 
+    9871 "Diagram PÃ«r Madhe Yin" 
+    9872 "e BardhÃ« Flamur" 
+    9873 "e ZezÃ« Flamur" 
+    9874 "Ã‡ekiÃ§ dhe Mbledh" 
+    9875 "SpirancÃ«" 
+    9876 "Shpata Kaluan" 
+    9877 "Staf i Aesculapius" 
+    9878 "Peshorja" 
+    9879 "Alembic" 
+    9880 "Lule" 
+    9881 "Marsh" 
+    9882 "Staf i  Hermes" 
+    9883 "Atom Simbol" 
+    9884 "Fleur-De-Lis" 
+    9885 "PÃ«rshkruara e BardhÃ« Yll" 
+    9886 "Tre Linja KonvertojnÃ« DjathtÃ«" 
+    9887 "Tre Linja KonvertojnÃ« MajtÃ«" 
+    9888 "ShenjÃ« Kujdes" 
+    9889 "Lart Voltazh ShenjÃ«" 
+    9890 "Dyfishuar FemÃ«r ShenjÃ«" 
+    9891 "Dyfishuar Mashkull ShenjÃ«" 
+    9892 "Kombinuar FemÃ«r dhe Male ShenjÃ«" 
+    9893 "Male dhe FemÃ«r ShenjÃ«" 
+    9894 "Male Me Goditje ShenjÃ«" 
+    9895 "Male Me Goditje dhe Male dhe FemÃ«r ShenjÃ«" 
+    9896 "Vertikale Male Me Goditje ShenjÃ«" 
+    9897 "Horizontal Male Me Goditje ShenjÃ«" 
+    9898 "Medium e BardhÃ« Rreth" 
+    9899 "Medium e ZezÃ« Rreth" 
+    9900 "Medium e VogÃ«l e BardhÃ« Rreth" 
+    9901 "Simbol Martese" 
+    9902 "Divorce Simbol" 
+    9903 "Simbol Partneritet i Pamartuar" 
+    9904 "Arkivol" 
+    9905 "Funeral Urn" 
+    9906 "PaanshÃ«m" 
+    9907 "Ceres" 
+    9908 "Pallas" 
+    9909 "Juno" 
+    9910 "Vesta" 
+    9911 "Chiron" 
+    9912 "E ZezÃ« HÃ«nÃ« Lilith" 
+    9913 "Sextile" 
+    9914 "Semisextile" 
+    9915 "Quincunx" 
+    9916 "Sesquiquadrate" 
+    9917 "Top Futbolli" 
+    9918 "Bejsball" 
+    9919 "Katror Ã‡elÃ«s" 
+    9920 "E BardhÃ« SkicÃ« Man" 
+    9921 "E BardhÃ« SkicÃ« Mbret" 
+    9922 "E ZezÃ« SkicÃ« Man" 
+    9923 "E ZezÃ« SkicÃ« Mbret" 
+    9924 "BurrÃ« Debore UnÃ«jashtÃ« DeborÃ«" 
+    9925 "Dielli Pas Reve" 
+    9926 "Shi" 
+    9927 "E ZezÃ« BurrÃ« DeborÃ«" 
+    9928 "BubullimÃ« Re dhe Shi" 
+    9929 "Kthyer e BardhÃ« Shogi CopÃ«" 
+    9930 "Kthyer e ZezÃ« Shogi CopÃ«" 
+    9931 "e BardhÃ« Diamant In Katror" 
+    9932 "Kalim Korsi" 
+    9933 "MakinÃ« Kufizuar" 
+    9934 "Ophiuchus" 
+    9935 "Mbledh" 
+    9936 "MakinÃ« RrÃ«shqitÃ«se" 
+    9937 "Helmet Me e BardhÃ« Kryq" 
+    9938 "Rrethuar Kalim korsi" 
+    9939 "ZinxhirÃ«" 
+    9940 "Jo Hyrje" 
+    9941 "Alternativ NjÃ«-RrugÃ« MajtÃ« RrugÃ« Trafik" 
+    9942 "e ZezÃ« Dy-RrugÃ« MajtÃ« RrugÃ« Trafik" 
+    9943 "e BardhÃ« Dy-RrugÃ« MajtÃ« RrugÃ« Trafik" 
+    9944 "e ZezÃ« MajtÃ« Bashkim Korsi" 
+    9945 "e BardhÃ« MajtÃ« Bashkim Korsi" 
+    9946 "ShenjÃ« Ec NgadalÃ«" 
+    9947 "RÃ«ndÃ« e BardhÃ« PoshtÃ«-Treguese TrekÃ«ndÃ«sh" 
+    9948 "MajtÃ« Mbyllur Hyrje" 
+    9949 "Katror Saltire" 
+    9950 "Bie Diagonal In e BardhÃ« Rreth In e ZezÃ« Katror" 
+    9951 "e ZezÃ« Kamion" 
+    9952 "Kufizuar MajtÃ« Hyrje-1" 
+    9953 "Kufizuar MajtÃ« Hyrje-2" 
+    9954 "Astronomie Simbol PÃ«r Uranus" 
+    9955 "RÃ«ndÃ« Rreth Me Goditje dhe Dy PikÃ« Lart" 
+    9956 "Pentagram" 
+    9957 "DjathtÃ«-KokÃ« GÃ«rshetohet Pentagram" 
+    9958 "MajtÃ«-KokÃ« GÃ«rshetohet Pentagram" 
+    9959 "Kthyer Pentagram" 
+    9960 "E ZezÃ« Kryq NÃ« Mburoje" 
+    9961 "Shinto Shrine" 
+    9962 "KishÃ«" 
+    9963 "KÃ«shtjedhÃ«" 
+    9964 "Vend historik" 
+    9965 "Marsh Meout QendÃ«r" 
+    9966 "Marsh Me Trajton" 
+    9967 "HartÃ« Simbol PÃ«r Far" 
+    9968 "Mal" 
+    9969 "Ã‡adÃ«r NÃ« TokÃ«" 
+    9970 "ShatÃ«rvan" 
+    9971 "Flamur nÃ« BirÃ«" 
+    9972 "Tren" 
+    9973 "Anie" 
+    9974 "Katror KatÃ«r KÃ«ndet" 
+    9975 "Ski" 
+    9976 "Patina" 
+    9977 "Person Me Top" 
+    9978 "TendÃ«" 
+    9979 "Japonisht Banke Simbol" 
+    9980 "KokÃ«fortÃ« RÃ«ndÃ«yard Simbol" 
+    9981 "PompÃ« Karburanti" 
+    9982 "E ZezÃ« Katror" 
+    9983 "E BardhÃ« Flamur Me Horizontal Mesit e ZezÃ« Shirit" 
+    9985 "SipÃ«rm GÃ«rshÃ«rÃ« ThikÃ«" 
+    9986 "e ZezÃ« GÃ«rshÃ«rÃ«" 
+    9987 "MÃ« i'ulÃ«t ThikÃ« GÃ«rshÃ«rÃ«" 
+    9988 "e BardhÃ« GÃ«rshÃ«rÃ«" 
+    9989 "e BardhÃ« RÃ«ndÃ« Kontrolloj ShenjÃ«" 
+    9990 "Telefon Vend ShenjÃ«" 
+    9991 "Shirit Shofer" 
+    9992 "Aeroplan" 
+    9993 "Zarf" 
+    9994 "Ngritur Pari" 
+    9995 "Ngritur DorÃ«" 
+    9996 "Fitore DorÃ«" 
+    9997 "Shkrim DorÃ«" 
+    9998 "MÃ« i'ulÃ«t DjathtÃ« Laps" 
+    9999 "Laps" 
+    10000 "SipÃ«rm DjathtÃ« Laps" 
+    10001 "e BardhÃ« Nib" 
+    10002 "e ZezÃ« Nib" 
+    10003 "Kontrolloj ShenjÃ«" 
+    10004 "RÃ«ndÃ« Kontrolloj ShenjÃ«" 
+    10005 "ShumÃ«zim X" 
+    10006 "RÃ«ndÃ« ShumÃ«zim X" 
+    10007 "Ballot X" 
+    10008 "RÃ«ndÃ« Ballot X" 
+    10009 "PÃ«rshkruara Greke Kryq" 
+    10010 "RÃ«ndÃ« Greke Kryq" 
+    10011 "Hap Qendra Kryq" 
+    10012 "RÃ«ndÃ« Hap Qendra Kryq" 
+    10013 "Latin Kryq" 
+    10014 "Hije e BardhÃ« Latin Kryq" 
+    10015 "PÃ«rshkruara Latin Kryq" 
+    10016 "Malte Kryq" 
+    10017 "Yll i David" 
+    10018 "KatÃ«r Lot-Foli Yll" 
+    10019 "KatÃ«r Balloon-Spoked Yll" 
+    10020 "RÃ«ndÃ« KatÃ«r Balloon-Spoked Yll" 
+    10021 "KatÃ«r Klub-Foli Yll" 
+    10022 "e ZezÃ« KatÃ«r DukshÃ«m Yll" 
+    10023 "e BardhÃ« KatÃ«r DukshÃ«m Yll" 
+    10024 "Sparkles" 
+    10025 "Stress PÃ«rshkruara e BardhÃ« Yll" 
+    10026 "Rrethuar e BardhÃ« Yll" 
+    10027 "Hap Qendra e ZezÃ« Yll" 
+    10028 "e ZezÃ« Qendra e BardhÃ« Yll" 
+    10029 "PÃ«rshkruara e ZezÃ« Yll" 
+    10030 "RÃ«ndÃ« PÃ«rshkruara e ZezÃ« Yll" 
+    10031 "Rrotapin Yll" 
+    10032 "Hije e BardhÃ« Yll" 
+    10033 "RÃ«ndÃ« Yll" 
+    10034 "Hap Qendra Yll" 
+    10035 "TetÃ« Spoked Yll" 
+    10036 "TetÃ« DukshÃ«m e ZezÃ« Yll" 
+    10037 "TetÃ« DukshÃ«m Rrotapin Yll" 
+    10038 "GjashtÃ« DukshÃ«m e ZezÃ« Yll" 
+    10039 "TetÃ« DukshÃ«m drejtvizor e ZezÃ« Yll" 
+    10040 "RÃ«ndÃ« TetÃ« DukshÃ«m drejtvizor e ZezÃ« Yll" 
+    10041 "DymbÃ«dhjetÃ« DukshÃ«m e ZezÃ« Yll" 
+    10042 "GjashtÃ«mbÃ«dhjetÃ« DukshÃ«m Yll" 
+    10043 "Lot-Spoked Yll" 
+    10044 "Hap Qendra Lot-Spoked Yll" 
+    10045 "RÃ«ndÃ« Lot-Spoked Yll" 
+    10046 "GjashtÃ« Petalled e ZezÃ« dhe e BardhÃ« Florette" 
+    10047 "e ZezÃ« Florette" 
+    10048 "e BardhÃ« Florette" 
+    10049 "TetÃ« Petalled PÃ«rshkruara e ZezÃ« Florette" 
+    10050 "Rrethuar Hap Qendra TetÃ« DukshÃ«m Yll" 
+    10051 "RÃ«ndÃ« Lot-Spoked Rrotapin Yll" 
+    10052 "Fol-Bore" 
+    10053 "NgushtÃ« Trifoliate Flok DÃ«bore" 
+    10054 "RÃ«ndÃ« Chevron Flok DÃ«bore" 
+    10055 "VetÃ«tin" 
+    10056 "RÃ«ndÃ« VetÃ«tin" 
+    10057 "Balloon-Spoked Yll" 
+    10058 "TetÃ« Lot-Spoked HelikÃ« Yll" 
+    10059 "RÃ«ndÃ« TetÃ« Lot-Spoked HelikÃ« Yll" 
+    10060 "Kryq ShenjÃ«" 
+    10061 "Hije e BardhÃ« Rreth" 
+    10062 "Negative Katror Kryq ShenjÃ«" 
+    10063 "MÃ« i'ulÃ«t DjathtÃ« Drop-Hije e BardhÃ« Katror" 
+    10064 "SipÃ«rm DjathtÃ« Drop-Hije e BardhÃ« Katror" 
+    10065 "MÃ« i'ulÃ«t DjathtÃ« Hije e BardhÃ« Katror" 
+    10066 "SipÃ«rm DjathtÃ« Hije e BardhÃ« Katror" 
+    10067 "e ZezÃ« Pyetje ShenjÃ« Ornament" 
+    10068 "e BardhÃ« Pyetje ShenjÃ« Ornament" 
+    10069 "e BardhÃ« Thirrje ShenjÃ« Ornament" 
+    10070 "e ZezÃ« Diamant Minus e BardhÃ« X" 
+    10071 "RÃ«ndÃ« Thirrje ShenjÃ« Simbol" 
+    10072 "LehtÃ« Vertikale Bar" 
+    10073 "Medium Vertikale Bar" 
+    10074 "RÃ«ndÃ« Vertikale Bar" 
+    10075 "RÃ«ndÃ« E VetÃ«m Kthyer Presje Citat ShenjÃ« Ornament" 
+    10076 "RÃ«ndÃ« E VetÃ«m Presje Citat ShenjÃ« Ornament" 
+    10077 "RÃ«ndÃ« Dyshe Kthyer Presje Citat ShenjÃ« Ornament" 
+    10078 "RÃ«ndÃ« Dyshe Presje Citat ShenjÃ« Ornament" 
+    10079 "RÃ«ndÃ« UlÃ«t E VetÃ«m Presje Citat ShenjÃ« Ornament" 
+    10080 "RÃ«ndÃ« UlÃ«t Dyshe Presje Citat ShenjÃ« Ornament" 
+    10081 "Dredhur Stem Paragraf ShenjÃ« Ornament" 
+    10082 "RÃ«ndÃ« Thirrje ShenjÃ« Ornament" 
+    10083 "RÃ«ndÃ« ZemÃ«r Thirrje ShenjÃ« Ornament" 
+    10084 "RÃ«ndÃ« e ZezÃ« ZemÃ«r" 
+    10085 "Rrotulluar RÃ«ndÃ« e ZezÃ« ZemÃ«r Plumb" 
+    10086 "Lule ZemÃ«r" 
+    10087 "Rrotulluar Lule ZemÃ«r Plumb" 
+    10088 "Medium MajtÃ« KllapÃ« Ornament" 
+    10089 "Medium DjathtÃ« KllapÃ« Ornament" 
+    10090 "Medium Rrafshuar MajtÃ« KllapÃ« Ornament" 
+    10091 "Medium Rrafshuar DjathtÃ« KllapÃ« Ornament" 
+    10092 "Medium MajtÃ«-Treguese KÃ«nd Kllapa Ornament" 
+    10093 "Medium DjathtÃ«-Treguese KÃ«nd Kllapa Ornament" 
+    10094 "RÃ«ndÃ« MajtÃ«-Treguese KÃ«nd Citat ShenjÃ« Ornament" 
+    10095 "RÃ«ndÃ« DjathtÃ«-Treguese KÃ«nd Citat ShenjÃ« Ornament" 
+    10096 "RÃ«ndÃ« MajtÃ«-Treguese KÃ«nd Kllapa Ornament" 
+    10097 "RÃ«ndÃ« DjathtÃ«-Treguese KÃ«nd Kllapa Ornament" 
+    10098 "LehtÃ« MajtÃ« Tortoise Shell Kllapa Ornament" 
+    10099 "LehtÃ« DjathtÃ« Tortoise Shell Kllapa Ornament" 
+    10100 "Medium MajtÃ« Dredhur Kllapa Ornament" 
+    10101 "Medium DjathtÃ« Dredhur Kllapa Ornament" 
+    10102 "Dingbat Negative Rrethuar ShifÃ«r NjÃ«" 
+    10103 "Dingbat Negative Rrethuar ShifÃ«r Dy" 
+    10104 "Dingbat Negative Rrethuar ShifÃ«r Tre" 
+    10105 "Dingbat Negative Rrethuar ShifÃ«r KatÃ«r" 
+    10106 "Dingbat Negative Rrethuar ShifÃ«r PesÃ«" 
+    10107 "Dingbat Negative Rrethuar ShifÃ«r GjashtÃ«" 
+    10108 "Dingbat Negative Rrethuar ShifÃ«r ShtatÃ«" 
+    10109 "Dingbat Negative Rrethuar ShifÃ«r TetÃ«" 
+    10110 "Dingbat Negative Rrethuar ShifÃ«r NÃ«ntÃ«" 
+    10111 "Dingbat Negative Rrethuar NumÃ«r DhjetÃ«" 
+    10112 "Dingbat Rrethuar Sans-Serif ShifÃ«r NjÃ«" 
+    10113 "Dingbat Rrethuar Sans-Serif ShifÃ«r Dy" 
+    10114 "Dingbat Rrethuar Sans-Serif ShifÃ«r Tre" 
+    10115 "Dingbat Rrethuar Sans-Serif ShifÃ«r KatÃ«r" 
+    10116 "Dingbat Rrethuar Sans-Serif ShifÃ«r PesÃ«" 
+    10117 "Dingbat Rrethuar Sans-Serif ShifÃ«r GjashtÃ«" 
+    10118 "Dingbat Rrethuar Sans-Serif ShifÃ«r ShtatÃ«" 
+    10119 "Dingbat Rrethuar Sans-Serif ShifÃ«r TetÃ«" 
+    10120 "Dingbat Rrethuar Sans-Serif ShifÃ«r NÃ«ntÃ«" 
+    10121 "Dingbat Rrethuar Sans-Serif NumÃ«r DhjetÃ«" 
+    10122 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r NjÃ«" 
+    10123 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r Dy" 
+    10124 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r Tre" 
+    10125 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r KatÃ«r" 
+    10126 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r PesÃ«" 
+    10127 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r GjashtÃ«" 
+    10128 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r ShtatÃ«" 
+    10129 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r TetÃ«" 
+    10130 "Dingbat Negative Rrethuar Sans-Serif ShifÃ«r NÃ«ntÃ«" 
+    10131 "Dingbat Negative Rrethuar Sans-Serif NumÃ«r DhjetÃ«" 
+    10132 "RÃ«ndÃ« GjerÃ«-KokÃ« Djathtas ShigjetÃ«" 
+    10133 "RÃ«ndÃ« Plus ShenjÃ«" 
+    10134 "RÃ«ndÃ« Minus ShenjÃ«" 
+    10135 "RÃ«ndÃ« Ndarje ShenjÃ«" 
+    10136 "RÃ«ndÃ« Juglindje ShigjetÃ«" 
+    10137 "RÃ«ndÃ« Djathtas ShigjetÃ«" 
+    10138 "RÃ«ndÃ« Verilindje ShigjetÃ«" 
+    10139 "PikÃ« Hartimi Djathtas ShigjetÃ«" 
+    10140 "RÃ«ndÃ« Rreth-Informoi Djathtas ShigjetÃ«" 
+    10141 "TrekÃ«ndÃ«sh-KokÃ« Djathtas ShigjetÃ«" 
+    10142 "RÃ«ndÃ« TrekÃ«ndÃ«sh-KokÃ« Djathtas ShigjetÃ«" 
+    10143 "Thye TrekÃ«ndÃ«sh-KokÃ« Djathtas ShigjetÃ«" 
+    10144 "RÃ«ndÃ« Thye TrekÃ«ndÃ«sh-KokÃ« Djathtas ShigjetÃ«" 
+    10145 "e ZezÃ« Djathtas ShigjetÃ«" 
+    10146 "Tre-D SipÃ«rm-Ndezur Djathtas kokÃ«ShigjetÃ«" 
+    10147 "Tre-D Fund-Ndezur Djathtas KokÃ«ShigjetÃ«" 
+    10148 "e ZezÃ« Djathtas KokÃ«ShigjetÃ«" 
+    10149 "RÃ«ndÃ« e ZezÃ« Dredhur TeposhtÃ« dhe Djathtas ShigjetÃ«" 
+    10150 "RÃ«ndÃ« e ZezÃ« Dredhur PÃ«rpjetÃ« dhe Djathtas ShigjetÃ«" 
+    10151 "Mbledhje e ZezÃ« Djathtas ShigjetÃ«" 
+    10152 "RÃ«ndÃ« Concave-DukshÃ«m e ZezÃ« Djathtas ShigjetÃ«" 
+    10153 "DjathtÃ«-Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10154 "MajtÃ«-Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10155 "Mbrapa-Anoj Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10156 "Para-Anoj Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10157 "RÃ«ndÃ« MÃ« i'ulÃ«t DjathtÃ«-Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10158 "RÃ«ndÃ« SipÃ«rm DjathtÃ«-Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10159 "ShkallÃ« MÃ« i'ulÃ«t DjathtÃ«-Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10160 "Dredhur Loop" 
+    10161 "ShkallÃ« SipÃ«rm DjathtÃ«-Hije e BardhÃ« Djathtas ShigjetÃ«" 
+    10162 "Rrethuar RÃ«ndÃ« e BardhÃ« Djathtas ShigjetÃ«" 
+    10163 "E BardhÃ«-PendÃ« Djathtas ShigjetÃ«" 
+    10164 "E ZezÃ«-PendÃ« Juglindje ShigjetÃ«" 
+    10165 "E ZezÃ«-PendÃ« Djathtas ShigjetÃ«" 
+    10166 "E ZezÃ«-PendÃ« Verilindje ShigjetÃ«" 
+    10167 "RÃ«ndÃ« e ZezÃ«-PendÃ« Juglindje ShigjetÃ«" 
+    10168 "RÃ«ndÃ« e ZezÃ«-PendÃ« Djathtas ShigjetÃ«" 
+    10169 "RÃ«ndÃ« e ZezÃ«-PendÃ« Verilindje ShigjetÃ«" 
+    10170 "Lot-Barbed Djathtas ShigjetÃ«" 
+    10171 "RÃ«ndÃ« Lot-Shanked Djathtas ShigjetÃ«" 
+    10172 "Wedge-Tailed Djathtas ShigjetÃ«" 
+    10173 "RÃ«ndÃ« Wedge-Tailed Djathtas ShigjetÃ«" 
+    10174 "Hap-PÃ«rshkruara Djathtas ShigjetÃ«" 
+    10175 "Dyshe Dredhur Loop" 
+    10176 "Tre Dimensional KÃ«nd" 
+    10177 "e BardhÃ« TrekÃ«ndÃ«sh PÃ«rmbaj e VogÃ«l e BardhÃ« TrekÃ«ndÃ«sh" 
+    10178 "Pingul" 
+    10179 "Hap NÃ«n-vendos" 
+    10180 "Hap Mbi-vendos" 
+    10181 "MajtÃ« S-FormÃ« Ã‡antÃ« Deli-metri" 
+    10182 "DjathtÃ« S-FormÃ« Ã‡antÃ« Deli-metri" 
+    10183 "ose Me PikÃ« Brenda" 
+    10184 "Kthe-Mbrapsht Solidus ParaprirÃ« NÃ«n-vendos" 
+    10187 "Matematikisht Rritje Diagonal" 
+    10186 "Vertikale Bar Me Horizontal Goditje" 
+    10185 "Mbi-vendos ParaprirÃ« Solidus" 
+    10188 "GjatÃ« Ndarje" 
+    10189 "Matematikisht Bie Diagonal" 
+    10190 "Katror Logjike dhe" 
+    10191 "Katror Logjike ose" 
+    10192 "e BardhÃ« Diamant Me QendÃ«r PikÃ«" 
+    10193 "dhe Me PikÃ«" 
+    10194 "Element i Hapjes PÃ«rpjetÃ«" 
+    10195 "MÃ« i'ulÃ«t DjathtÃ« KÃ«nd Me PikÃ«" 
+    10196 "SipÃ«rm MajtÃ« KÃ«nd Me PikÃ«" 
+    10197 "Hyrja Jashtme MajtÃ«" 
+    10198 "Hyrja Jashtme DjathtÃ«" 
+    10199 "Hyrja Jashtme PlotÃ«" 
+    10200 "Madhe Lart Litar" 
+    10201 "Madhe PoshtÃ« Litar" 
+    10202 "MajtÃ« dhe Djathtas Dyshe Timon" 
+    10203 "MajtÃ« dhe DjathtÃ« Litar" 
+    10204 "MajtÃ« ShumÃ«hartÃ« " 
+    10205 "GjatÃ« DjathtÃ« Litar" 
+    10206 "GjatÃ« MajtÃ« Litar" 
+    10207 "Lart Litar Me Rreth Lart" 
+    10208 "TabletÃ« Divided By Horizontal Rule" 
+    10209 "e BardhÃ« konkav-njÃ«anshÃ«m Diamant" 
+    10210 "e BardhÃ« konkav-njÃ«anshÃ«m Diamant Me Majtas ShenjÃ«" 
+    10211 "e BardhÃ« konkav-njÃ«anshÃ«m Diamant Me Djathtas ShenjÃ«" 
+    10212 "e BardhÃ« Katror Me Majtas ShenjÃ«" 
+    10213 "e BardhÃ« Katror Me Djathtas ShenjÃ«" 
+    10214 "Matematik MajtÃ« e BardhÃ« Katror Kllapa" 
+    10215 "Matematik DjathtÃ« e BardhÃ« Katror Kllapa" 
+    10216 "Matematik MajtÃ« KÃ«nd Kllapa" 
+    10217 "Matematik DjathtÃ« KÃ«nd Kllapa" 
+    10218 "Matematik Majtas Dyshe KÃ«nd Kllapa" 
+    10219 "Matematik Djathtas Dyshe KÃ«nd Kllapa" 
+    10220 "Matematik MajtÃ« e BardhÃ« Tortoise Shell Kllapa" 
+    10221 "Matematik DjathtÃ« e BardhÃ« Tortoise Shell Kllapa" 
+    10222 "Matematik MajtÃ« Rrafshuar KllapÃ«" 
+    10223 "Matematik DjathtÃ« Rrafshuar KllapÃ«" 
+    10224 "PÃ«rpjetÃ« KatÃ«rfish ShigjetÃ«" 
+    10225 "TeposhtÃ« KatÃ«rfish ShigjetÃ«" 
+    10226 "KundÃ«r-Akrepa VrimÃ« Rreth ShigjetÃ«" 
+    10227 "Drejtim-Akrepa VrimÃ« Rreth ShigjetÃ«" 
+    10228 "DjathtÃ« ShigjetÃ« Me Rrethuar Plus" 
+    10229 "GjatÃ« Majtas ShigjetÃ«" 
+    10230 "GjatÃ« Djathtas ShigjetÃ«" 
+    10231 "GjatÃ« Majtas Djathtas ShigjetÃ«" 
+    10232 "GjatÃ« Majtas Dyshe ShigjetÃ«" 
+    10233 "GjatÃ« Djathtas Dyshe ShigjetÃ«" 
+    10234 "GjatÃ« MajtÃ« Djathtas Dyshe ShigjetÃ«" 
+    10235 "GjatÃ« Majtas ShigjetÃ« Nga Bar" 
+    10236 "GjatÃ« Djathtas ShigjetÃ« Nga Bar" 
+    10237 "GjatÃ« Majtas Dyshe ShigjetÃ« Nga Bar" 
+    10238 "GjatÃ« Djathtas Dyshe ShigjetÃ« Nga Bar" 
+    10239 "GjatÃ« Djathtas Squiggle ShigjetÃ«" 
+    10240 "Braille StrukturÃ« Bosh" 
+    10241 "Braille StrukturÃ« PikÃ«-1" 
+    10242 "Braille StrukturÃ« PikÃ«-2" 
+    10243 "Braille StrukturÃ« PikÃ«-12" 
+    10244 "Braille StrukturÃ« PikÃ«-3" 
+    10245 "Braille StrukturÃ« PikÃ«-13" 
+    10246 "Braille StrukturÃ« PikÃ«-23" 
+    10247 "Braille StrukturÃ« PikÃ«-123" 
+    10248 "Braille StrukturÃ« PikÃ«-4" 
+    10249 "Braille StrukturÃ« PikÃ«-14" 
+    10250 "Braille StrukturÃ« PikÃ«-24" 
+    10251 "Braille StrukturÃ« PikÃ«-124" 
+    10252 "Braille StrukturÃ« PikÃ«-34" 
+    10253 "Braille StrukturÃ« PikÃ«-134" 
+    10254 "Braille StrukturÃ« PikÃ«-234" 
+    10255 "Braille StrukturÃ« PikÃ«-1234" 
+    10256 "Braille StrukturÃ« PikÃ«-5" 
+    10257 "Braille StrukturÃ« PikÃ«-15" 
+    10258 "Braille StrukturÃ« PikÃ«-25" 
+    10259 "Braille StrukturÃ« PikÃ«-125" 
+    10260 "Braille StrukturÃ« PikÃ«-35" 
+    10261 "Braille StrukturÃ« PikÃ«-135" 
+    10262 "Braille StrukturÃ« PikÃ«-235" 
+    10263 "Braille StrukturÃ« PikÃ«-1235" 
+    10264 "Braille StrukturÃ« PikÃ«-45" 
+    10265 "Braille StrukturÃ« PikÃ«-145" 
+    10266 "Braille StrukturÃ« PikÃ«-245" 
+    10267 "Braille StrukturÃ« PikÃ«-1245" 
+    10268 "Braille StrukturÃ« PikÃ«-345" 
+    10269 "Braille StrukturÃ« PikÃ«-1345" 
+    10270 "Braille StrukturÃ« PikÃ«-2345" 
+    10271 "Braille StrukturÃ« PikÃ«-12345" 
+    10272 "Braille StrukturÃ« PikÃ«-6" 
+    10273 "Braille StrukturÃ« PikÃ«-16" 
+    10274 "Braille StrukturÃ« PikÃ«-26" 
+    10275 "Braille StrukturÃ« PikÃ«-126" 
+    10276 "Braille StrukturÃ« PikÃ«-36" 
+    10277 "Braille StrukturÃ« PikÃ«-136" 
+    10278 "Braille StrukturÃ« PikÃ«-236" 
+    10279 "Braille StrukturÃ« PikÃ«-1236" 
+    10280 "Braille StrukturÃ« PikÃ«-46" 
+    10281 "Braille StrukturÃ« PikÃ«-146" 
+    10282 "Braille StrukturÃ« PikÃ«-246" 
+    10283 "Braille StrukturÃ« PikÃ«-1246" 
+    10284 "Braille StrukturÃ« PikÃ«-346" 
+    10285 "Braille StrukturÃ« PikÃ«-1346" 
+    10286 "Braille StrukturÃ« PikÃ«-2346" 
+    10287 "Braille StrukturÃ« PikÃ«-12346" 
+    10288 "Braille StrukturÃ« PikÃ«-56" 
+    10289 "Braille StrukturÃ« PikÃ«-156" 
+    10290 "Braille StrukturÃ« PikÃ«-256" 
+    10291 "Braille StrukturÃ« PikÃ«-1256" 
+    10292 "Braille StrukturÃ« PikÃ«-356" 
+    10293 "Braille StrukturÃ« PikÃ«-1356" 
+    10294 "Braille StrukturÃ« PikÃ«-2356" 
+    10295 "Braille StrukturÃ« PikÃ«-12356" 
+    10296 "Braille StrukturÃ« PikÃ«-456" 
+    10297 "Braille StrukturÃ« PikÃ«-1456" 
+    10298 "Braille StrukturÃ« PikÃ«-2456" 
+    10299 "Braille StrukturÃ« PikÃ«-12456" 
+    10300 "Braille StrukturÃ« PikÃ«-3456" 
+    10301 "Braille StrukturÃ« PikÃ«-13456" 
+    10302 "Braille StrukturÃ« PikÃ«-23456" 
+    10303 "Braille StrukturÃ« PikÃ«-123456" 
+    10304 "Braille StrukturÃ« PikÃ«-7" 
+    10305 "Braille StrukturÃ« PikÃ«-17" 
+    10306 "Braille StrukturÃ« PikÃ«-27" 
+    10307 "Braille StrukturÃ« PikÃ«-127" 
+    10308 "Braille StrukturÃ« PikÃ«-37" 
+    10309 "Braille StrukturÃ« PikÃ«-137" 
+    10310 "Braille StrukturÃ« PikÃ«-237" 
+    10311 "Braille StrukturÃ« PikÃ«-1237" 
+    10312 "Braille StrukturÃ« PikÃ«-47" 
+    10313 "Braille StrukturÃ« PikÃ«-147" 
+    10314 "Braille StrukturÃ« PikÃ«-247" 
+    10315 "Braille StrukturÃ« PikÃ«-1247" 
+    10316 "Braille StrukturÃ« PikÃ«-347" 
+    10317 "Braille StrukturÃ« PikÃ«-1347" 
+    10318 "Braille StrukturÃ« PikÃ«-2347" 
+    10319 "Braille StrukturÃ« PikÃ«-12347" 
+    10320 "Braille StrukturÃ« PikÃ«-57" 
+    10321 "Braille StrukturÃ« PikÃ«-157" 
+    10322 "Braille StrukturÃ« PikÃ«-257" 
+    10323 "Braille StrukturÃ« PikÃ«-1257" 
+    10324 "Braille StrukturÃ« PikÃ«-357" 
+    10325 "Braille StrukturÃ« PikÃ«-1357" 
+    10326 "Braille StrukturÃ« PikÃ«-2357" 
+    10327 "Braille StrukturÃ« PikÃ«-12357" 
+    10328 "Braille StrukturÃ« PikÃ«-457" 
+    10329 "Braille StrukturÃ« PikÃ«-1457" 
+    10330 "Braille StrukturÃ« PikÃ«-2457" 
+    10331 "Braille StrukturÃ« PikÃ«-12457" 
+    10332 "Braille StrukturÃ« PikÃ«-3457" 
+    10333 "Braille StrukturÃ« PikÃ«-13457" 
+    10334 "Braille StrukturÃ« PikÃ«-23457" 
+    10335 "Braille StrukturÃ« PikÃ«-123457" 
+    10336 "Braille StrukturÃ« PikÃ«-67" 
+    10337 "Braille StrukturÃ« PikÃ«-167" 
+    10338 "Braille StrukturÃ« PikÃ«-267" 
+    10339 "Braille StrukturÃ« PikÃ«-1267" 
+    10340 "Braille StrukturÃ« PikÃ«-367" 
+    10341 "Braille StrukturÃ« PikÃ«-1367" 
+    10342 "Braille StrukturÃ« PikÃ«-2367" 
+    10343 "Braille StrukturÃ« PikÃ«-12367" 
+    10344 "Braille StrukturÃ« PikÃ«-467" 
+    10345 "Braille StrukturÃ« PikÃ«-1467" 
+    10346 "Braille StrukturÃ« PikÃ«-2467" 
+    10347 "Braille StrukturÃ« PikÃ«-12467" 
+    10348 "Braille StrukturÃ« PikÃ«-3467" 
+    10349 "Braille StrukturÃ« PikÃ«-13467" 
+    10350 "Braille StrukturÃ« PikÃ«-23467" 
+    10351 "Braille StrukturÃ« PikÃ«-123467" 
+    10352 "Braille StrukturÃ« PikÃ«-567" 
+    10353 "Braille StrukturÃ« PikÃ«-1567" 
+    10354 "Braille StrukturÃ« PikÃ«-2567" 
+    10355 "Braille StrukturÃ« PikÃ«-12567" 
+    10356 "Braille StrukturÃ« PikÃ«-3567" 
+    10357 "Braille StrukturÃ« PikÃ«-13567" 
+    10358 "Braille StrukturÃ« PikÃ«-23567" 
+    10359 "Braille StrukturÃ« PikÃ«-123567" 
+    10360 "Braille StrukturÃ« PikÃ«-4567" 
+    10361 "Braille StrukturÃ« PikÃ«-14567" 
+    10362 "Braille StrukturÃ« PikÃ«-24567" 
+    10363 "Braille StrukturÃ« PikÃ«-124567" 
+    10364 "Braille StrukturÃ« PikÃ«-34567" 
+    10365 "Braille StrukturÃ« PikÃ«-134567" 
+    10366 "Braille StrukturÃ« PikÃ«-234567" 
+    10367 "Braille StrukturÃ« PikÃ«-1234567" 
+    10368 "Braille StrukturÃ« PikÃ«-8" 
+    10369 "Braille StrukturÃ« PikÃ«-18" 
+    10370 "Braille StrukturÃ« PikÃ«-28" 
+    10371 "Braille StrukturÃ« PikÃ«-128" 
+    10372 "Braille StrukturÃ« PikÃ«-38" 
+    10373 "Braille StrukturÃ« PikÃ«-138" 
+    10374 "Braille StrukturÃ« PikÃ«-238" 
+    10375 "Braille StrukturÃ« PikÃ«-1238" 
+    10376 "Braille StrukturÃ« PikÃ«-48" 
+    10377 "Braille StrukturÃ« PikÃ«-148" 
+    10378 "Braille StrukturÃ« PikÃ«-248" 
+    10379 "Braille StrukturÃ« PikÃ«-1248" 
+    10380 "Braille StrukturÃ« PikÃ«-348" 
+    10381 "Braille StrukturÃ« PikÃ«-1348" 
+    10382 "Braille StrukturÃ« PikÃ«-2348" 
+    10383 "Braille StrukturÃ« PikÃ«-12348" 
+    10384 "Braille StrukturÃ« PikÃ«-58" 
+    10385 "Braille StrukturÃ« PikÃ«-158" 
+    10386 "Braille StrukturÃ« PikÃ«-258" 
+    10387 "Braille StrukturÃ« PikÃ«-1258" 
+    10388 "Braille StrukturÃ« PikÃ«-358" 
+    10389 "Braille StrukturÃ« PikÃ«-1358" 
+    10390 "Braille StrukturÃ« PikÃ«-2358" 
+    10391 "Braille StrukturÃ« PikÃ«-12358" 
+    10392 "Braille StrukturÃ« PikÃ«-458" 
+    10393 "Braille StrukturÃ« PikÃ«-1458" 
+    10394 "Braille StrukturÃ« PikÃ«-2458" 
+    10395 "Braille StrukturÃ« PikÃ«-12458" 
+    10396 "Braille StrukturÃ« PikÃ«-3458" 
+    10397 "Braille StrukturÃ« PikÃ«-13458" 
+    10398 "Braille StrukturÃ« PikÃ«-23458" 
+    10399 "Braille StrukturÃ« PikÃ«-123458" 
+    10400 "Braille StrukturÃ« PikÃ«-68" 
+    10401 "Braille StrukturÃ« PikÃ«-168" 
+    10402 "Braille StrukturÃ« PikÃ«-268" 
+    10403 "Braille StrukturÃ« PikÃ«-1268" 
+    10404 "Braille StrukturÃ« PikÃ«-368" 
+    10405 "Braille StrukturÃ« PikÃ«-1368" 
+    10406 "Braille StrukturÃ« PikÃ«-2368" 
+    10407 "Braille StrukturÃ« PikÃ«-12368" 
+    10408 "Braille StrukturÃ« PikÃ«-468" 
+    10409 "Braille StrukturÃ« PikÃ«-1468" 
+    10410 "Braille StrukturÃ« PikÃ«-2468" 
+    10411 "Braille StrukturÃ« PikÃ«-12468" 
+    10412 "Braille StrukturÃ« PikÃ«-3468" 
+    10413 "Braille StrukturÃ« PikÃ«-13468" 
+    10414 "Braille StrukturÃ« PikÃ«-23468" 
+    10415 "Braille StrukturÃ« PikÃ«-123468" 
+    10416 "Braille StrukturÃ« PikÃ«-568" 
+    10417 "Braille StrukturÃ« PikÃ«-1568" 
+    10418 "Braille StrukturÃ« PikÃ«-2568" 
+    10419 "Braille StrukturÃ« PikÃ«-12568" 
+    10420 "Braille StrukturÃ« PikÃ«-3568" 
+    10421 "Braille StrukturÃ« PikÃ«-13568" 
+    10422 "Braille StrukturÃ« PikÃ«-23568" 
+    10423 "Braille StrukturÃ« PikÃ«-123568" 
+    10424 "Braille StrukturÃ« PikÃ«-4568" 
+    10425 "Braille StrukturÃ« PikÃ«-14568" 
+    10426 "Braille StrukturÃ« PikÃ«-24568" 
+    10427 "Braille StrukturÃ« PikÃ«-124568" 
+    10428 "Braille StrukturÃ« PikÃ«-34568" 
+    10429 "Braille StrukturÃ« PikÃ«-134568" 
+    10430 "Braille StrukturÃ« PikÃ«-234568" 
+    10431 "Braille StrukturÃ« PikÃ«-1234568" 
+    10432 "Braille StrukturÃ« PikÃ«-78" 
+    10433 "Braille StrukturÃ« PikÃ«-178" 
+    10434 "Braille StrukturÃ« PikÃ«-278" 
+    10435 "Braille StrukturÃ« PikÃ«-1278" 
+    10436 "Braille StrukturÃ« PikÃ«-378" 
+    10437 "Braille StrukturÃ« PikÃ«-1378" 
+    10438 "Braille StrukturÃ« PikÃ«-2378" 
+    10439 "Braille StrukturÃ« PikÃ«-12378" 
+    10440 "Braille StrukturÃ« PikÃ«-478" 
+    10441 "Braille StrukturÃ« PikÃ«-1478" 
+    10442 "Braille StrukturÃ« PikÃ«-2478" 
+    10443 "Braille StrukturÃ« PikÃ«-12478" 
+    10444 "Braille StrukturÃ« PikÃ«-3478" 
+    10445 "Braille StrukturÃ« PikÃ«-13478" 
+    10446 "Braille StrukturÃ« PikÃ«-23478" 
+    10447 "Braille StrukturÃ« PikÃ«-123478" 
+    10448 "Braille StrukturÃ« PikÃ«-578" 
+    10449 "Braille StrukturÃ« PikÃ«-1578" 
+    10450 "Braille StrukturÃ« PikÃ«-2578" 
+    10451 "Braille StrukturÃ« PikÃ«-12578" 
+    10452 "Braille StrukturÃ« PikÃ«-3578" 
+    10453 "Braille StrukturÃ« PikÃ«-13578" 
+    10454 "Braille StrukturÃ« PikÃ«-23578" 
+    10455 "Braille StrukturÃ« PikÃ«-123578" 
+    10456 "Braille StrukturÃ« PikÃ«-4578" 
+    10457 "Braille StrukturÃ« PikÃ«-14578" 
+    10458 "Braille StrukturÃ« PikÃ«-24578" 
+    10459 "Braille StrukturÃ« PikÃ«-124578" 
+    10460 "Braille StrukturÃ« PikÃ«-34578" 
+    10461 "Braille StrukturÃ« PikÃ«-134578" 
+    10462 "Braille StrukturÃ« PikÃ«-234578" 
+    10463 "Braille StrukturÃ« PikÃ«-1234578" 
+    10464 "Braille StrukturÃ« PikÃ«-678" 
+    10465 "Braille StrukturÃ« PikÃ«-1678" 
+    10466 "Braille StrukturÃ« PikÃ«-2678" 
+    10467 "Braille StrukturÃ« PikÃ«-12678" 
+    10468 "Braille StrukturÃ« PikÃ«-3678" 
+    10469 "Braille StrukturÃ« PikÃ«-13678" 
+    10470 "Braille StrukturÃ« PikÃ«-23678" 
+    10471 "Braille StrukturÃ« PikÃ«-123678" 
+    10472 "Braille StrukturÃ« PikÃ«-4678" 
+    10473 "Braille StrukturÃ« PikÃ«-14678" 
+    10474 "Braille StrukturÃ« PikÃ«-24678" 
+    10475 "Braille StrukturÃ« PikÃ«-124678" 
+    10476 "Braille StrukturÃ« PikÃ«-34678" 
+    10477 "Braille StrukturÃ« PikÃ«-134678" 
+    10478 "Braille StrukturÃ« PikÃ«-234678" 
+    10479 "Braille StrukturÃ« PikÃ«-1234678" 
+    10480 "Braille StrukturÃ« PikÃ«-5678" 
+    10481 "Braille StrukturÃ« PikÃ«-15678" 
+    10482 "Braille StrukturÃ« PikÃ«-25678" 
+    10483 "Braille StrukturÃ« PikÃ«-125678" 
+    10484 "Braille StrukturÃ« PikÃ«-35678" 
+    10485 "Braille StrukturÃ« PikÃ«-135678" 
+    10486 "Braille StrukturÃ« PikÃ«-235678" 
+    10487 "Braille StrukturÃ« PikÃ«-1235678" 
+    10488 "Braille StrukturÃ« PikÃ«-45678" 
+    10489 "Braille StrukturÃ« PikÃ«-145678" 
+    10490 "Braille StrukturÃ« PikÃ«-245678" 
+    10491 "Braille StrukturÃ« PikÃ«-1245678" 
+    10492 "Braille StrukturÃ« PikÃ«-345678" 
+    10493 "Braille StrukturÃ« PikÃ«-1345678" 
+    10494 "Braille StrukturÃ« PikÃ«-2345678" 
+    10495 "Braille StrukturÃ« PikÃ«-12345678" 
+    10496 "Djathtas Dy-KokÃ« ShigjetÃ« Me Vertikale Goditje" 
+    10497 "Djathtas Dy-KokÃ« ShigjetÃ« Me Dyshe Vertikale Goditje" 
+    10498 "Majtas Dyshe ShigjetÃ« Me Vertikale Goditje" 
+    10499 "Djathtas Dyshe ShigjetÃ« Me Vertikale Goditje" 
+    10500 "MajtÃ« Djathtas Dyshe ShigjetÃ« Me Vertikale Goditje" 
+    10501 "Djathtas Dy-KokÃ« ShigjetÃ« Nga Bar" 
+    10502 "Majtas Dyshe ShigjetÃ« Nga Bar" 
+    10503 "Djathtas Dyshe ShigjetÃ« Nga Bar" 
+    10504 "TeposhtÃ« ShigjetÃ« Me Horizontal Goditje" 
+    10505 "PÃ«rpjetÃ« ShigjetÃ« Me Horizontal Goditje" 
+    10506 "PÃ«rpjetÃ« Trefish ShigjetÃ«" 
+    10507 "TeposhtÃ« Trefish ShigjetÃ«" 
+    10508 "Majtas Dyshe Dash ShigjetÃ«" 
+    10509 "Djathtas Dyshe Dash ShigjetÃ«" 
+    10510 "Majtas Trefish Dash ShigjetÃ«" 
+    10511 "Djathtas Trefish Dash ShigjetÃ«" 
+    10512 "Djathtas Dy-KokÃ« Trefish Dash ShigjetÃ«" 
+    10513 "Djathtas ShigjetÃ« Me Pika-Pika Stem" 
+    10514 "PÃ«rpjetÃ« ShigjetÃ« Me Bar" 
+    10515 "TeposhtÃ« ShigjetÃ« Me Bar" 
+    10516 "Djathtas ShigjetÃ« Me Bisht Me Vertikale Goditje" 
+    10517 "Djathtas ShigjetÃ« Me Bisht Me Dyshe Vertikale Goditje" 
+    10518 "Djathtas Dy-KokÃ« ShigjetÃ« Me Bisht" 
+    10519 "Djathtas Dy-KokÃ« ShigjetÃ« Me Bisht Me Vertikale Goditje" 
+    10520 "Djathtas Dy-KokÃ« ShigjetÃ« Me Bisht Me Dyshe Vertikale Goditje" 
+    10521 "Majtas ShigjetÃ«-Bisht" 
+    10522 "Djathtas ShigjetÃ«-Bisht" 
+    10523 "Majtas Dyshe ShigjetÃ«-Bisht" 
+    10524 "Djathtas Dyshe ShigjetÃ«-Bisht" 
+    10525 "Majtas ShigjetÃ« Me e ZezÃ« Diamant" 
+    10526 "Djathtas ShigjetÃ« Me e ZezÃ« Diamant" 
+    10527 "Majtas ShigjetÃ« Nga Bar Me e ZezÃ« Diamant" 
+    10528 "Djathtas ShigjetÃ« Nga Bar Me e ZezÃ« Diamant" 
+    10529 "VeriperÃ«ndim dhe Juglindje ShigjetÃ«" 
+    10530 "Verilindje dhe Jug-PerÃ«ndim ShigjetÃ«" 
+    10531 "VeriperÃ«ndim ShigjetÃ« Me Kapje" 
+    10532 "Verilindje ShigjetÃ« Me Kapje" 
+    10533 "Juglindje ShigjetÃ« Me Kapje" 
+    10534 "Jug-PerÃ«ndim ShigjetÃ« Me Kapje" 
+    10535 "VeriperÃ«ndim ShigjetÃ« dhe Verilindje ShigjetÃ«" 
+    10536 "Verilindje ShigjetÃ« dhe Juglindje ShigjetÃ«" 
+    10537 "Juglindje ShigjetÃ« dhe Jug-PerÃ«ndim ShigjetÃ«" 
+    10538 "Jug-PerÃ«ndim ShigjetÃ« dhe VeriperÃ«ndim ShigjetÃ«" 
+    10539 "Rritje Diagonal Kalim RÃ«nie Diagonal" 
+    10540 "RÃ«nie Diagonal Kalim Rritje Diagonal" 
+    10541 "Juglindje ShigjetÃ« Kalim Verilindje ShigjetÃ«" 
+    10542 "Verilindje ShigjetÃ« Kalim Juglindje ShigjetÃ«" 
+    10543 "RÃ«nie Diagonal Kalim Verilindje ShigjetÃ«" 
+    10544 "Rritje Diagonal Kalim Juglindje ShigjetÃ«" 
+    10545 "Verilindje ShigjetÃ« Kalim VeriperÃ«ndim ShigjetÃ«" 
+    10546 "VeriperÃ«ndim ShigjetÃ« Kalim Verilindje ShigjetÃ«" 
+    10547 "ValÃ« ShigjetÃ« Treguese DrejtpÃ«rdrejt DjathtÃ«" 
+    10548 "ShigjetÃ« Treguese Djathtas Pastaj Lakoj PÃ«rpjetÃ«" 
+    10549 "ShigjetÃ« Treguese Djathtas Pastaj Lakoj TeposhtÃ«" 
+    10550 "ShigjetÃ« Treguese TeposhtÃ« Pastaj Lakoj Majtas" 
+    10551 "ShigjetÃ« Treguese TeposhtÃ« Pastaj Lakoj Djathtas" 
+    10552 "DjathtÃ«-Side Arc Drejtim-Akrepa ShigjetÃ«" 
+    10553 "MajtÃ«-Side Arc KundÃ«r-Akrepa ShigjetÃ«" 
+    10554 "SipÃ«rm Arc KundÃ«r-Akrepa ShigjetÃ«" 
+    10555 "Fund Arc KundÃ«r-Akrepa ShigjetÃ«" 
+    10556 "SipÃ«rm Arc Drejtim-Akrepa ShigjetÃ« Me Minus" 
+    10557 "SipÃ«rm Arc KundÃ«r-Akrepa ShigjetÃ« Me Plus" 
+    10558 "MÃ« i'ulÃ«t DjathtÃ« GjysmÃ«rreth Drejtim-Akrepa ShigjetÃ«" 
+    10559 "MÃ« i'ulÃ«t MajtÃ« GjysmÃ«rreth KundÃ«r-Akrepa ShigjetÃ«" 
+    10560 "KundÃ«r-Akrepa Mbyllur Rreth ShigjetÃ«" 
+    10561 "Drejtim-Akrepa Mbyllur Rreth ShigjetÃ«" 
+    10562 "Djathtas ShigjetÃ« Lart ShkurtÃ«r Majtas ShigjetÃ«" 
+    10563 "Majtas ShigjetÃ« Lart ShkurtÃ«r Djathtas ShigjetÃ«" 
+    10564 "ShkurtÃ«r Djathtas ShigjetÃ« Lart Majtas ShigjetÃ«" 
+    10565 "Djathtas ShigjetÃ« Me Plus PoshtÃ«" 
+    10566 "Majtas ShigjetÃ« Me Plus PoshtÃ«" 
+    10567 "Djathtas ShigjetÃ« pÃ«rmes X" 
+    10568 "Majtas Djathtas ShigjetÃ« pÃ«rmes e VogÃ«l Rreth" 
+    10569 "PÃ«rpjetÃ« Dy-KokÃ« ShigjetÃ« Nga e VogÃ«l Rreth" 
+    10570 "MajtÃ« Gjemb Lart DjathtÃ« Gjemb PoshtÃ« FuzhnjÃ«" 
+    10571 "MajtÃ« Gjemb PoshtÃ« DjathtÃ« Gjemb Lart FuzhnjÃ«" 
+    10572 "Lart Gjemb DjathtÃ« PoshtÃ« Gjemb MajtÃ« FuzhnjÃ«" 
+    10573 "Lart Gjemb MajtÃ« PoshtÃ« Gjemb DjathtÃ« FuzhnjÃ«" 
+    10574 "MajtÃ« Gjemb Lart DjathtÃ« Gjemb Lart FuzhnjÃ«" 
+    10575 "Lart Gjemb DjathtÃ« PoshtÃ« Gjemb DjathtÃ« FuzhnjÃ«" 
+    10576 "MajtÃ« Gjemb PoshtÃ« DjathtÃ« Gjemb PoshtÃ« FuzhnjÃ«" 
+    10577 "Lart Gjemb MajtÃ« PoshtÃ« Gjemb MajtÃ« FuzhnjÃ«" 
+    10578 "Majtas FuzhnjÃ« Me Gjemb Lart Me Bar" 
+    10579 "Djathtas FuzhnjÃ« Me Gjemb Lart Me Bar" 
+    10580 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb DjathtÃ« Me Bar" 
+    10581 "TeposhtÃ« FuzhnjÃ« Me Gjemb DjathtÃ« Me Bar" 
+    10582 "Majtas FuzhnjÃ« Me Gjemb PoshtÃ« Me Bar" 
+    10583 "Djathtas FuzhnjÃ« Me Gjemb PoshtÃ« Me Bar" 
+    10584 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb MajtÃ« Me Bar" 
+    10585 "TeposhtÃ« FuzhnjÃ« Me Gjemb MajtÃ« Me Bar" 
+    10586 "Majtas FuzhnjÃ« Me Gjemb Lart Nga Bar" 
+    10587 "Djathtas FuzhnjÃ« Me Gjemb Lart Nga Bar" 
+    10588 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb DjathtÃ« Nga Bar" 
+    10589 "TeposhtÃ« FuzhnjÃ« Me Gjemb DjathtÃ« Nga Bar" 
+    10590 "Majtas FuzhnjÃ« Me Gjemb PoshtÃ« Nga Bar" 
+    10591 "Djathtas FuzhnjÃ« Me Gjemb PoshtÃ« Nga Bar" 
+    10592 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb MajtÃ« Nga Bar" 
+    10593 "TeposhtÃ« FuzhnjÃ« Me Gjemb MajtÃ« Nga Bar" 
+    10594 "Majtas FuzhnjÃ« Me Gjemb Lart Lart Majtas FuzhnjÃ« Me Gjemb PoshtÃ«" 
+    10595 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb MajtÃ« PranÃ« PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb DjathtÃ«" 
+    10596 "Djathtas FuzhnjÃ« Me Gjemb Lart Lart Djathtas FuzhnjÃ« Me Gjemb PoshtÃ«" 
+    10597 "TeposhtÃ« FuzhnjÃ« Me Gjemb MajtÃ« PranÃ« TeposhtÃ« FuzhnjÃ« Me Gjemb DjathtÃ«" 
+    10598 "Majtas FuzhnjÃ« Me Gjemb Lart Lart Djathtas FuzhnjÃ« Me Gjemb Lart" 
+    10599 "Majtas FuzhnjÃ« Me Gjemb PoshtÃ« Lart Djathtas FuzhnjÃ« Me Gjemb PoshtÃ«" 
+    10600 "Djathtas FuzhnjÃ« Me Gjemb Lart Lart Majtas FuzhnjÃ« Me Gjemb Lart" 
+    10601 "Djathtas FuzhnjÃ« Me Gjemb PoshtÃ« Lart Majtas FuzhnjÃ« Me Gjemb PoshtÃ«" 
+    10602 "Majtas FuzhnjÃ« Me Gjemb Lart Lart GjatÃ« Dash" 
+    10603 "Majtas FuzhnjÃ« Me Gjemb PoshtÃ« PoshtÃ« GjatÃ« Dash" 
+    10604 "Djathtas FuzhnjÃ« Me Gjemb Lart Lart GjatÃ« Dash" 
+    10605 "Djathtas FuzhnjÃ« Me Gjemb PoshtÃ« PoshtÃ« GjatÃ« Dash" 
+    10606 "PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb MajtÃ« PranÃ« TeposhtÃ« FuzhnjÃ« Me Gjemb DjathtÃ«" 
+    10607 "TeposhtÃ« FuzhnjÃ« Me Gjemb MajtÃ« PranÃ« PÃ«rpjetÃ« FuzhnjÃ« Me Gjemb DjathtÃ«" 
+    10608 "Djathtas Dyshe ShigjetÃ« Me Rrethore KokÃ«" 
+    10609 "BarabartÃ« ShenjÃ« Lart Djathtas ShigjetÃ«" 
+    10610 "TildÃ« Operator Lart Djathtas ShigjetÃ«" 
+    10611 "Majtas ShigjetÃ« Lart TildÃ« Operator" 
+    10612 "Djathtas ShigjetÃ« Lart TildÃ« Operator" 
+    10613 "Djathtas ShigjetÃ« Lart Pothuajse e BarabartÃ« Me" 
+    10614 "MÃ« pak-se Lart Majtas ShigjetÃ«" 
+    10615 "Majtas ShigjetÃ« PÃ«rmes MÃ« pak-se" 
+    10616 "Madhe-se Lart Djathtas ShigjetÃ«" 
+    10617 "NÃ«n-vendos Lart Djathtas ShigjetÃ«" 
+    10618 "Majtas ShigjetÃ« PÃ«rmes NÃ«n-vendos" 
+    10619 "Mbi-vendos Lart Majtas ShigjetÃ«" 
+    10620 "MajtÃ« Fish Bisht" 
+    10621 "DjathtÃ« Fish Bisht" 
+    10622 "Lart Fish Bisht" 
+    10623 "PoshtÃ« Fish Bisht" 
+    10624 "Trefish Vertikale Bar Delimiter" 
+    10625 "Z ShÃ«nim Vend" 
+    10626 "Z ShÃ«nim Tipi Dy Pika" 
+    10627 "MajtÃ« e BardhÃ« Dredhur Kllapa" 
+    10628 "DjathtÃ« e BardhÃ« Dredhur Kllapa" 
+    10629 "MajtÃ« e BardhÃ« KllapÃ«" 
+    10630 "DjathtÃ« e BardhÃ« KllapÃ«" 
+    10631 "Z ShÃ«nim MajtÃ« Imazh Kllapa" 
+    10632 "Z ShÃ«nim DjathtÃ« Imazh Kllapa" 
+    10633 "Z ShÃ«nim MajtÃ« Detyrues Kllapa" 
+    10634 "Z ShÃ«nim DjathtÃ« Detyrues Kllapa" 
+    10635 "KllapÃ« Rrumbullake Majtas Me NÃ«n-tabelÃ«" 
+    10636 "DjathtÃ« Katror Kllapa Me NÃ«n-tabelÃ«" 
+    10637 "KllapÃ« Rrumbullake Majtas Me ShenjÃ« In SipÃ«rm KÃ«nd" 
+    10638 "DjathtÃ« Katror Kllapa Me ShenjÃ« In Fund KÃ«nd" 
+    10639 "KllapÃ« Rrumbullake Majtas Me ShenjÃ« In Fund KÃ«nd" 
+    10640 "DjathtÃ« Katror Kllapa Me ShenjÃ« In SipÃ«rm KÃ«nd" 
+    10641 "MajtÃ« KÃ«nd Kllapa Me PikÃ«" 
+    10642 "DjathtÃ« KÃ«nd Kllapa Me PikÃ«" 
+    10643 "MajtÃ« Arc MÃ« pak-se Kllapa" 
+    10644 "DjathtÃ« Arc Madhe-se Kllapa" 
+    10645 "Dyshe MajtÃ« Arc Madhe-se Kllapa" 
+    10646 "Dyshe DjathtÃ« Arc MÃ« pak-se Kllapa" 
+    10647 "MajtÃ« e ZezÃ« Tortoise Shell Kllapa" 
+    10648 "DjathtÃ« e ZezÃ« Tortoise Shell Kllapa" 
+    10649 "PikÃ« te Fence" 
+    10650 "Vertikale Zigzag LinjÃ«" 
+    10651 "KÃ«nd Matur Hapje MajtÃ«" 
+    10652 "DjathtÃ« KÃ«nd Variant Me Katror" 
+    10653 "Matur DjathtÃ« KÃ«nd Me PikÃ«" 
+    10654 "KÃ«nd Me S Brenda" 
+    10655 "MprehtÃ« KÃ«nd" 
+    10656 "Sferik KÃ«nd Hapje MajtÃ«" 
+    10657 "Sferik KÃ«nd Hapje Lart" 
+    10658 "Kthyer KÃ«nd" 
+    10659 "KundÃ«rt KÃ«nd" 
+    10660 "KÃ«nd Me NÃ«n-tabelÃ«" 
+    10661 "KundÃ«rt KÃ«nd Me NÃ«n-tabelÃ«" 
+    10662 "PjerrÃ«t KÃ«nd Hapje Lart" 
+    10663 "PjerrÃ«t KÃ«nd Hapje PoshtÃ«" 
+    10664 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar Lart dhe Djathtas" 
+    10665 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar Lart dhe Majtas" 
+    10666 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar PoshtÃ« dhe Djathtas" 
+    10667 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar PoshtÃ« dhe Majtas" 
+    10668 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar Djathtas dhe Lart" 
+    10669 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar Majtas dhe Lart" 
+    10670 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar Djathtas dhe PoshtÃ«" 
+    10671 "KÃ«nd Matur Me Hap Krah Mbyllur NÃ« ShigjetÃ« Drejtuar Majtas dhe PoshtÃ«" 
+    10672 "KundÃ«rt Bosh Set" 
+    10673 "Bosh Set Me Mbi-tabelÃ«" 
+    10674 "Bosh Set Me e VogÃ«l Rreth Lart" 
+    10675 "Bosh Set Me DjathtÃ« ShigjetÃ« Lart" 
+    10676 "Bosh Set Me MajtÃ« ShigjetÃ« Lart" 
+    10677 "Rreth Me Horizontal Bar" 
+    10678 "Rrethuar Vertikale Bar" 
+    10679 "Rrethuar Paralel" 
+    10680 "Rrethuar Kthe-Mbrapsht Solidus" 
+    10681 "Rrethuar Pingul" 
+    10682 "Rreth i NdarÃ« Nga Horizontal Bar dhe SipÃ«rm GjysmÃ« NdarÃ« Nga Vertikale Bar" 
+    10683 "Rreth Me mbivendosur X" 
+    10684 "Rrethuar KundÃ«r-Akrepa-Rrotulluar Ndarje ShenjÃ«" 
+    10685 "Lart ShigjetÃ« PÃ«rmes Rreth" 
+    10686 "Rrethuar e BardhÃ« Plumb" 
+    10687 "Rrethuar Plumb" 
+    10688 "Rrethuar MÃ« pak-se" 
+    10689 "Rrethuar Madhe-se" 
+    10690 "Rreth Me e VogÃ«l Rreth Me The DjathtÃ«" 
+    10691 "Rreth Me Dy Horizontal Goditjes Me The DjathtÃ«" 
+    10692 "Katror Rritje Diagonal VijÃ«" 
+    10693 "Katror RÃ«nie Diagonal VijÃ«" 
+    10694 "Katror Yll" 
+    10695 "Katror e VogÃ«l Rreth" 
+    10696 "Katror Katror" 
+    10697 "Dy Kuti Bashkuara" 
+    10698 "TrekÃ«ndÃ«sh Me PikÃ« Mbi" 
+    10699 "TrekÃ«ndÃ«sh Me NÃ«n-tabelÃ«" 
+    10700 "S In TrekÃ«ndÃ«sh" 
+    10701 "TrekÃ«ndÃ«sh Me Serifs At Fund" 
+    10702 "DjathtÃ« TrekÃ«ndÃ«sh Lart MajtÃ« TrekÃ«ndÃ«sh" 
+    10703 "MajtÃ« TrekÃ«ndÃ«sh PranÃ« Vertikale Bar" 
+    10704 "Vertikale Bar PranÃ« DjathtÃ« TrekÃ«ndÃ«sh" 
+    10705 "Papion Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    10706 "Papion Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    10707 "e ZezÃ« Papion" 
+    10708 "KohÃ«t Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    10709 "KohÃ«t Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    10710 "e BardhÃ« OrÃ«-gjami" 
+    10711 "e ZezÃ« OrÃ«-gjami" 
+    10712 "MajtÃ« dredhur Gardh" 
+    10713 "DjathtÃ« dredhur Gardh" 
+    10714 "Majtas Dyshe dredhur Gardh" 
+    10715 "Djathtas Dyshe dredhur Gardh" 
+    10716 "PafundÃ«si PaplotÃ«" 
+    10717 "Lidh Mbi PafundÃ«si" 
+    10718 "PafundÃ«si Mohuar Me Vertikale Bar" 
+    10719 "ShumÃ«-HartÃ« Dyshe-Mbaroj" 
+    10720 "Katror Me KonturÃ« JashtÃ«" 
+    10721 "Rritje Si" 
+    10722 "PÃ«rziej Produktin" 
+    10723 "BarabartÃ« ShenjÃ« dhe Anohet Paralel" 
+    10724 "BarabartÃ« ShenjÃ« dhe Anohet Paralel Me TildÃ« Lart" 
+    10725 "Identike Me dhe Anohet Paralel" 
+    10726 "Gleich Stark" 
+    10727 "Thermodynamic" 
+    10728 "PoshtÃ«-Treguese TrekÃ«ndÃ«sh Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    10729 "PoshtÃ«-Treguese TrekÃ«ndÃ«sh Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    10730 "e ZezÃ« Diamant Me PoshtÃ« ShigjetÃ«" 
+    10731 "e ZezÃ« TabletÃ«" 
+    10732 "e BardhÃ« Rreth Me PoshtÃ« ShigjetÃ«" 
+    10733 "e ZezÃ« Rreth Me PoshtÃ« ShigjetÃ«" 
+    10734 "Gabim-Mbrojtur e BardhÃ« Katror" 
+    10735 "Gabim-Mbrojtur e ZezÃ« Katror" 
+    10736 "Gabim-Mbrojtur e BardhÃ« Diamant" 
+    10737 "Gabim-Mbrojtur e ZezÃ« Diamant" 
+    10738 "Gabim-Mbrojtur e BardhÃ« Rreth" 
+    10739 "Gabim-Mbrojtur e ZezÃ« Rreth" 
+    10740 "Rule-Vonuar" 
+    10741 "Kthe-Mbrapsht Solidus Operator" 
+    10742 "Solidus Me Mbi-tabelÃ«" 
+    10743 "Kthe-Mbrapsht Solidus Me Horizontal Goditje" 
+    10744 "Big Solidus" 
+    10745 "Big Kthe-Mbrapsht Solidus" 
+    10746 "Dyshe Plus" 
+    10747 "Trefish Plus" 
+    10748 "MajtÃ«-Treguese Dredhur KÃ«nd Kllapa" 
+    10749 "DjathtÃ«-Treguese Dredhur KÃ«nd Kllapa" 
+    10750 "VockÃ«l" 
+    10751 "Miny" 
+    10752 "N-Ary Rrethuar PikÃ« Operator" 
+    10753 "N-Ary Rrethuar Plus Operator" 
+    10754 "N-Ary Rrethuar KohÃ«t Operator" 
+    10755 "N-Ary Union Operator Me PikÃ«" 
+    10756 "N-Ary Union Operator Me Plus" 
+    10757 "N-Ary Katror NdÃ«rprerje Operator" 
+    10758 "N-Ary Katror Union Operator" 
+    10759 "Dy Logjike dhe Operator" 
+    10760 "Dy Logjike ose Operator" 
+    10761 "N-Ary KohÃ«t Operator" 
+    10762 "Moduli Dy ShumÃ«" 
+    10763 "Mbledhje Me Integral" 
+    10764 "KatÃ«rfish Integral Operator" 
+    10765 "Pjesa Fundit Integral" 
+    10766 "Integral Me Dyshe Goditje" 
+    10767 "Integral MesatarÃ« Me Slash" 
+    10768 "Qarkullim Funksioni" 
+    10769 "KundÃ«r-Akrepa Integrim" 
+    10770 "LinjÃ« Integrim Me Rruge DrejtkÃ«ndÃ«sh Rreth Pole" 
+    10771 "LinjÃ« Integrim Me GjysmÃ«rreth RrugÃ« Rreth Pole" 
+    10772 "LinjÃ« Integrim Jo PÃ«rfshij The Pole" 
+    10773 "Integral Rreth A PikÃ« Operator" 
+    10774 "Kuaternion Integral Operator" 
+    10775 "Integral Me Majtas ShigjetÃ« Me Kapje" 
+    10776 "Integral Me KohÃ«t ShenjÃ«" 
+    10777 "Integral Me NdÃ«rprerje" 
+    10778 "Integral Me Union" 
+    10779 "Integral Me Mbi-tabelÃ«" 
+    10780 "Integral Me NÃ«n-tabelÃ«" 
+    10781 "Bashkoju" 
+    10782 "Madhe MajtÃ« TrekÃ«ndÃ«sh Operator" 
+    10783 "Z ShÃ«nim SkemÃ« PÃ«rbÃ«rje" 
+    10784 "Z ShÃ«nim SkemÃ« Piping" 
+    10785 "Z ShÃ«nim SkemÃ« Projektim" 
+    10786 "Plus ShenjÃ« Me e VogÃ«l Rreth Lart" 
+    10787 "Plus ShenjÃ« Me Theks-lakor Theks Lart" 
+    10788 "Plus ShenjÃ« Me TildÃ« Lart" 
+    10789 "Plus ShenjÃ« Me PikÃ« PoshtÃ«" 
+    10790 "Plus ShenjÃ« Me TildÃ« PoshtÃ«" 
+    10791 "Plus ShenjÃ« Me NÃ«nshkrim Dy" 
+    10792 "Plus ShenjÃ« Me e ZezÃ« TrekÃ«ndÃ«sh" 
+    10793 "Minus ShenjÃ« Me Presje Lart" 
+    10794 "Minus ShenjÃ« Me PikÃ« PoshtÃ«" 
+    10795 "Minus ShenjÃ« Me RÃ«nie PikÃ«" 
+    10796 "Minus ShenjÃ« Me Rritje PikÃ«" 
+    10797 "Plus ShenjÃ« In MajtÃ« GjysmÃ« Rreth" 
+    10798 "Plus ShenjÃ« In DjathtÃ« GjysmÃ« Rreth" 
+    10799 "Vektor ose Kryq Produkt" 
+    10800 "ShumÃ«zim ShenjÃ« Me PikÃ« Mbi" 
+    10801 "ShumÃ«zim ShenjÃ« Me NÃ«n-tabelÃ«" 
+    10802 "GjysmÃ«-direkt Produkt Me Fund Mbyllur" 
+    10803 "Produkt Thyes" 
+    10804 "ShumÃ«zim ShenjÃ« In MajtÃ« GjysmÃ« Rreth" 
+    10805 "ShumÃ«zim ShenjÃ« In DjathtÃ« GjysmÃ« Rreth" 
+    10806 "Rrethuar ShumÃ«zim ShenjÃ« Me Theks-lakor Theks" 
+    10807 "ShumÃ«zim ShenjÃ« In Dyshe Rreth" 
+    10808 "Rrethuar Ndarje ShenjÃ«" 
+    10809 "Plus ShenjÃ« In TrekÃ«ndÃ«sh" 
+    10810 "Minus ShenjÃ« In TrekÃ«ndÃ«sh" 
+    10811 "ShumÃ«zim ShenjÃ« In TrekÃ«ndÃ«sh" 
+    10812 "Produkt i BrendshÃ«m" 
+    10813 "Produkt i BrendshÃ«m DorÃ«DjathtÃ«" 
+    10814 "Z ShÃ«nim PÃ«rbÃ«rja Relacione" 
+    10815 "Amalgamation ose BashkÃ«prodhimit" 
+    10816 "NdÃ«rprerje Me PikÃ«" 
+    10817 "Union Me Minus ShenjÃ«" 
+    10818 "Union Me Mbi-tabelÃ«" 
+    10819 "NdÃ«rprerje Me Mbi-tabelÃ«" 
+    10820 "NdÃ«rprerje Me Logjike dhe" 
+    10821 "Union Me Logjike ose" 
+    10822 "Union Lart NdÃ«rprerje" 
+    10823 "NdÃ«rprerje Lart Union" 
+    10824 "Union Lart Bar Lart NdÃ«rprerje" 
+    10825 "NdÃ«rprerje Lart Bar Lart Union" 
+    10826 "Union PranÃ« dhe Bashkoju Me Union" 
+    10827 "NdÃ«rprerje PranÃ« dhe Bashkoju Me NdÃ«rprerje" 
+    10828 "Mbyllur Union Me Serifs" 
+    10829 "Mbyllur NdÃ«rprerje Me Serifs" 
+    10830 "Dyshe Katror NdÃ«rprerje" 
+    10831 "Dyshe Katror Union" 
+    10832 "Mbyllur Union Me Serifs dhe Smash Product" 
+    10833 "Logjike dhe Me PikÃ« Mbi" 
+    10834 "Logjike ose Me PikÃ« Mbi" 
+    10835 "Dyshe Logjike dhe" 
+    10836 "Dyshe Logjike ose" 
+    10837 "Dy ndÃ«rpritet Logjike dhe" 
+    10838 "Dy ndÃ«rpritet Logjike ose" 
+    10839 "PjerrÃ«t Madhe ose" 
+    10840 "PjerrÃ«t Madhe dhe" 
+    10841 "Logjike ose Mbivendosje Logjike dhe" 
+    10842 "Logjike dhe Me Mesit Stem" 
+    10843 "Logjike ose Me Mesit Stem" 
+    10844 "Logjike dhe Me Horizontal Dash" 
+    10845 "Logjike ose Me Horizontal Dash" 
+    10846 "Logjike dhe Me Dyshe Mbi-tabelÃ«" 
+    10847 "Logjike dhe Me NÃ«n-tabelÃ«" 
+    10848 "Logjike dhe Me Dyshe NÃ«n-tabelÃ«" 
+    10849 "E VogÃ«l dhe Me NÃ«n-tabelÃ«" 
+    10850 "Logjike ose Me Dyshe Mbi-tabelÃ«" 
+    10851 "Logjike ose Me Dyshe NÃ«n-tabelÃ«" 
+    10852 "Z ShÃ«nim Domain Antirestriction" 
+    10853 "Z ShÃ«nim Range Antirestriction" 
+    10854 "BarabartÃ« ShenjÃ« Me PikÃ« PoshtÃ«" 
+    10855 "Identike Me PikÃ« Mbi" 
+    10856 "Trefish Horizontal Bar Me Dyshe Vertikale Goditje" 
+    10857 "Trefish Horizontal Bar Me Trefish Vertikale Goditje" 
+    10858 "TildÃ« Operator Me PikÃ« Mbi" 
+    10859 "TildÃ« Operator Me Rritje PikÃ«" 
+    10860 "NgjashÃ«m Minus NgjashÃ«m" 
+    10861 "Harmoni Me PikÃ« Mbi" 
+    10862 "BarabartÃ« Me Yll" 
+    10863 "Pothuajse e BarabartÃ« Me Me Theks-lakor Theks" 
+    10864 "PÃ«rafÃ«rsisht I BarabartÃ« ose I BarabartÃ« Me" 
+    10865 "BarabartÃ« ShenjÃ« Lart Plus ShenjÃ«" 
+    10866 "Plus ShenjÃ« Lart BarabartÃ« ShenjÃ«" 
+    10867 "BarabartÃ« ShenjÃ« Lart TildÃ« Operator" 
+    10868 "Dyshe Dy Pika I BarabartÃ«" 
+    10869 "Dy NjÃ«pasnjÃ«shÃ«m  BarabartÃ« ShenjÃ«s" 
+    10870 "Tre NjÃ«pasnjÃ«shÃ«m BarabartÃ« ShenjÃ«s" 
+    10871 "BarabartÃ« ShenjÃ« Me Dy PikÃ« Lart dhe Dy PikÃ« PoshtÃ«" 
+    10872 "BarasvlershÃ«m Me KatÃ«r PikÃ« Lart" 
+    10873 "MÃ« pak-se Me Rreth Brenda" 
+    10874 "Madhe-se Me Rreth Brenda" 
+    10875 "MÃ« pak-se Me Pyetje ShenjÃ« Lart" 
+    10876 "Madhe-se Me Pyetje ShenjÃ« Lart" 
+    10877 "MÃ« pak-se ose Anohet I BarabartÃ« Me" 
+    10878 "Madhe-se ose Anohet I BarabartÃ« Me" 
+    10879 "MÃ« pak-se ose Anohet I BarabartÃ« Me Me PikÃ« Brenda" 
+    10880 "Madhe-se ose Anohet I BarabartÃ« Me Me PikÃ« Brenda" 
+    10881 "MÃ« pak-se ose Anohet I BarabartÃ« Me Me PikÃ« Mbi" 
+    10882 "Madhe-se ose Anohet I BarabartÃ« Me Me PikÃ« Mbi" 
+    10883 "MÃ« pak-se ose Anohet I BarabartÃ« Me Me PikÃ« Mbi DjathtÃ«" 
+    10884 "Madhe-se ose Anohet I BarabartÃ« Me Me PikÃ« Mbi MajtÃ«" 
+    10885 "MÃ« pak-se ose PÃ«rafÃ«rt" 
+    10886 "Madhe-se ose PÃ«rafÃ«rt" 
+    10887 "MÃ« pak-se dhe E VetÃ«m-LinjÃ« Jo I BarabartÃ« Me" 
+    10888 "Madhe-se dhe E VetÃ«m-LinjÃ« Jo I BarabartÃ« Me" 
+    10889 "MÃ« pak-se dhe Jo PÃ«rafÃ«rt" 
+    10890 "Madhe-se dhe Jo PÃ«rafÃ«rt" 
+    10891 "MÃ« pak-se Lart Dyshe-LinjÃ« I BarabartÃ« Lart Madhe-se" 
+    10892 "Madhe-se Lart Dyshe-LinjÃ« I BarabartÃ« Lart MÃ« pak-se" 
+    10893 "MÃ« pak-se Lart NgjashÃ«m ose I BarabartÃ«" 
+    10894 "Madhe-se Lart NgjashÃ«m ose I BarabartÃ«" 
+    10895 "MÃ« pak-se Lart NgjashÃ«m Lart Madhe-se" 
+    10896 "Madhe-se Lart NgjashÃ«m Lart MÃ« pak-se" 
+    10897 "MÃ« pak-se Lart Madhe-se Lart Dyshe-LinjÃ« I BarabartÃ«" 
+    10898 "Madhe-se Lart MÃ« pak-se Lart Dyshe-LinjÃ« I BarabartÃ«" 
+    10899 "MÃ« pak-se Lart Anohet I BarabartÃ« Lart Madhe-se Lart Anohet I BarabartÃ«" 
+    10900 "Madhe-se Lart Anohet I BarabartÃ« Lart MÃ« pak-se Lart Anohet I BarabartÃ«" 
+    10901 "Anohet I BarabartÃ« Me ose MÃ« pak-se" 
+    10902 "Anohet I BarabartÃ« Me ose Madhe-se" 
+    10903 "Anohet I BarabartÃ« Me ose MÃ« pak-se Me PikÃ« Brenda" 
+    10904 "Anohet I BarabartÃ« Me ose Madhe-se Me PikÃ« Brenda" 
+    10905 "Dyshe-LinjÃ« I BarabartÃ« Me ose MÃ« pak-se" 
+    10906 "Dyshe-LinjÃ« I BarabartÃ« Me ose Madhe-se" 
+    10907 "Dyshe-LinjÃ« Anohet I BarabartÃ« Me ose MÃ« pak-se" 
+    10908 "Dyshe-LinjÃ« Anohet I BarabartÃ« Me ose Madhe-se" 
+    10909 "NgjashÃ«m ose MÃ« pak-se" 
+    10910 "NgjashÃ«m ose Madhe-se" 
+    10911 "NgjashÃ«m Lart MÃ« pak-se Lart BarabartÃ« ShenjÃ«" 
+    10912 "NgjashÃ«m Lart Madhe-se Lart BarabartÃ« ShenjÃ«" 
+    10913 "Dyshe Mbivendosin MÃ« pak-se" 
+    10914 "Dyshe Mbivendosin Madhe-se" 
+    10915 "Dyshe Mbivendosin MÃ« pak-se Me NÃ«n-tabelÃ«" 
+    10916 "Madhe-se Mbivendoset MÃ« pak-se" 
+    10917 "Madhe-se PranÃ« MÃ« pak-se" 
+    10918 "MÃ« pak-se Mbyllur Nga KthesÃ«" 
+    10919 "Madhe-se Mbyllur Nga KthesÃ«" 
+    10920 "MÃ« pak-se Mbyllur Nga KthesÃ« Lart Anohet I BarabartÃ«" 
+    10921 "Madhe-se Mbyllur Nga KthesÃ« Lart Anohet I BarabartÃ«" 
+    10922 "E VogÃ«l Se" 
+    10923 "Madhe Se" 
+    10924 "e VogÃ«l Se ose I BarabartÃ« Me" 
+    10925 "Madhe Se ose I BarabartÃ« Me" 
+    10926 "BarabartÃ« ShenjÃ« Me Gunga Lart" 
+    10927 "Paraprin Lart E VetÃ«m-LinjÃ« BarabartÃ« ShenjÃ«" 
+    10928 "Sukses Lart E VetÃ«m-LinjÃ« BarabartÃ« ShenjÃ«" 
+    10929 "Paraprin Lart E VetÃ«m-LinjÃ« Jo I BarabartÃ« Me" 
+    10930 "Sukses Lart E VetÃ«m-LinjÃ« Jo I BarabartÃ« Me" 
+    10931 "Paraprin Lart BarabartÃ« ShenjÃ«" 
+    10932 "Sukses Lart BarabartÃ« ShenjÃ«" 
+    10933 "Paraprin Lart Jo I BarabartÃ« Me" 
+    10934 "Sukses Lart Jo I BarabartÃ« Me" 
+    10935 "Paraprin Lart Pothuajse e BarabartÃ« Me" 
+    10936 "Sukses Lart Pothuajse e BarabartÃ« Me" 
+    10937 "Paraprin Lart Jo Pothuajse e BarabartÃ« Me" 
+    10938 "Sukses Lart Jo Pothuajse e BarabartÃ« Me" 
+    10939 "Dyshe Paraprin" 
+    10940 "Dyshe Sukses" 
+    10941 "NÃ«n-vendos Me PikÃ«" 
+    10942 "Mbi-vendos Me PikÃ«" 
+    10943 "NÃ«n-vendos Me Plus ShenjÃ« PoshtÃ«" 
+    10944 "Mbi-vendos Me Plus ShenjÃ« PoshtÃ«" 
+    10945 "NÃ«n-vendos Me ShumÃ«zim ShenjÃ« PoshtÃ«" 
+    10946 "Mbi-vendos Me ShumÃ«zim ShenjÃ« PoshtÃ«" 
+    10947 "NÃ«n-vendos Ose I BarabartÃ« Me Me PikÃ« Mbi" 
+    10948 "Mbi-vendos Ose I BarabartÃ« Me Me PikÃ« Mbi" 
+    10949 "NÃ«n-vendos Lart BarabartÃ« ShenjÃ«" 
+    10950 "Mbi-vendos Lart BarabartÃ« ShenjÃ«" 
+    10951 "NÃ«n-vendos Lart TildÃ« Operator" 
+    10952 "Mbi-vendos Lart TildÃ« Operator" 
+    10953 "NÃ«n-vendos Lart Pothuajse e BarabartÃ« Me" 
+    10954 "Mbi-vendos Lart Pothuajse e BarabartÃ« Me" 
+    10955 "NÃ«n-vendos Lart Jo I BarabartÃ« Me" 
+    10956 "Mbi-vendos Lart Jo I BarabartÃ« Me" 
+    10957 "Katror MajtÃ« Hap Kuti Operator" 
+    10958 "Katror DjathtÃ« Hap Kuti Operator" 
+    10959 "Mbyllur NÃ«n-vendos" 
+    10960 "Mbyllur Mbi-vendos" 
+    10961 "Mbyllur NÃ«n-vendos Ose I BarabartÃ« Me" 
+    10962 "Mbyllur Mbi-vendos Ose I BarabartÃ« Me" 
+    10963 "NÃ«n-vendos Lart Mbi-vendos" 
+    10964 "Mbi-vendos Lart NÃ«n-vendos" 
+    10965 "NÃ«n-vendos Lart NÃ«n-vendos" 
+    10966 "Mbi-vendos Lart Mbi-vendos" 
+    10967 "Mbi-vendos PranÃ« NÃ«n-vendos" 
+    10968 "Mbi-vendos PranÃ« dhe Bashkoju Nga Dash Me NÃ«n-vendos" 
+    10969 "Element i Hapje TeposhtÃ«" 
+    10970 "Pitchfork Me Tee SipÃ«rm" 
+    10971 "Transversal NdÃ«rprerje" 
+    10972 "Forking" 
+    10973 "Nonforking" 
+    10974 "ShkurtÃ«r MajtÃ« Litar" 
+    10975 "ShkurtÃ«r PoshtÃ« Litar" 
+    10976 "ShkurtÃ«r Lart Litar" 
+    10977 "Pingul Me S" 
+    10978 "Vertikale Bar Trefish DjathtÃ« Timon" 
+    10979 "Dyshe Vertikale Bar MajtÃ« Timon" 
+    10980 "Vertikale Bar Dyshe MajtÃ« Timon" 
+    10981 "Dyshe Vertikale Bar Dyshe MajtÃ« Timon" 
+    10982 "GjatÃ« Dash Nga MajtÃ« AnÃ«tar e Dyshe Vertikale" 
+    10983 "ShkurtÃ«r PoshtÃ« Litar Me Mbi-tabelÃ«" 
+    10984 "ShkurtÃ«r Lart Litar Me NÃ«n-tabelÃ«" 
+    10985 "ShkurtÃ«r Lart Litar Lart ShkurtÃ«r PoshtÃ« Litar" 
+    10986 "Dyshe PoshtÃ« Litar" 
+    10987 "Dyshe Lart Litar" 
+    10988 "Dyshe Goditje Jo ShenjÃ«" 
+    10989 "KundÃ«rt Dyshe Goditje Jo ShenjÃ«" 
+    10990 "Jo Ndahet Me KundÃ«rt Mohim VizÃ«" 
+    10991 "Vertikale LinjÃ« Me Rreth Lart" 
+    10992 "Vertikale LinjÃ« Me Rreth PoshtÃ«" 
+    10993 "PoshtÃ« Litar Me Rreth PoshtÃ«" 
+    10994 "Paralel Me Horizontal Goditje" 
+    10995 "Paralel Me TildÃ« Operator" 
+    10996 "Trefish Vertikale Bar BinarÃ« Lidhje" 
+    10997 "Trefish Vertikale Bar Me Horizontal Goditje" 
+    10998 "Trefish Dy Pika Operator" 
+    10999 "Trefish Mbivendosin MÃ« pak-se" 
+    11000 "Trefish Mbivendosin Madhe-se" 
+    11001 "Dyshe-LinjÃ« Anohet MÃ« pak-se Ose I BarabartÃ« Me" 
+    11002 "Dyshe-LinjÃ« Anohet Madhe-se Ose BarabartÃ« Me" 
+    11003 "Trefish Solidus BinarÃ« Lidhje" 
+    11004 "Madhe Trefish Vertikale Bar Operator" 
+    11005 "Dyshe Solidus Operator" 
+    11006 "e BardhÃ« Vertikale Bar" 
+    11007 "N-Ary e BardhÃ« Vertikale Bar" 
+    11008 "Verilindje e BardhÃ« ShigjetÃ«" 
+    11009 "VeriperÃ«ndim e BardhÃ« ShigjetÃ«" 
+    11010 "Juglindje e BardhÃ« ShigjetÃ«" 
+    11011 "Jug-PerÃ«ndim e BardhÃ« ShigjetÃ«" 
+    11012 "Majtas Djathtas e BardhÃ« ShigjetÃ«" 
+    11013 "Majtas e ZezÃ« ShigjetÃ«" 
+    11014 "PÃ«rpjetÃ« e ZezÃ« ShigjetÃ«" 
+    11015 "TeposhtÃ« e ZezÃ« ShigjetÃ«" 
+    11016 "Verilindje e ZezÃ« ShigjetÃ«" 
+    11017 "VeriperÃ«ndim e ZezÃ« ShigjetÃ«" 
+    11018 "Juglindje e ZezÃ« ShigjetÃ«" 
+    11019 "Jug-PerÃ«ndim e ZezÃ« ShigjetÃ«" 
+    11020 "Majtas Djathtas e ZezÃ« ShigjetÃ«" 
+    11021 "Lart PoshtÃ« e ZezÃ« ShigjetÃ«" 
+    11022 "Djathtas ShigjetÃ« Me Tip TeposhtÃ«" 
+    11023 "Djathtas ShigjetÃ« Me Tip PÃ«rpjetÃ«" 
+    11024 "Majtas ShigjetÃ« Me Tip TeposhtÃ«" 
+    11025 "Majtas ShigjetÃ« Me Tip PÃ«rpjetÃ«" 
+    11026 "Katror Me SipÃ«rm GjysmÃ« e ZezÃ«" 
+    11027 "Katror Me Fund GjysmÃ« e ZezÃ«" 
+    11028 "Katror Me SipÃ«rm DjathtÃ« Diagonal GjysmÃ« e ZezÃ«" 
+    11029 "Katror Me MÃ« i'ulÃ«t MajtÃ« Diagonal GjysmÃ« e ZezÃ«" 
+    11030 "Diamant Me MajtÃ« GjysmÃ« e ZezÃ«" 
+    11031 "Diamant Me DjathtÃ« GjysmÃ« e ZezÃ«" 
+    11032 "Diamant Me SipÃ«rm GjysmÃ« e ZezÃ«" 
+    11033 "Diamant Me Fund GjysmÃ« e ZezÃ«" 
+    11034 "Pika-Pika Katror" 
+    11035 "E ZezÃ« Madhe Katror" 
+    11036 "E BardhÃ« Madhe Katror" 
+    11037 "E ZezÃ« ShumÃ« e VogÃ«l Katror" 
+    11038 "E BardhÃ« ShumÃ« e VogÃ«l Katror" 
+    11039 "E ZezÃ« Pentagon" 
+    11040 "E BardhÃ« Pentagon" 
+    11041 "E BardhÃ« GjashtÃ«kÃ«ndÃ«sh" 
+    11042 "E ZezÃ« gjashtÃ«kÃ«ndÃ«sh" 
+    11043 "Horizontal e ZezÃ« GjashtÃ«kÃ«ndÃ«sh" 
+    11044 "E ZezÃ« Madhe Rreth" 
+    11045 "E ZezÃ« Medium Diamant" 
+    11046 "E BardhÃ« Medium Diamant" 
+    11047 "E ZezÃ« Medium TabletÃ«" 
+    11048 "E BardhÃ« Medium TabletÃ«" 
+    11049 "E ZezÃ« e VogÃ«l Diamant" 
+    11050 "E ZezÃ« e VogÃ«l TabletÃ«" 
+    11051 "E BardhÃ« e VogÃ«l TabletÃ«" 
+    11052 "E ZezÃ« Horizontal Elips" 
+    11053 "E BardhÃ« Horizontal Elips" 
+    11054 "E ZezÃ« Vertikale Elips" 
+    11055 " BardhÃ« Vertikale Elips" 
+    11056 "MajtÃ« ShigjetÃ« Me e VogÃ«l Rreth" 
+    11057 "Tre Majtas ShigjetÃ«s" 
+    11058 "MajtÃ« ShigjetÃ« Me Rrethuar Plus" 
+    11059 "GjatÃ« Majtas Squiggle ShigjetÃ«" 
+    11060 "Majtas Dy-KokÃ« ShigjetÃ« Me Vertikale Goditje" 
+    11061 "Majtas Dy-KokÃ« ShigjetÃ« Me Dyshe Vertikale Goditje" 
+    11062 "Majtas Dy-KokÃ« ShigjetÃ« Nga Bar" 
+    11063 "Majtas Dy-KokÃ« Trefish Dash ShigjetÃ«" 
+    11064 "Majtas ShigjetÃ« Me Pika-Pika Stem" 
+    11065 "Majtas ShigjetÃ« Me Bisht Me Vertikale Goditje" 
+    11066 "Majtas ShigjetÃ« Me Bisht Me Dyshe Vertikale Goditje" 
+    11067 "Majtas Dy-KokÃ« ShigjetÃ« Me Bisht" 
+    11068 "Majtas Dy-KokÃ« ShigjetÃ« Me Bisht Me Vertikale Goditje" 
+    11069 "Majtas Dy-KokÃ« ShigjetÃ« Me Bisht Me Dyshe Vertikale Goditje" 
+    11070 "Majtas ShigjetÃ« PÃ«rmes X" 
+    11071 "ValÃ« ShigjetÃ« Treguese DrejtpÃ«rdrejt MajtÃ«" 
+    11072 "BarabartÃ« ShenjÃ« Lart Majtas ShigjetÃ«" 
+    11073 "Kthe-Mbrapsht TildÃ« Operator Lart Majtas ShigjetÃ«" 
+    11074 "Majtas ShigjetÃ« Lart Kthe-Mbrapsht Pothuajse e BarabartÃ« Me" 
+    11075 "Djathtas ShigjetÃ« PÃ«rmes Madhe-se" 
+    11076 "Djathtas ShigjetÃ« PÃ«rmes Mbi-vendos" 
+    11077 "Majtas KatÃ«rfish ShigjetÃ«" 
+    11078 "Djathtas KatÃ«rfish ShigjetÃ«" 
+    11079 "Kthe-Mbrapsht TildÃ« Operator Lart Djathtas ShigjetÃ«" 
+    11080 "Djathtas ShigjetÃ« Lart Kthe-Mbrapsht Pothuajse e BarabartÃ« Me" 
+    11081 "TildÃ« Operator Lart Majtas ShigjetÃ«" 
+    11082 "Majtas ShigjetÃ« Lart Pothuajse e BarabartÃ« Me" 
+    11083 "Majtas ShigjetÃ« Lart Kthe-Mbrapsht TildÃ« Operator" 
+    11084 "Djathtas ShigjetÃ« Lart Kthe-Mbrapsht TildÃ« Operator" 
+    11088 "e BardhÃ« Medium Yll" 
+    11089 "e ZezÃ« e VogÃ«l Yll" 
+    11090 "e BardhÃ« e VogÃ«l Yll" 
+    11091 "e ZezÃ« DjathtÃ«-Treguese Pentagon" 
+    11092 "e BardhÃ« DjathtÃ«-Treguese Pentagon" 
+    11093 "RÃ«ndÃ« Madhe Rreth" 
+    11094 "RÃ«ndÃ« Oval Me Oval Brenda" 
+    11095 "RÃ«ndÃ« Rreth Me Rreth Brenda" 
+    11096 "RÃ«ndÃ« Rreth" 
+    11097 "RÃ«ndÃ« Rrethuar Saltire" 
+    11264 "Glagolitike ShkronjÃ« e Madhe Azu" 
+    11265 "Glagolitike ShkronjÃ« e Madhe Buky" 
+    11266 "Glagolitike ShkronjÃ« e Madhe Vede" 
+    11267 "Glagolitike ShkronjÃ« e Madhe Glagoli" 
+    11268 "Glagolitike ShkronjÃ« e Madhe Dobro" 
+    11269 "Glagolitike ShkronjÃ« e Madhe Yestu" 
+    11270 "Glagolitike ShkronjÃ« e Madhe Zhivete" 
+    11271 "Glagolitike ShkronjÃ« e Madhe Dzelo" 
+    11272 "Glagolitike ShkronjÃ« e Madhe Zemlja" 
+    11273 "Glagolitike ShkronjÃ« e Madhe Izhe" 
+    11274 "Glagolitike ShkronjÃ« e Madhe Fillestar Izhe" 
+    11275 "Glagolitike ShkronjÃ« e Madhe I" 
+    11276 "Glagolitike ShkronjÃ« e Madhe Djervi" 
+    11277 "Glagolitike ShkronjÃ« e Madhe Kako" 
+    11278 "Glagolitike ShkronjÃ« e Madhe Ljudije" 
+    11279 "Glagolitike ShkronjÃ« e Madhe Myslite" 
+    11280 "Glagolitike ShkronjÃ« e Madhe Nashi" 
+    11281 "Glagolitike ShkronjÃ« e Madhe Onu" 
+    11282 "Glagolitike ShkronjÃ« e Madhe Pokoji" 
+    11283 "Glagolitike ShkronjÃ« e Madhe Ritsi" 
+    11284 "Glagolitike ShkronjÃ« e Madhe Slovo" 
+    11285 "Glagolitike ShkronjÃ« e Madhe Tvrido" 
+    11286 "Glagolitike ShkronjÃ« e Madhe Uku" 
+    11287 "Glagolitike ShkronjÃ« e Madhe Fritu" 
+    11288 "Glagolitike ShkronjÃ« e Madhe Heru" 
+    11289 "Glagolitike ShkronjÃ« e Madhe Otu" 
+    11290 "Glagolitike ShkronjÃ« e Madhe Pe" 
+    11291 "Glagolitike ShkronjÃ« e Madhe Shta" 
+    11292 "Glagolitike ShkronjÃ« e Madhe Tsi" 
+    11293 "Glagolitike ShkronjÃ« e Madhe Chrivi" 
+    11294 "Glagolitike ShkronjÃ« e Madhe Sha" 
+    11295 "Glagolitike ShkronjÃ« e Madhe Yeru" 
+    11296 "Glagolitike ShkronjÃ« e Madhe Yeri" 
+    11297 "Glagolitike ShkronjÃ« e Madhe Yati" 
+    11298 "Glagolitike ShkronjÃ« e Madhe Spidery Ha" 
+    11299 "Glagolitike ShkronjÃ« e Madhe Yu" 
+    11300 "Glagolitike ShkronjÃ« e Madhe e VogÃ«l Yus" 
+    11301 "Glagolitike ShkronjÃ« e Madhe e VogÃ«l Yus Me Bisht" 
+    11302 "Glagolitike ShkronjÃ« e Madhe Yo" 
+    11303 "Glagolitike ShkronjÃ« e Madhe Iotated e VogÃ«l Yus" 
+    11304 "Glagolitike ShkronjÃ« e Madhe Big Yus" 
+    11305 "Glagolitike ShkronjÃ« e Madhe Iotated Big Yus" 
+    11306 "Glagolitike ShkronjÃ« e Madhe Fita" 
+    11307 "Glagolitike ShkronjÃ« e Madhe Izhitsa" 
+    11308 "Glagolitike ShkronjÃ« e Madhe Shtapic" 
+    11309 "Glagolitike ShkronjÃ« e Madhe Trokutasti A" 
+    11310 "Glagolitike ShkronjÃ« e Madhe Latinate Myslite" 
+    11312 "Glagolitike ShkronjÃ« e VogÃ«l Azu" 
+    11313 "Glagolitike ShkronjÃ« e VogÃ«l Buky" 
+    11314 "Glagolitike ShkronjÃ« e VogÃ«l Vede" 
+    11315 "Glagolitike ShkronjÃ« e VogÃ«l Glagoli" 
+    11316 "Glagolitike ShkronjÃ« e VogÃ«l Dobro" 
+    11317 "Glagolitike ShkronjÃ« e VogÃ«l Yestu" 
+    11318 "Glagolitike ShkronjÃ« e VogÃ«l Zhivete" 
+    11319 "Glagolitike ShkronjÃ« e VogÃ«l Dzelo" 
+    11320 "Glagolitike ShkronjÃ« e VogÃ«l Zemlja" 
+    11321 "Glagolitike ShkronjÃ« e VogÃ«l Izhe" 
+    11322 "Glagolitike ShkronjÃ« e VogÃ«l Fillestar Izhe" 
+    11323 "Glagolitike ShkronjÃ« e VogÃ«l I" 
+    11324 "Glagolitike ShkronjÃ« e VogÃ«l Djervi" 
+    11325 "Glagolitike ShkronjÃ« e VogÃ«l Kako" 
+    11326 "Glagolitike ShkronjÃ« e VogÃ«l Ljudije" 
+    11327 "Glagolitike ShkronjÃ« e VogÃ«l Myslite" 
+    11328 "Glagolitike ShkronjÃ« e VogÃ«l Nashi" 
+    11329 "Glagolitike ShkronjÃ« e VogÃ«l Onu" 
+    11330 "Glagolitike ShkronjÃ« e VogÃ«l Pokoji" 
+    11331 "Glagolitike ShkronjÃ« e VogÃ«l Ritsi" 
+    11332 "Glagolitike ShkronjÃ« e VogÃ«l Slovo" 
+    11333 "Glagolitike ShkronjÃ« e VogÃ«l Tvrido" 
+    11334 "Glagolitike ShkronjÃ« e VogÃ«l Uku" 
+    11335 "Glagolitike ShkronjÃ« e VogÃ«l Fritu" 
+    11336 "Glagolitike ShkronjÃ« e VogÃ«l Heru" 
+    11337 "Glagolitike ShkronjÃ« e VogÃ«l Otu" 
+    11338 "Glagolitike ShkronjÃ« e VogÃ«l Pe" 
+    11339 "Glagolitike ShkronjÃ« e VogÃ«l Shta" 
+    11340 "Glagolitike ShkronjÃ« e VogÃ«l Tsi" 
+    11341 "Glagolitike ShkronjÃ« e VogÃ«l Chrivi" 
+    11342 "Glagolitike ShkronjÃ« e VogÃ«l Sha" 
+    11343 "Glagolitike ShkronjÃ« e VogÃ«l Yeru" 
+    11344 "Glagolitike ShkronjÃ« e VogÃ«l Yeri" 
+    11345 "Glagolitike ShkronjÃ« e VogÃ«l Yati" 
+    11346 "Glagolitike ShkronjÃ« e VogÃ«l Spidery Ha" 
+    11347 "Glagolitike ShkronjÃ« e VogÃ«l Yu" 
+    11348 "Glagolitike ShkronjÃ« e VogÃ«l e VogÃ«l Yus" 
+    11349 "Glagolitike ShkronjÃ« e VogÃ«l e VogÃ«l Yus Me Bisht" 
+    11350 "Glagolitike ShkronjÃ« e VogÃ«l Yo" 
+    11351 "Glagolitike ShkronjÃ« e VogÃ«l Iotated e VogÃ«l Yus" 
+    11352 "Glagolitike ShkronjÃ« e VogÃ«l Big Yus" 
+    11353 "Glagolitike ShkronjÃ« e VogÃ«l Iotated Big Yus" 
+    11354 "Glagolitike ShkronjÃ« e VogÃ«l Fita" 
+    11355 "Glagolitike ShkronjÃ« e VogÃ«l Izhitsa" 
+    11356 "Glagolitike ShkronjÃ« e VogÃ«l Shtapic" 
+    11357 "Glagolitike ShkronjÃ« e VogÃ«l Trokutasti A" 
+    11358 "Glagolitike ShkronjÃ« e VogÃ«l Latinate Myslite" 
+    11360 "ShkronjÃ« e Madhe Latine L Me Dyshe Bar" 
+    11361 "ShkronjÃ« e VogÃ«l Latine L Me Dyshe Bar" 
+    11362 "ShkronjÃ« e Madhe Latine L Me Mesit TildÃ«" 
+    11363 "ShkronjÃ« e Madhe Latine P Me Goditje" 
+    11364 "ShkronjÃ« e Madhe Latine R Me Bisht" 
+    11365 "ShkronjÃ« e VogÃ«l Latine A Me Goditje" 
+    11366 "ShkronjÃ« e VogÃ«l Latine T Me Diagonal Goditje" 
+    11367 "ShkronjÃ« e Madhe Latine H Me Descender" 
+    11368 "ShkronjÃ« e VogÃ«l Latine H Me Descender" 
+    11369 "ShkronjÃ« e Madhe Latine K Me Descender" 
+    11370 "ShkronjÃ« e VogÃ«l Latine K Me Descender" 
+    11371 "ShkronjÃ« e Madhe Latine Z Me Descender" 
+    11372 "ShkronjÃ« e VogÃ«l Latine Z Me Descender" 
+    11373 "ShkronjÃ« e Madhe Latine Alpha" 
+    11374 "ShkronjÃ« e Madhe Latine M Me Kapje" 
+    11375 "ShkronjÃ« e Madhe Latine Kthyer A" 
+    11376 "ShkronjÃ« e Madhe Latine Kthyer Alpha" 
+    11377 "ShkronjÃ« e VogÃ«l Latine V Me DjathtÃ« Kapje" 
+    11378 "ShkronjÃ« e Madhe Latine W Me Kapje" 
+    11379 "ShkronjÃ« e VogÃ«l Latine W Me Kapje" 
+    11380 "ShkronjÃ« e VogÃ«l Latine V Me PÃ«rdredhje" 
+    11381 "ShkronjÃ« e Madhe Latine GjysmÃ« H" 
+    11382 "ShkronjÃ« e VogÃ«l Latine GjysmÃ« H" 
+    11383 "ShkronjÃ« e VogÃ«l Latine Tailless Phi" 
+    11384 "ShkronjÃ« e VogÃ«l Latine E Me Notch" 
+    11385 "ShkronjÃ« e VogÃ«l Latine Kthyer R Me Bisht" 
+    11386 "ShkronjÃ« e VogÃ«l Latine O Me UlÃ«t Rreth Brenda" 
+    11387 "Latin ShkronjÃ« e VogÃ«l e Madhe Kthyer E" 
+    11388 "Latin NÃ«nshkrim ShkronjÃ« e VogÃ«l J" 
+    11389 "Modifiko ShkronjÃ« e Madhe V" 
+    11390 "ShkronjÃ« e Madhe Latine S Me Swash Bisht" 
+    11391 "ShkronjÃ« e Madhe Latine Z Me Swash Bisht" 
+    11392 "Coptic ShkronjÃ« e Madhe Alfa" 
+    11393 "Coptic ShkronjÃ« e VogÃ«l Alfa" 
+    11394 "Coptic ShkronjÃ« e Madhe Vida" 
+    11395 "Coptic ShkronjÃ« e VogÃ«l Vida" 
+    11396 "Coptic ShkronjÃ« e Madhe Gamma" 
+    11397 "Coptic ShkronjÃ« e VogÃ«l Gamma" 
+    11398 "Coptic ShkronjÃ« e Madhe Dalda" 
+    11399 "Coptic ShkronjÃ« e VogÃ«l Dalda" 
+    11400 "Coptic ShkronjÃ« e Madhe Eie" 
+    11401 "Coptic ShkronjÃ« e VogÃ«l Eie" 
+    11402 "Coptic ShkronjÃ« e Madhe Sou" 
+    11403 "Coptic ShkronjÃ« e VogÃ«l Sou" 
+    11404 "Coptic ShkronjÃ« e Madhe Zata" 
+    11405 "Coptic ShkronjÃ« e VogÃ«l Zata" 
+    11406 "Coptic ShkronjÃ« e Madhe Hate" 
+    11407 "Coptic ShkronjÃ« e VogÃ«l Hate" 
+    11408 "Coptic ShkronjÃ« e Madhe Thethe" 
+    11409 "Coptic ShkronjÃ« e VogÃ«l Thethe" 
+    11410 "Coptic ShkronjÃ« e Madhe Iauda" 
+    11411 "Coptic ShkronjÃ« e VogÃ«l Iauda" 
+    11412 "Coptic ShkronjÃ« e Madhe Kapa" 
+    11413 "Coptic ShkronjÃ« e VogÃ«l Kapa" 
+    11414 "Coptic ShkronjÃ« e Madhe Laula" 
+    11415 "Coptic ShkronjÃ« e VogÃ«l Laula" 
+    11416 "Coptic ShkronjÃ« e Madhe Mi" 
+    11417 "Coptic ShkronjÃ« e VogÃ«l Mi" 
+    11418 "Coptic ShkronjÃ« e Madhe Ni" 
+    11419 "Coptic ShkronjÃ« e VogÃ«l Ni" 
+    11420 "Coptic ShkronjÃ« e Madhe Ksi" 
+    11421 "Coptic ShkronjÃ« e VogÃ«l Ksi" 
+    11422 "Coptic ShkronjÃ« e Madhe O" 
+    11423 "Coptic ShkronjÃ« e VogÃ«l O" 
+    11424 "Coptic ShkronjÃ« e Madhe Pi" 
+    11425 "Coptic ShkronjÃ« e VogÃ«l Pi" 
+    11426 "Coptic ShkronjÃ« e Madhe Ro" 
+    11427 "Coptic ShkronjÃ« e VogÃ«l Ro" 
+    11428 "Coptic ShkronjÃ« e Madhe Sima" 
+    11429 "Coptic ShkronjÃ« e VogÃ«l Sima" 
+    11430 "Coptic ShkronjÃ« e Madhe Tau" 
+    11431 "Coptic ShkronjÃ« e VogÃ«l Tau" 
+    11432 "Coptic ShkronjÃ« e Madhe Ua" 
+    11433 "Coptic ShkronjÃ« e VogÃ«l Ua" 
+    11434 "Coptic ShkronjÃ« e Madhe Fi" 
+    11435 "Coptic ShkronjÃ« e VogÃ«l Fi" 
+    11436 "Coptic ShkronjÃ« e Madhe Khi" 
+    11437 "Coptic ShkronjÃ« e VogÃ«l Khi" 
+    11438 "Coptic ShkronjÃ« e Madhe Psi" 
+    11439 "Coptic ShkronjÃ« e VogÃ«l Psi" 
+    11440 "Coptic ShkronjÃ« e Madhe Oou" 
+    11441 "Coptic ShkronjÃ« e VogÃ«l Oou" 
+    11442 "Coptic ShkronjÃ« e Madhe Dialekt-P Alef" 
+    11443 "Coptic ShkronjÃ« e VogÃ«l Dialekt-P Alef" 
+    11444 "Coptic ShkronjÃ« e Madhe Old Coptic Ain" 
+    11445 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Ain" 
+    11446 "Coptic ShkronjÃ« e Madhe Cryptogrammic Eie" 
+    11447 "Coptic ShkronjÃ« e VogÃ«l Cryptogrammic Eie" 
+    11448 "Coptic ShkronjÃ« e Madhe Dialekt-P Kapa" 
+    11449 "Coptic ShkronjÃ« e VogÃ«l Dialekt-P Kapa" 
+    11450 "Coptic ShkronjÃ« e Madhe Dialekt-P Ni" 
+    11451 "Coptic ShkronjÃ« e VogÃ«l Dialekt-P Ni" 
+    11452 "Coptic ShkronjÃ« e Madhe Cryptogrammic Ni" 
+    11453 "Coptic ShkronjÃ« e VogÃ«l Cryptogrammic Ni" 
+    11454 "Coptic ShkronjÃ« e Madhe Old Coptic Oou" 
+    11455 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Oou" 
+    11456 "Coptic ShkronjÃ« e Madhe Sampi" 
+    11457 "Coptic ShkronjÃ« e VogÃ«l Sampi" 
+    11458 "Coptic ShkronjÃ« e Madhe Crossed Shei" 
+    11459 "Coptic ShkronjÃ« e VogÃ«l Crossed Shei" 
+    11460 "Coptic ShkronjÃ« e Madhe Old Coptic Shei" 
+    11461 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Shei" 
+    11462 "Coptic ShkronjÃ« e Madhe Old Coptic Esh" 
+    11463 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Esh" 
+    11464 "Coptic ShkronjÃ« e Madhe Akhmimic Khei" 
+    11465 "Coptic ShkronjÃ« e VogÃ«l Akhmimic Khei" 
+    11466 "Coptic ShkronjÃ« e Madhe Dialect-P Hori" 
+    11467 "Coptic ShkronjÃ« e VogÃ«l Dialect-P Hori" 
+    11468 "Coptic ShkronjÃ« e Madhe Old Coptic Hori" 
+    11469 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Hori" 
+    11470 "Coptic ShkronjÃ« e Madhe Old Coptic Ha" 
+    11471 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Ha" 
+    11472 "Coptic ShkronjÃ« e Madhe L-Shaped Ha" 
+    11473 "Coptic ShkronjÃ« e VogÃ«l L-Shaped Ha" 
+    11474 "Coptic ShkronjÃ« e Madhe Old Coptic Hei" 
+    11475 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Hei" 
+    11476 "Coptic ShkronjÃ« e Madhe Old Coptic Hat" 
+    11477 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Hat" 
+    11478 "Coptic ShkronjÃ« e Madhe Old Coptic Gangia" 
+    11479 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Gangia" 
+    11480 "Coptic ShkronjÃ« e Madhe Old Coptic Dja" 
+    11481 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Dja" 
+    11482 "Coptic ShkronjÃ« e Madhe Old Coptic Shima" 
+    11483 "Coptic ShkronjÃ« e VogÃ«l Old Coptic Shima" 
+    11484 "Coptic ShkronjÃ« e Madhe Old Nubian Shima" 
+    11485 "Coptic ShkronjÃ« e VogÃ«l Old Nubian Shima" 
+    11486 "Coptic ShkronjÃ« e Madhe Old Nubian Ngi" 
+    11487 "Coptic ShkronjÃ« e VogÃ«l Old Nubian Ngi" 
+    11488 "Coptic ShkronjÃ« e Madhe Old Nubian Nyi" 
+    11489 "Coptic ShkronjÃ« e VogÃ«l Old Nubian Nyi" 
+    11490 "Coptic ShkronjÃ« e Madhe Old Nubian Wau" 
+    11491 "Coptic ShkronjÃ« e VogÃ«l Old Nubian Wau" 
+    11492 "Coptic Simbol Kai" 
+    11493 "Coptic Simbol Mi Ro" 
+    11494 "Coptic Simbol Pi Ro" 
+    11495 "Coptic Simbol Stauros" 
+    11496 "Coptic Simbol Tau Ro" 
+    11497 "Coptic Simbol Khi Ro" 
+    11498 "Coptic Simbol Shima Sima" 
+    11499 "Coptic ShkronjÃ« e Madhe Cryptogrammic Shei" 
+    11500 "Coptic ShkronjÃ« e VogÃ«l Cryptogrammic Shei" 
+    11501 "Coptic ShkronjÃ« e Madhe Cryptogrammic Gangia" 
+    11502 "Coptic ShkronjÃ« e VogÃ«l Cryptogrammic Gangia" 
+    11503 "Coptic Kombinuar Ni Lart" 
+    11504 "Coptic Kombinuar Spiritus Asper" 
+    11505 "Coptic Kombinuar Spiritus Lenis" 
+    11506 "Coptic ShkronjÃ« e Madhe Bohairic Khei" 
+    11507 "Coptic ShkronjÃ« e VogÃ«l Bohairic Khei" 
+    11513 "Coptic Old Nubian PikÃ«" 
+    11514 "Coptic Old Nubian Direct Pyetje ShenjÃ«" 
+    11515 "Coptic Old Nubian Indirect Pyetje ShenjÃ«" 
+    11516 "Coptic Old Nubian Verse Divider" 
+    11517 "Coptic Fraksion NjÃ« GjysmÃ«" 
+    11518 "Coptic PikÃ«" 
+    11519 "Coptic Morphological Divider" 
+    11520 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l An" 
+    11521 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Ban" 
+    11522 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Gan" 
+    11523 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Don" 
+    11524 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l En" 
+    11525 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Vin" 
+    11526 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Zen" 
+    11527 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Tan" 
+    11528 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l In" 
+    11529 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Kan" 
+    11530 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Las" 
+    11531 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Man" 
+    11532 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Nar" 
+    11533 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l On" 
+    11534 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Par" 
+    11535 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Zhar" 
+    11536 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Rae" 
+    11537 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l San" 
+    11538 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Tar" 
+    11539 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Un" 
+    11540 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Phar" 
+    11541 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Khar" 
+    11542 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Ghan" 
+    11543 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Qar" 
+    11544 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Shin" 
+    11545 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Chin" 
+    11546 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Can" 
+    11547 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Jil" 
+    11548 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Cil" 
+    11549 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Char" 
+    11550 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Xan" 
+    11551 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Jhan" 
+    11552 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Hae" 
+    11553 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l He" 
+    11554 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Hie" 
+    11555 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l We" 
+    11556 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Har" 
+    11557 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Hoe" 
+    11559 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Yn" 
+    11565 "GjeorgjisÃ« ShkronjÃ« e VogÃ«l Aen" 
+    11568 "Tifinagh ShkronjÃ« Ya" 
+    11569 "Tifinagh ShkronjÃ« Yab" 
+    11570 "Tifinagh ShkronjÃ« Yabh" 
+    11571 "Tifinagh ShkronjÃ« Yag" 
+    11572 "Tifinagh ShkronjÃ« Yaghh" 
+    11573 "Tifinagh ShkronjÃ« Berber Academy Yaj" 
+    11574 "Tifinagh ShkronjÃ« Yaj" 
+    11575 "Tifinagh ShkronjÃ« Yad" 
+    11576 "Tifinagh ShkronjÃ« Yadh" 
+    11577 "Tifinagh ShkronjÃ« Yadd" 
+    11578 "Tifinagh ShkronjÃ« Yaddh" 
+    11579 "Tifinagh ShkronjÃ« Yey" 
+    11580 "Tifinagh ShkronjÃ« Yaf" 
+    11581 "Tifinagh ShkronjÃ« Yak" 
+    11582 "Tifinagh ShkronjÃ« Tuareg Yak" 
+    11583 "Tifinagh ShkronjÃ« Yakhh" 
+    11584 "Tifinagh ShkronjÃ« Yah" 
+    11585 "Tifinagh ShkronjÃ« Berber Academy Yah" 
+    11586 "Tifinagh ShkronjÃ« Tuareg Yah" 
+    11587 "Tifinagh ShkronjÃ« Yahh" 
+    11588 "Tifinagh ShkronjÃ« Yaa" 
+    11589 "Tifinagh ShkronjÃ« Yakh" 
+    11590 "Tifinagh ShkronjÃ« Tuareg Yakh" 
+    11591 "Tifinagh ShkronjÃ« Yaq" 
+    11592 "Tifinagh ShkronjÃ« Tuareg Yaq" 
+    11593 "Tifinagh ShkronjÃ« Yi" 
+    11594 "Tifinagh ShkronjÃ« Yazh" 
+    11595 "Tifinagh ShkronjÃ« Ahaggar Yazh" 
+    11596 "Tifinagh ShkronjÃ« Tuareg Yazh" 
+    11597 "Tifinagh ShkronjÃ« Yal" 
+    11598 "Tifinagh ShkronjÃ« Yam" 
+    11599 "Tifinagh ShkronjÃ« Yan" 
+    11600 "Tifinagh ShkronjÃ« Tuareg Yagn" 
+    11601 "Tifinagh ShkronjÃ« Tuareg Yang" 
+    11602 "Tifinagh ShkronjÃ« Yap" 
+    11603 "Tifinagh ShkronjÃ« Yu" 
+    11604 "Tifinagh ShkronjÃ« Yar" 
+    11605 "Tifinagh ShkronjÃ« Yarr" 
+    11606 "Tifinagh ShkronjÃ« Yagh" 
+    11607 "Tifinagh ShkronjÃ« Tuareg Yagh" 
+    11608 "Tifinagh ShkronjÃ« Ayer Yagh" 
+    11609 "Tifinagh ShkronjÃ« Yas" 
+    11610 "Tifinagh ShkronjÃ« Yass" 
+    11611 "Tifinagh ShkronjÃ« Yash" 
+    11612 "Tifinagh ShkronjÃ« Yat" 
+    11613 "Tifinagh ShkronjÃ« Yath" 
+    11614 "Tifinagh ShkronjÃ« Yach" 
+    11615 "Tifinagh ShkronjÃ« Yatt" 
+    11616 "Tifinagh ShkronjÃ« Yav" 
+    11617 "Tifinagh ShkronjÃ« Yaw" 
+    11618 "Tifinagh ShkronjÃ« Yay" 
+    11619 "Tifinagh ShkronjÃ« Yaz" 
+    11620 "Tifinagh ShkronjÃ« Tawellemet Yaz" 
+    11621 "Tifinagh ShkronjÃ« Yazz" 
+    11622 "Tifinagh ShkronjÃ« Ye" 
+    11623 "Tifinagh ShkronjÃ« Yo" 
+    11631 "Tifinagh Modifiko ShkronjÃ« Labialization ShenjÃ«" 
+    11632 "Tifinagh NdarÃ«s ShenjÃ«" 
+    11647 "Tifinagh BashkÃ«tingÃ«llore Joiner" 
+    11648 "Ethiopic Rrokje Loa" 
+    11649 "Ethiopic Rrokje Moa" 
+    11650 "Ethiopic Rrokje Roa" 
+    11651 "Ethiopic Rrokje Soa" 
+    11652 "Ethiopic Rrokje Shoa" 
+    11653 "Ethiopic Rrokje Boa" 
+    11654 "Ethiopic Rrokje Toa" 
+    11655 "Ethiopic Rrokje Coa" 
+    11656 "Ethiopic Rrokje Noa" 
+    11657 "Ethiopic Rrokje Nyoa" 
+    11658 "Ethiopic Rrokje Glottal Oa" 
+    11659 "Ethiopic Rrokje Zoa" 
+    11660 "Ethiopic Rrokje Doa" 
+    11661 "Ethiopic Rrokje Ddoa" 
+    11662 "Ethiopic Rrokje Joa" 
+    11663 "Ethiopic Rrokje Thoa" 
+    11664 "Ethiopic Rrokje Choa" 
+    11665 "Ethiopic Rrokje Phoa" 
+    11666 "Ethiopic Rrokje Poa" 
+    11667 "Ethiopic Rrokje Ggwa" 
+    11668 "Ethiopic Rrokje Ggwi" 
+    11669 "Ethiopic Rrokje Ggwee" 
+    11670 "Ethiopic Rrokje Ggwe" 
+    11680 "Ethiopic Rrokje Ssa" 
+    11681 "Ethiopic Rrokje Ssu" 
+    11682 "Ethiopic Rrokje Ssi" 
+    11683 "Ethiopic Rrokje Ssaa" 
+    11684 "Ethiopic Rrokje Ssee" 
+    11685 "Ethiopic Rrokje Sse" 
+    11686 "Ethiopic Rrokje Sso" 
+    11688 "Ethiopic Rrokje Cca" 
+    11689 "Ethiopic Rrokje Ccu" 
+    11690 "Ethiopic Rrokje Cci" 
+    11691 "Ethiopic Rrokje Ccaa" 
+    11692 "Ethiopic Rrokje Ccee" 
+    11693 "Ethiopic Rrokje Cce" 
+    11694 "Ethiopic Rrokje Cco" 
+    11696 "Ethiopic Rrokje Zza" 
+    11697 "Ethiopic Rrokje Zzu" 
+    11698 "Ethiopic Rrokje Zzi" 
+    11699 "Ethiopic Rrokje Zzaa" 
+    11700 "Ethiopic Rrokje Zzee" 
+    11701 "Ethiopic Rrokje Zze" 
+    11702 "Ethiopic Rrokje Zzo" 
+    11704 "Ethiopic Rrokje Ccha" 
+    11705 "Ethiopic Rrokje Cchu" 
+    11706 "Ethiopic Rrokje Cchi" 
+    11707 "Ethiopic Rrokje Cchaa" 
+    11708 "Ethiopic Rrokje Cchee" 
+    11709 "Ethiopic Rrokje Cche" 
+    11710 "Ethiopic Rrokje Ccho" 
+    11712 "Ethiopic Rrokje Qya" 
+    11713 "Ethiopic Rrokje Qyu" 
+    11714 "Ethiopic Rrokje Qyi" 
+    11715 "Ethiopic Rrokje Qyaa" 
+    11716 "Ethiopic Rrokje Qyee" 
+    11717 "Ethiopic Rrokje Qye" 
+    11718 "Ethiopic Rrokje Qyo" 
+    11720 "Ethiopic Rrokje Kya" 
+    11721 "Ethiopic Rrokje Kyu" 
+    11722 "Ethiopic Rrokje Kyi" 
+    11723 "Ethiopic Rrokje Kyaa" 
+    11724 "Ethiopic Rrokje Kyee" 
+    11725 "Ethiopic Rrokje Kye" 
+    11726 "Ethiopic Rrokje Kyo" 
+    11728 "Ethiopic Rrokje Xya" 
+    11729 "Ethiopic Rrokje Xyu" 
+    11730 "Ethiopic Rrokje Xyi" 
+    11731 "Ethiopic Rrokje Xyaa" 
+    11732 "Ethiopic Rrokje Xyee" 
+    11733 "Ethiopic Rrokje Xye" 
+    11734 "Ethiopic Rrokje Xyo" 
+    11736 "Ethiopic Rrokje Gya" 
+    11737 "Ethiopic Rrokje Gyu" 
+    11738 "Ethiopic Rrokje Gyi" 
+    11739 "Ethiopic Rrokje Gyaa" 
+    11740 "Ethiopic Rrokje Gyee" 
+    11741 "Ethiopic Rrokje Gye" 
+    11742 "Ethiopic Rrokje Gyo" 
+    11744 "Kombinuar Cyrillic ShkronjÃ« Be" 
+    11745 "Kombinuar Cyrillic ShkronjÃ« Ve" 
+    11746 "Kombinuar Cyrillic ShkronjÃ« Ghe" 
+    11747 "Kombinuar Cyrillic ShkronjÃ« De" 
+    11748 "Kombinuar Cyrillic ShkronjÃ« Zhe" 
+    11749 "Kombinuar Cyrillic ShkronjÃ« Ze" 
+    11750 "Kombinuar Cyrillic ShkronjÃ« Ka" 
+    11751 "Kombinuar Cyrillic ShkronjÃ« El" 
+    11752 "Kombinuar Cyrillic ShkronjÃ« Em" 
+    11753 "Kombinuar Cyrillic ShkronjÃ« En" 
+    11754 "Kombinuar Cyrillic ShkronjÃ« O" 
+    11755 "Kombinuar Cyrillic ShkronjÃ« Pe" 
+    11756 "Kombinuar Cyrillic ShkronjÃ« Er" 
+    11757 "Kombinuar Cyrillic ShkronjÃ« Es" 
+    11758 "Kombinuar Cyrillic ShkronjÃ« Te" 
+    11759 "Kombinuar Cyrillic ShkronjÃ« Ha" 
+    11760 "Kombinuar Cyrillic ShkronjÃ« Tse" 
+    11761 "Kombinuar Cyrillic ShkronjÃ« Che" 
+    11762 "Kombinuar Cyrillic ShkronjÃ« Sha" 
+    11763 "Kombinuar Cyrillic ShkronjÃ« Shcha" 
+    11764 "Kombinuar Cyrillic ShkronjÃ« Fita" 
+    11765 "Kombinuar Cyrillic ShkronjÃ« Es-Te" 
+    11766 "Kombinuar Cyrillic ShkronjÃ« A" 
+    11767 "Kombinuar Cyrillic ShkronjÃ« Ie" 
+    11768 "Kombinuar Cyrillic ShkronjÃ« Djerv" 
+    11769 "Kombinuar Cyrillic ShkronjÃ« Monograph Uk" 
+    11770 "Kombinuar Cyrillic ShkronjÃ« Yat" 
+    11771 "Kombinuar Cyrillic ShkronjÃ« Yu" 
+    11772 "Kombinuar Cyrillic ShkronjÃ« Iotified A" 
+    11773 "Kombinuar Cyrillic ShkronjÃ« Pak Yus" 
+    11774 "Kombinuar Cyrillic ShkronjÃ« Big Yus" 
+    11775 "Kombinuar Cyrillic ShkronjÃ« Iotified Big Yus" 
+    11776 "DjathtÃ« KÃ«nd zÃ«vendÃ«sim ShÃ«nues" 
+    11777 "DjathtÃ« KÃ«nd Pika-Pika zÃ«vendÃ«sim ShÃ«nues" 
+    11778 "MajtÃ« zÃ«vendÃ«sim Kllapa" 
+    11779 "DjathtÃ« zÃ«vendÃ«sim Kllapa" 
+    11780 "MajtÃ« Pika-Pika zÃ«vendÃ«sim Kllapa" 
+    11781 "DjathtÃ« Pika-Pika zÃ«vendÃ«sim Kllapa" 
+    11782 "Ngritur Interpelonte ShÃ«nues" 
+    11783 "Ngritur Pika-Pika Interpelonte ShÃ«nues" 
+    11784 "Pika-Pika Transporton ShÃ«nues" 
+    11785 "MajtÃ« Transporton Kllapa" 
+    11786 "DjathtÃ« Transporton Kllapa" 
+    11787 "Ngritur Katror" 
+    11788 "MajtÃ« Ngritur Komision Kllapa" 
+    11789 "DjathtÃ« Ngritur Komision Kllapa" 
+    11790 "Redaktorial Coronis" 
+    11791 "Paragraphos" 
+    11792 "Forked Paragraphos" 
+    11793 "KundÃ«rt Forked Paragraphos" 
+    11794 "Hypodiastole" 
+    11795 "Pika-Pika Obelos" 
+    11796 "TeposhtÃ« Ancora" 
+    11797 "PÃ«rpjetÃ« Ancora" 
+    11798 "Pika-Pika DjathtÃ«-Treguese KÃ«nd" 
+    11799 "Dyshe Oblique Hyphen" 
+    11800 "Kthyer Interrobang" 
+    11801 "Palm Branch" 
+    11802 "Hyphen Me Diaeresis" 
+    11803 "TildÃ« Me Rreth Mbi" 
+    11804 "MajtÃ« UlÃ«t Paraphrase Kllapa" 
+    11805 "DjathtÃ« UlÃ«t Paraphrase Kllapa" 
+    11806 "TildÃ« Me PikÃ« Mbi" 
+    11807 "TildÃ« Me PikÃ« PoshtÃ«" 
+    11808 "MajtÃ« Vertikale Bar Me Quill" 
+    11809 "DjathtÃ« Vertikale Bar Me Quill" 
+    11810 "SipÃ«rm MajtÃ« GjysmÃ« Kllapa" 
+    11811 "SipÃ«rm DjathtÃ« GjysmÃ« Kllapa" 
+    11812 "Fund MajtÃ« GjysmÃ« Kllapa" 
+    11813 "Fund DjathtÃ« GjysmÃ« Kllapa" 
+    11814 "MajtÃ« Anash U Kllapa" 
+    11815 "DjathtÃ« Anash U Kllapa" 
+    11816 "Majtas Dyshe KllapÃ«" 
+    11817 "Djathtas Dyshe KllapÃ«" 
+    11818 "Dy PikÃ« Mbi NjÃ« PikÃ« PikÃ«sim" 
+    11819 "NjÃ« PikÃ« Mbi Dy PikÃ« PikÃ«sim" 
+    11820 "Katror KatÃ«r PikÃ« PikÃ«sim" 
+    11821 "PesÃ« PikÃ« ShenjÃ«" 
+    11822 "KundÃ«rt Pyetje ShenjÃ«" 
+    11823 "Vertikale TildÃ«" 
+    11824 "Rreth Pik[" 
+    11825 "FjalÃ« NdarÃ«s Mesit PikÃ«" 
+    11826 "Kthyer Presje" 
+    11827 "Ngritur PikÃ«" 
+    11828 "Ngritur Presje" 
+    11829 "Kthyer PikÃ«presje" 
+    11830 "KamÃ« e MajtÃ« Roje" 
+    11831 "KamÃ« e DjathtÃ« Roje" 
+    11832 "Kthyer KamÃ«" 
+    11833 "SipÃ«rm GjysmÃ« Seksion ShenjÃ«" 
+    11834 "Dy-Em Dash" 
+    11835 "Tre-Em Dash" 
+    11904 "CJK Radikal PÃ«rsÃ«ritje" 
+    11905 "CJK Radikal ShkÃ«mb" 
+    11906 "CJK Radikal SekondÃ« NjÃ«" 
+    11907 "CJK Radikal SekondÃ« Dy" 
+    11908 "CJK Radikal SekondÃ« Tre" 
+    11909 "CJK Radikal Person" 
+    11910 "CJK Radikal Kuti" 
+    11911 "CJK Radikal TryezÃ«" 
+    11912 "CJK Radikal ThikÃ« NjÃ«" 
+    11913 "CJK Radikal ThikÃ« Dy" 
+    11914 "CJK Radikal Hamendje" 
+    11915 "CJK Radikal VulÃ«" 
+    11916 "CJK Radikal e VogÃ«l NjÃ«" 
+    11917 "CJK Radikal e VogÃ«l Dy" 
+    11918 "CJK Radikal Lame NjÃ«" 
+    11919 "CJK Radikal Lame Dy" 
+    11920 "CJK Radikal Lame Tre" 
+    11921 "CJK Radikal Lame KatÃ«r" 
+    11922 "CJK Radikal GjarpÃ«r" 
+    11923 "CJK Radikal Fije" 
+    11924 "CJK Radikal FeÃ§kÃ« NjÃ«" 
+    11925 "CJK Radikal FeÃ§kÃ« Dy" 
+    11926 "CJK Radikal ZemÃ«r NjÃ«" 
+    11927 "CJK Radikal ZemÃ«r Dy" 
+    11928 "CJK Radikal DorÃ«" 
+    11929 "CJK Radikal Trokas" 
+    11931 "CJK Radikal Asfiksim" 
+    11932 "CJK Radikal Diell" 
+    11933 "CJK Radikal HÃ«na" 
+    11934 "CJK Radikal Vdekja" 
+    11935 "CJK Radikal Mamaja" 
+    11936 "CJK Radikal Civil" 
+    11937 "CJK Radikal UjÃ« NjÃ«" 
+    11938 "CJK Radikal UjÃ« Dy" 
+    11939 "CJK Radikal Fire" 
+    11940 "CJK Radikal PutÃ«r NjÃ«" 
+    11941 "CJK Radikal PutÃ«r Dy" 
+    11942 "CJK Radikal ThjeshtÃ«suar GjysmÃ« Tree Trunk" 
+    11943 "CJK Radikal LopÃ«" 
+    11944 "CJK Radikal Qen" 
+    11945 "CJK Radikal Jade" 
+    11946 "CJK Radikal RrotÃ« Metrazhe" 
+    11947 "CJK Radikal Sy" 
+    11948 "CJK Radikal Shpirti NjÃ«" 
+    11949 "CJK Radikal Shpirti Dy" 
+    11950 "CJK Radikal Bamboo" 
+    11951 "CJK Radikal MÃ«ndafsh" 
+    11952 "CJK Radikal C-ThjedhtÃ«suar MÃ«ndafsh" 
+    11953 "CJK Radikal Net NjÃ«" 
+    11954 "CJK Radikal Net Dy" 
+    11955 "CJK Radikal Net Tre" 
+    11956 "CJK Radikal Net KatÃ«r" 
+    11957 "CJK Radikal Mesh" 
+    11958 "CJK Radikal Dele" 
+    11959 "CJK Radikal Ram" 
+    11960 "CJK Radikal Dele" 
+    11961 "CJK Radikal VjetÃ«r" 
+    11962 "CJK Radikal FurÃ§Ã« NjÃ«" 
+    11963 "CJK Radikal FurÃ§Ã« Dy" 
+    11964 "CJK Radikal Mish" 
+    11965 "CJK Radikal Llap" 
+    11966 "CJK Radikal BarÃ« NjÃ«" 
+    11967 "CJK Radikal BarÃ« Dy" 
+    11968 "CJK Radikal BarÃ« Tre" 
+    11969 "CJK Radikal Tiger" 
+    11970 "CJK Radikal Rroba" 
+    11971 "CJK Radikal PerÃ«ndim NjÃ«" 
+    11972 "CJK Radikal PerÃ«ndim Dy" 
+    11973 "CJK Radikal C-ThjeshtÃ«suar Shih" 
+    11974 "CJK Radikal ThjeshtÃ«suar Bri" 
+    11975 "CJK Radikal Bri" 
+    11976 "CJK Radikal C-ThjeshtÃ«suar Fjalim" 
+    11977 "CJK Radikal C-ThjeshtÃ«suar Shell" 
+    11978 "CJK Radikal KÃ«mbÃ«" 
+    11979 "CJK Radikal C-ThjeshtÃ«suar Cart" 
+    11980 "CJK Radikal ThjeshtÃ«suar Ecje" 
+    11981 "CJK Radikal Ecje NjÃ«" 
+    11982 "CJK Radikal Ecje Dy" 
+    11983 "CJK Radikal Qytet" 
+    11984 "CJK Radikal C-ThjeshtÃ«suar Ar" 
+    11985 "CJK Radikal GjatÃ« NjÃ«" 
+    11986 "CJK Radikal GjatÃ« Dy" 
+    11987 "CJK Radikal C-ThjeshtÃ«suar GjatÃ«" 
+    11988 "CJK Radikal C-ThjeshtÃ«suar Gate" 
+    11989 "CJK Radikal TumÃ« NjÃ«" 
+    11990 "CJK Radikal TumÃ« Dy" 
+    11991 "CJK Radikal Shi" 
+    11992 "CJK Radikal Blu" 
+    11993 "CJK Radikal C-ThjeshtÃ«suar Tanned Gjethe" 
+    11994 "CJK Radikal C-ThjeshtÃ«suar Gjethe" 
+    11995 "CJK Radikal C-ThjeshtÃ«suar ErÃ«" 
+    11996 "CJK Radikal C-ThjeshtÃ«suar Fluturo" 
+    11997 "CJK Radikal Ha NjÃ«" 
+    11998 "CJK Radikal Ha Dy" 
+    11999 "CJK Radikal Ha Tre" 
+    12000 "CJK Radikal C-ThjeshtÃ«suar Ha" 
+    12001 "CJK Radikal KokÃ«" 
+    12002 "CJK Radikal C-ThjeshtÃ«suar KalÃ«" 
+    12003 "CJK Radikal BNjÃ«" 
+    12004 "CJK Radikal FantazmÃ«" 
+    12005 "CJK Radikal C-ThjeshtÃ«suar Fish" 
+    12006 "CJK Radikal C-ThjeshtÃ«suar Zog" 
+    12007 "CJK Radikal C-ThjeshtÃ«suar KripÃ«" 
+    12008 "CJK Radikal ThjeshtÃ«suar GrurÃ«" 
+    12009 "CJK Radikal ThjeshtÃ«suar VerdhÃ«" 
+    12010 "CJK Radikal C-ThjeshtÃ«suar BretkosÃ«" 
+    12011 "CJK Radikal J-ThjeshtÃ«suar BarabartÃ«" 
+    12012 "CJK Radikal C-ThjeshtÃ«suar BarabartÃ«" 
+    12013 "CJK Radikal J-ThjeshtÃ«suar DhÃ«mb" 
+    12014 "CJK Radikal C-ThjeshtÃ«suar DhÃ«mb" 
+    12015 "CJK Radikal J-ThjeshtÃ«suar Dragua" 
+    12016 "CJK Radikal C-ThjeshtÃ«suar Dragua" 
+    12017 "CJK Radikal BreshkÃ«" 
+    12018 "CJK Radikal J-ThjeshtÃ«suar BreshkÃ«" 
+    12019 "CJK Radikal C-ThjeshtÃ«suar BreshkÃ«" 
+    12032 "Kangxi Radikal NjÃ«" 
+    12033 "Kangxi Radikal LinjÃ«" 
+    12034 "Kangxi Radikal PikÃ«" 
+    12035 "Kangxi Radikal Slash" 
+    12036 "Kangxi Radikal SekondÃ«" 
+    12037 "Kangxi Radikal Kapje" 
+    12038 "Kangxi Radikal Dy" 
+    12039 "Kangxi Radikal Lid" 
+    12040 "Kangxi Radikal Man" 
+    12041 "Kangxi Radikal KÃ«mbÃ«" 
+    12042 "Kangxi Radikal Hyr" 
+    12043 "Kangxi Radikal TetÃ«" 
+    12044 "Kangxi Radikal PoshtÃ« Kuti" 
+    12045 "Kangxi Radikal Cover" 
+    12046 "Kangxi Radikal Akull" 
+    12047 "Kangxi Radikal TryezÃ«" 
+    12048 "Kangxi Radikal Hap Kuti" 
+    12049 "Kangxi Radikal ThikÃ«" 
+    12050 "Kangxi Radikal ForcÃ«" 
+    12051 "Kangxi Radikal Paket" 
+    12052 "Kangxi Radikal LugÃ«" 
+    12053 "Kangxi Radikal DjathtÃ« Hap Kuti" 
+    12054 "Kangxi Radikal Fshehja ShtojcÃ«" 
+    12055 "Kangxi Radikal DhjetÃ«" 
+    12056 "Kangxi Radikal Hamendje" 
+    12057 "Kangxi Radikal VulÃ«" 
+    12058 "Kangxi Radikal ShkÃ«mb" 
+    12059 "Kangxi Radikal Private" 
+    12060 "Kangxi Radikal Again" 
+    12061 "Kangxi Radikal GojÃ«" 
+    12062 "Kangxi Radikal Mbyllje" 
+    12063 "Kangxi Radikal TokÃ«" 
+    12064 "Kangxi Radikal ShkollarÃ«" 
+    12065 "Kangxi Radikal Ec" 
+    12066 "Kangxi Radikal Ec NgadalÃ«" 
+    12067 "Kangxi Radikal MbrÃ«mje" 
+    12068 "Kangxi Radikal Madhe" 
+    12069 "Kangxi Radikal FemÃ«r" 
+    12070 "Kangxi Radikal FÃ«mijÃ«" 
+    12071 "Kangxi Radikal Ã‡ati" 
+    12072 "Kangxi Radikal Inq" 
+    12073 "Kangxi Radikal e VogÃ«l" 
+    12074 "Kangxi Radikal Lame" 
+    12075 "Kangxi Radikal KufomÃ«" 
+    12076 "Kangxi Radikal Dal" 
+    12077 "Kangxi Radikal Mal" 
+    12078 "Kangxi Radikal Lum" 
+    12079 "Kangxi Radikal PunÃ«" 
+    12080 "Kangxi Radikal VetÃ«m" 
+    12081 "Kangxi Radikal Turban" 
+    12082 "Kangxi Radikal Dry" 
+    12083 "Kangxi Radikal ShkurtÃ«r DepÃ«rtoj" 
+    12084 "Kangxi Radikal Pika-Pika ShkÃ«mb" 
+    12085 "Kangxi Radikal GjatÃ« Ecje" 
+    12086 "Kangxi Radikal Dy Duar" 
+    12087 "Kangxi Radikal Gjuaj" 
+    12088 "Kangxi Radikal PÃ«rkulje" 
+    12089 "Kangxi Radikal FeÃ§kÃ«" 
+    12090 "Kangxi Radikal Ngrihet" 
+    12091 "Kangxi Radikal Hap" 
+    12092 "Kangxi Radikal ZemÃ«r" 
+    12093 "Kangxi Radikal Halberd" 
+    12094 "Kangxi Radikal DerÃ«" 
+    12095 "Kangxi Radikal DorÃ«" 
+    12096 "Kangxi Radikal DegÃ«" 
+    12097 "Kangxi Radikal Rap" 
+    12098 "Kangxi Radikal DorÃ«shkrim" 
+    12099 "Kangxi Radikal Dipper" 
+    12100 "Kangxi Radikal Axe" 
+    12101 "Kangxi Radikal Katror" 
+    12102 "Kangxi Radikal Jo" 
+    12103 "Kangxi Radikal Diell" 
+    12104 "Kangxi Radikal Thuaj" 
+    12105 "Kangxi Radikal HÃ«nÃ«" 
+    12106 "Kangxi Radikal PemÃ«" 
+    12107 "Kangxi Radikal Fat" 
+    12108 "Kangxi Radikal Stop" 
+    12109 "Kangxi Radikal Vdekje" 
+    12110 "Kangxi Radikal ArmÃ«" 
+    12111 "Kangxi Radikal Do Jo" 
+    12112 "Kangxi Radikal Krahasim" 
+    12113 "Kangxi Radikal Fur" 
+    12114 "Kangxi Radikal Klan" 
+    12115 "Kangxi Radikal Avull" 
+    12116 "Kangxi Radikal UjÃ«" 
+    12117 "Kangxi Radikal Fire" 
+    12118 "Kangxi Radikal PutÃ«r" 
+    12119 "Kangxi Radikal Baba" 
+    12120 "Kangxi Radikal Dyshe X" 
+    12121 "Kangxi Radikal GjysmÃ« PemÃ« Trunk" 
+    12122 "Kangxi Radikal Daj" 
+    12123 "Kangxi Radikal DhÃ«mb" 
+    12124 "Kangxi Radikal LopÃ«" 
+    12125 "Kangxi Radikal Qen" 
+    12126 "Kangxi Radikal ThellÃ«" 
+    12127 "Kangxi Radikal Lodh" 
+    12128 "Kangxi Radikal PjepÃ«r" 
+    12129 "Kangxi Radikal Tile" 
+    12130 "Kangxi Radikal Ã‹mbÃ«l" 
+    12131 "Kangxi Radikal JetÃ«" 
+    12132 "Kangxi Radikal PÃ«rdor" 
+    12133 "Kangxi Radikal FushÃ«" 
+    12134 "Kangxi Radikal Top Lecke" 
+    12135 "Kangxi Radikal Grip" 
+    12136 "Kangxi Radikal Pika-Pika Tent" 
+    12137 "Kangxi Radikal e BardhÃ«" 
+    12138 "Kangxi Radikal LÃ«kure" 
+    12139 "Kangxi Radikal Dish" 
+    12140 "Kangxi Radikal Sy" 
+    12141 "Kangxi Radikal ShtizÃ«" 
+    12142 "Kangxi Radikal ShigjetÃ«" 
+    12143 "Kangxi Radikal GurÃ«" 
+    12144 "Kangxi Radikal Shpirt" 
+    12145 "Kangxi Radikal UdhÃ«" 
+    12146 "Kangxi Radikal KokÃ«rr" 
+    12147 "Kangxi Radikal Cave" 
+    12148 "Kangxi Radikal Rri" 
+    12149 "Kangxi Radikal Bambo" 
+    12150 "Kangxi Radikal Oriz" 
+    12151 "Kangxi Radikal MÃ«ndafsh" 
+    12152 "Kangxi Radikal Jar" 
+    12153 "Kangxi Radikal Net" 
+    12154 "Kangxi Radikal Dele" 
+    12155 "Kangxi Radikal PendÃ«" 
+    12156 "Kangxi Radikal VjetÃ«r" 
+    12157 "Kangxi Radikal dhe" 
+    12158 "Kangxi Radikal Ã‡an" 
+    12159 "Kangxi Radikal Vesh" 
+    12160 "Kangxi Radikal FurÃ§Ã«" 
+    12161 "Kangxi Radikal Mish" 
+    12162 "Kangxi Radikal Ministri" 
+    12163 "Kangxi Radikal Vetvetja" 
+    12164 "Kangxi Radikal Arriti" 
+    12165 "Kangxi Radikal MortajÃ«" 
+    12166 "Kangxi Radikal GjuhÃ«" 
+    12167 "Kangxi Radikal KundÃ«rshtoj" 
+    12168 "Kangxi Radikal Anije" 
+    12169 "Kangxi Radikal Ndalo" 
+    12170 "Kangxi Radikal Ngjyra" 
+    12171 "Kangxi Radikal Bari" 
+    12172 "Kangxi Radikal Tiger" 
+    12173 "Kangxi Radikal Insekt" 
+    12174 "Kangxi Radikal Gjak" 
+    12175 "Kangxi Radikal Ecni ShtojcÃ«" 
+    12176 "Kangxi Radikal Rroba" 
+    12177 "Kangxi Radikal PerÃ«ndim" 
+    12178 "Kangxi Radikal Shi" 
+    12179 "Kangxi Radikal Bri" 
+    12180 "Kangxi Radikal Fjalim" 
+    12181 "Kangxi Radikal LuginÃ«" 
+    12182 "Kangxi Radikal BathÃ«" 
+    12183 "Kangxi Radikal Derr" 
+    12184 "Kangxi Radikal Lodh" 
+    12185 "Kangxi Radikal GuaskÃ«" 
+    12186 "Kangxi Radikal Kuqe" 
+    12187 "Kangxi Radikal Ik" 
+    12188 "Kangxi Radikal KÃ«mbÃ«" 
+    12189 "Kangxi Radikal Trupi" 
+    12190 "Kangxi Radikal Cart" 
+    12191 "Kangxi Radikal Hidhur" 
+    12192 "Kangxi Radikal MÃ«ngjes" 
+    12193 "Kangxi Radikal Ecje" 
+    12194 "Kangxi Radikal Qytet" 
+    12195 "Kangxi Radikal VerÃ«" 
+    12196 "Kangxi Radikal Dalloj" 
+    12197 "Kangxi Radikal Fshat" 
+    12198 "Kangxi Radikal ArÃ«" 
+    12199 "Kangxi Radikal GjatÃ«" 
+    12200 "Kangxi Radikal Gate" 
+    12201 "Kangxi Radikal KodÃ«rvar" 
+    12202 "Kangxi Radikal Skllav" 
+    12203 "Kangxi Radikal ShkurtÃ«r Tailed Zog" 
+    12204 "Kangxi Radikal Shi" 
+    12205 "Kangxi Radikal Blu" 
+    12206 "Kangxi Radikal Gabim" 
+    12207 "Kangxi Radikal FytyrÃ«" 
+    12208 "Kangxi Radikal PendÃ«" 
+    12209 "Kangxi Radikal Tanned PendÃ«" 
+    12210 "Kangxi Radikal Rrjedh" 
+    12211 "Kangxi Radikal ZÃ«ri" 
+    12212 "Kangxi Radikal Gjethe" 
+    12213 "Kangxi Radikal ErÃ«" 
+    12214 "Kangxi Radikal Fluturo" 
+    12215 "Kangxi Radikal Ha" 
+    12216 "Kangxi Radikal KokÃ«" 
+    12217 "Kangxi Radikal Fragrant" 
+    12218 "Kangxi Radikal KalÃ«" 
+    12219 "Kangxi Radikal KockÃ«" 
+    12220 "Kangxi Radikal GjatÃ«" 
+    12221 "Kangxi Radikal FlokÃ«" 
+    12222 "Kangxi Radikal Lufto" 
+    12223 "Kangxi Radikal VerÃ« Sakrifikimi" 
+    12224 "Kangxi Radikal Kazan" 
+    12225 "Kangxi Radikal Fantazim" 
+    12226 "Kangxi Radikal Fish" 
+    12227 "Kangxi Radikal Zog" 
+    12228 "Kangxi Radikal Salt" 
+    12229 "Kangxi Radikal Dre" 
+    12230 "Kangxi Radikal GrurÃ«" 
+    12231 "Kangxi Radikal KÃ«rp" 
+    12232 "Kangxi Radikal VerdhÃ«" 
+    12233 "Kangxi Radikal Meli" 
+    12234 "Kangxi Radikal e ZezÃ«" 
+    12235 "Kangxi Radikal QÃ«ndisje" 
+    12236 "Kangxi Radikal Bretkose" 
+    12237 "Kangxi Radikal TrekÃ«ndÃ«sh" 
+    12238 "Kangxi Radikal Bateri" 
+    12239 "Kangxi Radikal Mi" 
+    12240 "Kangxi Radikal HundÃ«" 
+    12241 "Kangxi Radikal NjÃ«jtÃ«" 
+    12242 "Kangxi Radikal DhÃ«mb" 
+    12243 "Kangxi Radikal Dragua" 
+    12244 "Kangxi Radikal BreshkÃ«" 
+    12245 "Kangxi Radikal Flaut" 
+    12272 "Ideo-grafik PÃ«rshkrim Karakter MajtÃ« Me DjathtÃ«" 
+    12273 "Ideo-grafik PÃ«rshkrim Karakter Lart Me PoshtÃ«" 
+    12274 "Ideo-grafik PÃ«rshkrim Karakter MajtÃ« Me Mesit dhe DjathtÃ«" 
+    12275 "Ideo-grafik PÃ«rshkrim Karakter Lart Me Mesit dhe PoshtÃ«" 
+    12276 "Ideo-grafik PÃ«rshkrim Karakter Plot PÃ«rreth" 
+    12277 "Ideo-grafik PÃ«rshkrim Karakter PÃ«rreth Nga Lart" 
+    12278 "Ideo-grafik PÃ«rshkrim Karakter PÃ«rreth Nga PoshtÃ«" 
+    12279 "Ideo-grafik PÃ«rshkrim Karakter PÃ«rreth Nga MajtÃ«" 
+    12280 "Ideo-grafik PÃ«rshkrim Karakter PÃ«rreth Nga SipÃ«rm MajtÃ«" 
+    12281 "Ideo-grafik PÃ«rshkrim Karakter PÃ«rreth Nga SipÃ«rm DjathtÃ«" 
+    12282 "Ideo-grafik PÃ«rshkrim Karakter PÃ«rreth Nga MÃ« i'ulÃ«t MajtÃ«" 
+    12283 "Ideo-grafik PÃ«rshkrim Karakter Veshi" 
+    12288 "Ideo-grafik HapÃ«sirÃ«" 
+    12289 "Ideo-grafik Presje" 
+    12290 "Ideo-grafik PikÃ«" 
+    12291 "Ditto ShenjÃ«" 
+    12292 "Japanese Industrial Standard Simbol" 
+    12293 "Ideo-grafik PÃ«rsÃ«ritje ShenjÃ«" 
+    12294 "Ideo-grafik Mbyll ShenjÃ«" 
+    12295 "Ideo-grafik NumÃ«r Zero" 
+    12296 "MajtÃ« KÃ«nd Kllapa" 
+    12297 "DjathtÃ« KÃ«nd Kllapa" 
+    12298 "Majtas Dyshe KÃ«nd Kllapa" 
+    12299 "Djathtas Dyshe KÃ«nd Kllapa" 
+    12300 "MajtÃ« KÃ«nd Kllapa" 
+    12301 "DjathtÃ« KÃ«nd Kllapa" 
+    12302 "MajtÃ« e BardhÃ« KÃ«nd Kllapa" 
+    12303 "DjathtÃ« e BardhÃ« KÃ«nd Kllapa" 
+    12304 "MajtÃ« e ZezÃ« Lenticular Kllapa" 
+    12305 "DjathtÃ« e ZezÃ« Lenticular Kllapa" 
+    12306 "ShenjÃ« Postare" 
+    12307 "Geta ShenjÃ«" 
+    12308 "MajtÃ« Tortoise Shell Kllapa" 
+    12309 "DjathtÃ« Tortoise Shell Kllapa" 
+    12310 "MajtÃ« e BardhÃ« Lenticular Kllapa" 
+    12311 "DjathtÃ« e BardhÃ« Lenticular Kllapa" 
+    12312 "MajtÃ« e BardhÃ« Tortoise Shell Kllapa" 
+    12313 "DjathtÃ« e BardhÃ« Tortoise Shell Kllapa" 
+    12314 "MajtÃ« e BardhÃ« Katror Kllapa" 
+    12315 "DjathtÃ« e BardhÃ« Katror Kllapa" 
+    12316 "ValÃ« Dash" 
+    12317 "KundÃ«rt Dyshe Prime Citat ShenjÃ«" 
+    12318 "Dyshe Prime Citat ShenjÃ«" 
+    12319 "UlÃ«t Dyshe Prime Citat ShenjÃ«" 
+    12320 "Postar ShenjÃ« FytyrÃ«" 
+    12321 "Hangzhou NumÃ«ror NjÃ«" 
+    12322 "Hangzhou NumÃ«ror Dy" 
+    12323 "Hangzhou NumÃ«ror Tre" 
+    12324 "Hangzhou NumÃ«ror KatÃ«r" 
+    12325 "Hangzhou NumÃ«ror PesÃ«" 
+    12326 "Hangzhou NumÃ«ror GjashtÃ«" 
+    12327 "Hangzhou NumÃ«ror ShtatÃ«" 
+    12328 "Hangzhou NumÃ«ror TetÃ«" 
+    12329 "Hangzhou NumÃ«ror NÃ«ntÃ«" 
+    12330 "Ideo-grafik Nivel Tone ShenjÃ«" 
+    12331 "Ideo-grafik Rritje Tone ShenjÃ«" 
+    12332 "Ideo-grafik Nisen Tone ShenjÃ«" 
+    12333 "Ideo-grafik HynÃ« Tone ShenjÃ«" 
+    12334 "Hangul E VetÃ«m PikÃ« Tone ShenjÃ«" 
+    12335 "Hangul Dyshe PikÃ« Tone ShenjÃ«" 
+    12336 "ValÃ«zuar VizÃ«" 
+    12337 "Vertikale Kana PÃ«rsÃ«ritje ShenjÃ«" 
+    12338 "Vertikale Kana PÃ«rsÃ«ritje Me ShenjÃ« ZÃ«ri" 
+    12339 "Vertikale Kana PÃ«rsÃ«ritje ShenjÃ« SipÃ«rm GjysmÃ«" 
+    12340 "Vertikale Kana PÃ«rsÃ«ritje Me ShenjÃ« ZÃ«ri SipÃ«rm GjysmÃ«" 
+    12341 "Vertikale Kana PÃ«rsÃ«ritje ShenjÃ« MÃ« i'ulÃ«t GjysmÃ«" 
+    12342 "Rrethuar Postare ShenjÃ«" 
+    12343 "Telegraf Ideo-grafik  LinjÃ« Furnizim NdarÃ«s Simbol" 
+    12344 "Hangzhou NumÃ«ror DhjetÃ«" 
+    12345 "Hangzhou NumÃ«ror NjÃ«zet" 
+    12346 "Hangzhou NumÃ«ror TridhjetÃ«" 
+    12347 "Vertikale Ideo-grafik PÃ«rsÃ«ritje ShenjÃ«" 
+    12348 "Masu ShenjÃ«" 
+    12349 "PjesÃ« Alternim ShenjÃ«" 
+    12350 "Ideo-grafik Ndryshim Tregues" 
+    12351 "Ideo-grafik GjysmÃ« Fill HapÃ«sirÃ«" 
+    12353 "Hiragana ShkronjÃ« e VogÃ«l A" 
+    12354 "Hiragana ShkronjÃ« A" 
+    12355 "Hiragana ShkronjÃ« e VogÃ«l I" 
+    12356 "Hiragana ShkronjÃ« I" 
+    12357 "Hiragana ShkronjÃ« e VogÃ«l U" 
+    12358 "Hiragana ShkronjÃ« U" 
+    12359 "Hiragana ShkronjÃ« e VogÃ«l E" 
+    12360 "Hiragana ShkronjÃ« E" 
+    12361 "Hiragana ShkronjÃ« e VogÃ«l O" 
+    12362 "Hiragana ShkronjÃ« O" 
+    12363 "Hiragana ShkronjÃ« Ka" 
+    12364 "Hiragana ShkronjÃ« Ga" 
+    12365 "Hiragana ShkronjÃ« Ki" 
+    12366 "Hiragana ShkronjÃ« Gi" 
+    12367 "Hiragana ShkronjÃ« Ku" 
+    12368 "Hiragana ShkronjÃ« Gu" 
+    12369 "Hiragana ShkronjÃ« Ke" 
+    12370 "Hiragana ShkronjÃ« Ge" 
+    12371 "Hiragana ShkronjÃ« Ko" 
+    12372 "Hiragana ShkronjÃ« Go" 
+    12373 "Hiragana ShkronjÃ« Sa" 
+    12374 "Hiragana ShkronjÃ« Za" 
+    12375 "Hiragana ShkronjÃ« Si" 
+    12376 "Hiragana ShkronjÃ« Zi" 
+    12377 "Hiragana ShkronjÃ« Su" 
+    12378 "Hiragana ShkronjÃ« Zu" 
+    12379 "Hiragana ShkronjÃ« Se" 
+    12380 "Hiragana ShkronjÃ« Ze" 
+    12381 "Hiragana ShkronjÃ« So" 
+    12382 "Hiragana ShkronjÃ« Zo" 
+    12383 "Hiragana ShkronjÃ« Ta" 
+    12384 "Hiragana ShkronjÃ« Da" 
+    12385 "Hiragana ShkronjÃ« Ti" 
+    12386 "Hiragana ShkronjÃ« Di" 
+    12387 "Hiragana ShkronjÃ« e VogÃ«l Tu" 
+    12388 "Hiragana ShkronjÃ« Tu" 
+    12389 "Hiragana ShkronjÃ« Du" 
+    12390 "Hiragana ShkronjÃ« Te" 
+    12391 "Hiragana ShkronjÃ« De" 
+    12392 "Hiragana ShkronjÃ« To" 
+    12393 "Hiragana ShkronjÃ« Do" 
+    12394 "Hiragana ShkronjÃ« Na" 
+    12395 "Hiragana ShkronjÃ« Ni" 
+    12396 "Hiragana ShkronjÃ« Nu" 
+    12397 "Hiragana ShkronjÃ« Ne" 
+    12398 "Hiragana ShkronjÃ« No" 
+    12399 "Hiragana ShkronjÃ« Ha" 
+    12400 "Hiragana ShkronjÃ« Ba" 
+    12401 "Hiragana ShkronjÃ« Pa" 
+    12402 "Hiragana ShkronjÃ« Hi" 
+    12403 "Hiragana ShkronjÃ« Bi" 
+    12404 "Hiragana ShkronjÃ« Pi" 
+    12405 "Hiragana ShkronjÃ« Hu" 
+    12406 "Hiragana ShkronjÃ« Bu" 
+    12407 "Hiragana ShkronjÃ« Pu" 
+    12408 "Hiragana ShkronjÃ« He" 
+    12409 "Hiragana ShkronjÃ« Be" 
+    12410 "Hiragana ShkronjÃ« Pe" 
+    12411 "Hiragana ShkronjÃ« Ho" 
+    12412 "Hiragana ShkronjÃ« Bo" 
+    12413 "Hiragana ShkronjÃ« Po" 
+    12414 "Hiragana ShkronjÃ« Ma" 
+    12415 "Hiragana ShkronjÃ« Mi" 
+    12416 "Hiragana ShkronjÃ« Mu" 
+    12417 "Hiragana ShkronjÃ« Me" 
+    12418 "Hiragana ShkronjÃ« Mo" 
+    12419 "Hiragana ShkronjÃ« e VogÃ«l Ya" 
+    12420 "Hiragana ShkronjÃ« Ya" 
+    12421 "Hiragana ShkronjÃ« e VogÃ«l Yu" 
+    12422 "Hiragana ShkronjÃ« Yu" 
+    12423 "Hiragana ShkronjÃ« e VogÃ«l Yo" 
+    12424 "Hiragana ShkronjÃ« Yo" 
+    12425 "Hiragana ShkronjÃ« Ra" 
+    12426 "Hiragana ShkronjÃ« Ri" 
+    12427 "Hiragana ShkronjÃ« Ru" 
+    12428 "Hiragana ShkronjÃ« Re" 
+    12429 "Hiragana ShkronjÃ« Ro" 
+    12430 "Hiragana ShkronjÃ« e VogÃ«l Wa" 
+    12431 "Hiragana ShkronjÃ« Wa" 
+    12432 "Hiragana ShkronjÃ« Wi" 
+    12433 "Hiragana ShkronjÃ« We" 
+    12434 "Hiragana ShkronjÃ« Wo" 
+    12435 "Hiragana ShkronjÃ« N" 
+    12436 "Hiragana ShkronjÃ« Vu" 
+    12437 "Hiragana ShkronjÃ« e VogÃ«l Ka" 
+    12438 "Hiragana ShkronjÃ« e VogÃ«l Ke" 
+    12441 "Kombinuar Katakana-Hiragana ShenjÃ« ZÃ«ri" 
+    12442 "Kombinuar Katakana-Hiragana ShenjÃ« GjysmÃ«-ZÃ«ri" 
+    12443 "Katakana-Hiragana ShenjÃ« ZÃ«ri" 
+    12444 "Katakana-Hiragana ShenjÃ« GjysmÃ«-ZÃ«ri" 
+    12445 "Hiragana PÃ«rsÃ«ritje ShenjÃ«" 
+    12446 "Hiragana Voiced PÃ«rsÃ«ritje ShenjÃ«" 
+    12447 "Hiragana DyshkronjÃ«sh Yori" 
+    12448 "Katakana-Hiragana Dyshe Hyphen" 
+    12449 "Katakana ShkronjÃ« e VogÃ«l A" 
+    12450 "Katakana ShkronjÃ« A" 
+    12451 "Katakana ShkronjÃ« e VogÃ«l I" 
+    12452 "Katakana ShkronjÃ« I" 
+    12453 "Katakana ShkronjÃ« e VogÃ«l U" 
+    12454 "Katakana ShkronjÃ« U" 
+    12455 "Katakana ShkronjÃ« e VogÃ«l E" 
+    12456 "Katakana ShkronjÃ« E" 
+    12457 "Katakana ShkronjÃ« e VogÃ«l O" 
+    12458 "Katakana ShkronjÃ« O" 
+    12459 "Katakana ShkronjÃ« Ka" 
+    12460 "Katakana ShkronjÃ« Ga" 
+    12461 "Katakana ShkronjÃ« Ki" 
+    12462 "Katakana ShkronjÃ« Gi" 
+    12463 "Katakana ShkronjÃ« Ku" 
+    12464 "Katakana ShkronjÃ« Gu" 
+    12465 "Katakana ShkronjÃ« Ke" 
+    12466 "Katakana ShkronjÃ« Ge" 
+    12467 "Katakana ShkronjÃ« Ko" 
+    12468 "Katakana ShkronjÃ« Go" 
+    12469 "Katakana ShkronjÃ« Sa" 
+    12470 "Katakana ShkronjÃ« Za" 
+    12471 "Katakana ShkronjÃ« Si" 
+    12472 "Katakana ShkronjÃ« Zi" 
+    12473 "Katakana ShkronjÃ« Su" 
+    12474 "Katakana ShkronjÃ« Zu" 
+    12475 "Katakana ShkronjÃ« Se" 
+    12476 "Katakana ShkronjÃ« Ze" 
+    12477 "Katakana ShkronjÃ« So" 
+    12478 "Katakana ShkronjÃ« Zo" 
+    12479 "Katakana ShkronjÃ« Ta" 
+    12480 "Katakana ShkronjÃ« Da" 
+    12481 "Katakana ShkronjÃ« Ti" 
+    12482 "Katakana ShkronjÃ« Di" 
+    12483 "Katakana ShkronjÃ« e VogÃ«l Tu" 
+    12484 "Katakana ShkronjÃ« Tu" 
+    12485 "Katakana ShkronjÃ« Du" 
+    12486 "Katakana ShkronjÃ« Te" 
+    12487 "Katakana ShkronjÃ« De" 
+    12488 "Katakana ShkronjÃ« To" 
+    12489 "Katakana ShkronjÃ« Do" 
+    12490 "Katakana ShkronjÃ« Na" 
+    12491 "Katakana ShkronjÃ« Ni" 
+    12492 "Katakana ShkronjÃ« Nu" 
+    12493 "Katakana ShkronjÃ« Ne" 
+    12494 "Katakana ShkronjÃ« No" 
+    12495 "Katakana ShkronjÃ« Ha" 
+    12496 "Katakana ShkronjÃ« Ba" 
+    12497 "Katakana ShkronjÃ« Pa" 
+    12498 "Katakana ShkronjÃ« Hi" 
+    12499 "Katakana ShkronjÃ« Bi" 
+    12500 "Katakana ShkronjÃ« Pi" 
+    12501 "Katakana ShkronjÃ« Hu" 
+    12502 "Katakana ShkronjÃ« Bu" 
+    12503 "Katakana ShkronjÃ« Pu" 
+    12504 "Katakana ShkronjÃ« He" 
+    12505 "Katakana ShkronjÃ« Be" 
+    12506 "Katakana ShkronjÃ« Pe" 
+    12507 "Katakana ShkronjÃ« Ho" 
+    12508 "Katakana ShkronjÃ« Bo" 
+    12509 "Katakana ShkronjÃ« Po" 
+    12510 "Katakana ShkronjÃ« Ma" 
+    12511 "Katakana ShkronjÃ« Mi" 
+    12512 "Katakana ShkronjÃ« Mu" 
+    12513 "Katakana ShkronjÃ« Me" 
+    12514 "Katakana ShkronjÃ« Mo" 
+    12515 "Katakana ShkronjÃ« e VogÃ«l Ya" 
+    12516 "Katakana ShkronjÃ« Ya" 
+    12517 "Katakana ShkronjÃ« e VogÃ«l Yu" 
+    12518 "Katakana ShkronjÃ« Yu" 
+    12519 "Katakana ShkronjÃ« e VogÃ«l Yo" 
+    12520 "Katakana ShkronjÃ« Yo" 
+    12521 "Katakana ShkronjÃ« Ra" 
+    12522 "Katakana ShkronjÃ« Ri" 
+    12523 "Katakana ShkronjÃ« Ru" 
+    12524 "Katakana ShkronjÃ« Re" 
+    12525 "Katakana ShkronjÃ« Ro" 
+    12526 "Katakana ShkronjÃ« e VogÃ«l Wa" 
+    12527 "Katakana ShkronjÃ« Wa" 
+    12528 "Katakana ShkronjÃ« Wi" 
+    12529 "Katakana ShkronjÃ« We" 
+    12530 "Katakana ShkronjÃ« Wo" 
+    12531 "Katakana ShkronjÃ« N" 
+    12532 "Katakana ShkronjÃ« Vu" 
+    12533 "Katakana ShkronjÃ« e VogÃ«l Ka" 
+    12534 "Katakana ShkronjÃ« e VogÃ«l Ke" 
+    12535 "Katakana ShkronjÃ« Va" 
+    12536 "Katakana ShkronjÃ« Vi" 
+    12537 "Katakana ShkronjÃ« Ve" 
+    12538 "Katakana ShkronjÃ« Vo" 
+    12539 "Katakana Mesit PikÃ«" 
+    12540 "Katakana-Hiragana ZÃ«ri Zgjatur ShenjÃ«" 
+    12541 "Katakana PÃ«rsÃ«ritje ShenjÃ«" 
+    12542 "Katakana ZÃ«ri PÃ«rsÃ«ritje ShenjÃ«" 
+    12543 "Katakana DyshkronjÃ«sh Koto" 
+    12549 "Bopomofo ShkronjÃ« B" 
+    12550 "Bopomofo ShkronjÃ« P" 
+    12551 "Bopomofo ShkronjÃ« M" 
+    12552 "Bopomofo ShkronjÃ« F" 
+    12553 "Bopomofo ShkronjÃ« D" 
+    12554 "Bopomofo ShkronjÃ« T" 
+    12555 "Bopomofo ShkronjÃ« N" 
+    12556 "Bopomofo ShkronjÃ« L" 
+    12557 "Bopomofo ShkronjÃ« G" 
+    12558 "Bopomofo ShkronjÃ« K" 
+    12559 "Bopomofo ShkronjÃ« H" 
+    12560 "Bopomofo ShkronjÃ« J" 
+    12561 "Bopomofo ShkronjÃ« Q" 
+    12562 "Bopomofo ShkronjÃ« X" 
+    12563 "Bopomofo ShkronjÃ« Zh" 
+    12564 "Bopomofo ShkronjÃ« Ch" 
+    12565 "Bopomofo ShkronjÃ« Sh" 
+    12566 "Bopomofo ShkronjÃ« R" 
+    12567 "Bopomofo ShkronjÃ« Z" 
+    12568 "Bopomofo ShkronjÃ« C" 
+    12569 "Bopomofo ShkronjÃ« S" 
+    12570 "Bopomofo ShkronjÃ« A" 
+    12571 "Bopomofo ShkronjÃ« O" 
+    12572 "Bopomofo ShkronjÃ« E" 
+    12573 "Bopomofo ShkronjÃ« Eh" 
+    12574 "Bopomofo ShkronjÃ« Ai" 
+    12575 "Bopomofo ShkronjÃ« Ei" 
+    12576 "Bopomofo ShkronjÃ« Au" 
+    12577 "Bopomofo ShkronjÃ« Ou" 
+    12578 "Bopomofo ShkronjÃ« An" 
+    12579 "Bopomofo ShkronjÃ« En" 
+    12580 "Bopomofo ShkronjÃ« Ang" 
+    12581 "Bopomofo ShkronjÃ« Eng" 
+    12582 "Bopomofo ShkronjÃ« Er" 
+    12583 "Bopomofo ShkronjÃ« I" 
+    12584 "Bopomofo ShkronjÃ« U" 
+    12585 "Bopomofo ShkronjÃ« Iu" 
+    12586 "Bopomofo ShkronjÃ« V" 
+    12587 "Bopomofo ShkronjÃ« Ng" 
+    12588 "Bopomofo ShkronjÃ« Gn" 
+    12589 "Bopomofo ShkronjÃ« Ih" 
+    12593 "Hangul ShkronjÃ« Kiyeok" 
+    12594 "Hangul ShkronjÃ« Ssangkiyeok" 
+    12595 "Hangul ShkronjÃ« Kiyeok-Sios" 
+    12596 "Hangul ShkronjÃ« Nieun" 
+    12597 "Hangul ShkronjÃ« Nieun-Cieuc" 
+    12598 "Hangul ShkronjÃ« Nieun-Hieuh" 
+    12599 "Hangul ShkronjÃ« Tikeut" 
+    12600 "Hangul ShkronjÃ« Ssangtikeut" 
+    12601 "Hangul ShkronjÃ« Rieul" 
+    12602 "Hangul ShkronjÃ« Rieul-Kiyeok" 
+    12603 "Hangul ShkronjÃ« Rieul-Mieum" 
+    12604 "Hangul ShkronjÃ« Rieul-Pieup" 
+    12605 "Hangul ShkronjÃ« Rieul-Sios" 
+    12606 "Hangul ShkronjÃ« Rieul-Thieuth" 
+    12607 "Hangul ShkronjÃ« Rieul-Phieuph" 
+    12608 "Hangul ShkronjÃ« Rieul-Hieuh" 
+    12609 "Hangul ShkronjÃ« Mieum" 
+    12610 "Hangul ShkronjÃ« Pieup" 
+    12611 "Hangul ShkronjÃ« Ssangpieup" 
+    12612 "Hangul ShkronjÃ« Pieup-Sios" 
+    12613 "Hangul ShkronjÃ« Sios" 
+    12614 "Hangul ShkronjÃ« Ssangsios" 
+    12615 "Hangul ShkronjÃ« Ieung" 
+    12616 "Hangul ShkronjÃ« Cieuc" 
+    12617 "Hangul ShkronjÃ« Ssangcieuc" 
+    12618 "Hangul ShkronjÃ« Chieuch" 
+    12619 "Hangul ShkronjÃ« Khieukh" 
+    12620 "Hangul ShkronjÃ« Thieuth" 
+    12621 "Hangul ShkronjÃ« Phieuph" 
+    12622 "Hangul ShkronjÃ« Hieuh" 
+    12623 "Hangul ShkronjÃ« A" 
+    12624 "Hangul ShkronjÃ« Ae" 
+    12625 "Hangul ShkronjÃ« Ya" 
+    12626 "Hangul ShkronjÃ« Yae" 
+    12627 "Hangul ShkronjÃ« Eo" 
+    12628 "Hangul ShkronjÃ« E" 
+    12629 "Hangul ShkronjÃ« Yeo" 
+    12630 "Hangul ShkronjÃ« Ye" 
+    12631 "Hangul ShkronjÃ« O" 
+    12632 "Hangul ShkronjÃ« Wa" 
+    12633 "Hangul ShkronjÃ« Wae" 
+    12634 "Hangul ShkronjÃ« Oe" 
+    12635 "Hangul ShkronjÃ« Yo" 
+    12636 "Hangul ShkronjÃ« U" 
+    12637 "Hangul ShkronjÃ« Weo" 
+    12638 "Hangul ShkronjÃ« We" 
+    12639 "Hangul ShkronjÃ« Wi" 
+    12640 "Hangul ShkronjÃ« Yu" 
+    12641 "Hangul ShkronjÃ« Eu" 
+    12642 "Hangul ShkronjÃ« Yi" 
+    12643 "Hangul ShkronjÃ« I" 
+    12644 "Hangul Filler" 
+    12645 "Hangul ShkronjÃ« Ssangnieun" 
+    12646 "Hangul ShkronjÃ« Nieun-Tikeut" 
+    12647 "Hangul ShkronjÃ« Nieun-Sios" 
+    12648 "Hangul ShkronjÃ« Nieun-Pansios" 
+    12649 "Hangul ShkronjÃ« Rieul-Kiyeok-Sios" 
+    12650 "Hangul ShkronjÃ« Rieul-Tikeut" 
+    12651 "Hangul ShkronjÃ« Rieul-Pieup-Sios" 
+    12652 "Hangul ShkronjÃ« Rieul-Pansios" 
+    12653 "Hangul ShkronjÃ« Rieul-Yeorinhieuh" 
+    12654 "Hangul ShkronjÃ« Mieum-Pieup" 
+    12655 "Hangul ShkronjÃ« Mieum-Sios" 
+    12656 "Hangul ShkronjÃ« Mieum-Pansios" 
+    12657 "Hangul ShkronjÃ« Kapyeounmieum" 
+    12658 "Hangul ShkronjÃ« Pieup-Kiyeok" 
+    12659 "Hangul ShkronjÃ« Pieup-Tikeut" 
+    12660 "Hangul ShkronjÃ« Pieup-Sios-Kiyeok" 
+    12661 "Hangul ShkronjÃ« Pieup-Sios-Tikeut" 
+    12662 "Hangul ShkronjÃ« Pieup-Cieuc" 
+    12663 "Hangul ShkronjÃ« Pieup-Thieuth" 
+    12664 "Hangul ShkronjÃ« Kapyeounpieup" 
+    12665 "Hangul ShkronjÃ« Kapyeounssangpieup" 
+    12666 "Hangul ShkronjÃ« Sios-Kiyeok" 
+    12667 "Hangul ShkronjÃ« Sios-Nieun" 
+    12668 "Hangul ShkronjÃ« Sios-Tikeut" 
+    12669 "Hangul ShkronjÃ« Sios-Pieup" 
+    12670 "Hangul ShkronjÃ« Sios-Cieuc" 
+    12671 "Hangul ShkronjÃ« Pansios" 
+    12672 "Hangul ShkronjÃ« Ssangieung" 
+    12673 "Hangul ShkronjÃ« Yesieung" 
+    12674 "Hangul ShkronjÃ« Yesieung-Sios" 
+    12675 "Hangul ShkronjÃ« Yesieung-Pansios" 
+    12676 "Hangul ShkronjÃ« Kapyeounphieuph" 
+    12677 "Hangul ShkronjÃ« Ssanghieuh" 
+    12678 "Hangul ShkronjÃ« Yeorinhieuh" 
+    12679 "Hangul ShkronjÃ« Yo-Ya" 
+    12680 "Hangul ShkronjÃ« Yo-Yae" 
+    12681 "Hangul ShkronjÃ« Yo-I" 
+    12682 "Hangul ShkronjÃ« Yu-Yeo" 
+    12683 "Hangul ShkronjÃ« Yu-Ye" 
+    12684 "Hangul ShkronjÃ« Yu-I" 
+    12685 "Hangul ShkronjÃ« Araea" 
+    12686 "Hangul ShkronjÃ« Araeae" 
+    12688 "Ideo-grafik ShÃ«nim Lidhja ShenjÃ«" 
+    12689 "Ideo-grafik ShÃ«nim Kthe-Mbrapsht ShenjÃ«" 
+    12690 "Ideo-grafik ShÃ«nim NjÃ« ShenjÃ«" 
+    12691 "Ideo-grafik ShÃ«nim DitÃ« ShenjÃ«" 
+    12692 "Ideo-grafik ShÃ«nim Tre ShenjÃ«" 
+    12693 "Ideo-grafik ShÃ«nim KatÃ«r ShenjÃ«" 
+    12694 "Ideo-grafik ShÃ«nim SipÃ«rm ShenjÃ«" 
+    12695 "Ideo-grafik ShÃ«nim Mesit ShenjÃ«" 
+    12696 "Ideo-grafik ShÃ«nim Fund ShenjÃ«" 
+    12697 "Ideo-grafik ShÃ«nim ParÃ« ShenjÃ«" 
+    12698 "Ideo-grafik ShÃ«nim SekondÃ« ShenjÃ«" 
+    12699 "Ideo-grafik ShÃ«nim TretÃ« ShenjÃ«" 
+    12700 "Ideo-grafik ShÃ«nim KatÃ«rt ShenjÃ«" 
+    12701 "Ideo-grafik ShÃ«nim Qiell ShenjÃ«" 
+    12702 "Ideo-grafik ShÃ«nim TokÃ« ShenjÃ«" 
+    12703 "Ideo-grafik ShÃ«nim Man ShenjÃ«" 
+    12704 "Bopomofo ShkronjÃ« Bu" 
+    12705 "Bopomofo ShkronjÃ« Zi" 
+    12706 "Bopomofo ShkronjÃ« Ji" 
+    12707 "Bopomofo ShkronjÃ« Gu" 
+    12708 "Bopomofo ShkronjÃ« Ee" 
+    12709 "Bopomofo ShkronjÃ« Enn" 
+    12710 "Bopomofo ShkronjÃ« Oo" 
+    12711 "Bopomofo ShkronjÃ« Onn" 
+    12712 "Bopomofo ShkronjÃ« Ir" 
+    12713 "Bopomofo ShkronjÃ« Ann" 
+    12714 "Bopomofo ShkronjÃ« Inn" 
+    12715 "Bopomofo ShkronjÃ« Unn" 
+    12716 "Bopomofo ShkronjÃ« Im" 
+    12717 "Bopomofo ShkronjÃ« Ngg" 
+    12718 "Bopomofo ShkronjÃ« Ainn" 
+    12719 "Bopomofo ShkronjÃ« Aunn" 
+    12720 "Bopomofo ShkronjÃ« Am" 
+    12721 "Bopomofo ShkronjÃ« Om" 
+    12722 "Bopomofo ShkronjÃ« Ong" 
+    12723 "Bopomofo ShkronjÃ« Innn" 
+    12724 "Bopomofo PÃ«rfundimtare ShkronjÃ« P" 
+    12725 "Bopomofo PÃ«rfundimtare ShkronjÃ« T" 
+    12726 "Bopomofo PÃ«rfundimtare ShkronjÃ« K" 
+    12727 "Bopomofo PÃ«rfundimtare ShkronjÃ« H" 
+    12728 "Bopomofo ShkronjÃ« Gh" 
+    12729 "Bopomofo ShkronjÃ« Lh" 
+    12730 "Bopomofo ShkronjÃ« Zy" 
+    12736 "CJK Goditje T" 
+    12737 "CJK Goditje Wg" 
+    12738 "CJK Goditje Xg" 
+    12739 "CJK Goditje Bxg" 
+    12740 "CJK Goditje Sw" 
+    12741 "CJK Goditje Hzz" 
+    12742 "CJK Goditje Hzg" 
+    12743 "CJK Goditje Hp" 
+    12744 "CJK Goditje Hzwg" 
+    12745 "CJK Goditje Szwg" 
+    12746 "CJK Goditje Hzt" 
+    12747 "CJK Goditje Hzzp" 
+    12748 "CJK Goditje Hpwg" 
+    12749 "CJK Goditje Hzw" 
+    12750 "CJK Goditje Hzzz" 
+    12751 "CJK Goditje N" 
+    12752 "CJK Goditje H" 
+    12753 "CJK Goditje S" 
+    12754 "CJK Goditje P" 
+    12755 "CJK Goditje Sp" 
+    12756 "CJK Goditje D" 
+    12757 "CJK Goditje Hz" 
+    12758 "CJK Goditje Hg" 
+    12759 "CJK Goditje Sz" 
+    12760 "CJK Goditje Swz" 
+    12761 "CJK Goditje St" 
+    12762 "CJK Goditje Sg" 
+    12763 "CJK Goditje Pd" 
+    12764 "CJK Goditje Pz" 
+    12765 "CJK Goditje Tn" 
+    12766 "CJK Goditje Szz" 
+    12767 "CJK Goditje Swg" 
+    12768 "CJK Goditje Hxwg" 
+    12769 "CJK Goditje Hzzzg" 
+    12770 "CJK Goditje Pg" 
+    12771 "CJK Goditje Q" 
+    12784 "Katakana ShkronjÃ« e VogÃ«l Ku" 
+    12785 "Katakana ShkronjÃ« e VogÃ«l Si" 
+    12786 "Katakana ShkronjÃ« e VogÃ«l Su" 
+    12787 "Katakana ShkronjÃ« e VogÃ«l To" 
+    12788 "Katakana ShkronjÃ« e VogÃ«l Nu" 
+    12789 "Katakana ShkronjÃ« e VogÃ«l Ha" 
+    12790 "Katakana ShkronjÃ« e VogÃ«l Hi" 
+    12791 "Katakana ShkronjÃ« e VogÃ«l Hu" 
+    12792 "Katakana ShkronjÃ« e VogÃ«l He" 
+    12793 "Katakana ShkronjÃ« e VogÃ«l Ho" 
+    12794 "Katakana ShkronjÃ« e VogÃ«l Mu" 
+    12795 "Katakana ShkronjÃ« e VogÃ«l Ra" 
+    12796 "Katakana ShkronjÃ« e VogÃ«l Ri" 
+    12797 "Katakana ShkronjÃ« e VogÃ«l Ru" 
+    12798 "Katakana ShkronjÃ« e VogÃ«l Re" 
+    12799 "Katakana ShkronjÃ« e VogÃ«l Ro" 
+    12800 "NÃ«-kllapa Hangul Kiyeok" 
+    12801 "NÃ«-kllapa Hangul Nieun" 
+    12802 "NÃ«-kllapa Hangul Tikeut" 
+    12803 "NÃ«-kllapa Hangul Rieul" 
+    12804 "NÃ«-kllapa Hangul Mieum" 
+    12805 "NÃ«-kllapa Hangul Pieup" 
+    12806 "NÃ«-kllapa Hangul Sios" 
+    12807 "NÃ«-kllapa Hangul Ieung" 
+    12808 "NÃ«-kllapa Hangul Cieuc" 
+    12809 "NÃ«-kllapa Hangul Chieuch" 
+    12810 "NÃ«-kllapa Hangul Khieukh" 
+    12811 "NÃ«-kllapa Hangul Thieuth" 
+    12812 "NÃ«-kllapa Hangul Phieuph" 
+    12813 "NÃ«-kllapa Hangul Hieuh" 
+    12814 "NÃ«-kllapa Hangul Kiyeok A" 
+    12815 "NÃ«-kllapa Hangul Nieun A" 
+    12816 "NÃ«-kllapa Hangul Tikeut A" 
+    12817 "NÃ«-kllapa Hangul Rieul A" 
+    12818 "NÃ«-kllapa Hangul Mieum A" 
+    12819 "NÃ«-kllapa Hangul Pieup A" 
+    12820 "NÃ«-kllapa Hangul Sios A" 
+    12821 "NÃ«-kllapa Hangul Ieung A" 
+    12822 "NÃ«-kllapa Hangul Cieuc A" 
+    12823 "NÃ«-kllapa Hangul Chieuch A" 
+    12824 "NÃ«-kllapa Hangul Khieukh A" 
+    12825 "NÃ«-kllapa Hangul Thieuth A" 
+    12826 "NÃ«-kllapa Hangul Phieuph A" 
+    12827 "NÃ«-kllapa Hangul Hieuh A" 
+    12828 "NÃ«-kllapa Hangul Cieuc U" 
+    12829 "NÃ«-kllapa Korean Karakter Ojeon" 
+    12830 "NÃ«-kllapa Korean Karakter O Hu" 
+    12832 "NÃ«-kllapa Ideograf NjÃ«" 
+    12833 "NÃ«-kllapa Ideograf Dy" 
+    12834 "NÃ«-kllapa Ideograf Tre" 
+    12835 "NÃ«-kllapa Ideograf KatÃ«r" 
+    12836 "NÃ«-kllapa Ideograf PesÃ«" 
+    12837 "NÃ«-kllapa Ideograf GjashtÃ«" 
+    12838 "NÃ«-kllapa Ideograf ShtatÃ«" 
+    12839 "NÃ«-kllapa Ideograf TetÃ«" 
+    12840 "NÃ«-kllapa Ideograf NÃ«ntÃ«" 
+    12841 "NÃ«-kllapa Ideograf DhjetÃ«" 
+    12842 "NÃ«-kllapa Ideograf HÃ«nÃ«" 
+    12843 "NÃ«-kllapa Ideograf Fire" 
+    12844 "NÃ«-kllapa Ideograf UjÃ«" 
+    12845 "NÃ«-kllapa Ideograf Dru" 
+    12846 "NÃ«-kllapa Ideograf Metal" 
+    12847 "NÃ«-kllapa Ideograf TokÃ«" 
+    12848 "NÃ«-kllapa Ideograf Diell" 
+    12849 "NÃ«-kllapa Ideograf RezervÃ«" 
+    12850 "NÃ«-kllapa Ideograf Kam" 
+    12851 "NÃ«-kllapa Ideograf ShoqÃ«ri" 
+    12852 "NÃ«-kllapa Ideograf Emri" 
+    12853 "NÃ«-kllapa Ideograf Speciale" 
+    12854 "NÃ«-kllapa Ideograf Financiare" 
+    12855 "NÃ«-kllapa Ideograf PÃ«rgÃ«zime" 
+    12856 "NÃ«-kllapa Ideograf PunÃ«" 
+    12857 "NÃ«-kllapa Ideograf PÃ«rfaqÃ«son" 
+    12858 "NÃ«-kllapa Ideograf Thirr" 
+    12859 "NÃ«-kllapa Ideograf Studim" 
+    12860 "NÃ«-kllapa Ideograf MbikÃ«qyr" 
+    12861 "NÃ«-kllapa Ideograf NdÃ«rmarrje" 
+    12862 "NÃ«-kllapa Ideograf Burime" 
+    12863 "NÃ«-kllapa Ideograf AleancÃ«" 
+    12864 "NÃ«-kllapa Ideograf Festival" 
+    12865 "NÃ«-kllapa Ideograf Mbetje" 
+    12866 "NÃ«-kllapa Ideograf Vetja" 
+    12867 "NÃ«-kllapa Ideograf Arri" 
+    12868 "Rrethuar Ideograf Pyetje" 
+    12869 "Rrethuar Ideograf Kopsht FÃ«mijÃ«sh" 
+    12870 "Rrethuar Ideograf ShkollÃ«" 
+    12871 "Rrethuar Ideograf Koto" 
+    12872 "Rrethuar NumÃ«r DhjetÃ« e ZezÃ« Katror" 
+    12873 "Rrethuar NumÃ«r NjÃ«zet e ZezÃ« Katror" 
+    12874 "Rrethuar NumÃ«r Tridhjete e ZezÃ« Katror" 
+    12875 "Rrethuar NumÃ«r Dyzet e ZezÃ« Katror" 
+    12876 "Rrethuar NumÃ«r PesÃ«dhjetÃ« e ZezÃ« Katror" 
+    12877 "Rrethuar NumÃ«r GjashtÃ«dhjetÃ« e ZezÃ« Katror" 
+    12878 "Rrethuar NumÃ«r shtatÃ«dhjetÃ« e ZezÃ« Katror" 
+    12879 "Rrethuar NumÃ«r TetÃ«dhjetÃ« e ZezÃ« Katror" 
+    12880 "ShenjÃ« OrtakÃ«ri" 
+    12881 "Rrethuar NumÃ«r NjÃ«zet NjÃ«" 
+    12882 "Rrethuar NumÃ«r NjÃ«zet Dy" 
+    12883 "Rrethuar NumÃ«r NjÃ«zet Tre" 
+    12884 "Rrethuar NumÃ«r NjÃ«zet KatÃ«r" 
+    12885 "Rrethuar NumÃ«r NjÃ«zet PesÃ«" 
+    12886 "Rrethuar NumÃ«r NjÃ«zet GjashtÃ«" 
+    12887 "Rrethuar NumÃ«r NjÃ«zet ShtatÃ«" 
+    12888 "Rrethuar NumÃ«r NjÃ«zet TetÃ«" 
+    12889 "Rrethuar NumÃ«r NjÃ«zet NÃ«ntÃ«" 
+    12890 "Rrethuar NumÃ«r TridhjetÃ«" 
+    12891 "Rrethuar NumÃ«r TridhjetÃ« NjÃ«" 
+    12892 "Rrethuar NumÃ«r TridhjetÃ« Dy" 
+    12893 "Rrethuar NumÃ«r TridhjetÃ« Tre" 
+    12894 "Rrethuar NumÃ«r TridhjetÃ« KatÃ«r" 
+    12895 "Rrethuar NumÃ«r TridhjetÃ« PesÃ«" 
+    12896 "Rrethuar Hangul Kiyeok" 
+    12897 "Rrethuar Hangul Nieun" 
+    12898 "Rrethuar Hangul Tikeut" 
+    12899 "Rrethuar Hangul Rieul" 
+    12900 "Rrethuar Hangul Mieum" 
+    12901 "Rrethuar Hangul Pieup" 
+    12902 "Rrethuar Hangul Sios" 
+    12903 "Rrethuar Hangul Ieung" 
+    12904 "Rrethuar Hangul Cieuc" 
+    12905 "Rrethuar Hangul Chieuch" 
+    12906 "Rrethuar Hangul Khieukh" 
+    12907 "Rrethuar Hangul Thieuth" 
+    12908 "Rrethuar Hangul Phieuph" 
+    12909 "Rrethuar Hangul Hieuh" 
+    12910 "Rrethuar Hangul Kiyeok A" 
+    12911 "Rrethuar Hangul Nieun A" 
+    12912 "Rrethuar Hangul Tikeut A" 
+    12913 "Rrethuar Hangul Rieul A" 
+    12914 "Rrethuar Hangul Mieum A" 
+    12915 "Rrethuar Hangul Pieup A" 
+    12916 "Rrethuar Hangul Sios A" 
+    12917 "Rrethuar Hangul Ieung A" 
+    12918 "Rrethuar Hangul Cieuc A" 
+    12919 "Rrethuar Hangul Chieuch A" 
+    12920 "Rrethuar Hangul Khieukh A" 
+    12921 "Rrethuar Hangul Thieuth A" 
+    12922 "Rrethuar Hangul Phieuph A" 
+    12923 "Rrethuar Hangul Hieuh A" 
+    12924 "Rrethuar Korean Karakter Chamko" 
+    12925 "Rrethuar Korean Karakter Jueui" 
+    12926 "Rrethuar Hangul Ieung U" 
+    12927 "Korean Standard Simbol" 
+    12928 "Rrethuar Ideograf NjÃ«" 
+    12929 "Rrethuar Ideograf Dy" 
+    12930 "Rrethuar Ideograf Tre" 
+    12931 "Rrethuar Ideograf KatÃ«r" 
+    12932 "Rrethuar Ideograf PesÃ«" 
+    12933 "Rrethuar Ideograf GjashtÃ«" 
+    12934 "Rrethuar Ideograf ShtatÃ«" 
+    12935 "Rrethuar Ideograf TetÃ«" 
+    12936 "Rrethuar Ideograf NÃ«ntÃ«" 
+    12937 "Rrethuar Ideograf DhjetÃ«" 
+    12938 "Rrethuar Ideograf HÃ«nÃ«" 
+    12939 "Rrethuar Ideograf Zjarr" 
+    12940 "Rrethuar Ideograf UjÃ«" 
+    12941 "Rrethuar Ideograf Dru" 
+    12942 "Rrethuar Ideograf Metal" 
+    12943 "Rrethuar Ideograf TokÃ«" 
+    12944 "Rrethuar Ideograf Diell" 
+    12945 "Rrethuar Ideograf RezervÃ«" 
+    12946 "Rrethuar Ideograf Kam" 
+    12947 "Rrethuar Ideograf ShoqÃ«ri" 
+    12948 "Rrethuar Ideograf Emri" 
+    12949 "Rrethuar Ideograf Speciale" 
+    12950 "Rrethuar Ideograf Financiare" 
+    12951 "Rrethuar Ideograf PÃ«rgÃ«zime" 
+    12952 "Rrethuar Ideograf PunÃ«" 
+    12953 "Rrethuar Ideograf Sekret" 
+    12954 "Rrethuar Ideograf Mashkull" 
+    12955 "Rrethuar Ideograf FemÃ«r" 
+    12956 "Rrethuar Ideograf PÃ«rshtatshÃ«m" 
+    12957 "Rrethuar Ideograf ShkÃ«lqyer" 
+    12958 "Rrethuar Ideograf Printon" 
+    12959 "Rrethuar Ideograf Kujdes" 
+    12960 "Rrethuar Ideograf Send" 
+    12961 "Rrethuar Ideograf Mbetja" 
+    12962 "Rrethuar Ideograf kopjo" 
+    12963 "Rrethuar Ideograf SaktÃ«" 
+    12964 "Rrethuar Ideograf Lart" 
+    12965 "Rrethuar Ideograf Qendra" 
+    12966 "Rrethuar Ideograf UlÃ«t" 
+    12967 "Rrethuar Ideograf MajtÃ«" 
+    12968 "Rrethuar Ideograf DjathtÃ«" 
+    12969 "Rrethuar Ideograf Medicine" 
+    12970 "Rrethuar Ideograf Feja" 
+    12971 "Rrethuar Ideograf Studim" 
+    12972 "Rrethuar Ideograf MbikÃ«qyr" 
+    12973 "Rrethuar Ideograf NdÃ«rmarrje" 
+    12974 "Rrethuar Ideograf Burime" 
+    12975 "Rrethuar Ideograf AleancÃ«" 
+    12976 "Rrethuar Ideograf NatÃ«" 
+    12977 "Rrethuar NumÃ«r TridhjetÃ« GjashtÃ«" 
+    12978 "Rrethuar NumÃ«r TridhjetÃ« ShtatÃ«" 
+    12979 "Rrethuar NumÃ«r TridhjetÃ« TetÃ«" 
+    12980 "Rrethuar NumÃ«r TridhjetÃ« NÃ«ntÃ«" 
+    12981 "Rrethuar NumÃ«r DyzetÃ«" 
+    12982 "Rrethuar NumÃ«r DyzetÃ« NjÃ«" 
+    12983 "Rrethuar NumÃ«r DyzetÃ« Dy" 
+    12984 "Rrethuar NumÃ«r DyzetÃ« Tre" 
+    12985 "Rrethuar NumÃ«r DyzetÃ« KatÃ«r" 
+    12986 "Rrethuar NumÃ«r DyzetÃ« PesÃ«" 
+    12987 "Rrethuar NumÃ«r DyzetÃ« GjashtÃ«" 
+    12988 "Rrethuar NumÃ«r DyzetÃ« ShtatÃ«" 
+    12989 "Rrethuar NumÃ«r DyzetÃ« TetÃ«" 
+    12990 "Rrethuar NumÃ«r DyzetÃ« NÃ«ntÃ«" 
+    12991 "Rrethuar NumÃ«r PesÃ«dhjetÃ«" 
+    12992 "Telegraf Ideo-grafik Simbol PÃ«r Janar" 
+    12993 "Telegraf Ideo-grafik Simbol PÃ«r Shkurt" 
+    12994 "Telegraf Ideo-grafik Simbol PÃ«r Mars" 
+    12995 "Telegraf Ideo-grafik Simbol PÃ«r Prill" 
+    12996 "Telegraf Ideo-grafik Simbol PÃ«r Maj" 
+    12997 "Telegraf Ideo-grafik Simbol PÃ«r Qershor" 
+    12998 "Telegraf Ideo-grafik Simbol PÃ«r Korrik" 
+    12999 "Telegraf Ideo-grafik Simbol PÃ«r Gusht" 
+    13000 "Telegraf Ideo-grafik Simbol PÃ«r Shtator" 
+    13001 "Telegraf Ideo-grafik Simbol PÃ«r Tetor" 
+    13002 "Telegraf Ideo-grafik Simbol PÃ«r NÃ«ntor" 
+    13003 "Telegraf Ideo-grafik Simbol PÃ«r Dhjetor" 
+    13004 "Katror Hg" 
+    13005 "Katror Erg" 
+    13006 "Katror Ev" 
+    13007 "Limited Liability ShenjÃ«" 
+    13008 "Rrethuar Katakana A" 
+    13009 "Rrethuar Katakana I" 
+    13010 "Rrethuar Katakana U" 
+    13011 "Rrethuar Katakana E" 
+    13012 "Rrethuar Katakana O" 
+    13013 "Rrethuar Katakana Ka" 
+    13014 "Rrethuar Katakana Ki" 
+    13015 "Rrethuar Katakana Ku" 
+    13016 "Rrethuar Katakana Ke" 
+    13017 "Rrethuar Katakana Ko" 
+    13018 "Rrethuar Katakana Sa" 
+    13019 "Rrethuar Katakana Si" 
+    13020 "Rrethuar Katakana Su" 
+    13021 "Rrethuar Katakana Se" 
+    13022 "Rrethuar Katakana So" 
+    13023 "Rrethuar Katakana Ta" 
+    13024 "Rrethuar Katakana Ti" 
+    13025 "Rrethuar Katakana Tu" 
+    13026 "Rrethuar Katakana Te" 
+    13027 "Rrethuar Katakana To" 
+    13028 "Rrethuar Katakana Na" 
+    13029 "Rrethuar Katakana Ni" 
+    13030 "Rrethuar Katakana Nu" 
+    13031 "Rrethuar Katakana Ne" 
+    13032 "Rrethuar Katakana No" 
+    13033 "Rrethuar Katakana Ha" 
+    13034 "Rrethuar Katakana Hi" 
+    13035 "Rrethuar Katakana Hu" 
+    13036 "Rrethuar Katakana He" 
+    13037 "Rrethuar Katakana Ho" 
+    13038 "Rrethuar Katakana Ma" 
+    13039 "Rrethuar Katakana Mi" 
+    13040 "Rrethuar Katakana Mu" 
+    13041 "Rrethuar Katakana Me" 
+    13042 "Rrethuar Katakana Mo" 
+    13043 "Rrethuar Katakana Ya" 
+    13044 "Rrethuar Katakana Yu" 
+    13045 "Rrethuar Katakana Yo" 
+    13046 "Rrethuar Katakana Ra" 
+    13047 "Rrethuar Katakana Ri" 
+    13048 "Rrethuar Katakana Ru" 
+    13049 "Rrethuar Katakana Re" 
+    13050 "Rrethuar Katakana Ro" 
+    13051 "Rrethuar Katakana Wa" 
+    13052 "Rrethuar Katakana Wi" 
+    13053 "Rrethuar Katakana We" 
+    13054 "Rrethuar Katakana Wo" 
+    13056 "Katror Apaato" 
+    13057 "Katror Aruhua" 
+    13058 "Katror Anpea" 
+    13059 "Katror Aaru" 
+    13060 "Katror Iningu" 
+    13061 "Katror Inti" 
+    13062 "Katror Uon" 
+    13063 "Katror Esukuudo" 
+    13064 "Katror Eekaa" 
+    13065 "Katror Onsu" 
+    13066 "Katror Oomu" 
+    13067 "Katror Kairi" 
+    13068 "Katror Karatto" 
+    13069 "Katror Karorii" 
+    13070 "Katror Garon" 
+    13071 "Katror Ganma" 
+    13072 "Katror Giga" 
+    13073 "Katror Ginii" 
+    13074 "Katror Kyurii" 
+    13075 "Katror Girudaa" 
+    13076 "Katror Kiro" 
+    13077 "Katror Kiroguramu" 
+    13078 "Katror Kiromeetoru" 
+    13079 "Katror Kirowatto" 
+    13080 "Katror Guramu" 
+    13081 "Katror Guramuton" 
+    13082 "Katror Kuruzeiro" 
+    13083 "Katror Kuroone" 
+    13084 "Katror Keesu" 
+    13085 "Katror Koruna" 
+    13086 "Katror Koopo" 
+    13087 "Katror Saikuru" 
+    13088 "Katror Santiimu" 
+    13089 "Katror Siringu" 
+    13090 "Katror Senti" 
+    13091 "Katror Sento" 
+    13092 "Katror Daasu" 
+    13093 "Katror Desi" 
+    13094 "Katror Doru" 
+    13095 "Katror Ton" 
+    13096 "Katror Nano" 
+    13097 "Katror Notto" 
+    13098 "Katror Haitu" 
+    13099 "Katror Paasento" 
+    13100 "Katror Paatu" 
+    13101 "Katror Baareru" 
+    13102 "Katror Piasutoru" 
+    13103 "Katror Pikuru" 
+    13104 "Katror Piko" 
+    13105 "Katror Biru" 
+    13106 "Katror Huaraddo" 
+    13107 "Katror Huiito" 
+    13108 "Katror Bussyeru" 
+    13109 "Katror Huran" 
+    13110 "Katror Hekutaaru" 
+    13111 "Katror Peso" 
+    13112 "Katror Penihi" 
+    13113 "Katror Herutu" 
+    13114 "Katror Pensu" 
+    13115 "Katror Peezi" 
+    13116 "Katror Beeta" 
+    13117 "Katror Pointo" 
+    13118 "Katror Boruto" 
+    13119 "Katror Hon" 
+    13120 "Katror Pondo" 
+    13121 "Katror Hooru" 
+    13122 "Katror Hoon" 
+    13123 "Katror Maikuro" 
+    13124 "Katror Mairu" 
+    13125 "Katror Mahha" 
+    13126 "Katror Maruku" 
+    13127 "Katror Mansyon" 
+    13128 "Katror Mikuron" 
+    13129 "Katror Miri" 
+    13130 "Katror Miribaaru" 
+    13131 "Katror Mega" 
+    13132 "Katror Megaton" 
+    13133 "Katror Meetoru" 
+    13134 "Katror Yaado" 
+    13135 "Katror Yaaru" 
+    13136 "Katror Yuan" 
+    13137 "Katror Rittoru" 
+    13138 "Katror Rira" 
+    13139 "Katror Rupii" 
+    13140 "Katror Ruuburu" 
+    13141 "Katror Remu" 
+    13142 "Katror Rentogen" 
+    13143 "Katror Watto" 
+    13144 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« Zero" 
+    13145 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«" 
+    13146 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« Dy" 
+    13147 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« Tre" 
+    13148 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« KatÃ«r" 
+    13149 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« PesÃ«" 
+    13150 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« GjashtÃ«" 
+    13151 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« ShtatÃ«" 
+    13152 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« TetÃ«" 
+    13153 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NÃ«ntÃ«" 
+    13154 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« DhjetÃ«" 
+    13155 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«mbÃ«dhjetÃ«" 
+    13156 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« DymbÃ«dhjetÃ«" 
+    13157 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« TrembÃ«dhjetÃ«" 
+    13158 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« KatÃ«rmbÃ«dhjetÃ«" 
+    13159 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« PesÃ«mbÃ«dhjetÃ«" 
+    13160 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« GjashtÃ«mbÃ«dhjetÃ«" 
+    13161 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« ShtatÃ«mbÃ«dhjetÃ«" 
+    13162 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« TetÃ«mbÃ«dhjetÃ«" 
+    13163 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NÃ«ntÃ«mbÃ«dhjetÃ«" 
+    13164 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«zet" 
+    13165 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«zet-One" 
+    13166 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«zet-Dy" 
+    13167 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«zet-Tre" 
+    13168 "Telegraf Ideo-grafik  Simbol PÃ«r OrÃ« NjÃ«zet-KatÃ«r" 
+    13169 "Katror Hpa" 
+    13170 "Katror Da" 
+    13171 "Katror Au" 
+    13172 "Katror Bar" 
+    13173 "Katror Ov" 
+    13174 "Katror Pc" 
+    13175 "Katror Dm" 
+    13176 "Katror Dm Katrord" 
+    13177 "Katror Dm Cubed" 
+    13178 "Katror Iu" 
+    13179 "Katror Era Name Heisei" 
+    13180 "Katror Era Name Syouwa" 
+    13181 "Katror Era Name Taisyou" 
+    13182 "Katror Era Name Meizi" 
+    13183 "Katror KorporatÃ«" 
+    13184 "Katror Pa Amps" 
+    13185 "Katror Na" 
+    13186 "Katror Mu A" 
+    13187 "Katror Ma" 
+    13188 "Katror Ka" 
+    13189 "Katror Kb" 
+    13190 "Katror Mb" 
+    13191 "Katror Gb" 
+    13192 "Katror Cal" 
+    13193 "Katror Kcal" 
+    13194 "Katror Pf" 
+    13195 "Katror Nf" 
+    13196 "Katror Mu F" 
+    13197 "Katror Mu G" 
+    13198 "Katror Mg" 
+    13199 "Katror Kg" 
+    13200 "Katror Hz" 
+    13201 "Katror Khz" 
+    13202 "Katror Mhz" 
+    13203 "Katror Ghz" 
+    13204 "Katror Thz" 
+    13205 "Katror Mu L" 
+    13206 "Katror Ml" 
+    13207 "Katror Dl" 
+    13208 "Katror Kl" 
+    13209 "Katror Fm" 
+    13210 "Katror Nm" 
+    13211 "Katror Mu M" 
+    13212 "Katror Mm" 
+    13213 "Katror Cm" 
+    13214 "Katror Km" 
+    13215 "Katror Mm Katror" 
+    13216 "Katror Cm Katror" 
+    13217 "Katror M Katror" 
+    13218 "Katror Km Katror" 
+    13219 "Katror Mm Kub" 
+    13220 "Katror Cm Kub" 
+    13221 "Katror M Kub" 
+    13222 "Katror Km Kub" 
+    13223 "Katror M Mbi S" 
+    13224 "Katror M Mbi S Katror" 
+    13225 "Katror Pa" 
+    13226 "Katror Kpa" 
+    13227 "Katror Mpa" 
+    13228 "Katror Gpa" 
+    13229 "Katror Rad" 
+    13230 "Katror Rad Mbi S" 
+    13231 "Katror Rad Mbi S Katror" 
+    13232 "Katror Ps" 
+    13233 "Katror Ns" 
+    13234 "Katror Mu S" 
+    13235 "Katror Ms" 
+    13236 "Katror Pv" 
+    13237 "Katror Nv" 
+    13238 "Katror Mu V" 
+    13239 "Katror Mv" 
+    13240 "Katror Kv" 
+    13241 "Katror Mv Mega" 
+    13242 "Katror Pw" 
+    13243 "Katror Nw" 
+    13244 "Katror Mu W" 
+    13245 "Katror Mw" 
+    13246 "Katror Kw" 
+    13247 "Katror Mw Mega" 
+    13248 "Katror K Ohm" 
+    13249 "Katror M Ohm" 
+    13250 "Katror Am" 
+    13251 "Katror Bq" 
+    13252 "Katror Cc" 
+    13253 "Katror Cd" 
+    13254 "Katror C Mbi Kg" 
+    13255 "Katror Co" 
+    13256 "Katror Db" 
+    13257 "Katror Gy" 
+    13258 "Katror Ha" 
+    13259 "Katror Hp" 
+    13260 "Katror In" 
+    13261 "Katror Kk" 
+    13262 "Katror Km e Madhe" 
+    13263 "Katror Kt" 
+    13264 "Katror Lm" 
+    13265 "Katror Ln" 
+    13266 "Katror Log" 
+    13267 "Katror Lx" 
+    13268 "Katror Mb e VogÃ«l" 
+    13269 "Katror Mil" 
+    13270 "Katror Mol" 
+    13271 "Katror Ph" 
+    13272 "Katror Pm" 
+    13273 "Katror Ppm" 
+    13274 "Katror Pr" 
+    13275 "Katror Sr" 
+    13276 "Katror Sv" 
+    13277 "Katror Wb" 
+    13278 "Katror V Mbi M" 
+    13279 "Katror A Mbi M" 
+    13280 "Telegraf Ideo-grafik  PÃ«r DitÃ« NjÃ«" 
+    13281 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« Dy" 
+    13282 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« Tre" 
+    13283 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« KatÃ«r" 
+    13284 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« PesÃ«" 
+    13285 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« GjashtÃ«" 
+    13286 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« ShtatÃ«" 
+    13287 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« TetÃ«" 
+    13288 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NÃ«ntÃ«" 
+    13289 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« DhjetÃ«" 
+    13290 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«mbÃ«dhjetÃ«" 
+    13291 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« DymbÃ«dhjetÃ«" 
+    13292 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« TrembÃ«dhjetÃ«" 
+    13293 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« KatÃ«rmbÃ«dhjetÃ«" 
+    13294 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« PesÃ«mbÃ«dhjetÃ«" 
+    13295 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« GjashtÃ«mbÃ«dhjetÃ«" 
+    13296 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« ShtatÃ«mbÃ«dhjetÃ«" 
+    13297 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« TetÃ«mbÃ«dhjetÃ«" 
+    13298 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NÃ«ntÃ«mbÃ«dhjetÃ«" 
+    13299 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet" 
+    13300 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-NjÃ«" 
+    13301 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-Dy" 
+    13302 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-Tre" 
+    13303 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-KatÃ«r" 
+    13304 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-PesÃ«" 
+    13305 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-GjashtÃ«" 
+    13306 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-ShtatÃ«" 
+    13307 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-TetÃ«" 
+    13308 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« NjÃ«zet-NÃ«ntÃ«" 
+    13309 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« TridhjetÃ«" 
+    13310 "Telegraf Ideo-grafik  Simbol PÃ«r DitÃ« TridhjetÃ«-NjÃ«" 
+    13311 "Katror Gal" 
+    13312 "<CJK Ideograf Zgjatje A, Emri>" 
+    19893 "<CJK Ideograf Zgjatje A, Mbiemri>" 
+    19904 "GjashtÃ«kÃ«ndÃ«sh PÃ«r TokÃ«n e Krijuar" 
+    19905 "GjashtÃ«kÃ«ndÃ«sh PÃ«r TokÃ«n Perceptuese" 
+    19906 "GjashtÃ«kÃ«ndÃ«sh PÃ«r VÃ«shtirÃ« nÃ« Fillim" 
+    19907 "GjashtÃ«kÃ«ndÃ«sh PÃ«r MarrÃ«zi Rinore" 
+    19908 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Pritje" 
+    19909 "GjashtÃ«kÃ«ndÃ«sh PÃ«r konflikt" 
+    19910 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Ushtria" 
+    19911 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Mbahu SÃ« bashku" 
+    19912 "GjashtÃ«kÃ«ndÃ«sh PÃ«r e VogÃ«l Zbutje" 
+    19913 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Ndjek" 
+    19914 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Paqe" 
+    19915 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Rri nÃ« vend" 
+    19916 "GjashtÃ«kÃ«ndÃ«sh PÃ«r MiqÃ«si" 
+    19917 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Posedim i Madh" 
+    19918 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Modesti" 
+    19919 "GjashtÃ«kÃ«ndÃ«sh PÃ«r EntuziazÃ«m" 
+    19920 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Ndiq" 
+    19921 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Puno nÃ« tÃ« prishur" 
+    19922 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Afrim" 
+    19923 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Mbarim" 
+    19924 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Thumbues PÃ«rmes" 
+    19925 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Hir" 
+    19926 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Ndaj PÃ«rgjysmÃ«" 
+    19927 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Kthe" 
+    19928 "GjashtÃ«kÃ«ndÃ«sh PÃ«r PafajshÃ«m" 
+    19929 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Zbutja Madhe" 
+    19930 "GjashtÃ«kÃ«ndÃ«sh PÃ«r GojÃ« KÃ«ndet" 
+    19931 "GjashtÃ«kÃ«ndÃ«sh PÃ«r EpÃ«rsi Madhe" 
+    19932 "GjashtÃ«kÃ«ndÃ«sh PÃ«r UjÃ«ra tÃ« Pafund" 
+    19933 "GjashtÃ«kÃ«ndÃ«sh PÃ«r FlakÃ«t qÃ« Kacavaren" 
+    19934 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Influence" 
+    19935 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Zgjatje" 
+    19936 "GjashtÃ«kÃ«ndÃ«sh PÃ«r TÃ«rheqje" 
+    19937 "GjashtÃ«kÃ«ndÃ«sh PÃ«r ForcÃ« tÃ« Madhe" 
+    19938 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Progres" 
+    19939 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Nxirje tÃ« LehtÃ«" 
+    19940 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Familjen" 
+    19941 "GjashtÃ«kÃ«ndÃ«sh PÃ«r OpozitÃ«n" 
+    19942 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Pengimin" 
+    19943 "GjashtÃ«kÃ«ndÃ«sh PÃ«r ShpÃ«tim" 
+    19944 "GjashtÃ«kÃ«ndÃ«sh PÃ«r RÃ«nie" 
+    19945 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Rritje" 
+    19946 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Zbulim i Madh" 
+    19947 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Eja dhe mÃ« Tako" 
+    19948 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Mbledhje SÃ« Bashku" 
+    19949 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Shtyj PÃ«rpara" 
+    19950 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Shtytje" 
+    19951 "GjashtÃ«kÃ«ndÃ«sh PÃ«r MirÃ«qenie" 
+    19952 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Revolucion" 
+    19953 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Kazan" 
+    19954 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Ngjallja e BubullimÃ«s" 
+    19955 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Mbaj nÃ« Vend Malet" 
+    19956 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Zhvillim" 
+    19957 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Martesa Maiden" 
+    19958 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Begati" 
+    19959 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Endacak" 
+    19960 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Era ButÃ«" 
+    19961 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Lumi GÃ«zuar" 
+    19962 "GjashtÃ«kÃ«ndÃ«sh PÃ«r ShpÃ«rbÃ«rje" 
+    19963 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Limitim" 
+    19964 "GjashtÃ«kÃ«ndÃ«sh PÃ«r VÃ«rteta Brendshme" 
+    19965 "GjashtÃ«kÃ«ndÃ«sh PÃ«r e VogÃ«l EpÃ«rsi" 
+    19966 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Pas PÃ«rfundimit" 
+    19967 "GjashtÃ«kÃ«ndÃ«sh PÃ«r Para PÃ«rfundimit" 
+    19968 "<CJK Ideograf, Emri>" 
+    40908 "<CJK Ideograf, Mbiemri>" 
+    40960 "Yi Rrokje It" 
+    40961 "Yi Rrokje Ix" 
+    40962 "Yi Rrokje I" 
+    40963 "Yi Rrokje Ip" 
+    40964 "Yi Rrokje Iet" 
+    40965 "Yi Rrokje Iex" 
+    40966 "Yi Rrokje Ie" 
+    40967 "Yi Rrokje Iep" 
+    40968 "Yi Rrokje At" 
+    40969 "Yi Rrokje Ax" 
+    40970 "Yi Rrokje A" 
+    40971 "Yi Rrokje Ap" 
+    40972 "Yi Rrokje Uox" 
+    40973 "Yi Rrokje Uo" 
+    40974 "Yi Rrokje Uop" 
+    40975 "Yi Rrokje Ot" 
+    40976 "Yi Rrokje Ox" 
+    40977 "Yi Rrokje O" 
+    40978 "Yi Rrokje Op" 
+    40979 "Yi Rrokje Ex" 
+    40980 "Yi Rrokje E" 
+    40981 "Yi Rrokje Wu" 
+    40982 "Yi Rrokje Bit" 
+    40983 "Yi Rrokje Bix" 
+    40984 "Yi Rrokje Bi" 
+    40985 "Yi Rrokje Bip" 
+    40986 "Yi Rrokje Biet" 
+    40987 "Yi Rrokje Biex" 
+    40988 "Yi Rrokje Bie" 
+    40989 "Yi Rrokje Biep" 
+    40990 "Yi Rrokje Bat" 
+    40991 "Yi Rrokje Bax" 
+    40992 "Yi Rrokje Ba" 
+    40993 "Yi Rrokje Bap" 
+    40994 "Yi Rrokje Buox" 
+    40995 "Yi Rrokje Buo" 
+    40996 "Yi Rrokje Buop" 
+    40997 "Yi Rrokje Bot" 
+    40998 "Yi Rrokje Kuti" 
+    40999 "Yi Rrokje Bo" 
+    41000 "Yi Rrokje Bop" 
+    41001 "Yi Rrokje Bex" 
+    41002 "Yi Rrokje Be" 
+    41003 "Yi Rrokje Bep" 
+    41004 "Yi Rrokje But" 
+    41005 "Yi Rrokje Bux" 
+    41006 "Yi Rrokje Bu" 
+    41007 "Yi Rrokje Bup" 
+    41008 "Yi Rrokje Burx" 
+    41009 "Yi Rrokje Bur" 
+    41010 "Yi Rrokje Byt" 
+    41011 "Yi Rrokje Byx" 
+    41012 "Yi Rrokje By" 
+    41013 "Yi Rrokje Byp" 
+    41014 "Yi Rrokje Byrx" 
+    41015 "Yi Rrokje Byr" 
+    41016 "Yi Rrokje Pit" 
+    41017 "Yi Rrokje Pix" 
+    41018 "Yi Rrokje Pi" 
+    41019 "Yi Rrokje Pip" 
+    41020 "Yi Rrokje Piex" 
+    41021 "Yi Rrokje Pie" 
+    41022 "Yi Rrokje Piep" 
+    41023 "Yi Rrokje Pat" 
+    41024 "Yi Rrokje Pax" 
+    41025 "Yi Rrokje Pa" 
+    41026 "Yi Rrokje Pap" 
+    41027 "Yi Rrokje Puox" 
+    41028 "Yi Rrokje Puo" 
+    41029 "Yi Rrokje Puop" 
+    41030 "Yi Rrokje Pot" 
+    41031 "Yi Rrokje Pox" 
+    41032 "Yi Rrokje Po" 
+    41033 "Yi Rrokje Pop" 
+    41034 "Yi Rrokje Put" 
+    41035 "Yi Rrokje Pux" 
+    41036 "Yi Rrokje Pu" 
+    41037 "Yi Rrokje Pup" 
+    41038 "Yi Rrokje Purx" 
+    41039 "Yi Rrokje Pur" 
+    41040 "Yi Rrokje Pyt" 
+    41041 "Yi Rrokje Pyx" 
+    41042 "Yi Rrokje Py" 
+    41043 "Yi Rrokje Pyp" 
+    41044 "Yi Rrokje Pyrx" 
+    41045 "Yi Rrokje Pyr" 
+    41046 "Yi Rrokje Bbit" 
+    41047 "Yi Rrokje Bbix" 
+    41048 "Yi Rrokje Bbi" 
+    41049 "Yi Rrokje Bbip" 
+    41050 "Yi Rrokje Bbiet" 
+    41051 "Yi Rrokje Bbiex" 
+    41052 "Yi Rrokje Bbie" 
+    41053 "Yi Rrokje Bbiep" 
+    41054 "Yi Rrokje Bbat" 
+    41055 "Yi Rrokje Bbax" 
+    41056 "Yi Rrokje Bba" 
+    41057 "Yi Rrokje Bbap" 
+    41058 "Yi Rrokje Bbuox" 
+    41059 "Yi Rrokje Bbuo" 
+    41060 "Yi Rrokje Bbuop" 
+    41061 "Yi Rrokje Bbot" 
+    41062 "Yi Rrokje Bbox" 
+    41063 "Yi Rrokje Bbo" 
+    41064 "Yi Rrokje Bbop" 
+    41065 "Yi Rrokje Bbex" 
+    41066 "Yi Rrokje Bbe" 
+    41067 "Yi Rrokje Bbep" 
+    41068 "Yi Rrokje Bbut" 
+    41069 "Yi Rrokje Bbux" 
+    41070 "Yi Rrokje Bbu" 
+    41071 "Yi Rrokje Bbup" 
+    41072 "Yi Rrokje Bburx" 
+    41073 "Yi Rrokje Bbur" 
+    41074 "Yi Rrokje Bbyt" 
+    41075 "Yi Rrokje Bbyx" 
+    41076 "Yi Rrokje Bby" 
+    41077 "Yi Rrokje Bbyp" 
+    41078 "Yi Rrokje Nbit" 
+    41079 "Yi Rrokje Nbix" 
+    41080 "Yi Rrokje Nbi" 
+    41081 "Yi Rrokje Nbip" 
+    41082 "Yi Rrokje Nbiex" 
+    41083 "Yi Rrokje Nbie" 
+    41084 "Yi Rrokje Nbiep" 
+    41085 "Yi Rrokje Nbat" 
+    41086 "Yi Rrokje Nbax" 
+    41087 "Yi Rrokje Nba" 
+    41088 "Yi Rrokje Nbap" 
+    41089 "Yi Rrokje Nbot" 
+    41090 "Yi Rrokje Nbox" 
+    41091 "Yi Rrokje Nbo" 
+    41092 "Yi Rrokje Nbop" 
+    41093 "Yi Rrokje Nbut" 
+    41094 "Yi Rrokje Nbux" 
+    41095 "Yi Rrokje Nbu" 
+    41096 "Yi Rrokje Nbup" 
+    41097 "Yi Rrokje Nburx" 
+    41098 "Yi Rrokje Nbur" 
+    41099 "Yi Rrokje Nbyt" 
+    41100 "Yi Rrokje Nbyx" 
+    41101 "Yi Rrokje Nby" 
+    41102 "Yi Rrokje Nbyp" 
+    41103 "Yi Rrokje Nbyrx" 
+    41104 "Yi Rrokje Nbyr" 
+    41105 "Yi Rrokje Hmit" 
+    41106 "Yi Rrokje Hmix" 
+    41107 "Yi Rrokje Hmi" 
+    41108 "Yi Rrokje Hmip" 
+    41109 "Yi Rrokje Hmiex" 
+    41110 "Yi Rrokje Hmie" 
+    41111 "Yi Rrokje Hmiep" 
+    41112 "Yi Rrokje Hmat" 
+    41113 "Yi Rrokje Hmax" 
+    41114 "Yi Rrokje Hma" 
+    41115 "Yi Rrokje Hmap" 
+    41116 "Yi Rrokje Hmuox" 
+    41117 "Yi Rrokje Hmuo" 
+    41118 "Yi Rrokje Hmuop" 
+    41119 "Yi Rrokje Hmot" 
+    41120 "Yi Rrokje Hmox" 
+    41121 "Yi Rrokje Hmo" 
+    41122 "Yi Rrokje Hmop" 
+    41123 "Yi Rrokje Hmut" 
+    41124 "Yi Rrokje Hmux" 
+    41125 "Yi Rrokje Hmu" 
+    41126 "Yi Rrokje Hmup" 
+    41127 "Yi Rrokje Hmurx" 
+    41128 "Yi Rrokje Hmur" 
+    41129 "Yi Rrokje Hmyx" 
+    41130 "Yi Rrokje Hmy" 
+    41131 "Yi Rrokje Hmyp" 
+    41132 "Yi Rrokje Hmyrx" 
+    41133 "Yi Rrokje Hmyr" 
+    41134 "Yi Rrokje Mit" 
+    41135 "Yi Rrokje Mix" 
+    41136 "Yi Rrokje Mi" 
+    41137 "Yi Rrokje Mip" 
+    41138 "Yi Rrokje Miex" 
+    41139 "Yi Rrokje Mie" 
+    41140 "Yi Rrokje Miep" 
+    41141 "Yi Rrokje Mat" 
+    41142 "Yi Rrokje Max" 
+    41143 "Yi Rrokje Ma" 
+    41144 "Yi Rrokje Map" 
+    41145 "Yi Rrokje Muot" 
+    41146 "Yi Rrokje Muox" 
+    41147 "Yi Rrokje Muo" 
+    41148 "Yi Rrokje Muop" 
+    41149 "Yi Rrokje Mot" 
+    41150 "Yi Rrokje Mox" 
+    41151 "Yi Rrokje Mo" 
+    41152 "Yi Rrokje Mop" 
+    41153 "Yi Rrokje Mex" 
+    41154 "Yi Rrokje Me" 
+    41155 "Yi Rrokje Mut" 
+    41156 "Yi Rrokje Mux" 
+    41157 "Yi Rrokje Mu" 
+    41158 "Yi Rrokje Mup" 
+    41159 "Yi Rrokje Murx" 
+    41160 "Yi Rrokje Mur" 
+    41161 "Yi Rrokje Myt" 
+    41162 "Yi Rrokje Myx" 
+    41163 "Yi Rrokje My" 
+    41164 "Yi Rrokje Myp" 
+    41165 "Yi Rrokje Fit" 
+    41166 "Yi Rrokje Fix" 
+    41167 "Yi Rrokje Fi" 
+    41168 "Yi Rrokje Fip" 
+    41169 "Yi Rrokje Fat" 
+    41170 "Yi Rrokje Fax" 
+    41171 "Yi Rrokje Fa" 
+    41172 "Yi Rrokje Fap" 
+    41173 "Yi Rrokje Fox" 
+    41174 "Yi Rrokje Fo" 
+    41175 "Yi Rrokje Fop" 
+    41176 "Yi Rrokje Fut" 
+    41177 "Yi Rrokje Fux" 
+    41178 "Yi Rrokje Fu" 
+    41179 "Yi Rrokje Fup" 
+    41180 "Yi Rrokje Furx" 
+    41181 "Yi Rrokje Fur" 
+    41182 "Yi Rrokje Fyt" 
+    41183 "Yi Rrokje Fyx" 
+    41184 "Yi Rrokje Fy" 
+    41185 "Yi Rrokje Fyp" 
+    41186 "Yi Rrokje Vit" 
+    41187 "Yi Rrokje Vix" 
+    41188 "Yi Rrokje Vi" 
+    41189 "Yi Rrokje Vip" 
+    41190 "Yi Rrokje Viet" 
+    41191 "Yi Rrokje Viex" 
+    41192 "Yi Rrokje Vie" 
+    41193 "Yi Rrokje Viep" 
+    41194 "Yi Rrokje Vat" 
+    41195 "Yi Rrokje Vax" 
+    41196 "Yi Rrokje Va" 
+    41197 "Yi Rrokje Vap" 
+    41198 "Yi Rrokje Vot" 
+    41199 "Yi Rrokje Vox" 
+    41200 "Yi Rrokje Vo" 
+    41201 "Yi Rrokje Vop" 
+    41202 "Yi Rrokje Vex" 
+    41203 "Yi Rrokje Vep" 
+    41204 "Yi Rrokje Vut" 
+    41205 "Yi Rrokje Vux" 
+    41206 "Yi Rrokje Vu" 
+    41207 "Yi Rrokje Vup" 
+    41208 "Yi Rrokje Vurx" 
+    41209 "Yi Rrokje Vur" 
+    41210 "Yi Rrokje Vyt" 
+    41211 "Yi Rrokje Vyx" 
+    41212 "Yi Rrokje Vy" 
+    41213 "Yi Rrokje Vyp" 
+    41214 "Yi Rrokje Vyrx" 
+    41215 "Yi Rrokje Vyr" 
+    41216 "Yi Rrokje Dit" 
+    41217 "Yi Rrokje Dix" 
+    41218 "Yi Rrokje Di" 
+    41219 "Yi Rrokje Dip" 
+    41220 "Yi Rrokje Diex" 
+    41221 "Yi Rrokje Die" 
+    41222 "Yi Rrokje Diep" 
+    41223 "Yi Rrokje Dat" 
+    41224 "Yi Rrokje Dax" 
+    41225 "Yi Rrokje Da" 
+    41226 "Yi Rrokje Dap" 
+    41227 "Yi Rrokje Duox" 
+    41228 "Yi Rrokje Duo" 
+    41229 "Yi Rrokje PikÃ«" 
+    41230 "Yi Rrokje Dox" 
+    41231 "Yi Rrokje Do" 
+    41232 "Yi Rrokje Dop" 
+    41233 "Yi Rrokje Dex" 
+    41234 "Yi Rrokje De" 
+    41235 "Yi Rrokje Dep" 
+    41236 "Yi Rrokje Dut" 
+    41237 "Yi Rrokje Dux" 
+    41238 "Yi Rrokje Du" 
+    41239 "Yi Rrokje Dup" 
+    41240 "Yi Rrokje Durx" 
+    41241 "Yi Rrokje Dur" 
+    41242 "Yi Rrokje Tit" 
+    41243 "Yi Rrokje Tix" 
+    41244 "Yi Rrokje Ti" 
+    41245 "Yi Rrokje Tip" 
+    41246 "Yi Rrokje Tiex" 
+    41247 "Yi Rrokje Tie" 
+    41248 "Yi Rrokje Tiep" 
+    41249 "Yi Rrokje Tat" 
+    41250 "Yi Rrokje Tax" 
+    41251 "Yi Rrokje Ta" 
+    41252 "Yi Rrokje Tap" 
+    41253 "Yi Rrokje Tuot" 
+    41254 "Yi Rrokje Tuox" 
+    41255 "Yi Rrokje Tuo" 
+    41256 "Yi Rrokje Tuop" 
+    41257 "Yi Rrokje Tot" 
+    41258 "Yi Rrokje Tox" 
+    41259 "Yi Rrokje To" 
+    41260 "Yi Rrokje SipÃ«rm" 
+    41261 "Yi Rrokje Tex" 
+    41262 "Yi Rrokje Te" 
+    41263 "Yi Rrokje Tep" 
+    41264 "Yi Rrokje Tut" 
+    41265 "Yi Rrokje Tux" 
+    41266 "Yi Rrokje Tu" 
+    41267 "Yi Rrokje Tup" 
+    41268 "Yi Rrokje Turx" 
+    41269 "Yi Rrokje Tur" 
+    41270 "Yi Rrokje Ddit" 
+    41271 "Yi Rrokje Ddix" 
+    41272 "Yi Rrokje Ddi" 
+    41273 "Yi Rrokje Ddip" 
+    41274 "Yi Rrokje Ddiex" 
+    41275 "Yi Rrokje Ddie" 
+    41276 "Yi Rrokje Ddiep" 
+    41277 "Yi Rrokje Ddat" 
+    41278 "Yi Rrokje Ddax" 
+    41279 "Yi Rrokje Dda" 
+    41280 "Yi Rrokje Ddap" 
+    41281 "Yi Rrokje Dduox" 
+    41282 "Yi Rrokje Dduo" 
+    41283 "Yi Rrokje Dduop" 
+    41284 "Yi Rrokje Ddot" 
+    41285 "Yi Rrokje Ddox" 
+    41286 "Yi Rrokje Ddo" 
+    41287 "Yi Rrokje Ddop" 
+    41288 "Yi Rrokje Ddex" 
+    41289 "Yi Rrokje Dde" 
+    41290 "Yi Rrokje Ddep" 
+    41291 "Yi Rrokje Ddut" 
+    41292 "Yi Rrokje Ddux" 
+    41293 "Yi Rrokje Ddu" 
+    41294 "Yi Rrokje Ddup" 
+    41295 "Yi Rrokje Ddurx" 
+    41296 "Yi Rrokje Ddur" 
+    41297 "Yi Rrokje Ndit" 
+    41298 "Yi Rrokje Ndix" 
+    41299 "Yi Rrokje Ndi" 
+    41300 "Yi Rrokje Ndip" 
+    41301 "Yi Rrokje Ndiex" 
+    41302 "Yi Rrokje Ndie" 
+    41303 "Yi Rrokje Ndat" 
+    41304 "Yi Rrokje Ndax" 
+    41305 "Yi Rrokje Nda" 
+    41306 "Yi Rrokje Ndap" 
+    41307 "Yi Rrokje Ndot" 
+    41308 "Yi Rrokje Ndox" 
+    41309 "Yi Rrokje Ndo" 
+    41310 "Yi Rrokje Ndop" 
+    41311 "Yi Rrokje Ndex" 
+    41312 "Yi Rrokje Nde" 
+    41313 "Yi Rrokje Ndep" 
+    41314 "Yi Rrokje Ndut" 
+    41315 "Yi Rrokje Ndux" 
+    41316 "Yi Rrokje Ndu" 
+    41317 "Yi Rrokje Ndup" 
+    41318 "Yi Rrokje Ndurx" 
+    41319 "Yi Rrokje Ndur" 
+    41320 "Yi Rrokje Hnit" 
+    41321 "Yi Rrokje Hnix" 
+    41322 "Yi Rrokje Hni" 
+    41323 "Yi Rrokje Hnip" 
+    41324 "Yi Rrokje Hniet" 
+    41325 "Yi Rrokje Hniex" 
+    41326 "Yi Rrokje Hnie" 
+    41327 "Yi Rrokje Hniep" 
+    41328 "Yi Rrokje Hnat" 
+    41329 "Yi Rrokje Hnax" 
+    41330 "Yi Rrokje Hna" 
+    41331 "Yi Rrokje Hnap" 
+    41332 "Yi Rrokje Hnuox" 
+    41333 "Yi Rrokje Hnuo" 
+    41334 "Yi Rrokje Hnot" 
+    41335 "Yi Rrokje Hnox" 
+    41336 "Yi Rrokje Hnop" 
+    41337 "Yi Rrokje Hnex" 
+    41338 "Yi Rrokje Hne" 
+    41339 "Yi Rrokje Hnep" 
+    41340 "Yi Rrokje Hnut" 
+    41341 "Yi Rrokje Nit" 
+    41342 "Yi Rrokje Nix" 
+    41343 "Yi Rrokje Ni" 
+    41344 "Yi Rrokje Nip" 
+    41345 "Yi Rrokje Niex" 
+    41346 "Yi Rrokje Nie" 
+    41347 "Yi Rrokje Niep" 
+    41348 "Yi Rrokje Nax" 
+    41349 "Yi Rrokje Na" 
+    41350 "Yi Rrokje Nap" 
+    41351 "Yi Rrokje Nuox" 
+    41352 "Yi Rrokje Nuo" 
+    41353 "Yi Rrokje Nuop" 
+    41354 "Yi Rrokje Jo" 
+    41355 "Yi Rrokje Nox" 
+    41356 "Yi Rrokje No" 
+    41357 "Yi Rrokje Nop" 
+    41358 "Yi Rrokje Nex" 
+    41359 "Yi Rrokje Ne" 
+    41360 "Yi Rrokje Nep" 
+    41361 "Yi Rrokje Nut" 
+    41362 "Yi Rrokje Nux" 
+    41363 "Yi Rrokje Nu" 
+    41364 "Yi Rrokje Nup" 
+    41365 "Yi Rrokje Nurx" 
+    41366 "Yi Rrokje Nur" 
+    41367 "Yi Rrokje Hlit" 
+    41368 "Yi Rrokje Hlix" 
+    41369 "Yi Rrokje Hli" 
+    41370 "Yi Rrokje Hlip" 
+    41371 "Yi Rrokje Hliex" 
+    41372 "Yi Rrokje Hlie" 
+    41373 "Yi Rrokje Hliep" 
+    41374 "Yi Rrokje Hlat" 
+    41375 "Yi Rrokje Hlax" 
+    41376 "Yi Rrokje Hla" 
+    41377 "Yi Rrokje Hlap" 
+    41378 "Yi Rrokje Hluox" 
+    41379 "Yi Rrokje Hluo" 
+    41380 "Yi Rrokje Hluop" 
+    41381 "Yi Rrokje Hlox" 
+    41382 "Yi Rrokje Hlo" 
+    41383 "Yi Rrokje Hlop" 
+    41384 "Yi Rrokje Hlex" 
+    41385 "Yi Rrokje Hle" 
+    41386 "Yi Rrokje Hlep" 
+    41387 "Yi Rrokje Hlut" 
+    41388 "Yi Rrokje Hlux" 
+    41389 "Yi Rrokje Hlu" 
+    41390 "Yi Rrokje Hlup" 
+    41391 "Yi Rrokje Hlurx" 
+    41392 "Yi Rrokje Hlur" 
+    41393 "Yi Rrokje Hlyt" 
+    41394 "Yi Rrokje Hlyx" 
+    41395 "Yi Rrokje Hly" 
+    41396 "Yi Rrokje Hlyp" 
+    41397 "Yi Rrokje Hlyrx" 
+    41398 "Yi Rrokje Hlyr" 
+    41399 "Yi Rrokje Lit" 
+    41400 "Yi Rrokje Lix" 
+    41401 "Yi Rrokje Li" 
+    41402 "Yi Rrokje Lip" 
+    41403 "Yi Rrokje Liet" 
+    41404 "Yi Rrokje Liex" 
+    41405 "Yi Rrokje Lie" 
+    41406 "Yi Rrokje Liep" 
+    41407 "Yi Rrokje Lat" 
+    41408 "Yi Rrokje Lax" 
+    41409 "Yi Rrokje La" 
+    41410 "Yi Rrokje Lap" 
+    41411 "Yi Rrokje Luot" 
+    41412 "Yi Rrokje Luox" 
+    41413 "Yi Rrokje Luo" 
+    41414 "Yi Rrokje Luop" 
+    41415 "Yi Rrokje Lot" 
+    41416 "Yi Rrokje Lox" 
+    41417 "Yi Rrokje Lo" 
+    41418 "Yi Rrokje Lop" 
+    41419 "Yi Rrokje Lex" 
+    41420 "Yi Rrokje Le" 
+    41421 "Yi Rrokje Lep" 
+    41422 "Yi Rrokje Lut" 
+    41423 "Yi Rrokje Lux" 
+    41424 "Yi Rrokje Lu" 
+    41425 "Yi Rrokje Lup" 
+    41426 "Yi Rrokje Lurx" 
+    41427 "Yi Rrokje Lur" 
+    41428 "Yi Rrokje Lyt" 
+    41429 "Yi Rrokje Lyx" 
+    41430 "Yi Rrokje Ly" 
+    41431 "Yi Rrokje Lyp" 
+    41432 "Yi Rrokje Lyrx" 
+    41433 "Yi Rrokje Lyr" 
+    41434 "Yi Rrokje Git" 
+    41435 "Yi Rrokje Gix" 
+    41436 "Yi Rrokje Gi" 
+    41437 "Yi Rrokje Gip" 
+    41438 "Yi Rrokje Giet" 
+    41439 "Yi Rrokje Giex" 
+    41440 "Yi Rrokje Gie" 
+    41441 "Yi Rrokje Giep" 
+    41442 "Yi Rrokje Gat" 
+    41443 "Yi Rrokje Gax" 
+    41444 "Yi Rrokje Ga" 
+    41445 "Yi Rrokje Gap" 
+    41446 "Yi Rrokje Guot" 
+    41447 "Yi Rrokje Guox" 
+    41448 "Yi Rrokje Guo" 
+    41449 "Yi Rrokje Guop" 
+    41450 "Yi Rrokje Got" 
+    41451 "Yi Rrokje Gox" 
+    41452 "Yi Rrokje Go" 
+    41453 "Yi Rrokje Gop" 
+    41454 "Yi Rrokje Get" 
+    41455 "Yi Rrokje Gex" 
+    41456 "Yi Rrokje Ge" 
+    41457 "Yi Rrokje Gep" 
+    41458 "Yi Rrokje Gut" 
+    41459 "Yi Rrokje Gux" 
+    41460 "Yi Rrokje Gu" 
+    41461 "Yi Rrokje Gup" 
+    41462 "Yi Rrokje Gurx" 
+    41463 "Yi Rrokje Gur" 
+    41464 "Yi Rrokje Kit" 
+    41465 "Yi Rrokje Kix" 
+    41466 "Yi Rrokje Ki" 
+    41467 "Yi Rrokje Kip" 
+    41468 "Yi Rrokje Kiex" 
+    41469 "Yi Rrokje Kie" 
+    41470 "Yi Rrokje Kiep" 
+    41471 "Yi Rrokje Kat" 
+    41472 "Yi Rrokje Kax" 
+    41473 "Yi Rrokje Ka" 
+    41474 "Yi Rrokje Kap" 
+    41475 "Yi Rrokje Kuox" 
+    41476 "Yi Rrokje Kuo" 
+    41477 "Yi Rrokje Kuop" 
+    41478 "Yi Rrokje Kot" 
+    41479 "Yi Rrokje Kox" 
+    41480 "Yi Rrokje Ko" 
+    41481 "Yi Rrokje Kop" 
+    41482 "Yi Rrokje Ket" 
+    41483 "Yi Rrokje Kex" 
+    41484 "Yi Rrokje Ke" 
+    41485 "Yi Rrokje Kep" 
+    41486 "Yi Rrokje Kut" 
+    41487 "Yi Rrokje Kux" 
+    41488 "Yi Rrokje Ku" 
+    41489 "Yi Rrokje Kup" 
+    41490 "Yi Rrokje Kurx" 
+    41491 "Yi Rrokje Kur" 
+    41492 "Yi Rrokje Ggit" 
+    41493 "Yi Rrokje Ggix" 
+    41494 "Yi Rrokje Ggi" 
+    41495 "Yi Rrokje Ggiex" 
+    41496 "Yi Rrokje Ggie" 
+    41497 "Yi Rrokje Ggiep" 
+    41498 "Yi Rrokje Ggat" 
+    41499 "Yi Rrokje Ggax" 
+    41500 "Yi Rrokje Gga" 
+    41501 "Yi Rrokje Ggap" 
+    41502 "Yi Rrokje Gguot" 
+    41503 "Yi Rrokje Gguox" 
+    41504 "Yi Rrokje Gguo" 
+    41505 "Yi Rrokje Gguop" 
+    41506 "Yi Rrokje Ggot" 
+    41507 "Yi Rrokje Ggox" 
+    41508 "Yi Rrokje Ggo" 
+    41509 "Yi Rrokje Ggop" 
+    41510 "Yi Rrokje Gget" 
+    41511 "Yi Rrokje Ggex" 
+    41512 "Yi Rrokje Gge" 
+    41513 "Yi Rrokje Ggep" 
+    41514 "Yi Rrokje Ggut" 
+    41515 "Yi Rrokje Ggux" 
+    41516 "Yi Rrokje Ggu" 
+    41517 "Yi Rrokje Ggup" 
+    41518 "Yi Rrokje Ggurx" 
+    41519 "Yi Rrokje Ggur" 
+    41520 "Yi Rrokje Mgiex" 
+    41521 "Yi Rrokje Mgie" 
+    41522 "Yi Rrokje Mgat" 
+    41523 "Yi Rrokje Mgax" 
+    41524 "Yi Rrokje Mga" 
+    41525 "Yi Rrokje Mgap" 
+    41526 "Yi Rrokje Mguox" 
+    41527 "Yi Rrokje Mguo" 
+    41528 "Yi Rrokje Mguop" 
+    41529 "Yi Rrokje Mgot" 
+    41530 "Yi Rrokje Mgox" 
+    41531 "Yi Rrokje Mgo" 
+    41532 "Yi Rrokje Mgop" 
+    41533 "Yi Rrokje Mgex" 
+    41534 "Yi Rrokje Mge" 
+    41535 "Yi Rrokje Mgep" 
+    41536 "Yi Rrokje Mgut" 
+    41537 "Yi Rrokje Mgux" 
+    41538 "Yi Rrokje Mgu" 
+    41539 "Yi Rrokje Mgup" 
+    41540 "Yi Rrokje Mgurx" 
+    41541 "Yi Rrokje Mgur" 
+    41542 "Yi Rrokje Hxit" 
+    41543 "Yi Rrokje Hxix" 
+    41544 "Yi Rrokje Hxi" 
+    41545 "Yi Rrokje Hxip" 
+    41546 "Yi Rrokje Hxiet" 
+    41547 "Yi Rrokje Hxiex" 
+    41548 "Yi Rrokje Hxie" 
+    41549 "Yi Rrokje Hxiep" 
+    41550 "Yi Rrokje Hxat" 
+    41551 "Yi Rrokje Hxax" 
+    41552 "Yi Rrokje Hxa" 
+    41553 "Yi Rrokje Hxap" 
+    41554 "Yi Rrokje Hxuot" 
+    41555 "Yi Rrokje Hxuox" 
+    41556 "Yi Rrokje Hxuo" 
+    41557 "Yi Rrokje Hxuop" 
+    41558 "Yi Rrokje Hxot" 
+    41559 "Yi Rrokje Hxox" 
+    41560 "Yi Rrokje Hxo" 
+    41561 "Yi Rrokje Hxop" 
+    41562 "Yi Rrokje Hxex" 
+    41563 "Yi Rrokje Hxe" 
+    41564 "Yi Rrokje Hxep" 
+    41565 "Yi Rrokje Ngiex" 
+    41566 "Yi Rrokje Ngie" 
+    41567 "Yi Rrokje Ngiep" 
+    41568 "Yi Rrokje Ngat" 
+    41569 "Yi Rrokje Ngax" 
+    41570 "Yi Rrokje Nga" 
+    41571 "Yi Rrokje Ngap" 
+    41572 "Yi Rrokje Nguot" 
+    41573 "Yi Rrokje Nguox" 
+    41574 "Yi Rrokje Nguo" 
+    41575 "Yi Rrokje Ngot" 
+    41576 "Yi Rrokje Ngox" 
+    41577 "Yi Rrokje Ngo" 
+    41578 "Yi Rrokje Ngop" 
+    41579 "Yi Rrokje Ngex" 
+    41580 "Yi Rrokje Nge" 
+    41581 "Yi Rrokje Ngep" 
+    41582 "Yi Rrokje Hit" 
+    41583 "Yi Rrokje Hiex" 
+    41584 "Yi Rrokje Hie" 
+    41585 "Yi Rrokje Hat" 
+    41586 "Yi Rrokje Hax" 
+    41587 "Yi Rrokje Ha" 
+    41588 "Yi Rrokje Hap" 
+    41589 "Yi Rrokje Huot" 
+    41590 "Yi Rrokje Huox" 
+    41591 "Yi Rrokje Huo" 
+    41592 "Yi Rrokje Huop" 
+    41593 "Yi Rrokje Hot" 
+    41594 "Yi Rrokje Hox" 
+    41595 "Yi Rrokje Ho" 
+    41596 "Yi Rrokje Hop" 
+    41597 "Yi Rrokje Hex" 
+    41598 "Yi Rrokje He" 
+    41599 "Yi Rrokje Hep" 
+    41600 "Yi Rrokje Wat" 
+    41601 "Yi Rrokje Wax" 
+    41602 "Yi Rrokje Wa" 
+    41603 "Yi Rrokje Wap" 
+    41604 "Yi Rrokje Wuox" 
+    41605 "Yi Rrokje Wuo" 
+    41606 "Yi Rrokje Wuop" 
+    41607 "Yi Rrokje Wox" 
+    41608 "Yi Rrokje Wo" 
+    41609 "Yi Rrokje Wop" 
+    41610 "Yi Rrokje Wex" 
+    41611 "Yi Rrokje We" 
+    41612 "Yi Rrokje Wep" 
+    41613 "Yi Rrokje Zit" 
+    41614 "Yi Rrokje Zix" 
+    41615 "Yi Rrokje Zi" 
+    41616 "Yi Rrokje Zip" 
+    41617 "Yi Rrokje Ziex" 
+    41618 "Yi Rrokje Zie" 
+    41619 "Yi Rrokje Ziep" 
+    41620 "Yi Rrokje Zat" 
+    41621 "Yi Rrokje Zax" 
+    41622 "Yi Rrokje Za" 
+    41623 "Yi Rrokje Zap" 
+    41624 "Yi Rrokje Zuox" 
+    41625 "Yi Rrokje Zuo" 
+    41626 "Yi Rrokje Zuop" 
+    41627 "Yi Rrokje Zot" 
+    41628 "Yi Rrokje Zox" 
+    41629 "Yi Rrokje Zo" 
+    41630 "Yi Rrokje Zop" 
+    41631 "Yi Rrokje Zex" 
+    41632 "Yi Rrokje Ze" 
+    41633 "Yi Rrokje Zep" 
+    41634 "Yi Rrokje Zut" 
+    41635 "Yi Rrokje Zux" 
+    41636 "Yi Rrokje Zu" 
+    41637 "Yi Rrokje Zup" 
+    41638 "Yi Rrokje Zurx" 
+    41639 "Yi Rrokje Zur" 
+    41640 "Yi Rrokje Zyt" 
+    41641 "Yi Rrokje Zyx" 
+    41642 "Yi Rrokje Zy" 
+    41643 "Yi Rrokje Zyp" 
+    41644 "Yi Rrokje Zyrx" 
+    41645 "Yi Rrokje Zyr" 
+    41646 "Yi Rrokje Cit" 
+    41647 "Yi Rrokje Cix" 
+    41648 "Yi Rrokje Ci" 
+    41649 "Yi Rrokje Cip" 
+    41650 "Yi Rrokje Ciet" 
+    41651 "Yi Rrokje Ciex" 
+    41652 "Yi Rrokje Cie" 
+    41653 "Yi Rrokje Ciep" 
+    41654 "Yi Rrokje Cat" 
+    41655 "Yi Rrokje Cax" 
+    41656 "Yi Rrokje Ca" 
+    41657 "Yi Rrokje Cap" 
+    41658 "Yi Rrokje Cuox" 
+    41659 "Yi Rrokje Cuo" 
+    41660 "Yi Rrokje Cuop" 
+    41661 "Yi Rrokje Cot" 
+    41662 "Yi Rrokje Cox" 
+    41663 "Yi Rrokje Co" 
+    41664 "Yi Rrokje Cop" 
+    41665 "Yi Rrokje Cex" 
+    41666 "Yi Rrokje Ce" 
+    41667 "Yi Rrokje Cep" 
+    41668 "Yi Rrokje Cut" 
+    41669 "Yi Rrokje Cux" 
+    41670 "Yi Rrokje Cu" 
+    41671 "Yi Rrokje Cup" 
+    41672 "Yi Rrokje Curx" 
+    41673 "Yi Rrokje Cur" 
+    41674 "Yi Rrokje Cyt" 
+    41675 "Yi Rrokje Cyx" 
+    41676 "Yi Rrokje Cy" 
+    41677 "Yi Rrokje Cyp" 
+    41678 "Yi Rrokje Cyrx" 
+    41679 "Yi Rrokje Cyr" 
+    41680 "Yi Rrokje Zzit" 
+    41681 "Yi Rrokje Zzix" 
+    41682 "Yi Rrokje Zzi" 
+    41683 "Yi Rrokje Zzip" 
+    41684 "Yi Rrokje Zziet" 
+    41685 "Yi Rrokje Zziex" 
+    41686 "Yi Rrokje Zzie" 
+    41687 "Yi Rrokje Zziep" 
+    41688 "Yi Rrokje Zzat" 
+    41689 "Yi Rrokje Zzax" 
+    41690 "Yi Rrokje Zza" 
+    41691 "Yi Rrokje Zzap" 
+    41692 "Yi Rrokje Zzox" 
+    41693 "Yi Rrokje Zzo" 
+    41694 "Yi Rrokje Zzop" 
+    41695 "Yi Rrokje Zzex" 
+    41696 "Yi Rrokje Zze" 
+    41697 "Yi Rrokje Zzep" 
+    41698 "Yi Rrokje Zzux" 
+    41699 "Yi Rrokje Zzu" 
+    41700 "Yi Rrokje Zzup" 
+    41701 "Yi Rrokje Zzurx" 
+    41702 "Yi Rrokje Zzur" 
+    41703 "Yi Rrokje Zzyt" 
+    41704 "Yi Rrokje Zzyx" 
+    41705 "Yi Rrokje Zzy" 
+    41706 "Yi Rrokje Zzyp" 
+    41707 "Yi Rrokje Zzyrx" 
+    41708 "Yi Rrokje Zzyr" 
+    41709 "Yi Rrokje Nzit" 
+    41710 "Yi Rrokje Nzix" 
+    41711 "Yi Rrokje Nzi" 
+    41712 "Yi Rrokje Nzip" 
+    41713 "Yi Rrokje Nziex" 
+    41714 "Yi Rrokje Nzie" 
+    41715 "Yi Rrokje Nziep" 
+    41716 "Yi Rrokje Nzat" 
+    41717 "Yi Rrokje Nzax" 
+    41718 "Yi Rrokje Nza" 
+    41719 "Yi Rrokje Nzap" 
+    41720 "Yi Rrokje Nzuox" 
+    41721 "Yi Rrokje Nzuo" 
+    41722 "Yi Rrokje Nzox" 
+    41723 "Yi Rrokje Nzop" 
+    41724 "Yi Rrokje Nzex" 
+    41725 "Yi Rrokje Nze" 
+    41726 "Yi Rrokje Nzux" 
+    41727 "Yi Rrokje Nzu" 
+    41728 "Yi Rrokje Nzup" 
+    41729 "Yi Rrokje Nzurx" 
+    41730 "Yi Rrokje Nzur" 
+    41731 "Yi Rrokje Nzyt" 
+    41732 "Yi Rrokje Nzyx" 
+    41733 "Yi Rrokje Nzy" 
+    41734 "Yi Rrokje Nzyp" 
+    41735 "Yi Rrokje Nzyrx" 
+    41736 "Yi Rrokje Nzyr" 
+    41737 "Yi Rrokje Sit" 
+    41738 "Yi Rrokje GjashtÃ«" 
+    41739 "Yi Rrokje Si" 
+    41740 "Yi Rrokje Sip" 
+    41741 "Yi Rrokje Siex" 
+    41742 "Yi Rrokje Sie" 
+    41743 "Yi Rrokje Siep" 
+    41744 "Yi Rrokje Sat" 
+    41745 "Yi Rrokje Sax" 
+    41746 "Yi Rrokje Sa" 
+    41747 "Yi Rrokje Sap" 
+    41748 "Yi Rrokje Suox" 
+    41749 "Yi Rrokje Suo" 
+    41750 "Yi Rrokje Suop" 
+    41751 "Yi Rrokje Sot" 
+    41752 "Yi Rrokje Sox" 
+    41753 "Yi Rrokje So" 
+    41754 "Yi Rrokje Sop" 
+    41755 "Yi Rrokje Sex" 
+    41756 "Yi Rrokje Se" 
+    41757 "Yi Rrokje Sep" 
+    41758 "Yi Rrokje Sut" 
+    41759 "Yi Rrokje Sux" 
+    41760 "Yi Rrokje Su" 
+    41761 "Yi Rrokje Sup" 
+    41762 "Yi Rrokje Surx" 
+    41763 "Yi Rrokje Sur" 
+    41764 "Yi Rrokje Syt" 
+    41765 "Yi Rrokje Syx" 
+    41766 "Yi Rrokje Sy" 
+    41767 "Yi Rrokje Syp" 
+    41768 "Yi Rrokje Syrx" 
+    41769 "Yi Rrokje Syr" 
+    41770 "Yi Rrokje Ssit" 
+    41771 "Yi Rrokje Ssix" 
+    41772 "Yi Rrokje Ssi" 
+    41773 "Yi Rrokje Ssip" 
+    41774 "Yi Rrokje Ssiex" 
+    41775 "Yi Rrokje Ssie" 
+    41776 "Yi Rrokje Ssiep" 
+    41777 "Yi Rrokje Ssat" 
+    41778 "Yi Rrokje Ssax" 
+    41779 "Yi Rrokje Ssa" 
+    41780 "Yi Rrokje Ssap" 
+    41781 "Yi Rrokje Ssot" 
+    41782 "Yi Rrokje Ssox" 
+    41783 "Yi Rrokje Sso" 
+    41784 "Yi Rrokje Ssop" 
+    41785 "Yi Rrokje Ssex" 
+    41786 "Yi Rrokje Sse" 
+    41787 "Yi Rrokje Ssep" 
+    41788 "Yi Rrokje Ssut" 
+    41789 "Yi Rrokje Ssux" 
+    41790 "Yi Rrokje Ssu" 
+    41791 "Yi Rrokje Ssup" 
+    41792 "Yi Rrokje Ssyt" 
+    41793 "Yi Rrokje Ssyx" 
+    41794 "Yi Rrokje Ssy" 
+    41795 "Yi Rrokje Ssyp" 
+    41796 "Yi Rrokje Ssyrx" 
+    41797 "Yi Rrokje Ssyr" 
+    41798 "Yi Rrokje Zhat" 
+    41799 "Yi Rrokje Zhax" 
+    41800 "Yi Rrokje Zha" 
+    41801 "Yi Rrokje Zhap" 
+    41802 "Yi Rrokje Zhuox" 
+    41803 "Yi Rrokje Zhuo" 
+    41804 "Yi Rrokje Zhuop" 
+    41805 "Yi Rrokje Zhot" 
+    41806 "Yi Rrokje Zhox" 
+    41807 "Yi Rrokje Zho" 
+    41808 "Yi Rrokje Zhop" 
+    41809 "Yi Rrokje Zhet" 
+    41810 "Yi Rrokje Zhex" 
+    41811 "Yi Rrokje Zhe" 
+    41812 "Yi Rrokje Zhep" 
+    41813 "Yi Rrokje Zhut" 
+    41814 "Yi Rrokje Zhux" 
+    41815 "Yi Rrokje Zhu" 
+    41816 "Yi Rrokje Zhup" 
+    41817 "Yi Rrokje Zhurx" 
+    41818 "Yi Rrokje Zhur" 
+    41819 "Yi Rrokje Zhyt" 
+    41820 "Yi Rrokje Zhyx" 
+    41821 "Yi Rrokje Zhy" 
+    41822 "Yi Rrokje Zhyp" 
+    41823 "Yi Rrokje Zhyrx" 
+    41824 "Yi Rrokje Zhyr" 
+    41825 "Yi Rrokje Chat" 
+    41826 "Yi Rrokje Chax" 
+    41827 "Yi Rrokje Cha" 
+    41828 "Yi Rrokje Chap" 
+    41829 "Yi Rrokje Chuot" 
+    41830 "Yi Rrokje Chuox" 
+    41831 "Yi Rrokje Chuo" 
+    41832 "Yi Rrokje Chuop" 
+    41833 "Yi Rrokje Chot" 
+    41834 "Yi Rrokje Chox" 
+    41835 "Yi Rrokje Cho" 
+    41836 "Yi Rrokje Chop" 
+    41837 "Yi Rrokje Chet" 
+    41838 "Yi Rrokje Chex" 
+    41839 "Yi Rrokje Che" 
+    41840 "Yi Rrokje Chep" 
+    41841 "Yi Rrokje Chux" 
+    41842 "Yi Rrokje Chu" 
+    41843 "Yi Rrokje Chup" 
+    41844 "Yi Rrokje Churx" 
+    41845 "Yi Rrokje Chur" 
+    41846 "Yi Rrokje Chyt" 
+    41847 "Yi Rrokje Chyx" 
+    41848 "Yi Rrokje Chy" 
+    41849 "Yi Rrokje Chyp" 
+    41850 "Yi Rrokje Chyrx" 
+    41851 "Yi Rrokje Chyr" 
+    41852 "Yi Rrokje Rrax" 
+    41853 "Yi Rrokje Rra" 
+    41854 "Yi Rrokje Rruox" 
+    41855 "Yi Rrokje Rruo" 
+    41856 "Yi Rrokje Rrot" 
+    41857 "Yi Rrokje Rrox" 
+    41858 "Yi Rrokje Rro" 
+    41859 "Yi Rrokje Rrop" 
+    41860 "Yi Rrokje Rret" 
+    41861 "Yi Rrokje Rrex" 
+    41862 "Yi Rrokje Rre" 
+    41863 "Yi Rrokje Rrep" 
+    41864 "Yi Rrokje Rrut" 
+    41865 "Yi Rrokje Rrux" 
+    41866 "Yi Rrokje Rru" 
+    41867 "Yi Rrokje Rrup" 
+    41868 "Yi Rrokje Rrurx" 
+    41869 "Yi Rrokje Rrur" 
+    41870 "Yi Rrokje Rryt" 
+    41871 "Yi Rrokje Rryx" 
+    41872 "Yi Rrokje Rry" 
+    41873 "Yi Rrokje Rryp" 
+    41874 "Yi Rrokje Rryrx" 
+    41875 "Yi Rrokje Rryr" 
+    41876 "Yi Rrokje Nrat" 
+    41877 "Yi Rrokje Nrax" 
+    41878 "Yi Rrokje Nra" 
+    41879 "Yi Rrokje Nrap" 
+    41880 "Yi Rrokje Nrox" 
+    41881 "Yi Rrokje Nro" 
+    41882 "Yi Rrokje Nrop" 
+    41883 "Yi Rrokje Nret" 
+    41884 "Yi Rrokje Nrex" 
+    41885 "Yi Rrokje Nre" 
+    41886 "Yi Rrokje Nrep" 
+    41887 "Yi Rrokje Nrut" 
+    41888 "Yi Rrokje Nrux" 
+    41889 "Yi Rrokje Nru" 
+    41890 "Yi Rrokje Nrup" 
+    41891 "Yi Rrokje Nrurx" 
+    41892 "Yi Rrokje Nrur" 
+    41893 "Yi Rrokje Nryt" 
+    41894 "Yi Rrokje Nryx" 
+    41895 "Yi Rrokje Nry" 
+    41896 "Yi Rrokje Nryp" 
+    41897 "Yi Rrokje Nryrx" 
+    41898 "Yi Rrokje Nryr" 
+    41899 "Yi Rrokje Shat" 
+    41900 "Yi Rrokje Shax" 
+    41901 "Yi Rrokje Sha" 
+    41902 "Yi Rrokje Shap" 
+    41903 "Yi Rrokje Shuox" 
+    41904 "Yi Rrokje Shuo" 
+    41905 "Yi Rrokje Shuop" 
+    41906 "Yi Rrokje Shot" 
+    41907 "Yi Rrokje Shox" 
+    41908 "Yi Rrokje Sho" 
+    41909 "Yi Rrokje Shop" 
+    41910 "Yi Rrokje Shet" 
+    41911 "Yi Rrokje Shex" 
+    41912 "Yi Rrokje She" 
+    41913 "Yi Rrokje Shep" 
+    41914 "Yi Rrokje Shut" 
+    41915 "Yi Rrokje Shux" 
+    41916 "Yi Rrokje Shu" 
+    41917 "Yi Rrokje Shup" 
+    41918 "Yi Rrokje Shurx" 
+    41919 "Yi Rrokje Shur" 
+    41920 "Yi Rrokje Shyt" 
+    41921 "Yi Rrokje Shyx" 
+    41922 "Yi Rrokje Shy" 
+    41923 "Yi Rrokje Shyp" 
+    41924 "Yi Rrokje Shyrx" 
+    41925 "Yi Rrokje Shyr" 
+    41926 "Yi Rrokje Rat" 
+    41927 "Yi Rrokje Rax" 
+    41928 "Yi Rrokje Ra" 
+    41929 "Yi Rrokje Rap" 
+    41930 "Yi Rrokje Ruox" 
+    41931 "Yi Rrokje Ruo" 
+    41932 "Yi Rrokje Ruop" 
+    41933 "Yi Rrokje Rot" 
+    41934 "Yi Rrokje Rox" 
+    41935 "Yi Rrokje Ro" 
+    41936 "Yi Rrokje Rop" 
+    41937 "Yi Rrokje Rex" 
+    41938 "Yi Rrokje Re" 
+    41939 "Yi Rrokje Rep" 
+    41940 "Yi Rrokje Rut" 
+    41941 "Yi Rrokje Rux" 
+    41942 "Yi Rrokje Ru" 
+    41943 "Yi Rrokje Rup" 
+    41944 "Yi Rrokje Rurx" 
+    41945 "Yi Rrokje Rur" 
+    41946 "Yi Rrokje Ryt" 
+    41947 "Yi Rrokje Ryx" 
+    41948 "Yi Rrokje Ry" 
+    41949 "Yi Rrokje Ryp" 
+    41950 "Yi Rrokje Ryrx" 
+    41951 "Yi Rrokje Ryr" 
+    41952 "Yi Rrokje Jit" 
+    41953 "Yi Rrokje Jix" 
+    41954 "Yi Rrokje Ji" 
+    41955 "Yi Rrokje Jip" 
+    41956 "Yi Rrokje Jiet" 
+    41957 "Yi Rrokje Jiex" 
+    41958 "Yi Rrokje Jie" 
+    41959 "Yi Rrokje Jiep" 
+    41960 "Yi Rrokje Juot" 
+    41961 "Yi Rrokje Juox" 
+    41962 "Yi Rrokje Juo" 
+    41963 "Yi Rrokje Juop" 
+    41964 "Yi Rrokje Jot" 
+    41965 "Yi Rrokje Jox" 
+    41966 "Yi Rrokje Jo" 
+    41967 "Yi Rrokje Jop" 
+    41968 "Yi Rrokje Jut" 
+    41969 "Yi Rrokje Jux" 
+    41970 "Yi Rrokje Ju" 
+    41971 "Yi Rrokje Jup" 
+    41972 "Yi Rrokje Jurx" 
+    41973 "Yi Rrokje Jur" 
+    41974 "Yi Rrokje Jyt" 
+    41975 "Yi Rrokje Jyx" 
+    41976 "Yi Rrokje Jy" 
+    41977 "Yi Rrokje Jyp" 
+    41978 "Yi Rrokje Jyrx" 
+    41979 "Yi Rrokje Jyr" 
+    41980 "Yi Rrokje Qit" 
+    41981 "Yi Rrokje Qix" 
+    41982 "Yi Rrokje Qi" 
+    41983 "Yi Rrokje Qip" 
+    41984 "Yi Rrokje Qiet" 
+    41985 "Yi Rrokje Qiex" 
+    41986 "Yi Rrokje Qie" 
+    41987 "Yi Rrokje Qiep" 
+    41988 "Yi Rrokje Quot" 
+    41989 "Yi Rrokje Quox" 
+    41990 "Yi Rrokje Quo" 
+    41991 "Yi Rrokje Quop" 
+    41992 "Yi Rrokje Qot" 
+    41993 "Yi Rrokje Qox" 
+    41994 "Yi Rrokje Qo" 
+    41995 "Yi Rrokje Qop" 
+    41996 "Yi Rrokje Qut" 
+    41997 "Yi Rrokje Qux" 
+    41998 "Yi Rrokje Qu" 
+    41999 "Yi Rrokje Qup" 
+    42000 "Yi Rrokje Qurx" 
+    42001 "Yi Rrokje Qur" 
+    42002 "Yi Rrokje Qyt" 
+    42003 "Yi Rrokje Qyx" 
+    42004 "Yi Rrokje Qy" 
+    42005 "Yi Rrokje Qyp" 
+    42006 "Yi Rrokje Qyrx" 
+    42007 "Yi Rrokje Qyr" 
+    42008 "Yi Rrokje Jjit" 
+    42009 "Yi Rrokje Jjix" 
+    42010 "Yi Rrokje Jji" 
+    42011 "Yi Rrokje Jjip" 
+    42012 "Yi Rrokje Jjiet" 
+    42013 "Yi Rrokje Jjiex" 
+    42014 "Yi Rrokje Jjie" 
+    42015 "Yi Rrokje Jjiep" 
+    42016 "Yi Rrokje Jjuox" 
+    42017 "Yi Rrokje Jjuo" 
+    42018 "Yi Rrokje Jjuop" 
+    42019 "Yi Rrokje Jjot" 
+    42020 "Yi Rrokje Jjox" 
+    42021 "Yi Rrokje Jjo" 
+    42022 "Yi Rrokje Jjop" 
+    42023 "Yi Rrokje Jjut" 
+    42024 "Yi Rrokje Jjux" 
+    42025 "Yi Rrokje Jju" 
+    42026 "Yi Rrokje Jjup" 
+    42027 "Yi Rrokje Jjurx" 
+    42028 "Yi Rrokje Jjur" 
+    42029 "Yi Rrokje Jjyt" 
+    42030 "Yi Rrokje Jjyx" 
+    42031 "Yi Rrokje Jjy" 
+    42032 "Yi Rrokje Jjyp" 
+    42033 "Yi Rrokje Njit" 
+    42034 "Yi Rrokje Njix" 
+    42035 "Yi Rrokje Nji" 
+    42036 "Yi Rrokje Njip" 
+    42037 "Yi Rrokje Njiet" 
+    42038 "Yi Rrokje Njiex" 
+    42039 "Yi Rrokje Njie" 
+    42040 "Yi Rrokje Njiep" 
+    42041 "Yi Rrokje Njuox" 
+    42042 "Yi Rrokje Njuo" 
+    42043 "Yi Rrokje Njot" 
+    42044 "Yi Rrokje Njox" 
+    42045 "Yi Rrokje Njo" 
+    42046 "Yi Rrokje Njop" 
+    42047 "Yi Rrokje Njux" 
+    42048 "Yi Rrokje Nju" 
+    42049 "Yi Rrokje Njup" 
+    42050 "Yi Rrokje Njurx" 
+    42051 "Yi Rrokje Njur" 
+    42052 "Yi Rrokje Njyt" 
+    42053 "Yi Rrokje Njyx" 
+    42054 "Yi Rrokje Njy" 
+    42055 "Yi Rrokje Njyp" 
+    42056 "Yi Rrokje Njyrx" 
+    42057 "Yi Rrokje Njyr" 
+    42058 "Yi Rrokje Nyit" 
+    42059 "Yi Rrokje Nyix" 
+    42060 "Yi Rrokje Nyi" 
+    42061 "Yi Rrokje Nyip" 
+    42062 "Yi Rrokje Nyiet" 
+    42063 "Yi Rrokje Nyiex" 
+    42064 "Yi Rrokje Nyie" 
+    42065 "Yi Rrokje Nyiep" 
+    42066 "Yi Rrokje Nyuox" 
+    42067 "Yi Rrokje Nyuo" 
+    42068 "Yi Rrokje Nyuop" 
+    42069 "Yi Rrokje Nyot" 
+    42070 "Yi Rrokje Nyox" 
+    42071 "Yi Rrokje Nyo" 
+    42072 "Yi Rrokje Nyop" 
+    42073 "Yi Rrokje Nyut" 
+    42074 "Yi Rrokje Nyux" 
+    42075 "Yi Rrokje Nyu" 
+    42076 "Yi Rrokje Nyup" 
+    42077 "Yi Rrokje Xit" 
+    42078 "Yi Rrokje Xix" 
+    42079 "Yi Rrokje Xi" 
+    42080 "Yi Rrokje Xip" 
+    42081 "Yi Rrokje Xiet" 
+    42082 "Yi Rrokje Xiex" 
+    42083 "Yi Rrokje Xie" 
+    42084 "Yi Rrokje Xiep" 
+    42085 "Yi Rrokje Xuox" 
+    42086 "Yi Rrokje Xuo" 
+    42087 "Yi Rrokje Xot" 
+    42088 "Yi Rrokje Xox" 
+    42089 "Yi Rrokje Xo" 
+    42090 "Yi Rrokje Xop" 
+    42091 "Yi Rrokje Xyt" 
+    42092 "Yi Rrokje Xyx" 
+    42093 "Yi Rrokje Xy" 
+    42094 "Yi Rrokje Xyp" 
+    42095 "Yi Rrokje Xyrx" 
+    42096 "Yi Rrokje Xyr" 
+    42097 "Yi Rrokje Yit" 
+    42098 "Yi Rrokje Yix" 
+    42099 "Yi Rrokje Yi" 
+    42100 "Yi Rrokje Yip" 
+    42101 "Yi Rrokje Yiet" 
+    42102 "Yi Rrokje Yiex" 
+    42103 "Yi Rrokje Yie" 
+    42104 "Yi Rrokje Yiep" 
+    42105 "Yi Rrokje Yuot" 
+    42106 "Yi Rrokje Yuox" 
+    42107 "Yi Rrokje Yuo" 
+    42108 "Yi Rrokje Yuop" 
+    42109 "Yi Rrokje Yot" 
+    42110 "Yi Rrokje Yox" 
+    42111 "Yi Rrokje Yo" 
+    42112 "Yi Rrokje Yop" 
+    42113 "Yi Rrokje Yut" 
+    42114 "Yi Rrokje Yux" 
+    42115 "Yi Rrokje Yu" 
+    42116 "Yi Rrokje Yup" 
+    42117 "Yi Rrokje Yurx" 
+    42118 "Yi Rrokje Yur" 
+    42119 "Yi Rrokje Yyt" 
+    42120 "Yi Rrokje Yyx" 
+    42121 "Yi Rrokje Yy" 
+    42122 "Yi Rrokje Yyp" 
+    42123 "Yi Rrokje Yyrx" 
+    42124 "Yi Rrokje Yyr" 
+    42128 "Yi Radikal Qot" 
+    42129 "Yi Radikal Li" 
+    42130 "Yi Radikal Kit" 
+    42131 "Yi Radikal Nyip" 
+    42132 "Yi Radikal Cyp" 
+    42133 "Yi Radikal Ssi" 
+    42134 "Yi Radikal Ggop" 
+    42135 "Yi Radikal Gep" 
+    42136 "Yi Radikal Mi" 
+    42137 "Yi Radikal Hxit" 
+    42138 "Yi Radikal Lyr" 
+    42139 "Yi Radikal Bbut" 
+    42140 "Yi Radikal Mop" 
+    42141 "Yi Radikal Yo" 
+    42142 "Yi Radikal Put" 
+    42143 "Yi Radikal Hxuo" 
+    42144 "Yi Radikal Tat" 
+    42145 "Yi Radikal Ga" 
+    42146 "Yi Radikal Zup" 
+    42147 "Yi Radikal Cyt" 
+    42148 "Yi Radikal Ddur" 
+    42149 "Yi Radikal Bur" 
+    42150 "Yi Radikal Gguo" 
+    42151 "Yi Radikal Nyop" 
+    42152 "Yi Radikal Tu" 
+    42153 "Yi Radikal Op" 
+    42154 "Yi Radikal Jjut" 
+    42155 "Yi Radikal Zot" 
+    42156 "Yi Radikal Pyt" 
+    42157 "Yi Radikal Hmo" 
+    42158 "Yi Radikal Yit" 
+    42159 "Yi Radikal Vur" 
+    42160 "Yi Radikal Shy" 
+    42161 "Yi Radikal Vep" 
+    42162 "Yi Radikal Za" 
+    42163 "Yi Radikal Jo" 
+    42164 "Yi Radikal Nzup" 
+    42165 "Yi Radikal Jjy" 
+    42166 "Yi Radikal Got" 
+    42167 "Yi Radikal Jjie" 
+    42168 "Yi Radikal Wo" 
+    42169 "Yi Radikal Du" 
+    42170 "Yi Radikal Shur" 
+    42171 "Yi Radikal Lie" 
+    42172 "Yi Radikal Cy" 
+    42173 "Yi Radikal Cuop" 
+    42174 "Yi Radikal Cip" 
+    42175 "Yi Radikal Hxop" 
+    42176 "Yi Radikal Shat" 
+    42177 "Yi Radikal Zur" 
+    42178 "Yi Radikal Shop" 
+    42179 "Yi Radikal Che" 
+    42180 "Yi Radikal Zziet" 
+    42181 "Yi Radikal Nbie" 
+    42182 "Yi Radikal Ke" 
+    42192 "Lisu ShkronjÃ« Ba" 
+    42193 "Lisu ShkronjÃ« Pa" 
+    42194 "Lisu ShkronjÃ« Pha" 
+    42195 "Lisu ShkronjÃ« Da" 
+    42196 "Lisu ShkronjÃ« Ta" 
+    42197 "Lisu ShkronjÃ« Tha" 
+    42198 "Lisu ShkronjÃ« Ga" 
+    42199 "Lisu ShkronjÃ« Ka" 
+    42200 "Lisu ShkronjÃ« Kha" 
+    42201 "Lisu ShkronjÃ« Ja" 
+    42202 "Lisu ShkronjÃ« Ca" 
+    42203 "Lisu ShkronjÃ« Cha" 
+    42204 "Lisu ShkronjÃ« Dza" 
+    42205 "Lisu ShkronjÃ« Tsa" 
+    42206 "Lisu ShkronjÃ« Tsha" 
+    42207 "Lisu ShkronjÃ« Ma" 
+    42208 "Lisu ShkronjÃ« Na" 
+    42209 "Lisu ShkronjÃ« La" 
+    42210 "Lisu ShkronjÃ« Sa" 
+    42211 "Lisu ShkronjÃ« Zha" 
+    42212 "Lisu ShkronjÃ« Za" 
+    42213 "Lisu ShkronjÃ« Nga" 
+    42214 "Lisu ShkronjÃ« Ha" 
+    42215 "Lisu ShkronjÃ« Xa" 
+    42216 "Lisu ShkronjÃ« Hha" 
+    42217 "Lisu ShkronjÃ« Fa" 
+    42218 "Lisu ShkronjÃ« Wa" 
+    42219 "Lisu ShkronjÃ« Sha" 
+    42220 "Lisu ShkronjÃ« Ya" 
+    42221 "Lisu ShkronjÃ« Gha" 
+    42222 "Lisu ShkronjÃ« A" 
+    42223 "Lisu ShkronjÃ« Ae" 
+    42224 "Lisu ShkronjÃ« E" 
+    42225 "Lisu ShkronjÃ« Eu" 
+    42226 "Lisu ShkronjÃ« I" 
+    42227 "Lisu ShkronjÃ« O" 
+    42228 "Lisu ShkronjÃ« U" 
+    42229 "Lisu ShkronjÃ« Ue" 
+    42230 "Lisu ShkronjÃ« Uh" 
+    42231 "Lisu ShkronjÃ« Oe" 
+    42232 "Lisu ShkronjÃ« Tone Mya Ti" 
+    42233 "Lisu ShkronjÃ« Tone Na Po" 
+    42234 "Lisu ShkronjÃ« Tone Mya Cya" 
+    42235 "Lisu ShkronjÃ« Tone Mya Bo" 
+    42236 "Lisu ShkronjÃ« Tone Mya Na" 
+    42237 "Lisu ShkronjÃ« Tone Mya Jeu" 
+    42238 "Lisu PikÃ«sim Presje" 
+    42239 "Lisu PikÃ«sim PikÃ«" 
+    42240 "Vai Rrokje Ee" 
+    42241 "Vai Rrokje Een" 
+    42242 "Vai Rrokje Hee" 
+    42243 "Vai Rrokje Wee" 
+    42244 "Vai Rrokje Ween" 
+    42245 "Vai Rrokje Pee" 
+    42246 "Vai Rrokje Bhee" 
+    42247 "Vai Rrokje Bee" 
+    42248 "Vai Rrokje Mbee" 
+    42249 "Vai Rrokje Kpee" 
+    42250 "Vai Rrokje Mgbee" 
+    42251 "Vai Rrokje Gbee" 
+    42252 "Vai Rrokje Fee" 
+    42253 "Vai Rrokje Vee" 
+    42254 "Vai Rrokje Tee" 
+    42255 "Vai Rrokje Thee" 
+    42256 "Vai Rrokje Dhee" 
+    42257 "Vai Rrokje Dhhee" 
+    42258 "Vai Rrokje Lee" 
+    42259 "Vai Rrokje Ree" 
+    42260 "Vai Rrokje Dee" 
+    42261 "Vai Rrokje Ndee" 
+    42262 "Vai Rrokje See" 
+    42263 "Vai Rrokje Shee" 
+    42264 "Vai Rrokje Zee" 
+    42265 "Vai Rrokje Zhee" 
+    42266 "Vai Rrokje Cee" 
+    42267 "Vai Rrokje Jee" 
+    42268 "Vai Rrokje Njee" 
+    42269 "Vai Rrokje Yee" 
+    42270 "Vai Rrokje Kee" 
+    42271 "Vai Rrokje Nggee" 
+    42272 "Vai Rrokje Gee" 
+    42273 "Vai Rrokje Mee" 
+    42274 "Vai Rrokje Nee" 
+    42275 "Vai Rrokje Nyee" 
+    42276 "Vai Rrokje I" 
+    42277 "Vai Rrokje In" 
+    42278 "Vai Rrokje Hi" 
+    42279 "Vai Rrokje Hin" 
+    42280 "Vai Rrokje Wi" 
+    42281 "Vai Rrokje Win" 
+    42282 "Vai Rrokje Pi" 
+    42283 "Vai Rrokje Bhi" 
+    42284 "Vai Rrokje Bi" 
+    42285 "Vai Rrokje Mbi" 
+    42286 "Vai Rrokje Kpi" 
+    42287 "Vai Rrokje Mgbi" 
+    42288 "Vai Rrokje Gbi" 
+    42289 "Vai Rrokje Fi" 
+    42290 "Vai Rrokje Vi" 
+    42291 "Vai Rrokje Ti" 
+    42292 "Vai Rrokje Thi" 
+    42293 "Vai Rrokje Dhi" 
+    42294 "Vai Rrokje Dhhi" 
+    42295 "Vai Rrokje Li" 
+    42296 "Vai Rrokje Ri" 
+    42297 "Vai Rrokje Di" 
+    42298 "Vai Rrokje Ndi" 
+    42299 "Vai Rrokje Si" 
+    42300 "Vai Rrokje Shi" 
+    42301 "Vai Rrokje Zi" 
+    42302 "Vai Rrokje Zhi" 
+    42303 "Vai Rrokje Ci" 
+    42304 "Vai Rrokje Ji" 
+    42305 "Vai Rrokje Nji" 
+    42306 "Vai Rrokje Yi" 
+    42307 "Vai Rrokje Ki" 
+    42308 "Vai Rrokje Nggi" 
+    42309 "Vai Rrokje Gi" 
+    42310 "Vai Rrokje Mi" 
+    42311 "Vai Rrokje Ni" 
+    42312 "Vai Rrokje Nyi" 
+    42313 "Vai Rrokje A" 
+    42314 "Vai Rrokje An" 
+    42315 "Vai Rrokje Ngan" 
+    42316 "Vai Rrokje Ha" 
+    42317 "Vai Rrokje Han" 
+    42318 "Vai Rrokje Wa" 
+    42319 "Vai Rrokje Wan" 
+    42320 "Vai Rrokje Pa" 
+    42321 "Vai Rrokje Bha" 
+    42322 "Vai Rrokje Ba" 
+    42323 "Vai Rrokje Mba" 
+    42324 "Vai Rrokje Kpa" 
+    42325 "Vai Rrokje Kpan" 
+    42326 "Vai Rrokje Mgba" 
+    42327 "Vai Rrokje Gba" 
+    42328 "Vai Rrokje Fa" 
+    42329 "Vai Rrokje Va" 
+    42330 "Vai Rrokje Ta" 
+    42331 "Vai Rrokje Tha" 
+    42332 "Vai Rrokje Dha" 
+    42333 "Vai Rrokje Dhha" 
+    42334 "Vai Rrokje La" 
+    42335 "Vai Rrokje Ra" 
+    42336 "Vai Rrokje Da" 
+    42337 "Vai Rrokje Nda" 
+    42338 "Vai Rrokje Sa" 
+    42339 "Vai Rrokje Sha" 
+    42340 "Vai Rrokje Za" 
+    42341 "Vai Rrokje Zha" 
+    42342 "Vai Rrokje Ca" 
+    42343 "Vai Rrokje Ja" 
+    42344 "Vai Rrokje Nja" 
+    42345 "Vai Rrokje Ya" 
+    42346 "Vai Rrokje Ka" 
+    42347 "Vai Rrokje Kan" 
+    42348 "Vai Rrokje Ngga" 
+    42349 "Vai Rrokje Ga" 
+    42350 "Vai Rrokje Ma" 
+    42351 "Vai Rrokje Na" 
+    42352 "Vai Rrokje Nya" 
+    42353 "Vai Rrokje Oo" 
+    42354 "Vai Rrokje Oon" 
+    42355 "Vai Rrokje Hoo" 
+    42356 "Vai Rrokje Woo" 
+    42357 "Vai Rrokje Woon" 
+    42358 "Vai Rrokje Poo" 
+    42359 "Vai Rrokje Bhoo" 
+    42360 "Vai Rrokje Boo" 
+    42361 "Vai Rrokje Mboo" 
+    42362 "Vai Rrokje Kpoo" 
+    42363 "Vai Rrokje Mgboo" 
+    42364 "Vai Rrokje Gboo" 
+    42365 "Vai Rrokje Foo" 
+    42366 "Vai Rrokje Voo" 
+    42367 "Vai Rrokje Too" 
+    42368 "Vai Rrokje Thoo" 
+    42369 "Vai Rrokje Dhoo" 
+    42370 "Vai Rrokje Dhhoo" 
+    42371 "Vai Rrokje Loo" 
+    42372 "Vai Rrokje Roo" 
+    42373 "Vai Rrokje Doo" 
+    42374 "Vai Rrokje Ndoo" 
+    42375 "Vai Rrokje Soo" 
+    42376 "Vai Rrokje Shoo" 
+    42377 "Vai Rrokje Zoo" 
+    42378 "Vai Rrokje Zhoo" 
+    42379 "Vai Rrokje Coo" 
+    42380 "Vai Rrokje Joo" 
+    42381 "Vai Rrokje Njoo" 
+    42382 "Vai Rrokje Yoo" 
+    42383 "Vai Rrokje Koo" 
+    42384 "Vai Rrokje Nggoo" 
+    42385 "Vai Rrokje Goo" 
+    42386 "Vai Rrokje Moo" 
+    42387 "Vai Rrokje Noo" 
+    42388 "Vai Rrokje Nyoo" 
+    42389 "Vai Rrokje U" 
+    42390 "Vai Rrokje Un" 
+    42391 "Vai Rrokje Hu" 
+    42392 "Vai Rrokje Hun" 
+    42393 "Vai Rrokje Wu" 
+    42394 "Vai Rrokje Wun" 
+    42395 "Vai Rrokje Pu" 
+    42396 "Vai Rrokje Bhu" 
+    42397 "Vai Rrokje Bu" 
+    42398 "Vai Rrokje Mbu" 
+    42399 "Vai Rrokje Kpu" 
+    42400 "Vai Rrokje Mgbu" 
+    42401 "Vai Rrokje Gbu" 
+    42402 "Vai Rrokje Fu" 
+    42403 "Vai Rrokje Vu" 
+    42404 "Vai Rrokje Tu" 
+    42405 "Vai Rrokje Thu" 
+    42406 "Vai Rrokje Dhu" 
+    42407 "Vai Rrokje Dhhu" 
+    42408 "Vai Rrokje Lu" 
+    42409 "Vai Rrokje Ru" 
+    42410 "Vai Rrokje Du" 
+    42411 "Vai Rrokje Ndu" 
+    42412 "Vai Rrokje Su" 
+    42413 "Vai Rrokje Shu" 
+    42414 "Vai Rrokje Zu" 
+    42415 "Vai Rrokje Zhu" 
+    42416 "Vai Rrokje Cu" 
+    42417 "Vai Rrokje Ju" 
+    42418 "Vai Rrokje Nju" 
+    42419 "Vai Rrokje Yu" 
+    42420 "Vai Rrokje Ku" 
+    42421 "Vai Rrokje Nggu" 
+    42422 "Vai Rrokje Gu" 
+    42423 "Vai Rrokje Mu" 
+    42424 "Vai Rrokje Nu" 
+    42425 "Vai Rrokje Nyu" 
+    42426 "Vai Rrokje O" 
+    42427 "Vai Rrokje On" 
+    42428 "Vai Rrokje Ngon" 
+    42429 "Vai Rrokje Ho" 
+    42430 "Vai Rrokje Hon" 
+    42431 "Vai Rrokje Wo" 
+    42432 "Vai Rrokje Won" 
+    42433 "Vai Rrokje Po" 
+    42434 "Vai Rrokje Bho" 
+    42435 "Vai Rrokje Bo" 
+    42436 "Vai Rrokje Mbo" 
+    42437 "Vai Rrokje Kpo" 
+    42438 "Vai Rrokje Mgbo" 
+    42439 "Vai Rrokje Gbo" 
+    42440 "Vai Rrokje Gbon" 
+    42441 "Vai Rrokje Fo" 
+    42442 "Vai Rrokje Vo" 
+    42443 "Vai Rrokje To" 
+    42444 "Vai Rrokje Tho" 
+    42445 "Vai Rrokje Dho" 
+    42446 "Vai Rrokje Dhho" 
+    42447 "Vai Rrokje Lo" 
+    42448 "Vai Rrokje Ro" 
+    42449 "Vai Rrokje Do" 
+    42450 "Vai Rrokje Ndo" 
+    42451 "Vai Rrokje So" 
+    42452 "Vai Rrokje Sho" 
+    42453 "Vai Rrokje Zo" 
+    42454 "Vai Rrokje Zho" 
+    42455 "Vai Rrokje Co" 
+    42456 "Vai Rrokje Jo" 
+    42457 "Vai Rrokje Njo" 
+    42458 "Vai Rrokje Yo" 
+    42459 "Vai Rrokje Ko" 
+    42460 "Vai Rrokje Nggo" 
+    42461 "Vai Rrokje Go" 
+    42462 "Vai Rrokje Mo" 
+    42463 "Vai Rrokje No" 
+    42464 "Vai Rrokje Nyo" 
+    42465 "Vai Rrokje E" 
+    42466 "Vai Rrokje En" 
+    42467 "Vai Rrokje Ngen" 
+    42468 "Vai Rrokje He" 
+    42469 "Vai Rrokje Hen" 
+    42470 "Vai Rrokje We" 
+    42471 "Vai Rrokje Wen" 
+    42472 "Vai Rrokje Pe" 
+    42473 "Vai Rrokje Bhe" 
+    42474 "Vai Rrokje Be" 
+    42475 "Vai Rrokje Mbe" 
+    42476 "Vai Rrokje Kpe" 
+    42477 "Vai Rrokje Kpen" 
+    42478 "Vai Rrokje Mgbe" 
+    42479 "Vai Rrokje Gbe" 
+    42480 "Vai Rrokje Gben" 
+    42481 "Vai Rrokje Fe" 
+    42482 "Vai Rrokje Ve" 
+    42483 "Vai Rrokje Te" 
+    42484 "Vai Rrokje The" 
+    42485 "Vai Rrokje Dhe" 
+    42486 "Vai Rrokje Dhhe" 
+    42487 "Vai Rrokje Le" 
+    42488 "Vai Rrokje Re" 
+    42489 "Vai Rrokje De" 
+    42490 "Vai Rrokje Nde" 
+    42491 "Vai Rrokje Se" 
+    42492 "Vai Rrokje She" 
+    42493 "Vai Rrokje Ze" 
+    42494 "Vai Rrokje Zhe" 
+    42495 "Vai Rrokje Ce" 
+    42496 "Vai Rrokje Je" 
+    42497 "Vai Rrokje Nje" 
+    42498 "Vai Rrokje Ye" 
+    42499 "Vai Rrokje Ke" 
+    42500 "Vai Rrokje Ngge" 
+    42501 "Vai Rrokje Nggen" 
+    42502 "Vai Rrokje Ge" 
+    42503 "Vai Rrokje Gen" 
+    42504 "Vai Rrokje Me" 
+    42505 "Vai Rrokje Ne" 
+    42506 "Vai Rrokje Nye" 
+    42507 "Vai Rrokje Ng" 
+    42508 "Vai Rrokje Lengthener" 
+    42509 "Vai Presje" 
+    42510 "Vai PikÃ«" 
+    42511 "Vai Pyetje ShenjÃ«" 
+    42512 "Vai Rrokje Ndole Fa" 
+    42513 "Vai Rrokje Ndole Ka" 
+    42514 "Vai Rrokje Ndole Soo" 
+    42515 "Vai Simbol Feeng" 
+    42516 "Vai Simbol Keeng" 
+    42517 "Vai Simbol Ting" 
+    42518 "Vai Simbol Nii" 
+    42519 "Vai Simbol Bang" 
+    42520 "Vai Simbol Faa" 
+    42521 "Vai Simbol Taa" 
+    42522 "Vai Simbol Dang" 
+    42523 "Vai Simbol Doong" 
+    42524 "Vai Simbol Kung" 
+    42525 "Vai Simbol Tong" 
+    42526 "Vai Simbol Do-O" 
+    42527 "Vai Simbol Jong" 
+    42528 "Vai ShifÃ«r Zero" 
+    42529 "Vai ShifÃ«r NjÃ«" 
+    42530 "Vai ShifÃ«r Dy" 
+    42531 "Vai ShifÃ«r Tre" 
+    42532 "Vai ShifÃ«r KatÃ«r" 
+    42533 "Vai ShifÃ«r PesÃ«" 
+    42534 "Vai ShifÃ«r GjashtÃ«" 
+    42535 "Vai ShifÃ«r ShtatÃ«" 
+    42536 "Vai ShifÃ«r TetÃ«" 
+    42537 "Vai ShifÃ«r NÃ«ntÃ«" 
+    42538 "Vai Rrokje Ndole Ma" 
+    42539 "Vai Rrokje Ndole Do" 
+    42560 "Cyrillic ShkronjÃ« e Madhe Zemlya" 
+    42561 "Cyrillic ShkronjÃ« e VogÃ«l Zemlya" 
+    42562 "Cyrillic ShkronjÃ« e Madhe Dzelo" 
+    42563 "Cyrillic ShkronjÃ« e VogÃ«l Dzelo" 
+    42564 "Cyrillic ShkronjÃ« e Madhe KundÃ«rt Dze" 
+    42565 "Cyrillic ShkronjÃ« e VogÃ«l KundÃ«rt Dze" 
+    42566 "Cyrillic ShkronjÃ« e Madhe Iota" 
+    42567 "Cyrillic ShkronjÃ« e VogÃ«l Iota" 
+    42568 "Cyrillic ShkronjÃ« e Madhe Djerv" 
+    42569 "Cyrillic ShkronjÃ« e VogÃ«l Djerv" 
+    42570 "Cyrillic ShkronjÃ« e Madhe Monograph Uk" 
+    42571 "Cyrillic ShkronjÃ« e VogÃ«l Monograph Uk" 
+    42572 "Cyrillic ShkronjÃ« e Madhe Broad Omega" 
+    42573 "Cyrillic ShkronjÃ« e VogÃ«l Broad Omega" 
+    42574 "Cyrillic ShkronjÃ« e Madhe Neutral Yer" 
+    42575 "Cyrillic ShkronjÃ« e VogÃ«l Neutral Yer" 
+    42576 "Cyrillic ShkronjÃ« e Madhe Yeru Me Back Yer" 
+    42577 "Cyrillic ShkronjÃ« e VogÃ«l Yeru Me Back Yer" 
+    42578 "Cyrillic ShkronjÃ« e Madhe Iotified Yat" 
+    42579 "Cyrillic ShkronjÃ« e VogÃ«l Iotified Yat" 
+    42580 "Cyrillic ShkronjÃ« e Madhe KundÃ«rt Yu" 
+    42581 "Cyrillic ShkronjÃ« e VogÃ«l KundÃ«rt Yu" 
+    42582 "Cyrillic ShkronjÃ« e Madhe Iotified A" 
+    42583 "Cyrillic ShkronjÃ« e VogÃ«l Iotified A" 
+    42584 "Cyrillic ShkronjÃ« e Madhe Mbyllur Pak Yus" 
+    42585 "Cyrillic ShkronjÃ« e VogÃ«l Mbyllur Pak Yus" 
+    42586 "Cyrillic ShkronjÃ« e Madhe Blended Yus" 
+    42587 "Cyrillic ShkronjÃ« e VogÃ«l Blended Yus" 
+    42588 "Cyrillic ShkronjÃ« e Madhe Iotified Mbyllur Pak Yus" 
+    42589 "Cyrillic ShkronjÃ« e VogÃ«l Iotified Mbyllur Pak Yus" 
+    42590 "Cyrillic ShkronjÃ« e Madhe Yn" 
+    42591 "Cyrillic ShkronjÃ« e VogÃ«l Yn" 
+    42592 "Cyrillic ShkronjÃ« e Madhe KundÃ«rt Tse" 
+    42593 "Cyrillic ShkronjÃ« e VogÃ«l KundÃ«rt Tse" 
+    42594 "Cyrillic ShkronjÃ« e Madhe Soft De" 
+    42595 "Cyrillic ShkronjÃ« e VogÃ«l Soft De" 
+    42596 "Cyrillic ShkronjÃ« e Madhe Soft El" 
+    42597 "Cyrillic ShkronjÃ« e VogÃ«l Soft El" 
+    42598 "Cyrillic ShkronjÃ« e Madhe Soft Em" 
+    42599 "Cyrillic ShkronjÃ« e VogÃ«l Soft Em" 
+    42600 "Cyrillic ShkronjÃ« e Madhe Monocular O" 
+    42601 "Cyrillic ShkronjÃ« e VogÃ«l Monocular O" 
+    42602 "Cyrillic ShkronjÃ« e Madhe Binocular O" 
+    42603 "Cyrillic ShkronjÃ« e VogÃ«l Binocular O" 
+    42604 "Cyrillic ShkronjÃ« e Madhe Dyshe Monocular O" 
+    42605 "Cyrillic ShkronjÃ« e VogÃ«l Dyshe Monocular O" 
+    42606 "Cyrillic ShkronjÃ« Multiocular O" 
+    42607 "Kombinuar Cyrillic Vzmet" 
+    42608 "Kombinuar Cyrillic DhjetÃ« Miliona ShenjÃ«" 
+    42609 "Kombinuar Cyrillic NjÃ«qind Miliona ShenjÃ«" 
+    42610 "Kombinuar Cyrillic MijÃ« Miliona ShenjÃ«" 
+    42611 "Slavonic Yll" 
+    42612 "Kombinuar Cyrillic ShkronjÃ« Ukrainase Ie" 
+    42613 "Kombinuar Cyrillic ShkronjÃ« I" 
+    42614 "Kombinuar Cyrillic ShkronjÃ« Yi" 
+    42615 "Kombinuar Cyrillic ShkronjÃ« U" 
+    42616 "Kombinuar Cyrillic ShkronjÃ« Hard ShenjÃ«" 
+    42617 "Kombinuar Cyrillic ShkronjÃ« Yeru" 
+    42618 "Kombinuar Cyrillic ShkronjÃ« Soft ShenjÃ«" 
+    42619 "Kombinuar Cyrillic ShkronjÃ« Omega" 
+    42620 "Kombinuar Cyrillic Kavyka" 
+    42621 "Kombinuar Cyrillic Payerok" 
+    42622 "Cyrillic Kavyka" 
+    42623 "Cyrillic Payerok" 
+    42624 "Cyrillic ShkronjÃ« e Madhe Dwe" 
+    42625 "Cyrillic ShkronjÃ« e VogÃ«l Dwe" 
+    42626 "Cyrillic ShkronjÃ« e Madhe Dzwe" 
+    42627 "Cyrillic ShkronjÃ« e VogÃ«l Dzwe" 
+    42628 "Cyrillic ShkronjÃ« e Madhe Zhwe" 
+    42629 "Cyrillic ShkronjÃ« e VogÃ«l Zhwe" 
+    42630 "Cyrillic ShkronjÃ« e Madhe Cche" 
+    42631 "Cyrillic ShkronjÃ« e VogÃ«l Cche" 
+    42632 "Cyrillic ShkronjÃ« e Madhe Dzze" 
+    42633 "Cyrillic ShkronjÃ« e VogÃ«l Dzze" 
+    42634 "Cyrillic ShkronjÃ« e Madhe Te Me Mesit Kapje" 
+    42635 "Cyrillic ShkronjÃ« e VogÃ«l Te Me Mesit Kapje" 
+    42636 "Cyrillic ShkronjÃ« e Madhe Twe" 
+    42637 "Cyrillic ShkronjÃ« e VogÃ«l Twe" 
+    42638 "Cyrillic ShkronjÃ« e Madhe Tswe" 
+    42639 "Cyrillic ShkronjÃ« e VogÃ«l Tswe" 
+    42640 "Cyrillic ShkronjÃ« e Madhe Tsse" 
+    42641 "Cyrillic ShkronjÃ« e VogÃ«l Tsse" 
+    42642 "Cyrillic ShkronjÃ« e Madhe Tche" 
+    42643 "Cyrillic ShkronjÃ« e VogÃ«l Tche" 
+    42644 "Cyrillic ShkronjÃ« e Madhe Hwe" 
+    42645 "Cyrillic ShkronjÃ« e VogÃ«l Hwe" 
+    42646 "Cyrillic ShkronjÃ« e Madhe Shwe" 
+    42647 "Cyrillic ShkronjÃ« e VogÃ«l Shwe" 
+    42655 "Kombinuar Cyrillic ShkronjÃ« Iotified E" 
+    42656 "Bamum ShkronjÃ« A" 
+    42657 "Bamum ShkronjÃ« Ka" 
+    42658 "Bamum ShkronjÃ« U" 
+    42659 "Bamum ShkronjÃ« Ku" 
+    42660 "Bamum ShkronjÃ« Ee" 
+    42661 "Bamum ShkronjÃ« Ree" 
+    42662 "Bamum ShkronjÃ« Tae" 
+    42663 "Bamum ShkronjÃ« O" 
+    42664 "Bamum ShkronjÃ« Nyi" 
+    42665 "Bamum ShkronjÃ« I" 
+    42666 "Bamum ShkronjÃ« La" 
+    42667 "Bamum ShkronjÃ« Pa" 
+    42668 "Bamum ShkronjÃ« Rii" 
+    42669 "Bamum ShkronjÃ« Riee" 
+    42670 "Bamum ShkronjÃ« Leeee" 
+    42671 "Bamum ShkronjÃ« Meeee" 
+    42672 "Bamum ShkronjÃ« Taa" 
+    42673 "Bamum ShkronjÃ« Ndaa" 
+    42674 "Bamum ShkronjÃ« Njaem" 
+    42675 "Bamum ShkronjÃ« M" 
+    42676 "Bamum ShkronjÃ« Suu" 
+    42677 "Bamum ShkronjÃ« Mu" 
+    42678 "Bamum ShkronjÃ« Shii" 
+    42679 "Bamum ShkronjÃ« Si" 
+    42680 "Bamum ShkronjÃ« Sheux" 
+    42681 "Bamum ShkronjÃ« Seux" 
+    42682 "Bamum ShkronjÃ« Kyee" 
+    42683 "Bamum ShkronjÃ« Ket" 
+    42684 "Bamum ShkronjÃ« Nuae" 
+    42685 "Bamum ShkronjÃ« Nu" 
+    42686 "Bamum ShkronjÃ« Njuae" 
+    42687 "Bamum ShkronjÃ« Yoq" 
+    42688 "Bamum ShkronjÃ« Shu" 
+    42689 "Bamum ShkronjÃ« Yuq" 
+    42690 "Bamum ShkronjÃ« Ya" 
+    42691 "Bamum ShkronjÃ« Nsha" 
+    42692 "Bamum ShkronjÃ« Keux" 
+    42693 "Bamum ShkronjÃ« Peux" 
+    42694 "Bamum ShkronjÃ« Njee" 
+    42695 "Bamum ShkronjÃ« Ntee" 
+    42696 "Bamum ShkronjÃ« Pue" 
+    42697 "Bamum ShkronjÃ« Wue" 
+    42698 "Bamum ShkronjÃ« Pee" 
+    42699 "Bamum ShkronjÃ« Fee" 
+    42700 "Bamum ShkronjÃ« Ru" 
+    42701 "Bamum ShkronjÃ« Lu" 
+    42702 "Bamum ShkronjÃ« Mi" 
+    42703 "Bamum ShkronjÃ« Ni" 
+    42704 "Bamum ShkronjÃ« Reux" 
+    42705 "Bamum ShkronjÃ« Rae" 
+    42706 "Bamum ShkronjÃ« Ken" 
+    42707 "Bamum ShkronjÃ« Ngkwaen" 
+    42708 "Bamum ShkronjÃ« Ngga" 
+    42709 "Bamum ShkronjÃ« Nga" 
+    42710 "Bamum ShkronjÃ« Sho" 
+    42711 "Bamum ShkronjÃ« Puae" 
+    42712 "Bamum ShkronjÃ« Fu" 
+    42713 "Bamum ShkronjÃ« Fom" 
+    42714 "Bamum ShkronjÃ« Wa" 
+    42715 "Bamum ShkronjÃ« Na" 
+    42716 "Bamum ShkronjÃ« Li" 
+    42717 "Bamum ShkronjÃ« Pi" 
+    42718 "Bamum ShkronjÃ« Loq" 
+    42719 "Bamum ShkronjÃ« Ko" 
+    42720 "Bamum ShkronjÃ« Mben" 
+    42721 "Bamum ShkronjÃ« Ren" 
+    42722 "Bamum ShkronjÃ« Men" 
+    42723 "Bamum ShkronjÃ« Ma" 
+    42724 "Bamum ShkronjÃ« Ti" 
+    42725 "Bamum ShkronjÃ« Ki" 
+    42726 "Bamum ShkronjÃ« Mo" 
+    42727 "Bamum ShkronjÃ« Mbaa" 
+    42728 "Bamum ShkronjÃ« Tet" 
+    42729 "Bamum ShkronjÃ« Kpa" 
+    42730 "Bamum ShkronjÃ« DhjetÃ«" 
+    42731 "Bamum ShkronjÃ« Ntuu" 
+    42732 "Bamum ShkronjÃ« Samba" 
+    42733 "Bamum ShkronjÃ« Faamae" 
+    42734 "Bamum ShkronjÃ« Kovuu" 
+    42735 "Bamum ShkronjÃ« Koghom" 
+    42736 "Bamum Kombinuar ShenjÃ« Koqndon" 
+    42737 "Bamum Kombinuar ShenjÃ« Tukwentis" 
+    42738 "Bamum Njaemli" 
+    42739 "Bamum PikÃ«" 
+    42740 "Bamum Dy Pika" 
+    42741 "Bamum Presje" 
+    42742 "Bamum PikÃ«presje" 
+    42743 "Bamum Pyetje ShenjÃ«" 
+    42752 "Modifiko ShkronjÃ« Kineze Tone Yin Ping" 
+    42753 "Modifiko ShkronjÃ« Kineze Tone Yang Ping" 
+    42754 "Modifiko ShkronjÃ« Kineze Tone Yin Shang" 
+    42755 "Modifiko ShkronjÃ« Kineze Tone Yang Shang" 
+    42756 "Modifiko ShkronjÃ« Kineze Tone Yin Qu" 
+    42757 "Modifiko ShkronjÃ« Kineze Tone Yang Qu" 
+    42758 "Modifiko ShkronjÃ« Kineze Tone Yin Ru" 
+    42759 "Modifiko ShkronjÃ« Kineze Tone Yang Ru" 
+    42760 "Modifiko ShkronjÃ« ShumÃ«-Lart Pika-Pika Tone Bar" 
+    42761 "Modifiko ShkronjÃ« Lart Pika-Pika Tone Bar" 
+    42762 "Modifiko ShkronjÃ« Mesatar Pika-Pika Tone Bar" 
+    42763 "Modifiko ShkronjÃ« UlÃ«t Pika-Pika Tone Bar" 
+    42764 "Modifiko ShkronjÃ« ShtesÃ«-UlÃ«t Pika-Pika Tone Bar" 
+    42765 "Modifiko ShkronjÃ« ShumÃ«-Lart Pika-Pika MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42766 "Modifiko ShkronjÃ« Lart Pika-Pika MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42767 "Modifiko ShkronjÃ« Mesatar Pika-Pika MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42768 "Modifiko ShkronjÃ« UlÃ«t Pika-Pika MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42769 "Modifiko ShkronjÃ« ShtesÃ«-UlÃ«t Pika-Pika MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42770 "Modifiko ShkronjÃ« ShumÃ«-Lart MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42771 "Modifiko ShkronjÃ« Lart MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42772 "Modifiko ShkronjÃ« Mesatar MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42773 "Modifiko ShkronjÃ« UlÃ«t MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42774 "Modifiko ShkronjÃ« ShtesÃ«-UlÃ«t MajtÃ«-RrÃ«njÃ« Tone Bar" 
+    42775 "Modifiko ShkronjÃ« PikÃ« Vertikale Bar" 
+    42776 "Modifiko ShkronjÃ« PikÃ« Slash" 
+    42777 "Modifiko ShkronjÃ« PikÃ« Horizontal Bar" 
+    42778 "Modifiko ShkronjÃ« MÃ« i'ulÃ«t DjathtÃ« KÃ«nd KÃ«nd" 
+    42779 "Modifiko ShkronjÃ« Ngritur Lart ShigjetÃ«" 
+    42780 "Modifiko ShkronjÃ« Ngritur PoshtÃ« ShigjetÃ«" 
+    42781 "Modifiko ShkronjÃ« Ngritur Thirrje ShenjÃ«" 
+    42782 "Modifiko ShkronjÃ« Ngritur Kthyer Thirrje ShenjÃ«" 
+    42783 "Modifiko ShkronjÃ« UlÃ«t Kthyer Thirrje ShenjÃ«" 
+    42784 "Modifiko ShkronjÃ« Stres dhe Lart Tone" 
+    42785 "Modifiko ShkronjÃ« Stres dhe UlÃ«t Tone" 
+    42786 "ShkronjÃ« e Madhe Latine Egjiptologji Alef" 
+    42787 "ShkronjÃ« e VogÃ«l Latine Egjiptologji Alef" 
+    42788 "ShkronjÃ« e Madhe Latine Egjiptologji Ain" 
+    42789 "ShkronjÃ« e VogÃ«l Latine Egjiptologji Ain" 
+    42790 "ShkronjÃ« e Madhe Latine Heng" 
+    42791 "ShkronjÃ« e VogÃ«l Latine Heng" 
+    42792 "ShkronjÃ« e Madhe Latine Tz" 
+    42793 "ShkronjÃ« e VogÃ«l Latine Tz" 
+    42794 "ShkronjÃ« e Madhe Latine Tresillo" 
+    42795 "ShkronjÃ« e VogÃ«l Latine Tresillo" 
+    42796 "ShkronjÃ« e Madhe Latine Cuatrillo" 
+    42797 "ShkronjÃ« e VogÃ«l Latine Cuatrillo" 
+    42798 "ShkronjÃ« e Madhe Latine Cuatrillo Me Presje" 
+    42799 "ShkronjÃ« e VogÃ«l Latine Cuatrillo Me Presje" 
+    42800 "Latin ShkronjÃ« e VogÃ«l e Madhe F" 
+    42801 "Latin ShkronjÃ« e VogÃ«l e Madhe S" 
+    42802 "ShkronjÃ« e Madhe Latine Aa" 
+    42803 "ShkronjÃ« e VogÃ«l Latine Aa" 
+    42804 "ShkronjÃ« e Madhe Latine Ao" 
+    42805 "ShkronjÃ« e VogÃ«l Latine Ao" 
+    42806 "ShkronjÃ« e Madhe Latine Au" 
+    42807 "ShkronjÃ« e VogÃ«l Latine Au" 
+    42808 "ShkronjÃ« e Madhe Latine Av" 
+    42809 "ShkronjÃ« e VogÃ«l Latine Av" 
+    42810 "ShkronjÃ« e Madhe Latine Av Me Horizontal Bar" 
+    42811 "ShkronjÃ« e VogÃ«l Latine Av Me Horizontal Bar" 
+    42812 "ShkronjÃ« e Madhe Latine Ay" 
+    42813 "ShkronjÃ« e VogÃ«l Latine Ay" 
+    42814 "ShkronjÃ« e Madhe Latine KundÃ«rt C Me PikÃ«" 
+    42815 "ShkronjÃ« e VogÃ«l Latine KundÃ«rt C Me PikÃ«" 
+    42816 "ShkronjÃ« e Madhe Latine K Me Goditje" 
+    42817 "ShkronjÃ« e VogÃ«l Latine K Me Goditje" 
+    42818 "ShkronjÃ« e Madhe Latine K Me Diagonal Goditje" 
+    42819 "ShkronjÃ« e VogÃ«l Latine K Me Diagonal Goditje" 
+    42820 "ShkronjÃ« e Madhe Latine K Me Goditje dhe Diagonal Goditje" 
+    42821 "ShkronjÃ« e VogÃ«l Latine K Me Goditje dhe Diagonal Goditje" 
+    42822 "ShkronjÃ« e Madhe Latine Thyer L" 
+    42823 "ShkronjÃ« e VogÃ«l Latine Thyer L" 
+    42824 "ShkronjÃ« e Madhe Latine L Me Lart Goditje" 
+    42825 "ShkronjÃ« e VogÃ«l Latine L Me Lart Goditje" 
+    42826 "ShkronjÃ« e Madhe Latine O Me GjatÃ« Goditje Mbulim" 
+    42827 "ShkronjÃ« e VogÃ«l Latine O Me GjatÃ« Goditje Mbulim" 
+    42828 "ShkronjÃ« e Madhe Latine O Me Loop" 
+    42829 "ShkronjÃ« e VogÃ«l Latine O Me Loop" 
+    42830 "ShkronjÃ« e Madhe Latine Oo" 
+    42831 "ShkronjÃ« e VogÃ«l Latine Oo" 
+    42832 "ShkronjÃ« e Madhe Latine P Me Goditje PÃ«rmes Descender" 
+    42833 "ShkronjÃ« e VogÃ«l Latine P Me Goditje PÃ«rmes Descender" 
+    42834 "ShkronjÃ« e Madhe Latine P Me Flourish" 
+    42835 "ShkronjÃ« e VogÃ«l Latine P Me Flourish" 
+    42836 "ShkronjÃ« e Madhe Latine P Me Squirrel Bisht" 
+    42837 "ShkronjÃ« e VogÃ«l Latine P Me Squirrel Bisht" 
+    42838 "ShkronjÃ« e Madhe Latine Q Me Goditje PÃ«rmes Descender" 
+    42839 "ShkronjÃ« e VogÃ«l Latine Q Me Goditje PÃ«rmes Descender" 
+    42840 "ShkronjÃ« e Madhe Latine Q Me Diagonal Goditje" 
+    42841 "ShkronjÃ« e VogÃ«l Latine Q Me Diagonal Goditje" 
+    42842 "ShkronjÃ« e Madhe Latine R Rotunda" 
+    42843 "ShkronjÃ« e VogÃ«l Latine R Rotunda" 
+    42844 "ShkronjÃ« e Madhe Latine Rum Rotunda" 
+    42845 "ShkronjÃ« e VogÃ«l Latine Rum Rotunda" 
+    42846 "ShkronjÃ« e Madhe Latine V Me Diagonal Goditje" 
+    42847 "ShkronjÃ« e VogÃ«l Latine V Me Diagonal Goditje" 
+    42848 "ShkronjÃ« e Madhe Latine Vy" 
+    42849 "ShkronjÃ« e VogÃ«l Latine Vy" 
+    42850 "ShkronjÃ« e Madhe Latine Visigothic Z" 
+    42851 "ShkronjÃ« e VogÃ«l Latine Visigothic Z" 
+    42852 "ShkronjÃ« e Madhe Latine Gjemb Me Goditje" 
+    42853 "ShkronjÃ« e VogÃ«l Latine Gjemb Me Goditje" 
+    42854 "ShkronjÃ« e Madhe Latine Gjemb Me Goditje PÃ«rmes Descender" 
+    42855 "ShkronjÃ« e VogÃ«l Latine Gjemb Me Goditje PÃ«rmes Descender" 
+    42856 "ShkronjÃ« e Madhe Latine Vend" 
+    42857 "ShkronjÃ« e VogÃ«l Latine Vend" 
+    42858 "ShkronjÃ« e Madhe Latine Et" 
+    42859 "ShkronjÃ« e VogÃ«l Latine Et" 
+    42860 "ShkronjÃ« e Madhe Latine Is" 
+    42861 "ShkronjÃ« e VogÃ«l Latine Is" 
+    42862 "ShkronjÃ« e Madhe Latine Con" 
+    42863 "ShkronjÃ« e VogÃ«l Latine Con" 
+    42864 "Modifiko ShkronjÃ« Us" 
+    42865 "ShkronjÃ« e VogÃ«l Latine Dum" 
+    42866 "ShkronjÃ« e VogÃ«l Latine Lum" 
+    42867 "ShkronjÃ« e VogÃ«l Latine Mum" 
+    42868 "ShkronjÃ« e VogÃ«l Latine Num" 
+    42869 "ShkronjÃ« e VogÃ«l Latine Rum" 
+    42870 "Latin ShkronjÃ« e VogÃ«l e Madhe Rum" 
+    42871 "ShkronjÃ« e VogÃ«l Latine Tum" 
+    42872 "ShkronjÃ« e VogÃ«l Latine Um" 
+    42873 "ShkronjÃ« e Madhe Latine Insular D" 
+    42874 "ShkronjÃ« e VogÃ«l Latine Insular D" 
+    42875 "ShkronjÃ« e Madhe Latine Insular F" 
+    42876 "ShkronjÃ« e VogÃ«l Latine Insular F" 
+    42877 "ShkronjÃ« e Madhe Latine Insular G" 
+    42878 "ShkronjÃ« e Madhe Latine Kthyer Insular G" 
+    42879 "ShkronjÃ« e VogÃ«l Latine Kthyer Insular G" 
+    42880 "ShkronjÃ« e Madhe Latine Kthyer L" 
+    42881 "ShkronjÃ« e VogÃ«l Latine Kthyer L" 
+    42882 "ShkronjÃ« e Madhe Latine Insular R" 
+    42883 "ShkronjÃ« e VogÃ«l Latine Insular R" 
+    42884 "ShkronjÃ« e Madhe Latine Insular S" 
+    42885 "ShkronjÃ« e VogÃ«l Latine Insular S" 
+    42886 "ShkronjÃ« e Madhe Latine Insular T" 
+    42887 "ShkronjÃ« e VogÃ«l Latine Insular T" 
+    42888 "Modifiko ShkronjÃ« UlÃ«t Theks-lakor Theks" 
+    42889 "Modifiko ShkronjÃ« Dy Pika" 
+    42890 "Modifiko ShkronjÃ« ShkurtÃ«r BarabartÃ« ShenjÃ«" 
+    42891 "ShkronjÃ« e Madhe Latine Saltillo" 
+    42892 "ShkronjÃ« e VogÃ«l Latine Saltillo" 
+    42893 "ShkronjÃ« e Madhe Latine Kthyer H" 
+    42894 "ShkronjÃ« e VogÃ«l Latine L Me Retroflex Kapje dhe Belt" 
+    42896 "ShkronjÃ« e Madhe Latine N Me Descender" 
+    42897 "ShkronjÃ« e VogÃ«l Latine N Me Descender" 
+    42898 "ShkronjÃ« e Madhe Latine C Me Bar" 
+    42899 "ShkronjÃ« e VogÃ«l Latine C Me Bar" 
+    42912 "ShkronjÃ« e Madhe Latine G Me Oblique Goditje" 
+    42913 "ShkronjÃ« e VogÃ«l Latine G Me Oblique Goditje" 
+    42914 "ShkronjÃ« e Madhe Latine K Me Oblique Goditje" 
+    42915 "ShkronjÃ« e VogÃ«l Latine K Me Oblique Goditje" 
+    42916 "ShkronjÃ« e Madhe Latine N Me Oblique Goditje" 
+    42917 "ShkronjÃ« e VogÃ«l Latine N Me Oblique Goditje" 
+    42918 "ShkronjÃ« e Madhe Latine R Me Oblique Goditje" 
+    42919 "ShkronjÃ« e VogÃ«l Latine R Me Oblique Goditje" 
+    42920 "ShkronjÃ« e Madhe Latine S Me Oblique Goditje" 
+    42921 "ShkronjÃ« e VogÃ«l Latine S Me Oblique Goditje" 
+    42922 "ShkronjÃ« e Madhe Latine H Me Kapje" 
+    43000 "Modifiko ShkronjÃ« e Madhe H Me Goditje" 
+    43001 "Modifiko ShkronjÃ« e VogÃ«l Lidhje Oe" 
+    43002 "Latin ShkronjÃ« e VogÃ«l e Madhe Kthyer M" 
+    43003 "Latin Epigramesh ShkronjÃ« KundÃ«rt F" 
+    43004 "Latin Epigramesh ShkronjÃ« KundÃ«rt P" 
+    43005 "Latin Epigramesh ShkronjÃ« Kthyer M" 
+    43006 "Latin Epigramesh ShkronjÃ« I Longa" 
+    43007 "Latin Epigramesh ShkronjÃ« Archaic M" 
+    43008 "Syloti Nagri ShkronjÃ« A" 
+    43009 "Syloti Nagri ShkronjÃ« I" 
+    43010 "Syloti Nagri ShenjÃ« Dvisvara" 
+    43011 "Syloti Nagri ShkronjÃ« U" 
+    43012 "Syloti Nagri ShkronjÃ« E" 
+    43013 "Syloti Nagri ShkronjÃ« O" 
+    43014 "Syloti Nagri ShenjÃ« Hasanta" 
+    43015 "Syloti Nagri ShkronjÃ« Ko" 
+    43016 "Syloti Nagri ShkronjÃ« Kho" 
+    43017 "Syloti Nagri ShkronjÃ« Go" 
+    43018 "Syloti Nagri ShkronjÃ« Gho" 
+    43019 "Syloti Nagri ShenjÃ« Anusvara" 
+    43020 "Syloti Nagri ShkronjÃ« Co" 
+    43021 "Syloti Nagri ShkronjÃ« Cho" 
+    43022 "Syloti Nagri ShkronjÃ« Jo" 
+    43023 "Syloti Nagri ShkronjÃ« Jho" 
+    43024 "Syloti Nagri ShkronjÃ« Tto" 
+    43025 "Syloti Nagri ShkronjÃ« Ttho" 
+    43026 "Syloti Nagri ShkronjÃ« Ddo" 
+    43027 "Syloti Nagri ShkronjÃ« Ddho" 
+    43028 "Syloti Nagri ShkronjÃ« To" 
+    43029 "Syloti Nagri ShkronjÃ« Tho" 
+    43030 "Syloti Nagri ShkronjÃ« Do" 
+    43031 "Syloti Nagri ShkronjÃ« Dho" 
+    43032 "Syloti Nagri ShkronjÃ« No" 
+    43033 "Syloti Nagri ShkronjÃ« Po" 
+    43034 "Syloti Nagri ShkronjÃ« Pho" 
+    43035 "Syloti Nagri ShkronjÃ« Bo" 
+    43036 "Syloti Nagri ShkronjÃ« Bho" 
+    43037 "Syloti Nagri ShkronjÃ« Mo" 
+    43038 "Syloti Nagri ShkronjÃ« Ro" 
+    43039 "Syloti Nagri ShkronjÃ« Lo" 
+    43040 "Syloti Nagri ShkronjÃ« Rro" 
+    43041 "Syloti Nagri ShkronjÃ« So" 
+    43042 "Syloti Nagri ShkronjÃ« Ho" 
+    43043 "Syloti Nagri Zanore ShenjÃ« A" 
+    43044 "Syloti Nagri Zanore ShenjÃ« I" 
+    43045 "Syloti Nagri Zanore ShenjÃ« U" 
+    43046 "Syloti Nagri Zanore ShenjÃ« E" 
+    43047 "Syloti Nagri Zanore ShenjÃ« Oo" 
+    43048 "Syloti Nagri Poezi ShenjÃ«-1" 
+    43049 "Syloti Nagri Poezi ShenjÃ«-2" 
+    43050 "Syloti Nagri Poezi ShenjÃ«-3" 
+    43051 "Syloti Nagri Poezi ShenjÃ«-4" 
+    43056 "North Indic Fraksion NjÃ« Ã‡erek" 
+    43057 "North Indic Fraksion NjÃ« GjysmÃ«" 
+    43058 "North Indic Fraksion Tre Ã‡erek" 
+    43059 "North Indic Fraksion NjÃ« GjashtÃ«mbÃ«dhjetÃ«" 
+    43060 "North Indic Fraksion NjÃ« TetÃ«" 
+    43061 "North Indic Fraksion Tre GjashtÃ«mbÃ«dhjetÃ«" 
+    43062 "North Indic Ã‡erek ShenjÃ«" 
+    43063 "North Indic Vend-banues ShenjÃ«" 
+    43064 "North Indic Rupee ShenjÃ«" 
+    43065 "North Indic Sasi ShenjÃ«" 
+    43072 "Phags-Pa ShkronjÃ« Ka" 
+    43073 "Phags-Pa ShkronjÃ« Kha" 
+    43074 "Phags-Pa ShkronjÃ« Ga" 
+    43075 "Phags-Pa ShkronjÃ« Nga" 
+    43076 "Phags-Pa ShkronjÃ« Ca" 
+    43077 "Phags-Pa ShkronjÃ« Cha" 
+    43078 "Phags-Pa ShkronjÃ« Ja" 
+    43079 "Phags-Pa ShkronjÃ« Nya" 
+    43080 "Phags-Pa ShkronjÃ« Ta" 
+    43081 "Phags-Pa ShkronjÃ« Tha" 
+    43082 "Phags-Pa ShkronjÃ« Da" 
+    43083 "Phags-Pa ShkronjÃ« Na" 
+    43084 "Phags-Pa ShkronjÃ« Pa" 
+    43085 "Phags-Pa ShkronjÃ« Pha" 
+    43086 "Phags-Pa ShkronjÃ« Ba" 
+    43087 "Phags-Pa ShkronjÃ« Ma" 
+    43088 "Phags-Pa ShkronjÃ« Tsa" 
+    43089 "Phags-Pa ShkronjÃ« Tsha" 
+    43090 "Phags-Pa ShkronjÃ« Dza" 
+    43091 "Phags-Pa ShkronjÃ« Wa" 
+    43092 "Phags-Pa ShkronjÃ« Zha" 
+    43093 "Phags-Pa ShkronjÃ« Za" 
+    43094 "Phags-Pa ShkronjÃ« e VogÃ«l A" 
+    43095 "Phags-Pa ShkronjÃ« Ya" 
+    43096 "Phags-Pa ShkronjÃ« Ra" 
+    43097 "Phags-Pa ShkronjÃ« La" 
+    43098 "Phags-Pa ShkronjÃ« Sha" 
+    43099 "Phags-Pa ShkronjÃ« Sa" 
+    43100 "Phags-Pa ShkronjÃ« Ha" 
+    43101 "Phags-Pa ShkronjÃ« A" 
+    43102 "Phags-Pa ShkronjÃ« I" 
+    43103 "Phags-Pa ShkronjÃ« U" 
+    43104 "Phags-Pa ShkronjÃ« E" 
+    43105 "Phags-Pa ShkronjÃ« O" 
+    43106 "Phags-Pa ShkronjÃ« Qa" 
+    43107 "Phags-Pa ShkronjÃ« Xa" 
+    43108 "Phags-Pa ShkronjÃ« Fa" 
+    43109 "Phags-Pa ShkronjÃ« Gga" 
+    43110 "Phags-Pa ShkronjÃ« Ee" 
+    43111 "Phags-Pa BashkÃ«ngjitur ShkronjÃ« Wa" 
+    43112 "Phags-Pa BashkÃ«ngjitur ShkronjÃ« Ya" 
+    43113 "Phags-Pa ShkronjÃ« Tta" 
+    43114 "Phags-Pa ShkronjÃ« Ttha" 
+    43115 "Phags-Pa ShkronjÃ« Dda" 
+    43116 "Phags-Pa ShkronjÃ« Nna" 
+    43117 "Phags-Pa ShkronjÃ« Alternate Ya" 
+    43118 "Phags-Pa ShkronjÃ« Voiceless Sha" 
+    43119 "Phags-Pa ShkronjÃ« Voiced Ha" 
+    43120 "Phags-Pa ShkronjÃ« Aspirated Fa" 
+    43121 "Phags-Pa BashkÃ«ngjitur ShkronjÃ« Ra" 
+    43122 "Phags-Pa Superfixed ShkronjÃ« Ra" 
+    43123 "Phags-Pa ShkronjÃ« Candrabindu" 
+    43124 "Phags-Pa E VetÃ«m KokÃ« ShenjÃ«" 
+    43125 "Phags-Pa Dyshe KokÃ« ShenjÃ«" 
+    43126 "Phags-Pa ShenjÃ« Shad" 
+    43127 "Phags-Pa ShenjÃ« Dyshe Shad" 
+    43136 "Saurashtra ShenjÃ« Anusvara" 
+    43137 "Saurashtra ShenjÃ« Visarga" 
+    43138 "Saurashtra ShkronjÃ« A" 
+    43139 "Saurashtra ShkronjÃ« Aa" 
+    43140 "Saurashtra ShkronjÃ« I" 
+    43141 "Saurashtra ShkronjÃ« Ii" 
+    43142 "Saurashtra ShkronjÃ« U" 
+    43143 "Saurashtra ShkronjÃ« Uu" 
+    43144 "Saurashtra ShkronjÃ« Vocalic R" 
+    43145 "Saurashtra ShkronjÃ« Vocalic Rr" 
+    43146 "Saurashtra ShkronjÃ« Vocalic L" 
+    43147 "Saurashtra ShkronjÃ« Vocalic Ll" 
+    43148 "Saurashtra ShkronjÃ« E" 
+    43149 "Saurashtra ShkronjÃ« Ee" 
+    43150 "Saurashtra ShkronjÃ« Ai" 
+    43151 "Saurashtra ShkronjÃ« O" 
+    43152 "Saurashtra ShkronjÃ« Oo" 
+    43153 "Saurashtra ShkronjÃ« Au" 
+    43154 "Saurashtra ShkronjÃ« Ka" 
+    43155 "Saurashtra ShkronjÃ« Kha" 
+    43156 "Saurashtra ShkronjÃ« Ga" 
+    43157 "Saurashtra ShkronjÃ« Gha" 
+    43158 "Saurashtra ShkronjÃ« Nga" 
+    43159 "Saurashtra ShkronjÃ« Ca" 
+    43160 "Saurashtra ShkronjÃ« Cha" 
+    43161 "Saurashtra ShkronjÃ« Ja" 
+    43162 "Saurashtra ShkronjÃ« Jha" 
+    43163 "Saurashtra ShkronjÃ« Nya" 
+    43164 "Saurashtra ShkronjÃ« Tta" 
+    43165 "Saurashtra ShkronjÃ« Ttha" 
+    43166 "Saurashtra ShkronjÃ« Dda" 
+    43167 "Saurashtra ShkronjÃ« Ddha" 
+    43168 "Saurashtra ShkronjÃ« Nna" 
+    43169 "Saurashtra ShkronjÃ« Ta" 
+    43170 "Saurashtra ShkronjÃ« Tha" 
+    43171 "Saurashtra ShkronjÃ« Da" 
+    43172 "Saurashtra ShkronjÃ« Dha" 
+    43173 "Saurashtra ShkronjÃ« Na" 
+    43174 "Saurashtra ShkronjÃ« Pa" 
+    43175 "Saurashtra ShkronjÃ« Pha" 
+    43176 "Saurashtra ShkronjÃ« Ba" 
+    43177 "Saurashtra ShkronjÃ« Bha" 
+    43178 "Saurashtra ShkronjÃ« Ma" 
+    43179 "Saurashtra ShkronjÃ« Ya" 
+    43180 "Saurashtra ShkronjÃ« Ra" 
+    43181 "Saurashtra ShkronjÃ« La" 
+    43182 "Saurashtra ShkronjÃ« Va" 
+    43183 "Saurashtra ShkronjÃ« Sha" 
+    43184 "Saurashtra ShkronjÃ« Ssa" 
+    43185 "Saurashtra ShkronjÃ« Sa" 
+    43186 "Saurashtra ShkronjÃ« Ha" 
+    43187 "Saurashtra ShkronjÃ« Lla" 
+    43188 "Saurashtra BashkÃ«tingÃ«llore ShenjÃ« Haaru" 
+    43189 "Saurashtra Zanore ShenjÃ« Aa" 
+    43190 "Saurashtra Zanore ShenjÃ« I" 
+    43191 "Saurashtra Zanore ShenjÃ« Ii" 
+    43192 "Saurashtra Zanore ShenjÃ« U" 
+    43193 "Saurashtra Zanore ShenjÃ« Uu" 
+    43194 "Saurashtra Zanore ShenjÃ« Vocalic R" 
+    43195 "Saurashtra Zanore ShenjÃ« Vocalic Rr" 
+    43196 "Saurashtra Zanore ShenjÃ« Vocalic L" 
+    43197 "Saurashtra Zanore ShenjÃ« Vocalic Ll" 
+    43198 "Saurashtra Zanore ShenjÃ« E" 
+    43199 "Saurashtra Zanore ShenjÃ« Ee" 
+    43200 "Saurashtra Zanore ShenjÃ« Ai" 
+    43201 "Saurashtra Zanore ShenjÃ« O" 
+    43202 "Saurashtra Zanore ShenjÃ« Oo" 
+    43203 "Saurashtra Zanore ShenjÃ« Au" 
+    43204 "Saurashtra ShenjÃ« Virama" 
+    43214 "Saurashtra Danda" 
+    43215 "Saurashtra Dyshe Danda" 
+    43216 "Saurashtra ShifÃ«r Zero" 
+    43217 "Saurashtra ShifÃ«r NjÃ«" 
+    43218 "Saurashtra ShifÃ«r Dy" 
+    43219 "Saurashtra ShifÃ«r Tre" 
+    43220 "Saurashtra ShifÃ«r KatÃ«r" 
+    43221 "Saurashtra ShifÃ«r PesÃ«" 
+    43222 "Saurashtra ShifÃ«r GjashtÃ«" 
+    43223 "Saurashtra ShifÃ«r ShtatÃ«" 
+    43224 "Saurashtra ShifÃ«r TetÃ«" 
+    43225 "Saurashtra ShifÃ«r NÃ«ntÃ«" 
+    43232 "Kombinuar Devanagari ShifÃ«r Zero" 
+    43233 "Kombinuar Devanagari ShifÃ«r NjÃ«" 
+    43234 "Kombinuar Devanagari ShifÃ«r Dy" 
+    43235 "Kombinuar Devanagari ShifÃ«r Tre" 
+    43236 "Kombinuar Devanagari ShifÃ«r KatÃ«r" 
+    43237 "Kombinuar Devanagari ShifÃ«r PesÃ«" 
+    43238 "Kombinuar Devanagari ShifÃ«r GjashtÃ«" 
+    43239 "Kombinuar Devanagari ShifÃ«r ShtatÃ«" 
+    43240 "Kombinuar Devanagari ShifÃ«r TetÃ«" 
+    43241 "Kombinuar Devanagari ShifÃ«r NÃ«ntÃ«" 
+    43242 "Kombinuar Devanagari ShkronjÃ« A" 
+    43243 "Kombinuar Devanagari ShkronjÃ« U" 
+    43244 "Kombinuar Devanagari ShkronjÃ« Ka" 
+    43245 "Kombinuar Devanagari ShkronjÃ« Na" 
+    43246 "Kombinuar Devanagari ShkronjÃ« Pa" 
+    43247 "Kombinuar Devanagari ShkronjÃ« Ra" 
+    43248 "Kombinuar Devanagari ShkronjÃ« Vi" 
+    43249 "Kombinuar Devanagari ShenjÃ« Avagraha" 
+    43250 "Devanagari ShenjÃ« HapÃ«sirÃ« Candrabindu" 
+    43251 "Devanagari ShenjÃ« Candrabindu Virama" 
+    43252 "Devanagari ShenjÃ« Dyshe Candrabindu Virama" 
+    43253 "Devanagari ShenjÃ« Candrabindu Dy" 
+    43254 "Devanagari ShenjÃ« Candrabindu Tre" 
+    43255 "Devanagari ShenjÃ« Candrabindu Avagraha" 
+    43256 "Devanagari ShenjÃ« Pushpika" 
+    43257 "Devanagari Gap Filler" 
+    43258 "Devanagari Caret" 
+    43259 "Devanagari GoditjeKoke" 
+    43264 "Kayah Li ShifÃ«r Zero" 
+    43265 "Kayah Li ShifÃ«r NjÃ«" 
+    43266 "Kayah Li ShifÃ«r Dy" 
+    43267 "Kayah Li ShifÃ«r Tre" 
+    43268 "Kayah Li ShifÃ«r KatÃ«r" 
+    43269 "Kayah Li ShifÃ«r PesÃ«" 
+    43270 "Kayah Li ShifÃ«r GjashtÃ«" 
+    43271 "Kayah Li ShifÃ«r ShtatÃ«" 
+    43272 "Kayah Li ShifÃ«r TetÃ«" 
+    43273 "Kayah Li ShifÃ«r NÃ«ntÃ«" 
+    43274 "Kayah Li ShkronjÃ« Ka" 
+    43275 "Kayah Li ShkronjÃ« Kha" 
+    43276 "Kayah Li ShkronjÃ« Ga" 
+    43277 "Kayah Li ShkronjÃ« Nga" 
+    43278 "Kayah Li ShkronjÃ« Sa" 
+    43279 "Kayah Li ShkronjÃ« Sha" 
+    43280 "Kayah Li ShkronjÃ« Za" 
+    43281 "Kayah Li ShkronjÃ« Nya" 
+    43282 "Kayah Li ShkronjÃ« Ta" 
+    43283 "Kayah Li ShkronjÃ« Hta" 
+    43284 "Kayah Li ShkronjÃ« Na" 
+    43285 "Kayah Li ShkronjÃ« Pa" 
+    43286 "Kayah Li ShkronjÃ« Pha" 
+    43287 "Kayah Li ShkronjÃ« Ma" 
+    43288 "Kayah Li ShkronjÃ« Da" 
+    43289 "Kayah Li ShkronjÃ« Ba" 
+    43290 "Kayah Li ShkronjÃ« Ra" 
+    43291 "Kayah Li ShkronjÃ« Ya" 
+    43292 "Kayah Li ShkronjÃ« La" 
+    43293 "Kayah Li ShkronjÃ« Wa" 
+    43294 "Kayah Li ShkronjÃ« Tha" 
+    43295 "Kayah Li ShkronjÃ« Ha" 
+    43296 "Kayah Li ShkronjÃ« Va" 
+    43297 "Kayah Li ShkronjÃ« Ca" 
+    43298 "Kayah Li ShkronjÃ« A" 
+    43299 "Kayah Li ShkronjÃ« Oe" 
+    43300 "Kayah Li ShkronjÃ« I" 
+    43301 "Kayah Li ShkronjÃ« Oo" 
+    43302 "Kayah Li Zanore Ue" 
+    43303 "Kayah Li Zanore E" 
+    43304 "Kayah Li Zanore U" 
+    43305 "Kayah Li Zanore Ee" 
+    43306 "Kayah Li Zanore O" 
+    43307 "Kayah Li Tone Plophu" 
+    43308 "Kayah Li Tone Calya" 
+    43309 "Kayah Li Tone Calya Plophu" 
+    43310 "Kayah Li ShenjÃ« Cwi" 
+    43311 "Kayah Li ShenjÃ« Shya" 
+    43312 "Rejang ShkronjÃ« Ka" 
+    43313 "Rejang ShkronjÃ« Ga" 
+    43314 "Rejang ShkronjÃ« Nga" 
+    43315 "Rejang ShkronjÃ« Ta" 
+    43316 "Rejang ShkronjÃ« Da" 
+    43317 "Rejang ShkronjÃ« Na" 
+    43318 "Rejang ShkronjÃ« Pa" 
+    43319 "Rejang ShkronjÃ« Ba" 
+    43320 "Rejang ShkronjÃ« Ma" 
+    43321 "Rejang ShkronjÃ« Ca" 
+    43322 "Rejang ShkronjÃ« Ja" 
+    43323 "Rejang ShkronjÃ« Nya" 
+    43324 "Rejang ShkronjÃ« Sa" 
+    43325 "Rejang ShkronjÃ« Ra" 
+    43326 "Rejang ShkronjÃ« La" 
+    43327 "Rejang ShkronjÃ« Ya" 
+    43328 "Rejang ShkronjÃ« Wa" 
+    43329 "Rejang ShkronjÃ« Ha" 
+    43330 "Rejang ShkronjÃ« Mba" 
+    43331 "Rejang ShkronjÃ« Ngga" 
+    43332 "Rejang ShkronjÃ« Nda" 
+    43333 "Rejang ShkronjÃ« Nyja" 
+    43334 "Rejang ShkronjÃ« A" 
+    43335 "Rejang Zanore ShenjÃ« I" 
+    43336 "Rejang Zanore ShenjÃ« U" 
+    43337 "Rejang Zanore ShenjÃ« E" 
+    43338 "Rejang Zanore ShenjÃ« Ai" 
+    43339 "Rejang Zanore ShenjÃ« O" 
+    43340 "Rejang Zanore ShenjÃ« Au" 
+    43341 "Rejang Zanore ShenjÃ« Eu" 
+    43342 "Rejang Zanore ShenjÃ« Ea" 
+    43343 "Rejang BashkÃ«tingÃ«llore ShenjÃ« Ng" 
+    43344 "Rejang BashkÃ«tingÃ«llore ShenjÃ« N" 
+    43345 "Rejang BashkÃ«tingÃ«llore ShenjÃ« R" 
+    43346 "Rejang BashkÃ«tingÃ«llore ShenjÃ« H" 
+    43347 "Rejang Virama" 
+    43359 "Rejang Section ShenjÃ«" 
+    43360 "Hangul Choseong Tikeut-Mieum" 
+    43361 "Hangul Choseong Tikeut-Pieup" 
+    43362 "Hangul Choseong Tikeut-Sios" 
+    43363 "Hangul Choseong Tikeut-Cieuc" 
+    43364 "Hangul Choseong Rieul-Kiyeok" 
+    43365 "Hangul Choseong Rieul-Ssangkiyeok" 
+    43366 "Hangul Choseong Rieul-Tikeut" 
+    43367 "Hangul Choseong Rieul-Ssangtikeut" 
+    43368 "Hangul Choseong Rieul-Mieum" 
+    43369 "Hangul Choseong Rieul-Pieup" 
+    43370 "Hangul Choseong Rieul-Ssangpieup" 
+    43371 "Hangul Choseong Rieul-Kapyeounpieup" 
+    43372 "Hangul Choseong Rieul-Sios" 
+    43373 "Hangul Choseong Rieul-Cieuc" 
+    43374 "Hangul Choseong Rieul-Khieukh" 
+    43375 "Hangul Choseong Mieum-Kiyeok" 
+    43376 "Hangul Choseong Mieum-Tikeut" 
+    43377 "Hangul Choseong Mieum-Sios" 
+    43378 "Hangul Choseong Pieup-Sios-Thieuth" 
+    43379 "Hangul Choseong Pieup-Khieukh" 
+    43380 "Hangul Choseong Pieup-Hieuh" 
+    43381 "Hangul Choseong Ssangsios-Pieup" 
+    43382 "Hangul Choseong Ieung-Rieul" 
+    43383 "Hangul Choseong Ieung-Hieuh" 
+    43384 "Hangul Choseong Ssangcieuc-Hieuh" 
+    43385 "Hangul Choseong Ssangthieuth" 
+    43386 "Hangul Choseong Phieuph-Hieuh" 
+    43387 "Hangul Choseong Hieuh-Sios" 
+    43388 "Hangul Choseong Ssangyeorinhieuh" 
+    43392 "Javanese ShenjÃ« Panyangga" 
+    43393 "Javanese ShenjÃ« Cecak" 
+    43394 "Javanese ShenjÃ« Layar" 
+    43395 "Javanese ShenjÃ« Wignyan" 
+    43396 "Javanese ShkronjÃ« A" 
+    43397 "Javanese ShkronjÃ« I Kawi" 
+    43398 "Javanese ShkronjÃ« I" 
+    43399 "Javanese ShkronjÃ« Ii" 
+    43400 "Javanese ShkronjÃ« U" 
+    43401 "Javanese ShkronjÃ« Pa Cerek" 
+    43402 "Javanese ShkronjÃ« Nga Lelet" 
+    43403 "Javanese ShkronjÃ« Nga Lelet Raswadi" 
+    43404 "Javanese ShkronjÃ« E" 
+    43405 "Javanese ShkronjÃ« Ai" 
+    43406 "Javanese ShkronjÃ« O" 
+    43407 "Javanese ShkronjÃ« Ka" 
+    43408 "Javanese ShkronjÃ« Ka Sasak" 
+    43409 "Javanese ShkronjÃ« Ka Murda" 
+    43410 "Javanese ShkronjÃ« Ga" 
+    43411 "Javanese ShkronjÃ« Ga Murda" 
+    43412 "Javanese ShkronjÃ« Nga" 
+    43413 "Javanese ShkronjÃ« Ca" 
+    43414 "Javanese ShkronjÃ« Ca Murda" 
+    43415 "Javanese ShkronjÃ« Ja" 
+    43416 "Javanese ShkronjÃ« Nya Murda" 
+    43417 "Javanese ShkronjÃ« Ja Mahaprana" 
+    43418 "Javanese ShkronjÃ« Nya" 
+    43419 "Javanese ShkronjÃ« Tta" 
+    43420 "Javanese ShkronjÃ« Tta Mahaprana" 
+    43421 "Javanese ShkronjÃ« Dda" 
+    43422 "Javanese ShkronjÃ« Dda Mahaprana" 
+    43423 "Javanese ShkronjÃ« Na Murda" 
+    43424 "Javanese ShkronjÃ« Ta" 
+    43425 "Javanese ShkronjÃ« Ta Murda" 
+    43426 "Javanese ShkronjÃ« Da" 
+    43427 "Javanese ShkronjÃ« Da Mahaprana" 
+    43428 "Javanese ShkronjÃ« Na" 
+    43429 "Javanese ShkronjÃ« Pa" 
+    43430 "Javanese ShkronjÃ« Pa Murda" 
+    43431 "Javanese ShkronjÃ« Ba" 
+    43432 "Javanese ShkronjÃ« Ba Murda" 
+    43433 "Javanese ShkronjÃ« Ma" 
+    43434 "Javanese ShkronjÃ« Ya" 
+    43435 "Javanese ShkronjÃ« Ra" 
+    43436 "Javanese ShkronjÃ« Ra Agung" 
+    43437 "Javanese ShkronjÃ« La" 
+    43438 "Javanese ShkronjÃ« Wa" 
+    43439 "Javanese ShkronjÃ« Sa Murda" 
+    43440 "Javanese ShkronjÃ« Sa Mahaprana" 
+    43441 "Javanese ShkronjÃ« Sa" 
+    43442 "Javanese ShkronjÃ« Ha" 
+    43443 "Javanese ShenjÃ« Cecak Telu" 
+    43444 "Javanese Zanore ShenjÃ« Tarung" 
+    43445 "Javanese Zanore ShenjÃ« Tolong" 
+    43446 "Javanese Zanore ShenjÃ« Wulu" 
+    43447 "Javanese Zanore ShenjÃ« Wulu Melik" 
+    43448 "Javanese Zanore ShenjÃ« Suku" 
+    43449 "Javanese Zanore ShenjÃ« Suku Mendut" 
+    43450 "Javanese Zanore ShenjÃ« Taling" 
+    43451 "Javanese Zanore ShenjÃ« Dirga Mure" 
+    43452 "Javanese Zanore ShenjÃ« Pepet" 
+    43453 "Javanese BashkÃ«tingÃ«llore ShenjÃ« Keret" 
+    43454 "Javanese BashkÃ«tingÃ«llore ShenjÃ« Pengkal" 
+    43455 "Javanese BashkÃ«tingÃ«llore ShenjÃ« Cakra" 
+    43456 "Javanese Pangkon" 
+    43457 "Javanese MajtÃ« Rerenggan" 
+    43458 "Javanese DjathtÃ« Rerenggan" 
+    43459 "Javanese Pada Andap" 
+    43460 "Javanese Pada Madya" 
+    43461 "Javanese Pada Luhur" 
+    43462 "Javanese Pada Windu" 
+    43463 "Javanese Pada Pangkat" 
+    43464 "Javanese Pada Lingsa" 
+    43465 "Javanese Pada Lungsi" 
+    43466 "Javanese Pada Adeg" 
+    43467 "Javanese Pada Adeg Adeg" 
+    43468 "Javanese Pada Piseleh" 
+    43469 "Javanese Kthyer Pada Piseleh" 
+    43471 "Javanese Pangrangkep" 
+    43472 "Javanese ShifÃ«r Zero" 
+    43473 "Javanese ShifÃ«r NjÃ«" 
+    43474 "Javanese ShifÃ«r Dy" 
+    43475 "Javanese ShifÃ«r Tre" 
+    43476 "Javanese ShifÃ«r KatÃ«r" 
+    43477 "Javanese ShifÃ«r PesÃ«" 
+    43478 "Javanese ShifÃ«r GjashtÃ«" 
+    43479 "Javanese ShifÃ«r ShtatÃ«" 
+    43480 "Javanese ShifÃ«r TetÃ«" 
+    43481 "Javanese ShifÃ«r NÃ«ntÃ«" 
+    43486 "Javanese Pada Tirta Tumetes" 
+    43487 "Javanese Pada Isen-Isen" 
+    43520 "Cham ShkronjÃ« A" 
+    43521 "Cham ShkronjÃ« I" 
+    43522 "Cham ShkronjÃ« U" 
+    43523 "Cham ShkronjÃ« E" 
+    43524 "Cham ShkronjÃ« Ai" 
+    43525 "Cham ShkronjÃ« O" 
+    43526 "Cham ShkronjÃ« Ka" 
+    43527 "Cham ShkronjÃ« Kha" 
+    43528 "Cham ShkronjÃ« Ga" 
+    43529 "Cham ShkronjÃ« Gha" 
+    43530 "Cham ShkronjÃ« Ngue" 
+    43531 "Cham ShkronjÃ« Nga" 
+    43532 "Cham ShkronjÃ« Cha" 
+    43533 "Cham ShkronjÃ« Chha" 
+    43534 "Cham ShkronjÃ« Ja" 
+    43535 "Cham ShkronjÃ« Jha" 
+    43536 "Cham ShkronjÃ« Nhue" 
+    43537 "Cham ShkronjÃ« Nha" 
+    43538 "Cham ShkronjÃ« Nhja" 
+    43539 "Cham ShkronjÃ« Ta" 
+    43540 "Cham ShkronjÃ« Tha" 
+    43541 "Cham ShkronjÃ« Da" 
+    43542 "Cham ShkronjÃ« Dha" 
+    43543 "Cham ShkronjÃ« Nue" 
+    43544 "Cham ShkronjÃ« Na" 
+    43545 "Cham ShkronjÃ« Dda" 
+    43546 "Cham ShkronjÃ« Pa" 
+    43547 "Cham ShkronjÃ« Ppa" 
+    43548 "Cham ShkronjÃ« Pha" 
+    43549 "Cham ShkronjÃ« Ba" 
+    43550 "Cham ShkronjÃ« Bha" 
+    43551 "Cham ShkronjÃ« Mue" 
+    43552 "Cham ShkronjÃ« Ma" 
+    43553 "Cham ShkronjÃ« Bba" 
+    43554 "Cham ShkronjÃ« Ya" 
+    43555 "Cham ShkronjÃ« Ra" 
+    43556 "Cham ShkronjÃ« La" 
+    43557 "Cham ShkronjÃ« Va" 
+    43558 "Cham ShkronjÃ« Ssa" 
+    43559 "Cham ShkronjÃ« Sa" 
+    43560 "Cham ShkronjÃ« Ha" 
+    43561 "Cham Zanore ShenjÃ« Aa" 
+    43562 "Cham Zanore ShenjÃ« I" 
+    43563 "Cham Zanore ShenjÃ« Ii" 
+    43564 "Cham Zanore ShenjÃ« Ei" 
+    43565 "Cham Zanore ShenjÃ« U" 
+    43566 "Cham Zanore ShenjÃ« Oe" 
+    43567 "Cham Zanore ShenjÃ« O" 
+    43568 "Cham Zanore ShenjÃ« Ai" 
+    43569 "Cham Zanore ShenjÃ« Au" 
+    43570 "Cham Zanore ShenjÃ« Ue" 
+    43571 "Cham BashkÃ«tingÃ«llore ShenjÃ« Ya" 
+    43572 "Cham BashkÃ«tingÃ«llore ShenjÃ« Ra" 
+    43573 "Cham BashkÃ«tingÃ«llore ShenjÃ« La" 
+    43574 "Cham BashkÃ«tingÃ«llore ShenjÃ« Wa" 
+    43584 "Cham ShkronjÃ« PÃ«rfundimtare K" 
+    43585 "Cham ShkronjÃ« PÃ«rfundimtare G" 
+    43586 "Cham ShkronjÃ« PÃ«rfundimtare Ng" 
+    43587 "Cham BashkÃ«tingÃ«llore ShenjÃ« PÃ«rfundimtare Ng" 
+    43588 "Cham ShkronjÃ« PÃ«rfundimtare Ch" 
+    43589 "Cham ShkronjÃ« PÃ«rfundimtare T" 
+    43590 "Cham ShkronjÃ« PÃ«rfundimtare N" 
+    43591 "Cham ShkronjÃ« PÃ«rfundimtare P" 
+    43592 "Cham ShkronjÃ« PÃ«rfundimtare Y" 
+    43593 "Cham ShkronjÃ« PÃ«rfundimtare R" 
+    43594 "Cham ShkronjÃ« PÃ«rfundimtare L" 
+    43595 "Cham ShkronjÃ« PÃ«rfundimtare Ss" 
+    43596 "Cham BashkÃ«tingÃ«llore ShenjÃ« PÃ«rfundimtare M" 
+    43597 "Cham BashkÃ«tingÃ«llore ShenjÃ« PÃ«rfundimtare H" 
+    43600 "Cham ShifÃ«r Zero" 
+    43601 "Cham ShifÃ«r One" 
+    43602 "Cham ShifÃ«r Dy" 
+    43603 "Cham ShifÃ«r Tre" 
+    43604 "Cham ShifÃ«r KatÃ«r" 
+    43605 "Cham ShifÃ«r PesÃ«" 
+    43606 "Cham ShifÃ«r GjashtÃ«" 
+    43607 "Cham ShifÃ«r ShtatÃ«" 
+    43608 "Cham ShifÃ«r TetÃ«" 
+    43609 "Cham ShifÃ«r NÃ«ntÃ«" 
+    43612 "Cham PikÃ«sim Spiral" 
+    43613 "Cham PikÃ«sim Danda" 
+    43614 "Cham PikÃ«sim Dyshe Danda" 
+    43615 "Cham PikÃ«sim Trefish Danda" 
+    43616 "Myanmar ShkronjÃ« Khamti Ga" 
+    43617 "Myanmar ShkronjÃ« Khamti Ca" 
+    43618 "Myanmar ShkronjÃ« Khamti Cha" 
+    43619 "Myanmar ShkronjÃ« Khamti Ja" 
+    43620 "Myanmar ShkronjÃ« Khamti Jha" 
+    43621 "Myanmar ShkronjÃ« Khamti Nya" 
+    43622 "Myanmar ShkronjÃ« Khamti Tta" 
+    43623 "Myanmar ShkronjÃ« Khamti Ttha" 
+    43624 "Myanmar ShkronjÃ« Khamti Dda" 
+    43625 "Myanmar ShkronjÃ« Khamti Ddha" 
+    43626 "Myanmar ShkronjÃ« Khamti Dha" 
+    43627 "Myanmar ShkronjÃ« Khamti Na" 
+    43628 "Myanmar ShkronjÃ« Khamti Sa" 
+    43629 "Myanmar ShkronjÃ« Khamti Ha" 
+    43630 "Myanmar ShkronjÃ« Khamti Hha" 
+    43631 "Myanmar ShkronjÃ« Khamti Fa" 
+    43632 "Myanmar Modifiko ShkronjÃ« Khamti Reduplication" 
+    43633 "Myanmar ShkronjÃ« Khamti Xa" 
+    43634 "Myanmar ShkronjÃ« Khamti Za" 
+    43635 "Myanmar ShkronjÃ« Khamti Ra" 
+    43636 "Myanmar Logogram Khamti Oay" 
+    43637 "Myanmar Logogram Khamti Qn" 
+    43638 "Myanmar Logogram Khamti Hm" 
+    43639 "Myanmar Simbol Aiton Thirrje" 
+    43640 "Myanmar Simbol Aiton One" 
+    43641 "Myanmar Simbol Aiton Dy" 
+    43642 "Myanmar ShkronjÃ« Aiton Ra" 
+    43643 "Myanmar ShenjÃ« Pao Karen Tone" 
+    43648 "Tai Viet ShkronjÃ« UlÃ«t Ko" 
+    43649 "Tai Viet ShkronjÃ« Lart Ko" 
+    43650 "Tai Viet ShkronjÃ« UlÃ«t Kho" 
+    43651 "Tai Viet ShkronjÃ« Lart Kho" 
+    43652 "Tai Viet ShkronjÃ« UlÃ«t Khho" 
+    43653 "Tai Viet ShkronjÃ« Lart Khho" 
+    43654 "Tai Viet ShkronjÃ« UlÃ«t Go" 
+    43655 "Tai Viet ShkronjÃ« Lart Go" 
+    43656 "Tai Viet ShkronjÃ« UlÃ«t Ngo" 
+    43657 "Tai Viet ShkronjÃ« Lart Ngo" 
+    43658 "Tai Viet ShkronjÃ« UlÃ«t Co" 
+    43659 "Tai Viet ShkronjÃ« Lart Co" 
+    43660 "Tai Viet ShkronjÃ« UlÃ«t Cho" 
+    43661 "Tai Viet ShkronjÃ« Lart Cho" 
+    43662 "Tai Viet ShkronjÃ« UlÃ«t So" 
+    43663 "Tai Viet ShkronjÃ« Lart So" 
+    43664 "Tai Viet ShkronjÃ« UlÃ«t Nyo" 
+    43665 "Tai Viet ShkronjÃ« Lart Nyo" 
+    43666 "Tai Viet ShkronjÃ« UlÃ«t Do" 
+    43667 "Tai Viet ShkronjÃ« Lart Do" 
+    43668 "Tai Viet ShkronjÃ« UlÃ«t To" 
+    43669 "Tai Viet ShkronjÃ« Lart To" 
+    43670 "Tai Viet ShkronjÃ« UlÃ«t Tho" 
+    43671 "Tai Viet ShkronjÃ« Lart Tho" 
+    43672 "Tai Viet ShkronjÃ« UlÃ«t No" 
+    43673 "Tai Viet ShkronjÃ« Lart No" 
+    43674 "Tai Viet ShkronjÃ« UlÃ«t Bo" 
+    43675 "Tai Viet ShkronjÃ« Lart Bo" 
+    43676 "Tai Viet ShkronjÃ« UlÃ«t Po" 
+    43677 "Tai Viet ShkronjÃ« Lart Po" 
+    43678 "Tai Viet ShkronjÃ« UlÃ«t Pho" 
+    43679 "Tai Viet ShkronjÃ« Lart Pho" 
+    43680 "Tai Viet ShkronjÃ« UlÃ«t Fo" 
+    43681 "Tai Viet ShkronjÃ« Lart Fo" 
+    43682 "Tai Viet ShkronjÃ« UlÃ«t Mo" 
+    43683 "Tai Viet ShkronjÃ« Lart Mo" 
+    43684 "Tai Viet ShkronjÃ« UlÃ«t Yo" 
+    43685 "Tai Viet ShkronjÃ« Lart Yo" 
+    43686 "Tai Viet ShkronjÃ« UlÃ«t Ro" 
+    43687 "Tai Viet ShkronjÃ« Lart Ro" 
+    43688 "Tai Viet ShkronjÃ« UlÃ«t Lo" 
+    43689 "Tai Viet ShkronjÃ« Lart Lo" 
+    43690 "Tai Viet ShkronjÃ« UlÃ«t Vo" 
+    43691 "Tai Viet ShkronjÃ« Lart Vo" 
+    43692 "Tai Viet ShkronjÃ« UlÃ«t Ho" 
+    43693 "Tai Viet ShkronjÃ« Lart Ho" 
+    43694 "Tai Viet ShkronjÃ« UlÃ«t O" 
+    43695 "Tai Viet ShkronjÃ« Lart O" 
+    43696 "Tai Viet Mai Kang" 
+    43697 "Tai Viet Zanore Aa" 
+    43698 "Tai Viet Zanore I" 
+    43699 "Tai Viet Zanore Ue" 
+    43700 "Tai Viet Zanore U" 
+    43701 "Tai Viet Zanore E" 
+    43702 "Tai Viet Zanore O" 
+    43703 "Tai Viet Mai Khit" 
+    43704 "Tai Viet Zanore Ia" 
+    43705 "Tai Viet Zanore Uea" 
+    43706 "Tai Viet Zanore Ua" 
+    43707 "Tai Viet Zanore Aue" 
+    43708 "Tai Viet Zanore Ay" 
+    43709 "Tai Viet Zanore An" 
+    43710 "Tai Viet Zanore Am" 
+    43711 "Tai Viet Tone Mai Ek" 
+    43712 "Tai Viet Tone Mai Nueng" 
+    43713 "Tai Viet Tone Mai Tho" 
+    43714 "Tai Viet Tone Mai Song" 
+    43739 "Tai Viet Simbol Kon" 
+    43740 "Tai Viet Simbol Nueng" 
+    43741 "Tai Viet Simbol Sam" 
+    43742 "Tai Viet Simbol Ho Hoi" 
+    43743 "Tai Viet Simbol Koi Koi" 
+    43744 "Meetei Mayek ShkronjÃ« E" 
+    43745 "Meetei Mayek ShkronjÃ« O" 
+    43746 "Meetei Mayek ShkronjÃ« Cha" 
+    43747 "Meetei Mayek ShkronjÃ« Nya" 
+    43748 "Meetei Mayek ShkronjÃ« Tta" 
+    43749 "Meetei Mayek ShkronjÃ« Ttha" 
+    43750 "Meetei Mayek ShkronjÃ« Dda" 
+    43751 "Meetei Mayek ShkronjÃ« Ddha" 
+    43752 "Meetei Mayek ShkronjÃ« Nna" 
+    43753 "Meetei Mayek ShkronjÃ« Sha" 
+    43754 "Meetei Mayek ShkronjÃ« Ssa" 
+    43755 "Meetei Mayek Zanore ShenjÃ« Ii" 
+    43756 "Meetei Mayek Zanore ShenjÃ« Uu" 
+    43757 "Meetei Mayek Zanore ShenjÃ« Aai" 
+    43758 "Meetei Mayek Zanore ShenjÃ« Au" 
+    43759 "Meetei Mayek Zanore ShenjÃ« Aau" 
+    43760 "Meetei Mayek Cheikhan" 
+    43761 "Meetei Mayek Ahang Khudam" 
+    43762 "Meetei Mayek Anji" 
+    43763 "Meetei Mayek Rrokje Repetition ShenjÃ«" 
+    43764 "Meetei Mayek Word Repetition ShenjÃ«" 
+    43765 "Meetei Mayek Zanore ShenjÃ« Visarga" 
+    43766 "Meetei Mayek Virama" 
+    43777 "Ethiopic Rrokje Tthu" 
+    43778 "Ethiopic Rrokje Tthi" 
+    43779 "Ethiopic Rrokje Tthaa" 
+    43780 "Ethiopic Rrokje Tthee" 
+    43781 "Ethiopic Rrokje Tthe" 
+    43782 "Ethiopic Rrokje Ttho" 
+    43785 "Ethiopic Rrokje Ddhu" 
+    43786 "Ethiopic Rrokje Ddhi" 
+    43787 "Ethiopic Rrokje Ddhaa" 
+    43788 "Ethiopic Rrokje Ddhee" 
+    43789 "Ethiopic Rrokje Ddhe" 
+    43790 "Ethiopic Rrokje Ddho" 
+    43793 "Ethiopic Rrokje Dzu" 
+    43794 "Ethiopic Rrokje Dzi" 
+    43795 "Ethiopic Rrokje Dzaa" 
+    43796 "Ethiopic Rrokje Dzee" 
+    43797 "Ethiopic Rrokje Dze" 
+    43798 "Ethiopic Rrokje Dzo" 
+    43808 "Ethiopic Rrokje Cchha" 
+    43809 "Ethiopic Rrokje Cchhu" 
+    43810 "Ethiopic Rrokje Cchhi" 
+    43811 "Ethiopic Rrokje Cchhaa" 
+    43812 "Ethiopic Rrokje Cchhee" 
+    43813 "Ethiopic Rrokje Cchhe" 
+    43814 "Ethiopic Rrokje Cchho" 
+    43816 "Ethiopic Rrokje Bba" 
+    43817 "Ethiopic Rrokje Bbu" 
+    43818 "Ethiopic Rrokje Bbi" 
+    43819 "Ethiopic Rrokje Bbaa" 
+    43820 "Ethiopic Rrokje Bbee" 
+    43821 "Ethiopic Rrokje Bbe" 
+    43822 "Ethiopic Rrokje Bbo" 
+    43968 "Meetei Mayek ShkronjÃ« Kok" 
+    43969 "Meetei Mayek ShkronjÃ« Sam" 
+    43970 "Meetei Mayek ShkronjÃ« Lai" 
+    43971 "Meetei Mayek ShkronjÃ« Mit" 
+    43972 "Meetei Mayek ShkronjÃ« Pa" 
+    43973 "Meetei Mayek ShkronjÃ« Na" 
+    43974 "Meetei Mayek ShkronjÃ« Chil" 
+    43975 "Meetei Mayek ShkronjÃ« Til" 
+    43976 "Meetei Mayek ShkronjÃ« Khou" 
+    43977 "Meetei Mayek ShkronjÃ« Ngou" 
+    43978 "Meetei Mayek ShkronjÃ« Thou" 
+    43979 "Meetei Mayek ShkronjÃ« Wai" 
+    43980 "Meetei Mayek ShkronjÃ« Yang" 
+    43981 "Meetei Mayek ShkronjÃ« Huk" 
+    43982 "Meetei Mayek ShkronjÃ« Un" 
+    43983 "Meetei Mayek ShkronjÃ« I" 
+    43984 "Meetei Mayek ShkronjÃ« Pham" 
+    43985 "Meetei Mayek ShkronjÃ« Atiya" 
+    43986 "Meetei Mayek ShkronjÃ« Gok" 
+    43987 "Meetei Mayek ShkronjÃ« Jham" 
+    43988 "Meetei Mayek ShkronjÃ« Rai" 
+    43989 "Meetei Mayek ShkronjÃ« Ba" 
+    43990 "Meetei Mayek ShkronjÃ« Jil" 
+    43991 "Meetei Mayek ShkronjÃ« Dil" 
+    43992 "Meetei Mayek ShkronjÃ« Ghou" 
+    43993 "Meetei Mayek ShkronjÃ« Dhou" 
+    43994 "Meetei Mayek ShkronjÃ« Bham" 
+    43995 "Meetei Mayek ShkronjÃ« Kok Lonsum" 
+    43996 "Meetei Mayek ShkronjÃ« Lai Lonsum" 
+    43997 "Meetei Mayek ShkronjÃ« Mit Lonsum" 
+    43998 "Meetei Mayek ShkronjÃ« Pa Lonsum" 
+    43999 "Meetei Mayek ShkronjÃ« Na Lonsum" 
+    44000 "Meetei Mayek ShkronjÃ« Til Lonsum" 
+    44001 "Meetei Mayek ShkronjÃ« Ngou Lonsum" 
+    44002 "Meetei Mayek ShkronjÃ« I Lonsum" 
+    44003 "Meetei Mayek Zanore ShenjÃ« Onap" 
+    44004 "Meetei Mayek Zanore ShenjÃ« Inap" 
+    44005 "Meetei Mayek Zanore ShenjÃ« Anap" 
+    44006 "Meetei Mayek Zanore ShenjÃ« Yenap" 
+    44007 "Meetei Mayek Zanore ShenjÃ« Sounap" 
+    44008 "Meetei Mayek Zanore ShenjÃ« Unap" 
+    44009 "Meetei Mayek Zanore ShenjÃ« Cheinap" 
+    44010 "Meetei Mayek Zanore ShenjÃ« Nung" 
+    44011 "Meetei Mayek Cheikhei" 
+    44012 "Meetei Mayek Lum Iyek" 
+    44013 "Meetei Mayek Apun Iyek" 
+    44016 "Meetei Mayek ShifÃ«r Zero" 
+    44017 "Meetei Mayek ShifÃ«r NjÃ«" 
+    44018 "Meetei Mayek ShifÃ«r Dy" 
+    44019 "Meetei Mayek ShifÃ«r Tre" 
+    44020 "Meetei Mayek ShifÃ«r KatÃ«r" 
+    44021 "Meetei Mayek ShifÃ«r PesÃ«" 
+    44022 "Meetei Mayek ShifÃ«r GjashtÃ«" 
+    44023 "Meetei Mayek ShifÃ«r ShtatÃ«" 
+    44024 "Meetei Mayek ShifÃ«r TetÃ«" 
+    44025 "Meetei Mayek ShifÃ«r NÃ«ntÃ«" 
+    44032 "<Hangul Rrokje, First>" 
+    55203 "<Hangul Rrokje, Last>" 
+    55216 "Hangul Jungseong O-Yeo" 
+    55217 "Hangul Jungseong O-O-I" 
+    55218 "Hangul Jungseong Yo-A" 
+    55219 "Hangul Jungseong Yo-Ae" 
+    55220 "Hangul Jungseong Yo-Eo" 
+    55221 "Hangul Jungseong U-Yeo" 
+    55222 "Hangul Jungseong U-I-I" 
+    55223 "Hangul Jungseong Yu-Ae" 
+    55224 "Hangul Jungseong Yu-O" 
+    55225 "Hangul Jungseong Eu-A" 
+    55226 "Hangul Jungseong Eu-Eo" 
+    55227 "Hangul Jungseong Eu-E" 
+    55228 "Hangul Jungseong Eu-O" 
+    55229 "Hangul Jungseong I-Ya-O" 
+    55230 "Hangul Jungseong I-Yae" 
+    55231 "Hangul Jungseong I-Yeo" 
+    55232 "Hangul Jungseong I-Ye" 
+    55233 "Hangul Jungseong I-O-I" 
+    55234 "Hangul Jungseong I-Yo" 
+    55235 "Hangul Jungseong I-Yu" 
+    55236 "Hangul Jungseong I-I" 
+    55237 "Hangul Jungseong Araea-A" 
+    55238 "Hangul Jungseong Araea-E" 
+    55243 "Hangul Jongseong Nieun-Rieul" 
+    55244 "Hangul Jongseong Nieun-Chieuch" 
+    55245 "Hangul Jongseong Ssangtikeut" 
+    55246 "Hangul Jongseong Ssangtikeut-Pieup" 
+    55247 "Hangul Jongseong Tikeut-Pieup" 
+    55248 "Hangul Jongseong Tikeut-Sios" 
+    55249 "Hangul Jongseong Tikeut-Sios-Kiyeok" 
+    55250 "Hangul Jongseong Tikeut-Cieuc" 
+    55251 "Hangul Jongseong Tikeut-Chieuch" 
+    55252 "Hangul Jongseong Tikeut-Thieuth" 
+    55253 "Hangul Jongseong Rieul-Ssangkiyeok" 
+    55254 "Hangul Jongseong Rieul-Kiyeok-Hieuh" 
+    55255 "Hangul Jongseong Ssangrieul-Khieukh" 
+    55256 "Hangul Jongseong Rieul-Mieum-Hieuh" 
+    55257 "Hangul Jongseong Rieul-Pieup-Tikeut" 
+    55258 "Hangul Jongseong Rieul-Pieup-Phieuph" 
+    55259 "Hangul Jongseong Rieul-Yesieung" 
+    55260 "Hangul Jongseong Rieul-Yeorinhieuh-Hieuh" 
+    55261 "Hangul Jongseong Kapyeounrieul" 
+    55262 "Hangul Jongseong Mieum-Nieun" 
+    55263 "Hangul Jongseong Mieum-Ssangnieun" 
+    55264 "Hangul Jongseong Ssangmieum" 
+    55265 "Hangul Jongseong Mieum-Pieup-Sios" 
+    55266 "Hangul Jongseong Mieum-Cieuc" 
+    55267 "Hangul Jongseong Pieup-Tikeut" 
+    55268 "Hangul Jongseong Pieup-Rieul-Phieuph" 
+    55269 "Hangul Jongseong Pieup-Mieum" 
+    55270 "Hangul Jongseong Ssangpieup" 
+    55271 "Hangul Jongseong Pieup-Sios-Tikeut" 
+    55272 "Hangul Jongseong Pieup-Cieuc" 
+    55273 "Hangul Jongseong Pieup-Chieuch" 
+    55274 "Hangul Jongseong Sios-Mieum" 
+    55275 "Hangul Jongseong Sios-Kapyeounpieup" 
+    55276 "Hangul Jongseong Ssangsios-Kiyeok" 
+    55277 "Hangul Jongseong Ssangsios-Tikeut" 
+    55278 "Hangul Jongseong Sios-Pansios" 
+    55279 "Hangul Jongseong Sios-Cieuc" 
+    55280 "Hangul Jongseong Sios-Chieuch" 
+    55281 "Hangul Jongseong Sios-Thieuth" 
+    55282 "Hangul Jongseong Sios-Hieuh" 
+    55283 "Hangul Jongseong Pansios-Pieup" 
+    55284 "Hangul Jongseong Pansios-Kapyeounpieup" 
+    55285 "Hangul Jongseong Yesieung-Mieum" 
+    55286 "Hangul Jongseong Yesieung-Hieuh" 
+    55287 "Hangul Jongseong Cieuc-Pieup" 
+    55288 "Hangul Jongseong Cieuc-Ssangpieup" 
+    55289 "Hangul Jongseong Ssangcieuc" 
+    55290 "Hangul Jongseong Phieuph-Sios" 
+    55291 "Hangul Jongseong Phieuph-Thieuth" 
+    55296 "<Jo Private PÃ«rdor Lart ZÃ«vendÃ«sues, Emri>" 
+    56191 "<Jo Private PÃ«rdor Lart ZÃ«vendÃ«sues, Mbiemri>" 
+    56192 "<Private PÃ«rdor Lart ZÃ«vendÃ«sues, Emri>" 
+    56319 "<Private PÃ«rdor Lart ZÃ«vendÃ«sues, Mbiemri>" 
+    56320 "<UlÃ«t ZÃ«vendÃ«sues, Emri>" 
+    57343 "<UlÃ«t ZÃ«vendÃ«sues, Mbiemri>" 
+    57344 "<Private PÃ«rdor, Emri>" 
+    63743 "<Private PÃ«rdor, Mbiemri>" 
+    63744 "CJK PajtueshmÃ«ri Ideograf-F900" 
+    63745 "CJK PajtueshmÃ«ri Ideograf-F901" 
+    63746 "CJK PajtueshmÃ«ri Ideograf-F902" 
+    63747 "CJK PajtueshmÃ«ri Ideograf-F903" 
+    63748 "CJK PajtueshmÃ«ri Ideograf-F904" 
+    63749 "CJK PajtueshmÃ«ri Ideograf-F905" 
+    63750 "CJK PajtueshmÃ«ri Ideograf-F906" 
+    63751 "CJK PajtueshmÃ«ri Ideograf-F907" 
+    63752 "CJK PajtueshmÃ«ri Ideograf-F908" 
+    63753 "CJK PajtueshmÃ«ri Ideograf-F909" 
+    63754 "CJK PajtueshmÃ«ri Ideograf-F90a" 
+    63755 "CJK PajtueshmÃ«ri Ideograf-F90b" 
+    63756 "CJK PajtueshmÃ«ri Ideograf-F90c" 
+    63757 "CJK PajtueshmÃ«ri Ideograf-F90d" 
+    63758 "CJK PajtueshmÃ«ri Ideograf-F90e" 
+    63759 "CJK PajtueshmÃ«ri Ideograf-F90f" 
+    63760 "CJK PajtueshmÃ«ri Ideograf-F910" 
+    63761 "CJK PajtueshmÃ«ri Ideograf-F911" 
+    63762 "CJK PajtueshmÃ«ri Ideograf-F912" 
+    63763 "CJK PajtueshmÃ«ri Ideograf-F913" 
+    63764 "CJK PajtueshmÃ«ri Ideograf-F914" 
+    63765 "CJK PajtueshmÃ«ri Ideograf-F915" 
+    63766 "CJK PajtueshmÃ«ri Ideograf-F916" 
+    63767 "CJK PajtueshmÃ«ri Ideograf-F917" 
+    63768 "CJK PajtueshmÃ«ri Ideograf-F918" 
+    63769 "CJK PajtueshmÃ«ri Ideograf-F919" 
+    63770 "CJK PajtueshmÃ«ri Ideograf-F91a" 
+    63771 "CJK PajtueshmÃ«ri Ideograf-F91b" 
+    63772 "CJK PajtueshmÃ«ri Ideograf-F91c" 
+    63773 "CJK PajtueshmÃ«ri Ideograf-F91d" 
+    63774 "CJK PajtueshmÃ«ri Ideograf-F91e" 
+    63775 "CJK PajtueshmÃ«ri Ideograf-F91f" 
+    63776 "CJK PajtueshmÃ«ri Ideograf-F920" 
+    63777 "CJK PajtueshmÃ«ri Ideograf-F921" 
+    63778 "CJK PajtueshmÃ«ri Ideograf-F922" 
+    63779 "CJK PajtueshmÃ«ri Ideograf-F923" 
+    63780 "CJK PajtueshmÃ«ri Ideograf-F924" 
+    63781 "CJK PajtueshmÃ«ri Ideograf-F925" 
+    63782 "CJK PajtueshmÃ«ri Ideograf-F926" 
+    63783 "CJK PajtueshmÃ«ri Ideograf-F927" 
+    63784 "CJK PajtueshmÃ«ri Ideograf-F928" 
+    63785 "CJK PajtueshmÃ«ri Ideograf-F929" 
+    63786 "CJK PajtueshmÃ«ri Ideograf-F92a" 
+    63787 "CJK PajtueshmÃ«ri Ideograf-F92b" 
+    63788 "CJK PajtueshmÃ«ri Ideograf-F92c" 
+    63789 "CJK PajtueshmÃ«ri Ideograf-F92d" 
+    63790 "CJK PajtueshmÃ«ri Ideograf-F92e" 
+    63791 "CJK PajtueshmÃ«ri Ideograf-F92f" 
+    63792 "CJK PajtueshmÃ«ri Ideograf-F930" 
+    63793 "CJK PajtueshmÃ«ri Ideograf-F931" 
+    63794 "CJK PajtueshmÃ«ri Ideograf-F932" 
+    63795 "CJK PajtueshmÃ«ri Ideograf-F933" 
+    63796 "CJK PajtueshmÃ«ri Ideograf-F934" 
+    63797 "CJK PajtueshmÃ«ri Ideograf-F935" 
+    63798 "CJK PajtueshmÃ«ri Ideograf-F936" 
+    63799 "CJK PajtueshmÃ«ri Ideograf-F937" 
+    63800 "CJK PajtueshmÃ«ri Ideograf-F938" 
+    63801 "CJK PajtueshmÃ«ri Ideograf-F939" 
+    63802 "CJK PajtueshmÃ«ri Ideograf-F93a" 
+    63803 "CJK PajtueshmÃ«ri Ideograf-F93b" 
+    63804 "CJK PajtueshmÃ«ri Ideograf-F93c" 
+    63805 "CJK PajtueshmÃ«ri Ideograf-F93d" 
+    63806 "CJK PajtueshmÃ«ri Ideograf-F93e" 
+    63807 "CJK PajtueshmÃ«ri Ideograf-F93f" 
+    63808 "CJK PajtueshmÃ«ri Ideograf-F940" 
+    63809 "CJK PajtueshmÃ«ri Ideograf-F941" 
+    63810 "CJK PajtueshmÃ«ri Ideograf-F942" 
+    63811 "CJK PajtueshmÃ«ri Ideograf-F943" 
+    63812 "CJK PajtueshmÃ«ri Ideograf-F944" 
+    63813 "CJK PajtueshmÃ«ri Ideograf-F945" 
+    63814 "CJK PajtueshmÃ«ri Ideograf-F946" 
+    63815 "CJK PajtueshmÃ«ri Ideograf-F947" 
+    63816 "CJK PajtueshmÃ«ri Ideograf-F948" 
+    63817 "CJK PajtueshmÃ«ri Ideograf-F949" 
+    63818 "CJK PajtueshmÃ«ri Ideograf-F94a" 
+    63819 "CJK PajtueshmÃ«ri Ideograf-F94b" 
+    63820 "CJK PajtueshmÃ«ri Ideograf-F94c" 
+    63821 "CJK PajtueshmÃ«ri Ideograf-F94d" 
+    63822 "CJK PajtueshmÃ«ri Ideograf-F94e" 
+    63823 "CJK PajtueshmÃ«ri Ideograf-F94f" 
+    63824 "CJK PajtueshmÃ«ri Ideograf-F950" 
+    63825 "CJK PajtueshmÃ«ri Ideograf-F951" 
+    63826 "CJK PajtueshmÃ«ri Ideograf-F952" 
+    63827 "CJK PajtueshmÃ«ri Ideograf-F953" 
+    63828 "CJK PajtueshmÃ«ri Ideograf-F954" 
+    63829 "CJK PajtueshmÃ«ri Ideograf-F955" 
+    63830 "CJK PajtueshmÃ«ri Ideograf-F956" 
+    63831 "CJK PajtueshmÃ«ri Ideograf-F957" 
+    63832 "CJK PajtueshmÃ«ri Ideograf-F958" 
+    63833 "CJK PajtueshmÃ«ri Ideograf-F959" 
+    63834 "CJK PajtueshmÃ«ri Ideograf-F95a" 
+    63835 "CJK PajtueshmÃ«ri Ideograf-F95b" 
+    63836 "CJK PajtueshmÃ«ri Ideograf-F95c" 
+    63837 "CJK PajtueshmÃ«ri Ideograf-F95d" 
+    63838 "CJK PajtueshmÃ«ri Ideograf-F95e" 
+    63839 "CJK PajtueshmÃ«ri Ideograf-F95f" 
+    63840 "CJK PajtueshmÃ«ri Ideograf-F960" 
+    63841 "CJK PajtueshmÃ«ri Ideograf-F961" 
+    63842 "CJK PajtueshmÃ«ri Ideograf-F962" 
+    63843 "CJK PajtueshmÃ«ri Ideograf-F963" 
+    63844 "CJK PajtueshmÃ«ri Ideograf-F964" 
+    63845 "CJK PajtueshmÃ«ri Ideograf-F965" 
+    63846 "CJK PajtueshmÃ«ri Ideograf-F966" 
+    63847 "CJK PajtueshmÃ«ri Ideograf-F967" 
+    63848 "CJK PajtueshmÃ«ri Ideograf-F968" 
+    63849 "CJK PajtueshmÃ«ri Ideograf-F969" 
+    63850 "CJK PajtueshmÃ«ri Ideograf-F96a" 
+    63851 "CJK PajtueshmÃ«ri Ideograf-F96b" 
+    63852 "CJK PajtueshmÃ«ri Ideograf-F96c" 
+    63853 "CJK PajtueshmÃ«ri Ideograf-F96d" 
+    63854 "CJK PajtueshmÃ«ri Ideograf-F96e" 
+    63855 "CJK PajtueshmÃ«ri Ideograf-F96f" 
+    63856 "CJK PajtueshmÃ«ri Ideograf-F970" 
+    63857 "CJK PajtueshmÃ«ri Ideograf-F971" 
+    63858 "CJK PajtueshmÃ«ri Ideograf-F972" 
+    63859 "CJK PajtueshmÃ«ri Ideograf-F973" 
+    63860 "CJK PajtueshmÃ«ri Ideograf-F974" 
+    63861 "CJK PajtueshmÃ«ri Ideograf-F975" 
+    63862 "CJK PajtueshmÃ«ri Ideograf-F976" 
+    63863 "CJK PajtueshmÃ«ri Ideograf-F977" 
+    63864 "CJK PajtueshmÃ«ri Ideograf-F978" 
+    63865 "CJK PajtueshmÃ«ri Ideograf-F979" 
+    63866 "CJK PajtueshmÃ«ri Ideograf-F97a" 
+    63867 "CJK PajtueshmÃ«ri Ideograf-F97b" 
+    63868 "CJK PajtueshmÃ«ri Ideograf-F97c" 
+    63869 "CJK PajtueshmÃ«ri Ideograf-F97d" 
+    63870 "CJK PajtueshmÃ«ri Ideograf-F97e" 
+    63871 "CJK PajtueshmÃ«ri Ideograf-F97f" 
+    63872 "CJK PajtueshmÃ«ri Ideograf-F980" 
+    63873 "CJK PajtueshmÃ«ri Ideograf-F981" 
+    63874 "CJK PajtueshmÃ«ri Ideograf-F982" 
+    63875 "CJK PajtueshmÃ«ri Ideograf-F983" 
+    63876 "CJK PajtueshmÃ«ri Ideograf-F984" 
+    63877 "CJK PajtueshmÃ«ri Ideograf-F985" 
+    63878 "CJK PajtueshmÃ«ri Ideograf-F986" 
+    63879 "CJK PajtueshmÃ«ri Ideograf-F987" 
+    63880 "CJK PajtueshmÃ«ri Ideograf-F988" 
+    63881 "CJK PajtueshmÃ«ri Ideograf-F989" 
+    63882 "CJK PajtueshmÃ«ri Ideograf-F98a" 
+    63883 "CJK PajtueshmÃ«ri Ideograf-F98b" 
+    63884 "CJK PajtueshmÃ«ri Ideograf-F98c" 
+    63885 "CJK PajtueshmÃ«ri Ideograf-F98d" 
+    63886 "CJK PajtueshmÃ«ri Ideograf-F98e" 
+    63887 "CJK PajtueshmÃ«ri Ideograf-F98f" 
+    63888 "CJK PajtueshmÃ«ri Ideograf-F990" 
+    63889 "CJK PajtueshmÃ«ri Ideograf-F991" 
+    63890 "CJK PajtueshmÃ«ri Ideograf-F992" 
+    63891 "CJK PajtueshmÃ«ri Ideograf-F993" 
+    63892 "CJK PajtueshmÃ«ri Ideograf-F994" 
+    63893 "CJK PajtueshmÃ«ri Ideograf-F995" 
+    63894 "CJK PajtueshmÃ«ri Ideograf-F996" 
+    63895 "CJK PajtueshmÃ«ri Ideograf-F997" 
+    63896 "CJK PajtueshmÃ«ri Ideograf-F998" 
+    63897 "CJK PajtueshmÃ«ri Ideograf-F999" 
+    63898 "CJK PajtueshmÃ«ri Ideograf-F99a" 
+    63899 "CJK PajtueshmÃ«ri Ideograf-F99b" 
+    63900 "CJK PajtueshmÃ«ri Ideograf-F99c" 
+    63901 "CJK PajtueshmÃ«ri Ideograf-F99d" 
+    63902 "CJK PajtueshmÃ«ri Ideograf-F99e" 
+    63903 "CJK PajtueshmÃ«ri Ideograf-F99f" 
+    63904 "CJK PajtueshmÃ«ri Ideograf-F9a0" 
+    63905 "CJK PajtueshmÃ«ri Ideograf-F9a1" 
+    63906 "CJK PajtueshmÃ«ri Ideograf-F9a2" 
+    63907 "CJK PajtueshmÃ«ri Ideograf-F9a3" 
+    63908 "CJK PajtueshmÃ«ri Ideograf-F9a4" 
+    63909 "CJK PajtueshmÃ«ri Ideograf-F9a5" 
+    63910 "CJK PajtueshmÃ«ri Ideograf-F9a6" 
+    63911 "CJK PajtueshmÃ«ri Ideograf-F9a7" 
+    63912 "CJK PajtueshmÃ«ri Ideograf-F9a8" 
+    63913 "CJK PajtueshmÃ«ri Ideograf-F9a9" 
+    63914 "CJK PajtueshmÃ«ri Ideograf-F9aa" 
+    63915 "CJK PajtueshmÃ«ri Ideograf-F9ab" 
+    63916 "CJK PajtueshmÃ«ri Ideograf-F9ac" 
+    63917 "CJK PajtueshmÃ«ri Ideograf-F9ad" 
+    63918 "CJK PajtueshmÃ«ri Ideograf-F9ae" 
+    63919 "CJK PajtueshmÃ«ri Ideograf-F9af" 
+    63920 "CJK PajtueshmÃ«ri Ideograf-F9b0" 
+    63921 "CJK PajtueshmÃ«ri Ideograf-F9b1" 
+    63922 "CJK PajtueshmÃ«ri Ideograf-F9b2" 
+    63923 "CJK PajtueshmÃ«ri Ideograf-F9b3" 
+    63924 "CJK PajtueshmÃ«ri Ideograf-F9b4" 
+    63925 "CJK PajtueshmÃ«ri Ideograf-F9b5" 
+    63926 "CJK PajtueshmÃ«ri Ideograf-F9b6" 
+    63927 "CJK PajtueshmÃ«ri Ideograf-F9b7" 
+    63928 "CJK PajtueshmÃ«ri Ideograf-F9b8" 
+    63929 "CJK PajtueshmÃ«ri Ideograf-F9b9" 
+    63930 "CJK PajtueshmÃ«ri Ideograf-F9ba" 
+    63931 "CJK PajtueshmÃ«ri Ideograf-F9bb" 
+    63932 "CJK PajtueshmÃ«ri Ideograf-F9bc" 
+    63933 "CJK PajtueshmÃ«ri Ideograf-F9bd" 
+    63934 "CJK PajtueshmÃ«ri Ideograf-F9be" 
+    63935 "CJK PajtueshmÃ«ri Ideograf-F9bf" 
+    63936 "CJK PajtueshmÃ«ri Ideograf-F9c0" 
+    63937 "CJK PajtueshmÃ«ri Ideograf-F9c1" 
+    63938 "CJK PajtueshmÃ«ri Ideograf-F9c2" 
+    63939 "CJK PajtueshmÃ«ri Ideograf-F9c3" 
+    63940 "CJK PajtueshmÃ«ri Ideograf-F9c4" 
+    63941 "CJK PajtueshmÃ«ri Ideograf-F9c5" 
+    63942 "CJK PajtueshmÃ«ri Ideograf-F9c6" 
+    63943 "CJK PajtueshmÃ«ri Ideograf-F9c7" 
+    63944 "CJK PajtueshmÃ«ri Ideograf-F9c8" 
+    63945 "CJK PajtueshmÃ«ri Ideograf-F9c9" 
+    63946 "CJK PajtueshmÃ«ri Ideograf-F9ca" 
+    63947 "CJK PajtueshmÃ«ri Ideograf-F9cb" 
+    63948 "CJK PajtueshmÃ«ri Ideograf-F9cc" 
+    63949 "CJK PajtueshmÃ«ri Ideograf-F9cd" 
+    63950 "CJK PajtueshmÃ«ri Ideograf-F9ce" 
+    63951 "CJK PajtueshmÃ«ri Ideograf-F9cf" 
+    63952 "CJK PajtueshmÃ«ri Ideograf-F9d0" 
+    63953 "CJK PajtueshmÃ«ri Ideograf-F9d1" 
+    63954 "CJK PajtueshmÃ«ri Ideograf-F9d2" 
+    63955 "CJK PajtueshmÃ«ri Ideograf-F9d3" 
+    63956 "CJK PajtueshmÃ«ri Ideograf-F9d4" 
+    63957 "CJK PajtueshmÃ«ri Ideograf-F9d5" 
+    63958 "CJK PajtueshmÃ«ri Ideograf-F9d6" 
+    63959 "CJK PajtueshmÃ«ri Ideograf-F9d7" 
+    63960 "CJK PajtueshmÃ«ri Ideograf-F9d8" 
+    63961 "CJK PajtueshmÃ«ri Ideograf-F9d9" 
+    63962 "CJK PajtueshmÃ«ri Ideograf-F9da" 
+    63963 "CJK PajtueshmÃ«ri Ideograf-F9db" 
+    63964 "CJK PajtueshmÃ«ri Ideograf-F9dc" 
+    63965 "CJK PajtueshmÃ«ri Ideograf-F9dd" 
+    63966 "CJK PajtueshmÃ«ri Ideograf-F9de" 
+    63967 "CJK PajtueshmÃ«ri Ideograf-F9df" 
+    63968 "CJK PajtueshmÃ«ri Ideograf-F9e0" 
+    63969 "CJK PajtueshmÃ«ri Ideograf-F9e1" 
+    63970 "CJK PajtueshmÃ«ri Ideograf-F9e2" 
+    63971 "CJK PajtueshmÃ«ri Ideograf-F9e3" 
+    63972 "CJK PajtueshmÃ«ri Ideograf-F9e4" 
+    63973 "CJK PajtueshmÃ«ri Ideograf-F9e5" 
+    63974 "CJK PajtueshmÃ«ri Ideograf-F9e6" 
+    63975 "CJK PajtueshmÃ«ri Ideograf-F9e7" 
+    63976 "CJK PajtueshmÃ«ri Ideograf-F9e8" 
+    63977 "CJK PajtueshmÃ«ri Ideograf-F9e9" 
+    63978 "CJK PajtueshmÃ«ri Ideograf-F9ea" 
+    63979 "CJK PajtueshmÃ«ri Ideograf-F9eb" 
+    63980 "CJK PajtueshmÃ«ri Ideograf-F9ec" 
+    63981 "CJK PajtueshmÃ«ri Ideograf-F9ed" 
+    63982 "CJK PajtueshmÃ«ri Ideograf-F9ee" 
+    63983 "CJK PajtueshmÃ«ri Ideograf-F9ef" 
+    63984 "CJK PajtueshmÃ«ri Ideograf-F9f0" 
+    63985 "CJK PajtueshmÃ«ri Ideograf-F9f1" 
+    63986 "CJK PajtueshmÃ«ri Ideograf-F9f2" 
+    63987 "CJK PajtueshmÃ«ri Ideograf-F9f3" 
+    63988 "CJK PajtueshmÃ«ri Ideograf-F9f4" 
+    63989 "CJK PajtueshmÃ«ri Ideograf-F9f5" 
+    63990 "CJK PajtueshmÃ«ri Ideograf-F9f6" 
+    63991 "CJK PajtueshmÃ«ri Ideograf-F9f7" 
+    63992 "CJK PajtueshmÃ«ri Ideograf-F9f8" 
+    63993 "CJK PajtueshmÃ«ri Ideograf-F9f9" 
+    63994 "CJK PajtueshmÃ«ri Ideograf-F9fa" 
+    63995 "CJK PajtueshmÃ«ri Ideograf-F9fb" 
+    63996 "CJK PajtueshmÃ«ri Ideograf-F9fc" 
+    63997 "CJK PajtueshmÃ«ri Ideograf-F9fd" 
+    63998 "CJK PajtueshmÃ«ri Ideograf-F9fe" 
+    63999 "CJK PajtueshmÃ«ri Ideograf-F9ff" 
+    64000 "CJK PajtueshmÃ«ri Ideograf-Fa00" 
+    64001 "CJK PajtueshmÃ«ri Ideograf-Fa01" 
+    64002 "CJK PajtueshmÃ«ri Ideograf-Fa02" 
+    64003 "CJK PajtueshmÃ«ri Ideograf-Fa03" 
+    64004 "CJK PajtueshmÃ«ri Ideograf-Fa04" 
+    64005 "CJK PajtueshmÃ«ri Ideograf-Fa05" 
+    64006 "CJK PajtueshmÃ«ri Ideograf-Fa06" 
+    64007 "CJK PajtueshmÃ«ri Ideograf-Fa07" 
+    64008 "CJK PajtueshmÃ«ri Ideograf-Fa08" 
+    64009 "CJK PajtueshmÃ«ri Ideograf-Fa09" 
+    64010 "CJK PajtueshmÃ«ri Ideograf-Fa0a" 
+    64011 "CJK PajtueshmÃ«ri Ideograf-Fa0b" 
+    64012 "CJK PajtueshmÃ«ri Ideograf-Fa0c" 
+    64013 "CJK PajtueshmÃ«ri Ideograf-Fa0d" 
+    64014 "CJK PajtueshmÃ«ri Ideograf-Fa0e" 
+    64015 "CJK PajtueshmÃ«ri Ideograf-Fa0f" 
+    64016 "CJK PajtueshmÃ«ri Ideograf-Fa10" 
+    64017 "CJK PajtueshmÃ«ri Ideograf-Fa11" 
+    64018 "CJK PajtueshmÃ«ri Ideograf-Fa12" 
+    64019 "CJK PajtueshmÃ«ri Ideograf-Fa13" 
+    64020 "CJK PajtueshmÃ«ri Ideograf-Fa14" 
+    64021 "CJK PajtueshmÃ«ri Ideograf-Fa15" 
+    64022 "CJK PajtueshmÃ«ri Ideograf-Fa16" 
+    64023 "CJK PajtueshmÃ«ri Ideograf-Fa17" 
+    64024 "CJK PajtueshmÃ«ri Ideograf-Fa18" 
+    64025 "CJK PajtueshmÃ«ri Ideograf-Fa19" 
+    64026 "CJK PajtueshmÃ«ri Ideograf-Fa1a" 
+    64027 "CJK PajtueshmÃ«ri Ideograf-Fa1b" 
+    64028 "CJK PajtueshmÃ«ri Ideograf-Fa1c" 
+    64029 "CJK PajtueshmÃ«ri Ideograf-Fa1d" 
+    64030 "CJK PajtueshmÃ«ri Ideograf-Fa1e" 
+    64031 "CJK PajtueshmÃ«ri Ideograf-Fa1f" 
+    64032 "CJK PajtueshmÃ«ri Ideograf-Fa20" 
+    64033 "CJK PajtueshmÃ«ri Ideograf-Fa21" 
+    64034 "CJK PajtueshmÃ«ri Ideograf-Fa22" 
+    64035 "CJK PajtueshmÃ«ri Ideograf-Fa23" 
+    64036 "CJK PajtueshmÃ«ri Ideograf-Fa24" 
+    64037 "CJK PajtueshmÃ«ri Ideograf-Fa25" 
+    64038 "CJK PajtueshmÃ«ri Ideograf-Fa26" 
+    64039 "CJK PajtueshmÃ«ri Ideograf-Fa27" 
+    64040 "CJK PajtueshmÃ«ri Ideograf-Fa28" 
+    64041 "CJK PajtueshmÃ«ri Ideograf-Fa29" 
+    64042 "CJK PajtueshmÃ«ri Ideograf-Fa2a" 
+    64043 "CJK PajtueshmÃ«ri Ideograf-Fa2b" 
+    64044 "CJK PajtueshmÃ«ri Ideograf-Fa2c" 
+    64045 "CJK PajtueshmÃ«ri Ideograf-Fa2d" 
+    64046 "CJK PajtueshmÃ«ri Ideograf-Fa2e" 
+    64047 "CJK PajtueshmÃ«ri Ideograf-Fa2f" 
+    64048 "CJK PajtueshmÃ«ri Ideograf-Fa30" 
+    64049 "CJK PajtueshmÃ«ri Ideograf-Fa31" 
+    64050 "CJK PajtueshmÃ«ri Ideograf-Fa32" 
+    64051 "CJK PajtueshmÃ«ri Ideograf-Fa33" 
+    64052 "CJK PajtueshmÃ«ri Ideograf-Fa34" 
+    64053 "CJK PajtueshmÃ«ri Ideograf-Fa35" 
+    64054 "CJK PajtueshmÃ«ri Ideograf-Fa36" 
+    64055 "CJK PajtueshmÃ«ri Ideograf-Fa37" 
+    64056 "CJK PajtueshmÃ«ri Ideograf-Fa38" 
+    64057 "CJK PajtueshmÃ«ri Ideograf-Fa39" 
+    64058 "CJK PajtueshmÃ«ri Ideograf-Fa3a" 
+    64059 "CJK PajtueshmÃ«ri Ideograf-Fa3b" 
+    64060 "CJK PajtueshmÃ«ri Ideograf-Fa3c" 
+    64061 "CJK PajtueshmÃ«ri Ideograf-Fa3d" 
+    64062 "CJK PajtueshmÃ«ri Ideograf-Fa3e" 
+    64063 "CJK PajtueshmÃ«ri Ideograf-Fa3f" 
+    64064 "CJK PajtueshmÃ«ri Ideograf-Fa40" 
+    64065 "CJK PajtueshmÃ«ri Ideograf-Fa41" 
+    64066 "CJK PajtueshmÃ«ri Ideograf-Fa42" 
+    64067 "CJK PajtueshmÃ«ri Ideograf-Fa43" 
+    64068 "CJK PajtueshmÃ«ri Ideograf-Fa44" 
+    64069 "CJK PajtueshmÃ«ri Ideograf-Fa45" 
+    64070 "CJK PajtueshmÃ«ri Ideograf-Fa46" 
+    64071 "CJK PajtueshmÃ«ri Ideograf-Fa47" 
+    64072 "CJK PajtueshmÃ«ri Ideograf-Fa48" 
+    64073 "CJK PajtueshmÃ«ri Ideograf-Fa49" 
+    64074 "CJK PajtueshmÃ«ri Ideograf-Fa4a" 
+    64075 "CJK PajtueshmÃ«ri Ideograf-Fa4b" 
+    64076 "CJK PajtueshmÃ«ri Ideograf-Fa4c" 
+    64077 "CJK PajtueshmÃ«ri Ideograf-Fa4d" 
+    64078 "CJK PajtueshmÃ«ri Ideograf-Fa4e" 
+    64079 "CJK PajtueshmÃ«ri Ideograf-Fa4f" 
+    64080 "CJK PajtueshmÃ«ri Ideograf-Fa50" 
+    64081 "CJK PajtueshmÃ«ri Ideograf-Fa51" 
+    64082 "CJK PajtueshmÃ«ri Ideograf-Fa52" 
+    64083 "CJK PajtueshmÃ«ri Ideograf-Fa53" 
+    64084 "CJK PajtueshmÃ«ri Ideograf-Fa54" 
+    64085 "CJK PajtueshmÃ«ri Ideograf-Fa55" 
+    64086 "CJK PajtueshmÃ«ri Ideograf-Fa56" 
+    64087 "CJK PajtueshmÃ«ri Ideograf-Fa57" 
+    64088 "CJK PajtueshmÃ«ri Ideograf-Fa58" 
+    64089 "CJK PajtueshmÃ«ri Ideograf-Fa59" 
+    64090 "CJK PajtueshmÃ«ri Ideograf-Fa5a" 
+    64091 "CJK PajtueshmÃ«ri Ideograf-Fa5b" 
+    64092 "CJK PajtueshmÃ«ri Ideograf-Fa5c" 
+    64093 "CJK PajtueshmÃ«ri Ideograf-Fa5d" 
+    64094 "CJK PajtueshmÃ«ri Ideograf-Fa5e" 
+    64095 "CJK PajtueshmÃ«ri Ideograf-Fa5f" 
+    64096 "CJK PajtueshmÃ«ri Ideograf-Fa60" 
+    64097 "CJK PajtueshmÃ«ri Ideograf-Fa61" 
+    64098 "CJK PajtueshmÃ«ri Ideograf-Fa62" 
+    64099 "CJK PajtueshmÃ«ri Ideograf-Fa63" 
+    64100 "CJK PajtueshmÃ«ri Ideograf-Fa64" 
+    64101 "CJK PajtueshmÃ«ri Ideograf-Fa65" 
+    64102 "CJK PajtueshmÃ«ri Ideograf-Fa66" 
+    64103 "CJK PajtueshmÃ«ri Ideograf-Fa67" 
+    64104 "CJK PajtueshmÃ«ri Ideograf-Fa68" 
+    64105 "CJK PajtueshmÃ«ri Ideograf-Fa69" 
+    64106 "CJK PajtueshmÃ«ri Ideograf-Fa6a" 
+    64107 "CJK PajtueshmÃ«ri Ideograf-Fa6b" 
+    64108 "CJK PajtueshmÃ«ri Ideograf-Fa6c" 
+    64109 "CJK PajtueshmÃ«ri Ideograf-Fa6d" 
+    64112 "CJK PajtueshmÃ«ri Ideograf-Fa70" 
+    64113 "CJK PajtueshmÃ«ri Ideograf-Fa71" 
+    64114 "CJK PajtueshmÃ«ri Ideograf-Fa72" 
+    64115 "CJK PajtueshmÃ«ri Ideograf-Fa73" 
+    64116 "CJK PajtueshmÃ«ri Ideograf-Fa74" 
+    64117 "CJK PajtueshmÃ«ri Ideograf-Fa75" 
+    64118 "CJK PajtueshmÃ«ri Ideograf-Fa76" 
+    64119 "CJK PajtueshmÃ«ri Ideograf-Fa77" 
+    64120 "CJK PajtueshmÃ«ri Ideograf-Fa78" 
+    64121 "CJK PajtueshmÃ«ri Ideograf-Fa79" 
+    64122 "CJK PajtueshmÃ«ri Ideograf-Fa7a" 
+    64123 "CJK PajtueshmÃ«ri Ideograf-Fa7b" 
+    64124 "CJK PajtueshmÃ«ri Ideograf-Fa7c" 
+    64125 "CJK PajtueshmÃ«ri Ideograf-Fa7d" 
+    64126 "CJK PajtueshmÃ«ri Ideograf-Fa7e" 
+    64127 "CJK PajtueshmÃ«ri Ideograf-Fa7f" 
+    64128 "CJK PajtueshmÃ«ri Ideograf-Fa80" 
+    64129 "CJK PajtueshmÃ«ri Ideograf-Fa81" 
+    64130 "CJK PajtueshmÃ«ri Ideograf-Fa82" 
+    64131 "CJK PajtueshmÃ«ri Ideograf-Fa83" 
+    64132 "CJK PajtueshmÃ«ri Ideograf-Fa84" 
+    64133 "CJK PajtueshmÃ«ri Ideograf-Fa85" 
+    64134 "CJK PajtueshmÃ«ri Ideograf-Fa86" 
+    64135 "CJK PajtueshmÃ«ri Ideograf-Fa87" 
+    64136 "CJK PajtueshmÃ«ri Ideograf-Fa88" 
+    64137 "CJK PajtueshmÃ«ri Ideograf-Fa89" 
+    64138 "CJK PajtueshmÃ«ri Ideograf-Fa8a" 
+    64139 "CJK PajtueshmÃ«ri Ideograf-Fa8b" 
+    64140 "CJK PajtueshmÃ«ri Ideograf-Fa8c" 
+    64141 "CJK PajtueshmÃ«ri Ideograf-Fa8d" 
+    64142 "CJK PajtueshmÃ«ri Ideograf-Fa8e" 
+    64143 "CJK PajtueshmÃ«ri Ideograf-Fa8f" 
+    64144 "CJK PajtueshmÃ«ri Ideograf-Fa90" 
+    64145 "CJK PajtueshmÃ«ri Ideograf-Fa91" 
+    64146 "CJK PajtueshmÃ«ri Ideograf-Fa92" 
+    64147 "CJK PajtueshmÃ«ri Ideograf-Fa93" 
+    64148 "CJK PajtueshmÃ«ri Ideograf-Fa94" 
+    64149 "CJK PajtueshmÃ«ri Ideograf-Fa95" 
+    64150 "CJK PajtueshmÃ«ri Ideograf-Fa96" 
+    64151 "CJK PajtueshmÃ«ri Ideograf-Fa97" 
+    64152 "CJK PajtueshmÃ«ri Ideograf-Fa98" 
+    64153 "CJK PajtueshmÃ«ri Ideograf-Fa99" 
+    64154 "CJK PajtueshmÃ«ri Ideograf-Fa9a" 
+    64155 "CJK PajtueshmÃ«ri Ideograf-Fa9b" 
+    64156 "CJK PajtueshmÃ«ri Ideograf-Fa9c" 
+    64157 "CJK PajtueshmÃ«ri Ideograf-Fa9d" 
+    64158 "CJK PajtueshmÃ«ri Ideograf-Fa9e" 
+    64159 "CJK PajtueshmÃ«ri Ideograf-Fa9f" 
+    64160 "CJK PajtueshmÃ«ri Ideograf-Faa0" 
+    64161 "CJK PajtueshmÃ«ri Ideograf-Faa1" 
+    64162 "CJK PajtueshmÃ«ri Ideograf-Faa2" 
+    64163 "CJK PajtueshmÃ«ri Ideograf-Faa3" 
+    64164 "CJK PajtueshmÃ«ri Ideograf-Faa4" 
+    64165 "CJK PajtueshmÃ«ri Ideograf-Faa5" 
+    64166 "CJK PajtueshmÃ«ri Ideograf-Faa6" 
+    64167 "CJK PajtueshmÃ«ri Ideograf-Faa7" 
+    64168 "CJK PajtueshmÃ«ri Ideograf-Faa8" 
+    64169 "CJK PajtueshmÃ«ri Ideograf-Faa9" 
+    64170 "CJK PajtueshmÃ«ri Ideograf-Faaa" 
+    64171 "CJK PajtueshmÃ«ri Ideograf-Faab" 
+    64172 "CJK PajtueshmÃ«ri Ideograf-Faac" 
+    64173 "CJK PajtueshmÃ«ri Ideograf-Faad" 
+    64174 "CJK PajtueshmÃ«ri Ideograf-Faae" 
+    64175 "CJK PajtueshmÃ«ri Ideograf-Faaf" 
+    64176 "CJK PajtueshmÃ«ri Ideograf-Fab0" 
+    64177 "CJK PajtueshmÃ«ri Ideograf-Fab1" 
+    64178 "CJK PajtueshmÃ«ri Ideograf-Fab2" 
+    64179 "CJK PajtueshmÃ«ri Ideograf-Fab3" 
+    64180 "CJK PajtueshmÃ«ri Ideograf-Fab4" 
+    64181 "CJK PajtueshmÃ«ri Ideograf-Fab5" 
+    64182 "CJK PajtueshmÃ«ri Ideograf-Fab6" 
+    64183 "CJK PajtueshmÃ«ri Ideograf-Fab7" 
+    64184 "CJK PajtueshmÃ«ri Ideograf-Fab8" 
+    64185 "CJK PajtueshmÃ«ri Ideograf-Fab9" 
+    64186 "CJK PajtueshmÃ«ri Ideograf-Faba" 
+    64187 "CJK PajtueshmÃ«ri Ideograf-Fabb" 
+    64188 "CJK PajtueshmÃ«ri Ideograf-Fabc" 
+    64189 "CJK PajtueshmÃ«ri Ideograf-Fabd" 
+    64190 "CJK PajtueshmÃ«ri Ideograf-Fabe" 
+    64191 "CJK PajtueshmÃ«ri Ideograf-Fabf" 
+    64192 "CJK PajtueshmÃ«ri Ideograf-Fac0" 
+    64193 "CJK PajtueshmÃ«ri Ideograf-Fac1" 
+    64194 "CJK PajtueshmÃ«ri Ideograf-Fac2" 
+    64195 "CJK PajtueshmÃ«ri Ideograf-Fac3" 
+    64196 "CJK PajtueshmÃ«ri Ideograf-Fac4" 
+    64197 "CJK PajtueshmÃ«ri Ideograf-Fac5" 
+    64198 "CJK PajtueshmÃ«ri Ideograf-Fac6" 
+    64199 "CJK PajtueshmÃ«ri Ideograf-Fac7" 
+    64200 "CJK PajtueshmÃ«ri Ideograf-Fac8" 
+    64201 "CJK PajtueshmÃ«ri Ideograf-Fac9" 
+    64202 "CJK PajtueshmÃ«ri Ideograf-Faca" 
+    64203 "CJK PajtueshmÃ«ri Ideograf-Facb" 
+    64204 "CJK PajtueshmÃ«ri Ideograf-Facc" 
+    64205 "CJK PajtueshmÃ«ri Ideograf-Facd" 
+    64206 "CJK PajtueshmÃ«ri Ideograf-FytyrÃ«" 
+    64207 "CJK PajtueshmÃ«ri Ideograf-Facf" 
+    64208 "CJK PajtueshmÃ«ri Ideograf-Fad0" 
+    64209 "CJK PajtueshmÃ«ri Ideograf-Fad1" 
+    64210 "CJK PajtueshmÃ«ri Ideograf-Fad2" 
+    64211 "CJK PajtueshmÃ«ri Ideograf-Fad3" 
+    64212 "CJK PajtueshmÃ«ri Ideograf-Fad4" 
+    64213 "CJK PajtueshmÃ«ri Ideograf-Fad5" 
+    64214 "CJK PajtueshmÃ«ri Ideograf-Fad6" 
+    64215 "CJK PajtueshmÃ«ri Ideograf-Fad7" 
+    64216 "CJK PajtueshmÃ«ri Ideograf-Fad8" 
+    64217 "CJK PajtueshmÃ«ri Ideograf-Fad9" 
+    64256 "Latin e VogÃ«l Lidhje Ff" 
+    64257 "Latin e VogÃ«l Lidhje Fi" 
+    64258 "Latin e VogÃ«l Lidhje Fl" 
+    64259 "Latin e VogÃ«l Lidhje Ffi" 
+    64260 "Latin e VogÃ«l Lidhje Ffl" 
+    64261 "Latin e VogÃ«l Lidhje GjatÃ« S T" 
+    64262 "Latin e VogÃ«l Lidhje St" 
+    64275 "Armene e VogÃ«l Lidhje Men Now" 
+    64276 "Armene e VogÃ«l Lidhje Men Ech" 
+    64277 "Armene e VogÃ«l Lidhje Men Ini" 
+    64278 "Armene e VogÃ«l Lidhje Vew Now" 
+    64279 "Armene e VogÃ«l Lidhje Men Xeh" 
+    64285 "Hebre ShkronjÃ« Yod Me Hiriq" 
+    64286 "Hebre Point Judeo-Spanish Varika" 
+    64287 "Hebre Lidhje Yiddish Yod Yod Patah" 
+    64288 "Hebre ShkronjÃ« Alternative Ayin" 
+    64289 "Hebre ShkronjÃ« GjerÃ« Alef" 
+    64290 "Hebre ShkronjÃ« GjerÃ« Dalet" 
+    64291 "Hebre ShkronjÃ« GjerÃ« He" 
+    64292 "Hebre ShkronjÃ« GjerÃ« Kaf" 
+    64293 "Hebre ShkronjÃ« GjerÃ« Lamed" 
+    64294 "Hebre ShkronjÃ« GjerÃ« PÃ«rfundimtare Mem" 
+    64295 "Hebre ShkronjÃ« GjerÃ« Resh" 
+    64296 "Hebre ShkronjÃ« GjerÃ« Tav" 
+    64297 "Hebre ShkronjÃ« Alternative Plus ShenjÃ«" 
+    64298 "Hebre ShkronjÃ« Shin Me Shin PikÃ«" 
+    64299 "Hebre ShkronjÃ« Shin Me Sin PikÃ«" 
+    64300 "Hebre ShkronjÃ« Shin Me Dagesh dhe Shin PikÃ«" 
+    64301 "Hebre ShkronjÃ« Shin Me Dagesh dhe Sin PikÃ«" 
+    64302 "Hebre ShkronjÃ« Alef Me Patah" 
+    64303 "Hebre ShkronjÃ« Alef Me Qamats" 
+    64304 "Hebre ShkronjÃ« Alef Me Mapiq" 
+    64305 "Hebre ShkronjÃ« Bet Me Dagesh" 
+    64306 "Hebre ShkronjÃ« Gimel Me Dagesh" 
+    64307 "Hebre ShkronjÃ« Dalet Me Dagesh" 
+    64308 "Hebre ShkronjÃ« He Me Mapiq" 
+    64309 "Hebre ShkronjÃ« Vav Me Dagesh" 
+    64310 "Hebre ShkronjÃ« Zayin Me Dagesh" 
+    64312 "Hebre ShkronjÃ« Tet Me Dagesh" 
+    64313 "Hebre ShkronjÃ« Yod Me Dagesh" 
+    64314 "Hebre ShkronjÃ« PÃ«rfundimtare Kaf Me Dagesh" 
+    64315 "Hebre ShkronjÃ« Kaf Me Dagesh" 
+    64316 "Hebre ShkronjÃ« Lamed Me Dagesh" 
+    64318 "Hebre ShkronjÃ« Mem Me Dagesh" 
+    64320 "Hebre ShkronjÃ« Nun Me Dagesh" 
+    64321 "Hebre ShkronjÃ« Samekh Me Dagesh" 
+    64323 "Hebre ShkronjÃ« PÃ«rfundimtare Pe Me Dagesh" 
+    64324 "Hebre ShkronjÃ« Pe Me Dagesh" 
+    64326 "Hebre ShkronjÃ« Tsadi Me Dagesh" 
+    64327 "Hebre ShkronjÃ« Qof Me Dagesh" 
+    64328 "Hebre ShkronjÃ« Resh Me Dagesh" 
+    64329 "Hebre ShkronjÃ« Shin Me Dagesh" 
+    64330 "Hebre ShkronjÃ« Tav Me Dagesh" 
+    64331 "Hebre ShkronjÃ« Vav Me Holam" 
+    64332 "Hebre ShkronjÃ« Bet Me Rafe" 
+    64333 "Hebre ShkronjÃ« Kaf Me Rafe" 
+    64334 "Hebre ShkronjÃ« Pe Me Rafe" 
+    64335 "Hebre Lidhje Alef Lamed" 
+    64336 "Arabe ShkronjÃ« Alef Wasla Izoluar FormÃ«" 
+    64337 "Arabe ShkronjÃ« Alef Wasla PÃ«rfundimtare FormÃ«" 
+    64338 "Arabe ShkronjÃ« Beeh Izoluar FormÃ«" 
+    64339 "Arabe ShkronjÃ« Beeh PÃ«rfundimtare FormÃ«" 
+    64340 "Arabe ShkronjÃ« Beeh Fillestar FormÃ«" 
+    64341 "Arabe ShkronjÃ« Beeh Mesor FormÃ«" 
+    64342 "Arabe ShkronjÃ« Peh Izoluar FormÃ«" 
+    64343 "Arabe ShkronjÃ« Peh PÃ«rfundimtare FormÃ«" 
+    64344 "Arabe ShkronjÃ« Peh Fillestar FormÃ«" 
+    64345 "Arabe ShkronjÃ« Peh Mesor FormÃ«" 
+    64346 "Arabe ShkronjÃ« Beheh Izoluar FormÃ«" 
+    64347 "Arabe ShkronjÃ« Beheh PÃ«rfundimtare FormÃ«" 
+    64348 "Arabe ShkronjÃ« Beheh Fillestar FormÃ«" 
+    64349 "Arabe ShkronjÃ« Beheh Mesor FormÃ«" 
+    64350 "Arabe ShkronjÃ« Tteheh Izoluar FormÃ«" 
+    64351 "Arabe ShkronjÃ« Tteheh PÃ«rfundimtare FormÃ«" 
+    64352 "Arabe ShkronjÃ« Tteheh Fillestar FormÃ«" 
+    64353 "Arabe ShkronjÃ« Tteheh Mesor FormÃ«" 
+    64354 "Arabe ShkronjÃ« Teheh Izoluar FormÃ«" 
+    64355 "Arabe ShkronjÃ« Teheh PÃ«rfundimtare FormÃ«" 
+    64356 "Arabe ShkronjÃ« Teheh Fillestar FormÃ«" 
+    64357 "Arabe ShkronjÃ« Teheh Mesor FormÃ«" 
+    64358 "Arabe ShkronjÃ« Tteh Izoluar FormÃ«" 
+    64359 "Arabe ShkronjÃ« Tteh PÃ«rfundimtare FormÃ«" 
+    64360 "Arabe ShkronjÃ« Tteh Fillestar FormÃ«" 
+    64361 "Arabe ShkronjÃ« Tteh Mesor FormÃ«" 
+    64362 "Arabe ShkronjÃ« Veh Izoluar FormÃ«" 
+    64363 "Arabe ShkronjÃ« Veh PÃ«rfundimtare FormÃ«" 
+    64364 "Arabe ShkronjÃ« Veh Fillestar FormÃ«" 
+    64365 "Arabe ShkronjÃ« Veh Mesor FormÃ«" 
+    64366 "Arabe ShkronjÃ« Peheh Izoluar FormÃ«" 
+    64367 "Arabe ShkronjÃ« Peheh PÃ«rfundimtare FormÃ«" 
+    64368 "Arabe ShkronjÃ« Peheh Fillestar FormÃ«" 
+    64369 "Arabe ShkronjÃ« Peheh Mesor FormÃ«" 
+    64370 "Arabe ShkronjÃ« Dyeh Izoluar FormÃ«" 
+    64371 "Arabe ShkronjÃ« Dyeh PÃ«rfundimtare FormÃ«" 
+    64372 "Arabe ShkronjÃ« Dyeh Fillestar FormÃ«" 
+    64373 "Arabe ShkronjÃ« Dyeh Mesor FormÃ«" 
+    64374 "Arabe ShkronjÃ« Nyeh Izoluar FormÃ«" 
+    64375 "Arabe ShkronjÃ« Nyeh PÃ«rfundimtare FormÃ«" 
+    64376 "Arabe ShkronjÃ« Nyeh Fillestar FormÃ«" 
+    64377 "Arabe ShkronjÃ« Nyeh Mesor FormÃ«" 
+    64378 "Arabe ShkronjÃ« Tcheh Izoluar FormÃ«" 
+    64379 "Arabe ShkronjÃ« Tcheh PÃ«rfundimtare FormÃ«" 
+    64380 "Arabe ShkronjÃ« Tcheh Fillestar FormÃ«" 
+    64381 "Arabe ShkronjÃ« Tcheh Mesor FormÃ«" 
+    64382 "Arabe ShkronjÃ« Tcheheh Izoluar FormÃ«" 
+    64383 "Arabe ShkronjÃ« Tcheheh PÃ«rfundimtare FormÃ«" 
+    64384 "Arabe ShkronjÃ« Tcheheh Fillestar FormÃ«" 
+    64385 "Arabe ShkronjÃ« Tcheheh Mesor FormÃ«" 
+    64386 "Arabe ShkronjÃ« Ddahal Izoluar FormÃ«" 
+    64387 "Arabe ShkronjÃ« Ddahal PÃ«rfundimtare FormÃ«" 
+    64388 "Arabe ShkronjÃ« Dahal Izoluar FormÃ«" 
+    64389 "Arabe ShkronjÃ« Dahal PÃ«rfundimtare FormÃ«" 
+    64390 "Arabe ShkronjÃ« Dul Izoluar FormÃ«" 
+    64391 "Arabe ShkronjÃ« Dul PÃ«rfundimtare FormÃ«" 
+    64392 "Arabe ShkronjÃ« Ddal Izoluar FormÃ«" 
+    64393 "Arabe ShkronjÃ« Ddal PÃ«rfundimtare FormÃ«" 
+    64394 "Arabe ShkronjÃ« Jeh Izoluar FormÃ«" 
+    64395 "Arabe ShkronjÃ« Jeh PÃ«rfundimtare FormÃ«" 
+    64396 "Arabe ShkronjÃ« Rreh Izoluar FormÃ«" 
+    64397 "Arabe ShkronjÃ« Rreh PÃ«rfundimtare FormÃ«" 
+    64398 "Arabe ShkronjÃ« Keheh Izoluar FormÃ«" 
+    64399 "Arabe ShkronjÃ« Keheh PÃ«rfundimtare FormÃ«" 
+    64400 "Arabe ShkronjÃ« Keheh Fillestar FormÃ«" 
+    64401 "Arabe ShkronjÃ« Keheh Mesor FormÃ«" 
+    64402 "Arabe ShkronjÃ« Gaf Izoluar FormÃ«" 
+    64403 "Arabe ShkronjÃ« Gaf PÃ«rfundimtare FormÃ«" 
+    64404 "Arabe ShkronjÃ« Gaf Fillestar FormÃ«" 
+    64405 "Arabe ShkronjÃ« Gaf Mesor FormÃ«" 
+    64406 "Arabe ShkronjÃ« Gueh Izoluar FormÃ«" 
+    64407 "Arabe ShkronjÃ« Gueh PÃ«rfundimtare FormÃ«" 
+    64408 "Arabe ShkronjÃ« Gueh Fillestar FormÃ«" 
+    64409 "Arabe ShkronjÃ« Gueh Mesor FormÃ«" 
+    64410 "Arabe ShkronjÃ« Ngoeh Izoluar FormÃ«" 
+    64411 "Arabe ShkronjÃ« Ngoeh PÃ«rfundimtare FormÃ«" 
+    64412 "Arabe ShkronjÃ« Ngoeh Fillestar FormÃ«" 
+    64413 "Arabe ShkronjÃ« Ngoeh Mesor FormÃ«" 
+    64414 "Arabe ShkronjÃ« Noon Ghunna Izoluar FormÃ«" 
+    64415 "Arabe ShkronjÃ« Noon Ghunna PÃ«rfundimtare FormÃ«" 
+    64416 "Arabe ShkronjÃ« Rnoon Izoluar FormÃ«" 
+    64417 "Arabe ShkronjÃ« Rnoon PÃ«rfundimtare FormÃ«" 
+    64418 "Arabe ShkronjÃ« Rnoon Fillestar FormÃ«" 
+    64419 "Arabe ShkronjÃ« Rnoon Mesor FormÃ«" 
+    64420 "Arabe ShkronjÃ« Heh Me Yeh Lart Izoluar FormÃ«" 
+    64421 "Arabe ShkronjÃ« Heh Me Yeh Lart PÃ«rfundimtare FormÃ«" 
+    64422 "Arabe ShkronjÃ« Heh Goal Izoluar FormÃ«" 
+    64423 "Arabe ShkronjÃ« Heh Goal PÃ«rfundimtare FormÃ«" 
+    64424 "Arabe ShkronjÃ« Heh Goal Fillestar FormÃ«" 
+    64425 "Arabe ShkronjÃ« Heh Goal Mesor FormÃ«" 
+    64426 "Arabe ShkronjÃ« Heh Doachashmee Izoluar FormÃ«" 
+    64427 "Arabe ShkronjÃ« Heh Doachashmee PÃ«rfundimtare FormÃ«" 
+    64428 "Arabe ShkronjÃ« Heh Doachashmee Fillestar FormÃ«" 
+    64429 "Arabe ShkronjÃ« Heh Doachashmee Mesor FormÃ«" 
+    64430 "Arabe ShkronjÃ« Yeh Barree Izoluar FormÃ«" 
+    64431 "Arabe ShkronjÃ« Yeh Barree PÃ«rfundimtare FormÃ«" 
+    64432 "Arabe ShkronjÃ« Yeh Barree Me Hamza Lart Izoluar FormÃ«" 
+    64433 "Arabe ShkronjÃ« Yeh Barree Me Hamza Lart PÃ«rfundimtare FormÃ«" 
+    64434 "Arabe Simbol PikÃ« Mbi" 
+    64435 "Arabe Simbol PikÃ« PoshtÃ«" 
+    64436 "Arabe Simbol Dy PikÃ« Lart" 
+    64437 "Arabe Simbol Dy PikÃ« PoshtÃ«" 
+    64438 "Arabe Simbol Tre PikÃ« Lart" 
+    64439 "Arabe Simbol Tre PikÃ« PoshtÃ«" 
+    64440 "Arabe Simbol Tre PikÃ« Treguese TeposhtÃ« Lart" 
+    64441 "Arabe Simbol Tre PikÃ« Treguese TeposhtÃ« PoshtÃ«" 
+    64442 "Arabe Simbol KatÃ«r PikÃ« Lart" 
+    64443 "Arabe Simbol KatÃ«r PikÃ« PoshtÃ«" 
+    64444 "Arabe Simbol Dyshe Vertikale Bar PoshtÃ«" 
+    64445 "Arabe Simbol Dy PikÃ« Vertikale Lart" 
+    64446 "Arabe Simbol Dy PikÃ« Vertikale PoshtÃ«" 
+    64447 "Arabe Simbol Rreth" 
+    64448 "Arabe Simbol e VogÃ«l Tah Lart" 
+    64449 "Arabe Simbol e VogÃ«l Tah PoshtÃ«" 
+    64467 "Arabe ShkronjÃ« Ng Izoluar FormÃ«" 
+    64468 "Arabe ShkronjÃ« Ng PÃ«rfundimtare FormÃ«" 
+    64469 "Arabe ShkronjÃ« Ng Fillestar FormÃ«" 
+    64470 "Arabe ShkronjÃ« Ng Mesor FormÃ«" 
+    64471 "Arabe ShkronjÃ« U Izoluar FormÃ«" 
+    64472 "Arabe ShkronjÃ« U PÃ«rfundimtare FormÃ«" 
+    64473 "Arabe ShkronjÃ« Oe Izoluar FormÃ«" 
+    64474 "Arabe ShkronjÃ« Oe PÃ«rfundimtare FormÃ«" 
+    64475 "Arabe ShkronjÃ« Yu Izoluar FormÃ«" 
+    64476 "Arabe ShkronjÃ« Yu PÃ«rfundimtare FormÃ«" 
+    64477 "Arabe ShkronjÃ« U Me Hamza Lart Izoluar FormÃ«" 
+    64478 "Arabe ShkronjÃ« Ve Izoluar FormÃ«" 
+    64479 "Arabe ShkronjÃ« Ve PÃ«rfundimtare FormÃ«" 
+    64480 "Arabe ShkronjÃ« Kirghiz Oe Izoluar FormÃ«" 
+    64481 "Arabe ShkronjÃ« Kirghiz Oe PÃ«rfundimtare FormÃ«" 
+    64482 "Arabe ShkronjÃ« Kirghiz Yu Izoluar FormÃ«" 
+    64483 "Arabe ShkronjÃ« Kirghiz Yu PÃ«rfundimtare FormÃ«" 
+    64484 "Arabe ShkronjÃ« E Izoluar FormÃ«" 
+    64485 "Arabe ShkronjÃ« E PÃ«rfundimtare FormÃ«" 
+    64486 "Arabe ShkronjÃ« E Fillestar FormÃ«" 
+    64487 "Arabe ShkronjÃ« E Mesor FormÃ«" 
+    64488 "Arabe ShkronjÃ« Uighur Kazakh Kirghiz Alef Maksura Fillestar FormÃ«" 
+    64489 "Arabe ShkronjÃ« Uighur Kazakh Kirghiz Alef Maksura Mesor FormÃ«" 
+    64490 "Arabe Lidhje Yeh Me Hamza Lart Me Alef Izoluar FormÃ«" 
+    64491 "Arabe Lidhje Yeh Me Hamza Lart Me Alef PÃ«rfundimtare FormÃ«" 
+    64492 "Arabe Lidhje Yeh Me Hamza Lart Me Ae Izoluar FormÃ«" 
+    64493 "Arabe Lidhje Yeh Me Hamza Lart Me Ae PÃ«rfundimtare FormÃ«" 
+    64494 "Arabe Lidhje Yeh Me Hamza Lart Me Waw Izoluar FormÃ«" 
+    64495 "Arabe Lidhje Yeh Me Hamza Lart Me Waw PÃ«rfundimtare FormÃ«" 
+    64496 "Arabe Lidhje Yeh Me Hamza Lart Me U Izoluar FormÃ«" 
+    64497 "Arabe Lidhje Yeh Me Hamza Lart Me U PÃ«rfundimtare FormÃ«" 
+    64498 "Arabe Lidhje Yeh Me Hamza Lart Me Oe Izoluar FormÃ«" 
+    64499 "Arabe Lidhje Yeh Me Hamza Lart Me Oe PÃ«rfundimtare FormÃ«" 
+    64500 "Arabe Lidhje Yeh Me Hamza Lart Me Yu Izoluar FormÃ«" 
+    64501 "Arabe Lidhje Yeh Me Hamza Lart Me Yu PÃ«rfundimtare FormÃ«" 
+    64502 "Arabe Lidhje Yeh Me Hamza Lart Me E Izoluar FormÃ«" 
+    64503 "Arabe Lidhje Yeh Me Hamza Lart Me E PÃ«rfundimtare FormÃ«" 
+    64504 "Arabe Lidhje Yeh Me Hamza Lart Me E Fillestar FormÃ«" 
+    64505 "Arabe Lidhje Uighur Kirghiz Yeh Me Hamza Lart Me Alef Maksura Izoluar FormÃ«" 
+    64506 "Arabe Lidhje Uighur Kirghiz Yeh Me Hamza Lart Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64507 "Arabe Lidhje Uighur Kirghiz Yeh Me Hamza Lart Me Alef Maksura Fillestar FormÃ«" 
+    64508 "Arabe ShkronjÃ« Farsi Yeh Izoluar FormÃ«" 
+    64509 "Arabe ShkronjÃ« Farsi Yeh PÃ«rfundimtare FormÃ«" 
+    64510 "Arabe ShkronjÃ« Farsi Yeh Fillestar FormÃ«" 
+    64511 "Arabe ShkronjÃ« Farsi Yeh Mesor FormÃ«" 
+    64512 "Arabe Lidhje Yeh Me Hamza Lart Me Jeem Izoluar FormÃ«" 
+    64513 "Arabe Lidhje Yeh Me Hamza Lart Me Hah Izoluar FormÃ«" 
+    64514 "Arabe Lidhje Yeh Me Hamza Lart Me Meem Izoluar FormÃ«" 
+    64515 "Arabe Lidhje Yeh Me Hamza Lart Me Alef Maksura Izoluar FormÃ«" 
+    64516 "Arabe Lidhje Yeh Me Hamza Lart Me Yeh Izoluar FormÃ«" 
+    64517 "Arabe Lidhje Beh Me Jeem Izoluar FormÃ«" 
+    64518 "Arabe Lidhje Beh Me Hah Izoluar FormÃ«" 
+    64519 "Arabe Lidhje Beh Me Khah Izoluar FormÃ«" 
+    64520 "Arabe Lidhje Beh Me Meem Izoluar FormÃ«" 
+    64521 "Arabe Lidhje Beh Me Alef Maksura Izoluar FormÃ«" 
+    64522 "Arabe Lidhje Beh Me Yeh Izoluar FormÃ«" 
+    64523 "Arabe Lidhje Teh Me Jeem Izoluar FormÃ«" 
+    64524 "Arabe Lidhje Teh Me Hah Izoluar FormÃ«" 
+    64525 "Arabe Lidhje Teh Me Khah Izoluar FormÃ«" 
+    64526 "Arabe Lidhje Teh Me Meem Izoluar FormÃ«" 
+    64527 "Arabe Lidhje Teh Me Alef Maksura Izoluar FormÃ«" 
+    64528 "Arabe Lidhje Teh Me Yeh Izoluar FormÃ«" 
+    64529 "Arabe Lidhje Theh Me Jeem Izoluar FormÃ«" 
+    64530 "Arabe Lidhje Theh Me Meem Izoluar FormÃ«" 
+    64531 "Arabe Lidhje Theh Me Alef Maksura Izoluar FormÃ«" 
+    64532 "Arabe Lidhje Theh Me Yeh Izoluar FormÃ«" 
+    64533 "Arabe Lidhje Jeem Me Hah Izoluar FormÃ«" 
+    64534 "Arabe Lidhje Jeem Me Meem Izoluar FormÃ«" 
+    64535 "Arabe Lidhje Hah Me Jeem Izoluar FormÃ«" 
+    64536 "Arabe Lidhje Hah Me Meem Izoluar FormÃ«" 
+    64537 "Arabe Lidhje Khah Me Jeem Izoluar FormÃ«" 
+    64538 "Arabe Lidhje Khah Me Hah Izoluar FormÃ«" 
+    64539 "Arabe Lidhje Khah Me Meem Izoluar FormÃ«" 
+    64540 "Arabe Lidhje ParÃ« Me Jeem Izoluar FormÃ«" 
+    64541 "Arabe Lidhje ParÃ« Me Hah Izoluar FormÃ«" 
+    64542 "Arabe Lidhje ParÃ« Me Khah Izoluar FormÃ«" 
+    64543 "Arabe Lidhje ParÃ« Me Meem Izoluar FormÃ«" 
+    64544 "Arabe Lidhje Sad Me Hah Izoluar FormÃ«" 
+    64545 "Arabe Lidhje Sad Me Meem Izoluar FormÃ«" 
+    64546 "Arabe Lidhje Dad Me Jeem Izoluar FormÃ«" 
+    64547 "Arabe Lidhje Dad Me Hah Izoluar FormÃ«" 
+    64548 "Arabe Lidhje Dad Me Khah Izoluar FormÃ«" 
+    64549 "Arabe Lidhje Dad Me Meem Izoluar FormÃ«" 
+    64550 "Arabe Lidhje Tah Me Hah Izoluar FormÃ«" 
+    64551 "Arabe Lidhje Tah Me Meem Izoluar FormÃ«" 
+    64552 "Arabe Lidhje Zah Me Meem Izoluar FormÃ«" 
+    64553 "Arabe Lidhje Ain Me Jeem Izoluar FormÃ«" 
+    64554 "Arabe Lidhje Ain Me Meem Izoluar FormÃ«" 
+    64555 "Arabe Lidhje Ghain Me Jeem Izoluar FormÃ«" 
+    64556 "Arabe Lidhje Ghain Me Meem Izoluar FormÃ«" 
+    64557 "Arabe Lidhje Feh Me Jeem Izoluar FormÃ«" 
+    64558 "Arabe Lidhje Feh Me Hah Izoluar FormÃ«" 
+    64559 "Arabe Lidhje Feh Me Khah Izoluar FormÃ«" 
+    64560 "Arabe Lidhje Feh Me Meem Izoluar FormÃ«" 
+    64561 "Arabe Lidhje Feh Me Alef Maksura Izoluar FormÃ«" 
+    64562 "Arabe Lidhje Feh Me Yeh Izoluar FormÃ«" 
+    64563 "Arabe Lidhje Qaf Me Hah Izoluar FormÃ«" 
+    64564 "Arabe Lidhje Qaf Me Meem Izoluar FormÃ«" 
+    64565 "Arabe Lidhje Qaf Me Alef Maksura Izoluar FormÃ«" 
+    64566 "Arabe Lidhje Qaf Me Yeh Izoluar FormÃ«" 
+    64567 "Arabe Lidhje Kaf Me Alef Izoluar FormÃ«" 
+    64568 "Arabe Lidhje Kaf Me Jeem Izoluar FormÃ«" 
+    64569 "Arabe Lidhje Kaf Me Hah Izoluar FormÃ«" 
+    64570 "Arabe Lidhje Kaf Me Khah Izoluar FormÃ«" 
+    64571 "Arabe Lidhje Kaf Me Lam Izoluar FormÃ«" 
+    64572 "Arabe Lidhje Kaf Me Meem Izoluar FormÃ«" 
+    64573 "Arabe Lidhje Kaf Me Alef Maksura Izoluar FormÃ«" 
+    64574 "Arabe Lidhje Kaf Me Yeh Izoluar FormÃ«" 
+    64575 "Arabe Lidhje Lam Me Jeem Izoluar FormÃ«" 
+    64576 "Arabe Lidhje Lam Me Hah Izoluar FormÃ«" 
+    64577 "Arabe Lidhje Lam Me Khah Izoluar FormÃ«" 
+    64578 "Arabe Lidhje Lam Me Meem Izoluar FormÃ«" 
+    64579 "Arabe Lidhje Lam Me Alef Maksura Izoluar FormÃ«" 
+    64580 "Arabe Lidhje Lam Me Yeh Izoluar FormÃ«" 
+    64581 "Arabe Lidhje Meem Me Jeem Izoluar FormÃ«" 
+    64582 "Arabe Lidhje Meem Me Hah Izoluar FormÃ«" 
+    64583 "Arabe Lidhje Meem Me Khah Izoluar FormÃ«" 
+    64584 "Arabe Lidhje Meem Me Meem Izoluar FormÃ«" 
+    64585 "Arabe Lidhje Meem Me Alef Maksura Izoluar FormÃ«" 
+    64586 "Arabe Lidhje Meem Me Yeh Izoluar FormÃ«" 
+    64587 "Arabe Lidhje Noon Me Jeem Izoluar FormÃ«" 
+    64588 "Arabe Lidhje Noon Me Hah Izoluar FormÃ«" 
+    64589 "Arabe Lidhje Noon Me Khah Izoluar FormÃ«" 
+    64590 "Arabe Lidhje Noon Me Meem Izoluar FormÃ«" 
+    64591 "Arabe Lidhje Noon Me Alef Maksura Izoluar FormÃ«" 
+    64592 "Arabe Lidhje Noon Me Yeh Izoluar FormÃ«" 
+    64593 "Arabe Lidhje Heh Me Jeem Izoluar FormÃ«" 
+    64594 "Arabe Lidhje Heh Me Meem Izoluar FormÃ«" 
+    64595 "Arabe Lidhje Heh Me Alef Maksura Izoluar FormÃ«" 
+    64596 "Arabe Lidhje Heh Me Yeh Izoluar FormÃ«" 
+    64597 "Arabe Lidhje Yeh Me Jeem Izoluar FormÃ«" 
+    64598 "Arabe Lidhje Yeh Me Hah Izoluar FormÃ«" 
+    64599 "Arabe Lidhje Yeh Me Khah Izoluar FormÃ«" 
+    64600 "Arabe Lidhje Yeh Me Meem Izoluar FormÃ«" 
+    64601 "Arabe Lidhje Yeh Me Alef Maksura Izoluar FormÃ«" 
+    64602 "Arabe Lidhje Yeh Me Yeh Izoluar FormÃ«" 
+    64603 "Arabe Lidhje Thal Me Indeks i SipÃ«rm Alef Izoluar FormÃ«" 
+    64604 "Arabe Lidhje Reh Me Indeks i SipÃ«rm Alef Izoluar FormÃ«" 
+    64605 "Arabe Lidhje Alef Maksura Me Indeks i SipÃ«rm Alef Izoluar FormÃ«" 
+    64606 "Arabe Lidhje Shadda Me Dammatan Izoluar FormÃ«" 
+    64607 "Arabe Lidhje Shadda Me Kasratan Izoluar FormÃ«" 
+    64608 "Arabe Lidhje Shadda Me Fatha Izoluar FormÃ«" 
+    64609 "Arabe Lidhje Shadda Me Damma Izoluar FormÃ«" 
+    64610 "Arabe Lidhje Shadda Me Kasra Izoluar FormÃ«" 
+    64611 "Arabe Lidhje Shadda Me Indeks i SipÃ«rm Alef Izoluar FormÃ«" 
+    64612 "Arabe Lidhje Yeh Me Hamza Lart Me Reh PÃ«rfundimtare FormÃ«" 
+    64613 "Arabe Lidhje Yeh Me Hamza Lart Me Zain PÃ«rfundimtare FormÃ«" 
+    64614 "Arabe Lidhje Yeh Me Hamza Lart Me Meem PÃ«rfundimtare FormÃ«" 
+    64615 "Arabe Lidhje Yeh Me Hamza Lart Me Noon PÃ«rfundimtare FormÃ«" 
+    64616 "Arabe Lidhje Yeh Me Hamza Lart Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64617 "Arabe Lidhje Yeh Me Hamza Lart Me Yeh PÃ«rfundimtare FormÃ«" 
+    64618 "Arabe Lidhje Beh Me Reh PÃ«rfundimtare FormÃ«" 
+    64619 "Arabe Lidhje Beh Me Zain PÃ«rfundimtare FormÃ«" 
+    64620 "Arabe Lidhje Beh Me Meem PÃ«rfundimtare FormÃ«" 
+    64621 "Arabe Lidhje Beh Me Noon PÃ«rfundimtare FormÃ«" 
+    64622 "Arabe Lidhje Beh Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64623 "Arabe Lidhje Beh Me Yeh PÃ«rfundimtare FormÃ«" 
+    64624 "Arabe Lidhje Teh Me Reh PÃ«rfundimtare FormÃ«" 
+    64625 "Arabe Lidhje Teh Me Zain PÃ«rfundimtare FormÃ«" 
+    64626 "Arabe Lidhje Teh Me Meem PÃ«rfundimtare FormÃ«" 
+    64627 "Arabe Lidhje Teh Me Noon PÃ«rfundimtare FormÃ«" 
+    64628 "Arabe Lidhje Teh Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64629 "Arabe Lidhje Teh Me Yeh PÃ«rfundimtare FormÃ«" 
+    64630 "Arabe Lidhje Theh Me Reh PÃ«rfundimtare FormÃ«" 
+    64631 "Arabe Lidhje Theh Me Zain PÃ«rfundimtare FormÃ«" 
+    64632 "Arabe Lidhje Theh Me Meem PÃ«rfundimtare FormÃ«" 
+    64633 "Arabe Lidhje Theh Me Noon PÃ«rfundimtare FormÃ«" 
+    64634 "Arabe Lidhje Theh Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64635 "Arabe Lidhje Theh Me Yeh PÃ«rfundimtare FormÃ«" 
+    64636 "Arabe Lidhje Feh Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64637 "Arabe Lidhje Feh Me Yeh PÃ«rfundimtare FormÃ«" 
+    64638 "Arabe Lidhje Qaf Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64639 "Arabe Lidhje Qaf Me Yeh PÃ«rfundimtare FormÃ«" 
+    64640 "Arabe Lidhje Kaf Me Alef PÃ«rfundimtare FormÃ«" 
+    64641 "Arabe Lidhje Kaf Me Lam PÃ«rfundimtare FormÃ«" 
+    64642 "Arabe Lidhje Kaf Me Meem PÃ«rfundimtare FormÃ«" 
+    64643 "Arabe Lidhje Kaf Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64644 "Arabe Lidhje Kaf Me Yeh PÃ«rfundimtare FormÃ«" 
+    64645 "Arabe Lidhje Lam Me Meem PÃ«rfundimtare FormÃ«" 
+    64646 "Arabe Lidhje Lam Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64647 "Arabe Lidhje Lam Me Yeh PÃ«rfundimtare FormÃ«" 
+    64648 "Arabe Lidhje Meem Me Alef PÃ«rfundimtare FormÃ«" 
+    64649 "Arabe Lidhje Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64650 "Arabe Lidhje Noon Me Reh PÃ«rfundimtare FormÃ«" 
+    64651 "Arabe Lidhje Noon Me Zain PÃ«rfundimtare FormÃ«" 
+    64652 "Arabe Lidhje Noon Me Meem PÃ«rfundimtare FormÃ«" 
+    64653 "Arabe Lidhje Noon Me Noon PÃ«rfundimtare FormÃ«" 
+    64654 "Arabe Lidhje Noon Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64655 "Arabe Lidhje Noon Me Yeh PÃ«rfundimtare FormÃ«" 
+    64656 "Arabe Lidhje Alef Maksura Me Indeks i SipÃ«rm Alef PÃ«rfundimtare FormÃ«" 
+    64657 "Arabe Lidhje Yeh Me Reh PÃ«rfundimtare FormÃ«" 
+    64658 "Arabe Lidhje Yeh Me Zain PÃ«rfundimtare FormÃ«" 
+    64659 "Arabe Lidhje Yeh Me Meem PÃ«rfundimtare FormÃ«" 
+    64660 "Arabe Lidhje Yeh Me Noon PÃ«rfundimtare FormÃ«" 
+    64661 "Arabe Lidhje Yeh Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64662 "Arabe Lidhje Yeh Me Yeh PÃ«rfundimtare FormÃ«" 
+    64663 "Arabe Lidhje Yeh Me Hamza Lart Me Jeem Fillestar FormÃ«" 
+    64664 "Arabe Lidhje Yeh Me Hamza Lart Me Hah Fillestar FormÃ«" 
+    64665 "Arabe Lidhje Yeh Me Hamza Lart Me Khah Fillestar FormÃ«" 
+    64666 "Arabe Lidhje Yeh Me Hamza Lart Me Meem Fillestar FormÃ«" 
+    64667 "Arabe Lidhje Yeh Me Hamza Lart Me Heh Fillestar FormÃ«" 
+    64668 "Arabe Lidhje Beh Me Jeem Fillestar FormÃ«" 
+    64669 "Arabe Lidhje Beh Me Hah Fillestar FormÃ«" 
+    64670 "Arabe Lidhje Beh Me Khah Fillestar FormÃ«" 
+    64671 "Arabe Lidhje Beh Me Meem Fillestar FormÃ«" 
+    64672 "Arabe Lidhje Beh Me Heh Fillestar FormÃ«" 
+    64673 "Arabe Lidhje Teh Me Jeem Fillestar FormÃ«" 
+    64674 "Arabe Lidhje Teh Me Hah Fillestar FormÃ«" 
+    64675 "Arabe Lidhje Teh Me Khah Fillestar FormÃ«" 
+    64676 "Arabe Lidhje Teh Me Meem Fillestar FormÃ«" 
+    64677 "Arabe Lidhje Teh Me Heh Fillestar FormÃ«" 
+    64678 "Arabe Lidhje Theh Me Meem Fillestar FormÃ«" 
+    64679 "Arabe Lidhje Jeem Me Hah Fillestar FormÃ«" 
+    64680 "Arabe Lidhje Jeem Me Meem Fillestar FormÃ«" 
+    64681 "Arabe Lidhje Hah Me Jeem Fillestar FormÃ«" 
+    64682 "Arabe Lidhje Hah Me Meem Fillestar FormÃ«" 
+    64683 "Arabe Lidhje Khah Me Jeem Fillestar FormÃ«" 
+    64684 "Arabe Lidhje Khah Me Meem Fillestar FormÃ«" 
+    64685 "Arabe Lidhje ParÃ« Me Jeem Fillestar FormÃ«" 
+    64686 "Arabe Lidhje ParÃ« Me Hah Fillestar FormÃ«" 
+    64687 "Arabe Lidhje ParÃ« Me Khah Fillestar FormÃ«" 
+    64688 "Arabe Lidhje ParÃ« Me Meem Fillestar FormÃ«" 
+    64689 "Arabe Lidhje Sad Me Hah Fillestar FormÃ«" 
+    64690 "Arabe Lidhje Sad Me Khah Fillestar FormÃ«" 
+    64691 "Arabe Lidhje Sad Me Meem Fillestar FormÃ«" 
+    64692 "Arabe Lidhje Dad Me Jeem Fillestar FormÃ«" 
+    64693 "Arabe Lidhje Dad Me Hah Fillestar FormÃ«" 
+    64694 "Arabe Lidhje Dad Me Khah Fillestar FormÃ«" 
+    64695 "Arabe Lidhje Dad Me Meem Fillestar FormÃ«" 
+    64696 "Arabe Lidhje Tah Me Hah Fillestar FormÃ«" 
+    64697 "Arabe Lidhje Zah Me Meem Fillestar FormÃ«" 
+    64698 "Arabe Lidhje Ain Me Jeem Fillestar FormÃ«" 
+    64699 "Arabe Lidhje Ain Me Meem Fillestar FormÃ«" 
+    64700 "Arabe Lidhje Ghain Me Jeem Fillestar FormÃ«" 
+    64701 "Arabe Lidhje Ghain Me Meem Fillestar FormÃ«" 
+    64702 "Arabe Lidhje Feh Me Jeem Fillestar FormÃ«" 
+    64703 "Arabe Lidhje Feh Me Hah Fillestar FormÃ«" 
+    64704 "Arabe Lidhje Feh Me Khah Fillestar FormÃ«" 
+    64705 "Arabe Lidhje Feh Me Meem Fillestar FormÃ«" 
+    64706 "Arabe Lidhje Qaf Me Hah Fillestar FormÃ«" 
+    64707 "Arabe Lidhje Qaf Me Meem Fillestar FormÃ«" 
+    64708 "Arabe Lidhje Kaf Me Jeem Fillestar FormÃ«" 
+    64709 "Arabe Lidhje Kaf Me Hah Fillestar FormÃ«" 
+    64710 "Arabe Lidhje Kaf Me Khah Fillestar FormÃ«" 
+    64711 "Arabe Lidhje Kaf Me Lam Fillestar FormÃ«" 
+    64712 "Arabe Lidhje Kaf Me Meem Fillestar FormÃ«" 
+    64713 "Arabe Lidhje Lam Me Jeem Fillestar FormÃ«" 
+    64714 "Arabe Lidhje Lam Me Hah Fillestar FormÃ«" 
+    64715 "Arabe Lidhje Lam Me Khah Fillestar FormÃ«" 
+    64716 "Arabe Lidhje Lam Me Meem Fillestar FormÃ«" 
+    64717 "Arabe Lidhje Lam Me Heh Fillestar FormÃ«" 
+    64718 "Arabe Lidhje Meem Me Jeem Fillestar FormÃ«" 
+    64719 "Arabe Lidhje Meem Me Hah Fillestar FormÃ«" 
+    64720 "Arabe Lidhje Meem Me Khah Fillestar FormÃ«" 
+    64721 "Arabe Lidhje Meem Me Meem Fillestar FormÃ«" 
+    64722 "Arabe Lidhje Noon Me Jeem Fillestar FormÃ«" 
+    64723 "Arabe Lidhje Noon Me Hah Fillestar FormÃ«" 
+    64724 "Arabe Lidhje Noon Me Khah Fillestar FormÃ«" 
+    64725 "Arabe Lidhje Noon Me Meem Fillestar FormÃ«" 
+    64726 "Arabe Lidhje Noon Me Heh Fillestar FormÃ«" 
+    64727 "Arabe Lidhje Heh Me Jeem Fillestar FormÃ«" 
+    64728 "Arabe Lidhje Heh Me Meem Fillestar FormÃ«" 
+    64729 "Arabe Lidhje Heh Me Indeks i SipÃ«rm Alef Fillestar FormÃ«" 
+    64730 "Arabe Lidhje Yeh Me Jeem Fillestar FormÃ«" 
+    64731 "Arabe Lidhje Yeh Me Hah Fillestar FormÃ«" 
+    64732 "Arabe Lidhje Yeh Me Khah Fillestar FormÃ«" 
+    64733 "Arabe Lidhje Yeh Me Meem Fillestar FormÃ«" 
+    64734 "Arabe Lidhje Yeh Me Heh Fillestar FormÃ«" 
+    64735 "Arabe Lidhje Yeh Me Hamza Lart Me Meem Mesor FormÃ«" 
+    64736 "Arabe Lidhje Yeh Me Hamza Lart Me Heh Mesor FormÃ«" 
+    64737 "Arabe Lidhje Beh Me Meem Mesor FormÃ«" 
+    64738 "Arabe Lidhje Beh Me Heh Mesor FormÃ«" 
+    64739 "Arabe Lidhje Teh Me Meem Mesor FormÃ«" 
+    64740 "Arabe Lidhje Teh Me Heh Mesor FormÃ«" 
+    64741 "Arabe Lidhje Theh Me Meem Mesor FormÃ«" 
+    64742 "Arabe Lidhje Theh Me Heh Mesor FormÃ«" 
+    64743 "Arabe Lidhje ParÃ« Me Meem Mesor FormÃ«" 
+    64744 "Arabe Lidhje ParÃ« Me Heh Mesor FormÃ«" 
+    64745 "Arabe Lidhje Sheen Me Meem Mesor FormÃ«" 
+    64746 "Arabe Lidhje Sheen Me Heh Mesor FormÃ«" 
+    64747 "Arabe Lidhje Kaf Me Lam Mesor FormÃ«" 
+    64748 "Arabe Lidhje Kaf Me Meem Mesor FormÃ«" 
+    64749 "Arabe Lidhje Lam Me Meem Mesor FormÃ«" 
+    64750 "Arabe Lidhje Noon Me Meem Mesor FormÃ«" 
+    64751 "Arabe Lidhje Noon Me Heh Mesor FormÃ«" 
+    64752 "Arabe Lidhje Yeh Me Meem Mesor FormÃ«" 
+    64753 "Arabe Lidhje Yeh Me Heh Mesor FormÃ«" 
+    64754 "Arabe Lidhje Shadda Me Fatha Mesor FormÃ«" 
+    64755 "Arabe Lidhje Shadda Me Damma Mesor FormÃ«" 
+    64756 "Arabe Lidhje Shadda Me Kasra Mesor FormÃ«" 
+    64757 "Arabe Lidhje Tah Me Alef Maksura Izoluar FormÃ«" 
+    64758 "Arabe Lidhje Tah Me Yeh Izoluar FormÃ«" 
+    64759 "Arabe Lidhje Ain Me Alef Maksura Izoluar FormÃ«" 
+    64760 "Arabe Lidhje Ain Me Yeh Izoluar FormÃ«" 
+    64761 "Arabe Lidhje Ghain Me Alef Maksura Izoluar FormÃ«" 
+    64762 "Arabe Lidhje Ghain Me Yeh Izoluar FormÃ«" 
+    64763 "Arabe Lidhje ParÃ« Me Alef Maksura Izoluar FormÃ«" 
+    64764 "Arabe Lidhje ParÃ« Me Yeh Izoluar FormÃ«" 
+    64765 "Arabe Lidhje Sheen Me Alef Maksura Izoluar FormÃ«" 
+    64766 "Arabe Lidhje Sheen Me Yeh Izoluar FormÃ«" 
+    64767 "Arabe Lidhje Hah Me Alef Maksura Izoluar FormÃ«" 
+    64768 "Arabe Lidhje Hah Me Yeh Izoluar FormÃ«" 
+    64769 "Arabe Lidhje Jeem Me Alef Maksura Izoluar FormÃ«" 
+    64770 "Arabe Lidhje Jeem Me Yeh Izoluar FormÃ«" 
+    64771 "Arabe Lidhje Khah Me Alef Maksura Izoluar FormÃ«" 
+    64772 "Arabe Lidhje Khah Me Yeh Izoluar FormÃ«" 
+    64773 "Arabe Lidhje Sad Me Alef Maksura Izoluar FormÃ«" 
+    64774 "Arabe Lidhje Sad Me Yeh Izoluar FormÃ«" 
+    64775 "Arabe Lidhje Dad Me Alef Maksura Izoluar FormÃ«" 
+    64776 "Arabe Lidhje Dad Me Yeh Izoluar FormÃ«" 
+    64777 "Arabe Lidhje Sheen Me Jeem Izoluar FormÃ«" 
+    64778 "Arabe Lidhje Sheen Me Hah Izoluar FormÃ«" 
+    64779 "Arabe Lidhje Sheen Me Khah Izoluar FormÃ«" 
+    64780 "Arabe Lidhje Sheen Me Meem Izoluar FormÃ«" 
+    64781 "Arabe Lidhje Sheen Me Reh Izoluar FormÃ«" 
+    64782 "Arabe Lidhje ParÃ« Me Reh Izoluar FormÃ«" 
+    64783 "Arabe Lidhje Sad Me Reh Izoluar FormÃ«" 
+    64784 "Arabe Lidhje Dad Me Reh Izoluar FormÃ«" 
+    64785 "Arabe Lidhje Tah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64786 "Arabe Lidhje Tah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64787 "Arabe Lidhje Ain Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64788 "Arabe Lidhje Ain Me Yeh PÃ«rfundimtare FormÃ«" 
+    64789 "Arabe Lidhje Ghain Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64790 "Arabe Lidhje Ghain Me Yeh PÃ«rfundimtare FormÃ«" 
+    64791 "Arabe Lidhje ParÃ« Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64792 "Arabe Lidhje ParÃ« Me Yeh PÃ«rfundimtare FormÃ«" 
+    64793 "Arabe Lidhje Sheen Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64794 "Arabe Lidhje Sheen Me Yeh PÃ«rfundimtare FormÃ«" 
+    64795 "Arabe Lidhje Hah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64796 "Arabe Lidhje Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64797 "Arabe Lidhje Jeem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64798 "Arabe Lidhje Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64799 "Arabe Lidhje Khah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64800 "Arabe Lidhje Khah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64801 "Arabe Lidhje Sad Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64802 "Arabe Lidhje Sad Me Yeh PÃ«rfundimtare FormÃ«" 
+    64803 "Arabe Lidhje Dad Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64804 "Arabe Lidhje Dad Me Yeh PÃ«rfundimtare FormÃ«" 
+    64805 "Arabe Lidhje Sheen Me Jeem PÃ«rfundimtare FormÃ«" 
+    64806 "Arabe Lidhje Sheen Me Hah PÃ«rfundimtare FormÃ«" 
+    64807 "Arabe Lidhje Sheen Me Khah PÃ«rfundimtare FormÃ«" 
+    64808 "Arabe Lidhje Sheen Me Meem PÃ«rfundimtare FormÃ«" 
+    64809 "Arabe Lidhje Sheen Me Reh PÃ«rfundimtare FormÃ«" 
+    64810 "Arabe Lidhje ParÃ« Me Reh PÃ«rfundimtare FormÃ«" 
+    64811 "Arabe Lidhje Sad Me Reh PÃ«rfundimtare FormÃ«" 
+    64812 "Arabe Lidhje Dad Me Reh PÃ«rfundimtare FormÃ«" 
+    64813 "Arabe Lidhje Sheen Me Jeem Fillestar FormÃ«" 
+    64814 "Arabe Lidhje Sheen Me Hah Fillestar FormÃ«" 
+    64815 "Arabe Lidhje Sheen Me Khah Fillestar FormÃ«" 
+    64816 "Arabe Lidhje Sheen Me Meem Fillestar FormÃ«" 
+    64817 "Arabe Lidhje ParÃ« Me Heh Fillestar FormÃ«" 
+    64818 "Arabe Lidhje Sheen Me Heh Fillestar FormÃ«" 
+    64819 "Arabe Lidhje Tah Me Meem Fillestar FormÃ«" 
+    64820 "Arabe Lidhje ParÃ« Me Jeem Mesor FormÃ«" 
+    64821 "Arabe Lidhje ParÃ« Me Hah Mesor FormÃ«" 
+    64822 "Arabe Lidhje ParÃ« Me Khah Mesor FormÃ«" 
+    64823 "Arabe Lidhje Sheen Me Jeem Mesor FormÃ«" 
+    64824 "Arabe Lidhje Sheen Me Hah Mesor FormÃ«" 
+    64825 "Arabe Lidhje Sheen Me Khah Mesor FormÃ«" 
+    64826 "Arabe Lidhje Tah Me Meem Mesor FormÃ«" 
+    64827 "Arabe Lidhje Zah Me Meem Mesor FormÃ«" 
+    64828 "Arabe Lidhje Alef Me Fathatan PÃ«rfundimtare FormÃ«" 
+    64829 "Arabe Lidhje Alef Me Fathatan Izoluar FormÃ«" 
+    64830 "Ornate MajtÃ« KllapÃ«" 
+    64831 "Ornate DjathtÃ« KllapÃ«" 
+    64848 "Arabe Lidhje Teh Me Jeem Me Meem Fillestar FormÃ«" 
+    64849 "Arabe Lidhje Teh Me Hah Me Jeem PÃ«rfundimtare FormÃ«" 
+    64850 "Arabe Lidhje Teh Me Hah Me Jeem Fillestar FormÃ«" 
+    64851 "Arabe Lidhje Teh Me Hah Me Meem Fillestar FormÃ«" 
+    64852 "Arabe Lidhje Teh Me Khah Me Meem Fillestar FormÃ«" 
+    64853 "Arabe Lidhje Teh Me Meem Me Jeem Fillestar FormÃ«" 
+    64854 "Arabe Lidhje Teh Me Meem Me Hah Fillestar FormÃ«" 
+    64855 "Arabe Lidhje Teh Me Meem Me Khah Fillestar FormÃ«" 
+    64856 "Arabe Lidhje Jeem Me Meem Me Hah PÃ«rfundimtare FormÃ«" 
+    64857 "Arabe Lidhje Jeem Me Meem Me Hah Fillestar FormÃ«" 
+    64858 "Arabe Lidhje Hah Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64859 "Arabe Lidhje Hah Me Meem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64860 "Arabe Lidhje ParÃ« Me Hah Me Jeem Fillestar FormÃ«" 
+    64861 "Arabe Lidhje ParÃ« Me Jeem Me Hah Fillestar FormÃ«" 
+    64862 "Arabe Lidhje ParÃ« Me Jeem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64863 "Arabe Lidhje ParÃ« Me Meem Me Hah PÃ«rfundimtare FormÃ«" 
+    64864 "Arabe Lidhje ParÃ« Me Meem Me Hah Fillestar FormÃ«" 
+    64865 "Arabe Lidhje ParÃ« Me Meem Me Jeem Fillestar FormÃ«" 
+    64866 "Arabe Lidhje ParÃ« Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64867 "Arabe Lidhje ParÃ« Me Meem Me Meem Fillestar FormÃ«" 
+    64868 "Arabe Lidhje Sad Me Hah Me Hah PÃ«rfundimtare FormÃ«" 
+    64869 "Arabe Lidhje Sad Me Hah Me Hah Fillestar FormÃ«" 
+    64870 "Arabe Lidhje Sad Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64871 "Arabe Lidhje Sheen Me Hah Me Meem PÃ«rfundimtare FormÃ«" 
+    64872 "Arabe Lidhje Sheen Me Hah Me Meem Fillestar FormÃ«" 
+    64873 "Arabe Lidhje Sheen Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64874 "Arabe Lidhje Sheen Me Meem Me Khah PÃ«rfundimtare FormÃ«" 
+    64875 "Arabe Lidhje Sheen Me Meem Me Khah Fillestar FormÃ«" 
+    64876 "Arabe Lidhje Sheen Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64877 "Arabe Lidhje Sheen Me Meem Me Meem Fillestar FormÃ«" 
+    64878 "Arabe Lidhje Dad Me Hah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64879 "Arabe Lidhje Dad Me Khah Me Meem PÃ«rfundimtare FormÃ«" 
+    64880 "Arabe Lidhje Dad Me Khah Me Meem Fillestar FormÃ«" 
+    64881 "Arabe Lidhje Tah Me Meem Me Hah PÃ«rfundimtare FormÃ«" 
+    64882 "Arabe Lidhje Tah Me Meem Me Hah Fillestar FormÃ«" 
+    64883 "Arabe Lidhje Tah Me Meem Me Meem Fillestar FormÃ«" 
+    64884 "Arabe Lidhje Tah Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64885 "Arabe Lidhje Ain Me Jeem Me Meem PÃ«rfundimtare FormÃ«" 
+    64886 "Arabe Lidhje Ain Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64887 "Arabe Lidhje Ain Me Meem Me Meem Fillestar FormÃ«" 
+    64888 "Arabe Lidhje Ain Me Meem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64889 "Arabe Lidhje Ghain Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64890 "Arabe Lidhje Ghain Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64891 "Arabe Lidhje Ghain Me Meem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64892 "Arabe Lidhje Feh Me Khah Me Meem PÃ«rfundimtare FormÃ«" 
+    64893 "Arabe Lidhje Feh Me Khah Me Meem Fillestar FormÃ«" 
+    64894 "Arabe Lidhje Qaf Me Meem Me Hah PÃ«rfundimtare FormÃ«" 
+    64895 "Arabe Lidhje Qaf Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64896 "Arabe Lidhje Lam Me Hah Me Meem PÃ«rfundimtare FormÃ«" 
+    64897 "Arabe Lidhje Lam Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64898 "Arabe Lidhje Lam Me Hah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64899 "Arabe Lidhje Lam Me Jeem Me Jeem Lidhje FormÃ«" 
+    64900 "Arabe Lidhje Lam Me Jeem Me Jeem PÃ«rfundimtare FormÃ«" 
+    64901 "Arabe Lidhje Lam Me Khah Me Meem PÃ«rfundimtare FormÃ«" 
+    64902 "Arabe Lidhje Lam Me Khah Me Meem Fillestar FormÃ«" 
+    64903 "Arabe Lidhje Lam Me Meem Me Hah PÃ«rfundimtare FormÃ«" 
+    64904 "Arabe Lidhje Lam Me Meem Me Hah Fillestar FormÃ«" 
+    64905 "Arabe Lidhje Meem Me Hah Me Jeem Fillestar FormÃ«" 
+    64906 "Arabe Lidhje Meem Me Hah Me Meem Fillestar FormÃ«" 
+    64907 "Arabe Lidhje Meem Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64908 "Arabe Lidhje Meem Me Jeem Me Hah Fillestar FormÃ«" 
+    64909 "Arabe Lidhje Meem Me Jeem Me Meem Fillestar FormÃ«" 
+    64910 "Arabe Lidhje Meem Me Khah Me Jeem Fillestar FormÃ«" 
+    64911 "Arabe Lidhje Meem Me Khah Me Meem Fillestar FormÃ«" 
+    64914 "Arabe Lidhje Meem Me Jeem Me Khah Fillestar FormÃ«" 
+    64915 "Arabe Lidhje Heh Me Meem Me Jeem Fillestar FormÃ«" 
+    64916 "Arabe Lidhje Heh Me Meem Me Meem Fillestar FormÃ«" 
+    64917 "Arabe Lidhje Noon Me Hah Me Meem Fillestar FormÃ«" 
+    64918 "Arabe Lidhje Noon Me Hah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64919 "Arabe Lidhje Noon Me Jeem Me Meem PÃ«rfundimtare FormÃ«" 
+    64920 "Arabe Lidhje Noon Me Jeem Me Meem Fillestar FormÃ«" 
+    64921 "Arabe Lidhje Noon Me Jeem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64922 "Arabe Lidhje Noon Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64923 "Arabe Lidhje Noon Me Meem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64924 "Arabe Lidhje Yeh Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64925 "Arabe Lidhje Yeh Me Meem Me Meem Fillestar FormÃ«" 
+    64926 "Arabe Lidhje Beh Me Khah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64927 "Arabe Lidhje Teh Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64928 "Arabe Lidhje Teh Me Jeem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64929 "Arabe Lidhje Teh Me Khah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64930 "Arabe Lidhje Teh Me Khah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64931 "Arabe Lidhje Teh Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64932 "Arabe Lidhje Teh Me Meem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64933 "Arabe Lidhje Jeem Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64934 "Arabe Lidhje Jeem Me Hah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64935 "Arabe Lidhje Jeem Me Meem Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64936 "Arabe Lidhje ParÃ« Me Khah Me Alef Maksura PÃ«rfundimtare FormÃ«" 
+    64937 "Arabe Lidhje Sad Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64938 "Arabe Lidhje Sheen Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64939 "Arabe Lidhje Dad Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64940 "Arabe Lidhje Lam Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64941 "Arabe Lidhje Lam Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64942 "Arabe Lidhje Yeh Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64943 "Arabe Lidhje Yeh Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64944 "Arabe Lidhje Yeh Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64945 "Arabe Lidhje Meem Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64946 "Arabe Lidhje Qaf Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64947 "Arabe Lidhje Noon Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64948 "Arabe Lidhje Qaf Me Meem Me Hah Fillestar FormÃ«" 
+    64949 "Arabe Lidhje Lam Me Hah Me Meem Fillestar FormÃ«" 
+    64950 "Arabe Lidhje Ain Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64951 "Arabe Lidhje Kaf Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64952 "Arabe Lidhje Noon Me Jeem Me Hah Fillestar FormÃ«" 
+    64953 "Arabe Lidhje Meem Me Khah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64954 "Arabe Lidhje Lam Me Jeem Me Meem Fillestar FormÃ«" 
+    64955 "Arabe Lidhje Kaf Me Meem Me Meem PÃ«rfundimtare FormÃ«" 
+    64956 "Arabe Lidhje Lam Me Jeem Me Meem PÃ«rfundimtare FormÃ«" 
+    64957 "Arabe Lidhje Noon Me Jeem Me Hah PÃ«rfundimtare FormÃ«" 
+    64958 "Arabe Lidhje Jeem Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64959 "Arabe Lidhje Hah Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64960 "Arabe Lidhje Meem Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64961 "Arabe Lidhje Feh Me Meem Me Yeh PÃ«rfundimtare FormÃ«" 
+    64962 "Arabe Lidhje Beh Me Hah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64963 "Arabe Lidhje Kaf Me Meem Me Meem Fillestar FormÃ«" 
+    64964 "Arabe Lidhje Ain Me Jeem Me Meem Fillestar FormÃ«" 
+    64965 "Arabe Lidhje Sad Me Meem Me Meem Fillestar FormÃ«" 
+    64966 "Arabe Lidhje ParÃ« Me Khah Me Yeh PÃ«rfundimtare FormÃ«" 
+    64967 "Arabe Lidhje Noon Me Jeem Me Yeh PÃ«rfundimtare FormÃ«" 
+    65008 "Arabe Lidhje Salla Used As Koranic Stop ShenjÃ« Izoluar FormÃ«" 
+    65009 "Arabe Lidhje Qala Used As Koranic Stop ShenjÃ« Izoluar FormÃ«" 
+    65010 "Arabe Lidhje Allah Izoluar FormÃ«" 
+    65011 "Arabe Lidhje Akbar Izoluar FormÃ«" 
+    65012 "Arabe Lidhje Mohammad Izoluar FormÃ«" 
+    65013 "Arabe Lidhje Salam Izoluar FormÃ«" 
+    65014 "Arabe Lidhje Rasoul Izoluar FormÃ«" 
+    65015 "Arabe Lidhje Alayhe Izoluar FormÃ«" 
+    65016 "Arabe Lidhje Wasallam Izoluar FormÃ«" 
+    65017 "Arabe Lidhje Salla Izoluar FormÃ«" 
+    65018 "Arabe Lidhje Sallallahou Alayhe Wasallam" 
+    65019 "Arabe Lidhje Jallajalalouhou" 
+    65020 "Rial ShenjÃ«" 
+    65021 "Arabe Lidhje Bismillah Ar-Rahman Ar-Raheem" 
+    65024 "Ndryshim PÃ«rzgjedhÃ«s-1" 
+    65025 "Ndryshim PÃ«rzgjedhÃ«s-2" 
+    65026 "Ndryshim PÃ«rzgjedhÃ«s-3" 
+    65027 "Ndryshim PÃ«rzgjedhÃ«s-4" 
+    65028 "Ndryshim PÃ«rzgjedhÃ«s-5" 
+    65029 "Ndryshim PÃ«rzgjedhÃ«s-6" 
+    65030 "Ndryshim PÃ«rzgjedhÃ«s-7" 
+    65031 "Ndryshim PÃ«rzgjedhÃ«s-8" 
+    65032 "Ndryshim PÃ«rzgjedhÃ«s-9" 
+    65033 "Ndryshim PÃ«rzgjedhÃ«s-10" 
+    65034 "Ndryshim PÃ«rzgjedhÃ«s-11" 
+    65035 "Ndryshim PÃ«rzgjedhÃ«s-12" 
+    65036 "Ndryshim PÃ«rzgjedhÃ«s-13" 
+    65037 "Ndryshim PÃ«rzgjedhÃ«s-14" 
+    65038 "Ndryshim PÃ«rzgjedhÃ«s-15" 
+    65039 "Ndryshim PÃ«rzgjedhÃ«s-16" 
+    65040 "Prezantimi FormÃ« PÃ«r Vertikale Presje" 
+    65041 "Prezantimi Forma PÃ«r Vertikale Ideo-grafik Presje" 
+    65042 "Prezantimi Forma PÃ«r Vertikale Ideo-grafik PikÃ«" 
+    65043 "Prezantimi Forma PÃ«r Vertikale Dy Pika" 
+    65044 "Prezantimi Forma PÃ«r Vertikale PikÃ«presje" 
+    65045 "Prezantimi Forma PÃ«r Vertikale Thirrje ShenjÃ«" 
+    65046 "Prezantimi Forma PÃ«r Vertikale Pyetje ShenjÃ«" 
+    65047 "Prezantimi Forma PÃ«r Vertikale MajtÃ« e BardhÃ« Lenticular Kllapa" 
+    65048 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« e BardhÃ« Lenticular Brakcet" 
+    65049 "Prezantimi Forma PÃ«r Vertikale Horizontal Ellipsis" 
+    65056 "Kombinuar Lidhje MajtÃ« GjysmÃ«" 
+    65057 "Kombinuar Lidhje DjathtÃ« GjysmÃ«" 
+    65058 "Kombinuar Dyshe TildÃ« MajtÃ« GjysmÃ«" 
+    65059 "Kombinuar Dyshe TildÃ« DjathtÃ« GjysmÃ«" 
+    65060 "Kombinuar Macron MajtÃ« GjysmÃ«" 
+    65061 "Kombinuar Macron DjathtÃ« GjysmÃ«" 
+    65062 "Kombinuar Conjoining Macron" 
+    65072 "Prezantimi Forma PÃ«r Vertikale Dy PikÃ« UdhÃ«heqÃ«se" 
+    65073 "Prezantimi Forma PÃ«r Vertikale Em Dash" 
+    65074 "Prezantimi Forma PÃ«r Vertikale En Dash" 
+    65075 "Prezantimi Forma PÃ«r Vertikale UlÃ«t LinjÃ«" 
+    65076 "Prezantimi Forma PÃ«r Vertikale Onde UlÃ«t LinjÃ«" 
+    65077 "Prezantimi Forma PÃ«r Vertikale MajtÃ« KllapÃ«" 
+    65078 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« KllapÃ«" 
+    65079 "Prezantimi Forma PÃ«r Vertikale MajtÃ« Dredhur Kllapa" 
+    65080 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« Dredhur Kllapa" 
+    65081 "Prezantimi Forma PÃ«r Vertikale MajtÃ« Tortoise Shell Kllapa" 
+    65082 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« Tortoise Shell Kllapa" 
+    65083 "Prezantimi Forma PÃ«r Vertikale MajtÃ« e ZezÃ« Lenticular Kllapa" 
+    65084 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« e ZezÃ« Lenticular Kllapa" 
+    65085 "Prezantimi Forma PÃ«r Vertikale Majtas Dyshe KÃ«nd Kllapa" 
+    65086 "Prezantimi Forma PÃ«r Vertikale Djathtas Dyshe KÃ«nd Kllapa" 
+    65087 "Prezantimi Forma PÃ«r Vertikale MajtÃ« KÃ«nd Kllapa" 
+    65088 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« KÃ«nd Kllapa" 
+    65089 "Prezantimi Forma PÃ«r Vertikale MajtÃ« KÃ«nd Kllapa" 
+    65090 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« KÃ«nd Kllapa" 
+    65091 "Prezantimi Forma PÃ«r Vertikale MajtÃ« e BardhÃ« KÃ«nd Kllapa" 
+    65092 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« e BardhÃ« KÃ«nd Kllapa" 
+    65093 "Sesame PikÃ«" 
+    65094 "E BardhÃ« Sesame PikÃ«" 
+    65095 "Prezantimi Forma PÃ«r Vertikale KllapÃ« Rrumbullake Majtas" 
+    65096 "Prezantimi Forma PÃ«r Vertikale DjathtÃ« Katror Kllapa" 
+    65097 "VizÃ« Mbi-linjÃ«" 
+    65098 "Centralizmin Mbi-linjÃ«" 
+    65099 "Onde Mbi-linjÃ«" 
+    65100 "Dyshe ValÃ« Mbi-linjÃ«" 
+    65101 "VizÃ« UlÃ«t LinjÃ«" 
+    65102 "CentreLinjÃ« UlÃ«t LinjÃ«" 
+    65103 "ValÃ« UlÃ«t LinjÃ«" 
+    65104 "E VogÃ«l Presje" 
+    65105 "E VogÃ«l Ideo-grafik Presje" 
+    65106 "E VogÃ«l PikÃ«" 
+    65108 "E VogÃ«l PikÃ«presje" 
+    65109 "E VogÃ«l Dy Pika" 
+    65110 "E VogÃ«l Pyetje ShenjÃ«" 
+    65111 "E VogÃ«l Thirrje ShenjÃ«" 
+    65112 "E VogÃ«l Em Dash" 
+    65113 "E VogÃ«l MajtÃ« KllapÃ«" 
+    65114 "E VogÃ«l DjathtÃ« KllapÃ«" 
+    65115 "E VogÃ«l MajtÃ« Dredhur Kllapa" 
+    65116 "E VogÃ«l DjathtÃ« Dredhur Kllapa" 
+    65117 "E VogÃ«l MajtÃ« Tortoise Shell Kllapa" 
+    65118 "E VogÃ«l DjathtÃ« Tortoise Shell Kllapa" 
+    65119 "E VogÃ«l NumÃ«r ShenjÃ«" 
+    65120 "E VogÃ«l Ampersand" 
+    65121 "E VogÃ«l Yll" 
+    65122 "E VogÃ«l Plus ShenjÃ«" 
+    65123 "E VogÃ«l Hyphen-Minus" 
+    65124 "E VogÃ«l MÃ« pak-se ShenjÃ«" 
+    65125 "E VogÃ«l Madhe-se ShenjÃ«" 
+    65126 "E VogÃ«l BarabartÃ« ShenjÃ«" 
+    65128 "E VogÃ«l Kthe-Mrapsht Solidus" 
+    65129 "E VogÃ«l Dollar ShenjÃ«" 
+    65130 "E VogÃ«l PÃ«rqind ShenjÃ«" 
+    65131 "E VogÃ«l Commercial At" 
+    65136 "Arabe Fathatan Izoluar FormÃ«" 
+    65137 "Arabe Tatweel Me Fathatan Lart" 
+    65138 "Arabe Dammatan Izoluar FormÃ«" 
+    65139 "Arabe Bisht Fragment" 
+    65140 "Arabe Kasratan Izoluar FormÃ«" 
+    65142 "Arabe Fatha Izoluar FormÃ«" 
+    65143 "Arabe Fatha Mesor FormÃ«" 
+    65144 "Arabe Damma Izoluar FormÃ«" 
+    65145 "Arabe Damma Mesor FormÃ«" 
+    65146 "Arabe Kasra Izoluar FormÃ«" 
+    65147 "Arabe Kasra Mesor FormÃ«" 
+    65148 "Arabe Shadda Izoluar FormÃ«" 
+    65149 "Arabe Shadda Mesor FormÃ«" 
+    65150 "Arabe Sukun Izoluar FormÃ«" 
+    65151 "Arabe Sukun Mesor FormÃ«" 
+    65152 "Arabe ShkronjÃ« Hamza Izoluar FormÃ«" 
+    65153 "Arabe ShkronjÃ« Alef Me Madda Lart Izoluar FormÃ«" 
+    65154 "Arabe ShkronjÃ« Alef Me Madda Lart PÃ«rfundimtare FormÃ«" 
+    65155 "Arabe ShkronjÃ« Alef Me Hamza Lart Izoluar FormÃ«" 
+    65156 "Arabe ShkronjÃ« Alef Me Hamza Lart PÃ«rfundimtare FormÃ«" 
+    65157 "Arabe ShkronjÃ« Waw Me Hamza Lart Izoluar FormÃ«" 
+    65158 "Arabe ShkronjÃ« Waw Me Hamza Lart PÃ«rfundimtare FormÃ«" 
+    65159 "Arabe ShkronjÃ« Alef Me Hamza PoshtÃ« Izoluar FormÃ«" 
+    65160 "Arabe ShkronjÃ« Alef Me Hamza PoshtÃ« PÃ«rfundimtare FormÃ«" 
+    65161 "Arabe ShkronjÃ« Yeh Me Hamza Lart Izoluar FormÃ«" 
+    65162 "Arabe ShkronjÃ« Yeh Me Hamza Lart PÃ«rfundimtare FormÃ«" 
+    65163 "Arabe ShkronjÃ« Yeh Me Hamza Lart Fillestar FormÃ«" 
+    65164 "Arabe ShkronjÃ« Yeh Me Hamza Lart Mesor FormÃ«" 
+    65165 "Arabe ShkronjÃ« Alef Izoluar FormÃ«" 
+    65166 "Arabe ShkronjÃ« Alef PÃ«rfundimtare FormÃ«" 
+    65167 "Arabe ShkronjÃ« Beh Izoluar FormÃ«" 
+    65168 "Arabe ShkronjÃ« Beh PÃ«rfundimtare FormÃ«" 
+    65169 "Arabe ShkronjÃ« Beh Fillestar FormÃ«" 
+    65170 "Arabe ShkronjÃ« Beh Mesor FormÃ«" 
+    65171 "Arabe ShkronjÃ« Teh Marbuta Izoluar FormÃ«" 
+    65172 "Arabe ShkronjÃ« Teh Marbuta PÃ«rfundimtare FormÃ«" 
+    65173 "Arabe ShkronjÃ« Teh Izoluar FormÃ«" 
+    65174 "Arabe ShkronjÃ« Teh PÃ«rfundimtare FormÃ«" 
+    65175 "Arabe ShkronjÃ« Teh Fillestar FormÃ«" 
+    65176 "Arabe ShkronjÃ« Teh Mesor FormÃ«" 
+    65177 "Arabe ShkronjÃ« Theh Izoluar FormÃ«" 
+    65178 "Arabe ShkronjÃ« Theh PÃ«rfundimtare FormÃ«" 
+    65179 "Arabe ShkronjÃ« Theh Fillestar FormÃ«" 
+    65180 "Arabe ShkronjÃ« Theh Mesor FormÃ«" 
+    65181 "Arabe ShkronjÃ« Jeem Izoluar FormÃ«" 
+    65182 "Arabe ShkronjÃ« Jeem PÃ«rfundimtare FormÃ«" 
+    65183 "Arabe ShkronjÃ« Jeem Fillestar FormÃ«" 
+    65184 "Arabe ShkronjÃ« Jeem Mesor FormÃ«" 
+    65185 "Arabe ShkronjÃ« Hah Izoluar FormÃ«" 
+    65186 "Arabe ShkronjÃ« Hah PÃ«rfundimtare FormÃ«" 
+    65187 "Arabe ShkronjÃ« Hah Fillestar FormÃ«" 
+    65188 "Arabe ShkronjÃ« Hah Mesor FormÃ«" 
+    65189 "Arabe ShkronjÃ« Khah Izoluar FormÃ«" 
+    65190 "Arabe ShkronjÃ« Khah PÃ«rfundimtare FormÃ«" 
+    65191 "Arabe ShkronjÃ« Khah Fillestar FormÃ«" 
+    65192 "Arabe ShkronjÃ« Khah Mesor FormÃ«" 
+    65193 "Arabe ShkronjÃ« Dal Izoluar FormÃ«" 
+    65194 "Arabe ShkronjÃ« Dal PÃ«rfundimtare FormÃ«" 
+    65195 "Arabe ShkronjÃ« Thal Izoluar FormÃ«" 
+    65196 "Arabe ShkronjÃ« Thal PÃ«rfundimtare FormÃ«" 
+    65197 "Arabe ShkronjÃ« Reh Izoluar FormÃ«" 
+    65198 "Arabe ShkronjÃ« Reh PÃ«rfundimtare FormÃ«" 
+    65199 "Arabe ShkronjÃ« Zain Izoluar FormÃ«" 
+    65200 "Arabe ShkronjÃ« Zain PÃ«rfundimtare FormÃ«" 
+    65201 "Arabe ShkronjÃ« ParÃ« Izoluar FormÃ«" 
+    65202 "Arabe ShkronjÃ« ParÃ« PÃ«rfundimtare FormÃ«" 
+    65203 "Arabe ShkronjÃ« ParÃ« Fillestar FormÃ«" 
+    65204 "Arabe ShkronjÃ« ParÃ« Mesor FormÃ«" 
+    65205 "Arabe ShkronjÃ« Sheen Izoluar FormÃ«" 
+    65206 "Arabe ShkronjÃ« Sheen PÃ«rfundimtare FormÃ«" 
+    65207 "Arabe ShkronjÃ« Sheen Fillestar FormÃ«" 
+    65208 "Arabe ShkronjÃ« Sheen Mesor FormÃ«" 
+    65209 "Arabe ShkronjÃ« Sad Izoluar FormÃ«" 
+    65210 "Arabe ShkronjÃ« Sad PÃ«rfundimtare FormÃ«" 
+    65211 "Arabe ShkronjÃ« Sad Fillestar FormÃ«" 
+    65212 "Arabe ShkronjÃ« Sad Mesor FormÃ«" 
+    65213 "Arabe ShkronjÃ« Dad Izoluar FormÃ«" 
+    65214 "Arabe ShkronjÃ« Dad PÃ«rfundimtare FormÃ«" 
+    65215 "Arabe ShkronjÃ« Dad Fillestar FormÃ«" 
+    65216 "Arabe ShkronjÃ« Dad Mesor FormÃ«" 
+    65217 "Arabe ShkronjÃ« Tah Izoluar FormÃ«" 
+    65218 "Arabe ShkronjÃ« Tah PÃ«rfundimtare FormÃ«" 
+    65219 "Arabe ShkronjÃ« Tah Fillestar FormÃ«" 
+    65220 "Arabe ShkronjÃ« Tah Mesor FormÃ«" 
+    65221 "Arabe ShkronjÃ« Zah Izoluar FormÃ«" 
+    65222 "Arabe ShkronjÃ« Zah PÃ«rfundimtare FormÃ«" 
+    65223 "Arabe ShkronjÃ« Zah Fillestar FormÃ«" 
+    65224 "Arabe ShkronjÃ« Zah Mesor FormÃ«" 
+    65225 "Arabe ShkronjÃ« Ain Izoluar FormÃ«" 
+    65226 "Arabe ShkronjÃ« Ain PÃ«rfundimtare FormÃ«" 
+    65227 "Arabe ShkronjÃ« Ain Fillestar FormÃ«" 
+    65228 "Arabe ShkronjÃ« Ain Mesor FormÃ«" 
+    65229 "Arabe ShkronjÃ« Ghain Izoluar FormÃ«" 
+    65230 "Arabe ShkronjÃ« Ghain PÃ«rfundimtare FormÃ«" 
+    65231 "Arabe ShkronjÃ« Ghain Fillestar FormÃ«" 
+    65232 "Arabe ShkronjÃ« Ghain Mesor FormÃ«" 
+    65233 "Arabe ShkronjÃ« Feh Izoluar FormÃ«" 
+    65234 "Arabe ShkronjÃ« Feh PÃ«rfundimtare FormÃ«" 
+    65235 "Arabe ShkronjÃ« Feh Fillestar FormÃ«" 
+    65236 "Arabe ShkronjÃ« Feh Mesor FormÃ«" 
+    65237 "Arabe ShkronjÃ« Qaf Izoluar FormÃ«" 
+    65238 "Arabe ShkronjÃ« Qaf PÃ«rfundimtare FormÃ«" 
+    65239 "Arabe ShkronjÃ« Qaf Fillestar FormÃ«" 
+    65240 "Arabe ShkronjÃ« Qaf Mesor FormÃ«" 
+    65241 "Arabe ShkronjÃ« Kaf Izoluar FormÃ«" 
+    65242 "Arabe ShkronjÃ« Kaf PÃ«rfundimtare FormÃ«" 
+    65243 "Arabe ShkronjÃ« Kaf Fillestar FormÃ«" 
+    65244 "Arabe ShkronjÃ« Kaf Mesor FormÃ«" 
+    65245 "Arabe ShkronjÃ« Lam Izoluar FormÃ«" 
+    65246 "Arabe ShkronjÃ« Lam PÃ«rfundimtare FormÃ«" 
+    65247 "Arabe ShkronjÃ« Lam Fillestar FormÃ«" 
+    65248 "Arabe ShkronjÃ« Lam Mesor FormÃ«" 
+    65249 "Arabe ShkronjÃ« Meem Izoluar FormÃ«" 
+    65250 "Arabe ShkronjÃ« Meem PÃ«rfundimtare FormÃ«" 
+    65251 "Arabe ShkronjÃ« Meem Fillestar FormÃ«" 
+    65252 "Arabe ShkronjÃ« Meem Mesor FormÃ«" 
+    65253 "Arabe ShkronjÃ« Noon Izoluar FormÃ«" 
+    65254 "Arabe ShkronjÃ« Noon PÃ«rfundimtare FormÃ«" 
+    65255 "Arabe ShkronjÃ« Noon Fillestar FormÃ«" 
+    65256 "Arabe ShkronjÃ« Noon Mesor FormÃ«" 
+    65257 "Arabe ShkronjÃ« Heh Izoluar FormÃ«" 
+    65258 "Arabe ShkronjÃ« Heh PÃ«rfundimtare FormÃ«" 
+    65259 "Arabe ShkronjÃ« Heh Fillestar FormÃ«" 
+    65260 "Arabe ShkronjÃ« Heh Mesor FormÃ«" 
+    65261 "Arabe ShkronjÃ« Waw Izoluar FormÃ«" 
+    65262 "Arabe ShkronjÃ« Waw PÃ«rfundimtare FormÃ«" 
+    65263 "Arabe ShkronjÃ« Alef Maksura Izoluar FormÃ«" 
+    65264 "Arabe ShkronjÃ« Alef Maksura PÃ«rfundimtare FormÃ«" 
+    65265 "Arabe ShkronjÃ« Yeh Izoluar FormÃ«" 
+    65266 "Arabe ShkronjÃ« Yeh PÃ«rfundimtare FormÃ«" 
+    65267 "Arabe ShkronjÃ« Yeh Fillestar FormÃ«" 
+    65268 "Arabe ShkronjÃ« Yeh Mesor FormÃ«" 
+    65269 "Arabe Lidhje Lam Me Alef Me Madda Lart Izoluar FormÃ«" 
+    65270 "Arabe Lidhje Lam Me Alef Me Madda Lart PÃ«rfundimtare FormÃ«" 
+    65271 "Arabe Lidhje Lam Me Alef Me Hamza Lart Izoluar FormÃ«" 
+    65272 "Arabe Lidhje Lam Me Alef Me Hamza Lart PÃ«rfundimtare FormÃ«" 
+    65273 "Arabe Lidhje Lam Me Alef Me Hamza PoshtÃ« Izoluar FormÃ«" 
+    65274 "Arabe Lidhje Lam Me Alef Me Hamza PoshtÃ« PÃ«rfundimtare FormÃ«" 
+    65275 "Arabe Lidhje Lam Me Alef Izoluar FormÃ«" 
+    65276 "Arabe Lidhje Lam Me Alef PÃ«rfundimtare FormÃ«" 
+    65279 "Zero GjerÃ«si No-Break HapÃ«sirÃ«" 
+    65281 "GjerÃ«si-PlotÃ« Thirrje ShenjÃ«" 
+    65282 "GjerÃ«si-PlotÃ« Citat ShenjÃ«" 
+    65283 "GjerÃ«si-PlotÃ« NumÃ«r ShenjÃ«" 
+    65284 "GjerÃ«si-PlotÃ« Dollar ShenjÃ«" 
+    65285 "GjerÃ«si-PlotÃ« PÃ«rqind ShenjÃ«" 
+    65286 "GjerÃ«si-PlotÃ« Ampersand" 
+    65287 "GjerÃ«si-PlotÃ« Apostrof" 
+    65288 "GjerÃ«si-PlotÃ« MajtÃ« KllapÃ«" 
+    65289 "GjerÃ«si-PlotÃ« DjathtÃ« KllapÃ«" 
+    65290 "GjerÃ«si-PlotÃ« Yll" 
+    65291 "GjerÃ«si-PlotÃ« Plus ShenjÃ«" 
+    65292 "GjerÃ«si-PlotÃ« Presje" 
+    65293 "GjerÃ«si-PlotÃ« Hyphen-Minus" 
+    65294 "GjerÃ«si-PlotÃ« PikÃ«" 
+    65295 "GjerÃ«si-PlotÃ« Solidus" 
+    65296 "GjerÃ«si-PlotÃ« ShifÃ«r Zero" 
+    65297 "GjerÃ«si-PlotÃ« ShifÃ«r NjÃ«" 
+    65298 "GjerÃ«si-PlotÃ« ShifÃ«r Dy" 
+    65299 "GjerÃ«si-PlotÃ« ShifÃ«r Tre" 
+    65300 "GjerÃ«si-PlotÃ« ShifÃ«r KatÃ«r" 
+    65301 "GjerÃ«si-PlotÃ« ShifÃ«r PesÃ«" 
+    65302 "GjerÃ«si-PlotÃ« ShifÃ«r GjashtÃ«" 
+    65303 "GjerÃ«si-PlotÃ« ShifÃ«r ShtatÃ«" 
+    65304 "GjerÃ«si-PlotÃ« ShifÃ«r TetÃ«" 
+    65305 "GjerÃ«si-PlotÃ« ShifÃ«r NÃ«ntÃ«" 
+    65306 "GjerÃ«si-PlotÃ« Dy Pika" 
+    65307 "GjerÃ«si-PlotÃ« PikÃ«presje" 
+    65308 "GjerÃ«si-PlotÃ« MÃ« pak-se ShenjÃ«" 
+    65309 "GjerÃ«si-PlotÃ« BarabartÃ« ShenjÃ«" 
+    65310 "GjerÃ«si-PlotÃ« Madhe-se ShenjÃ«" 
+    65311 "GjerÃ«si-PlotÃ« Pyetje ShenjÃ«" 
+    65312 "GjerÃ«si-PlotÃ« Komercial NÃ«" 
+    65313 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine A" 
+    65314 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine B" 
+    65315 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine C" 
+    65316 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine D" 
+    65317 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine E" 
+    65318 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine F" 
+    65319 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine G" 
+    65320 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine H" 
+    65321 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine I" 
+    65322 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine J" 
+    65323 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine K" 
+    65324 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine L" 
+    65325 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine M" 
+    65326 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine N" 
+    65327 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine O" 
+    65328 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine P" 
+    65329 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine Q" 
+    65330 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine R" 
+    65331 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine S" 
+    65332 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine T" 
+    65333 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine U" 
+    65334 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine V" 
+    65335 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine W" 
+    65336 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine X" 
+    65337 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine Y" 
+    65338 "GjerÃ«si-PlotÃ« ShkronjÃ« e Madhe Latine Z" 
+    65339 "GjerÃ«si-PlotÃ« KllapÃ« Rrumbullake Majtas" 
+    65340 "GjerÃ«si-PlotÃ« Kthe-Mbrapsht Solidus" 
+    65341 "GjerÃ«si-PlotÃ« DjathtÃ« Katror Kllapa" 
+    65342 "GjerÃ«si-PlotÃ« Theks-lakor Theks" 
+    65343 "GjerÃ«si-PlotÃ« UlÃ«t LinjÃ«" 
+    65344 "GjerÃ«si-PlotÃ« RÃ«ndÃ« Theks" 
+    65345 "GjerÃ«si-PlotÃ« ShkronjÃ« e VogÃ«l Latine A" 
+    65346 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine B" 
+    65347 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine C" 
+    65348 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine D" 
+    65349 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine E" 
+    65350 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine F" 
+    65351 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine G" 
+    65352 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine H" 
+    65353 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine I" 
+    65354 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine J" 
+    65355 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine K" 
+    65356 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine L" 
+    65357 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine M" 
+    65358 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine N" 
+    65359 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine O" 
+    65360 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine P" 
+    65361 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine Q" 
+    65362 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine R" 
+    65363 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine S" 
+    65364 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine T" 
+    65365 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine U" 
+    65366 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine V" 
+    65367 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine W" 
+    65368 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine X" 
+    65369 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine Y" 
+    65370 "GjerÃ«si-plotÃ« ShkronjÃ« e VogÃ«l Latine Z" 
+    65371 "GjerÃ«si-plotÃ« MajtÃ« Dredhur Kllapa" 
+    65372 "GjerÃ«si-plotÃ« Vertikale LinjÃ«" 
+    65373 "GjerÃ«si-plotÃ« DjathtÃ« Dredhur Kllapa" 
+    65374 "GjerÃ«si-plotÃ« TildÃ«" 
+    65375 "GjerÃ«si-plotÃ« MajtÃ« e BardhÃ« KllapÃ«" 
+    65376 "GjerÃ«si-plotÃ« DjathtÃ« e BardhÃ« KllapÃ«" 
+    65377 "GjerÃ«si-gjysmÃ« Ideo-grafik PikÃ«" 
+    65378 "GjerÃ«si-gjysmÃ« MajtÃ« KÃ«nd Kllapa" 
+    65379 "GjerÃ«si-gjysmÃ« DjathtÃ« KÃ«nd Kllapa" 
+    65380 "GjerÃ«si-gjysmÃ« Ideo-grafik Presje" 
+    65381 "GjerÃ«si-gjysmÃ« Katakana Mesit PikÃ«" 
+    65382 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Wo" 
+    65383 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l A" 
+    65384 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l I" 
+    65385 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l U" 
+    65386 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l E" 
+    65387 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l O" 
+    65388 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l Ya" 
+    65389 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l Yu" 
+    65390 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l Yo" 
+    65391 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« e VogÃ«l Tu" 
+    65392 "GjerÃ«si-gjysmÃ« Katakana-Hiragana Prolonged ZÃ« ShenjÃ«" 
+    65393 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« A" 
+    65394 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« I" 
+    65395 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« U" 
+    65396 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« E" 
+    65397 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« O" 
+    65398 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ka" 
+    65399 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ki" 
+    65400 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ku" 
+    65401 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ke" 
+    65402 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ko" 
+    65403 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Sa" 
+    65404 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Si" 
+    65405 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Su" 
+    65406 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Se" 
+    65407 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« So" 
+    65408 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ta" 
+    65409 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ti" 
+    65410 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Tu" 
+    65411 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Te" 
+    65412 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« To" 
+    65413 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Na" 
+    65414 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ni" 
+    65415 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Nu" 
+    65416 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ne" 
+    65417 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« No" 
+    65418 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ha" 
+    65419 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Hi" 
+    65420 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Hu" 
+    65421 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« He" 
+    65422 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ho" 
+    65423 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ma" 
+    65424 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Mi" 
+    65425 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Mu" 
+    65426 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Me" 
+    65427 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Mo" 
+    65428 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ya" 
+    65429 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Yu" 
+    65430 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Yo" 
+    65431 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ra" 
+    65432 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ri" 
+    65433 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ru" 
+    65434 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Re" 
+    65435 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Ro" 
+    65436 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« Wa" 
+    65437 "GjerÃ«si-gjysmÃ« Katakana ShkronjÃ« N" 
+    65438 "GjerÃ«si-gjysmÃ« Katakana ZÃ«ri ShenjÃ«" 
+    65439 "GjerÃ«si-gjysmÃ« Katakana GjysmÃ«-ZÃ«ri ShenjÃ«" 
+    65440 "GjerÃ«si-gjysmÃ« Hangul Filler" 
+    65441 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Kiyeok" 
+    65442 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ssangkiyeok" 
+    65443 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Kiyeok-Sios" 
+    65444 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Nieun" 
+    65445 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Nieun-Cieuc" 
+    65446 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Nieun-Hieuh" 
+    65447 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Tikeut" 
+    65448 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ssangtikeut" 
+    65449 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul" 
+    65450 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Kiyeok" 
+    65451 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Mieum" 
+    65452 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Pieup" 
+    65453 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Sios" 
+    65454 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Thieuth" 
+    65455 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Phieuph" 
+    65456 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Rieul-Hieuh" 
+    65457 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Mieum" 
+    65458 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Pieup" 
+    65459 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ssangpieup" 
+    65460 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Pieup-Sios" 
+    65461 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Sios" 
+    65462 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ssangsios" 
+    65463 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ieung" 
+    65464 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Cieuc" 
+    65465 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ssangcieuc" 
+    65466 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Chieuch" 
+    65467 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Khieukh" 
+    65468 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Thieuth" 
+    65469 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Phieuph" 
+    65470 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Hieuh" 
+    65474 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« A" 
+    65475 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ae" 
+    65476 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ya" 
+    65477 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Yae" 
+    65478 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Eo" 
+    65479 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« E" 
+    65482 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Yeo" 
+    65483 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Ye" 
+    65484 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« O" 
+    65485 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Wa" 
+    65486 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Wae" 
+    65487 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Oe" 
+    65490 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Yo" 
+    65491 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« U" 
+    65492 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Weo" 
+    65493 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« We" 
+    65494 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Wi" 
+    65495 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Yu" 
+    65498 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Eu" 
+    65499 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« Yi" 
+    65500 "GjerÃ«si-gjysmÃ« Hangul ShkronjÃ« I" 
+    65504 "GjerÃ«si-plotÃ« Cent ShenjÃ«" 
+    65505 "GjerÃ«si-plotÃ« Pound ShenjÃ«" 
+    65506 "GjerÃ«si-plotÃ« Jo ShenjÃ«" 
+    65507 "GjerÃ«si-plotÃ« Macron" 
+    65508 "GjerÃ«si-plotÃ« Thyer Bar" 
+    65509 "GjerÃ«si-plotÃ« Yen ShenjÃ«" 
+    65510 "GjerÃ«si-plotÃ« Won ShenjÃ«" 
+    65512 "GjerÃ«si-gjysmÃ« Format LehtÃ« Vertikale" 
+    65513 "GjerÃ«si-gjysmÃ« Majtas ShigjetÃ«" 
+    65514 "GjerÃ«si-gjysmÃ« PÃ«rpjetÃ« ShigjetÃ«" 
+    65515 "GjerÃ«si-gjysmÃ« Djathtas ShigjetÃ«" 
+    65516 "GjerÃ«si-gjysmÃ« TeposhtÃ« ShigjetÃ«" 
+    65517 "GjerÃ«si-gjysmÃ« e ZezÃ« Katror" 
+    65518 "GjerÃ«si-gjysmÃ« e BardhÃ« Rreth" 
+    65529 "Inter-linear ShÃ«nim SpirancÃ«" 
+    65530 "Inter-linear ShÃ«nim NdarÃ«s" 
+    65531 "Inter-linear ShÃ«nim Terminator" 
+    65532 "Karakter NdÃ«rrimi Objekti" 
+END

Modification de propriÃ©tÃ©s sur dll/win32/getuname/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/getuname/getuname.rc
===================================================================
--- dll/win32/getuname/getuname.rc	(rÃ©vision 61927)
+++ dll/win32/getuname/getuname.rc	(copie de travail)
@@ -15,3 +15,6 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
\ No newline at end of file
Index: dll/win32/msv1_0/msv1_0.c
===================================================================
--- dll/win32/msv1_0/msv1_0.c	(rÃ©vision 61927)
+++ dll/win32/msv1_0/msv1_0.c	(copie de travail)
@@ -437,6 +437,22 @@
     SAMPR_ULONG_ARRAY Use = {0, NULL};
     NTSTATUS Status;
 
+    ENCRYPTED_NT_OWF_PASSWORD OldNtPassword;
+    ENCRYPTED_NT_OWF_PASSWORD NewNtPassword;
+    ENCRYPTED_LM_OWF_PASSWORD OldLmPassword;
+    ENCRYPTED_LM_OWF_PASSWORD NewLmPassword;
+    OEM_STRING LmPwdString;
+    CHAR LmPwdBuffer[15];
+    BOOLEAN OldLmPasswordPresent = FALSE;
+    BOOLEAN NewLmPasswordPresent = FALSE;
+
+    ENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm;
+    ENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm;
+    ENCRYPTED_LM_OWF_PASSWORD OldNtEncryptedWithNewNt;
+    ENCRYPTED_LM_OWF_PASSWORD NewNtEncryptedWithOldNt;
+    PENCRYPTED_LM_OWF_PASSWORD pOldLmEncryptedWithNewLm = NULL;
+    PENCRYPTED_LM_OWF_PASSWORD pNewLmEncryptedWithOldLm = NULL;
+
     TRACE("()\n");
 
     RequestBuffer = (PMSV1_0_CHANGEPASSWORD_REQUEST)ProtocolSubmitBuffer;
@@ -523,26 +539,128 @@
     }
 
 
+    /* Calculate the NT hash for the old password */
+    Status = SystemFunction007(&RequestBuffer->OldPassword,
+                               (LPBYTE)&OldNtPassword);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
 
-#if 0
+    /* Calculate the NT hash for the new password */
+    Status = SystemFunction007(&RequestBuffer->NewPassword,
+                               (LPBYTE)&NewNtPassword);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
+    /* Calculate the LM password and hash for the old password */
+    LmPwdString.Length = 15;
+    LmPwdString.MaximumLength = 15;
+    LmPwdString.Buffer = LmPwdBuffer;
+    ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength);
+
+    Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString,
+                                               &RequestBuffer->OldPassword,
+                                               FALSE);
+    if (NT_SUCCESS(Status))
+    {
+        /* Calculate the LM hash value of the password */
+        Status = SystemFunction006(LmPwdString.Buffer,
+                                   (LPSTR)&OldLmPassword);
+        if (NT_SUCCESS(Status))
+        {
+            OldLmPasswordPresent = TRUE;
+        }
+    }
+
+    /* Calculate the LM password and hash for the new password */
+    LmPwdString.Length = 15;
+    LmPwdString.MaximumLength = 15;
+    LmPwdString.Buffer = LmPwdBuffer;
+    ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength);
+
+    Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString,
+                                               &RequestBuffer->NewPassword,
+                                               FALSE);
+    if (NT_SUCCESS(Status))
+    {
+        /* Calculate the LM hash value of the password */
+        Status = SystemFunction006(LmPwdString.Buffer,
+                                   (LPSTR)&NewLmPassword);
+        if (NT_SUCCESS(Status))
+        {
+            NewLmPasswordPresent = TRUE;
+        }
+    }
+
+    /* Encrypt the old and new LM passwords, if they exist */
+    if (OldLmPasswordPresent && NewLmPasswordPresent)
+    {
+        /* Encrypt the old LM password */
+        Status = SystemFunction012((const BYTE *)&OldLmPassword,
+                                   (const BYTE *)&NewLmPassword,
+                                   (LPBYTE)&OldLmEncryptedWithNewLm);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Encrypt the new LM password */
+        Status = SystemFunction012((const BYTE *)&NewLmPassword,
+                                   (const BYTE *)&OldLmPassword,
+                                   (LPBYTE)&NewLmEncryptedWithOldLm);
+        if (!NT_SUCCESS(Status))
+        {
+            TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        pOldLmEncryptedWithNewLm = &OldLmEncryptedWithNewLm;
+        pNewLmEncryptedWithOldLm = &NewLmEncryptedWithOldLm;
+    }
+
+    /* Encrypt the old NT password */
+    Status = SystemFunction012((const BYTE *)&OldNtPassword,
+                               (const BYTE *)&NewNtPassword,
+                               (LPBYTE)&OldNtEncryptedWithNewNt);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
+    /* Encrypt the new NT password */
+    Status = SystemFunction012((const BYTE *)&NewNtPassword,
+                               (const BYTE *)&OldNtPassword,
+                               (LPBYTE)&NewNtEncryptedWithOldNt);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
     /* Change the password */
     Status = SamrChangePasswordUser(UserHandle,
-                                    IN unsigned char LmPresent,
-                                    IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm,
-                                    IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm,
-                                    IN unsigned char NtPresent,
-                                    IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt,
-                                    IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt,
-                                    IN unsigned char NtCrossEncryptionPresent,
-                                    IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm,
-                                    IN unsigned char LmCrossEncryptionPresent,
-                                    IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt)
+                                    OldLmPasswordPresent && NewLmPasswordPresent,
+                                    pOldLmEncryptedWithNewLm,
+                                    pNewLmEncryptedWithOldLm,
+                                    TRUE,
+                                    &OldNtEncryptedWithNewNt,
+                                    &NewNtEncryptedWithOldNt,
+                                    FALSE,
+                                    NULL,
+                                    FALSE,
+                                    NULL);
     if (!NT_SUCCESS(Status))
     {
         TRACE("SamrChangePasswordUser failed (Status %08lx)\n", Status);
         goto done;
     }
-#endif
 
 done:
     if (UserHandle != NULL)
@@ -848,6 +966,10 @@
     PSAMPR_USER_INFO_BUFFER UserInfo = NULL;
     UNICODE_STRING LogonServer;
     BOOLEAN SessionCreated = FALSE;
+    LARGE_INTEGER LogonTime;
+//    LARGE_INTEGER AccountExpires;
+    LARGE_INTEGER PasswordMustChange;
+    LARGE_INTEGER PasswordLastSet;
     NTSTATUS Status;
 
     TRACE("()\n");
@@ -887,6 +1009,10 @@
         return STATUS_NOT_IMPLEMENTED;
     }
 
+    /* Get the logon time */
+    NtQuerySystemTime(&LogonTime);
+
+    /* Get the domain SID */
     Status = GetDomainSid(&AccountDomainSid);
     if (!NT_SUCCESS(Status))
     {
@@ -962,11 +1088,8 @@
         goto done;
     }
 
-
     TRACE("UserName: %S\n", UserInfo->All.UserName.Buffer);
 
-    /* FIXME: Check restrictions */
-
     /* Check the password */
     if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0)
     {
@@ -979,6 +1102,65 @@
         }
     }
 
+    /* Check account restrictions for non-administrator accounts */
+    if (RelativeIds.Element[0] != DOMAIN_USER_RID_ADMIN)
+    {
+        /* Check if the account has been disabled */
+        if (UserInfo->All.UserAccountControl & USER_ACCOUNT_DISABLED)
+        {
+            ERR("Account disabled!\n");
+            *SubStatus = STATUS_ACCOUNT_DISABLED;
+            Status = STATUS_ACCOUNT_RESTRICTION;
+            goto done;
+        }
+
+        /* Check if the account has been locked */
+        if (UserInfo->All.UserAccountControl & USER_ACCOUNT_AUTO_LOCKED)
+        {
+            ERR("Account locked!\n");
+            *SubStatus = STATUS_ACCOUNT_LOCKED_OUT;
+            Status = STATUS_ACCOUNT_RESTRICTION;
+            goto done;
+        }
+
+#if 0
+        /* Check if the account expired */
+        AccountExpires.LowPart = UserInfo->All.AccountExpires.LowPart;
+        AccountExpires.HighPart = UserInfo->All.AccountExpires.HighPart;
+
+        if (AccountExpires.QuadPart != 0 &&
+            LogonTime.QuadPart >= AccountExpires.QuadPart)
+        {
+            ERR("Account expired!\n");
+            *SubStatus = STATUS_ACCOUNT_EXPIRED;
+            Status = STATUS_ACCOUNT_RESTRICTION;
+            goto done;
+        }
+#endif
+
+        /* Check if the password expired */
+        PasswordMustChange.LowPart = UserInfo->All.PasswordMustChange.LowPart;
+        PasswordMustChange.HighPart = UserInfo->All.PasswordMustChange.HighPart;
+        PasswordLastSet.LowPart = UserInfo->All.PasswordLastSet.LowPart;
+        PasswordLastSet.HighPart = UserInfo->All.PasswordLastSet.HighPart;
+
+        if (LogonTime.QuadPart >= PasswordMustChange.QuadPart)
+        {
+            ERR("Password expired!\n");
+            if (PasswordLastSet.QuadPart == 0)
+                *SubStatus = STATUS_PASSWORD_MUST_CHANGE;
+            else
+                *SubStatus = STATUS_PASSWORD_EXPIRED;
+
+            Status = STATUS_ACCOUNT_RESTRICTION;
+            goto done;
+        }
+
+        /* FIXME: more checks */
+        // STATUS_INVALID_LOGON_HOURS;
+        // STATUS_INVALID_WORKSTATION;
+    }
+
     /* Return logon information */
 
     /* Create and return a new logon id */
@@ -1076,7 +1258,7 @@
         Status = STATUS_LOGON_FAILURE;
     }
 
-    TRACE("LsaApLogonUser done (Status %08lx)\n", Status);
+    TRACE("LsaApLogonUser done (Status 0x%08lx  SubStatus 0x%08lx)\n", Status, *SubStatus);
 
     return Status;
 }
Index: dll/win32/msv1_0/msv1_0.h
===================================================================
--- dll/win32/msv1_0/msv1_0.h	(rÃ©vision 61927)
+++ dll/win32/msv1_0/msv1_0.h	(copie de travail)
@@ -186,6 +186,20 @@
 
 NTSTATUS
 NTAPI
+SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle,
+                       IN unsigned char LmPresent,
+                       IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm,
+                       IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm,
+                       IN unsigned char NtPresent,
+                       IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt,
+                       IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt,
+                       IN unsigned char NtCrossEncryptionPresent,
+                       IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm,
+                       IN unsigned char LmCrossEncryptionPresent,
+                       IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt);
+
+NTSTATUS
+NTAPI
 SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle);
 
 NTSTATUS
@@ -317,4 +331,10 @@
 SystemFunction007(PUNICODE_STRING string,
                   LPBYTE hash);
 
+NTSTATUS
+WINAPI
+SystemFunction012(const BYTE *in,
+                  const BYTE *key,
+                  LPBYTE out);
+
 /* EOF */
Index: dll/win32/msv1_0/CMakeLists.txt
===================================================================
--- dll/win32/msv1_0/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msv1_0/CMakeLists.txt	(copie de travail)
@@ -1,7 +1,4 @@
 
-#include_directories(
-#    ${CMAKE_CURRENT_BINARY_DIR})
-
 spec2def(msv1_0.dll msv1_0.spec)
 
 list(APPEND SOURCE
@@ -15,6 +12,5 @@
 target_link_libraries(msv1_0 wine ${PSEH_LIB})
 add_delay_importlibs(msv1_0 samsrv lsasrv)
 add_importlibs(msv1_0 advapi32 kernel32 ntdll)
-add_pch(msv1_0 msv1_0.h)
 add_dependencies(msv1_0 psdk)
 add_cd_file(TARGET msv1_0 DESTINATION reactos/system32 FOR all)
Index: dll/win32/usp10/usp10_internal.h
===================================================================
--- dll/win32/usp10/usp10_internal.h	(rÃ©vision 61927)
+++ dll/win32/usp10/usp10_internal.h	(copie de travail)
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef _USP10_INTERNAL_H_
+#define _USP10_INTERNAL_H_
+
 #include <config.h>
 
 #include <stdarg.h>
@@ -268,3 +271,5 @@
 HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN;
 HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) DECLSPEC_HIDDEN;
 HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;
+
+#endif /* _USP10_INTERNAL_H_ */
Index: dll/win32/usp10/CMakeLists.txt
===================================================================
--- dll/win32/usp10/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/usp10/CMakeLists.txt	(copie de travail)
@@ -14,11 +14,15 @@
     shape.c
     shaping.c
     usp10.c
-    ${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c
+    usp10_internal.h
+    ${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c)
+
+add_library(usp10 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/usp10.def)
 
-add_library(usp10 SHARED ${SOURCE})
 set_module_type(usp10 win32dll)
 target_link_libraries(usp10 wine)
 add_importlibs(usp10 advapi32 user32 gdi32 msvcrt kernel32 ntdll)
+add_pch(usp10 usp10_internal.h SOURCE)
 add_cd_file(TARGET usp10 DESTINATION reactos/system32 FOR all)
Index: dll/win32/advpack/advpack_private.h
===================================================================
--- dll/win32/advpack/advpack_private.h	(rÃ©vision 61927)
+++ dll/win32/advpack/advpack_private.h	(copie de travail)
@@ -34,9 +34,9 @@
 #include <winternl.h>
 #include <advpub.h>
 
+#include <wine/debug.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advpack);
 
 HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN;
Index: dll/win32/advpack/CMakeLists.txt
===================================================================
--- dll/win32/advpack/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/advpack/CMakeLists.txt	(copie de travail)
@@ -10,10 +10,14 @@
     files.c
     install.c
     reg.c
+    advpack_private.h)
+
+add_library(advpack SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
 
-add_library(advpack SHARED ${SOURCE})
 set_module_type(advpack win32dll)
 target_link_libraries(advpack wine)
 add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll)
+add_pch(advpack advpack_private.h SOURCE)
 add_cd_file(TARGET advpack DESTINATION reactos/system32 FOR all)
Index: dll/win32/advpack/reg.c
===================================================================
--- dll/win32/advpack/reg.c	(rÃ©vision 61927)
+++ dll/win32/advpack/reg.c	(copie de travail)
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "advpack_private.h"
 
 static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0};
Index: dll/win32/inetcomm/inetcomm_private.h
===================================================================
--- dll/win32/inetcomm/inetcomm_private.h	(rÃ©vision 61927)
+++ dll/win32/inetcomm/inetcomm_private.h	(copie de travail)
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#ifndef _INETCOMM_PRIVATE_H_
+#define _INETCOMM_PRIVATE_H_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -99,3 +101,5 @@
 HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
 HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
 HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
+
+#endif /* _INETCOMM_PRIVATE_H_ */
Index: dll/win32/inetcomm/CMakeLists.txt
===================================================================
--- dll/win32/inetcomm/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/inetcomm/CMakeLists.txt	(copie de travail)
@@ -11,12 +11,17 @@
     mimeole.c
     pop3transport.c
     smtptransport.c
+    inetcomm_private.h)
+
+add_library(inetcomm SHARED
+    ${SOURCE}
     guid.c
+    inetcomm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
 
-add_library(inetcomm SHARED ${SOURCE} inetcomm.rc)
 set_module_type(inetcomm win32dll)
 target_link_libraries(inetcomm uuid wine)
 add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 msvcrt kernel32 ntdll)
+add_pch(inetcomm inetcomm_private.h SOURCE)
 add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all)
Index: dll/win32/wdmaud.drv/CMakeLists.txt
===================================================================
--- dll/win32/wdmaud.drv/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wdmaud.drv/CMakeLists.txt	(copie de travail)
@@ -14,11 +14,13 @@
     mixer.c
     mmixer.c
     legacy.c
+    wdmaud.h)
+
+add_library(wdmaud.drv SHARED
+    ${SOURCE}
     wdmaud.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def)
 
-add_library(wdmaud.drv SHARED ${SOURCE})
-
 set_module_type(wdmaud.drv win32dll UNICODE)
 
 set_target_properties(wdmaud.drv PROPERTIES SUFFIX "")
@@ -29,5 +31,5 @@
     mmixer)
 
 add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
-add_pch(wdmaud.drv wdmaud.h)
+add_pch(wdmaud.drv wdmaud.h SOURCE)
 add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32 FOR all)
Index: dll/win32/propsys/propsys_private.h
===================================================================
--- dll/win32/propsys/propsys_private.h	(rÃ©vision 61927)
+++ dll/win32/propsys/propsys_private.h	(copie de travail)
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _PROPSYS_PRIVATE_H_
+#define _PROPSYS_PRIVATE_H_
+
 #include <config.h>
 
 #include <stdarg.h>
@@ -40,3 +43,5 @@
 WINE_DEFAULT_DEBUG_CHANNEL(propsys);
 
 HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN;
+
+#endif /* _PROPSYS_PRIVATE_H_ */
Index: dll/win32/propsys/CMakeLists.txt
===================================================================
--- dll/win32/propsys/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/propsys/CMakeLists.txt	(copie de travail)
@@ -7,11 +7,16 @@
     propstore.c
     propsys_main.c
     propvar.c
-    ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c
+    propsys_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c)
+
+add_library(propsys SHARED
+    ${SOURCE}
+    propsys.rc
     ${CMAKE_CURRENT_BINARY_DIR}/propsys.def)
 
-add_library(propsys SHARED ${SOURCE} propsys.rc)
 set_module_type(propsys win32dll)
 target_link_libraries(propsys uuid wine)
 add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll)
+add_pch(propsys propsys_private.h SOURCE)
 add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all)
Index: dll/win32/lpk/CMakeLists.txt
===================================================================
--- dll/win32/lpk/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/lpk/CMakeLists.txt	(copie de travail)
@@ -8,14 +8,16 @@
 list(APPEND SOURCE
     dllmain.c
     stub.c
+    ros_lpk.h)
+
+add_library(lpk SHARED
+    ${SOURCE}
     lpk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
 
-add_library(lpk SHARED ${SOURCE})
-
 set_module_type(lpk win32dll UNICODE)
 
 
 add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll)
-add_pch(lpk ros_lpk.h)
+add_pch(lpk ros_lpk.h SOURCE)
 add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all)
Index: dll/win32/lpk/ros_lpk.h
===================================================================
--- dll/win32/lpk/ros_lpk.h	(rÃ©vision 61927)
+++ dll/win32/lpk/ros_lpk.h	(copie de travail)
@@ -6,6 +6,9 @@
  *
  */
 
+#ifndef _LPK_H
+#define _LPK_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -64,3 +67,5 @@
 DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6);
 DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5);
 DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5);
+
+#endif /* _LPK_H */
Index: dll/win32/imagehlp/CMakeLists.txt
===================================================================
--- dll/win32/imagehlp/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/imagehlp/CMakeLists.txt	(copie de travail)
@@ -9,13 +9,16 @@
     imagehlp_main.c
     integrity.c
     modify.c
+    precomp.h)
+
+add_library(imagehlp SHARED
+    ${SOURCE}
     imagehlp.rc
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def)
 
-add_library(imagehlp SHARED ${SOURCE})
 set_module_type(imagehlp win32dll)
 target_link_libraries(imagehlp wine)
 add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
-add_pch(imagehlp precomp.h)
+add_pch(imagehlp precomp.h SOURCE)
 add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all)
Index: dll/win32/unicows/CMakeLists.txt
===================================================================
--- dll/win32/unicows/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/unicows/CMakeLists.txt	(copie de travail)
@@ -28,4 +28,4 @@
     msvcrt
     kernel32
     ntdll)
-add_cd_file(TARGET unicows DESTINATION reactos/system32 FOR all)
+add_cd_file(TARGET unicows DESTINATION reactos FOR all)
Index: dll/win32/localui/localui.rc
===================================================================
--- dll/win32/localui/localui.rc	(rÃ©vision 61927)
+++ dll/win32/localui/localui.rc	(copie de travail)
@@ -96,6 +96,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/ui_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/ui_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/ui_Uk.rc"
 #endif
Index: dll/win32/localui/lang/ui_Sq.rc
===================================================================
--- dll/win32/localui/lang/ui_Sq.rc	(rÃ©vision 0)
+++ dll/win32/localui/lang/ui_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,57 @@
+/*
+ * English resources for localui
+ *
+ * Copyright 2007 Detlef Riekenberg
+ * Translation: Ardit Dani (Albanian Translation Resource File)
+ *
+ * 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
+ */
+
+#include "localui.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+ADDPORT_DIALOG DIALOG 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Shto njÃ« Port Vendor"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Fut emrin e Portit pÃ«r tÃ« shtuar:", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "Anulo", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+
+LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Konfiguro Portin LPT"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Timeout (sekonda)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "&Transmission Riprove:", -1, 14, 22, 90, 13, WS_VISIBLE
+    EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
+    DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
+    PUSHBUTTON "Anulo", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+END
+
+
+STRINGTABLE
+{
+    IDS_LOCALPORT "Porti Vendor"
+    IDS_INVALIDNAME "'%s' nuk Ã«shtÃ« emer e vlefshem porti"
+    IDS_PORTEXISTS "Porti %s ekziston"
+    IDS_NOTHINGTOCONFIG "Ky port ska opsione pÃ«r tÃ« konfiguruar"
+}

Modification de propriÃ©tÃ©s sur dll/win32/localui/lang/ui_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/msvidc32/rsrc.rc
===================================================================
--- dll/win32/msvidc32/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/msvidc32/rsrc.rc	(copie de travail)
@@ -46,9 +46,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/msvidc32_Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/msvidc32_Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DE_DE
@@ -78,6 +75,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/msvidc32_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+	#include "lang/msvidc32_Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/msvidc32_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/msvidc32_Uk.rc"
 #endif
Index: dll/win32/msvidc32/lang/msvidc32_Sq.rc
===================================================================
--- dll/win32/msvidc32/lang/msvidc32_Sq.rc	(rÃ©vision 0)
+++ dll/win32/msvidc32/lang/msvidc32_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2005 Dmitry Timoshkov
+ *
+ * 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
+ */
+
+#include "msvidc32_private.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_NAME "MS-CRAM"
+    IDS_DESCRIPTION "Wine Video 1 video Kodek"
+}

Modification de propriÃ©tÃ©s sur dll/win32/msvidc32/lang/msvidc32_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/authz/precomp.h
===================================================================
--- dll/win32/authz/precomp.h	(rÃ©vision 61927)
+++ dll/win32/authz/precomp.h	(copie de travail)
@@ -3,11 +3,12 @@
 
 #define _AUTHZ_
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
 
@@ -60,4 +61,3 @@
 } AUTHZ_CLIENT_CONTEXT, *PAUTHZ_CLIENT_CONTEXT;
 
 #endif /* __AUTHZ_PRECOMP_H */
-/* EOF */
Index: dll/win32/authz/authz.c
===================================================================
--- dll/win32/authz/authz.c	(rÃ©vision 61927)
+++ dll/win32/authz/authz.c	(copie de travail)
@@ -33,7 +33,6 @@
 
 HINSTANCE hDllInstance;
 
-
 /*
  * @unimplemented
  */
Index: dll/win32/authz/CMakeLists.txt
===================================================================
--- dll/win32/authz/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/authz/CMakeLists.txt	(copie de travail)
@@ -6,15 +6,17 @@
     authz.c
     clictx.c
     resman.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/authz_stubs.c)
+
+add_library(authz SHARED
+    ${SOURCE}
     authz.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/authz_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
 
-add_library(authz SHARED ${SOURCE})
-
 set_module_type(authz win32dll UNICODE)
 
 add_importlibs(authz advapi32 msvcrt kernel32 ntdll)
-add_pch(authz precomp.h)
+add_pch(authz precomp.h SOURCE)
 
 add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all)
Index: dll/win32/mscoree/CMakeLists.txt
===================================================================
--- dll/win32/mscoree/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mscoree/CMakeLists.txt	(copie de travail)
@@ -15,13 +15,17 @@
     metadata.c
     metahost.c
     mscoree_main.c
+    mscoree_private.h)
+
+add_library(mscoree SHARED
+    ${SOURCE}
     guid.c
     mscoree.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
 
-add_library(mscoree SHARED ${SOURCE})
 set_module_type(mscoree win32dll)
 target_link_libraries(mscoree uuid wine)
 add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll)
+add_pch(mscoree mscoree_private.h SOURCE)
 add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all)
Index: dll/win32/modemui/lang/sq-AL.rc
===================================================================
--- dll/win32/modemui/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/modemui/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,617 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDM_MENU MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&DublikatÃ«...", 0
+        MENUITEM "Hiq", 1
+        MENUITEM "&Shiko shÃ«nimet", 2
+        MENUITEM SEPARATOR
+        MENUITEM "Karakteristika", 3
+        MENUITEM "K&opjo karakteristika", 4
+        MENUITEM "A&pliko Karakteristika", 5
+    END
+END
+
+IDD_ADVANCED DIALOGEX 17, 12, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Avancuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "CilÃ«sime ShtesÃ«", 1018, 6, 6, 225, 70
+    LTEXT "Komanda Inicializimi ShtesÃ«:", 1011, 16, 20, 143, 8
+    EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL
+    LTEXT "Prisni pÃ«r tingullin e kartes sÃ« kreditit:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE
+    EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP
+    CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12
+    LTEXT "sekonda", 1010, 173, 54, 40, 8, NOT WS_VISIBLE
+    GROUPBOX "&Shteti/Zgjidh Rajonin", 1012, 6, 80, 225, 75
+    COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
+    PUSHBUTTON "&CilÃ«sime Avancuara Porti...", 1100, 107, 170, 125, 14
+    DEFPUSHBUTTON "Ndrysho Preferencat &Parazgjedhore...", 3, 107, 188, 125, 14
+END
+
+IDD_GENERAL DIALOGEX 0, 0, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Porti:", 1018, 9, 8, 32, 10
+    LTEXT "Com porti", 1095, 48, 8, 181, 10
+    GROUPBOX "&Volumi Boxave", 1029, 10, 21, 218, 48
+    CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20
+    RTEXT "Fike", 1045, 56, 40, 22, 8
+    LTEXT "Lart", 1001, 155, 40, 25, 11
+    GROUPBOX "&ShpejtÃ«sia Maksimale Portit", 1031, 10, 78, 218, 46
+    COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "Kontrolli Formimit", 1060, 10, 133, 218, 51
+    AUTOCHECKBOX "&Prisni pÃ«r tingullin e formimit para telefonates", 1003, 27, 157, 174, 10
+END
+
+IDD_DISTINCTIVE_RING DIALOGEX 0, 0, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Zile Dalluese"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "", 1068, 10, 7, 218, 145
+    AUTOCHECKBOX "Kjo linjÃ« telefonike ka shÃ«rbim dallues zileje", 1069, 20, 7, 184, 10
+    CTEXT "StrukturÃ« Zileje", -1, 84, 21, 70, 8
+    CTEXT "Lloji i telefonates", -1, 159, 21, 63, 8
+    LTEXT "Adresa &Primare:", 1070, 20, 41, 62, 8
+    COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP
+    COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Adresa &1:", 1071, 20, 59, 62, 8
+    COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP
+    COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Adresa &2:", 1072, 20, 77, 62, 8
+    COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP
+    COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Adresa &3:", 1076, 20, 95, 62, 8
+    COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP
+    COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Prioriti &telefonuesit:", 1078, 20, 112, 62, 8
+    COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP
+    COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Thirr m&brapa:", 1080, 20, 131, 62, 8
+    COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP
+    COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+IDD_DISTINCTIVE_RING_2 DIALOGEX 0, 0, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Zile Dalluese"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "", 1068, 10, 7, 218, 87
+    AUTOCHECKBOX "Kjo linjÃ« telefonike ka shÃ«rbim dallues zileje", 1069, 19, 7, 177, 10
+    CTEXT "StrukturÃ« Zileje", -1, 20, 21, 74, 8
+    CTEXT "Lloji i telefonates", -1, 96, 21, 65, 8
+    LTEXT "Zile Teke:", 1088, 20, 37, 53, 8
+    COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Zile dyshe:", 1089, 20, 57, 53, 8
+    COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "Zile treshe:", 1090, 20, 76, 53, 8
+    COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+END
+
+IDD_DIAGNOSTICS DIALOGEX 0, 0, 238, 215
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "DiagnozÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58
+    CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58
+    PUSHBUTTON "Pyet Modemin", 1096, 138, 149, 75, 14
+    AUTOCHECKBOX "Regjistro njÃ« shÃ«nim", 1020, 18, 187, 98, 10
+    PUSHBUTTON "&Shiko shÃ«nimet", 1094, 138, 184, 75, 14, WS_DISABLED
+    GROUPBOX "Informacionet e Modemit", 1047, 10, 6, 217, 164
+    GROUPBOX "ShÃ«nimet", -1, 10, 173, 217, 32
+END
+
+IDD_PLEASE_WAIT DIALOGEX 0, 0, 195, 72
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Ju lutem prisni..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 5100, -1, 9, 7, 20, 20
+    LTEXT "komunikimi me Modemin. Kjo mund tÃ« marrÃ« disa sekonda.", -1, 42, 7, 146, 28
+    DEFPUSHBUTTON "Anulo", 2, 72, 52, 50, 14
+END
+
+IDD_GENERAL_2 DIALOGEX 0, 0, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "CilÃ«sime"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "&NdihmÃ«s operatori (manuale) bjeri", 1002, 19, 22, 150, 10
+    AUTOCHECKBOX "ShkÃ«put njÃ« telefonatÃ« nÃ«se pa-punÃ« pÃ«r mÃ« shumÃ« se", 1042, 19, 38, 143, 10
+    EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "Anulo thirrjen nÃ«se jo e lidhur brenda", -1, 19, 56, 147, 10
+    EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER
+    RTEXT "ShpejtÃ«sia &Portit:", 1034, 16, 102, 93, 8
+    COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    RTEXT "D&ata Protokoll:", 1032, 16, 122, 93, 8
+    COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    RTEXT "Ngjeshje:", 1035, 16, 139, 93, 8
+    COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    RTEXT "Kontrolli i rrjedhjes:", 1027, 16, 157, 93, 8
+    COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "Preferencat telefonates", 1060, 11, 7, 217, 66
+    LTEXT "mins", 1044, 195, 38, 22, 8
+    LTEXT "secs", 1041, 194, 56, 22, 8
+    GROUPBOX "Preferenca Lidhjes tÃ« dhÃ«nave", -1, 11, 82, 217, 94
+END
+
+IDD_ADVANCED_2 DIALOGEX 17, 12, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Avancuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "SjellÃ« terminali e dritares para formimit tÃ« numrit", 1000, 20, 21, 200, 10
+    AUTOCHECKBOX "SjellÃ« terminali e dritares pas formimit tÃ« numrit", 1001, 20, 38, 200, 10
+    RTEXT "&Data bits:", 1024, 18, 79, 93, 8
+    COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    RTEXT "Barazi:", 1026, 18, 97, 93, 8
+    COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    RTEXT "PjesÃ« Ndaluse:", 1029, 18, 115, 93, 8
+    COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    RTEXT "&Rregullim:", 1045, 18, 133, 93, 8
+    COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "Dritare Terminali", 1004, 10, 7, 217, 49
+    GROUPBOX "CilÃ«sime PjesÃ«sh Elektronike", 1005, 10, 64, 217, 89
+END
+
+IDD_ISDN DIALOGEX 0, 0, 238, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "ISDN"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Switch &Tipi", -1, 11, 6, 217, 39
+    COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    GROUPBOX "&Numri ParÃ«", -1, 11, 50, 217, 50
+    EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8
+    EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX "&Numri DztÃ«", -1, 11, 105, 217, 49
+    EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8
+    EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER
+END
+
+IDD_PLEASE_WAIT_2 DIALOGEX 0, 0, 195, 72
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Ju lutÃ«m prisni"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 5100, -1, 9, 7, 20, 20
+    LTEXT "Shteti dÃ«rgues/Informacioni rajonit pÃ«r modem.", -1, 42, 7, 146, 28
+END
+
+IDD_WARNING DIALOGEX 0, 0, 360, 105
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "ParalajmÃ«rim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTOCHECKBOX "Mos e tregoni kÃ«tÃ« mesazh pÃ«rsÃ«ri", 1109, 17, 73, 118, 10
+    DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14
+    LTEXT "Disa modeme nuk mbajnÃ« vargjet e inicializimit tÃ« kÃ«tij gjatÃ«si.", -1, 50, 27, 304, 8
+    LTEXT "Informacion nÃ« lidhje me kÃ«tÃ« kufizim mund tÃ« merret nga prodhuesi i modemit tuaj.", -1, 50, 41, 304, 8
+    ICON 5100, -1, 15, 14, 20, 20
+    LTEXT "Ju keni hyrÃ« nÃ« njÃ« varg modemi inicializues mÃ« tÃ« madh se 57 karaktere tÃ« gjatÃ«.", -1, 50, 14, 304, 8
+END
+
+IDD_MODEMS DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Modemi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 5100, 1057, 6, 7, 20, 20
+    LTEXT "&Modemet nÃ« vazhdim janÃ« tÃ« instaluar:", -1, 44, 12, 203, 9
+    CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE
+    PUSHBUTTON "Shto...", 110, 56, 198, 60, 14
+    PUSHBUTTON "&Hiq", 112, 121, 198, 60, 14
+    PUSHBUTTON "&CilÃ«sime", 109, 185, 198, 60, 14
+END
+
+IDD_PLEASE_WAIT_3 DIALOGEX 0, 0, 195, 72
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Ju Lutem Prisni..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "&Ndalo", 2, 74, 53, 50, 14
+    ICON 5100, -1, 9, 7, 20, 20
+    LTEXT "Hiq", -1, 40, 8, 151, 8
+    LTEXT "Modem", 1005, 40, 16, 151, 25
+END
+
+STRINGTABLE
+BEGIN
+    180 "RS-232 Serial Port"
+    181 "Modem JashtÃ«m "
+    182 "Modem BrendhsÃ«m"
+    183 "PCMCIA Modem"
+    184 "Paralel Modem"
+    185 "Paralel Port"
+    200 "110"
+    201 "1200"
+    202 "2400"
+    203 "4800"
+    204 "9600"
+    206 "19200"
+    207 "38400"
+    210 "115200"
+    211 "57600"
+    216 "300"
+    220 "230400"
+    221 "460800"
+    222 "921600"
+    240 "4"
+    241 "5"
+    242 "6"
+    243 "7"
+    244 "8"
+    250 "Qift"
+    251 "Tek"
+    252 "AsnjÃ«"
+    253 "Mark"
+    254 "HapÃ«sire"
+    255 "1"
+    256 "1.5"
+    257 "2"
+    260 "Xon / Xoff"
+    261 "PjesÃ« Elektronike"
+    262 "AsnjÃ«"
+    263 "Ndezur"
+    264 "UlÃ«t"
+    265 "V.23 (Minitel)"
+    266 "Standard"
+    267 "Jo-standard (Bell, HST)"
+    270 "Shtoj tek &ShÃ«nime"
+    300 "Paspecifikuara"
+    301 "Data"
+    302 "Fax"
+    303 "YÃ«ri"
+    304 "AsnjÃ«"
+    320 "Shteti/Vendodhaj Rajonale Azhornua"
+    340 "Modem"
+    341 "CilÃ«sime Modem"
+    342 "Adresa Modem"
+    400 "Shteti/Vendodhaj Rajonale su Azhornua"
+    401 "Disa modems nuk e pranojnÃ« pÃ«rdorues inicializimi komandash mÃ« tÃ« mÃ«dha se 57 karaktere.\n\nInformacioni nÃ« lidhje me kÃ«tÃ« kufizim mund tÃ« merret nga prodhuesi juaj i modemit"
+    402 "Paralajmerim"
+    460 "Nuk ka memorie tÃ« mjaftueshme pÃ«r tÃ« parÃ« kutinÃ« e PÃ«rgjithshme e dialogut.\nMbyll disa dokumente ose programe, dhe pastaj provoni pÃ«rsÃ«ri."
+    461 "Nuk ka memorie tÃ« mjaftueshme pÃ«r tÃ« parÃ« kutinÃ« e CilÃ«simeve tÃ« Modemit dialog.\nMbyll disa dokumente ose programe, dhe pastaj provoni pÃ«rsÃ«ri."
+    463 "Ã‡do adresÃ« thirrÃ«se duhet tÃ« jetÃ« vendosur pÃ«r 'Automatik', ose nÃ« njÃ« model unik unazÃ«.\n\nNdysho modelin e dublikuar unaza pÃ«r njÃ« tjetÃ«r."
+    465 "Standard EC"
+    466 "Detzruar EC"
+    467 "Celulare"
+    468 "Gjymtuar"
+    469 "MundÃ«suar"
+    470 "Gjymtuar"
+    480 "AUTO  (1 Ch.)"
+    481 "AUTO  (2 Ch.)"
+    482 "PPP   (56K)"
+    483 "PPP   (64K)"
+    484 "PPP   (112K)"
+    485 "PPP   (112K,PAP)"
+    486 "PPP   (112K,CHAP)"
+    487 "PPP   (112K,MSCHAP)"
+    488 "PPP   (128K)"
+    489 "PPP   (128K,PAP)"
+    490 "PPP   (128K,CHAP)"
+    491 "PPP   (128K,MSCHAP)"
+    500 "V.120 (64K)"
+    501 "V.120 (56K)"
+    502 "V.120 (112K)"
+    503 "V.120 (128K)"
+    504 "X.75  (64K)"
+    505 "X.75  (128K)"
+    506 "X.75  (T.70)"
+    507 "X.75  (BTX)"
+    508 "V.110 (1.2K)"
+    509 "V.110 (2.4K)"
+    510 "V.110 (4.8K)"
+    511 "V.110 (9.6K)"
+    512 "V.110 (12.0K)"
+    513 "V.110 (14.4K)"
+    514 "V.110 (19.2K)"
+    515 "V.110 (28.8K)"
+    516 "V.110 (38.4K)"
+    517 "V.110 (57.6K)"
+    518 "Analog (V.34/V.90)"
+    550 "ESS5 (AT&T) (Amerika Veriore)"
+    551 "AT&T PikÃ« nÃ« ShumPikÃ«"
+    552 "Nacionale ISDN 1 (NI-1)"
+    553 "Telekomi Versior DMS 100 (NT1)"
+    554 "NTT INS64 (Japan)"
+    555 "Europiane ISDN (DSS1)"
+    556 "Gjermane Nacionale (1TR6) (pÃ«rdorur rrallÃ«)"
+    557 "Franceze Nacionale (VN3) (pÃ«rdorur rrallÃ«)"
+    558 "Belge Nacionale (pÃ«rdorur rrallÃ«)"
+    559 "Australiane Nacionale (pÃ«rdorur rrallÃ«)"
+    560 "Kalim panjohur"
+    570 "ISDN Konfigurimi pÃ«r kÃ«tÃ« modem\nÃ«shtÃ« jo i plotÃ«.\n\nJu lutem plotÃ«soni informacionet nÃ«\nISDN Tabele para se tÃ« pÃ«rdorni kÃ«tÃ« modem."
+    600 "PPP   (56K,GSM)"
+    601 "PPP   (64K,GSM)"
+    602 "V.120 (64K,GSM)"
+    604 "V.110 (1.2K,GSM)"
+    605 "V.110 (2.4K,GSM)"
+    606 "V.110 (4.8K,GSM)"
+    607 "V.110 (9.6K,GSM)"
+    608 "V.110 (12.0K,GSM)"
+    609 "V.110 (14.4K,GSM)"
+    610 "V.110 (19.2K,GSM)"
+    611 "V.110 (28.8K,GSM)"
+    612 "V.110 (38.4K,GSM)"
+    613 "V.110 (57.6K,GSM)"
+    614 "Analog RLP"
+    615 "Analog NRLP"
+    616 "GPRS"
+    617 "PIAFS - hyres"
+    618 "PIAFS - dales"
+    700 "PÃ«rdor vendnodhjen TAPI aktuale"
+    2006 "Ngjit tek"
+    2007 "Nuk Ã«shtÃ« e pranishme"
+    2008 "Jo funksionale"
+    2009 "Duhet Rifilluar"
+    2010 "#PÃ«r tÃ« pÃ«rfunduar cilÃ«simet e modemin tuaj, ju duhet tÃ« rinisni kompjuterin tuaj.\n\nA doni tÃ« rinisni kompjuterin tuaj tani?"
+    2011 "Modem jo i instaluar plotÃ«sisht"
+    2012 "Port panjohur"
+    3000 "Cilesimet Modemit"
+    3018 "Modemi"
+    3019 "Instalon njÃ« modem tÃ« re dhe ndryshon cilÃ«simet modemit."
+    3053 "Karakteristikat e modemit nuk mund tÃ« shfaqen, sepse modemi nuk Ã«shtÃ« nÃ« dispozicion.\n\nRifilloni sistemin dhe provoni pÃ«rsÃ«ri."
+    3054 "Karakteristikat pÃ«r Modemin"
+    3060 "Jeni te sigurte qe doni te hiqni modem e zgjedhu(r) nga sistemi juaj?"
+    3061 "ReactOS nuk ishte nÃ« gjendje pÃ«r tÃ« hequr modem '%1' nga %2."
+    3062 "Modemi"
+    3069 "Nuk ka memorie tÃ« mjaftueshme pÃ«r tÃ« hapur panelin e kontrollit tÃ« modemit.\n\nMbylle disa programe dhe provoni pÃ«rsÃ«ri."
+    3073 "Ju duhet tÃ« jeni njÃ« Administrator i Sistemit pÃ«r tÃ« instaluar njÃ« modem."
+    3074 "Nuk ka modem tÃ« instaluar. Ju duhet tÃ« jeni njÃ« Administrator i Sistemit pÃ«r tÃ« instaluar njÃ« modem."
+    3076 "Ju duhet tÃ« mbyllni dhe tÃ« rinisni kompjuterin tuaj para se parametrat e reja do tÃ« hyjnÃ« nÃ« fuqi.\n\nA doni tÃ« rinisni kompjuterin tuaj tani?"
+    3077 "Ndryshimet e CilÃ«simeve tÃ« Rrjesit"
+    3200 "300 Baud"
+    3201 "1200 Baud"
+    3202 "2400 Baud"
+    3203 "9600 Baud"
+    3204 "19.2K Baud"
+    3205 "38.4K Baud"
+    3206 "57.6K Baud"
+    3207 "Ska pÃ«rgjigje"
+    3212 "KomandÃ«"
+    3213 "Pergjigje"
+    3214 "Porti ku modemi Ã«shtÃ« i bashkangjitur nuk mund tÃ« hapet. Kjo mund tÃ« jetÃ« rezultat i njÃ« konflikti pjese elektronike. Kontrolloni menaxherin e pajisjeve pÃ«r tÃ« verifikuar tÃ« gjitha pajisjet janÃ« funksionale."
+    3215 "Porti qÃ« modemi Ã«shtÃ« duke pÃ«rdorur aktualisht Ã«shtÃ« i hapur nga njÃ« tjetÃ«r program. Dil nga programi qÃ« aktualisht mund tÃ« jetÃ« duke pÃ«rdorur portin."
+    3218 "OpenComm"
+    3221 "115K Baud"
+    3222 "Azhorno"
+    3223 "Gabim"
+    3233 "Sukses"
+    3236 "Modem nuk arriti tÃ« pÃ«rgjigjet. Sigurohuni qÃ« ajo Ã«shtÃ« e lidhur si duhet dhe ndezur. NÃ« qoftÃ« se kjo Ã«shtÃ« njÃ« modem i brendshÃ«m apo Ã«shtÃ« e lidhur, tÃ« verifikohet se interrupt pÃ«r portin Ã«shtÃ« vendosur si duhet."
+    3237 "KOMANDA NUK MBESHTETET"
+    3238 "FushÃ«"
+    3239 "VlerÃ«"
+    3240 "Preferenca Parazgjedhore"
+    3241 "Preferenca Lidhjeve"
+    6144 "Japoni"
+    6145 "ShqipÃ«ria"
+    6146 "Algjeria"
+    6147 "Amerika Samoa"
+    6148 "Gjermania (Shteti/Kodi rajonit 04)"
+    6149 "Anguilla"
+    6150 "Antigua dhe Barbuda"
+    6151 "Argjentina"
+    6152 "Ascension Island"
+    6153 "Australia"
+    6154 "Austria"
+    6155 "Bahamas"
+    6156 "Bahrain"
+    6157 "Bangladesh"
+    6158 "Barbados"
+    6159 "Belgjika"
+    6160 "Belize"
+    6161 "Benin"
+    6162 "Bermuda"
+    6163 "Bhutan"
+    6164 "Bolivia"
+    6165 "Botswana"
+    6166 "Brazil"
+    6167 "Shteti/kodi rajonit (23)"
+    6168 "Teritori Eqeanik Indian Britanik"
+    6169 "Ishujt Virgin Britanik"
+    6170 "Brunei"
+    6171 "Bulgaria"
+    6172 "Myanmar"
+    6173 "Burundi"
+    6174 "Bjellorusia"
+    6175 "Kameroon"
+    6176 "Kanada"
+    6177 "Kape Verde"
+    6178 "Ishulli Cayman"
+    6179 "Republika e AfrikÃ«s Qendrore"
+    6180 "Chad"
+    6181 "Qili"
+    6182 "Kina"
+    6183 "Kolombia"
+    6184 "Komoros"
+    6185 "Kongo"
+    6186 "Ishulli Cook"
+    6187 "Kosta Rica"
+    6188 "Kuba"
+    6189 "Qipro"
+    6190 "Republika Ã‡eke"
+    6191 "Kambodia"
+    6192 "Korea Veriut"
+    6193 "Danimark"
+    6194 "Djibouti"
+    6195 "Republika Dominikane"
+    6196 "Dominica"
+    6197 "Ekuador"
+    6198 "Egjypt"
+    6199 "El Salvador"
+    6200 "Guinea Ekuadorial"
+    6201 "Ethiopia"
+    6202 "Ishujt Falkland (Islas Malvinas)"
+    6203 "Ishujt Fiji"
+    6204 "Finland"
+    6205 "France"
+    6206 "French Polynesia"
+    6207 "Shteti/Kodi rajonal (63)"
+    6208 "Gabon"
+    6209 "Gambia"
+    6210 "Germany (Shteti/Kodi rajonal 66)"
+    6211 "Angola"
+    6212 "Ghana"
+    6213 "Gibraltar"
+    6214 "Greqia"
+    6215 "Grenada"
+    6216 "Guam"
+    6217 "Guatemala"
+    6218 "Guernsey"
+    6219 "Guinea"
+    6220 "Guinea-Bissau"
+    6221 "Guyana"
+    6222 "Haiti"
+    6223 "Honduras"
+    6224 "Hong Kong SAR"
+    6225 "Hungaria"
+    6226 "IslandÃ«"
+    6227 "India"
+    6228 "Indonezia"
+    6229 "Irani"
+    6230 "Irak"
+    6231 "Ireland"
+    6232 "Izrael"
+    6233 "Itali"
+    6234 "Cote d'Ivoire"
+    6235 "Xhamaika"
+    6236 "Afghanistan"
+    6237 "Jersey"
+    6238 "Jordani"
+    6239 "Kenya"
+    6240 "Kiribati"
+    6241 "Korea"
+    6242 "Kuwait"
+    6243 "Laos"
+    6244 "Lebanon"
+    6245 "Lesotho"
+    6246 "Liberia"
+    6247 "Libia"
+    6248 "Lihtenshtajn"
+    6249 "Luksemburg"
+    6250 "Macau SAR"
+    6251 "Madagaskar"
+    6252 "Malaysia"
+    6253 "Malawi"
+    6254 "Maldives"
+    6255 "Mali"
+    6256 "Malta"
+    6257 "Mauritania"
+    6258 "Mauritius"
+    6259 "Mexike"
+    6260 "Monako"
+    6261 "Mongolia"
+    6262 "Montserrat"
+    6263 "Moroko"
+    6264 "Mozambique"
+    6265 "Nauru"
+    6266 "Nepal"
+    6267 "HolandÃ«"
+    6268 "HolandÃ« Antilles"
+    6269 "Kaledonia e Re"
+    6270 "Zelanda e Re"
+    6271 "Nikaragua"
+    6272 "Niger"
+    6273 "Nigeria"
+    6274 "Norvegjia"
+    6275 "Oman"
+    6276 "Pakistan"
+    6277 "Panama"
+    6278 "Papua New Guinea"
+    6279 "Paraguay"
+    6280 "Peru"
+    6281 "Philippines"
+    6282 "Polonia"
+    6283 "Portugalia"
+    6284 "Puerto Rico"
+    6285 "Qatar"
+    6286 "Romania"
+    6287 "Rwanda"
+    6288 "St. Kitts and Nevis"
+    6289 "Shteti/Kodi rajonal (145)"
+    6290 "St. Helena"
+    6291 "St. Lucia"
+    6292 "San Marino"
+    6293 "Shteti/Kodi rajonal (148)"
+    6294 "Sao Tome dhe Principe"
+    6295 "ShÃ«n Vincenti dhe Grenadinet"
+    6296 "Arabia Saudite"
+    6297 "Senegal"
+    6298 "Seychelles"
+    6299 "Sierra Leone"
+    6300 "Singapori"
+    6301 "Ishujt Solomon"
+    6302 "Somalia"
+    6303 "Afrika e Jugut"
+    6304 "SpanjÃ«"
+    6305 "Sri Lanka"
+    6306 "Sudan"
+    6307 "Suriname"
+    6308 "Swaziland"
+    6309 "Suedi"
+    6310 "Zvicer"
+    6311 "Siria"
+    6312 "Tanzania"
+    6313 "Tailand"
+    6314 "Togo"
+    6315 "Tonga"
+    6316 "Trinidad dhe Tobago"
+    6317 "Tuniyia"
+    6318 "Turkia"
+    6319 "Turks dhe Ishujt Caicos"
+    6320 "Tuvalu"
+    6321 "Uganda"
+    6322 "Ukraina"
+    6323 "Emiratet e Bashkuara Arabe"
+    6324 "Britania e Madhe"
+    6325 "Shtetet e Bashkuara"
+    6326 "Burkina Faso"
+    6327 "Uruguai"
+    6328 "Shteti/Kodi rajonal (184)"
+    6329 "Vanuatu"
+    6330 "Qzteti Vatikanit"
+    6331 "Venezuela"
+    6332 "Vietnam"
+    6333 "Wallis dhe Futuna"
+    6334 "Samoa"
+    6335 "Yemen"
+    6336 "Yemen"
+    6337 "Shteti/Kodi rajonal (193)"
+    6338 "Kongo (DRC)"
+    6339 "Zambia"
+    6340 "Zimbabwe"
+    6501 "Moldova"
+    6502 "Estonia"
+    6503 "Lituania"
+    6504 "Armenia"
+    6505 "Gjeorgia"
+    6506 "Azerbaigjan"
+    6507 "Turkmenistan"
+    6508 "Uzbekistan"
+    6509 "Kazakhstan"
+    6510 "Tajikistan"
+    6511 "Kyrgyzstan"
+    6512 "Latvia"
+    6513 "Russia"
+    6600 "Kroatia"
+    6601 "Slovenia"
+    6602 "Macedonia, FYRO"
+    6603 "Bosnia dhe Herzegovina"
+    6604 "Yugoslavia"
+    20013 "Hardware ID"
+END

Modification de propriÃ©tÃ©s sur dll/win32/modemui/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/modemui/modemui.rc
===================================================================
--- dll/win32/modemui/modemui.rc	(rÃ©vision 61927)
+++ dll/win32/modemui/modemui.rc	(copie de travail)
@@ -39,6 +39,9 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
Index: dll/win32/atl100/CMakeLists.txt
===================================================================
--- dll/win32/atl100/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/atl100/CMakeLists.txt	(copie de travail)
@@ -14,11 +14,15 @@
     atl.c
     atl_ax.c
     registrar.c
-    ${CMAKE_CURRENT_BINARY_DIR}/atl100_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/atl100_stubs.c)
+
+add_library(atl100 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/atl100.def)
 
-add_library(atl100 SHARED ${SOURCE})
 set_module_type(atl100 win32dll)
 target_link_libraries(atl100 uuid wine)
 add_importlibs(atl100 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(atl100 precomp.h SOURCE)
 add_cd_file(TARGET atl100 DESTINATION reactos/system32 FOR all)
Index: dll/win32/spoolss/spoolss.h
===================================================================
--- dll/win32/spoolss/spoolss.h	(rÃ©vision 61927)
+++ dll/win32/spoolss/spoolss.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _SPOOLSS_H_
+#define _SPOOLSS_H_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -46,3 +49,5 @@
 {
     return HeapFree( GetProcessHeap(), 0, mem );
 }
+
+#endif /* _SPOOLSS_H_ */
Index: dll/win32/spoolss/CMakeLists.txt
===================================================================
--- dll/win32/spoolss/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/spoolss/CMakeLists.txt	(copie de travail)
@@ -6,11 +6,15 @@
 list(APPEND SOURCE
     spoolss_main.c
     router.c
-    ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c
+    spoolss.h
+    ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c)
+
+add_library(spoolss SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
 
-add_library(spoolss SHARED ${SOURCE})
 set_module_type(spoolss win32dll)
 target_link_libraries(spoolss wine)
 add_importlibs(spoolss msvcrt kernel32 ntdll)
+add_pch(spoolss spoolss.h SOURCE)
 add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)
Index: dll/win32/activeds/CMakeLists.txt
===================================================================
--- dll/win32/activeds/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/activeds/CMakeLists.txt	(copie de travail)
@@ -6,10 +6,14 @@
 list(APPEND SOURCE
     activeds_main.c
     stubs.c
+    precomp.h)
+
+add_library(activeds SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
 
-add_library(activeds SHARED ${SOURCE})
 set_module_type(activeds win32dll)
 target_link_libraries(activeds wine)
 add_importlibs(activeds msvcrt kernel32 ntdll)
+add_pch(activeds precomp.h SOURCE)
 add_cd_file(TARGET activeds DESTINATION reactos/system32 FOR all)
Index: dll/win32/hid/precomp.h
===================================================================
--- dll/win32/hid/precomp.h	(rÃ©vision 61927)
+++ dll/win32/hid/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _HID_PCH_
+#define _HID_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -18,4 +21,4 @@
 extern HINSTANCE hDllInstance;
 extern const GUID HidClassGuid;
 
-/* EOF */
+#endif /* _HID_PCH_ */
Index: dll/win32/hid/CMakeLists.txt
===================================================================
--- dll/win32/hid/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/hid/CMakeLists.txt	(copie de travail)
@@ -3,15 +3,17 @@
 list(APPEND SOURCE
     hid.c
     stubs.c
-    hid.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
+    precomp.h)
 
 spec2def(hid.dll hid.spec)
 
-add_library(hid SHARED ${SOURCE})
+add_library(hid SHARED
+    ${SOURCE}
+    hid.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
 
 set_module_type(hid win32dll UNICODE)
 
 add_importlibs(hid msvcrt kernel32 ntdll)
-add_pch(hid precomp.h)
+add_pch(hid precomp.h SOURCE)
 add_cd_file(TARGET hid DESTINATION reactos/system32 FOR all)
Index: dll/win32/hlink/CMakeLists.txt
===================================================================
--- dll/win32/hlink/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/hlink/CMakeLists.txt	(copie de travail)
@@ -9,13 +9,17 @@
     extserv.c
     hlink_main.c
     link.c
+    hlink_private.h)
+
+add_library(hlink SHARED
+    ${SOURCE}
+    hlink.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/hlink.def)
 
-add_library(hlink SHARED ${SOURCE} hlink.rc)
 set_module_type(hlink win32dll)
 target_link_libraries(hlink uuid wine)
 add_delay_importlibs(hlink urlmon)
 add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll)
-add_pch(hlink hlink_private.h)
+add_pch(hlink hlink_private.h SOURCE)
 add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all)
Index: dll/win32/hlink/hlink_private.h
===================================================================
--- dll/win32/hlink/hlink_private.h	(rÃ©vision 61927)
+++ dll/win32/hlink/hlink_private.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _HLINK_PRIVATE_H
+#define _HLINK_PRIVATE_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -82,3 +85,5 @@
 
     return ret;
 }
+
+#endif /* _HLINK_PRIVATE_H */
Index: dll/win32/oledlg/rsrc.rc
===================================================================
--- dll/win32/oledlg/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/oledlg/rsrc.rc	(copie de travail)
@@ -53,9 +53,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/oledlg_Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/oledlg_Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DE_DE
@@ -94,6 +91,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/oledlg_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/oledlg_Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/oledlg_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/oledlg_Uk.rc"
 #endif
@@ -100,4 +103,3 @@
 #ifdef LANGUAGE_ZH_CN
     #include "lang/oledlg_Zh.rc"
 #endif
-
Index: dll/win32/oledlg/CMakeLists.txt
===================================================================
--- dll/win32/oledlg/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/oledlg/CMakeLists.txt	(copie de travail)
@@ -7,10 +7,15 @@
     insobjdlg.c
     oledlg_main.c
     pastespl.c
+    oledlg_private.h)
+
+add_library(oledlg SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)
 
-add_library(oledlg SHARED ${SOURCE} rsrc.rc)
 set_module_type(oledlg win32dll)
 target_link_libraries(oledlg wine)
 add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(oledlg oledlg_private.h SOURCE)
 add_cd_file(TARGET oledlg DESTINATION reactos/system32 FOR all)
Index: dll/win32/oledlg/lang/oledlg_Sq.rc
===================================================================
--- dll/win32/oledlg/lang/oledlg_Sq.rc	(rÃ©vision 0)
+++ dll/win32/oledlg/lang/oledlg_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2003 Ulrich Czekalla for CodeWeavers
+ *
+ * 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
+ */
+ /* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+UIINSERTOBJECT DIALOG  0, 0, 294, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fut Objektin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
+                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "Tipi Objektit:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
+    PUSHBUTTON      "Anulo",IDCANCEL,221,24,66,14
+    GROUPBOX        "Rezultat",IDC_RESULT,7,103,208,41
+    CONTROL         "Krijo te re",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,7,20,62,10
+    CONTROL         "Krijo Kontroll",IDC_CREATECONTROL,"Button",
+                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
+    CONTROL         "Krijo Nga Dokumenti",IDC_CREATEFROMFILE,"Button",
+                    BS_AUTORADIOBUTTON,7,37,67,10
+    LTEXT           "",IDC_RESULTDESC,49,112,159,23
+    PUSHBUTTON      "&Shto Kontroll...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    CONTROL         "Shfaq Si IkonÃ«",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
+    PUSHBUTTON      "Shfleto...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "Dokumenti:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
+    EDITTEXT        IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
+END
+
+STRINGTABLE
+{
+  IDS_RESULTOBJDESC	"Fut njÃ« %s objekt nÃ« dokumentin tuaj"
+  IDS_RESULTFILEOBJDESC	"Fut pÃ«rmbajtjen e dokumentit si njÃ« objekt nÃ« dokumentin tuaj nÃ« mÃ«nyrÃ« qÃ« ju mund ta aktivizoni duke pÃ«rdorur programin i cili krijoi atÃ«."
+  IDS_BROWSE            "Shfleto"
+  IDS_NOTOLEMOD         "Dokument nuk duket tÃ« ketÃ« njÃ« modul tÃ« vlefshme OLE. NÃ« pamundÃ«si pÃ«r tÃ« regjistruar kontrollin OLE."
+  IDS_NOTOLEMODCAPTION  "Shto Kontroll"
+}
+
+IDD_PASTESPECIAL4 DIALOG 3, 15, 293, 140
+STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ngjit Speciale"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT         "Burimi:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
+    CONTROL       "&Ngjit", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
+                  6, 38, 55, 10
+    CONTROL       "Ngjit &Linkun", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+                  6, 63, 55, 10
+    LTEXT         "&Si:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
+    CONTROL       "Anulo", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
+    CONTROL       "&NdihmÃ«", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
+    CONTROL       "&Shfaq Si IkonÃ«", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
+    CONTROL       "Ndrysho &IkonÃ«...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
+    CONTROL       "<< teksti rezultat shkon kÃ«tu >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "rezultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
+    CONTROL       "", IDC_PS_SOURCETEXT, "Redakto", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
+END
+
+STRINGTABLE
+{
+    IDS_PS_PASTE_DATA                     "Fut pÃ«rmbajtjen e tabelÃ«s nÃ« dokumentin tuaj si %s."
+    IDS_PS_PASTE_OBJECT                   "Fut pÃ«rmbajtjen e tabelÃ«s nÃ« dokumentin tuaj nÃ« mÃ«nyrÃ« qÃ« ju mund ta aktivizoni atÃ« duke pÃ«rdorur %s."
+    IDS_PS_PASTE_OBJECT_AS_ICON           "Fut pÃ«rmbajtjen e tabelÃ«s nÃ« dokumentin tuaj nÃ« mÃ«nyrÃ« qÃ« ju mund ta aktivizoni duke pÃ«rdorur %s. Ajo do tÃ« shfaqet si njÃ« ikonÃ«."
+    IDS_PS_PASTE_LINK_DATA                "Fut pÃ«rmbajtjen e tabelÃ«s nÃ« dokumentin tuaj si %s. TÃ« dhÃ«nat janÃ« tÃ« lidhura me burimin e dokumentit nÃ« mÃ«nyrÃ« qÃ« ndryshimet nÃ« dokument do tÃ« reflektohen nÃ« dokumentin tuaj."
+    IDS_PS_PASTE_LINK_OBJECT              "Fut pÃ«rmbajtjen e tabelÃ«s nÃ« dokumentin tuaj si %s. TÃ« dhÃ«nat janÃ« tÃ« lidhura me burimin e dokumentit nÃ« mÃ«nyrÃ« qÃ« ndryshimet nÃ« dokument do tÃ« reflektohen nÃ« dokumentin tuaj."
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "Fut njÃ« ikonÃ« e cila tregon pÃ«r vendndodhjen e pÃ«rmbajtjes tabelÃ«s. Ikona Ã«shtÃ« e lidhur me burimin e dokumentit nÃ« mÃ«nyrÃ« qÃ« ndryshimet nÃ« dokument do tÃ« reflektohen nÃ« dokumentin tuaj."
+    IDS_PS_NON_OLE                        "Fut pÃ«rmbajtjen e tabelÃ«s nÃ« dokumentin tuaj."
+    IDS_PS_UNKNOWN_TYPE                   "Tipi panjohur"
+    IDS_PS_UNKNOWN_SRC                    "Burimi panjohur"
+    IDS_PS_UNKNOWN_APP                    "program i cili krijoi atÃ«"
+}

Modification de propriÃ©tÃ©s sur dll/win32/oledlg/lang/oledlg_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/iphlpapi/iphlpapi_private.h
===================================================================
--- dll/win32/iphlpapi/iphlpapi_private.h	(rÃ©vision 61927)
+++ dll/win32/iphlpapi/iphlpapi_private.h	(copie de travail)
@@ -172,4 +172,4 @@
 GetComputerNameExA(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD);
 #endif
 
-#endif/*IPPRIVATE_H*/
+#endif /* IPPRIVATE_H */
Index: dll/win32/iphlpapi/iphlpapi_main.c
===================================================================
--- dll/win32/iphlpapi/iphlpapi_main.c	(rÃ©vision 61927)
+++ dll/win32/iphlpapi/iphlpapi_main.c	(copie de travail)
@@ -2281,7 +2281,7 @@
 /*
  * @implemented
  */
-DWORD WINAPI GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen)
+DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen)
 {
 #if 0
     InterfaceIndexTable *indexTable;
Index: dll/win32/iphlpapi/CMakeLists.txt
===================================================================
--- dll/win32/iphlpapi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/iphlpapi/CMakeLists.txt	(copie de travail)
@@ -16,15 +16,17 @@
     registry.c
     resinfo_reactos.c
     route_reactos.c
+    iphlpapi_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_stubs.c)
+
+add_library(iphlpapi SHARED
+    ${SOURCE}
     iphlpapi.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
 
-add_library(iphlpapi SHARED ${SOURCE})
-
-set_module_type(iphlpapi win32dll UNICODE)
+set_module_type(iphlpapi win32dll UNICODE HOTPATCHABLE)
 target_link_libraries(iphlpapi wine tdilib)
 add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
-add_pch(iphlpapi iphlpapi_private.h)
+add_pch(iphlpapi iphlpapi_private.h SOURCE)
 add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/gdiplus/CMakeLists.txt
===================================================================
--- dll/win32/gdiplus/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/gdiplus/CMakeLists.txt	(copie de travail)
@@ -22,13 +22,18 @@
     pen.c
     region.c
     stringformat.c
+    gdiplus_private.h)
+
+add_library(gdiplus SHARED
+    ${SOURCE}
     guid.c
+    gdiplus.rc
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def)
 
-add_library(gdiplus SHARED ${SOURCE} gdiplus.rc)
 set_module_type(gdiplus win32dll)
 target_link_libraries(gdiplus wine)
 add_delay_importlibs(gdiplus windowscodecs)
 add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll)
+add_pch(gdiplus gdiplus_private.h SOURCE)
 add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all)
Index: dll/win32/comdlg32/lang/cdlg_Tr.rc
===================================================================
--- dll/win32/comdlg32/lang/cdlg_Tr.rc	(rÃ©vision 61927)
+++ dll/win32/comdlg32/lang/cdlg_Tr.rc	(copie de travail)
@@ -82,7 +82,7 @@
     PD32_PRINTER_STATUS_PAPER_OUT         "KÃ¢ÄŸÄ±t yok; "
     PD32_PRINTER_STATUS_MANUAL_FEED       "Elle kÃ¢ÄŸÄ±t besleme; "
     PD32_PRINTER_STATUS_PAPER_PROBLEM     "KÃ¢ÄŸÄ±t sorunu var; "
-    PD32_PRINTER_STATUS_OFFLINE           "Ã‡evrimdÄ±ÅŸÄ±; "
+    PD32_PRINTER_STATUS_OFFLINE           "Ã‡evrim DÄ±ÅŸÄ±; "
     PD32_PRINTER_STATUS_IO_ACTIVE         "G/Ã‡ Etkin; "
     PD32_PRINTER_STATUS_BUSY              "KullanÄ±mda; "
     PD32_PRINTER_STATUS_PRINTING          "YazdÄ±rÄ±lÄ±yor; "
Index: dll/win32/comdlg32/lang/cdlg_Sq.rc
===================================================================
--- dll/win32/comdlg32/lang/cdlg_Sq.rc	(rÃ©vision 0)
+++ dll/win32/comdlg32/lang/cdlg_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,488 @@
+/*
+ * Resources for Common Dialogs
+ *
+ * Copyright 1999 Bertho Stultiens
+ * Copyright 1999 Klaas van Gend
+ * Translator: Ardit Dani (Albanian)
+ *
+ * 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
+ */
+
+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_FILENOTFOUND        "Dokumenti nuk i gjend"
+    IDS_VERIFYFILE          "Ju lutem verifikoni qÃ« emri i saktÃ« fotografi Ã«shtÃ« dhÃ«nÃ«"
+    IDS_CREATEFILE          "Dokumenti nuk ekziston.\n\
+Doni ta krijoni dokumentin?"
+    IDS_OVERWRITEFILE       "Dokumenti ekziston.\n\
+Doni ta zevendesoni?"
+    IDS_INVALID_FILENAME_TITLE "Karatere te pavlere ne rruge"
+    IDS_INVALID_FILENAME    "Nje emer dokumentin nuk mund te permbaje kararakteret e meposhtme:\n\
+                          / : < > |"
+    IDS_PATHNOTEXISTING     "Rruga nuk ekziston"
+    IDS_FILENOTEXISTING     "Dokumenti nuk ekziston"
+}
+
+STRINGTABLE
+{
+    IDS_UPFOLDER         "Lart nje nivel"
+    IDS_NEWFOLDER        "Krijo dosje te re"
+    IDS_LISTVIEW         "Listo"
+    IDS_REPORTVIEW       "Detaje"
+    IDS_TODESKTOP        "Shfleto Desktopin"
+}
+
+STRINGTABLE
+{
+    PD32_PRINT_TITLE       "Printo"
+
+    PD32_VALUE_UREADABLE                  "Hyrje e palexueshme"
+    PD32_INVALID_PAGE_RANGE "Kjo vlerÃ« nuk gjendet brenda intervalit faqes.\n\
+Ju lutem fusni nje vlere mes %1!d! dhe %2!d!."
+    PD32_FROM_NOT_ABOVE_TO                "Pjesa 'from' hyrese nuk mund te tejkaloje hyrsen 'to'."
+    PD32_MARGINS_OVERLAP                  "Kufinjte pÃ«rputhen ose bien jashtÃ« kufijtÃ« te faqes.\n\
+Ju lutem reshkruani kufinjte."
+    PD32_NR_OF_COPIES_EMPTY               "Pjesa 'Number of copies' nuk mund te jete bosh."
+    PD32_TOO_LARGE_COPIES                 "This large number of copies is not supported by your printer.\n\
+Ju lutem fusni nje vlere mes 1 dhe %d."
+    PD32_PRINT_ERROR                      "Nje error ne printer ndodhi."
+    PD32_NO_DEFAULT_PRINTER               "Printera te paraperzgjedhur nuk ka."
+    PD32_CANT_FIND_PRINTER                "Nuk gjindet printeri."
+    PD32_OUT_OF_MEMORY                    "Ska memorie te mjaftushme."
+    PD32_GENERIC_ERROR                    "Nje error."
+    PD32_DRIVER_UNKNOWN                   "Driveri i printerir i panjohur."
+    PD32_NO_DEVICES                       "Para se te besh nje detyre ne lidhje me printerin si konfigurimi i faqes ose printimi i dokumentit, duhet te instaloni nje printer. Ju lutem instaloni nje dhe provoni perseri."
+    PD32_DEFAULT_PRINTER                  "Printeri i perzgjedhur; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Dokumentet %d jane ne rradhe/pritje"
+    PD32_MARGINS_IN_INCHES                "Diferenca [inches]"
+    PD32_MARGINS_IN_MILLIMETERS           "Diferenca [mm]"
+    PD32_MILLIMETERS                      "mm"
+
+    PD32_PRINTER_STATUS_READY             "Gati"
+    PD32_PRINTER_STATUS_PAUSED            "Pushim; "
+    PD32_PRINTER_STATUS_ERROR             "Error; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Fshirje ne pritje; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Leter e bllokuar; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Ska Leter; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Terhiq letren manualish; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Problem me letren; "
+    PD32_PRINTER_STATUS_OFFLINE           "Printeri offline; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Aktiv; "
+    PD32_PRINTER_STATUS_BUSY              "I ZÃ«nÃ«; "
+    PD32_PRINTER_STATUS_PRINTING          "Printim; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Koshi i daljes eshte plot; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Jo i disponushem; "
+    PD32_PRINTER_STATUS_WAITING           "Pritni; "
+    PD32_PRINTER_STATUS_PROCESSING        "Ne Proces; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Fillon; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Duke u nxehur; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Toneri po mbaron; "
+    PD32_PRINTER_STATUS_NO_TONER          "Ska toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Faqe punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Nderprer nga perdoruesi; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Ska memorie; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "Dera e printerit eshte hapur; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server pa njohur; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Ruajtje Energjie; "
+}
+
+STRINGTABLE /* Font styles */
+{
+    IDS_FONT_REGULAR       "Regular"
+    IDS_FONT_BOLD          "Bold"
+    IDS_FONT_ITALIC        "Italic"
+    IDS_FONT_BOLD_ITALIC   "Bold Italic"
+}
+
+STRINGTABLE /* Color names */
+{
+    IDS_COLOR_BLACK     "I Zi"
+    IDS_COLOR_MAROON    "Maroon"
+    IDS_COLOR_GREEN     "Jeshil"
+    IDS_COLOR_OLIVE     "Ullinje"
+    IDS_COLOR_NAVY      "Ushtarake"
+    IDS_COLOR_PURPLE    "Lejla"
+    IDS_COLOR_TEAL      "Teal"
+    IDS_COLOR_GRAY      "Gri"
+    IDS_COLOR_SILVER    "Argjente"
+    IDS_COLOR_RED       "Kuqe"
+    IDS_COLOR_LIME      "Lime"
+    IDS_COLOR_YELLOW    "E Verdhe"
+    IDS_COLOR_BLUE      "Blu"
+    IDS_COLOR_FUCHSIA   "Fuchsia"
+    IDS_COLOR_AQUA      "Uje"
+    IDS_COLOR_WHITE     "Bardhe"
+}
+
+STRINGTABLE
+{
+    IDS_FONT_SIZE   "Perzgjidh masen e fontit mes %1!d! dhe %2!d! pikave."
+    IDS_SAVE_BUTTON "Ruaj"
+    IDS_SAVE_IN     "Ruaj nÃ«:"
+    IDS_SAVE        "Ruaj"
+    IDS_SAVE_AS     "Ruaj si "
+    IDS_OPEN_FILE   "Hap"
+}
+
+/*
+ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
+ */
+
+OPEN_FILE DIALOG 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Hap"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Emer dokumenti:", stc3, 6, 6, 76, 9
+ EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Skeda:", -1, 110, 6, 92, 9
+ LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Listo dokumentat te &Tipit:", stc2, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", stc4, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Hap", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anulo", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "NdihmÃ«", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Te Lexueshem", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ruaj si..."
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Emer dokumenti:", stc3, 6, 6, 76, 9
+ EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Skeda:", -1, 110, 6, 92, 9
+ LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Listo dokumentat te &Tipit:", stc2, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", stc4, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ruaj si", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anulo", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "NdihmÃ«", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "te Lexueshem", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Printo"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Printeri:", stc1, 6, 6, 40, 9
+ LTEXT "", stc2, 60, 6, 150, 9
+ GROUPBOX "Gama Printerit", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "Te gjith", rad1, 16, 45, 60, 12
+ RADIOBUTTON "Perzgjedhur", rad2, 16, 60, 60, 12
+ RADIOBUTTON "Faqe", rad3, 16, 75, 60, 12
+ DEFPUSHBUTTON "Printer", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anulo", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "Nga:", stc3, 60, 80, 30, 9
+ LTEXT "Tek:", stc4, 120, 80, 30, 9
+ LTEXT "Kualiteti Printerit:", stc5, 6, 100, 76, 9
+ COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Printo ne dokument", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kondesuar", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurimi Printerit"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "Printeri", grp1, 6, 6, 180, 72, BS_GROUPBOX
+ RADIOBUTTON "Printeri perzgjedhur", rad1, 16, 16, 150, 12
+ LTEXT "[asnje]", stc1, 35, 30, 120, 9
+ RADIOBUTTON "&Printeri specifik", rad2, 16, 44, 150, 12
+ COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anulo", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientimi", grp2, 6, 82, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Po&rtret", rad3, 50, 95, 50, 12
+ RADIOBUTTON "&Landscape", rad4, 50, 110, 50, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "Leter", grp3, 116, 82, 178, 50, BS_GROUPBOX
+ LTEXT "Masa", stc2, 126, 95, 35, 9
+ LTEXT "Burimi", stc3, 126, 110, 35, 9
+ COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG  13, 54, 274, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "&Font:",stc1 ,6,3,90,9
+    COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Font Stili:",stc2 ,108,3,60,9
+    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Masa:",stc3,179,3,32,9
+    COMBOBOX        cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Anulo",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Apliko", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "NdihmÃ«" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Efekt",grp1,6,72,84,36,WS_GROUP
+    CHECKBOX	    "Stri&keout", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "Nenshkrim", chx2, 10,94,78,10, BS_AUTOCHECKBOX
+    LTEXT           "Ngjyra:", stc4 ,6,114,80,9
+    COMBOBOX        cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Shembull",grp2,98,72,120,36,WS_GROUP
+    CTEXT           "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "Skr&ipt:",stc7 ,98,114,40,9
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG 36, 24, 300, 185
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ngjyra"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Ngjyra fillestare:",   stc1, 4,    4,  140, 10
+ LTEXT "Ngjyra konfiguruar:",  stc2, 4,   106, 140, 10
+ LTEXT "Ngjyre |  Sol&ide",  stc3, 150, 151,  48, 10
+ LTEXT   "Kuqe:", IDC_COLOR_RL /*1094*/,247,126,27,10
+ EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "Jeshile:", IDC_COLOR_GL /*1095*/,247,140,27,10
+ EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blu:", IDC_COLOR_BL /*1096*/,247,154,27,10
+ EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10
+ EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10
+ EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10
+ EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  IDOK,  4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anulo", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "NdihmÃ«", pshHelp,100,166, 44, 14
+ PUSHBUTTON "Shto tek ngjyra konfiguruar",    IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "PÃ«rcakto konfigurimin e ngjyres >>", IDC_COLOR_DEFINE /*1025*/,   4, 149, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Ngjyra |  Sol&ide", IDC_COLOR_RES, 300,200,4,14   /* just a dummy */
+}
+
+
+FINDDLGORD DIALOG 36, 24, 276, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Gjej"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Fi&nd What:", -1, 4, 8, 52, 8
+ EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "PÃ«rshtat Vetem fjalet e plota", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "PÃ«rshtat rast", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Drejtim", grp1, 147, 21, 58, 38
+ CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12
+ CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12
+
+ DEFPUSHBUTTON "Gjej tjetrin", IDOK, 212,  6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Anulo", IDCANCEL	 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "NdihmÃ«", pshHelp	 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG 36, 24, 276, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ZÃ«vendÃ«so"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Gjej Ã§fare:", -1, 4, 8, 52, 8
+ EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "ZÃ«vendÃ«so me:", -1, 4, 26, 52, 8
+ EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "PÃ«rshtat vetem fjalet e plota", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "PÃ«rshtat rast", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "Gjej tjetrent", IDOK, 212,  6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "ZÃ«vendÃ«so", psh1	 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ZÃ«vendÃ«so te gjitha", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anulo", IDCANCEL	 , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "NdihmÃ«", pshHelp	 , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Printo"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Anulo", IDCANCEL, 230,164, 50,14, WS_GROUP
+    PUSHBUTTON      "NdihmÃ«",  pshHelp,  50, 161, 50,14, WS_GROUP
+    GROUPBOX        "Printeri",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Printo dookumentin", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16
+    PUSHBUTTON      "Tiparet",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "Emri:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Statusi:",        stc8,  16, 36,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipi:",          stc7,  16, 48,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Ku:",         stc10, 16, 60,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Koment:",       stc9,  16, 72,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    GROUPBOX        "Kopjon",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Numri i kopjeve:",stc5,168,105,68,8
+    ICON            "",               ico3, 170,131,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "Mbledh",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12
+    EDITTEXT                          edt3, 240,103,  32,12, WS_GROUP | ES_NUMBER
+    GROUPBOX        "Printo gamen",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "Te gjith",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "Faqet",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "PÃ«rzgjedhur",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  73,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 120,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "Nga:",         stc2,  52,124,  20,8
+    RTEXT           "Tek:",           stc3,  99,124,  20,8
+}
+
+PRINT32_SETUP DIALOG  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Konfiguimi i Printerit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,176,156,50,14,WS_GROUP
+    PUSHBUTTON      "Anulo",IDCANCEL,230,156,50,14
+/*    PUSHBUTTON      "Network...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Printeri",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "Tipre",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "Emii:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Statusi:",        stc8,  16, 36,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "ipi:",          stc7,  16, 48,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Ku:",         stc10, 16, 60,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommennt:",       stc9,  16, 72,  47,10, SS_NOPREFIX
+    LTEXT           "",               stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Lter",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "Masa:",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Burimi:",       stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX        "Orientimi",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "P&ortrait",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "L&andscape",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+PAGESETUPDLGORD DIALOG 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfigurimi i Faqes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+  CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+  CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
+  GROUPBOX "Leter", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "Masa:", stc2, 16, 112, 36, 8
+  COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  LTEXT "Kosh:", stc3, 16, 132, 36, 8
+  COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Orientimi", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "Kufij", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "Majtas:", stc15, 88, 172, 30, 8
+  EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "Djathtas:", stc16, 159, 172, 30, 8
+  EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "Lart:", stc17, 88, 192, 30, 8
+  EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "Poshte:", stc18, 159, 192, 30, 8
+  EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON "Anulo", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "P&rinteri...", psh3, 182, 220, 50, 14
+END
+
+NEWFILEOPENORD DIALOG 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
+CAPTION "Hap"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT	"Kerko nÃ«:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+    LTEXT	"Emer dokumenti:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL
+    CONTROL     "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150
+
+    LTEXT	"Dokumenta te &tipit:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Hap si &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10
+
+    DEFPUSHBUTTON	"Hap",		 IDOK,222,110,54,14
+    PUSHBUTTON		"Anulo",		 IDCANCEL,222,128,54,14
+    PUSHBUTTON		"NdihmÃ«",		 pshHelp,222,145,54,14
+}
+
+NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN |
+      WS_THICKFRAME
+CAPTION "Hap"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "Emri dokumentit:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT
+    EDITTEXT        IDC_FILENAME, 226, 240, 100, 12,  WS_CHILD | WS_VISIBLE | WS_TABSTOP
+
+    LTEXT           "Tipe dokumenti:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT
+    COMBOBOX        IDC_FILETYPE, 226, 256, 100, 12,  WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+                    CBS_HASSTRINGS | CBS_DROPDOWNLIST
+
+    DEFPUSHBUTTON   "Hap",  IDOK,     350, 240, 40, 14, WS_GROUP
+    PUSHBUTTON      "Anulo", IDCANCEL, 395, 240, 40, 14
+    PUSHBUTTON      "NdihmÃ«",  pshHelp,  350, 272, 40, 14
+}

Modification de propriÃ©tÃ©s sur dll/win32/comdlg32/lang/cdlg_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/comdlg32/rsrc.rc
===================================================================
--- dll/win32/comdlg32/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/comdlg32/rsrc.rc	(copie de travail)
@@ -115,6 +115,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/cdlg_Sk.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/cdlg_Sq.rc"
+#endif
 #ifdef LANGUAGE_SL_SI
     #include "lang/cdlg_Si.rc"
 #endif
Index: dll/win32/comdlg32/CMakeLists.txt
===================================================================
--- dll/win32/comdlg32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/comdlg32/CMakeLists.txt	(copie de travail)
@@ -16,12 +16,17 @@
     fontdlg.c
     #itemdlg.c /* Win 7 */
     printdlg.c
-    ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c
+    cdlg.h
+    ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c)
+
+add_library(comdlg32 SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
 
-add_library(comdlg32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(comdlg32 win32dll)
 target_link_libraries(comdlg32 uuid wine)
 add_delay_importlibs(comdlg32 ole32)
 add_importlibs(comdlg32 shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(comdlg32 cdlg.h SOURCE)
 add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/mciavi32/CMakeLists.txt
===================================================================
--- dll/win32/mciavi32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mciavi32/CMakeLists.txt	(copie de travail)
@@ -9,11 +9,15 @@
     mciavi.c
     mmoutput.c
     wnd.c
+    private_mciavi.h)
+
+add_library(mciavi32 SHARED
+    ${SOURCE}
+    mciavi_res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
 
-add_library(mciavi32 SHARED ${SOURCE} mciavi_res.rc)
 set_module_type(mciavi32 win32dll)
 target_link_libraries(mciavi32 wine)
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll)
-add_pch(mciavi32 private_mciavi.h)
+add_pch(mciavi32 private_mciavi.h SOURCE)
 add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/serialui/serialui.rc
===================================================================
--- dll/win32/serialui/serialui.rc	(rÃ©vision 61927)
+++ dll/win32/serialui/serialui.rc	(copie de travail)
@@ -52,6 +52,9 @@
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/serialui/lang/sq-AL.rc
===================================================================
--- dll/win32/serialui/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/serialui/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,41 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_EVENPARITY "Madje"
+    IDS_MARKPARITY "Mark"
+    IDS_NOPARITY "Ska Barazi"
+    IDS_ODDPARITY "RastÃ«sishÃ«m"
+    IDS_SPACEPARITY "HapÃ«sirÃ«"
+    IDS_ONESTOPBIT "1 bit ndalo"
+    IDS_ONE5STOPBITS "1.5 bits ndalo"
+    IDS_TWOSTOPBITS "2 bits ndalo"
+    IDS_FC_NO "Jo"
+    IDS_FC_CTSRTS "CTS/RTS"
+    IDS_FC_XONXOFF "XON/XOFF"
+    IDS_TITLE "CilÃ«sime pÃ«r %s"
+END
+
+IDD_COMMDLG DIALOGEX 6, 5, 222, 175
+FONT 8, "MS Shell Dlg"
+STYLE 0x10C80080
+EXSTYLE 0x00000001
+BEGIN
+    CONTROL "", IDC_GRP1, "Buton", 0x50000007, 6, 5, 210, 146, 0x00000000
+    CONTROL "OK", IDC_OKBTN, "Buton", 0x50010000, 98, 156, 56, 13, 0x00000000
+    CONTROL "Anulo", IDC_CANCELBTN, "Buton", 0x50010000, 158, 156, 56, 13, 0x00000000
+    CONTROL "Baud normÃ«:", IDC_STC1, "Statik", 0x50000000, 24, 31, 42, 9, 0x00000000
+    CONTROL "Byte masÃ«:", IDC_STC2, "Statik", 0x50000000, 24, 53, 42, 9, 0x00000000
+    CONTROL "Barazi:", IDC_STC3, "Statik", 0x50000000, 24, 73, 42, 9, 0x00000000
+    CONTROL "Ndalo bits:", IDC_STC4, "Statik", 0x50000000, 24, 96, 42, 9, 0x00000000
+    CONTROL "Kontroll Rrjedhe:", IDC_STC5, "Statik", 0x50000000, 24, 120, 42, 9, 0x00000000
+    CONTROL "", IDC_BAUDRATE, "ComboBox", 0x50210003, 98, 29, 100, 50, 0x00000000
+    CONTROL "", IDC_BYTESIZE, "ComboBox", 0x50210003, 98, 49, 100, 50, 0x00000000
+    CONTROL "", IDC_PARITY, "ComboBox", 0x50210003, 98, 72, 100, 50, 0x00000000
+    CONTROL "", IDC_STOPBITS, "ComboBox", 0x50210003, 98, 94, 100, 50, 0x00000000
+    CONTROL "", IDC_FLOW, "ComboBox", 0x50210003, 98, 116, 100, 50, 0x00000000
+END

Modification de propriÃ©tÃ©s sur dll/win32/serialui/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/jscript/jscript.h
===================================================================
--- dll/win32/jscript/jscript.h	(rÃ©vision 61927)
+++ dll/win32/jscript/jscript.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WINE_JSCRIPT_H
+#define _WINE_JSCRIPT_H
+
 #include <wine/config.h>
 #include <wine/port.h>
 
@@ -555,3 +558,5 @@
 
 #include "engine.h"
 #include "regexp.h"
+
+#endif /* _WINE_JSCRIPT_H */
Index: dll/win32/jscript/rsrc.rc
===================================================================
--- dll/win32/jscript/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/jscript/rsrc.rc	(copie de travail)
@@ -93,6 +93,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/jscript_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/jscript_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/jscript_Uk.rc"
 #endif
Index: dll/win32/jscript/CMakeLists.txt
===================================================================
--- dll/win32/jscript/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/jscript/CMakeLists.txt	(copie de travail)
@@ -31,7 +31,7 @@
     regexp.c
     string.c
     vbarray.c
-    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
+    jscript.h)
 
 list(APPEND jscript_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/jscript.rgs
@@ -40,7 +40,11 @@
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps}")
 
-add_library(jscript SHARED ${SOURCE} rsrc.rc)
+add_library(jscript SHARED
+    ${SOURCE}
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
+
 add_idl_headers(jscript_idlheader jscript_classes.idl)
 add_typelib(jsglobal.idl)
 add_dependencies(jscript jscript_idlheader stdole2) # jsglobal.tlb needs stdole2.tlb
@@ -47,5 +51,5 @@
 set_module_type(jscript win32dll)
 target_link_libraries(jscript uuid wine)
 add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
-add_pch(jscript jscript.h)
+add_pch(jscript jscript.h SOURCE)
 add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)
Index: dll/win32/jscript/lang/jscript_Sq.rc
===================================================================
--- dll/win32/jscript/lang/jscript_Sq.rc	(rÃ©vision 0)
+++ dll/win32/jscript/lang/jscript_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Piotr Caban
+ * Translation: Ardit Dani (Albanian Translation Resource File)
+ *
+ * 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
+ */
+
+#include "resource.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_TO_PRIMITIVE        "Gabim ne konvertimin e subjektit te tipit primitiv"
+    IDS_INVALID_CALL_ARG    "Procedure a pavlefshme ne thirrje apo argument"
+    IDS_CREATE_OBJ_ERROR    "Serveri i Automatizuar nuk mund te krijoje objektin"
+    IDS_NO_PROPERTY         "Objekti nuk mbeshtet kete tipar apo metode"
+    IDS_ARG_NOT_OPT         "Argumente jo opsionale"
+    IDS_SYNTAX_ERROR        "GAbim Sintaksi"
+    IDS_SEMICOLON           "Pritej ';'"
+    IDS_LBRACKET            "Pritej '('"
+    IDS_RBRACKET            "Pritej ')'"
+    IDS_UNTERMINATED_STR    "String i pambyllur konstant"
+    IDS_NOT_FUNC            "Funksioni Pritej"
+    IDS_NOT_DATE            "'[objekt]' nuk eshte nje objekt date"
+    IDS_NOT_NUM             "Numri Pritej"
+    IDS_OBJECT_EXPECTED     "Objekti Pritej"
+    IDS_ILLEGAL_ASSIGN      "Caktim  i paligjshÃ«m"
+    IDS_UNDEFINED           "'|' Ã«shtÃ« i papÃ«rcaktuar"
+    IDS_NOT_BOOL            "Objekti Boolean Pritej"
+    IDS_JSCRIPT_EXPECTED    "Objekti JScript Pritej"
+    IDS_REGEXP_SYNTAX_ERROR "Gabim sintaksti ne shprehjen e rregullt"
+    IDS_URI_INVALID_CHAR    "URI pÃ«r tu koduar pÃ«rmban shenja tÃ« pavlefshme"
+    IDS_INVALID_LENGTH      "GjatÃ«sia e njÃ« grupi duhet tÃ« jetÃ« njÃ« numÃ«r i plotÃ« pozitiv i caktuar"
+    IDS_ARRAY_EXPECTED      "Objekti Array Pritej"
+}

Modification de propriÃ©tÃ©s sur dll/win32/jscript/lang/jscript_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/netapi32/user.c
===================================================================
--- dll/win32/netapi32/user.c	(rÃ©vision 61927)
+++ dll/win32/netapi32/user.c	(copie de travail)
@@ -251,6 +251,28 @@
 
 
 static
+VOID
+ChangeUserDacl(IN PACL Dacl,
+               IN ULONG Flags)
+{
+    PACCESS_ALLOWED_ACE Ace = NULL;
+    NTSTATUS Status;
+
+    if (Dacl == NULL)
+        return;
+
+    Status = GetAllowedWorldAce(Dacl, &Ace);
+    if (!NT_SUCCESS(Status))
+        return;
+
+    if (Flags & UF_PASSWD_CANT_CHANGE)
+        Ace->Mask &= ~USER_CHANGE_PASSWORD;
+    else
+        Ace->Mask |= USER_CHANGE_PASSWORD;
+}
+
+
+static
 NET_API_STATUS
 GetUserDacl(IN SAM_HANDLE UserHandle,
             OUT PACL *Dacl)
@@ -1511,6 +1533,7 @@
     PUSER_INFO_2 UserInfo2;
     PUSER_INFO_3 UserInfo3;
     PUSER_INFO_4 UserInfo4;
+    PUSER_INFO_22 UserInfo22;
     PUSER_INFO_1003 UserInfo1003;
     PUSER_INFO_1006 UserInfo1006;
     PUSER_INFO_1007 UserInfo1007;
@@ -1527,11 +1550,20 @@
     PUSER_INFO_1051 UserInfo1051;
     PUSER_INFO_1052 UserInfo1052;
     PUSER_INFO_1053 UserInfo1053;
+    PACL Dacl = NULL;
     NET_API_STATUS ApiStatus = NERR_Success;
     NTSTATUS Status = STATUS_SUCCESS;
 
     ZeroMemory(&UserAllInfo, sizeof(USER_ALL_INFORMATION));
 
+    if ((Level == 1) || (Level == 2) || (Level == 3) ||
+        (Level == 4) || (Level == 22) || (Level == 1008))
+    {
+        ApiStatus = GetUserDacl(UserHandle, &Dacl);
+        if (ApiStatus != NERR_Success)
+            goto done;
+    }
+
     switch (Level)
     {
         case 0:
@@ -1574,6 +1606,7 @@
                 UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
             }
 
+            ChangeUserDacl(Dacl, UserInfo1->usri1_flags);
             UserAllInfo.UserAccountControl = GetAccountControl(UserInfo1->usri1_flags);
             UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
 
@@ -1616,6 +1649,7 @@
                 UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
             }
 
+            ChangeUserDacl(Dacl, UserInfo2->usri2_flags);
             UserAllInfo.UserAccountControl = GetAccountControl(UserInfo2->usri2_flags);
             UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
 
@@ -1718,6 +1752,7 @@
                 UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
             }
 
+            ChangeUserDacl(Dacl, UserInfo3->usri3_flags);
             UserAllInfo.UserAccountControl = GetAccountControl(UserInfo3->usri3_flags);
             UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
 
@@ -1842,6 +1877,7 @@
                 UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
             }
 
+            ChangeUserDacl(Dacl, UserInfo4->usri4_flags);
             UserAllInfo.UserAccountControl = GetAccountControl(UserInfo4->usri4_flags);
             UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
 
@@ -1899,8 +1935,8 @@
 
             // usri4_max_storage ignored
 
-//          UserInfo3->usri4_units_per_week;
-//          UserInfo3->usri4_logon_hours;
+//          UserInfo4->usri4_units_per_week;
+//          UserInfo4->usri4_logon_hours;
 
             // usri4_bad_pw_count ignored
             // usri4_num_logons ignored
@@ -1936,8 +1972,105 @@
             break;
 
 //        case 21:
-//        case 22:
+//            break;
 
+        case 22:
+            UserInfo22 = (PUSER_INFO_22)UserInfo;
+
+            // usri22_name ignored
+
+//          UserInfo22->usri22_password[ENCRYPTED_PWLEN];
+
+            // usri22_password_age ignored
+
+//          UserInfo3->usri3_priv;
+
+            if (UserInfo22->usri22_home_dir != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
+                                     UserInfo22->usri22_home_dir);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY;
+            }
+
+            if (UserInfo22->usri22_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.AdminComment,
+                                     UserInfo22->usri22_comment);
+                UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
+            }
+
+            ChangeUserDacl(Dacl, UserInfo22->usri22_flags);
+            UserAllInfo.UserAccountControl = GetAccountControl(UserInfo22->usri22_flags);
+            UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
+
+            if (UserInfo22->usri22_script_path != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ScriptPath,
+                                     UserInfo22->usri22_script_path);
+                UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH;
+            }
+
+//          UserInfo22->usri22_auth_flags;
+
+            if (UserInfo22->usri22_full_name != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.FullName,
+                                     UserInfo22->usri22_full_name);
+                UserAllInfo.WhichFields |= USER_ALL_FULLNAME;
+            }
+
+            if (UserInfo22->usri22_usr_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.UserComment,
+                                     UserInfo22->usri22_usr_comment);
+                UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT;
+            }
+
+            if (UserInfo22->usri22_parms != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.Parameters,
+                                     UserInfo22->usri22_parms);
+                UserAllInfo.WhichFields |= USER_ALL_PARAMETERS;
+            }
+
+            if (UserInfo22->usri22_workstations != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.WorkStations,
+                                     UserInfo22->usri22_workstations);
+                UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS;
+            }
+
+            // usri22_last_logon ignored
+            // usri22_last_logoff ignored
+
+            if (UserInfo22->usri22_acct_expires == TIMEQ_FOREVER)
+            {
+                UserAllInfo.AccountExpires.LowPart = 0;
+                UserAllInfo.AccountExpires.HighPart = 0;
+            }
+            else
+            {
+                RtlSecondsSince1970ToTime(UserInfo22->usri22_acct_expires,
+                                          &UserAllInfo.AccountExpires);
+            }
+            UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES;
+
+            // usri22_max_storage ignored
+
+//          UserInfo22->usri22_units_per_week;
+//          UserInfo22->usri22_logon_hours;
+
+            // usri22_bad_pw_count ignored
+            // usri22_num_logons ignored
+            // usri22_logon_server ignored
+
+            UserAllInfo.CountryCode = UserInfo22->usri22_country_code;
+            UserAllInfo.WhichFields |= USER_ALL_COUNTRYCODE;
+
+            UserAllInfo.CodePage = UserInfo22->usri22_code_page;
+            UserAllInfo.WhichFields |= USER_ALL_CODEPAGE;
+            break;
+
         case 1003:
             UserInfo1003 = (PUSER_INFO_1003)UserInfo;
 
@@ -1951,6 +2084,7 @@
             break;
 
 //        case 1005:
+//            break;
 
         case 1006:
             UserInfo1006 = (PUSER_INFO_1006)UserInfo;
@@ -1976,6 +2110,7 @@
 
         case 1008:
             UserInfo1008 = (PUSER_INFO_1008)UserInfo;
+            ChangeUserDacl(Dacl, UserInfo1008->usri1008_flags);
             UserAllInfo.UserAccountControl = GetAccountControl(UserInfo1008->usri1008_flags);
             UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
             break;
@@ -1992,6 +2127,7 @@
             break;
 
 //        case 1010:
+//            break;
 
         case 1011:
             UserInfo1011 = (PUSER_INFO_1011)UserInfo;
@@ -2064,6 +2200,7 @@
             break;
 
 //        case 1020:
+//            break;
 
         case 1024:
             UserInfo1024 = (PUSER_INFO_1024)UserInfo;
@@ -2124,6 +2261,9 @@
     }
 
 done:
+    if (Dacl != NULL)
+        HeapFree(GetProcessHeap(), 0, Dacl);
+
     return ApiStatus;
 }
 
@@ -2934,14 +3074,6 @@
 //    *bufptr = (LPBYTE)Buffer;
 
     return ApiStatus;
-
-#if 0
-    *bufptr = NULL;
-    *entriesread = 0;
-    *totalentries = 0;
-
-    return ERROR_INVALID_LEVEL;
-#endif
 }
 
 
@@ -3755,9 +3887,9 @@
         case 1:
         case 2:
         case 3:
-//        case 4:
+        case 4:
 //        case 21:
-//        case 22:
+        case 22:
         case 1003:
 //        case 1005:
         case 1006:
@@ -3769,8 +3901,8 @@
         case 1012:
         case 1013:
         case 1014:
-//        case 1017:
-//        case 1018:
+        case 1017:
+        case 1018:
 //        case 1020:
         case 1024:
         case 1025:
Index: dll/win32/netapi32/wksta.c
===================================================================
--- dll/win32/netapi32/wksta.c	(rÃ©vision 61927)
+++ dll/win32/netapi32/wksta.c	(copie de travail)
@@ -570,6 +570,9 @@
 {
     FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type);
 
+    if (Name == NULL || type == NULL)
+        return ERROR_INVALID_PARAMETER;
+
     *Name = NULL;
     *type = NetSetupUnknownStatus;
 
Index: dll/win32/netapi32/CMakeLists.txt
===================================================================
--- dll/win32/netapi32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/netapi32/CMakeLists.txt	(copie de travail)
@@ -20,11 +20,13 @@
     share.c
     user.c
     wksta.c
+    netapi32.h)
+
+add_library(netapi32 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
 
-add_library(netapi32 SHARED ${SOURCE})
-
 set_module_type(netapi32 win32dll)
 
 target_link_libraries(netapi32 wine)
@@ -32,6 +34,6 @@
 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll)
 
 add_delay_importlibs(netapi32 samlib secur32)
-
+add_pch(netapi32 netapi32.h SOURCE)
 add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/oleacc/lang/oleacc_Sq.rc
===================================================================
--- dll/win32/oleacc/lang/oleacc_Sq.rc	(rÃ©vision 0)
+++ dll/win32/oleacc/lang/oleacc_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,92 @@
+/*
+ * English resources for oleacc
+ *
+ * Copyright 2008 Nikolay Sivov
+ *
+ * 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
+ */
+
+#include "oleacc.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    0 "unknown object" /* undocumented */
+    ROLE_SYSTEM_TITLEBAR    "titull tabele"
+    ROLE_SYSTEM_MENUBAR     "tabele menuje"
+    ROLE_SYSTEM_SCROLLBAR   "tabele liste"
+    ROLE_SYSTEM_GRIP        "kapje"
+    ROLE_SYSTEM_SOUND       "yÃ«ri"
+    ROLE_SYSTEM_CURSOR      "kursori"
+    ROLE_SYSTEM_CARET       "shenjÃ«"
+    ROLE_SYSTEM_ALERT       "alarm"
+    ROLE_SYSTEM_WINDOW      "dritare"
+    ROLE_SYSTEM_CLIENT      "klient"
+    ROLE_SYSTEM_MENUPOPUP   "menu dales"
+    ROLE_SYSTEM_MENUITEM    "pjesÃ« menuje"
+    ROLE_SYSTEM_TOOLTIP     "maje mjeti"
+    ROLE_SYSTEM_APPLICATION "aplikacion"
+    ROLE_SYSTEM_DOCUMENT    "dokument"
+    ROLE_SYSTEM_PANE        "anÃ«"
+    ROLE_SYSTEM_CHART       "tabelÃ«"
+    ROLE_SYSTEM_DIALOG      "dialog"
+    ROLE_SYSTEM_BORDER      "kufi"
+    ROLE_SYSTEM_GROUPING    "grupim"
+    ROLE_SYSTEM_SEPARATOR   "ndarÃ«s"
+    ROLE_SYSTEM_TOOLBAR     "tabelÃ« mjeti"
+    ROLE_SYSTEM_STATUSBAR   "tabele gjÃ«ndje"
+    ROLE_SYSTEM_TABLE        "tabelÃ«"
+    ROLE_SYSTEM_COLUMNHEADER "kokÃ« kolone"
+    ROLE_SYSTEM_ROWHEADER    "kokÃ« rreshti"
+    ROLE_SYSTEM_COLUMN       "kolonÃ«"
+    ROLE_SYSTEM_ROW          "rresht"
+    ROLE_SYSTEM_CELL         "qelizÃ«"
+    ROLE_SYSTEM_LINK         "link"
+    ROLE_SYSTEM_HELPBALLOON  "ndihmÃ« tullumbace"
+    ROLE_SYSTEM_CHARACTER    "karakter"
+    ROLE_SYSTEM_LIST         "listÃ«"
+    ROLE_SYSTEM_LISTITEM     "lista artikuj"
+    ROLE_SYSTEM_OUTLINE      "plan"
+    ROLE_SYSTEM_OUTLINEITEM  "plan artikujsh"
+    ROLE_SYSTEM_PAGETAB      "tabelÃ« faqeje"
+    ROLE_SYSTEM_PROPERTYPAGE "karakteristika faqe"
+    ROLE_SYSTEM_INDICATOR    "tregues"
+    ROLE_SYSTEM_GRAPHIC      "grafike"
+    ROLE_SYSTEM_STATICTEXT   "tekst statik"
+    ROLE_SYSTEM_TEXT         "tekst"
+    ROLE_SYSTEM_PUSHBUTTON   "buton shtztje"
+    ROLE_SYSTEM_CHECKBUTTON  "buton kontrolli"
+    ROLE_SYSTEM_RADIOBUTTON  "buton radioje"
+    ROLE_SYSTEM_COMBOBOX     "kuti kombo"
+    ROLE_SYSTEM_DROPLIST     "ul poshtÃ«"
+    ROLE_SYSTEM_PROGRESSBAR  "tabelÃ« progresi"
+    ROLE_SYSTEM_DIAL         "bjeri"
+    ROLE_SYSTEM_HOTKEYFIELD  "butona tÃ« nxehtÃ«"
+    ROLE_SYSTEM_SLIDER       "tregues"
+    ROLE_SYSTEM_SPINBUTTON   "kuti sjellse"
+    ROLE_SYSTEM_DIAGRAM      "diagram"
+    ROLE_SYSTEM_ANIMATION    "animacion"
+    ROLE_SYSTEM_EQUATION     "ekuacion"
+    ROLE_SYSTEM_BUTTONDROPDOWN "buton ul poshtÃ«"
+    ROLE_SYSTEM_BUTTONMENU   "buton menuje"
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID "buton ul poshtÃ« rrjetin"
+    ROLE_SYSTEM_WHITESPACE   "hapÃ«sire bardhÃ«"
+    ROLE_SYSTEM_PAGETABLIST  "tabelÃ« liste faqeje"
+    ROLE_SYSTEM_CLOCK        "orÃ«"
+    ROLE_SYSTEM_SPLITBUTTON  "buton ndarÃ«s"
+    ROLE_SYSTEM_IPADDRESS    "adresa IP"
+    ROLE_SYSTEM_OUTLINEBUTTON "buton plani"
+}

Modification de propriÃ©tÃ©s sur dll/win32/oleacc/lang/oleacc_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/oleacc/oleacc.rc
===================================================================
--- dll/win32/oleacc/oleacc.rc	(rÃ©vision 61927)
+++ dll/win32/oleacc/oleacc.rc	(copie de travail)
@@ -68,6 +68,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/oleacc_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/oleacc_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/oleacc_Uk.rc"
 #endif
Index: dll/win32/userenv/CMakeLists.txt
===================================================================
--- dll/win32/userenv/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/userenv/CMakeLists.txt	(copie de travail)
@@ -11,13 +11,16 @@
     registry.c
     setup.c
     userenv.c
+    precomp.h)
+
+add_library(userenv SHARED
+    ${SOURCE}
     userenv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/userenv_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/userenv.def)
 
-add_library(userenv SHARED ${SOURCE})
 set_module_type(userenv win32dll)
 target_link_libraries(userenv uuid)
 add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll)
-add_pch(userenv precomp.h)
+add_pch(userenv precomp.h SOURCE)
 add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all)
Index: dll/win32/userenv/lang/sq-AL.rc
===================================================================
--- dll/win32/userenv/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/userenv/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,35 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_PROFILEPATH "%SistemDrive%\\Dokumente dhe CilÃ«sime"
+    IDS_APPDATA "Aplikation Data"
+    IDS_DESKTOP "Desktop"
+    IDS_FAVORITES "Preferuara"
+    IDS_STARTMENU "Fillo Menu"
+    IDS_PROGRAMS "Fillo Menu\\Programe"
+    IDS_ADMINTOOLS "Fillo Menu\\Programe\\Vegla Administrative"
+    IDS_STARTUP "Fillo Menu\\Programe\\Fillimi"
+    IDS_MYDOCUMENTS "Dokumentet e'mi"
+    IDS_MYPICTURES "Dokumentet e'mi\\Fotot e'mia"
+    IDS_MYMUSIC "Dokumentet e'mi\\Muzika Ime"
+    IDS_MYVIDEOS "Dokumentet e'mi\\Vidoe e'mi"
+    IDS_TEMPLATES "Shabllone"
+    IDS_RECENT "Fundit"
+    IDS_SENDTO "DÃ«rguarTe"
+    IDS_PRINTHOOD "PrintoKapuÃ§"
+    IDS_NETHOOD "NetKapuÃ§"
+    IDS_LOCALSETTINGS "CilÃ«simet lokale"
+    IDS_LOCALAPPDATA "CilÃ«simet lokale\\Aplikacion Data"
+    IDS_TEMP "CilÃ«simet lokale\\PÃ«rk"
+    IDS_CACHE "CilÃ«simet lokale\\Dokumente Interneti PÃ«rkohshÃ«m"
+    IDS_HISTORY "CilÃ«simet lokale\\Historia"
+    IDS_COOKIES "Biskota"
+    IDS_PROGRAMFILES "%SystemDrive%\\Dokumente Programi"
+    IDS_COMMONFILES "Dokumente ZakonshÃ«m"
+END

Modification de propriÃ©tÃ©s sur dll/win32/userenv/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/userenv/userenv.rc
===================================================================
--- dll/win32/userenv/userenv.rc	(rÃ©vision 61927)
+++ dll/win32/userenv/userenv.rc	(copie de travail)
@@ -105,6 +105,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/win32/userenv/precomp.h
===================================================================
--- dll/win32/userenv/precomp.h	(rÃ©vision 61927)
+++ dll/win32/userenv/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _USERENV_PCH_
+#define _USERENV_PCH_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -14,3 +17,5 @@
 #include <userenv.h>
 
 #include "internal.h"
+
+#endif /* _USERENV_PCH_ */
Index: dll/win32/msafd/CMakeLists.txt
===================================================================
--- dll/win32/msafd/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msafd/CMakeLists.txt	(copie de travail)
@@ -7,18 +7,20 @@
 spec2def(msafd.dll msafd.spec)
 
 list(APPEND SOURCE
-    msafd.rc
     misc/dllmain.c
     misc/event.c
     misc/helpers.c
     misc/sndrcv.c
     misc/stubs.c
+    msafd.h)
+
+add_library(msafd SHARED
+    ${SOURCE}
+    msafd.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
 
-add_library(msafd SHARED ${SOURCE})
-
 set_module_type(msafd win32dll UNICODE)
 
 add_importlibs(msafd advapi32 msvcrt kernel32 ntdll)
-add_pch(msafd msafd.h)
+add_pch(msafd msafd.h SOURCE)
 add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all)
Index: dll/win32/mapi32/lang/Sq.rc
===================================================================
--- dll/win32/mapi32/lang/Sq.rc	(rÃ©vision 0)
+++ dll/win32/mapi32/lang/Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,30 @@
+/*
+* MAPI32 English resources
+*
+* Copyright 2009 Owen Rudge for CodeWeavers
+*
+* 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
+*
+*
+*
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "DÃ«rgimi mail-it dÃ«shtoi se ju nuk keni njÃ« klient email Mapi tÃ«instaluar."
+   IDS_SEND_MAIL, "DÃ«rgo Mail"
+}

Modification de propriÃ©tÃ©s sur dll/win32/mapi32/lang/Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/mapi32/version.rc
===================================================================
--- dll/win32/mapi32/version.rc	(rÃ©vision 61927)
+++ dll/win32/mapi32/version.rc	(copie de travail)
@@ -83,6 +83,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/Uk.rc"
 #endif
Index: dll/win32/mapi32/CMakeLists.txt
===================================================================
--- dll/win32/mapi32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mapi32/CMakeLists.txt	(copie de travail)
@@ -8,14 +8,19 @@
     mapi32_main.c
     prop.c
     sendmail.c
+    stubs.c
     util.c
-    stubs.c
+    precomp.h)
+
+add_library(mapi32 SHARED
+    ${SOURCE}
     guid.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def)
 
-add_library(mapi32 SHARED ${SOURCE} version.rc)
 set_module_type(mapi32 win32dll)
 target_link_libraries(mapi32 uuid wine)
 add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(mapi32 precomp.h SOURCE)
 add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/vbscript/CMakeLists.txt
===================================================================
--- dll/win32/vbscript/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/vbscript/CMakeLists.txt	(copie de travail)
@@ -15,7 +15,7 @@
     vbregexp.c
     vbscript.c
     vbscript_main.c
-    ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
+    vbscript.h)
 
 list(APPEND vbscript_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/vbscript_classes.rgs
@@ -29,9 +29,15 @@
 set_source_files_properties(vbscript.rc PROPERTIES OBJECT_DEPENDS "${vbscript_rc_deps}")
 add_idl_headers(vbscript_idlheader vbscript_classes.idl vbsglobal.idl vbsregexp55.idl)
 add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl)
-add_library(vbscript SHARED ${SOURCE} vbscript.rc)
+
+add_library(vbscript SHARED
+    ${SOURCE}
+    vbscript.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
+
 set_module_type(vbscript win32dll)
 target_link_libraries(vbscript uuid wine)
 add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_dependencies(vbscript vbscript_idlheader stdole2)
+add_pch(vbscript vbscript.h SOURCE)
 add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all)
Index: dll/win32/vbscript/vbscript.h
===================================================================
--- dll/win32/vbscript/vbscript.h	(rÃ©vision 61927)
+++ dll/win32/vbscript/vbscript.h	(copie de travail)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _VBSCRIPT_H
+#define _VBSCRIPT_H
+
 #include <assert.h>
 #include <stdarg.h>
 
@@ -418,3 +421,5 @@
 #include "parse.h"
 #include "regexp.h"
 #include "vbscript_defs.h"
+
+#endif /* _VBSCRIPT_H */
Index: dll/win32/msimtf/CMakeLists.txt
===================================================================
--- dll/win32/msimtf/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msimtf/CMakeLists.txt	(copie de travail)
@@ -6,11 +6,16 @@
 list(APPEND SOURCE
     activeimmapp.c
     main.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c)
+
+add_library(msimtf SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
 
-add_library(msimtf SHARED ${SOURCE} rsrc.rc)
 set_module_type(msimtf win32dll)
 target_link_libraries(msimtf uuid wine)
 add_importlibs(msimtf imm32 msvcrt kernel32 ntdll)
+add_pch(msimtf precomp.h SOURCE)
 add_cd_file(TARGET msimtf DESTINATION reactos/system32 FOR all)
Index: dll/win32/browseui/internettoolbar.cpp
===================================================================
--- dll/win32/browseui/internettoolbar.cpp	(rÃ©vision 61927)
+++ dll/win32/browseui/internettoolbar.cpp	(copie de travail)
@@ -25,6 +25,8 @@
 
 #include "precomp.h"
 
+#define USE_CUSTOM_MENUBAND 1
+
 // navigation controls and menubar just send a message to parent window
 /*
 TODO:
@@ -67,6 +69,8 @@
 extern HRESULT CreateBandProxy(REFIID riid, void **ppv);
 extern HRESULT CreateAddressBand(REFIID riid, void **ppv);
 
+typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);
+
 class CInternetToolbar;
 
 class CDockSite :
@@ -321,15 +325,10 @@
 
 HRESULT STDMETHODCALLTYPE CDockSite::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
 {
-    CComPtr<IServiceProvider>               serviceProvider;
-    HRESULT                                 hResult;
-
     if (IsEqualIID(guidService, SID_SMenuBandParent))
         return this->QueryInterface(riid, ppvObject);
-    hResult = fToolbar->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider));
-    if (FAILED(hResult))
-        return hResult;
-    return serviceProvider->QueryService(guidService, riid, ppvObject);
+
+    return fToolbar->QueryService(guidService, riid, ppvObject);
 }
 
 CMenuCallback::CMenuCallback()
@@ -372,8 +371,23 @@
         favoritesHMenu = GetSubMenu(parentHMenu, 3);
         if (favoritesHMenu == NULL)
             return E_FAIL;
+#if USE_CUSTOM_MENUBAND
+        HMODULE hrs = LoadLibrary(L"rshell.dll");
+
+        PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor");
+        if (func)
+        {
+            hResult = func(IID_PPV_ARG(IShellMenu, &newMenu));
+        }
+        else
+        {
+            hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER,
+                IID_IShellMenu, reinterpret_cast<void **>(&newMenu));
+        }
+#else
         hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER,
             IID_IShellMenu, reinterpret_cast<void **>(&newMenu));
+#endif
         if (FAILED(hResult))
             return hResult;
         hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED);
@@ -536,8 +550,35 @@
     HWND                                    ownerWindow;
     HRESULT                                 hResult;
 
+#if USE_CUSTOM_MENUBAND
+    HMODULE hrs = LoadLibraryW(L"rshell.dll");
+
+    if (!hrs)
+    {
+        DbgPrint("Failed: %d\n", GetLastError());
+        return E_FAIL;
+    }
+
+    PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor");
+    if (func)
+    {
+        hResult = func(IID_PPV_ARG(IShellMenu, menuBar));
+    }
+    else
+    {
+        DbgPrint("Failed: %d\n", GetLastError());
+        hResult = E_FAIL;
+    }
+    
+    if (FAILED(hResult))
+    {
+        hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER,
+            IID_IShellMenu, reinterpret_cast<void **>(menuBar));
+    }
+#else
     hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER,
         IID_IShellMenu, reinterpret_cast<void **>(menuBar));
+#endif
     if (FAILED(hResult))
         return hResult;
     hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback));
@@ -776,7 +817,7 @@
 HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew()
 {
     CComPtr<IShellMenu>                     menuBar;
-    CComPtr<IUnknown>                       logoBar;
+    //CComPtr<IUnknown>                       logoBar;
     CComPtr<IUnknown>                       toolsBar;
     CComPtr<IUnknown>                       navigationBar;
     CComPtr<IOleWindow>                     menuOleWindow;
@@ -794,6 +835,7 @@
     hResult = menuOleWindow->GetWindow(&fMenuBandWindow);
     fMenuBar.Attach(menuBar.Detach());                  // transfer the ref count
 
+    /* FIXME
     hResult = CreateBrandBand(&logoBar);
     if (FAILED(hResult))
         return hResult;
@@ -800,6 +842,7 @@
     AddDockItem(logoBar, ITBBID_BRANDBAND,
         CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE);
     fLogoBar.Attach(logoBar.Detach());                  // transfer the ref count
+    */
 
     hResult = CreateToolsBar(&toolsBar);
     if (FAILED(hResult))
@@ -1125,10 +1168,7 @@
         }
         return fBandProxy->QueryInterface(riid, ppvObject);
     }
-    hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider));
-    if (FAILED(hResult))
-        return hResult;
-    return serviceProvider->QueryService(guidService, riid, ppvObject);
+    return IUnknown_QueryService(fSite, guidService, riid, ppvObject);
 }
 
 HRESULT STDMETHODCALLTYPE CInternetToolbar::OnWinEvent(
@@ -1137,12 +1177,16 @@
     CComPtr<IWinEventHandler>               menuWinEventHandler;
     HRESULT                                 hResult;
 
-    if (fMenuBar.p != NULL)
+    if (fMenuBar)
     {
         hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler));
-        return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult);
+        if (menuWinEventHandler->IsWindowOwner(hWnd))
+        {
+            return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult);
+        }
     }
-    return E_FAIL;
+
+    return S_FALSE;
 }
 
 HRESULT STDMETHODCALLTYPE CInternetToolbar::IsWindowOwner(HWND hWnd)
@@ -1167,8 +1211,8 @@
         return E_POINTER;
     if (dwBandID == ITBBID_MENUBAND && fMenuBar.p != NULL)
         return fMenuBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb));
-    if (dwBandID == ITBBID_BRANDBAND && fLogoBar.p != NULL)
-        return fLogoBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb));
+    //if (dwBandID == ITBBID_BRANDBAND && fLogoBar.p != NULL)
+    //    return fLogoBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb));
     *ppstb = NULL;
     return E_FAIL;
 }
@@ -1410,20 +1454,6 @@
     return 1;
 }
 
-LRESULT CInternetToolbar::OnNavigateCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
-{
-    CComPtr<IWinEventHandler>               winEventHandler;
-    LRESULT                                 theResult;
-    HRESULT                                 hResult;
-
-    hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler));
-    hResult = winEventHandler->OnWinEvent(m_hWnd, uMsg, wParam, lParam, &theResult);
-    if (SUCCEEDED(hResult))
-        return theResult;
-    bHandled = FALSE;
-    return 0;
-}
-
 LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     HMENU                                   contextMenuBar;
@@ -1553,27 +1583,78 @@
     return 0;
 }
 
+LRESULT CInternetToolbar::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+    LRESULT theResult;
+    HRESULT hResult;
+    HWND    target = (HWND) lParam;
+
+    if (fMenuBar)
+    {
+        CComPtr<IWinEventHandler> menuWinEventHandler;
+        hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler));
+        if (SUCCEEDED(hResult))
+        {
+            if (menuWinEventHandler->IsWindowOwner(target) == S_OK)
+            {
+                hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult);
+                return FAILED(hResult) ? 0 : theResult;
+            }
+        }
+    }
+
+    if (fNavigationBar)
+    {
+        CComPtr<IWinEventHandler> menuWinEventHandler;
+        hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler));
+        if (SUCCEEDED(hResult))
+        {
+            if (menuWinEventHandler->IsWindowOwner(target) == S_OK)
+            {
+                hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult);
+                return FAILED(hResult) ? 0 : theResult;
+            }
+        }
+    }
+
+    return 0;
+}
 LRESULT CInternetToolbar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
-    NMHDR                                   *notifyHeader;
-    CComPtr<IWinEventHandler>               menuWinEventHandler;
-    LRESULT                                 theResult;
-    HRESULT                                 hResult;
+    NMHDR   *notifyHeader;
+    LRESULT theResult;
+    HRESULT hResult;
 
-    notifyHeader = (NMHDR *)lParam;
-    if (fMenuBar.p != NULL && notifyHeader->hwndFrom == fMenuBandWindow)
+    notifyHeader = (NMHDR *) lParam;
+
+    if (fMenuBar)
     {
+        CComPtr<IWinEventHandler> menuWinEventHandler;
         hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler));
-        hResult = menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, &theResult);
-        return theResult;
+        if (SUCCEEDED(hResult))
+        {
+            if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK)
+            {
+                hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult);
+                return FAILED(hResult) ? 0 : theResult;
+            }
+        }
     }
-    if (fNavigationBar.p != NULL && notifyHeader->hwndFrom == fNavigationWindow)
+
+    if (fNavigationBar)
     {
-        hResult = fNavigationBar->QueryInterface(
-            IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler));
-        hResult = menuWinEventHandler->OnWinEvent(m_hWnd, uMsg, wParam, lParam, &theResult);
-        return theResult;
+        CComPtr<IWinEventHandler> menuWinEventHandler;
+        hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler));
+        if (SUCCEEDED(hResult))
+        {
+            if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK)
+            {
+                hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult);
+                return FAILED(hResult) ? 0 : theResult;
+            }
+        }
     }
+
     return 0;
 }
 
Index: dll/win32/browseui/shellbrowser.cpp
===================================================================
--- dll/win32/browseui/shellbrowser.cpp	(rÃ©vision 61927)
+++ dll/win32/browseui/shellbrowser.cpp	(copie de travail)
@@ -814,29 +814,6 @@
 
     ShowWindow(SW_SHOWNORMAL);
 
-
-    // test code to make brand band animate
-    {
-        CComPtr<IOleCommandTarget>              oleCommandTarget;
-        CComPtr<IServiceProvider>               serviceProvider;
-        CComPtr<IBandSite>                      bandSite;
-        CComPtr<IDeskBand>                      deskBand;
-        CComPtr<IWinEventHandler>               winEventHandler;
-        HRESULT                                 hResult;
-
-        if (fClientBars[BIInternetToolbar].clientBar.p == NULL)
-            return 0;
-        hResult = fClientBars[BIInternetToolbar].clientBar->
-            QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider));
-        hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, reinterpret_cast<void **>(&bandSite));
-        hResult = bandSite->QueryBand(5, &deskBand, NULL, NULL, 0);
-        deskBand->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler));
-        winEventHandler->IsWindowOwner(NULL);
-        deskBand->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget));
-        oleCommandTarget->QueryStatus(&CGID_BrandCmdGroup, 0, NULL, NULL);
-        oleCommandTarget->Exec(&CGID_BrandCmdGroup, BBID_STARTANIMATION, 0, NULL, NULL);
-    }
-
     return S_OK;
 }
 
@@ -1971,6 +1948,8 @@
         return this->QueryInterface(riid, ppvObject);
     if (IsEqualIID(guidService, SID_IExplorerToolbar))
         return fClientBars[BIInternetToolbar].clientBar->QueryInterface(riid, ppvObject);
+    if (IsEqualIID(riid, IID_IShellBrowser))
+        return this->QueryInterface(riid, ppvObject);
     return E_NOINTERFACE;
 }
 
@@ -3254,6 +3233,9 @@
 
             TranslateMessage(&Msg);
             DispatchMessage(&Msg);
+
+            if (Msg.message == WM_QUIT)
+                break;
         }
     }
 }
Index: dll/win32/browseui/CMakeLists.txt
===================================================================
--- dll/win32/browseui/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/browseui/CMakeLists.txt	(copie de travail)
@@ -1,3 +1,4 @@
+PROJECT(SHELL)
 
 set_cpp(WITH_RUNTIME)
 
@@ -28,12 +29,13 @@
     toolsband.cpp
     travellog.cpp
     utility.cpp
-    dllinstall.c
-    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
+    precomp.h)
 
 add_library(browseui SHARED
     ${SOURCE}
-    browseui.rc)
+    dllinstall.c
+    browseui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
 
 set_module_type(browseui win32dll UNICODE)
 
@@ -55,5 +57,17 @@
     kernel32
     ntdll)
 
-add_pch(browseui precomp.h)
+add_pch(browseui precomp.h SOURCE)
 add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all)
+
+add_custom_command(TARGET browseui POST_BUILD 
+  COMMAND "${CMAKE_COMMAND}" -E copy 
+     "$<TARGET_FILE:browseui>"
+     "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" 
+  COMMENT "Copying to output directory")
+
+add_custom_command(TARGET browseui POST_BUILD 
+  COMMAND "${CMAKE_COMMAND}" -E copy 
+     "$<TARGET_FILE:browseui>"
+     "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" 
+  COMMENT "Copying to output directory")
Index: dll/win32/browseui/lang/de-DE.rc
===================================================================
--- dll/win32/browseui/lang/de-DE.rc	(rÃ©vision 0)
+++ dll/win32/browseui/lang/de-DE.rc	(rÃ©vision 62573)
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2009 Andrew Hill
+ *
+ * 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
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+/* Menus */
+
+IDM_CABINET_CONTEXTMENU MENUEX
+BEGIN
+    POPUP "", 264,MFT_STRING,MFS_ENABLED
+    BEGIN
+        MENUITEM "&StandardschaltflÃ¤chen", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Adressleiste", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Links", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "S&ymbolleisten fixieren", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Anpassen...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Text Labels", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Go Button", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED
+    END
+END
+
+IDM_CABINET_MAINMENU MENUEX
+BEGIN
+    POPUP "&Datei", FCIDM_MENU_FILE
+    BEGIN
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "&SchlieÃŸen", IDM_FILE_CLOSE
+    END
+    POPUP "&Bearbeiten", FCIDM_MENU_EDIT
+    BEGIN
+        MENUITEM "", -1, MFT_SEPARATOR
+    END
+    POPUP "&Ansicht", FCIDM_MENU_VIEW
+    BEGIN
+        POPUP "&Symbolleisten", IDM_VIEW_TOOLBARS
+        BEGIN
+            MENUITEM "", -1, MFT_SEPARATOR
+        END
+        MENUITEM "S&tatusleiste", IDM_VIEW_STATUSBAR
+        POPUP "&Explorerleiste", IDM_VIEW_EXPLORERBAR
+        BEGIN
+            MENUITEM "Su&chen\tCtrl+E", IDM_EXPLORERBAR_SEARCH
+            MENUITEM "&Favoriten\tCtrl+I", IDM_EXPLORERBAR_FAVORITES
+            MENUITEM "&Media", IDM_EXPLORERBAR_MEDIA
+            MENUITEM "&Verlauf\tCtrl+H", IDM_EXPLORERBAR_HISTORY
+            MENUITEM "F&olders", IDM_EXPLORERBAR_FOLDERS
+            MENUITEM "", IDM_EXPLORERBAR_SEPARATOR
+        END
+        MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR
+        POPUP "&Wechseln zu", FCIDM_MENU_EXPLORE
+        BEGIN
+            MENUITEM "&ZurÃ¼ck\tAlt+Left Arrow", IDM_GOTO_BACK
+            MENUITEM "&VorwÃ¤rts\tAlt+Right Arrow", IDM_GOTO_FORWARD
+            MENUITEM "Ãœ&bergeordneter Ordner", IDM_GOTO_UPONELEVEL
+            MENUITEM "", -1, MFT_SEPARATOR
+            MENUITEM "&Startseite\tAlt+Home", IDM_GOTO_HOMEPAGE
+        END
+        MENUITEM "&Aktualisieren", IDM_VIEW_REFRESH
+    END
+    POPUP "F&avoriten", FCIDM_MENU_FAVORITES
+    BEGIN
+        MENUITEM "&Zu Favoriten hinzufÃ¼gen...", IDM_FAVORITES_ADDTOFAVORITES
+        MENUITEM "Fav&oriten verwalten...", IDM_FAVORITES_ORGANIZEFAVORITES
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "(Leer)", IDM_FAVORITES_EMPTY
+    END
+    POPUP "E&xtras", FCIDM_MENU_TOOLS
+    BEGIN
+        MENUITEM "&Netzlaufwerk verbinden...", IDM_TOOLS_MAPNETWORKDRIVE
+        MENUITEM "Netzlaufwerk &trennen...", IDM_TOOLS_DISCONNECTNETWORKDRIVE
+        MENUITEM "&Synchronisieren...", IDM_TOOLS_SYNCHRONIZE
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "&Ordneroptionen...", IDM_TOOLS_FOLDEROPTIONS
+    END
+    POPUP "&?", FCIDM_MENU_HELP
+    BEGIN
+        MENUITEM "Ist diese Kopie von ReactOS &legal?", IDM_HELP_ISTHISCOPYLEGAL
+        MENUITEM "Ãœ&ber ReactOS", IDM_HELP_ABOUT
+    END
+END
+
+/* Dialogs */
+
+IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    LTEXT "Te&xt Optionen:", -1, 4, 2, 48, 15
+    COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ico&n Optionen:", -1, 4, 20, 48, 15
+    COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+/* Accelerators */
+
+IDR_ACCELERATORS ACCELERATORS
+BEGIN
+    VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT
+    "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT
+    VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT
+    "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT
+    "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT
+    VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT
+    VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT
+    "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT
+    "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT
+    "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT
+    "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT
+END
+
+/* Strings */
+
+STRINGTABLE
+BEGIN
+    800 "Contains commands for manipulating the selected items."
+END
+
+STRINGTABLE
+BEGIN
+    864 "Contains edit commands."
+END
+
+STRINGTABLE
+BEGIN
+    928 "Contains commands for manipulating the view."
+END
+
+STRINGTABLE
+BEGIN
+    992 "Contains tools commands."
+END
+
+STRINGTABLE
+BEGIN
+    1056 "Contains commands for displaying Help."
+END
+
+STRINGTABLE
+BEGIN
+    9025 "Closes the window."
+    9026 "Goes up one level."
+END
+
+STRINGTABLE
+BEGIN
+    9121 "Connects to a network drive."
+    9122 "Disconnects from a network drive."
+END
+
+STRINGTABLE
+BEGIN
+    9250 "Displays program information, version number, and copyright."
+    9252 "Displays information for debugging."
+END
+
+STRINGTABLE
+BEGIN
+    9281 "Goes to the previous page."
+    9282 "Goes to the next page."
+    9283 "Enables you to change settings."
+    9285 "Goes to your home page."
+END
+
+STRINGTABLE
+BEGIN
+    9362 "Opens the Favorites folder."
+    9363 "Adds the current page to your Favorites list."
+END
+
+STRINGTABLE
+BEGIN
+    9505 "Shows or hides toolbars."
+    9506 "Shows or hides the status bar."
+    9508 "Displays the Standard Buttons toolbar."
+    9509 "Displays the Address bar."
+    9510 "Displays the Quick Links bar."
+    9516 "Locks the sizes and positions of the toolbars."
+END
+
+STRINGTABLE
+BEGIN
+    9533 "Customizes the toolbar."
+END
+
+STRINGTABLE
+BEGIN
+    9552 "Shows or hides an Explorer bar."
+    9553 "Shows the Search bar."
+    9554 "Shows the Favorites bar."
+    9555 "Shows the History bar."
+    9557 "Shows the Folders bar."
+    9559 "Shows the Media Bar."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SMALLICONS "Kleine Symbole"
+    IDS_LARGEICONS "GroÃŸe Symbole"
+    IDS_SHOWTEXTLABELS "Show text labels"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_NOTEXTLABELS "No text labels"
+    IDS_SELECTIVETEXTONRIGHT "Selective text on right"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_GOBUTTONLABEL "|Wechseln zu||"
+    IDS_GOBUTTONTIPTEMPLATE "Wechseln zu ""%s"""
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCHLABEL "Suchen"
+    IDS_ADDRESSBANDLABEL "A&dresse"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_FOLDERSLABEL "Ordner"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_HISTORYTEXT "&Verlauf\tCtrl+H"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_UP "AufwÃ¤rts"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_BACK "ZurÃ¼ck"
+    IDS_FORWARD "VorwÃ¤rts"
+END

Modification de propriÃ©tÃ©s sur dll/win32/browseui/lang/de-DE.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/browseui/lang/sq-AL.rc
===================================================================
--- dll/win32/browseui/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/browseui/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2009 Andrew Hill
+ * Translator: Ardit Dani : 2013 
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+/* Menus */
+
+IDM_CABINET_CONTEXTMENU MENUEX
+BEGIN
+    POPUP "", 264,MFT_STRING,MFS_ENABLED
+    BEGIN
+        MENUITEM "&Butona Standart", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Bari i Adreses", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Linqe", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "Kyq Tool&barin", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Rregulloje...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Etiketa", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED
+        MENUITEM "&Go Button", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED
+    END
+END
+
+IDM_CABINET_MAINMENU MENUEX
+BEGIN
+    POPUP "&File", FCIDM_MENU_FILE
+    BEGIN
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "&Mbyll", IDM_FILE_CLOSE
+    END
+    POPUP "&Edit", FCIDM_MENU_EDIT
+    BEGIN
+        MENUITEM "", -1, MFT_SEPARATOR
+    END
+    POPUP "&Modifiko", FCIDM_MENU_VIEW
+    BEGIN
+        POPUP "&Toolbari", IDM_VIEW_TOOLBARS
+        BEGIN
+            MENUITEM "", -1, MFT_SEPARATOR
+        END
+        MENUITEM "Statusi &Bar", IDM_VIEW_STATUSBAR
+        POPUP "&Explorer Bar", IDM_VIEW_EXPLORERBAR
+        BEGIN
+            MENUITEM "&Kerko\tCtrl+E", IDM_EXPLORERBAR_SEARCH
+            MENUITEM "&Te'pre&feruara\tCtrl+I", IDM_EXPLORERBAR_FAVORITES
+            MENUITEM "&Media", IDM_EXPLORERBAR_MEDIA
+            MENUITEM "&Histori\tCtrl+H", IDM_EXPLORERBAR_HISTORY
+            MENUITEM "D&osje", IDM_EXPLORERBAR_FOLDERS
+            MENUITEM "", IDM_EXPLORERBAR_SEPARATOR
+        END
+        MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR
+        POPUP "Shko tek", FCIDM_MENU_EXPLORE
+        BEGIN
+            MENUITEM "&Mbrapa\tAlt+Left Arrow", IDM_GOTO_BACK
+            MENUITEM "&Para\tAlt+Right Arrow", IDM_GOTO_FORWARD
+            MENUITEM "Lart nje nivel", IDM_GOTO_UPONELEVEL
+            MENUITEM "", -1, MFT_SEPARATOR
+            MENUITEM "&Faqja e pare\tAlt+Home", IDM_GOTO_HOMEPAGE
+        END
+        MENUITEM "&Rifresko", IDM_VIEW_REFRESH
+    END
+    POPUP "Te'pre&feruara", FCIDM_MENU_FAVORITES
+    BEGIN
+        MENUITEM "Shto te preferuar...", IDM_FAVORITES_ADDTOFAVORITES
+        MENUITEM "&Organizo te preferuara...", IDM_FAVORITES_ORGANIZEFAVORITES
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "(Bosh)", IDM_FAVORITES_EMPTY
+    END
+    POPUP "Vegla&t", FCIDM_MENU_TOOLS
+    BEGIN
+        MENUITEM "Mapo Driverin e rrejetit...", IDM_TOOLS_MAPNETWORKDRIVE
+        MENUITEM "Shkeput Driverin e rrjetit...", IDM_TOOLS_DISCONNECTNETWORKDRIVE
+        MENUITEM "&Sinkronizo...", IDM_TOOLS_SYNCHRONIZE
+        MENUITEM "", -1, MFT_SEPARATOR
+        MENUITEM "Dosja &Opsione...", IDM_TOOLS_FOLDEROPTIONS
+    END
+    POPUP "&NdihmÃ«", FCIDM_MENU_HELP
+    BEGIN
+        MENUITEM "A eshte kjo kopje e ReactOS e &ligjshme?", IDM_HELP_ISTHISCOPYLEGAL
+        MENUITEM "&Rreth ReactOS", IDM_HELP_ABOUT
+    END
+END
+
+/* Dialogs */
+
+IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    LTEXT "Opsionet e Te&xtit:", -1, 4, 2, 48, 15
+    COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Opsionet e Iko&nave:", -1, 4, 20, 48, 15
+    COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+/* Accelerators */
+
+IDR_ACCELERATORS ACCELERATORS
+BEGIN
+    VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT
+    "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT
+    VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT
+    "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT
+    "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT
+    VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT
+    VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT
+    "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT
+    "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT
+    "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT
+    "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT
+END
+
+/* Strings */
+
+STRINGTABLE
+BEGIN
+    800 "Permban komanda per te manipuluar sendet e perzgjedhura."
+END
+
+STRINGTABLE
+BEGIN
+    864 "Permban komanda konfigurimi."
+END
+
+STRINGTABLE
+BEGIN
+    928 "Permban komanda per te manipuluar veshgimin."
+END
+
+STRINGTABLE
+BEGIN
+    992 "Permban komanda te veglave."
+END
+
+STRINGTABLE
+BEGIN
+    1056 "Permban komanda per ndihmen."
+END
+
+STRINGTABLE
+BEGIN
+    9025 "Mbyll dritaren."
+    9026 "Shkon lart nje nivel."
+END
+
+STRINGTABLE
+BEGIN
+    9121 "Lidhet me driverin e rrjetit."
+    9122 "Shkeputet nga driveri i rrjetit."
+END
+
+STRINGTABLE
+BEGIN
+    9250 "Shfaq informacionet e programit, numrin e versionit, dhe te drejtat."
+    9252 "Shfaq informacionet e debugging."
+END
+
+STRINGTABLE
+BEGIN
+    9281 "Shko tek faqja e meparshme."
+    9282 "Sko tek faqja pasardhese."
+    9283 "Lejon ndryshimet e konfigurimeve."
+    9285 "Shko tek faqja kryesore."
+END
+
+STRINGTABLE
+BEGIN
+    9362 "Hap dosjen e te preferuarave."
+    9363 "Shton faqen aktuale te lista e te preferuarave."
+END
+
+STRINGTABLE
+BEGIN
+    9505 "Shfaq ose fsheh toolbarin."
+    9506 "Shfaq ose fsheh barin e statusit."
+    9508 "Shfaq Butonat Standard te toolbarit."
+    9509 "Shfaq Adresen e barit."
+    9510 "Shfaq barin e shpejte te Linqeve."
+    9516 "Kyq masen dhe pozicionin e toolbarit."
+END
+
+STRINGTABLE
+BEGIN
+    9533 "Modifiko toolbarin."
+END
+
+STRINGTABLE
+BEGIN
+    9552 "Shfaq ose fsheh nje Explorer bar."
+    9553 "Shfaq barin e kerkimit."
+    9554 "Shfaq barin e te preferuarave."
+    9555 "Shfaq barin e historise."
+    9557 "Shfaq barin e dosjeve."
+    9559 "Shfaq barin e Media."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SMALLICONS "Ikona te vogla"
+    IDS_LARGEICONS "Ikona te medha"
+    IDS_SHOWTEXTLABELS "Shfaq tekstin e etiketes"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_NOTEXTLABELS "Ska tekst etikete"
+    IDS_SELECTIVETEXTONRIGHT "Perzgjedh tekstin ne te djathte"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_GOBUTTONLABEL "|Shko||"
+    IDS_GOBUTTONTIPTEMPLATE "Shko tek ""%s"""
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCHLABEL "Kerko"
+    IDS_ADDRESSBANDLABEL "A&dresa"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_FOLDERSLABEL "Dosje"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_HISTORYTEXT "&Histori\tCtrl+H"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_UP "Lart"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_BACK "Mrapa"
+    IDS_FORWARD "Perpara"
+END

Modification de propriÃ©tÃ©s sur dll/win32/browseui/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/browseui/precomp.h
===================================================================
--- dll/win32/browseui/precomp.h	(rÃ©vision 61927)
+++ dll/win32/browseui/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _BROWSEUI_PCH_
+#define _BROWSEUI_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -35,5 +38,50 @@
 #include "commonbrowser.h"
 #include "globalfoldersettings.h"
 #include "regtreeoptions.h"
+#include <stdio.h>
 
+static __inline ULONG
+Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
+{
+    char szMsg[512];
+    char *szMsgStart;
+    const char *fname;
+    va_list vl;
+    ULONG uRet;
+
+    fname = strrchr(filename, '\\');
+    if (fname == NULL)
+    {
+        fname = strrchr(filename, '/');
+        if (fname != NULL)
+            fname++;
+    }
+    else
+        fname++;
+
+    if (fname == NULL)
+        fname = filename;
+
+    szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line);
+
+    va_start(vl, lpFormat);
+    uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl);
+    va_end(vl);
+
+    OutputDebugStringA(szMsg);
+
+    return uRet;
+}
+
+#define DbgPrint(fmt, ...) \
+    Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
+
+#if 1
+#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (DbgPrint("Unexpected failure %08x.\n", hr), TRUE))
+#else
+#define FAILED_UNEXPECTEDLY(hr) FAILED(hr)
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(browseui);
+
+#endif /* _BROWSEUI_PCH_ */
Index: dll/win32/browseui/addressband.cpp
===================================================================
--- dll/win32/browseui/addressband.cpp	(rÃ©vision 61927)
+++ dll/win32/browseui/addressband.cpp	(copie de travail)
@@ -311,10 +311,14 @@
     CComPtr<IWinEventHandler>               winEventHandler;
     HRESULT                                 hResult;
 
-    hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler));
-    if (FAILED(hResult))
-        return hResult;
-    return winEventHandler->IsWindowOwner(hWnd);
+    if (fAddressEditBox)
+    {
+        hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler));
+        if (FAILED(hResult))
+            return hResult;
+        return winEventHandler->IsWindowOwner(hWnd);
+    }
+    return S_FALSE;
 }
 
 HRESULT STDMETHODCALLTYPE CAddressBand::FileSysChange(long param8, long paramC)
Index: dll/win32/browseui/internettoolbar.h
===================================================================
--- dll/win32/browseui/internettoolbar.h	(rÃ©vision 61927)
+++ dll/win32/browseui/internettoolbar.h	(copie de travail)
@@ -87,7 +87,7 @@
     CComPtr<IShellMenu>                     fMenuBar;           // the menu rebar
     HWND                                    fMenuBandWindow;
     HWND                                    fNavigationWindow;
-    CComPtr<IUnknown>                       fLogoBar;           // the reactos logo
+    //CComPtr<IUnknown>                       fLogoBar;           // the reactos logo
     CComPtr<IUnknown>                       fControlsBar;       // navigation controls
     CComPtr<IUnknown>                       fNavigationBar;     // address bar
     CComObject<CMenuCallback>               fMenuCallback;
@@ -196,6 +196,7 @@
     LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
     LRESULT OnSetCursor(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
     LRESULT OnTipText(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled);
+    LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
     LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 
     BEGIN_MSG_MAP(CInternetToolbar)
@@ -208,7 +209,7 @@
         NOTIFY_HANDLER(0, TBN_DROPDOWN, OnMenuDropDown)
         NOTIFY_HANDLER(0, TBN_QUERYINSERT, OnQueryInsert)
         NOTIFY_HANDLER(0, TBN_QUERYDELETE, OnQueryDelete)
-        MESSAGE_HANDLER(WM_COMMAND, OnNavigateCommand)
+        MESSAGE_HANDLER(WM_COMMAND, OnCommand)
         MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu)
         MESSAGE_HANDLER(WM_SIZE, OnSize)
         MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor)
Index: dll/win32/browseui/browseui.rc
===================================================================
--- dll/win32/browseui/browseui.rc	(rÃ©vision 61927)
+++ dll/win32/browseui/browseui.rc	(copie de travail)
@@ -49,7 +49,6 @@
 //#include "lang/ca-ES.rc"
 //#include "lang/cs-CZ.rc"
 //#include "lang/da-DK.rc"
-//#include "lang/de-DE.rc"
 //#include "lang/el-GR.rc"
 //#include "lang/en-GB.rc"
 //#include "lang/fi-FI.rc"
@@ -74,6 +73,9 @@
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
@@ -95,6 +97,9 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/wintrust/CMakeLists.txt
===================================================================
--- dll/win32/wintrust/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wintrust/CMakeLists.txt	(copie de travail)
@@ -9,10 +9,14 @@
     register.c
     softpub.c
     wintrust_main.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c
+    wintrust_priv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c)
+
+add_library(wintrust SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def)
 
-add_library(wintrust SHARED ${SOURCE} version.rc)
 set_module_type(wintrust win32dll)
 target_link_libraries(wintrust wine ${PSEH_LIB})
 # FIXME: imagehlp should be delay-imported. See CORE-6504
@@ -19,4 +23,5 @@
 #add_delay_importlibs(wintrust cryptui imagehlp)
 add_delay_importlibs(wintrust cryptui)
 add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(wintrust wintrust_priv.h SOURCE)
 add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all)
Index: dll/win32/iccvid/rsrc.rc
===================================================================
--- dll/win32/iccvid/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/iccvid/rsrc.rc	(copie de travail)
@@ -46,9 +46,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/iccvid_Sv.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/iccvid_Tr.rc"
-#endif
 
 /* UTF-8 */
 #ifdef LANGUAGE_DE_DE
@@ -81,6 +78,12 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/iccvid_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/iccvid_Sq.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/iccvid_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/iccvid_Uk.rc"
 #endif
Index: dll/win32/iccvid/lang/iccvid_Tr.rc
===================================================================
--- dll/win32/iccvid/lang/iccvid_Tr.rc	(rÃ©vision 61927)
+++ dll/win32/iccvid/lang/iccvid_Tr.rc	(copie de travail)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Fatih Aþýcý
+ * Copyrights: 2006 - Fatih AÅŸÄ±cÄ±, 2014 - Erdem Ersoy (eersoy93) (erdemersoy@live.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,6 @@
 
 STRINGTABLE
 {
-    IDS_NAME "Cinepak Vidyo çözücü"
-    IDS_DESCRIPTION "Cinepak Vidyo çözücü"
+    IDS_NAME "Cinepak Vidyo Kodeki"
+    IDS_DESCRIPTION "Cinepak Vidyo Kodeki"
 }
Index: dll/win32/iccvid/lang/iccvid_Sq.rc
===================================================================
--- dll/win32/iccvid/lang/iccvid_Sq.rc	(rÃ©vision 0)
+++ dll/win32/iccvid/lang/iccvid_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2005 Dmitry Timoshkov
+ * Translation: Ardit Dani (Albanian Translation Resource File)
+ *
+ * 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
+ */
+
+#include "iccvid_private.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_NAME "Cinepak Video kodek"
+    IDS_DESCRIPTION "Cinepak Video kodek"
+}

Modification de propriÃ©tÃ©s sur dll/win32/iccvid/lang/iccvid_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/mstask/CMakeLists.txt
===================================================================
--- dll/win32/mstask/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mstask/CMakeLists.txt	(copie de travail)
@@ -10,13 +10,17 @@
     task.c
     task_scheduler.c
     task_trigger.c
+    mstask_private.h
     ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c)
+
+add_library(mstask SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
 
-add_library(mstask SHARED ${SOURCE} rsrc.rc)
 set_module_type(mstask win32dll)
 target_link_libraries(mstask uuid wine)
 add_importlibs(mstask ole32 msvcrt kernel32 ntdll)
-add_pch(mstask mstask_private.h)
+add_pch(mstask mstask_private.h SOURCE)
 add_cd_file(TARGET mstask DESTINATION reactos/system32 FOR all)
Index: dll/win32/crypt32/lang/crypt32_Sq.rc
===================================================================
--- dll/win32/crypt32/lang/crypt32_Sq.rc	(rÃ©vision 0)
+++ dll/win32/crypt32/lang/crypt32_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,239 @@
+/*
+ * crypt32 dll resources
+ *
+ * Copyright (C) 2006 Juan Lang
+ * Translation: Ardit Dani
+ *
+ * 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
+ */
+
+#include "cryptres.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_AUTHORITY_KEY_ID "Autoriteti identifikues i Ã§elesit"
+    IDS_KEY_ATTRIBUTES "Atributet e Ã§elesit"
+    IDS_KEY_USAGE_RESTRICTION "Kufizimet e perdorimit te Ã§elesit"
+    IDS_SUBJECT_ALT_NAME "Subjekti emrave alternativ"
+    IDS_ISSUER_ALT_NAME "Leshues i emrave alternativ"
+    IDS_BASIC_CONSTRAINTS "Pengesat kryesore"
+    IDS_KEY_USAGE "PÃ«rdorimi i Ã§elesit"
+    IDS_CERT_POLICIES "Politikat Ã§ertifikuese"
+    IDS_SUBJECT_KEY_IDENTIFIER "Subjekti identifikues i Ã§elesit"
+    IDS_CRL_REASON_CODE "Arsyea e koditCRL"
+    IDS_CRL_DIST_POINTS "Pikat e distribuimit CRL"
+    IDS_ENHANCED_KEY_USAGE "Zmadhimi i perdorimit te Ã§elesit"
+    IDS_AUTHORITY_INFO_ACCESS "Autoriteti i aksesit informativ"
+    IDS_CERT_EXTENSIONS "Zgjerime Ã§ertifikate"
+    IDS_NEXT_UPDATE_LOCATION "Vendi i azhornimet tjeter"
+    IDS_YES_OR_NO_TRUST "Po apo jo Besim"
+    IDS_EMAIL_ADDRESS "Email Address"
+    IDS_UNSTRUCTURED_NAME "Emer i pastrukturuar"
+    IDS_CONTENT_TYPE "Tipi pÃ«rmbajtjes"
+    IDS_MESSAGE_DIGEST "PÃ«rpunimi mesazhit"
+    IDS_SIGNING_TIME "Nenshkrim Kohe"
+    IDS_COUNTER_SIGN "Shenja numerimi"
+    IDS_CHALLENGE_PASSWORD "SfidÃ« Passwordi"
+    IDS_UNSTRUCTURED_ADDRESS "Adrese e pastrukturuar"
+    IDS_SMIME_CAPABILITIES "S/MIME AftÃ«si"
+    IDS_PREFER_SIGNED_DATA "NÃ«nshkrimi i tÃ« dhÃ«nave te preferuara"
+    IDS_CPS "CPS"
+    IDS_USER_NOTICE "Njofto pÃ«rdoruesin"
+    IDS_OCSP "Protokoli i Statusit Ã‡ertifikates On-line"
+    IDS_CA_ISSUER "Autoriteti LÃ«shues iCertifikimit"
+    IDS_CERT_TEMPLATE_NAME "Emrin i shabllonit Ã‡ertificues"
+    IDS_CERT_TYPE "Tipi Ã‡ertifikates"
+    IDS_CERT_MANIFOLD "Ã‡rtifikate e shumÃ«fishtÃ«"
+    IDS_NETSCAPE_CERT_TYPE "Tipi Netscape Ã‡ert"
+    IDS_NETSCAPE_BASE_URL "Baza Netscape URL"
+    IDS_NETSCAPE_REVOCATION_URL "Rivokim Netscape URL"
+    IDS_NETSCAPE_CA_REVOCATION_URL "Revokim Netscape CA URL"
+    IDS_NETSCAPE_CERT_RENEWAL_URL "Rinovim Netscape Ã‡ert URL"
+    IDS_NETSCAPE_CA_POLICY_URL "Politika Netscape CA URL"
+    IDS_NETSCAPE_SSL_SERVER_NAME "EmriServerit Netscape SSL"
+    IDS_NETSCAPE_COMMENT "Komento Netscape"
+    IDS_COUNTRY "Shteti/Rajoni"
+    IDS_ORGANIZATION "Organizata"
+    IDS_ORGANIZATIONAL_UNIT "Njesite Organizatore"
+    IDS_COMMON_NAME "Emer i zakonshÃ«m"
+    IDS_LOCALITY "Vendndodhja"
+    IDS_STATE_OR_PROVINCE "Shteti ose Provinca"
+    IDS_TITLE "Titulli"
+    IDS_GIVEN_NAME "Emri i dhÃ«ne"
+    IDS_INITIALS "Inicialet"
+    IDS_SUR_NAME "Mbiemri"
+    IDS_DOMAIN_COMPONENT "Komponentet e domainit"
+    IDS_STREET_ADDRESS "Rruga"
+    IDS_SERIAL_NUMBER "Numri Serial"
+    IDS_CA_VERSION "CA Versioni"
+    IDS_CROSS_CA_VERSION "Kryqezo CA Versioni"
+    IDS_SERIALIZED_SIG_SERIAL_NUMBER "Firma pjese-pjese e Numrit Serial"
+    IDS_PRINCIPAL_NAME "Emri Kryesor"
+    IDS_WINDOWS_PRODUCT_UPDATE "Windows Produkt Update"
+    IDS_ENROLLMENT_NAME_VALUE_PAIR "Regjistrimi i vlerave per emrin Ã§ift"
+    IDS_OS_VERSION "OS Versioni"
+    IDS_ENROLLMENT_CSP "Regjistrimi CSP"
+    IDS_CRL_NUMBER "CRL Numri"
+    IDS_DELTA_CRL_INDICATOR "Indikuesi Delta CRL"
+    IDS_ISSUING_DIST_POINT "LÃ«shimi Pika ShpÃ«rndarjes"
+    IDS_FRESHEST_CRL "Rifresko CRL"
+    IDS_NAME_CONSTRAINTS "Emero kufizimet"
+    IDS_POLICY_MAPPINGS "Planifikime Policy"
+    IDS_POLICY_CONSTRAINTS "Planifikime Policy"
+    IDS_CROSS_CERT_DIST_POINTS "Piket e shperndarjes se Ã‡ertifikatave kryqezuese"
+    IDS_APPLICATION_POLICIES "Aplikimi i Policies"
+    IDS_APPLICATION_POLICY_MAPPINGS "Planifikimi i Aplikimit te Policy"
+    IDS_APPLICATION_POLICY_CONSTRAINTS "Planifikim i Aplikimit te Policy"
+    IDS_CMC_DATA "CMC Data"
+    IDS_CMC_RESPONSE "CMC Pergjigje"
+    IDS_UNSIGNED_CMC_REQUEST "Kerkese pafirmosur CMC"
+    IDS_CMC_STATUS_INFO "CMC Statusi Info"
+    IDS_CMC_EXTENSIONS "CMC Shtese"
+    IDS_CMC_ATTRIBUTES "CMC Atributet"
+    IDS_PKCS_7_DATA "PKCS 7 Data"
+    IDS_PKCS_7_SIGNED "PKCS 7 Firmosur"
+    IDS_PKCS_7_ENVELOPED "PKCS 7 Zarf"
+    IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Zarf i firmosur"
+    IDS_PKCS_7_DIGESTED "PKCS 7 Tret"
+    IDS_PKCS_7_ENCRYPTED "PKCS 7 Kriptuar"
+    IDS_PREVIOUS_CA_CERT_HASH "CA Ã‡ertifikata Hash e mÃ«parshme"
+    IDS_CRL_VIRTUAL_BASE "Numri Baze Virtual CRL"
+    IDS_CRL_NEXT_PUBLISH "Publikim Tjeter CRL"
+    IDS_CA_EXCHANGE "Ã‡ertifikate kriptimi CA "
+    IDS_KEY_RECOVERY_AGENT "Ã‡elesi i Axhentit ShÃ«rues"
+    IDS_CERTIFICATE_TEMPLATE "Ã‡ertifikata informuese shabllon"
+    IDS_ENTERPRISE_ROOT_OID "Root Kriptum OID"
+    IDS_RDN_DUMMY_SIGNER "Dummy Signer"
+    IDS_ARCHIVED_KEY_ATTR "Ã‡eles i kriptuar privat"
+    IDS_CRL_SELF_CDP "CRL Publike vendndodhjen"
+    IDS_REQUIRE_CERT_CHAIN_POLICY "Forco Zingjirin e Policy se Ã‡ertifikates"
+    IDS_TRANSACTION_ID "Transaksion Id"
+    IDS_SENDER_NONCE "Derguesi Nonce"
+    IDS_RECIPIENT_NONCE "MarrÃ«s Nonce"
+    IDS_REG_INFO "Reg Info"
+    IDS_GET_CERTIFICATE "Merr Ã‡ertifikate"
+    IDS_GET_CRL "Merr CRL"
+    IDS_REVOKE_REQUEST "RevokojÃ« KÃ«rkesÃ«n"
+    IDS_QUERY_PENDING "Pritje Rradhe"
+    IDS_SORTED_CTL "Lista e Besuar e Ã‡ertifikatave"
+    IDS_ARCHIVED_KEY_CERT_HASH "Ã‡elesi Arkivues i Hashit te Ã‡ertifikates"
+    IDS_PRIVATE_KEY_USAGE_PERIOD "Koha e perdorimit te Ã‡elesit privat"
+    IDS_CLIENT_INFORMATION "Informacionet e klientit"
+    IDS_SERVER_AUTHENTICATION "Vertetimi i Serverit"
+    IDS_CLIENT_AUTHENTICATION "Vertetimi i Klientit"
+    IDS_CODE_SIGNING "Firmos kodin"
+    IDS_SECURE_EMAIL "Siguri Emaili"
+    IDS_TIME_STAMPING "Vulosje Kohe"
+    IDS_MICROSOFT_TRUST_LIST_SIGNING "Lista e Besuar Microsoft"
+    IDS_MICROSOFT_TIME_STAMPING "Microsoft Vulosje Kohe"
+    IDS_IPSEC_END_SYSTEM "IP siguri dhe sistem"
+    IDS_IPSEC_TUNNEL "IP mbarim tunel sigurie"
+    IDS_IPSEC_USER "IP siguri perdoruesi"
+    IDS_EFS "Sistem i kriptuar"
+    IDS_WHQL_CRYPTO "Verfifikimi i Windows Hardware Driver"
+    IDS_NT5_CRYPTO "Verifikimi i pjeseve te Windows System"
+    IDS_OEM_WHQL_CRYPTO "Verfikimi i pjeseve OEM Windows System"
+    IDS_EMBEDDED_NT_CRYPTO "Verifikimi i pjeseve Embedded Windows System"
+    IDS_KEY_PACK_LICENSES "Pako Ã‡elese LiÃ§ense"
+    IDS_LICENSE_SERVER "Verfikimi i LiÃ§enses se Serverit"
+    IDS_SMART_CARD_LOGON "Karta Smart Logon"
+    IDS_DIGITAL_RIGHTS "Te drejtat Digitale"
+    IDS_QUALIFIED_SUBORDINATION "Urdhera Qualifikues"
+    IDS_KEY_RECOVERY "RimÃ«kÃ«mbje Ã‡elesi"
+    IDS_DOCUMENT_SIGNING "Firmosje Dokumetash"
+    IDS_IPSEC_IKE_INTERMEDIATE "IP siguri IKE mesme"
+    IDS_FILE_RECOVERY "RimÃ«kÃ«mbje Dokumentash"
+    IDS_ROOT_LIST_SIGNER "Lista e firmosur Root"
+    IDS_ANY_APPLICATION_POLICIES "Te gjitha aplikimet policies"
+    IDS_DS_EMAIL_REPLICATION "Sherbime skeda pÃ«rsÃ«ritje Emaili"
+    IDS_ENROLLMENT_AGENT "Axhenti Kerkues Ã‡ertifikate"
+    IDS_LIFETIME_SIGNING "Jete gjatesia"
+    IDS_ANY_CERT_POLICY "Te gjitha sigurimet policies"
+}
+
+STRINGTABLE
+{
+    IDS_LOCALIZEDNAME_ROOT "Autoritetet e besuara Root Certification"
+    IDS_LOCALIZEDNAME_MY "Personale"
+    IDS_LOCALIZEDNAME_CA "Autoritetet Ndermjetese Ã‡ertifikatave"
+    IDS_LOCALIZEDNAME_ADDRESSBOOK "Njerez te Tjere"
+    IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Publikues te Besuar"
+    IDS_LOCALIZEDNAME_DISALLOWED "Ã‡ertifikate e Pabesushme"
+}
+
+STRINGTABLE
+{
+    IDS_KEY_ID "Ã‡elesiID="
+    IDS_CERT_ISSUER "Shperndares Ã‡ertifikate"
+    IDS_CERT_SERIAL_NUMBER "Numer Serial Ã‡ertifikate="
+    IDS_ALT_NAME_OTHER_NAME "Emer Tjeter="
+    IDS_ALT_NAME_RFC822_NAME "Email Address="
+    IDS_ALT_NAME_DNS_NAME "Emri DNS="
+    IDS_ALT_NAME_DIRECTORY_NAME "Adresa Skedes"
+    IDS_ALT_NAME_URL "URL="
+    IDS_ALT_NAME_IP_ADDRESS "IP Address="
+    IDS_ALT_NAME_MASK "Mask="
+    IDS_ALT_NAME_REGISTERED_ID "Regjister ID="
+    IDS_USAGE_UNKNOWN "Panjohur perdorimi i Ã‡elesit"
+    IDS_SUBJECT_TYPE "Tipi Subjektit="
+    IDS_SUBJECT_TYPE_CA "CA"
+    IDS_SUBJECT_TYPE_END_CERT "Mbyll Njesine"
+    IDS_PATH_LENGTH "Gjatesia e Rruges Konstante="
+    IDS_PATH_LENGTH_NONE "Asnje"
+    IDS_INFO_NOT_AVAILABLE "Informacione nuk ekziston"
+    IDS_AIA "Info Autoriteti Akses"
+    IDS_ACCESS_METHOD "Metode Aksesi="
+    IDS_ACCESS_METHOD_OCSP "OCSP"
+    IDS_ACCESS_METHOD_CA_ISSUERS "Shperndares CA"
+    IDS_ACCESS_METHOD_UNKNOWN "Metode Aksesi Panjohur"
+    IDS_ACCESS_LOCATION "Emer Alternativ"
+    IDS_CRL_DIST_POINT "Pike Shperndarje CRL"
+    IDS_CRL_DIST_POINT_NAME "Emri Pikes Shperndarese"
+    IDS_CRL_DIST_POINT_FULL_NAME "Emri Plote"
+    IDS_CRL_DIST_POINT_RDN_NAME "RDN Emri"
+    IDS_CRL_DIST_POINT_REASON "CRL Arsyja="
+    IDS_CRL_DIST_POINT_ISSUER "CRL Shperndaresi"
+    IDS_REASON_KEY_COMPROMISE "Ã‡eles Kompromisi"
+    IDS_REASON_CA_COMPROMISE "CA Kompromis"
+    IDS_REASON_AFFILIATION_CHANGED "Ndryshuar PÃ«rkatesia"
+    IDS_REASON_SUPERSEDED "ZÃ«vendÃ«sohet"
+    IDS_REASON_CESSATION_OF_OPERATION "Operacione Ndaloj"
+    IDS_REASON_CERTIFICATE_HOLD "Mbajtes Ã‡ertifikate"
+    IDS_FINANCIAL_CRITERIA "Informacion Financiar="
+    IDS_FINANCIAL_CRITERIA_AVAILABLE "Disponues"
+    IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Jo Disponues"
+    IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Ploteson Kriteret="
+    IDS_YES "Po"
+    IDS_NO "Jo"
+    IDS_DIGITAL_SIGNATURE "Firme Digitale"
+    IDS_NON_REPUDIATION "Jo-divorc"
+    IDS_KEY_ENCIPHERMENT "Ã‡eles Encipherment"
+    IDS_DATA_ENCIPHERMENT "Data Encipherment"
+    IDS_KEY_AGREEMENT "MarrÃ«veshje Ã‡elesi"
+    IDS_CERT_SIGN "Fime Ã‡ertifikate"
+    IDS_OFFLINE_CRL_SIGN "Firme Off-line CRL"
+    IDS_CRL_SIGN "CRL Firme"
+    IDS_ENCIPHER_ONLY "Vetem Encipher"
+    IDS_DECIPHER_ONLY "Vetem Decipher"
+    IDS_NETSCAPE_SSL_CLIENT "SSL Autentikimi Klientit"
+    IDS_NETSCAPE_SSL_SERVER "SSL Autentikimi Serverit"
+    IDS_NETSCAPE_SMIME "S/MIME"
+    IDS_NETSCAPE_SIGN "Firma"
+    IDS_NETSCAPE_SSL_CA "SSL CA"
+    IDS_NETSCAPE_SMIME_CA "S/MIME CA"
+    IDS_NETSCAPE_SIGN_CA "Firma CA"
+}

Modification de propriÃ©tÃ©s sur dll/win32/crypt32/lang/crypt32_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/crypt32/lang/crypt32_Tr.rc
===================================================================
--- dll/win32/crypt32/lang/crypt32_Tr.rc	(rÃ©vision 0)
+++ dll/win32/crypt32/lang/crypt32_Tr.rc	(rÃ©vision 62573)
@@ -0,0 +1,238 @@
+/*
+ * crypt32 dll resources
+ *
+ * Copyright (C) 2006 Juan Lang
+ *
+ * Translated to Turkish by Erdem Ersoy (eersoy93) (erdemersoy@live.com) in 2013 and 2014.
+ *
+ * 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
+ */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_AUTHORITY_KEY_ID "Yetki AnahtarÄ± TanÄ±mlayÄ±cÄ±sÄ±"
+    IDS_KEY_ATTRIBUTES "Anahtar HusÃ»siyetleri"
+    IDS_KEY_USAGE_RESTRICTION "Anahtar KullanÄ±mÄ± KÄ±sÄ±tlamasÄ±"
+    IDS_SUBJECT_ALT_NAME "Konu DiÄŸer AdÄ±"
+    IDS_ISSUER_ALT_NAME "DaÄŸÄ±tan DiÄŸer AdÄ±"
+    IDS_BASIC_CONSTRAINTS "Ana KÄ±sÄ±tlamalar"
+    IDS_KEY_USAGE "Anahtar KullanÄ±mÄ±"
+    IDS_CERT_POLICIES "Onay Belgesi Ä°lkeleri"
+    IDS_SUBJECT_KEY_IDENTIFIER "Konu AnahtarÄ± TanÄ±mlayÄ±cÄ±sÄ±"
+    IDS_CRL_REASON_CODE "CRL Neden Kodu"
+    IDS_CRL_DIST_POINTS "CRL DaÄŸÄ±tÄ±m NoktalarÄ±"
+    IDS_ENHANCED_KEY_USAGE "GeliÅŸmiÅŸ Anahtar KullanÄ±mÄ±"
+    IDS_AUTHORITY_INFO_ACCESS "Yetkili Bilgi EriÅŸimi"
+    IDS_CERT_EXTENSIONS "Onay Belgesi Eklentileri"
+    IDS_NEXT_UPDATE_LOCATION "Bir Sonraki ÅžimdikileÅŸtirme Konumu"
+    IDS_YES_OR_NO_TRUST "GÃ¼venmeye Evet ya da HayÄ±r"
+    IDS_EMAIL_ADDRESS "E-Posta Adresi"
+    IDS_UNSTRUCTURED_NAME "YapÄ±lÄ±k Olmayan Ad"
+    IDS_CONTENT_TYPE "Ä°Ã§erik TÃ¼rÃ¼"
+    IDS_MESSAGE_DIGEST "Ä°leti Ã–zeti"
+    IDS_SIGNING_TIME "Ä°mzÃ¢lama ZamÃ¢nÄ±"
+    IDS_COUNTER_SIGN "Onay Ä°mzÃ¢sÄ±"
+    IDS_CHALLENGE_PASSWORD "Åžifre Sorma"
+    IDS_UNSTRUCTURED_ADDRESS "YapÄ±lÄ±k Olmayan Adres"
+    IDS_SMIME_CAPABILITIES "S/MIME Yetenekleri"
+    IDS_PREFER_SIGNED_DATA "Ä°mzÃ¢lÄ± Veriyi YeÄŸleme"
+    IDS_CPS "CPS"
+    IDS_USER_NOTICE "KullanÄ±cÄ± Bildirisi"
+    IDS_OCSP "Ã‡evrim Ä°Ã§i Onay Belgesi Durum ProtokolÃ¼"
+    IDS_CA_ISSUER "Onaylama Yetkilisi DaÄŸÄ±tÄ±cÄ±sÄ±"
+    IDS_CERT_TEMPLATE_NAME "Onay Belgesi Ã–rnek AdÄ±"
+    IDS_CERT_TYPE "Onay Belgesi TÃ¼rÃ¼"
+    IDS_CERT_MANIFOLD "Onay Belgesi SÃ»reti"
+    IDS_NETSCAPE_CERT_TYPE "Netscape Onay Belgesi TÃ¼rÃ¼"
+    IDS_NETSCAPE_BASE_URL "Netscape TabanlÄ± URL"
+    IDS_NETSCAPE_REVOCATION_URL "Netscape Ä°ptal URL'si"
+    IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Ä°ptal URL'si"
+    IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Onay Belgesi Yenileme URL'si"
+    IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Ä°lke URL'si"
+    IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Sunucu AdÄ±"
+    IDS_NETSCAPE_COMMENT "Netscape Yorumu"
+    IDS_COUNTRY "Ãœlke/BÃ¶lge"
+    IDS_ORGANIZATION "KuruluÅŸ"
+    IDS_ORGANIZATIONAL_UNIT "KuruluÅŸ Birimi"
+    IDS_COMMON_NAME "Bilinen AdÄ±"
+    IDS_LOCALITY "Konum"
+    IDS_STATE_OR_PROVINCE "Ä°l veyÃ¢ EyÃ¢let"
+    IDS_TITLE "BaÅŸlÄ±k"
+    IDS_GIVEN_NAME "Verilen Ad"
+    IDS_INITIALS "BaÅŸ HÃ¢rfleri"
+    IDS_SUR_NAME "SoyadÄ±"
+    IDS_DOMAIN_COMPONENT "Etki AlanÄ± BileÅŸeni"
+    IDS_STREET_ADDRESS "Sokak Adresi"
+    IDS_SERIAL_NUMBER "Dizi NumarasÄ±"
+    IDS_CA_VERSION "CA SÃ¼rÃ¼mÃ¼"
+    IDS_CROSS_CA_VERSION "Ã‡apraz CA SÃ¼rÃ¼mÃ¼"
+    IDS_SERIALIZED_SIG_SERIAL_NUMBER "DizilendirilmiÅŸ Ä°mzÃ¢ Dizi NumarasÄ±"
+    IDS_PRINCIPAL_NAME "AsÄ±l AdÄ±"
+    IDS_WINDOWS_PRODUCT_UPDATE "Windows ÃœrÃ¼nÃ¼ ÅžimdikileÅŸtirmesi"
+    IDS_ENROLLMENT_NAME_VALUE_PAIR "KaydedilmiÅŸ Ad DeÄŸeri Ã‡ifti"
+    IDS_OS_VERSION "Ä°ÅŸletim Dizgesi SÃ¼rÃ¼mÃ¼"
+    IDS_ENROLLMENT_CSP "KayÄ±t CSP'si"
+    IDS_CRL_NUMBER "CRL NumarasÄ±"
+    IDS_DELTA_CRL_INDICATOR "Delta CRL GÃ¶stergesi"
+    IDS_ISSUING_DIST_POINT "YayÄ±mlama DaÄŸÄ±tÄ±m NoktasÄ±"
+    IDS_FRESHEST_CRL "En Yeni CRL"
+    IDS_NAME_CONSTRAINTS "Ad KÄ±sÄ±tlamalarÄ±"
+    IDS_POLICY_MAPPINGS "Ä°lke PlalamalarÄ±"
+    IDS_POLICY_CONSTRAINTS "Ä°lke KÄ±sÄ±tlamalarÄ±"
+    IDS_CROSS_CERT_DIST_POINTS "Ã‡apraz Onaylama DaÄŸÄ±tÄ±m NoktalarÄ±"
+    IDS_APPLICATION_POLICIES "Uygulama Ä°lkeleri"
+    IDS_APPLICATION_POLICY_MAPPINGS "Uygulama Ä°lke PlanlamalarÄ±"
+    IDS_APPLICATION_POLICY_CONSTRAINTS "Uygulama Ä°lke KÄ±sÄ±tlamalarÄ±"
+    IDS_CMC_DATA "CMC Verisi"
+    IDS_CMC_RESPONSE "CMC YanÄ±tÄ±"
+    IDS_UNSIGNED_CMC_REQUEST "Ä°mzÃ¢lanmamÄ±ÅŸ CMC Ä°steÄŸi"
+    IDS_CMC_STATUS_INFO "CMC Durum Bilgisi"
+    IDS_CMC_EXTENSIONS "CMC Eklentileri"
+    IDS_CMC_ATTRIBUTES "CMC Ã–znitelikleri"
+    IDS_PKCS_7_DATA "PKCS 7 Verisi"
+    IDS_PKCS_7_SIGNED "PKCS 7 Ä°mzÃ¢lÄ±"
+    IDS_PKCS_7_ENVELOPED "PKCS 7 ZarflÄ±"
+    IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Ä°mzÃ¢lÄ± ZarflÄ±"
+    IDS_PKCS_7_DIGESTED "PKCS 7 Ã–zetlenmiÅŸ"
+    IDS_PKCS_7_ENCRYPTED "PKCS 7 Åžifreli"
+    IDS_PREVIOUS_CA_CERT_HASH "Bir Ã–nceki CA Onay Belgesi Kodu"
+    IDS_CRL_VIRTUAL_BASE "FarazÃ® Taban CRL NumarasÄ±"
+    IDS_CRL_NEXT_PUBLISH "Bir Sonraki CRL YayÄ±mlamasÄ±"
+    IDS_CA_EXCHANGE "CA Åžifreleme Onay Belgesi"
+    IDS_KEY_RECOVERY_AGENT "Anahtar Kurtarma YardÄ±mcÄ±sÄ±"
+    IDS_CERTIFICATE_TEMPLATE "Onay Belgesi Ã–rnek Bilgisi"
+    IDS_ENTERPRISE_ROOT_OID "KuruluÅŸ KÃ¶k OID'si"
+    IDS_RDN_DUMMY_SIGNER "Kukla Ä°mzÃ¢layÄ±cÄ±sÄ±"
+    IDS_ARCHIVED_KEY_ATTR "ÅžifrelenmiÅŸ HusÃ»sÃ® Anahtar"
+    IDS_CRL_SELF_CDP "YayÄ±mlanan CRL KonumlarÄ±"
+    IDS_REQUIRE_CERT_CHAIN_POLICY "Onay Belgesi Dizi Ä°lkesini Zorlama"
+    IDS_TRANSACTION_ID "Eylem KimliÄŸi"
+    IDS_SENDER_NONCE "Åžimdiki GÃ¶nderici"
+    IDS_RECIPIENT_NONCE "Åžimdiki AlÄ±cÄ±"
+    IDS_REG_INFO "KayÄ±t Bilgisi"
+    IDS_GET_CERTIFICATE "Onay Belgesi Al"
+    IDS_GET_CRL "CRL Al"
+    IDS_REVOKE_REQUEST "Ä°steÄŸi Ä°ptal Et"
+    IDS_QUERY_PENDING "Sorgu Beklemede"
+    IDS_SORTED_CTL "Onay Belgesi GÃ¼ven Dizelgesi"
+    IDS_ARCHIVED_KEY_CERT_HASH "BelgeliklenmiÅŸ Anahtar Onaylama Kodu"
+    IDS_PRIVATE_KEY_USAGE_PERIOD "HusÃ»sÃ® Anahtar KullanÄ±m DÃ¶nemi"
+    IDS_CLIENT_INFORMATION "Ä°stemci Bilgisi"
+    IDS_SERVER_AUTHENTICATION "Sunucu Yetkilendirmesi"
+    IDS_CLIENT_AUTHENTICATION "Ä°stemci Yetkilendirmesi"
+    IDS_CODE_SIGNING "Kod Ä°mzÃ¢lama"
+    IDS_SECURE_EMAIL "GÃ¼venli E-Posta"
+    IDS_TIME_STAMPING "Zaman Damgalama"
+    IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft GÃ¼ven Dizelgesi Ä°mzÃ¢lamasÄ±"
+    IDS_MICROSOFT_TIME_STAMPING "Microsoft Zaman DamgalamasÄ±"
+    IDS_IPSEC_END_SYSTEM "IP GÃ¼venlik UÃ§ Dizgesi"
+    IDS_IPSEC_TUNNEL "IP GÃ¼venlik TÃ¼nel Sonu"
+    IDS_IPSEC_USER "IP GÃ¼venlik KullanÄ±cÄ±sÄ±"
+    IDS_EFS "Åžifreleyici KÃ¼tÃ¼k Dizgesi"
+    IDS_WHQL_CRYPTO "Windows DonanÄ±m SÃ¼rÃ¼cÃ¼sÃ¼ DoÄŸrulamasÄ±"
+    IDS_NT5_CRYPTO "Windows Dizge BileÅŸeni DoÄŸrulamasÄ±"
+    IDS_OEM_WHQL_CRYPTO "OEM Windows Dizge BileÅŸeni DoÄŸrulamasÄ±"
+    IDS_EMBEDDED_NT_CRYPTO "GÃ¶mÃ¼lÃ¼ Windows Dizge BileÅŸeni DoÄŸrulamasÄ±"
+    IDS_KEY_PACK_LICENSES "Anahtar Paketi RusatlarÄ±"
+    IDS_LICENSE_SERVER "Ruhsat Sunucusu DoÄŸrulamasÄ±"
+    IDS_SMART_CARD_LOGON "AkÄ±llÄ± Kart ile Oturum AÃ§ma"
+    IDS_DIGITAL_RIGHTS "SayÄ±lÄ±k Haklar"
+    IDS_QUALIFIED_SUBORDINATION "Nitelikli BaÄŸlÄ±lÄ±k"
+    IDS_KEY_RECOVERY "Anahtar Kurtarma"
+    IDS_DOCUMENT_SIGNING "Belge Ä°mzÃ¢lama"
+    IDS_IPSEC_IKE_INTERMEDIATE "IP GÃ¼venlik IKE AracÄ±sÄ±"
+    IDS_FILE_RECOVERY "KÃ¼tÃ¼k Kurtarma"
+    IDS_ROOT_LIST_SIGNER "KÃ¶k Dizelgesi Ä°mzÃ¢layÄ±cÄ±sÄ±"
+    IDS_ANY_APPLICATION_POLICIES "TÃ¼m Uygulama Ä°lkeleri"
+    IDS_DS_EMAIL_REPLICATION "Dizin Hizmeti E-Posta SÃ»reti"
+    IDS_ENROLLMENT_AGENT "Onay Belgesi Ä°stek YardÄ±mcÄ±sÄ±"
+    IDS_LIFETIME_SIGNING "YaÅŸam Boyu Ä°mzÃ¢lama"
+    IDS_ANY_CERT_POLICY "TÃ¼m YayÄ±mlama Ä°lkeleri"
+}
+
+STRINGTABLE
+{
+    IDS_LOCALIZEDNAME_ROOT "GÃ¼venilir KÃ¶k Onaylama Yetkilileri"
+    IDS_LOCALIZEDNAME_MY "ÅžahsÃ®"
+    IDS_LOCALIZEDNAME_CA "Ara Onaylama Yetkilileri"
+    IDS_LOCALIZEDNAME_ADDRESSBOOK "DiÄŸer Ä°nsanlar"
+    IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "GÃ¼venilir YayÄ±mcÄ±lar"
+    IDS_LOCALIZEDNAME_DISALLOWED "GÃ¼venilmeyen Onay Belgeleri"
+}
+
+STRINGTABLE
+{
+    IDS_KEY_ID "Anahtar KimliÄŸi="
+    IDS_CERT_ISSUER "Onay Belgesi DaÄŸÄ±tÄ±cÄ±sÄ±"
+    IDS_CERT_SERIAL_NUMBER "Onay Belgesi Dizi NumarasÄ±="
+    IDS_ALT_NAME_OTHER_NAME "DiÄŸer AdÄ±="
+    IDS_ALT_NAME_RFC822_NAME "E-Posta Adresi="
+    IDS_ALT_NAME_DNS_NAME "DNS AdÄ±="
+    IDS_ALT_NAME_DIRECTORY_NAME "Dizin Adresi"
+    IDS_ALT_NAME_URL "URL="
+    IDS_ALT_NAME_IP_ADDRESS "IP Adresi="
+    IDS_ALT_NAME_MASK "Maskesi="
+    IDS_ALT_NAME_REGISTERED_ID "KayÄ±tlÄ± KimliÄŸi="
+    IDS_USAGE_UNKNOWN "Bilinmeyen Anahtar KullanÄ±mÄ±"
+    IDS_SUBJECT_TYPE "Konu TÃ¼rÃ¼="
+    IDS_SUBJECT_TYPE_CA "CA"
+    IDS_SUBJECT_TYPE_END_CERT "Son VarlÄ±k"
+    IDS_PATH_LENGTH "Yol UzunluÄŸu KÄ±sÄ±tlamasÄ±="
+    IDS_PATH_LENGTH_NONE "Yok"
+    IDS_INFO_NOT_AVAILABLE "Bilgi Yok"
+    IDS_AIA "Yetkili Bilgi EriÅŸimi"
+    IDS_ACCESS_METHOD "EriÅŸim YÃ¶ntemi="
+    IDS_ACCESS_METHOD_OCSP "OCSP"
+    IDS_ACCESS_METHOD_CA_ISSUERS "CA DaÄŸÄ±tÄ±cÄ±larÄ±"
+    IDS_ACCESS_METHOD_UNKNOWN "Bilinmeyen EriÅŸim YÃ¶ntemi"
+    IDS_ACCESS_LOCATION "DiÄŸer AdÄ±"
+    IDS_CRL_DIST_POINT "CRL DaÄŸÄ±tÄ±m NoktasÄ±"
+    IDS_CRL_DIST_POINT_NAME "DaÄŸÄ±tÄ±m NoktasÄ± AdÄ±"
+    IDS_CRL_DIST_POINT_FULL_NAME "Tam AdÄ±"
+    IDS_CRL_DIST_POINT_RDN_NAME "RDN AdÄ±"
+    IDS_CRL_DIST_POINT_REASON "CRL Nedeni="
+    IDS_CRL_DIST_POINT_ISSUER "CRL DaÄŸÄ±tÄ±cÄ±sÄ±"
+    IDS_REASON_KEY_COMPROMISE "Anahtar UyuÅŸmasÄ±"
+    IDS_REASON_CA_COMPROMISE "CA UyuÅŸmasÄ±"
+    IDS_REASON_AFFILIATION_CHANGED "Ãœyelik DeÄŸiÅŸti"
+    IDS_REASON_SUPERSEDED "Yerine GeÃ§ti"
+    IDS_REASON_CESSATION_OF_OPERATION "Ä°ÅŸlem Sona Erdi"
+    IDS_REASON_CERTIFICATE_HOLD "Onay Belgesini Tutma"
+    IDS_FINANCIAL_CRITERIA "MÃ¢lÃ® Bilgi="
+    IDS_FINANCIAL_CRITERIA_AVAILABLE "Var"
+    IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Yok"
+    IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Ã–lÃ§Ã¼tleri KarÅŸÄ±layan="
+    IDS_YES "Evet"
+    IDS_NO "HayÄ±r"
+    IDS_DIGITAL_SIGNATURE "SayÄ±lÄ±k Ä°mzÃ¢"
+    IDS_NON_REPUDIATION "Ret Olmayan"
+    IDS_KEY_ENCIPHERMENT "Anahtar Åžifreleme"
+    IDS_DATA_ENCIPHERMENT "Veri Åžifreleme"
+    IDS_KEY_AGREEMENT "Anahtar KabÃ»lÃ¼"
+    IDS_CERT_SIGN "Onay Belgesi Ä°mzÃ¢lama"
+    IDS_OFFLINE_CRL_SIGN "Ã‡evrim DÄ±ÅŸÄ± CRL Ä°mzÃ¢lama"
+    IDS_CRL_SIGN "CRL Ä°mzÃ¢lama"
+    IDS_ENCIPHER_ONLY "YalnÄ±zca Åžifrele"
+    IDS_DECIPHER_ONLY "YalnÄ±zca Åžifreyi Ã‡Ã¶z"
+    IDS_NETSCAPE_SSL_CLIENT "SSL Ä°stemci Yetkilendirmesi"
+    IDS_NETSCAPE_SSL_SERVER "SSL Sunucu Yetkilendirmesi"
+    IDS_NETSCAPE_SMIME "S/MIME"
+    IDS_NETSCAPE_SIGN "Ä°mzÃ¢"
+    IDS_NETSCAPE_SSL_CA "SSL CA"
+    IDS_NETSCAPE_SMIME_CA "S/MIME CA"
+    IDS_NETSCAPE_SIGN_CA "Ä°mzÃ¢ CA"
+}

Modification de propriÃ©tÃ©s sur dll/win32/crypt32/lang/crypt32_Tr.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/crypt32/crypt32.rc
===================================================================
--- dll/win32/crypt32/crypt32.rc	(rÃ©vision 61927)
+++ dll/win32/crypt32/crypt32.rc	(copie de travail)
@@ -70,9 +70,15 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/crypt32_Ro.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/crypt32_Sq.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/crypt32_Sv.rc"
 #endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/crypt32_Tr.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/crypt32_Uk.rc"
 #endif
Index: dll/win32/crypt32/CMakeLists.txt
===================================================================
--- dll/win32/crypt32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/crypt32/CMakeLists.txt	(copie de travail)
@@ -35,11 +35,16 @@
     sip.c
     store.c
     str.c
+    crypt32_private.h)
+
+add_library(crypt32 SHARED
+    ${SOURCE}
+    crypt32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
 
-add_library(crypt32 SHARED ${SOURCE} crypt32.rc)
 set_module_type(crypt32 win32dll)
 target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(crypt32 crypt32_private.h SOURCE)
 add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/advapi32/CMakeLists.txt
===================================================================
--- dll/win32/advapi32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/advapi32/CMakeLists.txt	(copie de travail)
@@ -44,6 +44,10 @@
     service/sctrl.c
     token/privilege.c
     token/token.c
+    advapi32.h)
+
+add_library(advapi32 SHARED
+    ${SOURCE}
     advapi32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/advapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def
@@ -51,15 +55,12 @@
     ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c
     ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c)
 
-add_library(advapi32 SHARED ${SOURCE})
 set_module_type(advapi32 win32dll UNICODE)
 target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB})
 add_delay_importlibs(advapi32 rpcrt4)
 add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll)
 
-add_pch(advapi32 advapi32.h
-    ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h
-    ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h)
+add_pch(advapi32 advapi32.h SOURCE)
 
 add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/advapi32/service/sctrl.c
===================================================================
--- dll/win32/advapi32/service/sctrl.c	(rÃ©vision 61927)
+++ dll/win32/advapi32/service/sctrl.c	(copie de travail)
@@ -288,8 +288,10 @@
 {
     LPWSTR *lpVector;
     LPWSTR *lpArg;
-    DWORD i, cbServiceName, cbTotal;
     LPWSTR pszServiceName;
+    DWORD cbServiceName;
+    DWORD cbTotal;
+    DWORD i;
 
     if (ControlPacket == NULL || lpArgCount == NULL || lpArgVector == NULL)
         return ERROR_INVALID_PARAMETER;
@@ -297,18 +299,12 @@
     *lpArgCount = 0;
     *lpArgVector = NULL;
 
-    pszServiceName = (PWSTR) ((PBYTE) ControlPacket + ControlPacket->dwServiceNameOffset);
+    pszServiceName = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset);
     cbServiceName = lstrlenW(pszServiceName) * sizeof(WCHAR) + sizeof(UNICODE_NULL);
 
+    cbTotal = cbServiceName + sizeof(LPWSTR);
     if (ControlPacket->dwArgumentsCount > 0)
-    {
-        cbTotal = ControlPacket->dwSize - ControlPacket->dwArgumentsOffset +
-                  cbServiceName + sizeof(LPWSTR);
-    }
-    else
-    {
-        cbTotal = cbServiceName + sizeof(LPWSTR);
-    }
+        cbTotal += ControlPacket->dwSize - ControlPacket->dwArgumentsOffset;
 
     lpVector = HeapAlloc(GetProcessHeap(),
                          HEAP_ZERO_MEMORY,
@@ -321,7 +317,7 @@
     lpArg++;
 
     memcpy(lpArg, pszServiceName, cbServiceName);
-    lpArg = (LPWSTR*) ((ULONG_PTR) lpArg + cbServiceName);
+    lpArg = (LPWSTR*)((ULONG_PTR)lpArg + cbServiceName);
 
     if (ControlPacket->dwArgumentsCount > 0)
     {
@@ -351,10 +347,13 @@
     LPSTR *lpVector;
     LPSTR *lpPtr;
     LPWSTR lpUnicodeString;
+    LPWSTR pszServiceName;
     LPSTR lpAnsiString;
+    DWORD cbServiceName;
     DWORD dwVectorSize;
     DWORD dwUnicodeSize;
-    DWORD dwAnsiSize;
+    DWORD dwAnsiSize = 0;
+    DWORD dwAnsiNameSize = 0;
     DWORD i;
 
     if (ControlPacket == NULL || lpArgCount == NULL || lpArgVector == NULL)
@@ -363,13 +362,21 @@
     *lpArgCount = 0;
     *lpArgVector = NULL;
 
-    /* FIXME: There should always be one argument (the name) sent to services... */
-    /* FIXME: See the Unicode version above on how to achieve this */
+    pszServiceName = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset);
+    cbServiceName = lstrlenW(pszServiceName) * sizeof(WCHAR) + sizeof(UNICODE_NULL);
 
+    dwAnsiNameSize = WideCharToMultiByte(CP_ACP,
+                                         0,
+                                         pszServiceName,
+                                         cbServiceName,
+                                         NULL,
+                                         0,
+                                         NULL,
+                                         NULL);
+
+    dwVectorSize = ControlPacket->dwArgumentsCount * sizeof(LPWSTR);
     if (ControlPacket->dwArgumentsCount > 0)
     {
-        dwVectorSize = ControlPacket->dwArgumentsCount * sizeof(LPWSTR);
-
         lpUnicodeString = (LPWSTR)((PBYTE)ControlPacket +
                                    ControlPacket->dwArgumentsOffset +
                                    dwVectorSize);
@@ -385,16 +392,32 @@
                                          0,
                                          NULL,
                                          NULL);
+    }
 
-        lpVector = HeapAlloc(GetProcessHeap(),
-                             HEAP_ZERO_MEMORY,
-                             dwVectorSize + dwAnsiSize);
-        if (lpVector == NULL)
-            return ERROR_OUTOFMEMORY;
+    dwVectorSize += sizeof(LPWSTR);
 
-        lpPtr = (LPSTR*)lpVector;
-        lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize);
+    lpVector = HeapAlloc(GetProcessHeap(),
+                         HEAP_ZERO_MEMORY,
+                         dwVectorSize + dwAnsiNameSize + dwAnsiSize);
+    if (lpVector == NULL)
+        return ERROR_OUTOFMEMORY;
 
+    lpPtr = (LPSTR*)lpVector;
+    lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize);
+
+    WideCharToMultiByte(CP_ACP,
+                        0,
+                        pszServiceName,
+                        cbServiceName,
+                        lpAnsiString,
+                        dwAnsiNameSize,
+                        NULL,
+                        NULL);
+
+    if (ControlPacket->dwArgumentsCount > 0)
+    {
+        lpAnsiString = (LPSTR)((ULONG_PTR)lpAnsiString + dwAnsiNameSize);
+
         WideCharToMultiByte(CP_ACP,
                             0,
                             lpUnicodeString,
@@ -403,19 +426,20 @@
                             dwAnsiSize,
                             NULL,
                             NULL);
+    }
 
-        for (i = 0; i < ControlPacket->dwArgumentsCount; i++)
-        {
-            *lpPtr = lpAnsiString;
+    lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize);
+    for (i = 0; i < ControlPacket->dwArgumentsCount + 1; i++)
+    {
+        *lpPtr = lpAnsiString;
 
-            lpPtr++;
-            lpAnsiString += (strlen(lpAnsiString) + 1);
-        }
-
-        *lpArgCount = ControlPacket->dwArgumentsCount;
-        *lpArgVector = lpVector;
+        lpPtr++;
+        lpAnsiString += (strlen(lpAnsiString) + 1);
     }
 
+    *lpArgCount = ControlPacket->dwArgumentsCount + 1;
+    *lpArgVector = lpVector;
+
     return ERROR_SUCCESS;
 }
 
Index: dll/win32/wldap32/CMakeLists.txt
===================================================================
--- dll/win32/wldap32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wldap32/CMakeLists.txt	(copie de travail)
@@ -5,7 +5,6 @@
 
 list(APPEND SOURCE
     add.c
-    ber.c
     bind.c
     compare.c
     control.c
@@ -24,11 +23,17 @@
     rename.c
     search.c
     value.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c
+    winldap_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c)
+
+add_library(wldap32 SHARED
+    ${SOURCE}
+    ber.c
+    wldap32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def)
 
-add_library(wldap32 SHARED ${SOURCE} wldap32.rc)
 set_module_type(wldap32 win32dll)
 target_link_libraries(wldap32 wine)
 add_importlibs(wldap32 user32 msvcrt kernel32 ntdll)
+add_pch(wldap32 winldap_private.h SOURCE)
 add_cd_file(TARGET wldap32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/wldap32/winldap_private.h
===================================================================
--- dll/win32/wldap32/winldap_private.h	(rÃ©vision 61927)
+++ dll/win32/wldap32/winldap_private.h	(copie de travail)
@@ -22,8 +22,11 @@
  * native headers.
  */
 
-#include <config.h>
+#ifndef _WINLDAP_PRIVATE_H_
+#define _WINLDAP_PRIVATE_H_
 
+#include <wine/config.h>
+
 #include <stdarg.h>
 
 #ifdef HAVE_LDAP_H
@@ -477,3 +480,5 @@
 ULONG CDECL LdapMapErrorToWin32(ULONG);
 int CDECL LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
 int CDECL LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
+
+#endif /* _WINLDAP_PRIVATE_H_ */
Index: dll/win32/wldap32/wldap32.h
===================================================================
--- dll/win32/wldap32/wldap32.h	(rÃ©vision 61927)
+++ dll/win32/wldap32/wldap32.h	(copie de travail)
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 extern HINSTANCE hwldap32 DECLSPEC_HIDDEN;
 
 ULONG map_error( int ) DECLSPEC_HIDDEN;
Index: dll/win32/urlmon/CMakeLists.txt
===================================================================
--- dll/win32/urlmon/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/urlmon/CMakeLists.txt	(copie de travail)
@@ -7,9 +7,6 @@
     -DWINE_REGISTER_DLL
     -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
 
-#remove_definitions(-D_WIN32_WINNT=0x502)
-#add_definitions(-D_WIN32_WINNT=0x600)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB)
 add_rpcproxy_files(urlmon_urlmon.idl)
@@ -36,14 +33,18 @@
     uri.c
     urlmon_main.c
     usrmarshal.c
+    urlmon_main.h)
+
+add_library(urlmon SHARED
+    ${SOURCE}
+    urlmon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def)
 
-add_library(urlmon SHARED ${SOURCE} urlmon.rc)
 set_module_type(urlmon win32dll)
 target_link_libraries(urlmon uuid wine ${PSEH_LIB})
 add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 advpack msvcrt kernel32 ntdll)
-add_pch(urlmon urlmon_main.h)
+add_pch(urlmon urlmon_main.h SOURCE)
 add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
Index: dll/win32/dnsapi/CMakeLists.txt
===================================================================
--- dll/win32/dnsapi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/dnsapi/CMakeLists.txt	(copie de travail)
@@ -16,15 +16,17 @@
     dnsapi/query.c
     dnsapi/record.c
     dnsapi/stubs.c
+    dnsapi/precomp.h)
+
+add_library(dnsapi SHARED
+    ${SOURCE}
     dnsapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def)
 
-add_library(dnsapi SHARED ${SOURCE})
-
 set_module_type(dnsapi win32dll)
 target_link_libraries(dnsapi adns)
 add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
-add_pch(dnsapi dnsapi/precomp.h)
+add_pch(dnsapi dnsapi/precomp.h SOURCE)
 add_dependencies(dnsapi psdk)
 add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/dnsapi/dnsapi/precomp.h
===================================================================
--- dll/win32/dnsapi/dnsapi/precomp.h	(rÃ©vision 61927)
+++ dll/win32/dnsapi/dnsapi/precomp.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _DNSAPI_H
+#define _DNSAPI_H
+
 /* INCLUDES ******************************************************************/
 
 #include <stdarg.h>
@@ -127,3 +130,5 @@
     }
     return dst;
 }
+
+#endif /* _DNSAPI_H */
Index: dll/win32/shdoclc/rsrc.rc
===================================================================
--- dll/win32/shdoclc/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/shdoclc/rsrc.rc	(copie de travail)
@@ -89,6 +89,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/Sq.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/Tr.rc"
 #endif
Index: dll/win32/shdoclc/lang/Sq.rc
===================================================================
--- dll/win32/shdoclc/lang/Sq.rc	(rÃ©vision 0)
+++ dll/win32/shdoclc/lang/Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2005-2006 Jacek Caban
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_MESSAGE_BOX_TITLE, "Eksplorues Wine Interneti"
+}
+
+STRINGTABLE
+{
+    IDS_PRINT_HEADER_TEMPLATE "&faqeinterneti &p" /* FIXME: should be "&w&bPage &p of &P" */
+    IDS_PRINT_FOOTER_TEMPLATE "&u&b&d"
+}
+
+IDR_BROWSE_CONTEXT_MENU MENU
+{
+    POPUP "" /* Default */
+    {
+        MENUITEM "M&brapa",                  IDM_GOBACKWARD
+        MENUITEM "PÃ«rpara",               IDM_GOFORWARD
+        MENUITEM SEPARATOR
+        MENUITEM "&Ruaj FleteMurit Si...", IDM_SAVEBACKGROUND
+        MENUITEM "Vendos FletenMurit",     IDM_SETWALLPAPER
+        MENUITEM "&Kopjo FleteMurit",       IDM_COPYBACKGROUND
+        MENUITEM "Vendos si artikull &Desktop",   IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "PÃ«rzgjidh T'gjitha",            IDM_SELECTALL
+        MENUITEM "&Ngjit",                 IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Krijo IkonÃ«",       IDM_CREATESHORTCUT
+        MENUITEM "Shto tek &Preferuarat...",   IDM_ADDFAVORITES
+        MENUITEM "&Vezhgo Burimin",           IDM_VIEWSOURCE
+        MENUITEM SEPARATOR
+        MENUITEM "&Kodim",              IDM_LANGUAGE
+        MENUITEM SEPARATOR
+        MENUITEM "Pr&into",                 IDM_PRINT
+        MENUITEM "&Rifresko",               _IDM_REFRESH
+        MENUITEM SEPARATOR
+        MENUITEM "&CilÃ«sime",            IDM_PROPERTIES
+    }
+
+    POPUP "" /* Image */
+    {
+        MENUITEM "&Hap lidhjen",               IDM_FOLLOWLINKC
+        MENUITEM "Hap lidhjen nÃ« Dritare T're", IDM_FOLLOWLINKN
+        MENUITEM "Ruaj Objektivin Si...",       IDM_SAVETARGET
+        MENUITEM "&Printo Objektivin",            IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "S&hfaq Foto",            IDM_SHOWPICTURE
+        MENUITEM "&Ruaj Foto Si...",      IDM_SAVEPICTURE
+        MENUITEM "&E-mail Foto...",       IDM_MP_EMAILPICTURE
+        MENUITEM "Pr&into Foto...",        IDM_MP_PRINTPICTURE
+        MENUITEM "&Shko tek Fotot e Mia",       IDM_MP_MYPICS
+        MENUITEM "Vendos Si Sfond",       IDM_SETWALLPAPER
+        MENUITEM "Vendos Si artikull &Desktopi...",  IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "Prej",                     IDM_CUT
+        MENUITEM "&Kopjo",                    IDM_COPY
+        MENUITEM "Kopjo IkonÃ«",           IDM_COPYSHORTCUT
+        MENUITEM "&Paste",                   IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Shto tek &Preferuarat...",     IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM "CilÃ«sime",              IDM_PROPERTIES
+    }
+
+    POPUP "" /* Control */
+    {
+        MENUITEM "&ZhbÃ«j",       IDM_UNDO
+        MENUITEM SEPARATOR
+        MENUITEM "Prej",        IDM_CUT
+        MENUITEM "&Kopjo",       IDM_COPY
+        MENUITEM "&Ngjit",      IDM_PASTE
+        MENUITEM "&Fshi",     IDM_DELETE
+        MENUITEM SEPARATOR
+        MENUITEM "Zgjedh T'gjitha", IDM_SELECTALL
+    }
+
+    POPUP "" /* Table */
+    {
+        POPUP "&Zgjedh"
+        {
+            MENUITEM "&Kuti",         IDM_CELLSELECT
+            MENUITEM "&Resht",          IDM_ROWSELECT
+            MENUITEM "&KolonÃ«",       IDM_COLUMNSELECT
+            MENUITEM "&TabelÃ«",        IDM_TABLESELECT
+        }
+        MENUITEM SEPARATOR
+        MENUITEM "&CilÃ«sime Kutie",  IDM_CELLPROPERTIES
+        MENUITEM "&CilÃ«sime Tabele", IDM_TABLEPROPERTIES
+    }
+
+    POPUP "" /* 1DSite Select */
+    {
+        MENUITEM "Prej",        IDM_CUT
+        MENUITEM "&Kopjo",       IDM_COPY
+        MENUITEM "Ngjit",       IDM_PASTE
+        MENUITEM "Zgjedh T'gjitha", IDM_SELECTALL
+        MENUITEM "&Printo",      IDM_PRINT
+        MENUITEM SEPARATOR
+    }
+
+    POPUP "" /* Anchor */
+    {
+        MENUITEM "&Hap",                IDM_FOLLOWLINKC
+        MENUITEM "Hap nÃ« Dritare T're",  IDM_FOLLOWLINKN
+        MENUITEM "Ruaj Objektin Si...",   IDM_SAVETARGET
+        MENUITEM "&Printo Objektin",        IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "Prej",                  IDM_CUT
+        MENUITEM "&Kopjo",                IDM_COPY
+        MENUITEM "Kopjo IkonÃ«",       IDM_COPYSHORTCUT
+        MENUITEM "&Ngjit",               IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Shto tek &Preferuarat...", IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM "CilÃ«sime",          IDM_PROPERTIES
+    }
+
+    POPUP "" /* Context Unknown */
+    {
+        MENUITEM SEPARATOR
+    }
+
+    POPUP "" /* DYNSRC Image */
+    {
+        MENUITEM "&Hap Lidhje",               IDM_FOLLOWLINKC
+        MENUITEM "Hap Lidhje nÃ« Dritare T're", IDM_FOLLOWLINKN
+        MENUITEM "Ruaj Objektivin Si...",       IDM_SAVETARGET
+        MENUITEM "&Printo Objektivin",            IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "S&hfaq Foto",            IDM_SHOWPICTURE
+        MENUITEM "&Ruaj Video Si...",        IDM_SAVEPICTURE
+        MENUITEM "Vendos Si Sfond",       IDM_SETWALLPAPER
+        MENUITEM "Vendos Si artikull &Desktopi...",  IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "Prej",                     IDM_CUT
+        MENUITEM "&Kopjo",                    IDM_COPY
+        MENUITEM "Kopjo IkonÃ«",           IDM_COPYSHORTCUT
+        MENUITEM "&Ngjit",                   IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Shto tek &Preferuarat...",     IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM "Luaj",                     IDM_DYNSRCPLAY
+        MENUITEM "Ndalo",                     IDM_DYNSRCSTOP
+        MENUITEM "CilÃ«sime",              IDM_PROPERTIES
+    }
+
+    POPUP "" /* ART Image */
+    {
+        MENUITEM "&Hap Lidhje",               IDM_FOLLOWLINKC
+        MENUITEM "Hap Lidhje nÃ« Dritare T're", IDM_FOLLOWLINKN
+        MENUITEM "Ruaj Objektivin Si...",       IDM_SAVETARGET
+        MENUITEM "&Printo Objektivin",            IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "S&hfaq Foto",            IDM_SHOWPICTURE
+        MENUITEM "&Ruaj Foto Si...",      IDM_SAVEPICTURE
+        MENUITEM "Vendos Si Sfond",       IDM_SETWALLPAPER
+        MENUITEM "Vendos Si artikull &Desktopi...",  IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "Prej",                     IDM_CUT
+        MENUITEM "&Kopjo",                    IDM_COPY
+        MENUITEM "Kopjo IkonÃ«",           IDM_COPYSHORTCUT
+        MENUITEM "&Ngjit",                   IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Shto Tek &Preferuarat...",     IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM "Luaj",                     IDM_IMGARTPLAY
+        MENUITEM "Ndalo",                     IDM_IMGARTSTOP
+        MENUITEM "Kthe",                   IDM_IMGARTREWIND
+        MENUITEM SEPARATOR
+        MENUITEM "CilÃ«sime",              IDM_PROPERTIES
+    }
+
+    POPUP "" /* Debug */
+    {
+        MENUITEM "Gjurmo Etiketat",         IDM_TRACETAGS
+        MENUITEM "DÃ«shtimet e Burimeve",  IDM_RESOURCEFAILURES
+        MENUITEM "Derdhin info Ndjekes", IDM_DUMPTRACKINGINFO
+        MENUITEM "Rregullo Pushimin",        IDM_DEBUGBREAK
+        MENUITEM "Rregullo Shikimin",         IDM_DEBUGVIEW
+        MENUITEM "Derdh PemÃ«n",          IDM_DUMPTREE
+        MENUITEM "Derdh Linjat",         IDM_DUMPLINES
+        MENUITEM "Derdh ShfaqPemÃ«n",   IDM_DUMPDISPLAYTREE
+        MENUITEM "Derdh FormatinKafaz",  IDM_DUMPFORMATCACHES
+        MENUITEM "Derdh ParaqitjenRects",   IDM_DUMPLAYOUTRECTS
+        MENUITEM "Memoria Monitorit",     IDM_MEMORYMONITOR
+        MENUITEM "Matja e PerformancÃ«s", IDM_PERFORMANCEMETERS
+        MENUITEM "Ruaj HTML",          IDM_SAVEHTML
+        MENUITEM SEPARATOR
+        MENUITEM "&Shfleto Vezhgimin",       IDM_BROWSEMODE
+        MENUITEM "&Modifiko Vezhgimin",         IDM_EDITMODE
+    }
+
+    POPUP "" /* Vertical Scrollbar */
+    {
+        MENUITEM "Shkoni KÃ«tu",  IDM_SCROLL_HERE
+        MENUITEM SEPARATOR
+        MENUITEM "Lart",          IDM_SCROLL_TOP
+        MENUITEM "PoshtÃ«",       IDM_SCROLL_BOTTOM
+        MENUITEM SEPARATOR
+        MENUITEM "Faqe Lart",      IDM_SCROLL_PAGEUP
+        MENUITEM "Faqe Posht",    IDM_SCROLL_PAGEDOWN
+        MENUITEM SEPARATOR
+        MENUITEM "Shkoni Lart",    IDM_SCROLL_UP
+        MENUITEM "Shkoni Posht",  IDM_SCROLL_DOWN
+    }
+
+    POPUP "" /* Horizontal Scrollbar */
+    {
+        MENUITEM "Shkoni KetÃ«",  IDM_SCROLL_HERE
+        MENUITEM SEPARATOR
+        MENUITEM "Cepi Majtas",    IDM_SCROLL_LEFTEDGE
+        MENUITEM "Cepi Djathtas",   IDM_SCROLL_RIGHTEDGE
+        MENUITEM SEPARATOR
+        MENUITEM "Faqe Majtas",    IDM_SCROLL_PAGELEFT
+        MENUITEM "Faqe Djathtas",   IDM_SCROLL_PAGERIGHT
+        MENUITEM SEPARATOR
+        MENUITEM "Shko Majtas",  IDM_SCROLL_LEFT
+        MENUITEM "Shko Djathtas", IDM_SCROLL_RIGHT
+    }
+}

Modification de propriÃ©tÃ©s sur dll/win32/shdoclc/lang/Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/avifil32/rsrc.rc
===================================================================
--- dll/win32/avifil32/rsrc.rc	(rÃ©vision 61927)
+++ dll/win32/avifil32/rsrc.rc	(copie de travail)
@@ -105,6 +105,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/avifile_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/avifile_Sq.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/avifile_Sv.rc"
 #endif
Index: dll/win32/avifil32/CMakeLists.txt
===================================================================
--- dll/win32/avifil32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/avifil32/CMakeLists.txt	(copie de travail)
@@ -6,7 +6,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB)
 
-add_library(avifil32 SHARED
+list(APPEND SOURCE
     acmstream.c
     api.c
     avifile.c
@@ -17,6 +17,10 @@
     icmstream.c
     tmpfile.c
     wavfile.c
+    avifile_private.h)
+
+add_library(avifil32 SHARED
+    ${SOURCE}
     guid.c
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)
@@ -24,4 +28,5 @@
 set_module_type(avifil32 win32dll)
 target_link_libraries(avifil32 wine)
 add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(avifil32 avifile_private.h SOURCE)
 add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/avifil32/lang/avifile_Sq.rc
===================================================================
--- dll/win32/avifil32/lang/avifile_Sq.rc	(rÃ©vision 0)
+++ dll/win32/avifil32/lang/avifile_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,53 @@
+/*
+ * Top level resource file for avifil32.dll
+ *
+ * Copyright 2013 Ardit Dani
+ *
+ * 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
+ */
+
+#include "avifile_private.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+  IDS_WAVESTREAMFORMAT	"Formati Wave: %s"
+  IDS_WAVEFILETYPE	"Formati Wave"
+  IDS_ALLMULTIMEDIA	"Te gjith dokumentet multimedia"
+  IDS_ALLFILES		"Te gjith dokumentet (*.*)"
+  IDS_VIDEO		"video"
+  IDS_AUDIO		"audio"
+  IDS_AVIFILETYPE	"Menaxhimi i konfigurimit te Wine AVI"
+  IDS_UNCOMPRESSED      "Pa'kompresuar"
+}
+
+IDD_SAVEOPTIONS DIALOG  43, 37, 226, 82
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Opsione kompresimi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Zgjidh nje transmetues:",-1,5,5,154,10
+    COMBOBOX        IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
+                    WS_TABSTOP
+    PUSHBUTTON      "&Opsione...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "Gersheto te gjitha",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "kornize",-1,129,43,36,9
+    LTEXT           "Formati aktual:",-1,5,56,73,9
+    LTEXT           "",IDC_FORMATTEXT,80,56,88,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Anulo",IDCANCEL,170,61,50,14
+END

Modification de propriÃ©tÃ©s sur dll/win32/avifil32/lang/avifile_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/mmdrv/mmioctl.h
===================================================================
--- dll/win32/mmdrv/mmioctl.h	(rÃ©vision 61927)
+++ dll/win32/mmdrv/mmioctl.h	(copie de travail)
@@ -137,4 +137,4 @@
 #define IOCTL_SOUND_GET_CHANGED_VOLUME \
     CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS)
 
-#endif
+#endif /* MMDRV_IOCTLS */
Index: dll/win32/mmdrv/auxil.c
===================================================================
--- dll/win32/mmdrv/auxil.c	(rÃ©vision 61927)
+++ dll/win32/mmdrv/auxil.c	(copie de travail)
@@ -9,13 +9,14 @@
  * UPDATE HISTORY:
  *                       Mar 16, 2004: Created skeleton implementation
  */
+
 #include "mmdrv.h"
-#include "wave.h"
 
-
 #define NDEBUG
 #include <debug.h>
 
+#include "wave.h"
+
 APIENTRY DWORD auxMessage(UINT dwId,
                   UINT uMessage,
                   DWORD dwUser,
Index: dll/win32/mmdrv/midi.c
===================================================================
--- dll/win32/mmdrv/midi.c	(rÃ©vision 61927)
+++ dll/win32/mmdrv/midi.c	(copie de travail)
@@ -10,11 +10,12 @@
  */
 
 #include "mmdrv.h"
-#include "wave.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "wave.h"
+
 // MIDI device instance information
 //
 #define LOCAL_DATA_SIZE 20
Index: dll/win32/mmdrv/mmdrv.h
===================================================================
--- dll/win32/mmdrv/mmdrv.h	(rÃ©vision 61927)
+++ dll/win32/mmdrv/mmdrv.h	(copie de travail)
@@ -17,7 +17,6 @@
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
-
 #include <windef.h>
 #include <winbase.h>
 #include <winioctl.h>
@@ -337,4 +336,4 @@
 
 extern CRITICAL_SECTION critical_section;
 
-#endif
+#endif /* MMDRV_H */
Index: dll/win32/mmdrv/CMakeLists.txt
===================================================================
--- dll/win32/mmdrv/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mmdrv/CMakeLists.txt	(copie de travail)
@@ -11,11 +11,15 @@
     common.c
     wave.c
     wave_io.c
+    mmdrv.h)
+
+add_library(mmdrv SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
-add_library(mmdrv SHARED ${SOURCE})
 set_module_type(mmdrv win32dll UNICODE)
 
 add_importlibs(mmdrv msvcrt winmm user32 kernel32 ntdll)
 add_dependencies(mmdrv psdk)
+add_pch(mmdrv mmdrv.h SOURCE)
 add_cd_file(TARGET mmdrv DESTINATION reactos/system32 FOR all)
Index: dll/win32/mmdrv/wave.c
===================================================================
--- dll/win32/mmdrv/wave.c	(rÃ©vision 61927)
+++ dll/win32/mmdrv/wave.c	(copie de travail)
@@ -17,7 +17,6 @@
 
 #define MAX_WAVE_BUFFER_SIZE    65536
 
-
 MMRESULT
 QueueWaveBuffer(
     SessionInfo* session_info,
Index: dll/win32/wuapi/CMakeLists.txt
===================================================================
--- dll/win32/wuapi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wuapi/CMakeLists.txt	(copie de travail)
@@ -14,13 +14,19 @@
     session.c
     systeminfo.c
     updates.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
+    wuapi_private.h)
 
 add_typelib(wuapi_tlb.idl)
 set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb)
-add_library(wuapi SHARED ${SOURCE} wuapi.rc)
+
+add_library(wuapi SHARED
+    ${SOURCE}
+    wuapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
+
 set_module_type(wuapi win32dll)
 target_link_libraries(wuapi uuid wine wuguid)
 add_importlibs(wuapi msvcrt kernel32 ntdll)
 add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb
+add_pch(wuapi wuapi_private.h SOURCE)
 add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all)
Index: dll/win32/wuapi/wuapi_private.h
===================================================================
--- dll/win32/wuapi/wuapi_private.h	(rÃ©vision 61927)
+++ dll/win32/wuapi/wuapi_private.h	(copie de travail)
@@ -16,8 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _WUAPI_PRIVATE_H_
+#define _WUAPI_PRIVATE_H_
 
+#include <wine/config.h>
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -39,3 +42,5 @@
 extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
+
+#endif /* _WUAPI_PRIVATE_H_ */
Index: dll/win32/tapiui/tapiui.rc
===================================================================
--- dll/win32/tapiui/tapiui.rc	(rÃ©vision 61927)
+++ dll/win32/tapiui/tapiui.rc	(copie de travail)
@@ -41,6 +41,9 @@
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/win32/tapiui/lang/sq-AL.rc
===================================================================
--- dll/win32/tapiui/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/tapiui/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,450 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+101 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Rregullat Thirrjes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 201, 2000, 7, 7, 21, 20
+    LTEXT "Lista e mÃ«poshtme tregon vendet qÃ« keni specifikuar. Zgjidhni vendin nga i cili ju po formoni numrin.", -1, 35, 7, 210, 16
+    LTEXT "&Vendndodhje:", -1, 7, 35, 210, 8
+    CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&E'Re...", 1030, 87, 155, 50, 14
+    PUSHBUTTON "&Modifiko...", 1031, 141, 155, 50, 14
+    PUSHBUTTON "&Fshi", 1032, 195, 155, 50, 14
+    LTEXT "Numri Telefonik do tÃ« thirret si:", 1052, 7, 181, 100, 8
+    LTEXT "", 1053, 14, 195, 224, 16
+END
+
+102 DIALOGEX 0, 0, 252, 255
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 202, 2000, 7, 7, 20, 20
+    LTEXT "Vendndodhja &emri:", -1, 35, 11, 56, 8, SS_CENTERIMAGE
+    EDITTEXT 1038, 96, 8, 149, 14, ES_AUTOHSCROLL
+    LTEXT "Specifikoni vendin nga tÃ« cili ju do tÃ« formoni numrin.", 2001, 7, 33, 238, 8
+    LTEXT "Shteti/&rajon:", -1, 7, 49, 161, 8
+    COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    LTEXT "ZonÃ« &kodi:", -1, 190, 49, 48, 8
+    EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL
+    GROUPBOX "Rregullat thirrjes", 2002, 7, 80, 238, 92
+    LTEXT "Kur thirrni nga ky vend, pÃ«rdorni rregullat e mÃ«poshtme:", 2003, 14, 92, 224, 8
+    LTEXT "PÃ«r tÃ« hyrÃ« nÃ« njÃ« linjÃ« tÃ« jashtme &thirrje lokale, thirr:", -1, 14, 106, 170, 8
+    EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL
+    LTEXT "PÃ«r tÃ« hyrÃ« nÃ« njÃ« linjÃ« tÃ« jashtme pÃ«r &thirrje-tÃ« gjata nÃ« distancÃ«, thirr:", -1, 14, 122, 170, 8
+    EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL
+    LTEXT "PÃ«rdor kÃ«tÃ« kod shÃ«rbimi pÃ«r thirrje-tÃ« gjata nÃ« distancÃ«:", -1, 14, 138, 170, 8
+    EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL
+    LTEXT "PÃ«rdor kÃ«tÃ« kod shÃ«rbimi pÃ«r &thirrjet ndÃ«rkombÃ«tare:", -1, 14, 154, 170, 8
+    EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL
+    AUTOCHECKBOX "PÃ«r tÃ« Ã§aktivizuar thirrje &pritje, thirr:", 1035, 14, 177, 170, 10
+    COMBOBOX 1013, 190, 176, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL
+    LTEXT "Thirr duke pÃ«rdorur:", -1, 14, 195, 40, 8
+    AUTORADIOBUTTON "&Tonalitet", 1036, 58, 194, 50, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Pulse", 1037, 112, 194, 50, 10, NOT WS_TABSTOP
+    LTEXT "Numri telefonik do tÃ« thirret si:", 1052, 7, 219, 100, 8
+    LTEXT "", 1053, 14, 232, 224, 16
+END
+
+103 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Rregullat Pre-fiksit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NjÃ« pre-fiks i zonÃ«s pÃ«rcakton se si numrat e telefonit thirren nga pre-fiksi i zonÃ«s tuaj tÃ« tanishme pÃ«r tek pre-fikset e zonave tÃ« tjera brenda pre-fikseve zonÃ«s tuaj.", 2000, 7, 7, 238, 16
+    LTEXT "Rregullat &pre-fikseve:", -1, 7, 31, 238, 8
+    CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&E're...", 1030, 87, 147, 50, 14
+    PUSHBUTTON "&Modifiko...", 1031, 141, 147, 50, 14
+    PUSHBUTTON "&Fshi", 1032, 195, 147, 50, 14
+    GROUPBOX "PÃ«rshkrim", 2006, 7, 166, 238, 45
+    LTEXT "", 1039, 14, 180, 224, 24
+END
+
+104 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "KartÃ« Thirrje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni kartÃ« e thirrjeve qÃ« ju do tÃ« pÃ«rdorni, ose kliko E're pÃ«r tÃ« shtuar njÃ« kartÃ« tjetÃ«r.", 2000, 7, 7, 238, 8
+    LTEXT "&Tipi KartÃ«s:", -1, 7, 23, 238, 8
+    CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&E're...", 1030, 87, 103, 50, 14
+    PUSHBUTTON "&Modifiko...", 1031, 141, 103, 50, 14
+    PUSHBUTTON "&Fshi", 1032, 195, 103, 50, 14
+    LTEXT "Numri llogarisÃ«:", -1, 7, 127, 91, 8
+    EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL
+    LTEXT "NumÃ«r &Personal ID (PIN):", -1, 7, 145, 91, 8
+    EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL
+    GROUPBOX "Numrat e telefonit pÃ«r", 2001, 7, 158, 238, 53
+    LTEXT "Thirrje tÃ« largÃ«ta nÃ« distancÃ«:", -1, 14, 172, 84, 8
+    LTEXT "", 1042, 102, 172, 136, 8
+    LTEXT "Thirrje ndÃ«rkombÃ«tare:", -1, 14, 184, 84, 8
+    LTEXT "", 1043, 102, 184, 136, 8
+    LTEXT "Thirrje lokale:", -1, 14, 196, 84, 8
+    LTEXT "", 1051, 102, 196, 136, 8
+END
+
+105 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 203, 2000, 7, 7, 20, 20
+    LTEXT "Emri KartÃ«s ThirrÃ«se:", -1, 35, 12, 64, 8, SS_CENTERIMAGE
+    EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL
+    LTEXT "Numri llogarisÃ«:", -1, 7, 35, 238, 8
+    EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL
+    LTEXT "Numri &Personal Identifikues (PIN):", -1, 7, 68, 238, 8
+    EDITTEXT 1019, 7, 80, 116, 14, ES_AUTOHSCROLL
+    LTEXT "Kjo kartÃ« thirrÃ«se do tÃ« pÃ«rdoret kur:", 1056, 14, 117, 224, 8
+    GROUPBOX "Detajet e kartÃ«s thirrÃ«se", 2001, 7, 105, 238, 66
+    LTEXT "", 1000, 22, 131, 216, 8
+    LTEXT "", 1001, 22, 143, 216, 8
+    LTEXT "", 1002, 22, 155, 216, 8
+END
+
+106 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "DistancÃ« e GjatÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Numri thirrÃ«s pÃ«r distanca tÃ« &gjata telefonuese:", -1, 7, 7, 238, 8
+    EDITTEXT 1044, 7, 18, 140, 14, ES_AUTOHSCROLL
+    LTEXT "PÃ«rdorni butonat mÃ« poshtÃ« pÃ«r tÃ« hyrÃ« nÃ« hapat formues tÃ« numrit pÃ«r tÃ« bÃ«rÃ« thirrje nÃ« distancÃ« tÃ« gjatÃ«.  Shkruani kÃ«to hapa nÃ« mÃ«nyrÃ« tÃ« saktÃ« si ato tÃ« shfaqen nÃ« kartÃ«n tuaj tÃ« quajtur.", 2000, 7, 40, 238, 24
+    LTEXT "Hapat thirrjes kartÃ«s telefonuese:", -1, 7, 72, 80, 8
+    CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE
+    PUSHBUTTON "LÃ«viz &Lart", 1022, 195, 83, 50, 14
+    PUSHBUTTON "&LÃ«viz PoshtÃ«", 1023, 195, 101, 50, 14
+    PUSHBUTTON "&Fshi", 1024, 195, 119, 50, 14
+    PUSHBUTTON "&NumÃ«r HyrÃ«s", 1025, 7, 161, 90, 14
+    PUSHBUTTON "NumÃ«r Llogarie", 1018, 101, 161, 90, 14
+    PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14
+    PUSHBUTTON "Numri Destinacioni...", 1020, 101, 179, 90, 14
+    PUSHBUTTON "&Prisni pÃ«r Prompt...", 1017, 7, 197, 90, 14
+    PUSHBUTTON "&Specifikoni shifra...", 1021, 101, 197, 90, 14
+END
+
+107 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "NdÃ«rkombÃ«tarÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NumÃ«r hyrÃ«s pÃ«r telefonata &ndÃ«rkombÃ«tare:", -1, 7, 7, 238, 8
+    EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL
+    LTEXT "PÃ«rdorni butonat mÃ« poshtÃ« pÃ«r tÃ« hyrÃ« nÃ« hapat formimit tÃ« numrit pÃ«r tÃ« bÃ«rÃ« telefonata ndÃ«rkombÃ«tare.  Shkruani kÃ«to hapa nÃ« mÃ«nyrÃ« tÃ« saktÃ« si ato qÃ« shfaqen nÃ« kartÃ«n tuaj tÃ« quajtur.", 2000, 7, 40, 244, 24
+    LTEXT "KartÃ« thirrÃ«se hapat formim numrit:", -1, 7, 72, 80, 8
+    CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE
+    PUSHBUTTON "LÃ«viz &Lart", 1022, 195, 83, 50, 14
+    PUSHBUTTON "&LÃ«viz PoshtÃ«", 1023, 195, 101, 50, 14
+    PUSHBUTTON "&Fshi", 1024, 195, 119, 50, 14
+    PUSHBUTTON "NumÃ«r HyrÃ«s", 1025, 7, 161, 90, 14
+    PUSHBUTTON "NumÃ«r Llogarie", 1018, 101, 161, 90, 14
+    PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14
+    PUSHBUTTON "Numri Destinacinit...", 1020, 101, 179, 90, 14
+    PUSHBUTTON "&Prisni pÃ«r Prompt...", 1017, 7, 197, 90, 14
+    PUSHBUTTON "&Specifikoni shifrat...", 1021, 101, 197, 90, 14
+END
+
+108 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Thirrje Lokale"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Numri hyrÃ«s pÃ«r &thirrje lokale:", -1, 7, 7, 238, 8
+    EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL
+    LTEXT "PÃ«rdorni butonat mÃ« poshtÃ« pÃ«r tÃ« hyrÃ« nÃ« hapat formues numrit pÃ«r tÃ« bÃ«rÃ« thirrje lokale. Shkruani kÃ«to hapa nÃ« mÃ«nyrÃ« tÃ« saktÃ« si ato qÃ« shfaqen nÃ« kartÃ«n tuaj tÃ« quajtur. PÃ«r tÃ« bÃ«rÃ« thirrje lokale pa pÃ«rdorur kartÃ«n tuaj tÃ« quajtur, lÃ«re kÃ«tÃ« seksion bosh.", 2000, 7, 40, 238, 24
+    LTEXT "Hapat thirrÃ«s pÃ«r kartÃ«n telefonuese:", -1, 7, 72, 238, 8
+    CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE
+    PUSHBUTTON "LÃ«viz &Lart", 1022, 195, 83, 50, 14
+    PUSHBUTTON "&LÃ«viz PoshtÃ«", 1023, 195, 101, 50, 14
+    PUSHBUTTON "&Fshi", 1024, 195, 119, 50, 14
+    PUSHBUTTON "NumÃ«r HyrÃ«s", 1025, 7, 161, 90, 14
+    PUSHBUTTON "NumÃ«r Llogarie", 1018, 101, 161, 90, 14
+    PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14
+    PUSHBUTTON "NumÃ«r Destinacioni...", 1020, 101, 179, 90, 14
+    PUSHBUTTON "&prisni pÃ«r Prompt...", 1017, 7, 197, 90, 14
+    PUSHBUTTON "&Specifikoni shifrat...", 1021, 101, 197, 90, 14
+END
+
+109 DIALOGEX 0, 0, 252, 257
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Rregulli i Ri Pre-Fiksit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ky pre-fiks i zonÃ«s do tÃ« aplikohet vetÃ«m pÃ«r thirrjet e bÃ«ra nÃ« pre-fiksin dhe kombinimi pre-fiksi qÃ« ke dhÃ«nÃ« mÃ« poshtÃ«.", 2000, 7, 6, 238, 16
+    LTEXT "Prefiksi i rrethit qÃ« jeni duke thirrur:", -1, 7, 31, 110, 8
+    LTEXT "Prefiksi i zonÃ«s:", -1, 7, 47, 36, 8
+    EDITTEXT 1034, 46, 44, 50, 14, ES_AUTOHSCROLL
+    LTEXT "Specifiko the pre-fiksin pÃ«r tu pÃ«rdorur nÃ« kÃ«tÃ« rregull pre-fiks zonÃ«.", -1, 14, 78, 224, 8
+    AUTORADIOBUTTON "&PÃ«rfshij tÃ« gjithÃ« pre-fikset pre-fiks i rrethit", 1014, 14, 90, 224, 12, NOT WS_TABSTOP
+    AUTORADIOBUTTON "PÃ«rfshij &vetÃ«m pre-fikset nÃ« listÃ«n poshtÃ«:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP
+    LTEXT "&Prefixes to include:", 1057, 26, 117, 119, 8
+    CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE
+    PUSHBUTTON "&Shto...", 1005, 95, 128, 50, 14
+    PUSHBUTTON "Fshi", 1024, 95, 146, 50, 14
+    LTEXT "Kur formoni numrat e telefonit qÃ« pÃ«rmbajnÃ« pre-fikset e mÃ«sipÃ«rme:", -1, 14, 184, 224, 8
+    AUTOCHECKBOX "&Thirr:", 1012, 14, 198, 30, 12
+    EDITTEXT 1007, 46, 196, 42, 14, ES_AUTOHSCROLL
+    AUTOCHECKBOX "PÃ«rfshini kodin e zonÃ«s", 1029, 14, 214, 85, 12
+    DEFPUSHBUTTON "OK", 1, 141, 236, 50, 14
+    PUSHBUTTON "Anulo", 2, 195, 236, 50, 14
+    RTEXT "Pre-fiksi i rrethit", 2001, 133, 31, 51, 8
+    LTEXT "Pre-fiksi", 2002, 200, 31, 45, 8
+    CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6
+    CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6
+    RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8
+    GROUPBOX "Pre-fiksi", -1, 7, 64, 238, 102
+    GROUPBOX "Rregullat", -1, 7, 170, 238, 60
+END
+
+110 DIALOGEX 0, 0, 227, 82
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", 1003, 7, 7, 213, 8
+    LTEXT "", 1039, 7, 23, 213, 8
+    EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", 1, 116, 62, 50, 14
+    PUSHBUTTON "Anulo", 2, 170, 62, 50, 14
+END
+
+111 DIALOGEX 0, 0, 252, 124
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Prisni pÃ«r"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni llojin e shpejtÃ« pÃ«r tÃ« pritur pÃ«r para se tÃ« vazhdoni me rend formimi tÃ« numrit tÃ«.", 2000, 7, 7, 238, 16
+    AUTORADIOBUTTON "Prisni pÃ«r njÃ« &tingull thirrje", 1009, 7, 31, 238, 10, WS_GROUP
+    AUTORADIOBUTTON "Prisni pÃ«r njÃ« &mesazhi me zÃ« pÃ«r tÃ« pÃ«rfunduar", 1016, 7, 47, 238, 10, NOT WS_TABSTOP
+    AUTORADIOBUTTON "Prisni pÃ«r njÃ« gjatÃ«si specifik tÃ« kohÃ«s:", 1048, 7, 63, 238, 10, NOT WS_TABSTOP
+    EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP
+    CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 78, 11, 14
+    LTEXT "&sekonda", -1, 58, 81, 187, 8
+    DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14
+    PUSHBUTTON "Anulo", 2, 195, 103, 50, 14
+END
+
+112 DIALOGEX 0, 0, 252, 111
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Numri Destinacionit"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ky hap do tÃ« vendos numrin e destinacionit qÃ« ju do formoni nÃ« sekuencÃ«n thirrÃ«se tÃ« kartÃ«s. Kur formoni numrin e destinacionit, cilat pjesÃ« tÃ« numrit ju doni tÃ« thirrni?", 2000, 7, 7, 238, 24
+    AUTOCHECKBOX "Thirrni &shteti/kodi rajonit", 1027, 7, 39, 238, 10
+    AUTOCHECKBOX "Thirrni &pre-fiksin zonÃ«s", 1034, 7, 55, 238, 10
+    AUTOCHECKBOX "Thirr &numrin", 1008, 7, 71, 238, 10, WS_DISABLED
+    DEFPUSHBUTTON "OK", 1, 141, 92, 50, 14
+    PUSHBUTTON "Anulo", 2, 195, 92, 50, 14
+END
+
+113 DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "PÃ«rparuar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 201, 2000, 7, 7, 20, 20
+    LTEXT "Ofruesit e mÃ«poshtme telefonisÃ« janÃ« instaluar nÃ« kÃ«tÃ« kompjuter:", -1, 40, 7, 205, 8
+    LTEXT "&Ofruesit:", -1, 7, 35, 238, 8
+    LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP
+    PUSHBUTTON "Shto...", 1005, 87, 197, 50, 14
+    PUSHBUTTON "&Hiq", 1024, 141, 197, 50, 14
+    PUSHBUTTON "&Konfiguro...", 1031, 195, 197, 50, 14
+END
+
+114 DIALOGEX 20, 15, 252, 127
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Shto Ofrues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Zgjidhni ofruesin qÃ« ju dÃ«shironi tÃ« instaloni nga lista mÃ« poshtÃ«, dhe klikoni Shto.", 2000, 7, 7, 241, 8
+    LTEXT "&Ofrues Telefonie:", -1, 7, 23, 144, 10
+    LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP
+    PUSHBUTTON "&Shto", 1005, 141, 106, 50, 14
+    DEFPUSHBUTTON "Anulo", 2, 195, 106, 50, 14
+END
+
+115 DIALOGEX 10, 10, 303, 228
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Informacione Vendndodhja"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155
+    LTEXT "Para se ju mund tÃ« bÃ«ni ndonjÃ« telefonatÃ« ose lidhjeve modemi, ReactOS ka nevojÃ« pÃ«r informacionin e mÃ«poshtÃ«m nÃ« lidhje me vendndodhjen tuaj tÃ« tanishme.", 2000, 107, 15, 188, 25
+    LTEXT "&Cili Shtet/rajoni jeni nÃ« tani?", -1, 107, 43, 189, 10
+    COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    LTEXT "Ã‡farÃ« pre-fiks zone(ose kodi qytetit) jeni nÃ« tani?", -1, 107, 74, 189, 10
+    EDITTEXT 1034, 107, 87, 45, 12, ES_AUTOHSCROLL
+    LTEXT "NÃ«se ju duhet tÃ« specifikoni njÃ« kod shÃ«rbyesi, Ã§farÃ« Ã«shtÃ« ajo?", -1, 107, 105, 189, 10
+    EDITTEXT 1058, 106, 118, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL
+    LTEXT "NÃ«se ju thirrni njÃ« numÃ«r pÃ«r tÃ« hyrÃ« nÃ« njÃ« linjÃ« tÃ« jashtme, Ã§farÃ« Ã«shtÃ« ajo?", -1, 107, 137, 189, 10
+    EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL
+    LTEXT "Sistemi TelefonisÃ« nÃ« kÃ«tÃ« vend pÃ«rdor:", -1, 107, 168, 189, 10
+    AUTORADIOBUTTON "&Tingulli thirrÃ«s", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Pulse thirrÃ«s", 1037, 175, 178, 57, 14, NOT WS_TABSTOP
+    DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14
+    PUSHBUTTON "Anulo", 2, 246, 204, 50, 14
+END
+
+400 DIALOGEX 0, 0, 290, 151
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155
+    LTEXT "Para se ju mund tÃ« bÃ«ni ndonjÃ« telefonatÃ« ose lidhjeve modemi, ReactOS ka nevojÃ« pÃ«r informacionin e mÃ«poshtÃ«m nÃ« lidhje me vendndodhjen tuaj tÃ« tanishme.", 2000, 95, 2, 188, 25
+    LTEXT "&Cili Shtet/rajoni jeni nÃ« tani?", -1, 95, 30, 188, 10
+    COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+    LTEXT "Ã‡farÃ« pre-fiks zone(ose kodi qytetit) jeni nÃ« tani?", -1, 95, 61, 188, 10
+    EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL
+    LTEXT "NÃ«se ju duhet tÃ« specifikoni njÃ« kod shÃ«rbyesi, Ã§farÃ« Ã«shtÃ« ajo?", -1, 95, 96, 188, 10
+    EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL
+    LTEXT "Sistemi TelefonisÃ« nÃ« kÃ«tÃ« vend pÃ«rdor:", -1, 95, 129, 159, 10
+    AUTORADIOBUTTON "&Tingulli thirrÃ«s", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP
+    AUTORADIOBUTTON "&Pulse thirrÃ«s", 1037, 155, 139, 55, 12, NOT WS_TABSTOP
+END
+
+500 DIALOGEX 0, 0, 235, 88
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ReactOS Eksplorues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 504, 501, 13, 14, 21, 20
+    LTEXT "", 502, 47, 15, 180, 32
+    AUTOCHECKBOX "&In the future, always trust this page", 503, 50, 47, 147, 12
+    DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14
+    PUSHBUTTON "&Anulo", 506, 164, 65, 50, 14
+END
+
+STRINGTABLE
+BEGIN
+    1 "Alternativa Telefoni dhe Modemi"
+    2 "Konfiguro rregullat formuese tÃ« numrit dhe pronat pÃ«r tÃ« pÃ«rdorur modemin tuaj."
+    3 "Vendndodhja"
+    4 "PÃ«r tÃ« krijuar njÃ« vendndodhje tÃ« re, kliko E're."
+    5 "Vendndodhje e Re"
+    6 "Modifiko Vendndodhjen"
+    7 "KartÃ« e Re Telefonike"
+    8 "Modifiko KartÃ«n Telefonike"
+    9 "Pre-Fiksi ZonÃ«s"
+    10 "Pre-fikse"
+    11 "Rregulla"
+    12 "Karakteri qÃ« dhatÃ« Ã«shtÃ« i pavlefshÃ«m.\n\nKaraktere tÃ« vlefshme janÃ« 0 deri 9, *, #, dhe presje."
+    13 "Karakteri qÃ« dhatÃ« Ã«shtÃ« i pavlefshÃ«m.\n\nKaraktere tÃ« vlefshme janÃ« 0 deri 9, *, #, hapÃ«sirÃ«, dhe presje."
+    14 "Karakteri qÃ« dhatÃ« Ã«shtÃ« i pavlefshÃ«m.\n\nKaraktere tÃ« vlefshme janÃ« 0 deri 9."
+    15 "Karakteri qÃ« dhatÃ« Ã«shtÃ« i pavlefshÃ«m."
+    16 "Thirr %1"
+    17 "Thirr %1 plus kodi zonÃ«s"
+    18 "Thirr kodi zonÃ«s"
+    19 "Thirr vetÃ«m numrat"
+    20 "TÃ« GjithÃ«"
+    21 "Zgjedhurat"
+    22 "Modifiko rregullat e kodit zonÃ«s"
+    23 "Zgjidh njÃ« rregull nÃ« listÃ«n e mÃ«sipÃ«rme pÃ«r tÃ« parÃ« pÃ«rshkrimin e saj, ose klikoni E're pÃ«r tÃ« shtuar njÃ« rregull."
+    24 "Thirr '%2' plus kodi i zonÃ«s para numrit pÃ«r tÃ« gjitha thirrjet brenda %1 kodi zonÃ«s."
+    25 "Thirr '%2' para numrit pÃ«r tÃ« gjitha thirrjet brenda %1 kodi zonÃ«s."
+    26 "Thirr kodi i zonÃ«s para numrit pÃ«r tÃ« gjitha thirrjet brenda %1 kodi zonÃ«s."
+    27 "Thirr vetÃ«m numra pÃ«r tÃ« gjitha thirrjet brenda %1 kodi zonÃ«s."
+    28 "Thirr '%2' plus kodi i zonÃ«s para numrit pÃ«r thirrjet brenda %1 kodit zonÃ«s, pÃ«rmban pre-fikset qÃ« ju specifikuara."
+    29 "Thirr '%2' para numrit pÃ«r thirrjet brenda %1 kodi zonÃ«s, pÃ«rmban pre-fikset qÃ« ju specifikuara."
+    30 "Thirr kodi i zonÃ«s para numrit pÃ«r thirrjet brenda %1 kodi zonÃ«s, pÃ«rmban pre-fikset qÃ« ju specifikuara."
+    31 "Thirr vetÃ«m numri pÃ«r thirrjet brenda %1 kodi zonÃ«s, pÃ«rmban pre-fikset qÃ« ju specifikuara."
+    32 "Thirr njÃ« '1' para se tÃ« thÃ«rrasÃ«sh brenda tÃ« gjitha kodet e tjera zonÃ«s, dhe pÃ«rfshin kodin e zonÃ«s pÃ«r tÃ« gjitha pre-fikset."
+    33 "Shto Pre-fiks"
+    34 "Shkruaj njÃ« ose mÃ« shumÃ« pre-fikse tÃ« ndara nga hapÃ«sira apo presje."
+    35 "Specifikoni shifra"
+    36 "Shkruaj njÃ« ose mÃ« shumÃ« shifra (pÃ«rfshirÃ« * dhe #) pÃ«r tu thirr."
+    37 "Ju u pÃ«rpoq pÃ«r tÃ« futur nÃ« njÃ« karakter pavlefshÃ«m.\n\nKaraktere tÃ« vlefshme janÃ« 0 deri 9 dhe hapÃ«sirÃ«."
+    38 "Prisni pÃ«r %1!d! sekonda."
+    39 "Thirr numri hyrÃ«s."
+    40 "Thirr numri i llogarisÃ«."
+    41 "Thirr numrin PIN."
+    42 "Prisni pÃ«r njÃ« tingull thirrje."
+    43 "Prisni pÃ«r njÃ« mesazh zanor pÃ«r t'i dhÃ«nÃ« fund."
+    44 "Thirr shtetin/kodi rajonit, kodi zonÃ«s, dhe numÃ«r."
+    45 "Thirr the shtetin/kodi rajonit dhe numÃ«r."
+    46 "Thirr kodin e zonÃ«s dhe numrin."
+    47 "Thirr the shtetin/kodi rajonal."
+    48 "Thirr kodin zonÃ«s."
+    49 "Thirr numrin."
+    50 "formimi numrit pÃ«r thirrje nÃ« distancÃ«."
+    51 "formimi i numrit pÃ«r thirrjet ndÃ«rkombÃ«tare."
+    52 "formimi i numrit pÃ«r thirrjet lokale."
+    53 "Nuk ka rregulla tÃ« pÃ«rcaktuara pÃ«r mÃ«nyrÃ«n se si kjo kartÃ« thirrje duhet tÃ« pÃ«rdoret."
+    54 "Ju duhet tÃ« shkruani kodin nÃ« distancÃ« tÃ« gjatÃ« pÃ«r kÃ«tÃ« vend."
+    55 "Ju duhet tÃ« jepni njÃ« emÃ«r pÃ«r kÃ«tÃ« vend."
+    56 "Ju duhet tÃ« shkruani kodin e zonÃ«s pÃ«r kÃ«tÃ« vend."
+    57 "Ju duhet tÃ« zgjedhin numrin pÃ«r tÃ« thirrur pÃ«r tÃ« Ã§aktivizuar thirrje nÃ« pritje."
+    58 "Ju duhet tÃ« zgjidhni shtetin ose rajonin qÃ« ju jeni duke e quajtur nga."
+    59 "Informacione Zhdukur"
+    60 "Emri vendndodhjes qÃ« ju keni futur Ã«shtÃ« tashmÃ« nÃ« pÃ«rdorim.  Ju lutem shkruani njÃ« emÃ«r tÃ« veÃ§antÃ«."
+    61 "Kjo kartÃ« thirrÃ«se mungon disa informacione tÃ« kÃ«rkuara. PÃ«r tÃ« pÃ«rdorur kÃ«tÃ« kartÃ«, kliko Modifiko pÃ«r tÃ« siguruar mÃ« shumÃ« informacion, ose zgjidhni njÃ« kartÃ« tjetÃ«r."
+    62 "Duhet tÃ« zgjidhni njÃ« kartÃ« thirrÃ«se tÃ« parazgjedhur. Zgjidh njÃ« kartÃ« nga lista, ose klikoni E're pÃ«r tÃ« krijuar njÃ« kartÃ« tÃ« re."
+    63 "Ju duhet tÃ« shkruani emrin kartÃ«s thirrÃ«se."
+    64 "Ju duhet tÃ« fusni numrin e llogarisÃ«."
+    65 "Ju duhet tÃ« fusni numrin PIN."
+    66 "Nuk ka rregulla tÃ« pÃ«rcaktuara pÃ«r kÃ«tÃ« kartÃ« thirrÃ«se. PÃ«r tÃ« krijuar njÃ« rregull, zgjidhni distancÃ« tÃ« gjatÃ«, NdÃ«rkombÃ«tare, apo thirrjet lokale."
+    67 "Rregulli i juaj pÃ«r nÃ« distancÃ« tÃ« gjatÃ« kÃ«rkon numrin e kartÃ«s tuaj tÃ« distancÃ«s."
+    68 "Rregulli i juaj ndÃ«rkombÃ«tare kÃ«rkon numÃ«r kartÃ«s ndÃ«rkombÃ«tare tuaj tÃ« thirrjes."
+    69 "Rregulli i juaj lokal kÃ«rkon numÃ«r kartÃ«s lokale tuaj duke bÃ«rÃ« thirrje tÃ« numrit."
+    70 "AsnjÃ«"
+    71 "Jeni te sigurte qe doni te hiqni zgjedhjen Ofruesin ShÃ«rbimit TelefonisÃ«?"
+    72 "<ofruesi i shÃ«rbimit nuk Ã«shtÃ« i instaluar>"
+    73 "Ju duhet tÃ« fusni njÃ« pre-fiks pÃ«r tÃ« cilat zbatohet ky rregull."
+    74 "&Shifrat:"
+    75 "&Pre-fikse:"
+    76 "Ju u pÃ«rpoq pÃ«r tÃ« futur nÃ« njÃ« karakter pavlefshÃ«m.\n\nKaraktere tÃ« vlefshme janÃ« 0 deri 9, hapÃ«sirÃ« dhe presje."
+    77 "Konfirmo Fshij"
+    78 "Jeni te sigurte qe doni te fshini ketÃ« vendndodhje?"
+    79 "Jeni te sigurte qe doni te fshini ketÃ« kartÃ« e thirrjeve?"
+    80 "Jeni te sigurte qe doni te fshini kÃ«tÃ« rregull tÃ« kodit tÃ« zonÃ«s?"
+    81 "Ju duhet tÃ« fusni nÃ« shifra tÃ« thirrni."
+    82 "Emri kartÃ«s thirrÃ«se qÃ« ju keni futur Ã«shtÃ« tashmÃ« nÃ« pÃ«rdorim. Ju lutem shkruani njÃ« emÃ«r tÃ« veÃ§antÃ«."
+    83 "ReactOS ka nevojÃ« pÃ«r informacion nÃ« lidhje me vendndodhjen e telefonit nga tÃ« cilat ju do tÃ« formoni numrin. NÃ«se anuloni pa dhÃ«nÃ« kÃ«tÃ« informacion, ky program nuk mund tÃ« funksionojÃ« si duhet, kur formoni numrin. PÃ«rveÃ§ kÃ«saj, disa aplikacione i pÃ«rgjigjen anulimit tuaj kÃ«tÃ« kuti dialogu nga menjÃ«herÃ« ri-postim atÃ«.\nJeni te sigurte qe doni te anuloni?"
+    84 "Konfirmo Anulimin"
+    85 "Vendndodhja e mia"
+    86 "<nuk ka ofruesit tÃ« shÃ«rbimeve qÃ« janÃ« nÃ« dispozicion pÃ«r instalim>"
+    87 "Karakteri qÃ« dhatÃ« Ã«shtÃ« i pavlefshÃ«m.\n\nKaraktere tÃ« vlefshme janÃ« 0 deri nÃ« 9, A deri D, *, #, +, !, hapÃ«sirÃ«, dhe presje."
+    88 "Ju duhet tÃ« shkruani kodin ndÃ«rkombÃ«tar thirrÃ«s pÃ«r kÃ«tÃ« vend."
+    89 "Ju duhet tÃ« shkruani kodin thirrÃ«s pÃ«r kÃ«tÃ« vend."
+    90 "Kjo faqe Ã«shtÃ« duke u pÃ«rpjekur pÃ«r tÃ« bÃ«rÃ« ose tÃ« monitoruar thirrje telefonike ose lidhje tÃ« tjera multimediale nÃ« kompjuterin tuaj.\nA doni tÃ« lejojÃ« qÃ« ajo tÃ« vazhdojÃ«?"
+    91 "Kjo faqe Ã«shtÃ« duke u pÃ«rpjekur pÃ«r tÃ« hyrÃ« nÃ« informacionin e skedarit nÃ« rrjetin tuaj.\nA doni tÃ« lejojÃ« qÃ« ajo tÃ« vazhdojÃ«?"
+    92 "Kjo faqe Ã«shtÃ« duke u pÃ«rpjekur pÃ«r tÃ« hyrÃ« ose tÃ« ndryshojÃ« informacion e rrjetit konferencÃ«s.\nA doni tÃ« lejojÃ« qÃ« ajo tÃ« vazhdojÃ«?"
+    93 "Kjo faqe Ã«shtÃ« duke u pÃ«rpjekur pÃ«r tÃ« hyrÃ« ose tÃ« ndryshojÃ« informacionin e regjistrit.\nA doni tÃ« lejojÃ« qÃ« ajo tÃ« vazhdojÃ«?"
+    1064 "Paneli Kontrollit tÃ« Telefonit Dhe Modemit nuk mund tÃ« hapen. Ju mund tÃ« keni njÃ« problem duke filluar shÃ«rbimin telefonik."
+    1065 "Hiq Ofruesin"
+    15800 "23"
+    15801 "0,""AsnjÃ« (Thirrje Direkt)"","""","""","""","""","""","""","""","""",1"
+    15802 "1,""AT&T Thirrje Direkt nÃ«pÃ«rmjet 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1"
+    15803 "2,""AT&T nÃ«pÃ«rmjet 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1"
+    15804 "3,""AT&T nÃ«pÃ«rmjet 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1"
+    15805 "4,""MCI Thirrje Direkt nÃ«pÃ«rmjet 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1"
+    15806 "5,""MCI nÃ«pÃ«rmjet 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1"
+    15807 "6,""MCI nÃ«pÃ«rmjet 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1"
+    15808 "7,""MCI nÃ«pÃ«rmjet 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1"
+    15809 "8,""MCI nÃ«pÃ«rmjet 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1"
+    15810 "9,""US Sprint Thirrje Direkt nÃ«pÃ«rmjet 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1"
+    15811 "10,""US Sprint nÃ«pÃ«rmjet 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1"
+    15812 "11,""US Sprint nÃ«pÃ«rmjet 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1"
+    15813 "12,""Calling Card nÃ«pÃ«rmjet 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1"
+    15814 "13,""KartÃ« France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1"
+    15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1"
+    15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1"
+    15817 "16,""CLEAR Communications (New Zealand)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1"
+    15818 "17,""Telekom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1"
+    15819 "18,""Global KartÃ« (Taiwan to USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1"
+    15820 "19,""Telstra (Australia) nÃ«pÃ«rmjet 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1"
+    15821 "20,""Telstra (Australia) nÃ«pÃ«rmjet 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1"
+    15822 "21,""Optus (Australia) nÃ«pÃ«rmjet 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1"
+    15823 "22,""Optus (Australia) nÃ«pÃ«rmjet 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1"
+END

Modification de propriÃ©tÃ©s sur dll/win32/tapiui/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/netcfgx/CMakeLists.txt
===================================================================
--- dll/win32/netcfgx/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/netcfgx/CMakeLists.txt	(copie de travail)
@@ -9,13 +9,16 @@
     netcfg_iface.c
     inetcfgcomp_iface.c
     tcpipconf_notify.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c)
+
+add_library(netcfgx SHARED
+    ${SOURCE}
     netcfgx.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def)
 
-add_library(netcfgx SHARED ${SOURCE})
 set_module_type(netcfgx win32dll)
 target_link_libraries(netcfgx uuid wine)
 add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll)
-add_pch(netcfgx precomp.h)
+add_pch(netcfgx precomp.h SOURCE)
 add_cd_file(TARGET netcfgx DESTINATION reactos/system32 FOR all)
Index: dll/win32/netcfgx/lang/sq-AL.rc
===================================================================
--- dll/win32/netcfgx/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/netcfgx/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,233 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  23-01-2014
+*/
+
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Ju mund tÃ« merrni cilÃ«simet e IP've tÃ« caktuara automatikisht nÃ« qoftÃ« se rrjeti juaj mbÃ«shtet kÃ«tÃ« aftÃ«si. PÃ«rndryshe, ju duhet tÃ« pyesni administratorin e rrjetit tuaj pÃ«r cilÃ«simet e duhura tÃ« IP've.", -1, 9, 9, 228, 27
+    CONTROL "MarrÃ« adresÃ« IP'sh automatikisht", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
+    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    CONTROL "&PÃ«rdor adresÃ«n e mÃ«poshtme IP'sÃ«:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12
+    LTEXT "Adresa IP:", -1, 14, 75, 135, 8
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    LTEXT "Gateway parazgjedhur:", -1, 14, 105, 135, 8
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "Merr adresÃ«n e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
+    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
+    CONTROL "&PÃ«rdorni adresen DNS tÃ« server-it tÃ« mÃ«poshtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12
+    LTEXT "DNS'ja serverit e preferuar:", -1, 14, 171, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    LTEXT "Alterno DNS'nÃ« e server-it:", -1, 14, 186, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    PUSHBUTTON "&PÃ«rparuar", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+END
+
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Alterno Konfigurimin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "NÃ« qoftÃ« se ky kompjuter Ã«shtÃ« pÃ«rdorur nÃ« mÃ« shumÃ« se njÃ« rrjet, futni cilÃ«simet alternative IP poshtÃ«", -1, 9, 9, 220, 20
+    CONTROL "AdresÃ« IP private auto%matike", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
+    CONTROL "PÃ«rdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    LTEXT "Adresa &IP:", -1, 14, 75, 135, 8
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    LTEXT "Gateway Parazgjedhur:", -1, 14, 115, 135, 8
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    LTEXT "DNS'ja serverit e &preferuar:", -1, 14, 150, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    LTEXT "&Alterno DNS'nÃ« e server-it:", -1, 14, 165, 180, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+END
+
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "CilÃ«simet IP've"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Adresat IP've", -1, 5, 5, 240, 90
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55
+    PUSHBUTTON "Shto...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifiko...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
+    GROUPBOX "Gateway Parazgjedhur:", -1, 5, 100, 240, 90
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55
+    PUSHBUTTON "Shto...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifiko...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 200, 240, 30
+    CHECKBOX "Automatik metrik", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "NdÃ«rfaqe metrike:", -1, 15, 215, 90, 12
+    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+END
+
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "DNS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY
+    LTEXT "Adresa D&NS server, nÃ« rend pÃ«rdorimi:", -1, 5, 5, 180, 12
+    PUSHBUTTON "Lart", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP
+    PUSHBUTTON "PoshtÃ«", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Shto...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modifiko...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP
+    LTEXT "Tre cilÃ«simet e mÃ«poshtme zbatohen pÃ«r tÃ« gjitha lidhjeve me TCP/IP tÃ« aktivizuara. PÃ«r zgjidhjen e emrave tÃ« pakualifikuar:", -1, 5, 90, 220, 24
+    CONTROL "Shto lidhjen primare dhe specifike suffixes pÃ«r DNS'nÃ«", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12
+    CHECKBOX "Shto prindin prapashtesÃ« tÃ« primarit DNS", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Shto kÃ«to DNS suffixes(nÃ« rend):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY
+    PUSHBUTTON "Lart", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "PoshtÃ«", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Shto...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modifiko...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP
+    LTEXT "Prapashtesa DNS'sÃ« pÃ«r kÃ«tÃ« lidhje:", -1, 5, 225, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
+    CHECKBOX "&Regjistrohu adresat e kÃ«saj lidhje nÃ« DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&PÃ«rdor lidhje prapashtesÃ« tÃ« DNS'sÃ« nÃ« regjistrimin e DNS'sÃ«", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+END
+
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "AlternativÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX IDC_OPTLIST, 5, 30, 230, 70
+    LTEXT "CilÃ«sime alternative", -1, 5, 15, 130, 12
+    PUSHBUTTON "&Karakteristika", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP
+    GROUPBOX "PÃ«rshkrimi:", -1, 5, 120, 240, 70
+    LTEXT "", IDC_OPTDESC, 15, 130, 220, 33
+END
+
+IDD_TCPIPADDIP_DLG DIALOGEX 0, 0, 200, 70
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Adresa TCP/IP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    LTEXT "Adresa IP:", -1, 5, 15, 70, 12
+    LTEXT "Subnet mask:", -1, 5, 30, 70, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+END
+
+IDD_TCPIPGW_DLG DIALOGEX 0, 0, 200, 80
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TCP/IP Gateway AdresÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    LTEXT "Gateway:", -1, 5, 15, 70, 12
+    CHECKBOX "Automatik metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
+END
+
+IDD_TCPIPDNS_DLG DIALOGEX 0, 0, 200, 80
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TCP/IP DNS Server"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    LTEXT "DNS server:", -1, 5, 10, 120, 12
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+END
+
+IDD_TCPIPSUFFIX_DLG DIALOGEX 0, 0, 200, 80
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TCP/IP Domain PrapashtesÃ«"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
+    LTEXT "PrapashtesÃ« Domain:", -1, 5, 10, 120, 12
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+END
+
+IDD_TCPIP_FILTER_DLG DIALOGEX 0, 0, 305, 220
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TCP/IP Filtrim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CHECKBOX "MundÃ«so TCP/IP-Filtrim (TÃ« gjith pÃ«rshtatÃ«sit)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    GROUPBOX "", -1, 5, 30, 90, 150
+    CONTROL "Lejo tÃ« GjithÃ«", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
+    CONTROL "Lejo VetÃ«m", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
+    CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75
+    PUSHBUTTON "Shto", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 105, 30, 90, 150
+    CONTROL "Lejo tÃ« GjithÃ«", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
+    CONTROL "Lejo VetÃ«m", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
+    CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75
+    PUSHBUTTON "Shto", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 205, 30, 90, 150
+    CONTROL "Lejo tÃ« GjithÃ«", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
+    CONTROL "Lejo VetÃ«m", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
+    CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75
+    PUSHBUTTON "Shto", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
+END
+
+IDD_TCPIP_PORT_DLG DIALOGEX 0, 0, 200, 60
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Shto Filter"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
+    LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
+END
+
+STRINGTABLE
+BEGIN
+    IDS_NET_CONNECT "Lidhje rrjeti"
+    IDS_NO_IPADDR_SET "PÃ«rshtatÃ«si kÃ«rkon tÃ« paktÃ«n njÃ« adresÃ« IP. Ju lutemi shkruani njÃ«."
+    IDS_NO_SUBMASK_SET "Ju keni futur nÃ« njÃ« adresÃ« qÃ« mungon maskÃ«n e subnet-it tÃ« vet. Ju lutem shtoni njÃ« maskÃ« subnet."
+    IDS_TCPFILTERDESC "TCP/IP filtrim ju lejon kontrollin e llojit tÃ« TCP/IP tÃ« rrjetit tÃ« trafikut qÃ« arrin kompjuteri juaj."
+    IDS_TCPFILTER "TCP/IP Filtrim"
+    IDS_IPADDR "Adresa IP"
+    IDS_SUBMASK "Subnet maskÃ«"
+    IDS_GATEWAY "Gateway"
+    IDS_METRIC "Metrik"
+    IDS_DHCPACTIVE "MundÃ«so DHCP"
+    IDS_AUTOMATIC "Automatike"
+    IDS_NOITEMSEL "Ju nuk keni zgjedhur njÃ« objekt. Zgjidhni njÃ« tÃ« parÃ«."
+    IDS_TCPIP "ReactOS-TCP/IP"
+    IDS_ADD "Stho"
+    IDS_MOD "OK"
+    IDS_TCP_PORTS "Porte TCP"
+    IDS_UDP_PORTS "Porte UDP"
+    IDS_IP_PROTO "Protokolle IP"
+    IDS_PORT_RANGE "Numri porteve duhet tÃ« jetÃ« mÃ« i madh se 0 dhe mÃ« pak se 65536. Ju lutem shkruani njÃ« numÃ«r nÃ« kÃ«tÃ« varg."
+    IDS_PROT_RANGE "Numrat protokolleve duhen tÃ« jenÃ« mÃ« tÃ« mÃ«dhenj se 0 dhe mÃ« pak se 256. Ju lutem shkruani njÃ« numÃ«r nÃ« kÃ«tÃ« varg."
+    IDS_DUP_NUMBER "Numri qÃ« jeni duke u pÃ«rpjekur pÃ«r tÃ« shtuar Ã«shtÃ« tashmÃ« nÃ« listÃ«. Ju lutem, jepni njÃ« numÃ«r tÃ« ndryshÃ«m."
+    IDS_DISABLE_FILTER "Ã‡aktivizimi i kÃ«tij cilÃ«simi global TCP/IP'je do tÃ« ndikojÃ« nÃ« tÃ« gjithÃ« pÃ«rshtatÃ«sit."
+    IDS_NO_SUFFIX "PÃ«rcaktimi i cilÃ«simit tÃ« metodÃ«s kÃ«rkuese kÃ«rkon tÃ« paktÃ«n njÃ« prapashtesÃ« DNS. Ju lutem shkruani njÃ« ose ndryshoni vendosjen."
+    IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix."
+    IDS_DNS_SUFFIX "Emri i domainit DNS ""%s"" nuk Ã«shtÃ« emer DNS i vlefshÃ«m."
+    IDS_DUP_SUFFIX "PrapashtesÃ« DNS[sÃ« Ã«shtÃ« tashmÃ« nÃ« listÃ«."
+    IDS_DUP_IPADDR "Adresa IP Ã«shtÃ« tashmÃ« nÃ« listÃ«."
+    IDS_DUP_GW "Gateway parazgjedhjes Ã«shtÃ« tashmÃ« nÃ« listÃ«."
+END

Modification de propriÃ©tÃ©s sur dll/win32/netcfgx/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/netcfgx/netcfgx.rc
===================================================================
--- dll/win32/netcfgx/netcfgx.rc	(rÃ©vision 61927)
+++ dll/win32/netcfgx/netcfgx.rc	(copie de travail)
@@ -75,6 +75,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/win32/mpr/CMakeLists.txt
===================================================================
--- dll/win32/mpr/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/mpr/CMakeLists.txt	(copie de travail)
@@ -13,11 +13,16 @@
     nps.c
     pwcache.c
     wnet.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c)
+
+add_library(mpr SHARED
+    ${SOURCE}
+    mpr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
 
-add_library(mpr SHARED ${SOURCE} mpr.rc)
 set_module_type(mpr win32dll)
 target_link_libraries(mpr wine)
 add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll)
+add_pch(mpr precomp.h SOURCE)
 add_cd_file(TARGET mpr DESTINATION reactos/system32 FOR all)
Index: dll/win32/mpr/lang/mpr_Sq.rc
===================================================================
--- dll/win32/mpr/lang/mpr_Sq.rc	(rÃ©vision 0)
+++ dll/win32/mpr/lang/mpr_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,46 @@
+/*
+ * MPR dll resources
+ *
+ * Copyright (C) 2004 Juan Lang
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_ENTIRENETWORK "GjithÃ« Rrjeti"
+}
+
+IDD_PROXYDLG DIALOG 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "FjalÃ«kalimi i GjithÃ« Rrjetit"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "Proxi", -1, 40, 26, 50, 10
+/* LTEXT "Realm", -1, 40, 46, 50, 10 */
+ LTEXT "PÃ«rdoruesi", -1, 40, 66, 50, 10
+ LTEXT "FjalÃ«kalimi", -1, 40, 86, 50, 10
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "&Ruaj kÃ«tÃ« fjalÃ«kalim (i pasigurt)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Anulo", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}

Modification de propriÃ©tÃ©s sur dll/win32/mpr/lang/mpr_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/mpr/mpr.rc
===================================================================
--- dll/win32/mpr/mpr.rc	(rÃ©vision 61927)
+++ dll/win32/mpr/mpr.rc	(copie de travail)
@@ -92,6 +92,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/mpr_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/mpr_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/mpr_Uk.rc"
 #endif
Index: dll/win32/sti/CMakeLists.txt
===================================================================
--- dll/win32/sti/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/sti/CMakeLists.txt	(copie de travail)
@@ -7,18 +7,23 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(sti.dll sti.spec)
+add_rpcproxy_files(sti_wia.idl)
 
 list(APPEND SOURCE
     sti.c
     sti_main.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
+    ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c)
+
+add_library(sti SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
-    ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c
+    sti.rc
     ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
 
-add_rpcproxy_files(sti_wia.idl)
-add_library(sti SHARED ${SOURCE} sti.rc)
 set_module_type(sti win32dll)
 target_link_libraries(sti wine uuid ${PSEH_LIB})
 add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll)
+add_pch(sti precomp.h SOURCE)
 add_cd_file(TARGET sti DESTINATION reactos/system32 FOR all)
Index: dll/win32/qmgr/CMakeLists.txt
===================================================================
--- dll/win32/qmgr/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/qmgr/CMakeLists.txt	(copie de travail)
@@ -13,15 +13,19 @@
     qmgr.c
     qmgr_main.c
     service.c
-    ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c
+    qmgr.h
+    ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c)
+
+add_library(qmgr SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def)
 
-add_library(qmgr SHARED ${SOURCE} rsrc.rc)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf)
 add_idl_headers(qmgr_idlheader qmgr_local.idl)
 set_module_type(qmgr win32dll)
 target_link_libraries(qmgr uuid wine)
 add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll)
-add_pch(qmgr qmgr.h)
+add_pch(qmgr qmgr.h SOURCE)
 add_cd_file(TARGET qmgr DESTINATION reactos/system32 FOR all)
 add_dependencies(qmgr qmgr_idlheader)
Index: dll/win32/shlwapi/ordinal.c
===================================================================
--- dll/win32/shlwapi/ordinal.c	(rÃ©vision 61927)
+++ dll/win32/shlwapi/ordinal.c	(copie de travail)
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * SHLWAPI ordinal functions
  *
  * Copyright 1997 Marcus Meissner
@@ -38,7 +38,7 @@
 extern DWORD SHLWAPI_ThreadRef_index;
 
 HRESULT WINAPI IUnknown_QueryService(IUnknown*,REFGUID,REFIID,LPVOID*);
-HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,BOOL);
+HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,DWORD);
 BOOL    WINAPI SHAboutInfoW(LPWSTR,DWORD);
 
 /*
@@ -2911,7 +2911,7 @@
 HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl)
 {
     TRACE("%p %p %p\n", hWnd, lpFolder, lpApidl);
-    return SHInvokeCommand(hWnd, lpFolder, lpApidl, FALSE);
+    return SHInvokeCommand(hWnd, lpFolder, lpApidl, 0);
 }
 
 /*************************************************************************
@@ -3459,7 +3459,7 @@
  *  hWnd           [I] Window displaying the shell folder
  *  lpFolder       [I] IShellFolder interface
  *  lpApidl        [I] Id for the particular folder desired
- *  bInvokeDefault [I] Whether to invoke the default menu item
+ *  dwCommandId    [I] The command ID to invoke (0=invoke default)
  *
  * RETURNS
  *  Success: S_OK. If bInvokeDefault is TRUE, the default menu action was
@@ -3466,12 +3466,12 @@
  *           executed.
  *  Failure: An HRESULT error code indicating the error.
  */
-HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, BOOL bInvokeDefault)
+HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, DWORD dwCommandId)
 {
   IContextMenu *iContext;
   HRESULT hRet;
 
-  TRACE("(%p, %p, %p, %d)\n", hWnd, lpFolder, lpApidl, bInvokeDefault);
+  TRACE("(%p, %p, %p, %u)\n", hWnd, lpFolder, lpApidl, dwCommandId);
 
   if (!lpFolder)
     return E_FAIL;
@@ -3485,16 +3485,16 @@
     if ((hMenu = CreatePopupMenu()))
     {
       HRESULT hQuery;
-      DWORD dwDefaultId = 0;
 
       /* Add the context menu entries to the popup */
       hQuery = IContextMenu_QueryContextMenu(iContext, hMenu, 0, 1, 0x7FFF,
-                                             bInvokeDefault ? CMF_NORMAL : CMF_DEFAULTONLY);
+                                             dwCommandId ? CMF_NORMAL : CMF_DEFAULTONLY);
 
       if (SUCCEEDED(hQuery))
       {
-        if (bInvokeDefault &&
-            (dwDefaultId = GetMenuDefaultItem(hMenu, 0, 0)) != (UINT)-1)
+        if (!dwCommandId)
+          dwCommandId = GetMenuDefaultItem(hMenu, 0, 0);
+        if (dwCommandId != (UINT)-1)
         {
           CMINVOKECOMMANDINFO cmIci;
           /* Invoke the default item */
@@ -3502,8 +3502,8 @@
           cmIci.cbSize = sizeof(cmIci);
           cmIci.fMask = CMIC_MASK_ASYNCOK;
           cmIci.hwnd = hWnd;
-          cmIci.lpVerb = MAKEINTRESOURCEA(dwDefaultId);
-          cmIci.nShow = SW_SCROLLCHILDREN;
+          cmIci.lpVerb = MAKEINTRESOURCEA(dwCommandId);
+          cmIci.nShow = SW_SHOWNORMAL;
 
           hRet = IContextMenu_InvokeCommand(iContext, &cmIci);
         }
Index: dll/win32/shlwapi/shlwapi.rc
===================================================================
--- dll/win32/shlwapi/shlwapi.rc	(rÃ©vision 61927)
+++ dll/win32/shlwapi/shlwapi.rc	(copie de travail)
@@ -54,6 +54,9 @@
 #ifdef LANGUAGE_SK_SK
     #include "lang/shlwapi_Sk.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/shlwapi_Sq.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/shlwapi_Sv.rc"
 #endif
Index: dll/win32/shlwapi/CMakeLists.txt
===================================================================
--- dll/win32/shlwapi/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/shlwapi/CMakeLists.txt	(copie de travail)
@@ -20,13 +20,18 @@
     string.c
     thread.c
     url.c
+    precomp.h)
+
+add_library(shlwapi SHARED
+    ${SOURCE}
+    shlwapi.rc
     wsprintf.c
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def)
 
-add_library(shlwapi SHARED ${SOURCE} shlwapi.rc)
 set_module_type(shlwapi win32dll)
 target_link_libraries(shlwapi uuid wine)
 add_delay_importlibs(shlwapi userenv oleaut32 ole32 comdlg32 mpr mlang urlmon shell32 winmm version)
 add_importlibs(shlwapi user32 gdi32 advapi32 wininet msvcrt kernel32 ntdll)
+add_pch(shlwapi precomp.h SOURCE)
 add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all)
Index: dll/win32/shlwapi/lang/shlwapi_Sq.rc
===================================================================
--- dll/win32/shlwapi/lang/shlwapi_Sq.rc	(rÃ©vision 0)
+++ dll/win32/shlwapi/lang/shlwapi_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,43 @@
+/*
+ * English resources for shlwapi
+ *
+ * Copyright 2004 Jon Griffiths
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_ERR_DIALOG DIALOG 0, 0, 220, 60
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Gabim!"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
+ LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
+ CHECKBOX "Mos mÃ« tregoni kÃ«tÃ« mesazh pÃ«rsÃ«ri", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Anulo", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Po", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Jo", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+STRINGTABLE
+{
+    IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " rÃ«"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sek"
+}

Modification de propriÃ©tÃ©s sur dll/win32/shlwapi/lang/shlwapi_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/shlwapi/precomp.h
===================================================================
--- dll/win32/shlwapi/precomp.h	(rÃ©vision 61927)
+++ dll/win32/shlwapi/precomp.h	(copie de travail)
@@ -24,11 +24,11 @@
 #include <shlwapi.h>
 #include <shlobj.h>
 
+#include <wine/debug.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
+#include "resource.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
-#include "resource.h"
-
 #endif /* _SHLWAPI_PCH_ */
Index: dll/win32/localspl/lang/spl_Sq.rc
===================================================================
--- dll/win32/localspl/lang/spl_Sq.rc	(rÃ©vision 0)
+++ dll/win32/localspl/lang/spl_Sq.rc	(rÃ©vision 62573)
@@ -0,0 +1,31 @@
+/*
+ * English resources for localspl
+ *
+ * Copyright 2005 Huw Davies
+ * Copyright 2006 Detlef Riekenberg
+ * Translation: Ardit Dani (ALbanian Translation Resource File)
+ *
+ * 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
+ */
+
+#include "localspl_private.h"
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_LOCALPORT "Porti Vendor"
+    IDS_LOCALMONITOR "Monitorim Vendor"
+}

Modification de propriÃ©tÃ©s sur dll/win32/localspl/lang/spl_Sq.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/localspl/localspl.rc
===================================================================
--- dll/win32/localspl/localspl.rc	(rÃ©vision 61927)
+++ dll/win32/localspl/localspl.rc	(copie de travail)
@@ -92,6 +92,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/spl_Si.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/spl_Sq.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/spl_Uk.rc"
 #endif
Index: dll/win32/localspl/CMakeLists.txt
===================================================================
--- dll/win32/localspl/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/localspl/CMakeLists.txt	(copie de travail)
@@ -10,11 +10,16 @@
     localmon.c
     localspl_main.c
     provider.c
+    localspl_private.h)
+
+add_library(localspl SHARED
+    ${SOURCE}
+    localspl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)
 
-add_library(localspl SHARED ${SOURCE} localspl.rc)
 set_module_type(localspl win32dll)
 target_link_libraries(localspl wine)
 add_importlibs(localspl spoolss user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(localspl localspl_private.h SOURCE)
 add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all)
Index: dll/win32/wbemdisp/wbemdisp_private.h
===================================================================
--- dll/win32/wbemdisp/wbemdisp_private.h	(rÃ©vision 61927)
+++ dll/win32/wbemdisp/wbemdisp_private.h	(copie de travail)
@@ -16,8 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _WBEMDISP_PRIVATE_H_
+#define _WBEMDISP_PRIVATE_H_
 
+#include <wine/config.h>
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -46,3 +49,5 @@
 {
     return HeapFree( GetProcessHeap(), 0, mem );
 }
+
+#endif /* _WBEMDISP_PRIVATE_H_ */
Index: dll/win32/wbemdisp/CMakeLists.txt
===================================================================
--- dll/win32/wbemdisp/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/wbemdisp/CMakeLists.txt	(copie de travail)
@@ -6,8 +6,7 @@
 list(APPEND SOURCE
     locator.c
     main.c
-    guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
+    wbemdisp_private.h)
 
 add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl)
 add_typelib(wbemdisp_tlb.idl)
@@ -19,9 +18,15 @@
 
 set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc_deps}")
 
-add_library(wbemdisp SHARED ${SOURCE} wbemdisp.rc)
+add_library(wbemdisp SHARED
+    ${SOURCE}
+    guid.c
+    wbemdisp.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
+
 set_module_type(wbemdisp win32dll)
 target_link_libraries(wbemdisp uuid wine)
 add_dependencies(wbemdisp wbemdisp_idlheader)
 add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll)
+add_pch(wbemdisp wbemdisp_private.h SOURCE)
 add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)
Index: dll/win32/shell32/res/rgs/mycomputer.rgs
===================================================================
--- dll/win32/shell32/res/rgs/mycomputer.rgs	(rÃ©vision 61927)
+++ dll/win32/shell32/res/rgs/mycomputer.rgs	(copie de travail)
@@ -7,7 +7,7 @@
 			val 'InfoTip' = e '@%%SystemRoot%%\system32\SHELL32.dll,-22913'
 			val 'IntroText' = e '@%%SystemRoot%%\system32\SHELL32.dll,-31751'
 			val 'LocalizedString' = e '@%%SystemRoot%%\system32\SHELL32.dll,-9216'
-			DefaultIcon = e '%%SystemRoot%%\Explorer.exe,0'
+			DefaultIcon = e '%%SystemRoot%%\system32\SHELL32.dll,-16'
 			InprocServer32 = s '%MODULE%'
 			{
 				val ThreadingModel = s 'Apartment'
Index: dll/win32/shell32/res/rgs/exedrophandler.rgs
===================================================================
--- dll/win32/shell32/res/rgs/exedrophandler.rgs	(rÃ©vision 0)
+++ dll/win32/shell32/res/rgs/exedrophandler.rgs	(rÃ©vision 62573)
@@ -0,0 +1,13 @@
+HKCR
+{
+	NoRemove CLSID
+	{
+		ForceRemove {86C86720-42A0-1069-A2E8-08002B30309D} = s 'Executable Drag and Drop target'
+		{
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'Apartment'
+			}
+		}
+	}
+}

Modification de propriÃ©tÃ©s sur dll/win32/shell32/res/rgs/exedrophandler.rgs
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/shell32/shell32_main.cpp
===================================================================
--- dll/win32/shell32/shell32_main.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shell32_main.cpp	(copie de travail)
@@ -1371,6 +1371,7 @@
     OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite)
     OBJECT_ENTRY(CLSID_MenuBand, CMenuBand)
     OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar)
+    OBJECT_ENTRY(CLSID_ExeDropHandler, CExeDropHandler)
 END_OBJECT_MAP()
 
 CShell32Module                                gModule;
Index: dll/win32/shell32/filedefext.h
===================================================================
--- dll/win32/shell32/filedefext.h	(rÃ©vision 61927)
+++ dll/win32/shell32/filedefext.h	(copie de travail)
@@ -73,7 +73,7 @@
     BOOL InitVersionPage(HWND hwndDlg);
     static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	static INT_PTR CALLBACK VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	BOOL CountFolderAndFiles(LPWSTR pwszBuf, UINT cchBufMax);
+	BOOL CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, LPDWORD ticks);
 
 	WCHAR m_wszPath[MAX_PATH];
 	CFileVersionInfo m_VerInfo;
@@ -83,6 +83,8 @@
     DWORD m_cFolders;
     ULARGE_INTEGER m_DirSize;
 
+    static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter);
+
 public:
 	CFileDefExt();
 	~CFileDefExt();
@@ -116,4 +118,11 @@
 END_COM_MAP()
 };
 
-#endif /* _FILE_DEF_EXT_H_ */
+struct _CountFolderAndFilesData {
+    CFileDefExt *This;
+    HWND hwndDlg;
+    LPWSTR pwszBuf;
+    UINT cchBufMax;
+};
+
+#endif /* _FILE_DEF_EXT_H_ */
\ No newline at end of file
Index: dll/win32/shell32/shelllink.cpp
===================================================================
--- dll/win32/shell32/shelllink.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shelllink.cpp	(copie de travail)
@@ -76,6 +76,43 @@
 
 #include "poppack.h"
 
+/**************************************************************************
+* SH_GetTargetTypeByPath
+*
+* Function to get target type by passing full path to it
+*/
+LPWSTR SH_GetTargetTypeByPath(LPCWSTR lpcwFullPath)
+{
+    LPCWSTR pwszExt;
+    static WCHAR wszBuf[MAX_PATH];
+
+    /* Get file information */
+    SHFILEINFO fi;
+    if (!SHGetFileInfoW(lpcwFullPath, 0, &fi, sizeof(fi), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES ))
+    {
+        ERR("SHGetFileInfoW failed for %ls (%lu)\n", lpcwFullPath, GetLastError());
+        fi.szTypeName[0] = L'\0';
+        fi.hIcon = NULL;
+    }
+
+    pwszExt = PathFindExtensionW(lpcwFullPath);
+    if (pwszExt[0])
+    {
+        if (!fi.szTypeName[0])
+        {
+            /* The file type is unknown, so default to string "FileExtension File" */
+            size_t cchRemaining = 0;
+            LPWSTR pwszEnd = NULL;
+
+            StringCchPrintfExW(wszBuf, _countof(wszBuf), &pwszEnd, &cchRemaining, 0, L"%s ", pwszExt + 1);
+        }
+        else
+            StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s (%s)", fi.szTypeName, pwszExt); /* Update file type */
+    }
+
+    return wszBuf;
+}
+
 /* IShellLink Implementation */
 
 static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath);
@@ -1949,6 +1986,10 @@
             else
                 ERR("ExtractIconW failed %ls %u\n", pThis->sIcoPath, pThis->iIcoNdx);
 
+            /* target type */
+            if (pThis->sPath)
+                SetDlgItemTextW(hwndDlg, 14005, SH_GetTargetTypeByPath(pThis->sPath));
+
             /* target location */
             if (pThis->sWorkDir)
                 SetDlgItemTextW(hwndDlg, 14007, PathFindFileName(pThis->sWorkDir));
@@ -1955,8 +1996,20 @@
 
             /* target path */
             if (pThis->sPath)
-                SetDlgItemTextW(hwndDlg, 14009, pThis->sPath);
-
+            {
+                WCHAR newpath[2*MAX_PATH] = L"\0";
+                if (wcschr(pThis->sPath, ' '))
+                    StringCchPrintfExW(newpath, 2*MAX_PATH, NULL, NULL, 0, L"\"%ls\"", pThis->sPath);
+                else 
+                    StringCchCopyExW(newpath, 2*MAX_PATH, pThis->sPath, NULL, NULL, 0);
+                
+                if (pThis->sArgs && pThis->sArgs[0])
+                {
+                    StringCchCatW(newpath, 2*MAX_PATH, L" ");
+                    StringCchCatW(newpath, 2*MAX_PATH, pThis->sArgs);
+                }
+                SetDlgItemTextW(hwndDlg, 14009, newpath);
+            }
             /* working dir */
             if (pThis->sWorkDir)
                 SetDlgItemTextW(hwndDlg, 14011, pThis->sWorkDir);
@@ -1973,21 +2026,25 @@
             if (lppsn->hdr.code == PSN_APPLY)
             {
                 WCHAR wszBuf[MAX_PATH];
-
                 /* set working directory */
                 GetDlgItemTextW(hwndDlg, 14011, wszBuf, MAX_PATH);
                 pThis->SetWorkingDirectory(wszBuf);
                 /* set link destination */
                 GetDlgItemTextW(hwndDlg, 14009, wszBuf, MAX_PATH);
-                if (!PathFileExistsW(wszBuf))
+                LPWSTR lpszArgs = NULL;
+                LPWSTR unquoted = strdupW(wszBuf);
+                StrTrimW(unquoted, L" ");
+                if (!PathFileExistsW(unquoted)) 
                 {
-                    //FIXME load localized error msg
-                    MessageBoxW(hwndDlg, L"file not existing", wszBuf, MB_OK);
-                    SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
-                    return TRUE;
+                    lpszArgs = PathGetArgsW(unquoted);
+                    PathRemoveArgsW(unquoted);
+                    StrTrimW(lpszArgs, L" ");
                 }
+                if (unquoted[0] == '"' && unquoted[wcslen(unquoted)-1] == '"')
+                    PathUnquoteSpacesW(unquoted);
 
-                WCHAR *pwszExt = PathFindExtensionW(wszBuf);
+
+                WCHAR *pwszExt = PathFindExtensionW(unquoted);
                 if (!wcsicmp(pwszExt, L".lnk"))
                 {
                     // FIXME load localized error msg
@@ -1996,12 +2053,25 @@
                     return TRUE;
                 }
 
-                pThis->SetPath(wszBuf);
+                if (!PathFileExistsW(unquoted))
+                {
+                    //FIXME load localized error msg
+                    MessageBoxW(hwndDlg, L"The specified file name in the target box is invalid", L"Error", MB_ICONERROR);
+                    SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
+                    return TRUE;
+                }
+                
+                pThis->SetPath(unquoted);
+                if (lpszArgs)
+                    pThis->SetArguments(lpszArgs);
+                else 
+                    pThis->SetArguments(L"\0");
 
+                HeapFree(GetProcessHeap(), 0, unquoted);
+
                 TRACE("This %p sLinkPath %S\n", pThis, pThis->sLinkPath);
                 pThis->Save(pThis->sLinkPath, TRUE);
-                SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
-                return TRUE;
+                SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);                return TRUE;
             }
             break;
         }
@@ -2098,6 +2168,68 @@
     return site->QueryInterface(iid, ppvSite);
 }
 
+HRESULT WINAPI CShellLink::DragEnter(IDataObject *pDataObject,
+    DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    TRACE("(%p)->(DataObject=%p)\n", this, pDataObject);
+    LPCITEMIDLIST pidlLast;
+    IShellFolder *psf;
+
+    HRESULT hr = SHBindToParent(pPidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast);
+
+    if (SUCCEEDED(hr))
+    {
+        hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IDropTarget, NULL, (LPVOID*)&mDropTarget);
+
+        if (SUCCEEDED(hr))
+            hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect);
+        else 
+            *pdwEffect = DROPEFFECT_NONE;
+
+        psf->Release();
+    }
+    else
+        *pdwEffect = DROPEFFECT_NONE;
+
+    return S_OK;
+}
+
+
+
+HRESULT WINAPI CShellLink::DragOver(DWORD dwKeyState, POINTL pt,
+    DWORD *pdwEffect)
+{
+    TRACE("(%p)\n", this);
+    HRESULT hr = S_OK;
+    if (mDropTarget)
+        hr = mDropTarget->DragOver(dwKeyState, pt, pdwEffect);
+    return hr;
+}
+
+HRESULT WINAPI CShellLink::DragLeave()
+{
+    TRACE("(%p)\n", this);
+    HRESULT hr = S_OK;
+    if (mDropTarget)
+    {
+        hr = mDropTarget->DragLeave();
+        mDropTarget->Release();
+    }
+
+    return hr;
+}
+
+HRESULT WINAPI CShellLink::Drop(IDataObject *pDataObject,
+    DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    TRACE("(%p)\n", this);
+    HRESULT hr = S_OK;
+    if (mDropTarget)
+        hr = mDropTarget->Drop(pDataObject, dwKeyState, pt, pdwEffect);
+
+    return hr;
+}
+
 /**************************************************************************
  *      IShellLink_ConstructFromFile
  */
Index: dll/win32/shell32/precomp.h
===================================================================
--- dll/win32/shell32/precomp.h	(rÃ©vision 61927)
+++ dll/win32/shell32/precomp.h	(copie de travail)
@@ -55,6 +55,7 @@
 #include "folders/printers.h"
 #include "folders/admintools.h"
 #include "folders/recyclebin.h"
+#include "droptargets/CexeDropHandler.h"
 #include "openwithmenu.h"
 #include "newmenu.h"
 #include "startmenu.h"
Index: dll/win32/shell32/shellord.cpp
===================================================================
--- dll/win32/shell32/shellord.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shellord.cpp	(copie de travail)
@@ -309,7 +309,7 @@
  * ordinal. If you change the implementation here please update the code in
  * shlwapi as well.
  */
-EXTERN_C int WINAPI ShellMessageBoxW(
+EXTERN_C int ShellMessageBoxW(
     HINSTANCE hInstance,
     HWND hWnd,
     LPCWSTR lpText,
@@ -367,7 +367,7 @@
  * NOTES
  *     Exported by ordinal
  */
-EXTERN_C int WINAPI ShellMessageBoxA(
+EXTERN_C int ShellMessageBoxA(
     HINSTANCE hInstance,
     HWND hWnd,
     LPCSTR lpText,
@@ -2265,8 +2265,11 @@
     }
 
     Shell_GetImageLists(&hLarge, &hSmall);
-    hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall);
 
+    // Duplicating the imagelist causes the start menu items not to draw on the first show.
+    // Was the Duplicate necessary for some reason? I believe Windows returns the raw pointer here.
+    hNew = /*ImageList_Duplicate*/(iImageList == SHIL_LARGE ? hLarge : hSmall);
+
     /* Get the interface for the new image list */
     if (hNew)
     {
Index: dll/win32/shell32/filedefext.cpp
===================================================================
--- dll/win32/shell32/filedefext.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/filedefext.cpp	(copie de travail)
@@ -95,7 +95,7 @@
 
     return pwszResult;
 }
-        
+
 VS_FIXEDFILEINFO *CFileVersionInfo::GetFixedInfo()
 {
     if (!m_pInfo)
@@ -531,10 +531,18 @@
     if (m_bDir)
     {
         /* For directories files have to be counted */
-        StringCchCopyW(wszBuf, _countof(wszBuf), m_wszPath);
-        CountFolderAndFiles(wszBuf, _countof(wszBuf));
 
-        /* Update size filed */
+        _CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_CountFolderAndFilesData)));
+        data->This = this;
+        data->pwszBuf = static_cast<LPWSTR>(HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * MAX_PATH));
+        data->cchBufMax = MAX_PATH;
+        data->hwndDlg = hwndDlg;
+        this->AddRef();
+        StringCchCopyW(data->pwszBuf, MAX_PATH, m_wszPath);
+
+        SHCreateThread(CFileDefExt::_CountFolderAndFilesThreadProc, data, NULL, NULL);
+
+        /* Update size field */
         if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf)))
             SetDlgItemTextW(hwndDlg, 14011, wszBuf);
 
@@ -635,7 +643,7 @@
             }
             else if (LOWORD(wParam) == 14021 || LOWORD(wParam) == 14022 || LOWORD(wParam) == 14023) /* checkboxes */
                 PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-           else if (LOWORD(wParam) == 14001) /* Name */
+            else if (LOWORD(wParam) == 14001) /* Name */
             {
                 if (HIWORD(wParam) == EN_CHANGE)
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
@@ -675,7 +683,7 @@
                     if (!MoveFileW(pFileDefExt->m_wszPath, wszBuf))
                         ERR("MoveFileW failed\n");
                 }
-                    
+
                 SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
                 return TRUE;
             }
@@ -858,7 +866,7 @@
 
 CFileDefExt::~CFileDefExt()
 {
-    
+
 }
 
 HRESULT WINAPI
@@ -968,8 +976,23 @@
     return E_NOTIMPL;
 }
 
+DWORD WINAPI
+CFileDefExt::_CountFolderAndFilesThreadProc(LPVOID lpParameter)
+{
+    _CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(lpParameter);
+    DWORD ticks = 0;
+    data->This->CountFolderAndFiles(data->hwndDlg, data->pwszBuf, data->cchBufMax, &ticks);
+
+    //Release the CFileDefExt and data object holds in the copying thread.
+    data->This->Release();
+    HeapFree(GetProcessHeap(), 0, data->pwszBuf);
+    HeapFree(GetProcessHeap(), 0, data);
+
+    return 0;
+}
+
 BOOL
-CFileDefExt::CountFolderAndFiles(LPWSTR pwszBuf, UINT cchBufMax)
+CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, DWORD *ticks)
 {
     /* Find filename position */
     UINT cchBuf = wcslen(pwszBuf);
@@ -991,6 +1014,12 @@
         return FALSE;
     }
 
+    BOOL root = FALSE;
+    if (*ticks == 0) {
+        *ticks = GetTickCount();
+        root = TRUE;
+    }
+
     do
     {
         if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -1002,7 +1031,7 @@
             ++m_cFolders;
 
             StringCchCopyW(pwszFilename, cchFilenameMax, wfd.cFileName);
-            CountFolderAndFiles(pwszBuf, cchBufMax);
+            CountFolderAndFiles(hwndDlg, pwszBuf, cchBufMax, ticks);
         }
         else
         {
@@ -1013,8 +1042,42 @@
             FileSize.u.HighPart = wfd.nFileSizeHigh;
             m_DirSize.QuadPart += FileSize.QuadPart;
         }
+        if (GetTickCount() - *ticks > (DWORD) 300)
+        {
+            /* FIXME Using IsWindow is generally ill advised */
+            if (IsWindow(hwndDlg))
+            {
+                WCHAR wszBuf[MAX_PATH];
+
+                if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf)))
+                    SetDlgItemTextW(hwndDlg, 14011, wszBuf);
+
+                /* Display files and folders count */
+                WCHAR wszFormat[256];
+                LoadStringW(shell32_hInstance, IDS_FILE_FOLDER, wszFormat, _countof(wszFormat));
+                StringCchPrintfW(wszBuf, _countof(wszBuf), wszFormat, m_cFiles, m_cFolders);
+                SetDlgItemTextW(hwndDlg, 14027, wszBuf);
+                *ticks = GetTickCount();
+            }
+            else
+                break;
+        }
     } while(FindNextFileW(hFind, &wfd));
 
+    if (root && IsWindow(hwndDlg))
+    {
+        WCHAR wszBuf[MAX_PATH];
+
+        if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf)))
+            SetDlgItemTextW(hwndDlg, 14011, wszBuf);
+
+        /* Display files and folders count */
+        WCHAR wszFormat[256];
+        LoadStringW(shell32_hInstance, IDS_FILE_FOLDER, wszFormat, _countof(wszFormat));
+        StringCchPrintfW(wszBuf, _countof(wszBuf), wszFormat, m_cFiles, m_cFolders);
+        SetDlgItemTextW(hwndDlg, 14027, wszBuf);
+    }
+
     FindClose(hFind);
     return TRUE;
 }
Index: dll/win32/shell32/shlfileop.cpp
===================================================================
--- dll/win32/shell32/shlfileop.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shlfileop.cpp	(copie de travail)
@@ -42,7 +42,7 @@
 static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec);
 static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path);
 static DWORD SHNotifyDeleteFileW(LPCWSTR path);
-static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest);
+static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir);
 static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists);
 static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly);
 
@@ -531,7 +531,7 @@
  * RETURNS
  *  ERORR_SUCCESS if successful
  */
-static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest)
+static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir)
 {
     BOOL ret;
 
@@ -559,7 +559,8 @@
     }
     if (ret)
     {
-        SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest);
+        SHChangeNotify(isdir ? SHCNE_MKDIR : SHCNE_CREATE, SHCNF_PATHW, dest, NULL);
+        SHChangeNotify(isdir ? SHCNE_RMDIR : SHCNE_DELETE, SHCNF_PATHW, src, NULL);
         return ERROR_SUCCESS;
     }
     return GetLastError();
@@ -1474,7 +1475,10 @@
         {
             BOOL bDelete;
             if (TRASH_TrashFile(fileEntry->szFullPath))
+            {
+                SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, fileEntry->szFullPath, NULL);
                 continue;
+            }
 
             /* Note: Windows silently deletes the file in such a situation, we show a dialog */
             if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING))
@@ -1491,7 +1495,10 @@
 
         /* delete the file or directory */
         if (IsAttribFile(fileEntry->attributes))
+        {
             bPathExists = DeleteFileW(fileEntry->szFullPath);
+            SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, fileEntry->szFullPath, NULL);
+        }
         else
             bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE);
 
@@ -1548,7 +1555,7 @@
     PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename);
 
     if (IsAttribFile(feFrom->attributes))
-        SHNotifyMoveFileW(feFrom->szFullPath, szDestPath);
+        SHNotifyMoveFileW(feFrom->szFullPath, szDestPath, FALSE);
     else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard))
         move_dir_to_dir(lpFileOp, feFrom, szDestPath);
 }
@@ -1599,7 +1606,7 @@
         if (fileDest->bExists && IsAttribDir(fileDest->attributes))
             move_to_dir(lpFileOp, entryToMove, fileDest);
         else
-            SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath);
+            SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes));
     }
 
     return ERROR_SUCCESS;
@@ -1628,7 +1635,7 @@
     if (feTo->bExists)
         return ERROR_ALREADY_EXISTS;
 
-    return SHNotifyMoveFileW(feFrom->szFullPath, feTo->szFullPath);
+    return SHNotifyMoveFileW(feFrom->szFullPath, feTo->szFullPath, IsAttribDir(feFrom->attributes));
 }
 
 /* alert the user if an unsupported flag is used */
Index: dll/win32/shell32/shpolicy.cpp
===================================================================
--- dll/win32/shell32/shpolicy.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shpolicy.cpp	(copie de travail)
@@ -67,7 +67,7 @@
 static const char strNoWindowsUpdate[] = {"NoWindowsUpdate"};
 static const char strNoSetActiveDesktop[] = {"NoSetActiveDesktop"};
 static const char strNoForgetSoftwareUpdate[] = {"NoForgetSoftwareUpdate"};
-static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"};
+//static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"};
 static const char strForceCopyACLW[] = {"ForceCopyACLWithFile"};
 static const char strNoResolveTrk[] = {"NoResolveTrack"};
 static const char strNoResolveSearch[] = {"NoResolveSearch"};
Index: dll/win32/shell32/shlexec.cpp
===================================================================
--- dll/win32/shell32/shlexec.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shlexec.cpp	(copie de travail)
@@ -2025,7 +2025,10 @@
  * ShellExecuteExA                [SHELL32.292]
  *
  */
-BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA sei)
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
+ShellExecuteExA(LPSHELLEXECUTEINFOA sei)
 {
     SHELLEXECUTEINFOW seiW;
     BOOL ret;
@@ -2072,7 +2075,10 @@
  * ShellExecuteExW                [SHELL32.293]
  *
  */
-BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW sei)
+BOOL
+WINAPI
+DECLSPEC_HOTPATCH
+ShellExecuteExW(LPSHELLEXECUTEINFOW sei)
 {
     return SHELL_execute(sei, SHELL_ExecuteW);
 }
Index: dll/win32/shell32/lang/sq-AL.rc
===================================================================
--- dll/win32/shell32/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/win32/shell32/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,788 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TRANSLATION:  06-02-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+MENU_001 MENU
+BEGIN
+    MENUITEM "Ikonat e mÃ«dha", FCIDM_SHVIEW_BIGICON
+    MENUITEM "Ikonat e vogla", FCIDM_SHVIEW_SMALLICON
+    MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW
+    MENUITEM "&Detaje", FCIDM_SHVIEW_REPORTVIEW
+END
+
+/* shellview background menu */
+MENU_002 MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        POPUP "&VÃ«zhgo"
+        BEGIN
+            MENUITEM "Ikonat e mÃ«dha", FCIDM_SHVIEW_BIGICON
+            MENUITEM "Ikonat e vogla", FCIDM_SHVIEW_SMALLICON
+            MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW
+            MENUITEM "&Detaje", FCIDM_SHVIEW_REPORTVIEW
+        END
+        MENUITEM SEPARATOR
+        POPUP "Organizo &Ikona"
+        BEGIN
+            MENUITEM "Nga &Emri", 0x30  /* column 0 */
+            MENUITEM "Nga &Tipi", 0x32  /* column 2 */
+            MENUITEM "Nga &Masa", 0x31  /* ... */
+            MENUITEM "Nga &Data", 0x33
+            MENUITEM SEPARATOR
+            MENUITEM "Organizo &Auto", FCIDM_SHVIEW_AUTOARRANGE
+        END
+        MENUITEM "Rreshto Ikonat", FCIDM_SHVIEW_SNAPTOGRID
+        MENUITEM SEPARATOR
+        MENUITEM "Riresko", FCIDM_SHVIEW_REFRESH
+        MENUITEM SEPARATOR
+        MENUITEM "Ngjit", FCIDM_SHVIEW_INSERT
+        MENUITEM "Ngjit si Lidhje", FCIDM_SHVIEW_INSERTLINK
+        MENUITEM SEPARATOR
+        MENUITEM "CilÃ«sime", FCIDM_SHVIEW_PROPERTIES
+    END
+END
+
+/* shellview item menu */
+MENU_SHV_FILE MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "E&xplorues", FCIDM_SHVIEW_EXPLORE
+        MENUITEM "&Hap", FCIDM_SHVIEW_OPEN
+        MENUITEM SEPARATOR
+        MENUITEM "Prej", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopjo", FCIDM_SHVIEW_COPY
+        MENUITEM SEPARATOR
+        MENUITEM "Krijo &Lidhje", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Fshi", FCIDM_SHVIEW_DELETE
+        MENUITEM "&RiemÃ«rto", FCIDM_SHVIEW_RENAME
+        MENUITEM SEPARATOR
+        MENUITEM "&CilÃ«sime", FCIDM_SHVIEW_PROPERTIES
+    END
+END
+
+IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Shfleto pÃ«r Dosje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Anulo", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
+    LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
+    LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
+    CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
+END
+
+IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Shfleto pÃ«r Dosje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
+    LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
+    LTEXT "Dosje:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
+    CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
+    EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "&BÃ«j Dosje T're", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
+END
+
+IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Meszhe"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "&Po", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Po pÃ«r T'gjitha", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "&Jo", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "&Anulo", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
+    LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
+END
+
+IDD_ABOUT DIALOGEX 0, 0, 275, 198
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Rreth %s"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
+    LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
+    LTEXT "Versioni ", IDC_STATIC, 35, 65, 28, 10
+    LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10
+    LTEXT " (", IDC_STATIC, 90, 65, 5, 10
+    LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10
+    LTEXT ")", IDC_STATIC, 153, 65, 5, 10
+    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
+    LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10
+    LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
+    LTEXT "Ky version ReactOS Ã«shtÃ« i regjistruar pÃ«r:", IDC_STATIC, 35, 115, 180, 10
+    LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10
+    LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10
+    LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ
+    LTEXT "Kujtesa fizike e instaluar:", IDC_STATIC, 35, 152, 130, 10
+    LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10
+    DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14
+    PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14
+END
+
+IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ReactOS u soll tek ju nga:", IDC_STATIC, 0, 0, 180, 10
+    LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75
+END
+
+IDD_RUN DIALOGEX 0, 0, 227, 95
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "EKzekuto"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
+    LTEXT "Shkruaj emrin e njÃ« programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do tÃ« hap atÃ« pÃ«r ju.", 12289, 36, 11, 182, 18
+    LTEXT "&Hap:", 12305, 7, 39, 24, 10
+    CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE |  CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
+    DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP
+    PUSHBUTTON "&Shfleto...", 12288, 160, 63, 59, 14, WS_TABSTOP
+END
+
+IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "IkonÃ«"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
+    EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Tipi Objektivit:", 14004, 8, 38, 68, 10
+    EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "Vendndodhja ObjektivitTarget location:", 14006, 8, 55, 68, 10
+    EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Objektivi:", 14008, 8, 71, 68, 10
+    EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
+    LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "&Fillo nÃ«:", 14010, 8, 98, 68, 10
+    EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
+    LTEXT "IkonÃ« &Ã§elÃ«s:", 14014, 8, 117, 68, 10
+    CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
+    LTEXT "&Ekzekuto:", 14016, 8, 136, 68, 10
+    COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    LTEXT "K&oment:", 14018, 8, 154, 68, 10
+    EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "&Gjej Objektivin...", 14020, 9, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "&Ndrysho IkonÃ«...", 14021, 84, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "A&vancuar...", 14022, 159, 172, 70, 14, ES_LEFT
+END
+
+IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "Karakteristika Zgjeruara"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Zgjidhni karakteristikat e avancuara qÃ« ju dÃ«shironi pÃ«r kÃ«tÃ« ikonÃ«.", -1, 5, 30, 210, 10
+    CHECKBOX "Ekzekuto me kredenciale tÃ« ndryshme", 14000, 25, 50, 150, 10
+    LTEXT "Ky opsion mund tÃ« lejojÃ« pÃ«r tÃ« drejtuar kÃ«tÃ« ikonÃ« si njÃ« pÃ«rdorues tjetÃ«r, ose tÃ« vazhdojÃ« si veten tÃ«nde, duke mbrojtur kompjuterin tuaj dhe tÃ« dhÃ«nat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 175, 40
+    CHECKBOX "Ekzekuto nÃ« hapÃ«sirÃ« â€‹â€‹tÃ« veÃ§antÃ« qÃ« e kujtesÃ«s", 14001, 25, 100, 90, 10, WS_DISABLED
+    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "NdÃ«rprej", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
+    EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT
+    LTEXT "Tipi i dokumentit:", 14004, 8, 40, 55, 10
+    CONTROL "Dosje", 14005, "modifiko", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 68, 40, 160, 10
+    LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Vendndodhje:", 14008, 8, 56, 55, 10
+    EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
+    LTEXT "MasÃ«:", 14010, 8, 72, 55, 10
+    EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "Masa e diskut:", 140101, 8, 88, 55, 10
+    EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "PÃ«rmban:", 14026, 8, 104, 55, 10
+    EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Krijuar:", 14014, 8, 128, 55, 10
+    EDITTEXT 14015, 68, 128, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Atribute:", 14020, 8, 152, 46, 10
+    AUTOCHECKBOX "&VetÃ«m-lexues", 14021, 56, 152, 70, 10
+    AUTOCHECKBOX "&Fshehur", 14022, 56, 166, 70, 10
+    AUTOCHECKBOX "&Arkiva", 14023, 56, 180, 70, 10
+    PUSHBUTTON "A&vancuar...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "PÃ«rgjithshme"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
+    EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | WS_TABSTOP
+    LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Tipi i dokumentit:", 14004, 8, 35, 50, 10
+    CONTROL "Dokumenti", 14005, "modifiko", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10
+    LTEXT "Hap me:", 14006, 8, 53, 50, 10
+    ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE
+    PUSHBUTTON "&Ndrysho...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
+    LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Vendndodhje:", 14008, 8, 75, 45, 10
+    EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
+    LTEXT "MasÃ«:", 14010, 8, 91, 45, 10
+    EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "MasÃ« nÃ« disk:", 140112, 8, 107, 55, 10
+    EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Krijuar:", 14014, 8, 131, 45, 10
+    EDITTEXT 14015, 68, 131, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Modifikuar:", 14016, 8, 147, 45, 10
+    EDITTEXT 14017, 68, 147, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Aksesuar:", 14018, 8, 163, 45, 10
+    EDITTEXT 14019, 68, 163, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Atribute:", 14020, 8, 189, 45, 10
+    AUTOCHECKBOX "&VetÃ«m-lexues", 14021, 58, 189, 67, 10
+    AUTOCHECKBOX "&Fshehur", 14022, 126, 189, 50, 10
+    AUTOCHECKBOX "&Arkivuar", 14023, 181, 189, 49, 10
+    PUSHBUTTON "A&vancuar...", 14028, 180, 185, 50, 15, WS_TABSTOP
+END
+
+IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Versioni"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Versioni dokumentit: ", 14000, 10, 10, 55, 10
+    EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+    LTEXT "PÃ«rshkrimi: ", 14002, 10, 27, 45, 10
+    EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+    GROUPBOX "Informacione tÃ« tjera Versioni: ", 14006, 6, 70, 222, 115
+    LTEXT "Emri artikullit: ", 14007, 13, 82, 50, 10
+    LTEXT "Vlera: ", 14008, 112, 82, 45, 10
+    LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
+    EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
+END
+
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PÃ«rgjithshme"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
+    LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Tipi:", -1, 8, 38, 95, 10
+    EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "Dokumentimi Sistemit:", -1, 8, 51, 95, 10
+    EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    CONTROL "", 14013, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10
+    LTEXT "HapÃ«sira pÃ«rdorur:", -1, 25, 69, 80, 10
+    EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CONTROL "", 14014, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10
+    LTEXT "HapÃ«sirÃ« Falas:", -1, 25, 82, 80, 10
+    EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    LTEXT "Kapaciteti:", -1, 25, 103, 80, 10
+    EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CONTROL "", 14015, "Statik", SS_OWNERDRAW, 70, 116, 100, 30
+    LTEXT "Drive %c", 14009, 100, 150, 70, 10
+    PUSHBUTTON "Pastrim &Disku", 14010, 160, 154, 70, 15, WS_TABSTOP
+    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
+    CHECKBOX "Kompres drivin pÃ«r tÃ« kursyer hapÃ«sirÃ« â€‹â€‹nÃ« disk", 14011, 8, 191, 222, 10, WS_DISABLED
+    CHECKBOX "Lejo ShÃ«rbimet e Indeksimi pÃ«r indeksim tÃ« kÃ«tij disku pÃ«r dokumentat tÃ« shpejtÃ« nÃ« kÃ«rkim", 14012, 8, 205, 222, 10, WS_DISABLED
+END
+
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Vegla"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Bagim-kontroll", -1, 5, 5, 230, 60
+    LTEXT "Ky opsion do tÃ« kontrollojÃ« volumin pÃ«r\ngabime.", -1, 40, 25, 160, 20
+    PUSHBUTTON "Kontrollo tani...", 14000, 130, 45, 90, 15, WS_TABSTOP
+    GROUPBOX "Defragmentacion", -1, 5, 65, 230, 60
+    LTEXT "Ky opsion do tÃ« defragmentojÃ« dokumentat nga vÃ«llimi", -1, 40, 85, 160, 20
+    PUSHBUTTON "Defragmento Tani...", 14001, 130, 105, 90, 15, WS_TABSTOP
+    GROUPBOX "Rezervat", -1, 5, 130, 230, 60
+    LTEXT "Ky opsion do tÃ« ruaj/rezervoj dokumentat nga vÃ«llimi.", -1, 40, 150, 160, 20
+    PUSHBUTTON "Rezerv Tani...", 14002, 130, 170, 90, 15, WS_TABSTOP
+END
+
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Pajisje"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+END
+
+IDD_RUN_AS DIALOGEX 0, 0, 240, 190
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ekzekuto Si"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Cila llogari pÃ«rdoruese doni tÃ« pÃ«rdorni pÃ«r tÃ« ekzekutuar kÃ«tÃ« program?", -1, 10, 20, 220, 20
+    CHECKBOX "PÃ«rdoruesi tanishme %s", 14000, 10, 45, 150, 10
+    LTEXT "Mbroni kompjuterin tim dhe tÃ« dhÃ«na nga aktiviteti i paautorizuar i programit", -1, 25, 57, 200, 10, WS_DISABLED
+    CHECKBOX "Ky opsion mund tÃ« parandaloi viruset kompjuterike qÃ« dÃ«mtojnÃ« kompjuterin tuaj personal ose tÃ« dhÃ«nat, por zgjedhja e programit mund tÃ« shkaktojÃ« funksionim nÃ« mÃ«nyrÃ« tÃ« paligjshme.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
+    CHECKBOX "PÃ«rdorues nÃ« vijim:", 14002, 10, 100, 90, 10
+    LTEXT "PÃ«rdoruesi:", -1, 20, 118, 54, 10
+    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    LTEXT "FjalÃ«kalimi:", -1, 20, 143, 53, 10
+    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
+    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", 14008, 122, 170, 60, 14, WS_TABSTOP
+END
+
+IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "CilÃ«simet Koshit"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
+    GROUPBOX "Parametrat pÃ«r vendndodhjen e pÃ«rzgjedhur", -1, 10, 72, 220, 70
+    RADIOBUTTON "MasÃ« me porosi:", 14001, 20, 90, 80, 10, WS_TABSTOP
+    EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
+    LTEXT "M&aximum masÃ«(MB):", -1, 20, 105, 70, 10
+    RADIOBUTTON "Mos lÃ«viz dokumenta nÃ« kosh. Hiqni dokumenat menjÃ«herÃ« kur fshihen.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
+    AUTOCHECKBOX "&Shfaq dialog konfirmues fshini", 14004, 20, 155, 140, 10, WS_TABSTOP
+END
+
+IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Hap Me"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
+    LTEXT "Zgjidhni programin qÃ« dÃ«shironi tÃ« pÃ«rdorni pÃ«r tÃ« hapur kÃ«tÃ« dokument:", -1, 44, 12, 211, 10
+    LTEXT "Dokument:    ", 14001, 44, 25, 188, 10
+    GROUPBOX "&Programe", -1, 7, 42, 249, 187
+    CONTROL "Programe", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
+    AUTOCHECKBOX "&GjithmonÃ« pÃ«rdorni programin e pÃ«rzgjedhur pÃ«r tÃ« hapur kÃ«tÃ« lloj dokumenti", 14003, 20, 193, 225, 10
+    PUSHBUTTON "&Shfleto...", 14004, 198, 207, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 206, 236, 50, 14
+END
+
+IDD_FILE_COPY DIALOGEX 0, 0, 264, 45
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Kopjim..."
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    PUSHBUTTON "Anulo", 14002, 195, 14, 60, 16 
+    CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10
+    LTEXT "Dokument", 14001, 8, 6, 169, 10
+END
+
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "PÃ«rgjithshÃ«m"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Detyra", -1, 7, 10, 249, 45
+    ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL
+    AUTORADIOBUTTON "Trego detyra tÃ« pÃ«rbashkÃ«ta nÃ« dosjet", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
+    AUTORADIOBUTTON "PÃ«rdorimi ReactOS dosjet klasike", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP
+    GROUPBOX "Shfleto Dosje", -1, 7, 60, 249, 45, WS_TABSTOP
+    ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL
+    AUTORADIOBUTTON "Hap Ã§do dosje nÃ« tÃ« njÃ«tÃ«n dritare", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
+    AUTORADIOBUTTON "Hap Ã§do dosje nÃ« dritaren e saj", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP
+    GROUPBOX "Klikoni artikuj si mÃ« poshtÃ«", -1, 7, 110, 249, 60
+    ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL
+    AUTORADIOBUTTON "Klikim-njÃ«herÃ«sh pÃ«r tÃ« hapur njÃ« objekt (pikÃ« pÃ«r tÃ« zgjedhur)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
+    AUTORADIOBUTTON "NÃ«nvizo titull ikone nÃ« pÃ«rputhje me shfletuesin tim", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
+    AUTORADIOBUTTON "NÃ«nvizo ikonÃ«n vetÃ«m nÃ« tituj ku unÃ« vÃ« pikÃ« nÃ« ta", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP
+    AUTORADIOBUTTON "Kliko-dyherÃ« pÃ«r tÃ« hapur njÃ« objekt (klikoni-njÃ«erÃ«sht pÃ«r tÃ« zgjedhur)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP
+    PUSHBUTTON "&Rikthe Parazgjedhjet", 14011, 180, 180, 60, 14, WS_TABSTOP
+END
+
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "VÃ«zhgo"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "VÃ«zhgo Dosjen", -1, 7, 10, 249, 60
+    //ICON
+    LTEXT "Ju mund tÃ« aplikoni pamje (tÃ« tilla si Detaje ose Pllaka) qÃ«\nJu jeni duke pÃ«rdorur pÃ«r kÃ«tÃ« dosje tÃ« gjitha dosjet.", -1, 60, 20, 180, 20
+    PUSHBUTTON "Apliko pÃ«r tÃ« gjitha Dosjet", 14001, 60, 50, 80, 14, WS_TABSTOP
+    PUSHBUTTON "&RivÃ« tÃ« gjitha Dosjet", 14002, 150, 50, 80, 14, WS_TABSTOP
+    LTEXT "CilÃ«sime tÃ« Avancuar:", -1, 7, 80, 100, 10
+    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    PUSHBUTTON "Kthej &Parazgjedhje", 14004, 180, 210, 80, 14, WS_TABSTOP
+END
+
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
+CAPTION "Tipe Dokumenti"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 70, 10
+    CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80
+    PUSHBUTTON "E're", 14001, 120, 110, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Fshi", 14002, 180, 110, 50, 14, WS_TABSTOP
+    GROUPBOX "Detaje pÃ«r '%s' zgjerim", 14003, 7, 130, 249, 70
+    LTEXT "Hap me:", -1, 12, 140, 40, 10
+    //ICON
+    LTEXT "Emriapp", 14005, 100, 140, 40, 10
+    PUSHBUTTON "&Ndrysho...", 14006, 180, 140, 50, 14, WS_TABSTOP
+    LTEXT "", 14007, 12, 155, 160, 30
+    PUSHBUTTON "Avancuar", 14008, 180, 175, 50, 14, WS_TABSTOP
+END
+
+IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Konfirmo ZÃ«vendÃ«simin Dokumenteve"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "&Po", IDYES, 20, 122, 60, 14
+    PUSHBUTTON "Po pÃ«r tÃ« GjithÃ«", 12807, 85, 122, 60, 14
+    PUSHBUTTON "&Jo", IDNO, 150, 122, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 215, 122, 60, 14
+    ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
+    LTEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dokument me emrin '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
+    LTEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dokument lexues-vetÃ«m me emrin '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dokument sistemi me emrin '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "Doni tÃ« zÃ«vendÃ«suar dokumentin ekzistues", -1, 44, 35, 228, 10, SS_NOPREFIX
+    LTEXT "(Data dhe madhÃ«sia e panjohur)", 12302, 79, 51, 198, 20, SS_NOPREFIX
+    ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
+    LTEXT "me kÃ«tÃ«?", -1, 44, 75, 228, 10, SS_NOPREFIX
+    LTEXT "(Data dhe madhÃ«sia e panjohur)", 12303, 79, 91, 198, 20, SS_NOPREFIX
+    ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
+END
+
+IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Dil nga ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
+    LTEXT "Jeni te sigurte qe doni tÃ« dilni?", -1, 43, 11, 140, 22
+    DEFPUSHBUTTON "&Dil", IDOK, 57, 40, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 122, 40, 60, 14
+END
+
+IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "ShkÃ«putu nga ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL
+    LTEXT "Jeni te sigurte qe doni te shkÃ«puteni?", -1, 49, 12, 137, 23
+    DEFPUSHBUTTON "ShkÃ«putu", IDOK, 57, 40, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 123, 40, 60, 14
+END
+
+IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
+CAPTION "HapAuto"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Zgjidhni njÃ« lloj pÃ«rmbajtje, mÃ« pas zgjidhni njÃ« veprim pÃ«r ReactOS pÃ«r tÃ« kryer automatikisht kur lloji qÃ« Ã«shtÃ« pÃ«rdorur nÃ« kÃ«tÃ« pajisje:", 1000, 7, 7, 215, 20
+    CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
+    GROUPBOX "Veprim", -1, 7, 45, 212, 146
+    AUTORADIOBUTTON "Zgjidhni njÃ« veprim pÃ«r tÃ« kryer:", 1005, 14, 54, 202, 10, WS_GROUP
+    CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
+    AUTORADIOBUTTON "MÃ« kÃ«rko mua Ã§do herÃ« pÃ«r tÃ« zgjedhur dhe njÃ« veprim", 1006, 14, 177, 202, 10
+    PUSHBUTTON "Kthej Parazgjedhje", 1008, 108, 197, 110, 14, WS_DISABLED
+END
+
+IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
+CAPTION "PÃ«rmbajtja PÃ«rzier"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", 1000, 5, 7, 21, 20
+    LTEXT "Ky disk ose pajisje pÃ«rmban mÃ« shumÃ« se njÃ« lloj tÃ« pÃ«rmbajtjes.", 1001, 32, 7, 191, 20
+    LTEXT "Ã‡farÃ« doni qÃ« ReactOS tÃ« bÃ«jÃ«?", 1002, 32, 31, 188, 8
+    CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
+    DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 160, 186, 60, 14
+END
+
+IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
+CAPTION "PÃ«rmbajtja PÃ«rzier"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", 1000, 5, 7, 21, 20
+    LTEXT "ReactOS mund tÃ« kryej tÃ« njÃ«jtin veprim sa herÃ« qÃ« ju tÃ« fusni njÃ« disk, ose njÃ« pajisje tÃ« lidhur me kÃ«tÃ« lloj dokumenti:", 1001, 30, 7, 193, 20
+    ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
+    EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Ã‡farÃ« doni qÃ« ReactOS tÃ« bÃ«jÃ«?", 1002, 32, 41, 190, 8
+    CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
+    AUTOCHECKBOX "GjithmonÃ« tÃ« bÃ«jÃ« veprimin e zgjedhur.", 1004, 32, 171, 190, 10
+    DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 160, 185, 60, 14
+END
+
+IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
+CAPTION "HapAuto"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", 1000, 5, 7, 21, 20
+    LTEXT "ReactOS mund tÃ« kryejÃ« tÃ« njÃ«jtÃ«n veprim sa herÃ« qÃ« ju lidhni kÃ«tÃ« pajisje.", 1001, 32, 7, 190, 22
+    LTEXT "&Ã‡farÃ« doni qÃ« ReactOS tÃ« bÃ«jÃ«?", 1002, 32, 31, 190, 8
+    CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
+    AUTOCHECKBOX "&GjithmonÃ« tÃ« bÃ«jÃ« veprimin e zgjedhur", 1004, 32, 143, 190, 8
+    DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 159, 160, 60, 14
+END
+
+IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
+CAPTION "Fikni ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
+    LTEXT "Ã‡farÃ« doni kompjuter tÃ« bÃ«jÃ«?", -1, 39, 7, 167, 10
+    COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "MirÃ«mban seancÃ«n tuaj, duke e mbajtur kompjuterin nÃ« punÃ« me fuqi tÃ« ulÃ«t dhe tÃ« dhÃ«nat ende nÃ« kujtesÃ«. Kompjuter zgjohet kur tÃ« shtypni njÃ« buton apo lÃ«vizja e miut.", 8225, 39, 40, 167, 37
+    DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
+    PUSHBUTTON "Anulo", IDCANCEL, 75, 82, 60, 14
+    PUSHBUTTON "&NdihmÃ«", IDHELP, 144, 82, 60, 14
+END
+
+IDD_FORMAT_DRIVE DIALOGEX 50, 50, 184, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Format"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "&Fillo", IDOK, 53, 198, 60, 14
+    PUSHBUTTON "&Mbyll", IDCANCEL, 118, 198, 60, 14
+    LTEXT "Kapaciteti:", -1, 7, 6, 169, 9
+    COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&Dokumente sistemi", -1, 7, 35, 170, 9
+    COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
+    LTEXT "MadhÃ«sia NjÃ«sisÃ« Alokimit", -1, 7, 64, 170, 9
+    COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
+    LTEXT "&Etiketa volumit", -1, 7, 93, 170, 9
+    EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
+    GROUPBOX "&Opsione format", 4610, 7, 121, 170, 49
+    AUTOCHECKBOX "Format ShpejtÃ«", 28674, 16, 135, 155, 10
+    AUTOCHECKBOX "MundÃ«so Kompresimin", 28675, 16, 152, 155, 10
+END
+
+IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Kontrollo Diskun"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON "Fillo", IDOK, 53, 100, 60, 14
+    GROUPBOX "Opsione kontrollo diskun", -1, 7, 6, 179, 50
+    PUSHBUTTON "Anulo", IDCANCEL, 118, 100, 60, 14
+    AUTOCHECKBOX "Rregullo dokumentet e sistemit automatikisht", 14000, 16, 15, 155, 10
+    AUTOCHECKBOX "&Skano pÃ«r shÃ«rim dhe pÃ«rpjekje tÃ« sektorÃ«ve tÃ« kÃ«qij", 14001, 16, 30, 165, 10
+    CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8
+    LTEXT "", 14003, 60, 80, 170, 10
+END
+
+IDD_PICK_ICON DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Ndrysho IkonÃ«"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Dokument:", -1, 7, 14, 208, 10
+    PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 148, 24, 67, 14
+    EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Ikona:", -1, 7, 47, 208, 10
+    LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 167, 181, 50, 14
+END
+
+STRINGTABLE
+BEGIN
+    /* columns in the shellview */
+    IDS_SHV_COLUMN1 "Dokument"
+    IDS_SHV_COLUMN2 "MasÃ«"
+    IDS_SHV_COLUMN3 "Tipi"
+    IDS_SHV_COLUMN4 "Modifikuar"
+    IDS_SHV_COLUMN5 "Atribute"
+    IDS_SHV_COLUMN6 "MasÃ«"
+    IDS_SHV_COLUMN7 "Masa nÃ« dispozicion"
+    IDS_SHV_COLUMN8 "Emri"
+    IDS_SHV_COLUMN9 "Komente"
+    IDS_SHV_COLUMN10 "ZotÃ«ruesi"
+    IDS_SHV_COLUMN11 "Grup"
+    IDS_SHV_COLUMN12 "Dokument"
+    IDS_SHV_COLUMN13 "Kategori"
+    IDS_SHV_COLUMN_DELFROM "Vendndodhja Origjinale"
+    IDS_SHV_COLUMN_DELDATE "Data FshirÃ«"
+    IDS_SHV_COLUMN_FONTTYPE "TipiFontit"
+    IDS_SHV_COLUMN_WORKGROUP "GrupipunÃ«s"
+    IDS_SHV_NETWORKLOCATION "Vendndodhja Rrjetit"
+    IDS_SHV_COLUMN_DOCUMENTS "DokumentÃ«"
+    IDS_SHV_COLUMN_STATUS "GjÃ«ndje"
+    IDS_SHV_COLUMN_COMMENTS "Komente"
+    IDS_SHV_COLUMN_LOCATION "Vendnodhje"
+    IDS_SHV_COLUMN_MODEL "Modeli"
+
+    /* special folders */
+    IDS_DESKTOP "Desktop"
+    IDS_MYCOMPUTER "Kompjuteri Im"
+    IDS_RECYCLEBIN_FOLDER_NAME "Plehra"
+    IDS_CONTROLPANEL "Paneli Kontrollit"
+    IDS_ADMINISTRATIVETOOLS "Vegla Administrative"
+
+    /* context menus */
+    IDS_VIEW_LARGE "Ikonat e mÃ«dha"
+    IDS_VIEW_SMALL "Ikonat e vogla"
+    IDS_VIEW_LIST "&Lista"
+    IDS_VIEW_DETAILS "&Detaje"
+    IDS_SELECT "PÃ«rtgjedh"
+    IDS_OPEN "Hap"
+    IDS_CREATELINK "Krijo &Lidhje"
+    IDS_COPY "&Kopjo"
+    IDS_DELETE "Fshi"
+    IDS_PROPERTIES "Karakteristika"
+    IDS_CUT "Prej"
+    IDS_RESTORE "Rikthe"
+    IDS_FORMATDRIVE "Format..."
+    IDS_RENAME "RiemÃ«rto"
+    IDS_INSERT "Fut"
+
+    IDS_CREATEFOLDER_DENIED "NÃ« pamundÃ«si pÃ«r tÃ« krijuar dosje tÃ« re: Ndalohet hyrja."
+    IDS_CREATEFOLDER_CAPTION "Gabim gjatÃ« krijimit tÃ« njÃ« dosje tÃ« re"
+    IDS_DELETEITEM_CAPTION "Konfirmo fshirjen e dokumentit"
+    IDS_DELETEFOLDER_CAPTION "Konfirmo fshirjen e dosjes"
+    IDS_DELETEITEM_TEXT "Jeni te sigurte qe doni te fshini '%1'?"
+    IDS_DELETEMULTIPLE_TEXT "Jeni te sigurte qe doni te fshini kÃ«to %1 artikuj?"
+    IDS_DELETESELECTED_TEXT "Jeni te sigurte qe doni te fshini elementin e zgjedhur?"
+    IDS_TRASHITEM_TEXT "A jeni i sigurt qÃ« ju dÃ«shironi tÃ« dÃ«rgoni '%1' nÃ« Plehra?"
+    IDS_TRASHFOLDER_TEXT "A jeni i sigurt qÃ« ju dÃ«shironi tÃ« dÃ«rgoni '%1' dhe tÃ«rÃ« pÃ«rmbajtjen e saj nÃ« Plehra?"
+    IDS_TRASHMULTIPLE_TEXT "A jeni i sigurt qÃ« ju dÃ«shironi tÃ« dÃ«rgoni kÃ«to %1 artikuj nÃ« Plehra?"
+    IDS_CANTTRASH_TEXT "Pika '%1' nuk mund tÃ« dÃ«rgohet nÃ« Plehra. A doni tÃ« fshini atÃ« nÃ« vend?"
+    IDS_OVERWRITEFILE_TEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dokument tÃ« quajtur '% '.\n\nA doni ta zÃ«vendÃ«soni atÃ«?"
+    IDS_OVERWRITEFILE_CAPTION "Konfirmo mbishkrim dokumenti"
+    IDS_OVERWRITEFOLDER_TEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dosje me emrin '%1'.\n\nNÃ«se dosjet nÃ« dosjen e destinacionit kanÃ« emÃ«r tÃ« njÃ«jtÃ« me dokumentet nÃ« dosje\npÃ«rzgjedh ata qÃ« do tÃ« zÃ«vendÃ«sohen. A doni ende tÃ« hyni ose kopjoni\nkÃ«tÃ« dosje?"
+
+    /* message box strings */
+    IDS_RESTART_TITLE "Rifillo"
+    IDS_RESTART_PROMPT "Doni tÃ« rifilloni sistemin?"
+    IDS_SHUTDOWN_TITLE "Fike"
+    IDS_SHUTDOWN_PROMPT "Doni ta filkni sistemin?"
+    IDS_LOGOFF_TITLE "Dilni"
+    IDS_LOGOFF_PROMPT "Doni tÃ« dilni nga sistemi?"
+
+    /* Run File dialog */
+    IDS_RUNDLG_ERROR "NÃ« pamundÃ«si pÃ«r tÃ« shfaqur kutinÃ« dialogut ekzekuto (gabim i brendshÃ«m)"
+    IDS_RUNDLG_BROWSE_ERROR "NÃ« pamundÃ«si pÃ«r tÃ« shfaqur kutinÃ« dialogut Shfleto (gabim i brendshÃ«m)"
+    IDS_RUNDLG_BROWSE_CAPTION "Shfletp"
+    IDS_RUNDLG_BROWSE_FILTER "DokumentÃ« Ekzekutues (*.exe)\0*.exe\0T'gjith Dokumentat (*.*)\0*.*\0"
+
+    /* shell folder path default values */
+    IDS_PROGRAMS "Fillo Menu\\Programe"
+    IDS_PERSONAL "Dokumentet e'mi"
+    IDS_FAVORITES "Preferuarat"
+    IDS_STARTUP "Fillo Menu\\Programe\\FilloTani"
+    IDS_RECENT "Fundift"
+    IDS_SENDTO "DÃ«rguarTek"
+    IDS_STARTMENU "Fillo Menu"
+    IDS_MYMUSIC "Muzika Ime"
+    IDS_MYVIDEO "Video e'mi"
+    IDS_DESKTOPDIRECTORY "Desktopi"
+    IDS_NETHOOD "NetHood"
+    IDS_TEMPLATES "Shabllon"
+    IDS_APPDATA "Aplikimi i tÃ« dhÃ«nave"
+    IDS_PRINTHOOD "PrintoKapuÃ§"
+    IDS_LOCAL_APPDATA "CilÃ«simet lokale\\Aplikimi i tÃ« dhÃ«nave"
+    IDS_INTERNET_CACHE "CilÃ«simet lokale\\Dokumente Interneti PÃ«rkohshÃ«m"
+    IDS_COOKIES "Biskota"
+    IDS_HISTORY "CilÃ«simet lokale\\Historia"
+    IDS_PROGRAM_FILES "Dokumente Programi"
+    IDS_MYPICTURES "My Pictures"
+    IDS_PROGRAM_FILES_COMMON "Dokumente Programi\\Dokumente ZakonshÃ«m"
+    IDS_COMMON_DOCUMENTS "Dokumente"
+    IDS_ADMINTOOLS "Fillo Menu\\Programe\\Vegla Administrative"
+    IDS_COMMON_MUSIC "Dokumente\\Muzika Ime"
+    IDS_COMMON_PICTURES "Documents\\Fotot e'mia"
+    IDS_COMMON_VIDEO "Dokumente\\Video e'mia"
+    IDS_CDBURN_AREA "CilÃ«simet lokale\\Aplikimi i tÃ« dhÃ«nave\\Microsoft\\Djegje CD"
+    IDS_NETWORKPLACE "Vendi Rrjetit Tim"
+
+    IDS_NEWFOLDER "Dosje e're"
+
+    IDS_DRIVE_FIXED "Disku VendorÃ«"
+    IDS_DRIVE_CDROM "CDROM"
+    IDS_DRIVE_NETWORK "Disku Rrjetit"
+
+    /* Open With */
+    IDS_OPEN_WITH "Hap me"
+    IDS_OPEN_WITH_CHOOSE "Zgjedh Programin..."
+    IDS_OPEN_WITH_RECOMMENDED "Programe Rekomanduara:"
+    IDS_OPEN_WITH_OTHER "Programe tÃ« TjerÃ«:"
+
+    IDS_SHELL_ABOUT_AUTHORS "&AutorÃ«t"
+    IDS_SHELL_ABOUT_BACK "< &Mbrapa"
+    FCIDM_SHVIEW_NEW "E're"
+    FCIDM_SHVIEW_NEWFOLDER "&Dosje E're"
+    FCIDM_SHVIEW_NEWLINK "&Lidhje e Re"
+    IDS_FOLDER_OPTIONS "Opsione Dosje"
+    IDS_RECYCLEBIN_LOCATION "VÃ«ndndodhja Koshit"
+    IDS_RECYCLEBIN_DISKSPACE "HapÃ«sirÃ« Dispozicion"
+    IDS_EMPTY_BITBUCKET "Zbraz Koshin"
+    IDS_PICK_ICON_TITLE "Ndrysho IkonÃ«"
+    IDS_PICK_ICON_FILTER "IkonÃ« Programi (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0T'gjith Dokumentat (*.*)\0*.*\0"
+    IDS_OPEN_WITH_FILTER "Dokumente Ekzekutues (*.exe)\0*.exe\0T'gjith Dokumentat (*.*)\0*.*\0"
+    IDS_DIRECTORY "Dosje"
+    IDS_VIRTUAL_DRIVER "UdhÃ«zuesi Virtual Pajisjes"
+    IDS_BAT_FILE "ReactOS Dokument Batch"
+    IDS_CMD_FILE "ReactOS Skript Komande"
+    IDS_COM_FILE "Aplikacion Dos"
+    IDS_CPL_FILE "Artikuj Kontroll Panelit"
+    IDS_CUR_FILE "Tregues"
+    IDS_DLL_FILE "Zgjatja Aplikacionit"
+    IDS_DRV_FILE "Drejtuesi Pajisjes"
+    IDS_EXE_FILE "Aplikacion"
+    IDS_FON_FILE "Dokument Fonti"
+    IDS_TTF_FILE "Dokument Fonti TipiVÃ«rtetÃ«"
+    IDS_HLP_FILE "Dokumente Ndihme"
+    IDS_INI_FILE "Konfigum CilÃ«simesh"
+    IDS_LNK_FILE "Shkurtues"
+    IDS_SYS_FILE "Dokumente Sistemi"
+
+    IDS_OPEN_VERB "Hap"
+    IDS_EXPLORE_VERB "Eksplorer"
+    IDS_RUNAS_VERB "Ekzekuto Si "
+    IDS_EDIT_VERB "Modifiko"
+    IDS_FIND_VERB "Gjej"
+    IDS_PRINT_VERB "Printo"
+
+    IDS_FILE_FOLDER "%u Dokumenta, %u Dosje"
+    IDS_PRINTERS "Printera"
+    IDS_FONTS "Fonte"
+    IDS_INSTALLNEWFONT "Instalo Fonte tÃ« Ri..."
+
+    IDS_DEFAULT_CLUSTER_SIZE "Masa parazgjedhur shpÃ«rndarjes"
+    IDS_COPY_OF "Kopjo"
+
+    IDS_SHLEXEC_NOASSOC "Nuk ka asnjÃ« program tÃ« Windows tÃ« konfiguruar pÃ«r tÃ« hapur kÃ«tÃ« lloj file."
+
+    IDS_FILE_DETAILS "Detaje pÃ«r '%s' prapashtesÃ«"
+    IDS_FILE_DETAILSADV "Dokumente me prapashtesÃ« '%s' janÃ« tÃ« tipit '%s'. PÃ«r tÃ« ndryshuar cilÃ«simet qÃ« ndikojnÃ« tÃ« gjithÃ« '%s' dokumentet, kliko Avancuar."
+    IDS_FILE_TYPES "TipiDokumentit"
+    IDS_COLUMN_EXTENSION "Prapashtesa"
+    IDS_BYTES_FORMAT "bytes"
+    IDS_UNKNOWN_APP "Aplikacion panjohur"
+    IDS_EXE_DESCRIPTION "PÃ«rshkrimi:"
+END

Modification de propriÃ©tÃ©s sur dll/win32/shell32/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/shell32/dragdrophelper.cpp
===================================================================
--- dll/win32/shell32/dragdrophelper.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/dragdrophelper.cpp	(copie de travail)
@@ -36,6 +36,18 @@
 {
 }
 
+HRESULT WINAPI CDropTargetHelper::InitializeFromBitmap(LPSHDRAGIMAGE pshdi, IDataObject *pDataObject)
+{
+    FIXME ("(%p)->()\n", this);
+    return E_NOTIMPL;
+}
+HRESULT WINAPI CDropTargetHelper::InitializeFromWindow(HWND hwnd, POINT *ppt, IDataObject *pDataObject)
+{
+    FIXME ("(%p)->()\n", this);
+    return E_NOTIMPL;
+}
+
+
 HRESULT WINAPI CDropTargetHelper::DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
 {
     FIXME ("(%p)->(%p %p %p 0x%08x)\n", this, hwndTarget, pDataObject, ppt, dwEffect);
Index: dll/win32/shell32/CMenuDeskBar.cpp
===================================================================
--- dll/win32/shell32/CMenuDeskBar.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/CMenuDeskBar.cpp	(copie de travail)
@@ -1,7 +1,5 @@
 #include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
-
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(
     POINTL *ppt,
     RECTL *prcExclude,
@@ -137,4 +135,3 @@
 {
     return S_OK;
 }
-
Index: dll/win32/shell32/shellpath.cpp
===================================================================
--- dll/win32/shell32/shellpath.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shellpath.cpp	(copie de travail)
@@ -564,16 +564,20 @@
 static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'};
 static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'};
 static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'};
+static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
+static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
+
+#if 0
 static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0};
 static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0};
 static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'};
-static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
-static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
+static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'};
+static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'};
+#endif
+
 /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're
  * acting more Windows 9x-like for now.
  */
-static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'};
-static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'};
 
 typedef enum _CSIDL_Type {
     CSIDL_Type_User,
Index: dll/win32/shell32/rgs_res.rc
===================================================================
--- dll/win32/shell32/rgs_res.rc	(rÃ©vision 61927)
+++ dll/win32/shell32/rgs_res.rc	(copie de travail)
@@ -23,3 +23,4 @@
 IDR_OPENWITHMENU REGISTRY "res/rgs/openwithmenu.rgs"
 IDR_FILEDEFEXT REGISTRY "res/rgs/shellfiledefext.rgs"
 IDR_DRVDEFEXT REGISTRY "res/rgs/shelldrvdefext.rgs"
+IDR_EXEDROPHANDLER REGISTRY "res/rgs/exedrophandler.rgs"
\ No newline at end of file
Index: dll/win32/shell32/shfldr.h
===================================================================
--- dll/win32/shell32/shfldr.h	(rÃ©vision 61927)
+++ dll/win32/shell32/shfldr.h	(copie de travail)
@@ -1,10 +1,10 @@
 
 /*
- *	Virtual Folder
- *	common definitions
+ *  Virtual Folder
+ *  common definitions
  *
- *	Copyright 1997			Marcus Meissner
- *	Copyright 1998, 1999, 2002	Juergen Schmied
+ *  Copyright 1997 Marcus Meissner
+ *  Copyright 1998, 1999, 2002 Juergen Schmied
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -40,13 +40,13 @@
 
 LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut);
 HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut,
-				  LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes);
+                  LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes);
 HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes);
 HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut,
-				       DWORD dwOutLen);
+                       DWORD dwOutLen);
 
 HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot,
-			     LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut);
+                 LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut);
 
 HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
 LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path);
Index: dll/win32/shell32/shell32.rc
===================================================================
--- dll/win32/shell32/shell32.rc	(rÃ©vision 61927)
+++ dll/win32/shell32/shell32.rc	(copie de travail)
@@ -152,6 +152,9 @@
 #ifdef LANGUAGE_SL_SI
     #include "lang/sl-SI.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
Index: dll/win32/shell32/folders.cpp
===================================================================
--- dll/win32/shell32/folders.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/folders.cpp	(copie de travail)
@@ -19,8 +19,6 @@
 
 #include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
-
 WCHAR swShell32Name[MAX_PATH];
 
 DWORD NumIconOverlayHandlers = 0;
Index: dll/win32/shell32/shellole.cpp
===================================================================
--- dll/win32/shell32/shellole.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shellole.cpp	(copie de travail)
@@ -600,7 +600,7 @@
          case CREATE_ALWAYS:
              if (SUCCEEDED(hres))
              {
-                 reinterpret_cast<IPropertyStorage*>(*ppstg)->Release();
+                 (*ppstg)->Release();
                  hres = psstg->Delete(fmtid);
                  if(FAILED(hres))
                      return hres;
@@ -620,7 +620,7 @@
              {
                  prop.ulKind = PRSPEC_PROPID;
                  prop.propid = PID_CODEPAGE;
-                 hres = reinterpret_cast<IPropertyStorage*>(*ppstg)->ReadMultiple(1, &prop, &ret);
+                 hres = (*ppstg)->ReadMultiple(1, &prop, &ret);
                  if (FAILED(hres) || ret.vt!=VT_I2)
                      *puCodePage = 0;
                  else
Index: dll/win32/shell32/dragdrophelper.h
===================================================================
--- dll/win32/shell32/dragdrophelper.h	(rÃ©vision 61927)
+++ dll/win32/shell32/dragdrophelper.h	(copie de travail)
@@ -26,6 +26,7 @@
 class CDropTargetHelper :
 	public CComCoClass<CDropTargetHelper, &CLSID_DragDropHelper>,
 	public CComObjectRootEx<CComMultiThreadModelNoCS>,
+	public IDragSourceHelper,
 	public IDropTargetHelper
 {
 private:
@@ -33,7 +34,9 @@
 	CDropTargetHelper();
 	~CDropTargetHelper();
 
-	////////
+	virtual HRESULT WINAPI InitializeFromBitmap(LPSHDRAGIMAGE pshdi, IDataObject *pDataObject);
+	virtual HRESULT WINAPI InitializeFromWindow(HWND hwnd, POINT *ppt, IDataObject *pDataObject);
+
 	virtual HRESULT WINAPI DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect);
 	virtual HRESULT WINAPI DragLeave();
 	virtual HRESULT WINAPI DragOver(POINT *ppt, DWORD dwEffect);
@@ -46,6 +49,7 @@
 DECLARE_PROTECT_FINAL_CONSTRUCT()
 
 BEGIN_COM_MAP(CDropTargetHelper)
+	COM_INTERFACE_ENTRY_IID(IID_IDragSourceHelper, IDragSourceHelper)
 	COM_INTERFACE_ENTRY_IID(IID_IDropTargetHelper, IDropTargetHelper)
 END_COM_MAP()
 };
Index: dll/win32/shell32/shresdef.h
===================================================================
--- dll/win32/shell32/shresdef.h	(rÃ©vision 61927)
+++ dll/win32/shell32/shresdef.h	(copie de travail)
@@ -523,3 +523,4 @@
 #define IDR_DRVDEFEXT           148
 #define IDR_MENUBAND            149
 #define IDR_MENUDESKBAR         150
+#define IDR_EXEDROPHANDLER      151
Index: dll/win32/shell32/folders/mydocuments.cpp
===================================================================
--- dll/win32/shell32/folders/mydocuments.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/mydocuments.cpp	(copie de travail)
@@ -78,6 +78,7 @@
 {
     pidlRoot = NULL;
     sPathTarget = NULL;
+    mFSDropTarget = NULL;
 }
 
 CMyDocsFolder::~CMyDocsFolder()
@@ -85,6 +86,7 @@
     TRACE ("-- destroying IShellFolder(%p)\n", this);
     SHFree(pidlRoot);
     HeapFree(GetProcessHeap(), 0, sPathTarget);
+    mFSDropTarget->Release();
 }
 
 HRESULT WINAPI CMyDocsFolder::FinalConstruct()
@@ -98,6 +100,29 @@
     sPathTarget = (LPWSTR)SHAlloc((wcslen(szMyPath) + 1) * sizeof(WCHAR));
     wcscpy(sPathTarget, szMyPath);
 
+    LPITEMIDLIST pidl = NULL;
+
+    WCHAR szPath[MAX_PATH];
+    lstrcpynW(szPath, sPathTarget, MAX_PATH);
+    PathAddBackslashW(szPath);
+    CComPtr<IShellFolder> psfDesktop = NULL;
+    
+    HRESULT hr = SHGetDesktopFolder(&psfDesktop);
+    if (SUCCEEDED(hr))
+        hr = psfDesktop->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL);
+    else
+        ERR("Error getting desktop folder\n");
+
+    if (SUCCEEDED(hr))
+    {
+        hr = psfDesktop->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*) &mFSDropTarget);
+        CoTaskMemFree(pidl);
+        if (FAILED(hr))
+            ERR("Error Binding");
+    }
+    else
+        ERR("Error creating from %s\n", debugstr_w(szPath));
+
     return S_OK;
 }
 
@@ -271,8 +296,7 @@
 
     if (IsEqualIID (riid, IID_IDropTarget))
     {
-        WARN ("IDropTarget not implemented\n");
-        hr = E_NOTIMPL;
+        hr = this->QueryInterface (IID_IDropTarget, ppvOut);
     }
     else if (IsEqualIID (riid, IID_IContextMenu))
     {
@@ -679,3 +703,26 @@
     *pidl = ILClone (pidlRoot);
     return S_OK;
 }
+
+HRESULT WINAPI CMyDocsFolder::DragEnter(IDataObject *pDataObject,
+                                    DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    return mFSDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect);
+}
+
+HRESULT WINAPI CMyDocsFolder::DragOver(DWORD dwKeyState, POINTL pt,
+                                   DWORD *pdwEffect)
+{
+    return mFSDropTarget->DragOver(dwKeyState, pt, pdwEffect);
+}
+
+HRESULT WINAPI CMyDocsFolder::DragLeave()
+{
+    return mFSDropTarget->DragLeave();
+}
+
+HRESULT WINAPI CMyDocsFolder::Drop(IDataObject *pDataObject,
+                               DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    return mFSDropTarget->Drop(pDataObject, dwKeyState, pt, pdwEffect);
+}
\ No newline at end of file
Index: dll/win32/shell32/folders/fs.cpp
===================================================================
--- dll/win32/shell32/folders/fs.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/fs.cpp	(copie de travail)
@@ -81,6 +81,7 @@
     cfShellIDList = 0;
     SF_RegisterClipFmt();
     fAcceptFmt = FALSE;
+    m_bGroupPolicyActive = 0;
 }
 
 CFSFolder::~CFSFolder()
@@ -502,7 +503,7 @@
         else if (IsEqualIID (riid, IID_IDropTarget))
         {
             /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */
-            if (cidl == 1 && SUCCEEDED(hr = this->BindToObject(apidl[0], NULL, IID_IDropTarget, (LPVOID*)&pObj)));
+            if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj)));
             else
                 hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj);
         }
@@ -1427,7 +1428,7 @@
     {
         if (SUCCEEDED(pAsyncOperation->GetAsyncMode(&fIsOpAsync)) && fIsOpAsync)
         {
-            _DoDropData *data = reinterpret_cast<_DoDropData*> (HeapAlloc(GetProcessHeap(), 0, sizeof(_DoDropData)));
+            _DoDropData *data = static_cast<_DoDropData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_DoDropData)));
             data->This = this;
             // Need to maintain this class in case the window is closed or the class exists temporarily (when dropping onto a folder).
             this->AddRef();
@@ -1439,7 +1440,7 @@
             data->pdwEffect = *pdwEffect;
             data->pDataObject->AddRef();
             data->pAsyncOperation->StartOperation(NULL);
-            SHCreateThread(reinterpret_cast<LPTHREAD_START_ROUTINE> (CFSFolder::_DoDropThreadProc), reinterpret_cast<void *> (data), NULL, NULL);
+            SHCreateThread(CFSFolder::_DoDropThreadProc, data, NULL, NULL);
             return S_OK;
         }
         else
@@ -1617,6 +1618,9 @@
                     }
 
                     hr = ppf->Save(wszTarget, FALSE);
+					if (FAILED(hr))
+						break;
+					SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL);
                 }
                 else
                 {
@@ -1653,6 +1657,9 @@
                         break;
 
                     hr = ppf->Save(wszTarget, TRUE);
+					if (FAILED(hr))
+						break;
+					SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL);
                 }
             }
         }
@@ -1737,8 +1744,8 @@
     return hr;
 }
 
-DWORD CFSFolder::_DoDropThreadProc(LPVOID lpParameter) {
-    _DoDropData *data = reinterpret_cast<_DoDropData*>(lpParameter);
+DWORD WINAPI CFSFolder::_DoDropThreadProc(LPVOID lpParameter) {
+    _DoDropData *data = static_cast<_DoDropData*>(lpParameter);
     HRESULT hr = data->This->_DoDrop(data->pDataObject, data->dwKeyState, data->pt, &data->pdwEffect);
     //Release the CFSFolder and data object holds in the copying thread.
     data->pAsyncOperation->EndOperation(hr, NULL, data->pdwEffect);
@@ -1748,4 +1755,114 @@
     //Release the parameter from the heap.
     HeapFree(GetProcessHeap(), 0, data);
     return 0;
+}
+
+HRESULT WINAPI CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) {
+    HKEY hKey;
+    HRESULT hr;
+
+    TRACE("CFSFolder::_GetDropTarget entered\n");
+
+    if (_ILGetGUIDPointer (pidl) || _ILIsFolder (pidl))
+        return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut);
+
+    STRRET strFile;
+    hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile);
+    if (hr == S_OK)
+    {
+        WCHAR wszPath[MAX_PATH];
+        hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath));
+
+        if (hr == S_OK)
+        {
+            LPCWSTR pwszExt = PathFindExtensionW(wszPath);
+            if (pwszExt[0])
+            {
+                /* enumerate dynamic/static for a given file class */
+                if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+                {
+                    /* load dynamic extensions from file extension key, for example .jpg */
+                    _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut);
+                    RegCloseKey(hKey);
+                }
+
+                WCHAR wszTemp[40];
+                DWORD dwSize = sizeof(wszTemp);
+                if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, NULL, RRF_RT_REG_SZ, NULL, wszTemp, &dwSize) == ERROR_SUCCESS)
+                {
+                    if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTemp, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+                    {
+                        /* load dynamic extensions from progid key, for example jpegfile */
+                        _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut);
+                        RegCloseKey(hKey);
+                    }
+                }
+            }
+        }
+    }
+    else
+        ERR("GetDisplayNameOf failed: %x\n", hr);
+
+    return hr;
+}
+
+HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut) 
+{
+    TRACE("CFSFolder::_LoadDynamicDropTargetHandlerForKey entered\n");
+
+    WCHAR wszName[MAX_PATH], *pwszClsid;
+    DWORD dwSize = sizeof(wszName);
+    HRESULT hr;
+
+    if (RegGetValueW(hRootKey, L"shellex\\DropHandler", NULL, RRF_RT_REG_SZ, NULL, wszName, &dwSize) == ERROR_SUCCESS)
+    {
+        CLSID clsid;
+        hr = CLSIDFromString(wszName, &clsid);
+        if (hr == S_OK)
+            pwszClsid = wszName;
+
+        if (m_bGroupPolicyActive)
+        {
+            if (RegGetValueW(HKEY_LOCAL_MACHINE,
+                L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
+                pwszClsid,
+                RRF_RT_REG_SZ,
+                NULL,
+                NULL,
+                NULL) == ERROR_SUCCESS)
+            {
+                hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut);
+            }
+        }
+        else
+        {
+            hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut);
+        }
+    }
+    else
+        return E_FAIL;
+    return hr;
+}
+
+HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut)
+{
+    TRACE("CFSFolder::_LoadDynamicDropTargetHandler entered\n");
+    HRESULT hr;
+
+    IPersistFile *pp;
+    hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IPersistFile, &pp));
+    if (hr != S_OK)
+    {
+        ERR("SHCoCreateInstance failed %x\n", GetLastError());
+    }
+    pp->Load(pwcsname, 0);
+
+    hr = pp->QueryInterface(IID_PPV_ARG(IDropTarget, (IDropTarget**) ppvOut));
+    if (hr != S_OK)
+    {
+        ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid));
+        return hr;
+    }
+    pp->Release();
+    return hr;
 }
\ No newline at end of file
Index: dll/win32/shell32/folders/desktop.cpp
===================================================================
--- dll/win32/shell32/folders/desktop.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/desktop.cpp	(copie de travail)
@@ -651,7 +651,7 @@
     else if (IsEqualIID (riid, IID_IDropTarget))
     {
         /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */
-        if (cidl == 1 && SUCCEEDED(this->BindToObject(apidl[0], NULL, IID_IDropTarget, (LPVOID*)&pObj)));
+        if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj)));
         else
             hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj);
     }
@@ -1451,7 +1451,7 @@
     else
     {
         InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL);
-        if SUCCEEDED(pDataObject->QueryGetData(&formatetc));
+        if (SUCCEEDED(pDataObject->QueryGetData(&formatetc)))
         {
             passthroughtofs = TRUE;
         }
@@ -1488,4 +1488,53 @@
     /* Todo, rewrite the registry such that the icons are well placed.
     Blocked by no bags implementation. */
     return hr;
+}
+
+HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) {
+    HRESULT hr;
+
+    TRACE("CFSFolder::_GetDropTarget entered\n");
+
+    if (_ILGetGUIDPointer (pidl) || _ILIsFolder (pidl))
+        return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut);
+
+    LPITEMIDLIST pidlNext = NULL;
+
+    STRRET strFile;
+    hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile);
+    if (SUCCEEDED(hr))
+    {
+        WCHAR wszPath[MAX_PATH];
+        hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath));
+
+        if (SUCCEEDED(hr))
+        {
+            PathRemoveFileSpecW (wszPath);
+            hr = this->ParseDisplayName(NULL, NULL, wszPath, NULL, &pidlNext, NULL);
+
+            if (SUCCEEDED(hr))
+            {
+                IShellFolder *psf;
+                hr = this->BindToObject(pidlNext, NULL, IID_IShellFolder, (LPVOID*)&psf);
+                CoTaskMemFree(pidlNext);
+                if (SUCCEEDED(hr))
+                {
+                    hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_IDropTarget, NULL, ppvOut);
+                    psf->Release();
+                    if (FAILED(hr))
+                        ERR("FS GetUIObjectOf failed: %x\n", hr);
+                }
+                else 
+                    ERR("BindToObject failed: %x\n", hr);
+            }
+            else
+                ERR("ParseDisplayName failed: %x\n", hr);
+        }
+        else
+            ERR("StrRetToBufW failed: %x\n", hr);
+    }    
+    else
+        ERR("GetDisplayNameOf failed: %x\n", hr);
+
+    return hr;
 }
\ No newline at end of file
Index: dll/win32/shell32/folders/mydocuments.h
===================================================================
--- dll/win32/shell32/folders/mydocuments.h	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/mydocuments.h	(copie de travail)
@@ -26,12 +26,14 @@
     public CComCoClass<CMyDocsFolder, &CLSID_MyDocuments>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IShellFolder2,
-    public IPersistFolder2
+    public IPersistFolder2,
+    public IDropTarget
 {
     private:
         /* both paths are parsible from the MyDocuments */
         LPWSTR sPathTarget;     /* complete path to target used for enumeration and ChangeNotify */
         LPITEMIDLIST pidlRoot;  /* absolute pidl */
+        IDropTarget *mFSDropTarget;
     public:
         CMyDocsFolder();
         ~CMyDocsFolder();
@@ -67,6 +69,12 @@
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
 
+        // IDropTarget
+        virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+        virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+        virtual HRESULT WINAPI DragLeave();
+        virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+
         DECLARE_REGISTRY_RESOURCEID(IDR_MYDOCUMENTS)
         DECLARE_NOT_AGGREGATABLE(CMyDocsFolder)
 
@@ -78,6 +86,7 @@
         COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder)
         COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2)
         COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist)
+        COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget)
         END_COM_MAP()
 };
 
Index: dll/win32/shell32/folders/fs.h
===================================================================
--- dll/win32/shell32/folders/fs.h	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/fs.h	(copie de travail)
@@ -44,10 +44,14 @@
         UINT cfShellIDList;    /* clipboardformat for IDropTarget */
         BOOL fAcceptFmt;       /* flag for pending Drop */
         BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect);
+        DWORD m_bGroupPolicyActive;
         void SF_RegisterClipFmt();
         BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut);
-        static DWORD _DoDropThreadProc(LPVOID lpParameter);
+        static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter);
         virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+        virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut);
+        virtual HRESULT WINAPI _LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut);
+        virtual HRESULT WINAPI _LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut);
 
     public:
         CFSFolder();
Index: dll/win32/shell32/folders/desktop.h
===================================================================
--- dll/win32/shell32/folders/desktop.h	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/desktop.h	(copie de travail)
@@ -40,6 +40,7 @@
         BOOL fAcceptFmt;       /* flag for pending Drop */
         BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect);
         void SF_RegisterClipFmt();
+        virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut);
 
     public:
         CDesktopFolder();
Index: dll/win32/shell32/folders/recyclebin.cpp
===================================================================
--- dll/win32/shell32/folders/recyclebin.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/folders/recyclebin.cpp	(copie de travail)
@@ -1416,7 +1416,7 @@
 HRESULT WINAPI CRecycleBin::DragEnter(IDataObject *pDataObject,
                                     DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
 {
-    FIXME("Recycle bin drag over (%p)\n", this);
+    TRACE("Recycle bin drag over (%p)\n", this);
     /* The recycle bin accepts pretty much everything, and sets a CSIDL flag. */
     fAcceptFmt = TRUE;
 
@@ -1449,7 +1449,7 @@
 HRESULT WINAPI CRecycleBin::Drop(IDataObject *pDataObject,
                                DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
 {
-    FIXME("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect);
+    TRACE("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect);
     
     /* TODO: pdwEffect should be read and make the drop object be permanently deleted in the move case (shift held) */
 
Index: dll/win32/shell32/changenotify.cpp
===================================================================
--- dll/win32/shell32/changenotify.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/changenotify.cpp	(copie de travail)
@@ -264,6 +264,25 @@
         return TRUE;
     if( sub && ILIsParent( watched, changed, TRUE ) )
         return TRUE;
+    if (sub && _ILIsDesktop(watched)) {
+        WCHAR wszPath[MAX_PATH];
+        SHGetSpecialFolderPathW(0, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE);
+        LPITEMIDLIST deskpidl = SHSimpleIDListFromPathW(wszPath);
+        if (ILIsParent(deskpidl, changed, TRUE))
+        {
+            ILFree(deskpidl);
+            return TRUE;
+        }
+        ILFree(deskpidl);
+        SHGetSpecialFolderPathW(0, wszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE);
+        deskpidl = SHSimpleIDListFromPathW(wszPath);
+        if (ILIsParent(deskpidl, changed, TRUE))
+        {
+            ILFree(deskpidl);
+            return TRUE;
+        }
+        ILFree(deskpidl);
+    }
     return FALSE;
 }
 
@@ -272,7 +291,7 @@
  */
 void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2)
 {
-    LPCITEMIDLIST Pidls[2];
+    LPITEMIDLIST Pidls[2];
     LPNOTIFICATIONLIST ptr;
     UINT typeFlag = uFlags & SHCNF_TYPE;
 
@@ -316,10 +335,43 @@
     case SHCNF_PATHW:
         if (dwItem1) Pidls[0] = SHSimpleIDListFromPathW((LPCWSTR)dwItem1);
         if (dwItem2) Pidls[1] = SHSimpleIDListFromPathW((LPCWSTR)dwItem2);
+        if (wEventId & (SHCNE_MKDIR | SHCNE_RMDIR | SHCNE_UPDATEDIR | SHCNE_RENAMEFOLDER))
+        {
+            /*
+             * The last items in the ID are currently files. So we chop off the last
+             * entry, and create a new one using a find data struct.
+             */
+            if (dwItem1 && Pidls[0]){
+                ILRemoveLastID(Pidls[0]);
+                WIN32_FIND_DATAW wfd;
+                LPWSTR p = PathFindFileNameW((LPCWSTR)dwItem1);
+                lstrcpynW(&wfd.cFileName[0], p, MAX_PATH);
+                wfd.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY;
+                LPITEMIDLIST newpidl = _ILCreateFromFindDataW(&wfd);
+                LPITEMIDLIST oldpidl = ILClone(Pidls[0]);
+                ILFree(Pidls[0]);
+                Pidls[0] = ILCombine(oldpidl, newpidl);
+                ILFree(newpidl);
+                ILFree(oldpidl);
+            }
+            if (dwItem2 && Pidls[1]){
+                ILRemoveLastID(Pidls[1]);
+                WIN32_FIND_DATAW wfd;
+                LPWSTR p = PathFindFileNameW((LPCWSTR)dwItem2);
+                lstrcpynW(&wfd.cFileName[0], p, MAX_PATH);
+                wfd.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY;
+                LPITEMIDLIST newpidl = _ILCreateFromFindDataW(&wfd);
+                LPITEMIDLIST oldpidl = ILClone(Pidls[0]);
+                ILFree(Pidls[1]);
+                Pidls[1] = ILCombine(oldpidl, newpidl);
+                ILFree(newpidl);
+                ILFree(oldpidl);
+            }
+        }
         break;
     case SHCNF_IDLIST:
-        Pidls[0] = (LPCITEMIDLIST)dwItem1;
-        Pidls[1] = (LPCITEMIDLIST)dwItem2;
+        Pidls[0] = (LPITEMIDLIST)dwItem1;
+        Pidls[1] = (LPITEMIDLIST)dwItem2;
         break;
     case SHCNF_PRINTERA:
     case SHCNF_PRINTERW:
Index: dll/win32/shell32/shlview.cpp
===================================================================
--- dll/win32/shell32/shlview.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/shlview.cpp	(copie de travail)
@@ -71,6 +71,7 @@
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IShellView,
     public IFolderView,
+    public IShellFolderView,
     public IOleCommandTarget,
     public IDropTarget,
     public IDropSource,
@@ -166,6 +167,36 @@
         virtual HRESULT STDMETHODCALLTYPE SelectItem(int iItem, DWORD dwFlags);
         virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItems(UINT cidl, LPCITEMIDLIST *apidl, POINT *apt, DWORD dwFlags);
 
+        // *** IShellFolderView methods ***
+        virtual HRESULT STDMETHODCALLTYPE Rearrange(LPARAM sort);
+        virtual HRESULT STDMETHODCALLTYPE GetArrangeParam(LPARAM *sort);
+        virtual HRESULT STDMETHODCALLTYPE ArrangeGrid();
+        virtual HRESULT STDMETHODCALLTYPE AutoArrange();
+        virtual HRESULT STDMETHODCALLTYPE IShellFolderView_GetAutoArrange();
+        virtual HRESULT STDMETHODCALLTYPE AddObject(PITEMID_CHILD pidl, UINT *item);
+        virtual HRESULT STDMETHODCALLTYPE GetObject(PITEMID_CHILD *pidl, UINT item);
+        virtual HRESULT STDMETHODCALLTYPE RemoveObject(PITEMID_CHILD pidl, UINT *item);
+        virtual HRESULT STDMETHODCALLTYPE GetObjectCount(UINT *count);
+        virtual HRESULT STDMETHODCALLTYPE SetObjectCount(UINT count, UINT flags);
+        virtual HRESULT STDMETHODCALLTYPE UpdateObject(PITEMID_CHILD pidl_old, PITEMID_CHILD pidl_new, UINT *item);
+        virtual HRESULT STDMETHODCALLTYPE RefreshObject(PITEMID_CHILD pidl, UINT *item);
+        virtual HRESULT STDMETHODCALLTYPE SetRedraw(BOOL redraw);
+        virtual HRESULT STDMETHODCALLTYPE GetSelectedCount(UINT *count);
+        virtual HRESULT STDMETHODCALLTYPE GetSelectedObjects(PCUITEMID_CHILD **pidl, UINT *items);
+        virtual HRESULT STDMETHODCALLTYPE IsDropOnSource(IDropTarget *drop_target);
+        virtual HRESULT STDMETHODCALLTYPE GetDragPoint(POINT *pt);
+        virtual HRESULT STDMETHODCALLTYPE GetDropPoint(POINT *pt);
+        virtual HRESULT STDMETHODCALLTYPE MoveIcons(IDataObject *obj);
+        virtual HRESULT STDMETHODCALLTYPE SetItemPos(PCUITEMID_CHILD pidl, POINT *pt);
+        virtual HRESULT STDMETHODCALLTYPE IsBkDropTarget(IDropTarget *drop_target);
+        virtual HRESULT STDMETHODCALLTYPE SetClipboard(BOOL move);
+        virtual HRESULT STDMETHODCALLTYPE SetPoints(IDataObject *obj);
+        virtual HRESULT STDMETHODCALLTYPE GetItemSpacing(ITEMSPACING *spacing);
+        virtual HRESULT STDMETHODCALLTYPE SetCallback(IShellFolderViewCB *new_cb, IShellFolderViewCB **old_cb);
+        virtual HRESULT STDMETHODCALLTYPE Select(UINT flags);
+        virtual HRESULT STDMETHODCALLTYPE QuerySupport(UINT *support);
+        virtual HRESULT STDMETHODCALLTYPE SetAutomationObject(IDispatch *disp);
+
         // *** IOleCommandTarget methods ***
         virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[  ], OLECMDTEXT *pCmdText);
         virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
@@ -269,6 +300,7 @@
         COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
         COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView)
         COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView)
+        COM_INTERFACE_ENTRY_IID(IID_IShellFolderView, IShellFolderView)
         COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
         COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget)
         COM_INTERFACE_ENTRY_IID(IID_IDropSource, IDropSource)
@@ -1019,7 +1051,12 @@
     if (hSubMenu)
     {   /*insert This item at the beginning of the menu */
         _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
-        _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"dummy45", MFS_ENABLED);
+        _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+4, MFT_STRING, L"Properties", MFS_DISABLED);
+        _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+3, MFT_STRING, L"Rename", MFS_DISABLED);
+        _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+2, MFT_STRING, L"Delete", MFS_DISABLED);
+        _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+1, MFT_STRING, L"Create Shortcut", MFS_DISABLED);
+        _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
+        _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED);
     }
 
     TRACE("--\n");
@@ -1360,12 +1397,6 @@
             mii.dwTypeData = szText;
             mii.hSubMenu = BuildFileMenu();
 
-            /*insert our menu into the menu bar*/
-            if (mii.hSubMenu)
-            {
-                InsertMenuItemA(m_hMenu, FCIDM_MENU_HELP, FALSE, &mii);
-            }
-
             /*get the view menu so we can merge with it*/
             ZeroMemory(&mii, sizeof(mii));
             mii.cbSize = sizeof(mii);
@@ -1807,9 +1838,13 @@
             break;
 
         case SHCNE_UPDATEITEM:
+            LV_RenameItem(Pidls[0], Pidls[0]);
             break;
+
+        case SHCNE_UPDATEDIR:
+            Refresh();
+            break;
     }
-
     return TRUE;
 }
 
@@ -2311,6 +2346,206 @@
 }
 
 /**********************************************************
+ * IShellFolderView implementation
+ */
+HRESULT STDMETHODCALLTYPE CDefView::Rearrange(LPARAM sort)
+{
+    FIXME("(%p)->(%ld) stub\n", this, sort);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetArrangeParam(LPARAM *sort)
+{
+    FIXME("(%p)->(%p) stub\n", this, sort);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::ArrangeGrid()
+{
+    FIXME("(%p) stub\n", this);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::AutoArrange()
+{
+    FIXME("(%p) stub\n", this);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::IShellFolderView_GetAutoArrange()
+{
+    TRACE("(%p)\n", this);
+    return GetAutoArrange();
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item)
+{
+    FIXME("(%p)->(%p %p) stub\n", this, pidl, item);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetObject(PITEMID_CHILD *pidl, UINT item)
+{
+    TRACE("(%p)->(%p %d)\n", this, pidl, item);
+    return Item(item, pidl);
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::RemoveObject(PITEMID_CHILD pidl, UINT *item)
+{
+
+    TRACE("(%p)->(%p %p)\n", this, pidl, item);
+
+    if (pidl)
+    {
+        *item = LV_FindItemByPidl(ILFindLastID(pidl));
+        SendMessageW(m_hWndList, LVM_DELETEITEM, *item, 0);
+    }
+    else
+    {
+        *item = 0;
+        SendMessageW(m_hWndList, LVM_DELETEALLITEMS, 0, 0);
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetObjectCount(UINT *count)
+{
+    TRACE("(%p)->(%p)\n", this, count);
+    return ItemCount(SVGIO_ALLVIEW, reinterpret_cast<INT*>(count));
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetObjectCount(UINT count, UINT flags)
+{
+    FIXME("(%p)->(%d %x) stub\n", this, count, flags);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::UpdateObject(PITEMID_CHILD pidl_old, PITEMID_CHILD pidl_new, UINT *item)
+{
+    FIXME("(%p)->(%p %p %p) stub\n", this, pidl_old, pidl_new, item);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::RefreshObject(PITEMID_CHILD pidl, UINT *item)
+{
+    FIXME("(%p)->(%p %p) stub\n", this, pidl, item);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetRedraw(BOOL redraw)
+{
+    TRACE("(%p)->(%d)\n", this, redraw);
+    SendMessageW(m_hWndList, WM_SETREDRAW, redraw, 0);
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetSelectedCount(UINT *count)
+{
+    FIXME("(%p)->(%p) stub\n", this, count);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetSelectedObjects(PCUITEMID_CHILD **pidl, UINT *items)
+{
+    TRACE("(%p)->(%p %p)\n", this, pidl, items);
+
+    *items = GetSelections();
+
+    if (*items)
+    {
+        *pidl = static_cast<PCUITEMID_CHILD *>(LocalAlloc(0, *items * sizeof(LPITEMIDLIST)));
+        if (!*pidl)
+        {
+            return E_OUTOFMEMORY;
+        }
+        
+        /* it's documented that caller shouldn't PIDLs, only array itself */
+        memcpy(static_cast<PCUITEMID_CHILD *>(*pidl), m_apidl, *items * sizeof(LPITEMIDLIST));
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::IsDropOnSource(IDropTarget *drop_target)
+{
+    FIXME("(%p)->(%p) stub\n", this, drop_target);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetDragPoint(POINT *pt)
+{
+    FIXME("(%p)->(%p) stub\n", this, pt);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetDropPoint(POINT *pt)
+{
+    FIXME("(%p)->(%p) stub\n", this, pt);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::MoveIcons(IDataObject *obj)
+{
+    TRACE("(%p)->(%p)\n", this, obj);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetItemPos(PCUITEMID_CHILD pidl, POINT *pt)
+{
+    FIXME("(%p)->(%p %p) stub\n", this, pidl, pt);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::IsBkDropTarget(IDropTarget *drop_target)
+{
+    FIXME("(%p)->(%p) stub\n", this, drop_target);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetClipboard(BOOL move)
+{
+    FIXME("(%p)->(%d) stub\n", this, move);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetPoints(IDataObject *obj)
+{
+    FIXME("(%p)->(%p) stub\n", this, obj);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::GetItemSpacing(ITEMSPACING *spacing)
+{
+    FIXME("(%p)->(%p) stub\n", this, spacing);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetCallback(IShellFolderViewCB  *new_cb, IShellFolderViewCB **old_cb)
+{
+    FIXME("(%p)->(%p %p) stub\n", this, new_cb, old_cb);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::Select(UINT flags)
+{
+    FIXME("(%p)->(%d) stub\n", this, flags);
+    return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::QuerySupport(UINT *support)
+{
+    TRACE("(%p)->(%p)\n", this, support);
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CDefView::SetAutomationObject(IDispatch *disp)
+{
+    FIXME("(%p)->(%p) stub\n", this, disp);
+    return E_NOTIMPL;
+}
+ 
+/**********************************************************
  * ISVOleCmdTarget_QueryStatus (IOleCommandTarget)
  */
 HRESULT WINAPI CDefView::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText)
@@ -2493,12 +2728,10 @@
     {
         m_pCurDropTarget->Drop(pDataObject, grfKeyState, pt, pdwEffect);
         m_pCurDropTarget.Release();
-
-        this->Refresh();
     }
 
-    m_pCurDataObject.Release();    m_iDragOverItem = 0;
-
+    m_pCurDataObject.Release();    
+    m_iDragOverItem = 0;
     return S_OK;
 }
 
Index: dll/win32/shell32/defcontextmenu.cpp
===================================================================
--- dll/win32/shell32/defcontextmenu.cpp	(rÃ©vision 61927)
+++ dll/win32/shell32/defcontextmenu.cpp	(copie de travail)
@@ -61,6 +61,7 @@
         HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink);
         HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi);
         HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi);
+        HRESULT DoRefresh(LPCMINVOKECOMMANDINFO lpcmi);
         HRESULT DoDelete(LPCMINVOKECOMMANDINFO lpcmi);
         HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy);
         HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi);
@@ -931,14 +932,9 @@
     if (FAILED(lpSB->QueryActiveShellView(&lpSV)))
         return E_FAIL;
 
-    if (LOWORD(lpcmi->lpVerb) == FCIDM_SHVIEW_REFRESH || bRefresh)
-        lpSV->Refresh();
-    else
-    {
-        HWND hwndSV = NULL;
-        if (SUCCEEDED(lpSV->GetWindow(&hwndSV)))
-            SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0);
-    }
+    HWND hwndSV = NULL;
+    if (SUCCEEDED(lpSV->GetWindow(&hwndSV)))
+        SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0);
 
     lpSV->Release();
     return S_OK;
@@ -945,6 +941,26 @@
 }
 
 HRESULT
+CDefaultContextMenu::DoRefresh(
+    LPCMINVOKECOMMANDINFO lpcmi)
+{
+    CComPtr<IPersistFolder2> ppf2 = NULL;
+    LPITEMIDLIST pidl;
+    HRESULT hr = m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2));
+    if (SUCCEEDED(hr))
+    {
+        hr = ppf2->GetCurFolder(&pidl);
+        if (SUCCEEDED(hr))
+        {
+            SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_IDLIST, pidl, NULL);
+            ILFree(pidl);
+        }
+        ppf2->Release();
+    }
+    return hr;
+}
+
+HRESULT
 CDefaultContextMenu::DoPaste(
     LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink)
 {
@@ -1512,8 +1528,9 @@
         case 0x33:
         case FCIDM_SHVIEW_AUTOARRANGE:
         case FCIDM_SHVIEW_SNAPTOGRID:
+            return NotifyShellViewWindow(lpcmi, FALSE);
         case FCIDM_SHVIEW_REFRESH:
-            return NotifyShellViewWindow(lpcmi, FALSE);
+            return DoRefresh(lpcmi);
         case FCIDM_SHVIEW_INSERT:
             return DoPaste(lpcmi, FALSE);
         case FCIDM_SHVIEW_INSERTLINK:
Index: dll/win32/shell32/shelllink.h
===================================================================
--- dll/win32/shell32/shelllink.h	(rÃ©vision 61927)
+++ dll/win32/shell32/shelllink.h	(copie de travail)
@@ -25,141 +25,149 @@
 #define _SHELLLINK_H_
 
 class CShellLink :
-	public CComCoClass<CShellLink, &CLSID_ShellLink>,
-	public CComObjectRootEx<CComMultiThreadModelNoCS>,
-	public IShellLinkA,
-	public IShellLinkW,
-	public IPersistFile,
-	public IPersistStream,
-	public IShellLinkDataList,
-	public IShellExtInit,
-	public IContextMenu,
-	public IObjectWithSite,
-	public IShellPropSheetExt
+    public CComCoClass<CShellLink, &CLSID_ShellLink>,
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IShellLinkA,
+    public IShellLinkW,
+    public IPersistFile,
+    public IPersistStream,
+    public IShellLinkDataList,
+    public IShellExtInit,
+    public IContextMenu,
+    public IDropTarget,
+    public IObjectWithSite,
+    public IShellPropSheetExt
 {
 public:
-	/* link file formats */
+    /* link file formats */
 
-	#include "pshpack1.h"
+    #include "pshpack1.h"
 
-	struct volume_info
-	{
-		DWORD		type;
-		DWORD		serial;
-		WCHAR		label[12];  /* assume 8.3 */
-	};
+    struct volume_info
+    {
+        DWORD        type;
+        DWORD        serial;
+        WCHAR        label[12];  /* assume 8.3 */
+    };
 
-	#include "poppack.h"
+    #include "poppack.h"
 
 private:
-	/* data structures according to the information in the link */
-	LPITEMIDLIST	pPidl;
-	WORD		wHotKey;
-	SYSTEMTIME	time1;
-	SYSTEMTIME	time2;
-	SYSTEMTIME	time3;
+    /* data structures according to the information in the link */
+    LPITEMIDLIST    pPidl;
+    WORD        wHotKey;
+    SYSTEMTIME    time1;
+    SYSTEMTIME    time2;
+    SYSTEMTIME    time3;
 
-	DWORD         iShowCmd;
-	LPWSTR        sIcoPath;
-	INT           iIcoNdx;
-	LPWSTR        sPath;
-	LPWSTR        sArgs;
-	LPWSTR        sWorkDir;
-	LPWSTR        sDescription;
-	LPWSTR        sPathRel;
-	LPWSTR        sProduct;
-	LPWSTR        sComponent;
-	volume_info   volume;
-	LPWSTR        sLinkPath;
-	BOOL          bRunAs;
-	BOOL          bDirty;
-	INT           iIdOpen;  /* id of the "Open" entry in the context menu */
-	CComPtr<IUnknown>		site;
+    DWORD         iShowCmd;
+    LPWSTR        sIcoPath;
+    INT           iIcoNdx;
+    LPWSTR        sPath;
+    LPWSTR        sArgs;
+    LPWSTR        sWorkDir;
+    LPWSTR        sDescription;
+    LPWSTR        sPathRel;
+    LPWSTR        sProduct;
+    LPWSTR        sComponent;
+    volume_info   volume;
+    LPWSTR        sLinkPath;
+    BOOL          bRunAs;
+    BOOL          bDirty;
+    INT           iIdOpen;  /* id of the "Open" entry in the context menu */
+    CComPtr<IUnknown>        site;
+    IDropTarget   *mDropTarget;
 public:
-	CShellLink();
-	~CShellLink();
-	LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str);
-	HRESULT ShellLink_SetAdvertiseInfo(LPCWSTR str);
-	static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    CShellLink();
+    ~CShellLink();
+    LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str);
+    HRESULT ShellLink_SetAdvertiseInfo(LPCWSTR str);
+    static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-	// IPersistFile
-	virtual HRESULT WINAPI GetClassID(CLSID *pclsid);
-	virtual HRESULT WINAPI IsDirty();
-	virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode);
-	virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember);
-	virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName);
-	virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName);
+    // IPersistFile
+    virtual HRESULT WINAPI GetClassID(CLSID *pclsid);
+    virtual HRESULT WINAPI IsDirty();
+    virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode);
+    virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember);
+    virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName);
+    virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName);
 
-	// IPersistStream
-//	virtual WINAPI HRESULT GetClassID(CLSID *pclsid);
-//	virtual HRESULT WINAPI IsDirty();
-	virtual HRESULT WINAPI Load(IStream *stm);
-	virtual HRESULT WINAPI Save(IStream *stm, BOOL fClearDirty);
-	virtual HRESULT WINAPI GetSizeMax(ULARGE_INTEGER *pcbSize);
+    // IPersistStream
+    // virtual WINAPI HRESULT GetClassID(CLSID *pclsid);
+    // virtual HRESULT WINAPI IsDirty();
+    virtual HRESULT WINAPI Load(IStream *stm);
+    virtual HRESULT WINAPI Save(IStream *stm, BOOL fClearDirty);
+    virtual HRESULT WINAPI GetSizeMax(ULARGE_INTEGER *pcbSize);
 
-	// IShellLinkA
-	virtual HRESULT WINAPI GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags);
-	virtual HRESULT WINAPI GetIDList(LPITEMIDLIST * ppidl);
-	virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl);
-	virtual HRESULT WINAPI GetDescription(LPSTR pszName,INT cchMaxName);
-	virtual HRESULT WINAPI SetDescription(LPCSTR pszName);
-	virtual HRESULT WINAPI GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath);
-	virtual HRESULT WINAPI SetWorkingDirectory(LPCSTR pszDir);
-	virtual HRESULT WINAPI GetArguments(LPSTR pszArgs,INT cchMaxPath);
-	virtual HRESULT WINAPI SetArguments(LPCSTR pszArgs);
-	virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey);
-	virtual HRESULT WINAPI SetHotkey(WORD wHotkey);
-	virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd);
-	virtual HRESULT WINAPI SetShowCmd(INT iShowCmd);
-	virtual HRESULT WINAPI GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon);
-	virtual HRESULT WINAPI SetIconLocation(LPCSTR pszIconPath,INT iIcon);
-	virtual HRESULT WINAPI SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved);
-	virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags);
-	virtual HRESULT WINAPI SetPath(LPCSTR pszFile);
+    // IShellLinkA
+    virtual HRESULT WINAPI GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags);
+    virtual HRESULT WINAPI GetIDList(LPITEMIDLIST * ppidl);
+    virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl);
+    virtual HRESULT WINAPI GetDescription(LPSTR pszName,INT cchMaxName);
+    virtual HRESULT WINAPI SetDescription(LPCSTR pszName);
+    virtual HRESULT WINAPI GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath);
+    virtual HRESULT WINAPI SetWorkingDirectory(LPCSTR pszDir);
+    virtual HRESULT WINAPI GetArguments(LPSTR pszArgs,INT cchMaxPath);
+    virtual HRESULT WINAPI SetArguments(LPCSTR pszArgs);
+    virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey);
+    virtual HRESULT WINAPI SetHotkey(WORD wHotkey);
+    virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd);
+    virtual HRESULT WINAPI SetShowCmd(INT iShowCmd);
+    virtual HRESULT WINAPI GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon);
+    virtual HRESULT WINAPI SetIconLocation(LPCSTR pszIconPath,INT iIcon);
+    virtual HRESULT WINAPI SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved);
+    virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags);
+    virtual HRESULT WINAPI SetPath(LPCSTR pszFile);
 
-	// IShellLinkW
-	virtual HRESULT WINAPI GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags);
-//	virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl);
-//	virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl);
-	virtual HRESULT WINAPI GetDescription(LPWSTR pszName, INT cchMaxName);
-	virtual HRESULT WINAPI SetDescription(LPCWSTR pszName);
-	virtual HRESULT WINAPI GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath);
-	virtual HRESULT WINAPI SetWorkingDirectory(LPCWSTR pszDir);
-	virtual HRESULT WINAPI GetArguments(LPWSTR pszArgs,INT cchMaxPath);
-	virtual HRESULT WINAPI SetArguments(LPCWSTR pszArgs);
-//	virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey);
-//	virtual HRESULT WINAPI SetHotkey(WORD wHotkey);
-//	virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd);
-//	virtual HRESULT WINAPI SetShowCmd(INT iShowCmd);
-	virtual HRESULT WINAPI GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon);
-	virtual HRESULT WINAPI SetIconLocation(LPCWSTR pszIconPath,INT iIcon);
-	virtual HRESULT WINAPI SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved);
-//	virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags);
-	virtual HRESULT WINAPI SetPath(LPCWSTR pszFile);
+    // IShellLinkW
+    virtual HRESULT WINAPI GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags);
+    // virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl);
+    // virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl);
+    virtual HRESULT WINAPI GetDescription(LPWSTR pszName, INT cchMaxName);
+    virtual HRESULT WINAPI SetDescription(LPCWSTR pszName);
+    virtual HRESULT WINAPI GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath);
+    virtual HRESULT WINAPI SetWorkingDirectory(LPCWSTR pszDir);
+    virtual HRESULT WINAPI GetArguments(LPWSTR pszArgs,INT cchMaxPath);
+    virtual HRESULT WINAPI SetArguments(LPCWSTR pszArgs);
+    // virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey);
+    // virtual HRESULT WINAPI SetHotkey(WORD wHotkey);
+    // virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd);
+    // virtual HRESULT WINAPI SetShowCmd(INT iShowCmd);
+    virtual HRESULT WINAPI GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon);
+    virtual HRESULT WINAPI SetIconLocation(LPCWSTR pszIconPath,INT iIcon);
+    virtual HRESULT WINAPI SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved);
+    // virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags);
+    virtual HRESULT WINAPI SetPath(LPCWSTR pszFile);
 
-	// IShellLinkDataList
-	virtual HRESULT WINAPI AddDataBlock(void *pDataBlock);
-	virtual HRESULT WINAPI CopyDataBlock(DWORD dwSig, void **ppDataBlock);
-	virtual HRESULT WINAPI RemoveDataBlock(DWORD dwSig);
-	virtual HRESULT WINAPI GetFlags(DWORD *pdwFlags);
-	virtual HRESULT WINAPI SetFlags(DWORD dwFlags);
+    // IShellLinkDataList
+    virtual HRESULT WINAPI AddDataBlock(void *pDataBlock);
+    virtual HRESULT WINAPI CopyDataBlock(DWORD dwSig, void **ppDataBlock);
+    virtual HRESULT WINAPI RemoveDataBlock(DWORD dwSig);
+    virtual HRESULT WINAPI GetFlags(DWORD *pdwFlags);
+    virtual HRESULT WINAPI SetFlags(DWORD dwFlags);
 
-	// IShellExtInit
-	virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
+    // IShellExtInit
+    virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
 
-	// IContextMenu
-	virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
-	virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
-	virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax);
+    // IContextMenu
+    virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
+    virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
+    virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax);
 
-	// IShellPropSheetExt
-	virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
-	virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam);
+    // IShellPropSheetExt
+    virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
+    virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam);
 
-	// IObjectWithSite
-	virtual HRESULT WINAPI SetSite(IUnknown *punk);
-	virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
+    // IObjectWithSite
+    virtual HRESULT WINAPI SetSite(IUnknown *punk);
+    virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
 
+    // IDropTarget
+    virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+    virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+    virtual HRESULT WINAPI DragLeave();
+    virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+
 DECLARE_REGISTRY_RESOURCEID(IDR_SHELLLINK)
 DECLARE_NOT_AGGREGATABLE(CShellLink)
 
@@ -166,16 +174,17 @@
 DECLARE_PROTECT_FINAL_CONSTRUCT()
 
 BEGIN_COM_MAP(CShellLink)
-	COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistFile)
-	COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile)
-	COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)
-	COM_INTERFACE_ENTRY_IID(IID_IShellLinkA, IShellLinkA)
-	COM_INTERFACE_ENTRY_IID(IID_IShellLinkW, IShellLinkW)
-	COM_INTERFACE_ENTRY_IID(IID_IShellLinkDataList, IShellLinkDataList)
-	COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit)
-	COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
-	COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt)
-	COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+    COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistFile)
+    COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile)
+    COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)
+    COM_INTERFACE_ENTRY_IID(IID_IShellLinkA, IShellLinkA)
+    COM_INTERFACE_ENTRY_IID(IID_IShellLinkW, IShellLinkW)
+    COM_INTERFACE_ENTRY_IID(IID_IShellLinkDataList, IShellLinkDataList)
+    COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit)
+    COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
+    COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget)
+    COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt)
+    COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
 END_COM_MAP()
 };
 
Index: dll/win32/shell32/CMakeLists.txt
===================================================================
--- dll/win32/shell32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/shell32/CMakeLists.txt	(copie de travail)
@@ -1,3 +1,4 @@
+PROJECT(SHELL)
 
 set_cpp(WITH_RUNTIME)
 
@@ -16,7 +17,7 @@
 spec2def(shell32.dll shell32.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
-    authors.cpp
+    #authors.cpp
     autocomplete.cpp
     brsfolder.cpp
     changenotify.cpp
@@ -54,6 +55,7 @@
     folders/fonts.cpp
     folders/cpanel.cpp
     folders/recyclebin.cpp
+    droptargets/CexeDropHandler.cpp
     shlexec.cpp
     shlfileop.cpp
     shlfolder.cpp
@@ -72,14 +74,15 @@
     folder_options.cpp
     filedefext.cpp
     drvdefext.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
+    precomp.h)
 
 add_library(shell32 SHARED
     ${SOURCE}
-    shell32.rc)
+    shell32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
 
-set_module_type(shell32 win32dll UNICODE)
+set_module_type(shell32 win32dll UNICODE HOTPATCHABLE)
 
 target_link_libraries(shell32
     atlnew
@@ -106,5 +109,5 @@
     ntdll)
 
 add_dependencies(shell32 shdocvw_v1)
-add_pch(shell32 precomp.h)
+add_pch(shell32 precomp.h SOURCE)
 add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/shell32/droptargets/CexeDropHandler.cpp
===================================================================
--- dll/win32/shell32/droptargets/CexeDropHandler.cpp	(rÃ©vision 0)
+++ dll/win32/shell32/droptargets/CexeDropHandler.cpp	(rÃ©vision 62573)
@@ -0,0 +1,138 @@
+/*
+ * executable drop target handler
+ *
+ * Copyright 2014              Huw Campbell
+ *
+ * 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
+ */
+
+#include <precomp.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL (shell);
+
+CExeDropHandler::CExeDropHandler()
+{
+    pclsid = (CLSID *)&CLSID_ExeDropHandler;
+}
+
+CExeDropHandler::~CExeDropHandler()
+{
+
+}
+
+// IDropTarget
+HRESULT WINAPI CExeDropHandler::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    TRACE ("(%p)\n", this);
+    *pdwEffect = DROPEFFECT_COPY;
+    return S_OK;
+}
+
+HRESULT WINAPI CExeDropHandler::DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    TRACE ("(%p)\n", this);
+    *pdwEffect = DROPEFFECT_COPY;
+    return S_OK;
+}
+
+HRESULT WINAPI CExeDropHandler::DragLeave()
+{
+    TRACE ("(%p)\n", this);
+    return S_OK;
+}
+
+HRESULT WINAPI CExeDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
+{
+    TRACE ("(%p)\n", this);    
+    FORMATETC fmt;
+    STGMEDIUM medium;
+    LPWSTR pszSrcList;
+    InitFormatEtc (fmt, CF_HDROP, TYMED_HGLOBAL);
+    WCHAR wszBuf[MAX_PATH * 2 + 8], *pszEnd = wszBuf;
+    size_t cchRemaining = _countof(wszBuf);
+
+    if (SUCCEEDED(pDataObject->GetData(&fmt, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/)
+    {
+        LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal);
+        if (!lpdf)
+        {
+            ERR("Error locking global\n");
+            return E_FAIL;
+        }
+        pszSrcList = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles);
+        while (*pszSrcList)
+        {
+            if (StrChrW(pszSrcList, L' ') && cchRemaining > 3)
+                StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"\"%ls\" ", pszSrcList);
+            else
+                StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"%ls ", pszSrcList);
+            
+            pszSrcList += wcslen(pszSrcList) + 1;
+        }
+    }
+
+    ShellExecute(NULL, L"open", sPathTarget, wszBuf, NULL,SW_SHOWNORMAL);
+
+    return S_OK;
+}
+
+
+// IPersistFile
+HRESULT WINAPI CExeDropHandler::GetCurFile(LPOLESTR *ppszFileName)
+{
+    FIXME ("(%p)\n", this);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI CExeDropHandler::IsDirty()
+{
+    FIXME ("(%p)\n", this);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI CExeDropHandler::Load(LPCOLESTR pszFileName, DWORD dwMode)
+{
+    UINT len = strlenW(pszFileName);
+    sPathTarget = (WCHAR *)SHAlloc((len + 1) * sizeof(WCHAR));
+    memcpy(sPathTarget, pszFileName, (len + 1) * sizeof(WCHAR));
+    return S_OK;
+}
+
+HRESULT WINAPI CExeDropHandler::Save(LPCOLESTR pszFileName, BOOL fRemember)
+{
+    FIXME ("(%p)\n", this);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI CExeDropHandler::SaveCompleted(LPCOLESTR pszFileName)
+{
+    FIXME ("(%p)\n", this);
+    return E_NOTIMPL;
+}
+
+/************************************************************************
+ * CFSFolder::GetClassID
+ */
+HRESULT WINAPI CExeDropHandler::GetClassID(CLSID * lpClassId)
+{
+    TRACE ("(%p)\n", this);
+
+    if (!lpClassId)
+        return E_POINTER;
+
+    *lpClassId = *pclsid;
+
+    return S_OK;
+}
\ No newline at end of file

Modification de propriÃ©tÃ©s sur dll/win32/shell32/droptargets/CexeDropHandler.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/shell32/droptargets/CexeDropHandler.h
===================================================================
--- dll/win32/shell32/droptargets/CexeDropHandler.h	(rÃ©vision 0)
+++ dll/win32/shell32/droptargets/CexeDropHandler.h	(rÃ©vision 62573)
@@ -0,0 +1,66 @@
+/*
+ * executable drop target handler
+ *
+ * Copyright 2014              Huw Campbell
+ *
+ * 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 _CEXEDROPHANDLER_H_
+#define _CEXEDROPHANDLER_H_
+
+class CExeDropHandler :
+    public CComCoClass<CExeDropHandler, &CLSID_ExeDropHandler>,
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IDropTarget,
+    public IPersistFile
+{
+private:
+    CLSID *pclsid;
+    LPWSTR sPathTarget;
+public:
+    CExeDropHandler();
+    ~CExeDropHandler();
+
+    // IDropTarget
+    virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+    virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+    virtual HRESULT WINAPI DragLeave();
+    virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
+
+    // IPersist
+    virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
+
+    //////// IPersistFile
+    virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName);
+    virtual HRESULT WINAPI IsDirty();
+    virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode);
+    virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember);
+    virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName);
+
+
+DECLARE_REGISTRY_RESOURCEID(IDR_EXEDROPHANDLER)
+DECLARE_NOT_AGGREGATABLE(CExeDropHandler)
+
+DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+BEGIN_COM_MAP(CExeDropHandler)
+    COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist)
+    COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile)
+    COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget)
+END_COM_MAP()
+};
+
+#endif /* _CEXEDROPHANDLER_H_ */

Modification de propriÃ©tÃ©s sur dll/win32/shell32/droptargets/CexeDropHandler.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/win32/shell32/droptargets
===================================================================
--- dll/win32/shell32/droptargets	(rÃ©vision 0)
+++ dll/win32/shell32/droptargets	(copie de travail)

Modification de propriÃ©tÃ©s sur dll/win32/shell32/droptargets
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Index: dll/win32/msvcrt/CMakeLists.txt
===================================================================
--- dll/win32/msvcrt/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/msvcrt/CMakeLists.txt	(copie de travail)
@@ -31,5 +31,4 @@
 endif()
 
 add_importlibs(msvcrt kernel32 ntdll)
-add_pch(msvcrt precomp.h)
 add_cd_file(TARGET msvcrt DESTINATION reactos/system32 FOR all)
Index: dll/win32/hnetcfg/CMakeLists.txt
===================================================================
--- dll/win32/hnetcfg/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/win32/hnetcfg/CMakeLists.txt	(copie de travail)
@@ -11,9 +11,13 @@
     port.c
     profile.c
     service.c
+    hnetcfg_private.h)
+
+add_library(hnetcfg SHARED
+    ${SOURCE}
+    hnetcfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
 
-add_library(hnetcfg SHARED ${SOURCE} hnetcfg.rc)
 add_typelib(hnetcfg_tlb.idl)
 
 list(APPEND hnetcfg_rc_deps
@@ -25,4 +29,5 @@
 set_module_type(hnetcfg win32dll)
 target_link_libraries(hnetcfg wine uuid)
 add_importlibs(hnetcfg ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
+add_pch(hnetcfg hnetcfg_private.h SOURCE)
 add_cd_file(TARGET hnetcfg DESTINATION reactos/system32 FOR all)
Index: dll/win32/hnetcfg/hnetcfg_private.h
===================================================================
--- dll/win32/hnetcfg/hnetcfg_private.h	(rÃ©vision 61927)
+++ dll/win32/hnetcfg/hnetcfg_private.h	(copie de travail)
@@ -16,8 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _HNETCFG_PRIVATE_H_
+#define _HNETCFG_PRIVATE_H_
 
+#include <wine/config.h>
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -53,3 +56,5 @@
 HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
+
+#endif /* _HNETCFG_PRIVATE_H_ */
Index: dll/opengl/mesa/swrast/CMakeLists.txt
===================================================================
--- dll/opengl/mesa/swrast/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/opengl/mesa/swrast/CMakeLists.txt	(copie de travail)
@@ -25,9 +25,10 @@
     s_texture.c
     s_triangle.c
     s_zoom.c
-)
+    precomp.h)
 
 add_library(mesa_swrast STATIC ${SOURCE})
+add_pch(mesa_swrast precomp.h SOURCE)
 if(NOT MSVC)
     allow_warnings(mesa_swrast)
 endif()
Index: dll/opengl/mesa/main/CMakeLists.txt
===================================================================
--- dll/opengl/mesa/main/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/opengl/mesa/main/CMakeLists.txt	(copie de travail)
@@ -35,7 +35,7 @@
     getstring.c
     hash.c
     hint.c
-    histogram.c
+    #histogram.c
     image.c
     imports.c
     light.c
@@ -62,7 +62,7 @@
     texgetimage.c
     teximage.c
     texobj.c
-    texpal.c
+    #texpal.c
     texparam.c
     texstate.c
     texstorage.c
@@ -72,9 +72,10 @@
     version.c
     viewport.c
     vtxfmt.c
-)
+    precomp.h)
 
 add_library(mesa_main STATIC ${SOURCE})
+add_pch(mesa_main precomp.h SOURCE)
 if(NOT MSVC)
     allow_warnings(mesa_main)
 endif()
Index: dll/opengl/mesa/vbo/CMakeLists.txt
===================================================================
--- dll/opengl/mesa/vbo/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/opengl/mesa/vbo/CMakeLists.txt	(copie de travail)
@@ -15,6 +15,7 @@
     vbo_save_api.c
     vbo_save_draw.c
     vbo_save_loopback.c
-)
+    precomp.h)
 
-add_library(mesa_vbo STATIC ${SOURCE})
\ No newline at end of file
+add_library(mesa_vbo STATIC ${SOURCE})
+add_pch(mesa_vbo precomp.h SOURCE)
Index: dll/opengl/mesa/math/CMakeLists.txt
===================================================================
--- dll/opengl/mesa/math/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/opengl/mesa/math/CMakeLists.txt	(copie de travail)
@@ -8,6 +8,7 @@
     m_translate.c
     m_vector.c
     m_xform.c
-)
+    precomp.h)
 
-add_library(mesa_math STATIC ${SOURCE})
\ No newline at end of file
+add_library(mesa_math STATIC ${SOURCE})
+add_pch(mesa_math precomp.h SOURCE)
Index: dll/opengl/mesa/tnl/CMakeLists.txt
===================================================================
--- dll/opengl/mesa/tnl/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/opengl/mesa/tnl/CMakeLists.txt	(copie de travail)
@@ -15,6 +15,7 @@
     t_vertex.c
     t_vertex_generic.c
     t_vertex_sse.c
-)
+    precomp.h)
 
-add_library(mesa_tnl STATIC ${SOURCE})
\ No newline at end of file
+add_library(mesa_tnl STATIC ${SOURCE})
+add_pch(mesa_tnl precomp.h SOURCE)
Index: dll/opengl/opengl32/wgl.c
===================================================================
--- dll/opengl/opengl32/wgl.c	(rÃ©vision 61927)
+++ dll/opengl/opengl32/wgl.c	(copie de travail)
@@ -871,7 +871,7 @@
     return sw_ShareLists(ctx_src->dhglrc, ctx_dst->dhglrc);
 }
 
-BOOL WINAPI wglSwapBuffers(HDC hdc)
+BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers(HDC hdc)
 {
     struct wgl_dc_data* dc_data = get_dc_data(hdc);
     
Index: dll/opengl/opengl32/CMakeLists.txt
===================================================================
--- dll/opengl/opengl32/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/opengl/opengl32/CMakeLists.txt	(copie de travail)
@@ -20,9 +20,8 @@
     swimpl.c
     wgl.c
     wgl_font.c
-    ${CMAKE_CURRENT_BINARY_DIR}/opengl32_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def
-)
+    opengl32.h
+    ${CMAKE_CURRENT_BINARY_DIR}/opengl32_stubs.c)
 
 set_source_files_properties(gcrt0.o libgmon.a PROPERTIES EXTERNAL_OBJECT TRUE)
 
@@ -33,7 +32,11 @@
     )
 endif()
 
-add_library(opengl32 SHARED ${SOURCE} ${opengl32_asm})
+add_library(opengl32 SHARED
+    ${SOURCE}
+    ${opengl32_asm}
+    ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def)
+
 target_link_libraries(opengl32
     wine
     ${PSEH_LIB}
@@ -50,7 +53,8 @@
     target_link_libraries(opengl32 mesa_x86)
 endif()
 
-set_module_type(opengl32 win32dll)
+set_module_type(opengl32 win32dll HOTPATCHABLE)
 
 add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(opengl32 opengl32.h SOURCE)
 add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)
Index: dll/opengl/opengl32/opengl32.h
===================================================================
--- dll/opengl/opengl32/opengl32.h	(rÃ©vision 61927)
+++ dll/opengl/opengl32/opengl32.h	(copie de travail)
@@ -5,7 +5,8 @@
  * PURPOSE:              OpenGL32 lib, general header
  */
 
-#pragma once
+#ifndef _OPENGL32_PCH_
+#define _OPENGL32_PCH_
 
 #define WIN32_NO_STATUS
 #include <stdarg.h>
@@ -168,3 +169,5 @@
 BOOL sw_CopyContext(DHGLRC dhglrcSrc, DHGLRC dhglrcDst, UINT mask);
 BOOL sw_ShareLists(DHGLRC dhglrcSrc, DHGLRC dhglrcDst);
 BOOL sw_SwapBuffers(HDC hdc, struct wgl_dc_data* dc_data);
+
+#endif /* _OPENGL32_PCH_ */
Index: dll/3rdparty/libtiff/CMakeLists.txt
===================================================================
--- dll/3rdparty/libtiff/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/3rdparty/libtiff/CMakeLists.txt	(copie de travail)
@@ -10,7 +10,7 @@
     ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff
     ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
 
-add_library(libtiff SHARED
+list(APPEND SOURCE
     mkg3states.c
     tif_aux.c
     tif_close.c
@@ -48,12 +48,15 @@
     tif_warning.c
     tif_win32.c
     tif_write.c
-    tif_zip.c)
+    tif_zip.c
+    precomp.h)
 
+add_library(libtiff SHARED ${SOURCE})
 set_module_type(libtiff win32dll)
 target_link_libraries(libtiff zlib getopt)
 add_importlibs(libtiff user32 msvcrt kernel32 ntdll)
 add_dependencies(libtiff psdk)
+add_pch(libtiff precomp.h SOURCE)
 add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all)
 
 if(NOT MSVC)
Index: dll/3rdparty/libxslt/CMakeLists.txt
===================================================================
--- dll/3rdparty/libxslt/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/3rdparty/libxslt/CMakeLists.txt	(copie de travail)
@@ -13,7 +13,7 @@
     -D_WINSOCKAPI_
     -DLIBXML_STATIC)
 
-add_library(libxslt SHARED
+list(APPEND SOURCE
     attributes.c
     attrvt.c
     documents.c
@@ -32,18 +32,19 @@
     variables.c
     xslt.c
     xsltlocale.c
-    xsltutils.c)
+    xsltutils.c
+    precomp.h)
 
+add_library(libxslt SHARED ${SOURCE})
 set_module_type(libxslt win32dll)
-target_link_libraries(libxslt libxml2)
+target_link_libraries(libxslt libxml2 iconv-static)
 add_importlibs(libxslt msvcrt ws2_32 kernel32)
-
 if(MSVC)
     add_importlibs(libxslt ntdll)
 endif()
 
 add_dependencies(libxslt psdk)
-add_pch(libxslt libxslt.h)
+add_pch(libxslt precomp.h SOURCE)
 add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all)
 
 if(NOT MSVC)
Index: dll/3rdparty/libpng/CMakeLists.txt
===================================================================
--- dll/3rdparty/libpng/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/3rdparty/libpng/CMakeLists.txt	(copie de travail)
@@ -9,7 +9,7 @@
     ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng
     ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
 
-add_library(libpng SHARED
+list(APPEND SOURCE
     png.c
     pngerror.c
     pngget.c
@@ -24,10 +24,12 @@
     pngwio.c
     pngwrite.c
     pngwtran.c
-    pngwutil.c)
+    pngwutil.c
+    pngpriv.h)
 
+add_library(libpng SHARED ${SOURCE})
 set_module_type(libpng win32dll)
 target_link_libraries(libpng zlib)
 add_importlibs(libpng msvcrt kernel32 ntdll)
-add_dependencies(libpng psdk)
+add_pch(libpng pngpriv.h SOURCE)
 add_cd_file(TARGET libpng DESTINATION reactos/system32 FOR all)
Index: dll/shellext/fontext/CMakeLists.txt
===================================================================
--- dll/shellext/fontext/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/shellext/fontext/CMakeLists.txt	(copie de travail)
@@ -1,9 +1,13 @@
 
 spec2def(fontext.dll fontext.spec)
 
-add_library(fontext SHARED
+list(APPEND SOURCE
     fontext.c
     regsvr.c
+    fontext.h)
+
+add_library(fontext SHARED
+    ${SOURCE}
     fontext.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fontext.def)
 
@@ -22,5 +26,5 @@
     kernel32
     ntdll)
 
-add_pch(fontext fontext.h)
+add_pch(fontext fontext.h SOURCE)
 add_cd_file(TARGET fontext DESTINATION reactos/system32 FOR all)
Index: dll/shellext/fontext/fontext.h
===================================================================
--- dll/shellext/fontext/fontext.h	(rÃ©vision 61927)
+++ dll/shellext/fontext/fontext.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _FONTEXT_PCH_
+#define _FONTEXT_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -4,3 +7,5 @@
 #define COBJMACROS
 
 #include <windef.h>
+
+#endif /* _FONTEXT_PCH_ */
Index: dll/shellext/deskadp/CMakeLists.txt
===================================================================
--- dll/shellext/deskadp/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/shellext/deskadp/CMakeLists.txt	(copie de travail)
@@ -4,10 +4,13 @@
 list(APPEND SOURCE
     deskadp.c
     shxiface.c
+    precomp.h)
+
+add_library(deskadp SHARED
+    ${SOURCE}
     deskadp.rc
     ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def)
 
-add_library(deskadp SHARED ${SOURCE})
 set_module_type(deskadp win32dll UNICODE)
 target_link_libraries(deskadp uuid)
 
@@ -20,5 +23,5 @@
     kernel32
     ntdll)
 
-add_pch(deskadp precomp.h)
+add_pch(deskadp precomp.h SOURCE)
 add_cd_file(TARGET deskadp DESTINATION reactos/system32 FOR all)
Index: dll/shellext/deskadp/deskadp.rc
===================================================================
--- dll/shellext/deskadp/deskadp.rc	(rÃ©vision 61927)
+++ dll/shellext/deskadp/deskadp.rc	(copie de travail)
@@ -63,6 +63,9 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/shellext/deskadp/lang/sq-AL.rc
===================================================================
--- dll/shellext/deskadp/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/shellext/deskadp/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,51 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+* DATE OF TR: 29-11-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Adapter"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Tipi Adapter", -1, 7, 3, 237, 50
+    LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX
+    PUSHBUTTON "Tipare", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14
+    GROUPBOX "Info mbi dapter", -1, 7, 56, 237, 75
+    LTEXT "Tipi Chipit:", -1, 13, 68, 58, 8
+    LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX
+    LTEXT "Tipi DAC:", -1, 13, 80, 58, 8
+    LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX
+    LTEXT "Masa e Memories:", -1, 13, 92, 58, 8
+    LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX
+    LTEXT "Adapter String:", -1, 13, 104, 58, 8
+    LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX
+    LTEXT "BIOS Infor:", -1, 13, 116, 58, 8
+    LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX
+    PUSHBUTTON "&Listo te gjith mjetet...", IDC_LISTALLMODES, 7, 139, 75, 14
+END
+
+IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME
+CAPTION "Listo te gjith mjetet"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15
+    PUSHBUTTON "Anulo", IDCANCEL, 167, 115, 50, 15
+    GROUPBOX "Listo te gjith mjetet e vlefshme", -1, 6, 7, 212, 98
+    LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL
+END
+
+STRINGTABLE
+BEGIN
+    IDS_MODEFMT "%d by %d, %s, %s"
+    IDS_DEFREFRESHRATE "Default Refresh"
+    IDES_REFRESHRATEFMT "%d Hertz"
+    IDS_4BPP "16 Colors"
+    IDS_8BPP "256 Colors"
+    IDS_15BPP "High Color (15 bit)"
+    IDS_16BPP "High Color (16 bit)"
+    IDS_24BPP "True Color (24 bit)"
+    IDS_32BPP "True Color (32 bit)"
+END

Modification de propriÃ©tÃ©s sur dll/shellext/deskadp/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/shellext/slayer/lang/sq-AL.rc
===================================================================
--- dll/shellext/slayer/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/shellext/slayer/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,41 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+* DATE OF TR: 29-11-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "PajtueshmÃ«ri"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT "NÃ«se keni probleme ne ekzekutimin e kÃ«tij programi nÃ« ReactOS, pÃ«rzgjidhni njÃ« sistem operativ ReactOS duhet tÃ« raportojÃ« pÃ«r zbatimin.", -1, 7, 7, 210, 31
+    GROUPBOX "Mjeti PajtueshmÃ«rise", IDC_COMPATGROUP, 7, 41, 210, 49
+    CHECKBOX "Ekzekuto kete program ne menyre pajtueshmerie per:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Shfaq konfigurimet", -1, 7, 99, 210, 61, BS_GROUPBOX | WS_DISABLED
+    CHECKBOX "Ekzekuto ne 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED
+    CHECKBOX "Ekzekuto ne 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED
+    CHECKBOX "Ã‡aktivizo themat vizuale", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "Modifiko mjetin e pajtueshmerise...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15
+    /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY */
+END
+
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Modifiko Mjetin e Pajtueshmerise"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LISTBOX IDC_COMPATIBILITYMODE, 9, 6, 148, 108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER
+    PUSHBUTTON "Shto...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
+    PUSHBUTTON "Modifiko...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
+    PUSHBUTTON "Fshi", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
+    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 162, 116, 60, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SLAYER "Slayer"
+    IDS_DESCRIPTION "Application Compatibility Layer Shell Extension"
+END

Modification de propriÃ©tÃ©s sur dll/shellext/slayer/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/shellext/slayer/slayer.rc
===================================================================
--- dll/shellext/slayer/slayer.rc	(rÃ©vision 61927)
+++ dll/shellext/slayer/slayer.rc	(copie de travail)
@@ -72,6 +72,9 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: dll/shellext/deskmon/CMakeLists.txt
===================================================================
--- dll/shellext/deskmon/CMakeLists.txt	(rÃ©vision 61927)
+++ dll/shellext/deskmon/CMakeLists.txt	(copie de travail)
@@ -4,10 +4,13 @@
 list(APPEND SOURCE
     deskmon.c
     shxiface.c
+    precomp.h)
+
+add_library(deskmon SHARED
+    ${SOURCE}
     deskmon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def)
 
-add_library(deskmon SHARED ${SOURCE})
 set_module_type(deskmon win32dll UNICODE)
 target_link_libraries(deskmon uuid)
 
@@ -20,5 +23,5 @@
     kernel32
     ntdll)
 
-add_pch(deskmon precomp.h)
+add_pch(deskmon precomp.h SOURCE)
 add_cd_file(TARGET deskmon DESTINATION reactos/system32 FOR all)
Index: dll/shellext/deskmon/lang/sq-AL.rc
===================================================================
--- dll/shellext/deskmon/lang/sq-AL.rc	(rÃ©vision 0)
+++ dll/shellext/deskmon/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,26 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+* DATE OF TR: 29-11-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+IDD_MONITOR DIALOGEX 0, 0, 252, 226
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Monitori"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX "Tipi Monitorit", -1, 7, 3, 237, 52
+    LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX
+    LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL
+    PUSHBUTTON "Tipare", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED
+    GROUPBOX "Konfigurime Monitor", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63
+    LTEXT "&Shkalla e fireskimit te monitorit:", IDS_REFRESHRATELABEL, 13, 73, 225, 8
+    COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT
+    AUTOCHECKBOX "&Fsheh mjetet qe ky monitor nuk shfaq", IDC_PRUNINGCHECK, 13, 106, 225, 10
+END
+
+STRINGTABLE
+BEGIN
+    IDS_USEDEFFRQUENCY "perdor konfigurimet e parazgjedhura per kete hardware"
+    IDS_FREQFMT "%u Hertz"
+END

Modification de propriÃ©tÃ©s sur dll/shellext/deskmon/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: dll/shellext/deskmon/deskmon.rc
===================================================================
--- dll/shellext/deskmon/deskmon.rc	(rÃ©vision 61927)
+++ dll/shellext/deskmon/deskmon.rc	(copie de travail)
@@ -63,6 +63,9 @@
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif
Index: drivers/setup/blue/CMakeLists.txt
===================================================================
--- drivers/setup/blue/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/setup/blue/CMakeLists.txt	(copie de travail)
@@ -1,9 +1,13 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 
-add_library(blue SHARED blue.c font.c blue.rc)
+list(APPEND SOURCE
+    blue.c
+    font.c
+    blue.h)
 
-add_pch(blue blue.h)
+add_library(blue SHARED ${SOURCE} blue.rc)
 set_module_type(blue kernelmodedriver)
 add_importlibs(blue ntoskrnl hal)
+add_pch(blue blue.h SOURCE)
 add_cd_file(TARGET blue DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/setup/blue/blue.h
===================================================================
--- drivers/setup/blue/blue.h	(rÃ©vision 61927)
+++ drivers/setup/blue/blue.h	(copie de travail)
@@ -6,9 +6,10 @@
  * PROGRAMMERS:     Aleksey Bragin (aleksey@reactos.org)
  */
 
-/* DEFINITIONS ***************************************************************/
+#ifndef _BLUE_PCH_
+#define _BLUE_PCH_
 
-#include <ntddk.h>
+#include <wdm.h>
 
 typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES;
 
@@ -131,3 +132,5 @@
 
 void ScrLoadFontTable(UINT32 CodePage);
 NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField);
+
+#endif /* _BLUE_PCH_ */
Index: drivers/setup/blue/font.c
===================================================================
--- drivers/setup/blue/font.c	(rÃ©vision 61927)
+++ drivers/setup/blue/font.c	(copie de travail)
@@ -10,9 +10,10 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <ntddk.h>
 #include "blue.h"
 
+#include <ntddk.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -256,4 +257,3 @@
         }
     }
 }
-
Index: drivers/setup/blue/blue.c
===================================================================
--- drivers/setup/blue/blue.c	(rÃ©vision 61927)
+++ drivers/setup/blue/blue.c	(copie de travail)
@@ -10,7 +10,6 @@
 
 /* INCLUDES ******************************************************************/
 
-//#include <intrin.h>
 #include "blue.h"
 
 #define NDEBUG
Index: drivers/storage/fdc/fdc/fdc.h
===================================================================
--- drivers/storage/fdc/fdc/fdc.h	(rÃ©vision 61927)
+++ drivers/storage/fdc/fdc/fdc.h	(copie de travail)
@@ -6,10 +6,10 @@
  * PROGRAMMERS:    Eric Kohl
  */
 
+#ifndef _FDC_PCH_
+#define _FDC_PCH_
+
 #include <ntifs.h>
-#include <ntddk.h>
-#include <stdio.h>
-#include <debug.h>
 
 #define MAX_DEVICE_NAME 255
 #define MAX_ARC_PATH_LEN 255
@@ -125,4 +125,4 @@
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp);
 
-/* EOF */
+#endif /* _FDC_PCH_ */
Index: drivers/storage/fdc/fdc/pdo.c
===================================================================
--- drivers/storage/fdc/fdc/pdo.c	(rÃ©vision 61927)
+++ drivers/storage/fdc/fdc/pdo.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "fdc.h"
 
+#include <debug.h>
+
 /* FUNCTIONS ******************************************************************/
 
 static
Index: drivers/storage/fdc/fdc/fdo.c
===================================================================
--- drivers/storage/fdc/fdc/fdo.c	(rÃ©vision 61927)
+++ drivers/storage/fdc/fdc/fdo.c	(copie de travail)
@@ -10,6 +10,9 @@
 
 #include "fdc.h"
 
+#include <stdio.h>
+#include <debug.h>
+
 /* FUNCTIONS ******************************************************************/
 
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
@@ -573,4 +576,4 @@
     return Status;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */
Index: drivers/storage/fdc/fdc/CMakeLists.txt
===================================================================
--- drivers/storage/fdc/fdc/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/fdc/fdc/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,13 @@
 
-add_library(fdc SHARED
+list(APPEND SOURCE
     fdc.c
     fdo.c
     misc.c
     pdo.c
-    fdc.rc)
+    fdc.h)
 
+add_library(fdc SHARED ${SOURCE} fdc.rc)
 set_module_type(fdc kernelmodedriver)
 add_importlibs(fdc hal ntoskrnl)
-
+add_pch(fdc fdc.h SOURCE)
 add_cd_file(TARGET fdc DESTINATION reactos/system32/drivers FOR all)
Index: drivers/storage/fdc/fdc/fdc.c
===================================================================
--- drivers/storage/fdc/fdc/fdc.c	(rÃ©vision 61927)
+++ drivers/storage/fdc/fdc/fdc.c	(copie de travail)
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 ULONG ControllerCount = 0;
@@ -31,7 +30,7 @@
     PDEVICE_OBJECT Fdo = NULL;
     NTSTATUS Status;
 
-    DPRINT1("FdcAddDevice()\n");
+    DPRINT("FdcAddDevice()\n");
 
     ASSERT(DriverObject);
     ASSERT(Pdo);
@@ -88,7 +87,7 @@
 FdcCreate(IN PDEVICE_OBJECT DeviceObject,
           IN PIRP Irp)
 {
-    DPRINT1("FdcCreate()\n");
+    DPRINT("FdcCreate()\n");
 
     Irp->IoStatus.Status = STATUS_SUCCESS;
     Irp->IoStatus.Information = FILE_OPENED;
@@ -105,7 +104,7 @@
 FdcClose(IN PDEVICE_OBJECT DeviceObject,
          IN PIRP Irp)
 {
-    DPRINT1("FdcClose()\n");
+    DPRINT("FdcClose()\n");
 
     Irp->IoStatus.Status = STATUS_SUCCESS;
     Irp->IoStatus.Information = 0;
@@ -124,7 +123,7 @@
 {
     PCOMMON_DEVICE_EXTENSION Common = DeviceObject->DeviceExtension;
 
-    DPRINT1("FdcPnP()\n");
+    DPRINT("FdcPnP()\n");
     if (Common->IsFDO)
     {
         return FdcFdoPnp(DeviceObject,
@@ -144,7 +143,7 @@
 FdcPower(IN PDEVICE_OBJECT DeviceObject,
          IN PIRP Irp)
 {
-    DPRINT1("FdcPower()\n");
+    DPRINT("FdcPower()\n");
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -154,7 +153,7 @@
 DriverEntry(IN PDRIVER_OBJECT DriverObject,
             IN PUNICODE_STRING RegistryPath)
 {
-    DPRINT1("FDC: DriverEntry()\n");
+    DPRINT("FDC: DriverEntry()\n");
 
     DriverObject->MajorFunction[IRP_MJ_CREATE] = FdcCreate;
     DriverObject->MajorFunction[IRP_MJ_CLOSE] = FdcClose;
@@ -166,4 +165,4 @@
     DriverObject->DriverUnload = FdcDriverUnload;
 
     return STATUS_SUCCESS;
-}
\ No newline at end of file
+}
Index: drivers/storage/ide/uniata/bm_devs.h
===================================================================
--- drivers/storage/ide/uniata/bm_devs.h	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/bm_devs.h	(copie de travail)
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2002-2012 Alexandr A. Telyatnikov (Alter)
+Copyright (c) 2002-2014 Alexandr A. Telyatnikov (Alter)
 
 Module Name:
     bm_devs.h
@@ -103,14 +103,6 @@
 #define ATA_ATP865A		0x00081191
 #define ATA_ATP865R		0x00091191
 
-#define ATA_AMD_ID		0x1022
-#define ATA_AMD755		0x74011022
-#define ATA_AMD756		0x74091022
-#define ATA_AMD766		0x74111022
-#define ATA_AMD768		0x74411022
-#define ATA_AMD8111		0x74691022
-#define ATA_AMD5536             0x209a1022
-
 #define ATA_ACER_LABS_ID	0x10b9
 #define ATA_ALI_1533            0x153310b9
 #define ATA_ALI_5228            0x522810b9
@@ -120,6 +112,24 @@
 #define ATA_ALI_5288            0x528810b9
 #define ATA_ALI_5289            0x528910b9
 
+#define ATA_AMD_ID              0x1022
+#define ATA_AMD755              0x74011022
+#define ATA_AMD756              0x74091022
+#define ATA_AMD766              0x74111022
+#define ATA_AMD768              0x74411022
+#define ATA_AMD8111             0x74691022
+#define ATA_AMD5536             0x209a1022
+#define ATA_AMD_HUDSON2_S1	0x78001022
+#define ATA_AMD_HUDSON2_S2	0x78011022
+#define ATA_AMD_HUDSON2_S3	0x78021022
+#define ATA_AMD_HUDSON2_S4	0x78031022
+#define ATA_AMD_HUDSON2_S5	0x78041022
+#define ATA_AMD_HUDSON2		0x780c1022
+
+#define ATA_ADAPTEC_ID          0x9005
+#define ATA_ADAPTEC_1420        0x02419005
+#define ATA_ADAPTEC_1430        0x02439005
+
 #define ATA_ATI_ID              0x1002
 #define ATA_ATI_IXP200          0x43491002
 #define ATA_ATI_IXP300          0x43691002
@@ -136,6 +146,7 @@
 #define	ATA_ATI_IXP700_S4	0x43931002
 #define	ATA_ATI_IXP800_S1	0x43941002
 #define	ATA_ATI_IXP800_S2	0x43951002
+#define	ATA_ATI_4385            0x43851002
 
 #define ATA_CENATEK_ID          0x16ca
 #define ATA_CENATEK_ROCKET      0x000116ca
@@ -209,6 +220,10 @@
 #define ATA_I82801IB_AH4        0x29238086
 #define ATA_I82801IB_R1         0x29258086
 #define ATA_I82801IB_S2         0x29268086
+#define ATA_I82801IBM_S1        0x29288086
+#define ATA_I82801IBM_AH        0x29298086
+#define ATA_I82801IBM_R1        0x292a8086
+#define ATA_I82801IBM_S2        0x292d8086
 #define ATA_I82801JIB_S1        0x3a208086
 #define ATA_I82801JIB_AH        0x3a228086
 #define ATA_I82801JIB_R1        0x3a258086
@@ -265,13 +280,31 @@
 #define ATA_PPT_R5		0x1e0e8086
 #define ATA_PPT_R6		0x1e0f8086
 
+#define ATA_LPT_S1		0x8c008086
+#define ATA_LPT_S2		0x8c018086
+#define ATA_LPT_AH1		0x8c028086
+#define ATA_LPT_AH2		0x8c038086
+#define ATA_LPT_R1		0x8c048086
+#define ATA_LPT_R2		0x8c058086
+#define ATA_LPT_R3		0x8c068086
+#define ATA_LPT_R4		0x8c078086
+#define ATA_LPT_S3		0x8c088086
+#define ATA_LPT_S4		0x8c098086
+#define ATA_LPT_R5		0x8c0e8086
+#define ATA_LPT_R6		0x8c0f8086
+
 #define ATA_I31244              0x32008086
 #define ATA_ISCH                0x811a8086
 #define ATA_DH89XXCC            0x23238086
 
+#define ATA_COLETOCRK_AH1       0x23a38086
+#define ATA_COLETOCRK_S1        0x23a18086
+#define ATA_COLETOCRK_S2        0x23a68086
+
 #define ATA_JMICRON_ID          0x197b
 #define ATA_JMB360              0x2360197b
 #define ATA_JMB361              0x2361197b
+#define ATA_JMB362              0x2362197b
 #define ATA_JMB363              0x2363197b
 #define ATA_JMB365              0x2365197b
 #define ATA_JMB366              0x2366197b
@@ -596,12 +629,14 @@
 #define PRNEW		1
 #define PRTX		2
 #define PRMIO		3
-#define PRIDX		4
 #define PRTX4		0x0100
 #define PRSX4K		0x0200
 #define PRSX6K		0x0400
 #define PRSATA		0x0800
-#define PRDUAL		0x1000
+#define PRCMBO		0x1000
+#define PRG2		0x2000
+#define PRCMBO2		(PRCMBO | PRG2)
+#define PRSATA2		(PRSATA | PRG2)
 
 #define SWKS33		0
 #define SWKS66		1
@@ -611,6 +646,7 @@
 #define SIIOLD          0
 #define SIICMD          1
 #define SIIMIO          2
+#define ATI700          3
 
 #define SIIINTR	        0x0100
 #define SIIENINTR       0x0200
@@ -644,11 +680,11 @@
 #define NV4OFF          0x0100
 #define NVQ             0x0200
 
-#define VIA33		0
+#define VIA33		4
 #define VIA66		1
 #define VIA100		2
 #define VIA133		3
-#define AMDNVIDIA	4
+#define AMDNVIDIA	0
 #define AMDCABLE	0x0100
 #define AMDBUG		0x0200
 #define VIABAR		0x0400
@@ -692,12 +728,12 @@
     PCI_DEV_HW_SPEC_BM( 5229, 10b9, 0x20, ATA_UDMA2, "ALI M5229 UDMA2"  , ALIOLD                                  ),
     PCI_DEV_HW_SPEC_BM( 5229, 10b9, 0x00, ATA_WDMA2, "ALI M5229 WDMA2"  , ALIOLD                                  ),
 
-    PCI_DEV_HW_SPEC_BM( 7401, 1022, 0x00, ATA_UDMA2, "AMD 755"          , AMDNVIDIA | 0x00                        ),
-    PCI_DEV_HW_SPEC_BM( 7409, 1022, 0x00, ATA_UDMA4, "AMD 756"          , AMDNVIDIA | UNIATA_NO80CHK              ),
-    PCI_DEV_HW_SPEC_BM( 7411, 1022, 0x00, ATA_UDMA5, "AMD 766"          , AMDNVIDIA | AMDBUG                      ),
-    PCI_DEV_HW_SPEC_BM( 7441, 1022, 0x00, ATA_UDMA5, "AMD 768"          , AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 7469, 1022, 0x00, ATA_UDMA6, "AMD 8111"         , AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 209a, 1022, 0x00, ATA_UDMA5, "AMD CS5536"       , AMDNVIDIA                               ),
+    PCI_DEV_HW_SPEC_BM( 7401, 1022, 0x00, ATA_UDMA2, "AMD 755"          , 0 | 0x00                        ),
+    PCI_DEV_HW_SPEC_BM( 7409, 1022, 0x00, ATA_UDMA4, "AMD 756"          , 0 | UNIATA_NO80CHK              ),
+    PCI_DEV_HW_SPEC_BM( 7411, 1022, 0x00, ATA_UDMA5, "AMD 766"          , 0 | AMDBUG                      ),
+    PCI_DEV_HW_SPEC_BM( 7441, 1022, 0x00, ATA_UDMA5, "AMD 768"          , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 7469, 1022, 0x00, ATA_UDMA6, "AMD 8111"         , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 209a, 1022, 0x00, ATA_UDMA5, "AMD CS5536"       , 0                               ),
 
     PCI_DEV_HW_SPEC_BM( 4349, 1002, 0x00, ATA_UDMA5, "ATI IXP200"       , 0                                       ),
     PCI_DEV_HW_SPEC_BM( 4369, 1002, 0x00, ATA_UDMA6, "ATI IXP300"       , 0                                       ),
@@ -706,10 +742,22 @@
     PCI_DEV_HW_SPEC_BM( 4379, 1002, 0x00, ATA_SA150, "ATI IXP400"       , SIIMIO | SIIBUG | SIINOSATAIRQ | UNIATA_SATA     ),
     PCI_DEV_HW_SPEC_BM( 437a, 1002, 0x00, ATA_SA300, "ATI IXP400"       , SIIMIO | SIIBUG | SIINOSATAIRQ | UNIATA_SATA     ),
     PCI_DEV_HW_SPEC_BM( 438c, 1002, 0x00, ATA_UDMA6, "ATI IXP600"       , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 4380, 1002, 0x00, ATA_SA150, "ATI IXP600"       , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4380, 1002, 0x00, ATA_SA300, "ATI IXP600"       , UNIATA_SATA | UNIATA_AHCI               ),
     PCI_DEV_HW_SPEC_BM( 439c, 1002, 0x00, ATA_UDMA6, "ATI IXP700"       , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 4390, 1002, 0x00, ATA_SA150, "ATI IXP700"       , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4390, 1002, 0x00, ATA_SA300, "ATI IXP700"       , ATI700 | UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4391, 1002, 0x00, ATA_SA300, "ATI IXP700"       , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4392, 1002, 0x00, ATA_SA300, "ATI IXP700"       , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4393, 1002, 0x00, ATA_SA300, "ATI IXP700"       , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4394, 1002, 0x00, ATA_SA300, "ATI IXP700/800"   , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 4395, 1002, 0x00, ATA_SA300, "ATI IXP700/800"   , UNIATA_SATA | UNIATA_AHCI               ),
 
+    PCI_DEV_HW_SPEC_BM( 780c, 1002, 0x00, ATA_UDMA6, "ATI Hudson-2"     , 0                                       ),
+    PCI_DEV_HW_SPEC_BM( 7800, 1002, 0x00, ATA_SA300, "ATI Hudson-2"     , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 7801, 1002, 0x00, ATA_SA300, "ATI Hudson-2"     , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 7802, 1002, 0x00, ATA_SA300, "ATI Hudson-2"     , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 7803, 1002, 0x00, ATA_SA300, "ATI Hudson-2"     , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 7804, 1002, 0x00, ATA_SA300, "ATI Hudson-2"     , UNIATA_SATA | UNIATA_AHCI               ),
+
     PCI_DEV_HW_SPEC_BM( 0004, 1103, 0x05, ATA_UDMA6, "HighPoint HPT372" , HPT372 | 0x00   | UNIATA_RAID_CONTROLLER),
     PCI_DEV_HW_SPEC_BM( 0004, 1103, 0x03, ATA_UDMA5, "HighPoint HPT370" , HPT370 | 0x00   | UNIATA_RAID_CONTROLLER),
     PCI_DEV_HW_SPEC_BM( 0004, 1103, 0x02, ATA_UDMA4, "HighPoint HPT368" , HPT366 | 0x00   | UNIATA_RAID_CONTROLLER),
@@ -778,7 +826,6 @@
 
     PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_SA300, "Intel ICH9"       , I6CH | UNIATA_SATA                      ),
     PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_SA300, "Intel ICH9"       , I6CH2 | UNIATA_SATA                     ),
-    PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH9"       , I6CH2 | UNIATA_SATA                     ),
     PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_SA300, "Intel ICH9"       , UNIATA_SATA | UNIATA_AHCI               ),/* ??? */
     PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9"       , UNIATA_SATA | UNIATA_AHCI               ),
     PCI_DEV_HW_SPEC_BM( 2923, 8086, 0x00, ATA_SA300, "Intel ICH9"       , UNIATA_SATA | UNIATA_AHCI               ),
@@ -846,57 +893,151 @@
     PCI_DEV_HW_SPEC_BM( 1e0e, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI               ),
     PCI_DEV_HW_SPEC_BM( 1e0f, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI               ),
 
+    PCI_DEV_HW_SPEC_BM( 8c00, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH | UNIATA_SATA                      ),
+    PCI_DEV_HW_SPEC_BM( 8c01, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH | UNIATA_SATA                      ),
+    PCI_DEV_HW_SPEC_BM( 8c02, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c03, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c04, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c05, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c06, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c07, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c08, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH2 | UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 8c09, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH2 | UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 8c0e, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+    PCI_DEV_HW_SPEC_BM( 8c0f, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI               ),
+
 //    PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244"      , UNIATA_SATA                             ),
     PCI_DEV_HW_SPEC_BM( 811a, 8086, 0x00, ATA_UDMA5, "Intel SCH"        , 0                                       ),
     PCI_DEV_HW_SPEC_BM( 2323, 8086, 0x00, ATA_SA300, "Intel DH98xxCC"   , UNIATA_SATA | UNIATA_AHCI                  ),
 
-    PCI_DEV_HW_SPEC_BM( 2360, 197b, 0x00, ATA_SA300, "JMB360"           , UNIATA_SATA | UNIATA_AHCI               ),
-
-    PCI_DEV_HW_SPEC_BM( 2361, 197b, 0x00, ATA_UDMA6, "JMB361"           , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 2363, 197b, 0x00, ATA_UDMA6, "JMB363"           , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 2365, 197b, 0x00, ATA_UDMA6, "JMB365"           , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 2366, 197b, 0x00, ATA_UDMA6, "JMB366"           , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 2368, 197b, 0x00, ATA_UDMA6, "JMB368"           , 0                                       ),
+    PCI_DEV_HW_SPEC_BM( 23a3, 8086, 0x00, ATA_SA300, "COLETOCRK" , I6CH2 | UNIATA_SATA                    ),
+    PCI_DEV_HW_SPEC_BM( 23a1, 8086, 0x00, ATA_SA300, "COLETOCRK" , I6CH2 | UNIATA_SATA                    ),
+    PCI_DEV_HW_SPEC_BM( 23a6, 8086, 0x00, ATA_SA300, "COLETOCRK" , UNIATA_SATA | UNIATA_AHCI              ),
+    
+    PCI_DEV_HW_SPEC_BM( 2360, 197b, 0x00, ATA_SA300, "JMB360"           , UNIATA_SATA | UNIATA_AHCI       ),
+    PCI_DEV_HW_SPEC_BM( 2361, 197b, 0x00, ATA_UDMA6, "JMB361"           , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 2362, 197b, 0x00, ATA_SA300, "JMB362"           , UNIATA_SATA | UNIATA_AHCI       ),
+    PCI_DEV_HW_SPEC_BM( 2363, 197b, 0x00, ATA_UDMA6, "JMB363"           , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 2365, 197b, 0x00, ATA_UDMA6, "JMB365"           , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 2366, 197b, 0x00, ATA_UDMA6, "JMB366"           , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 2368, 197b, 0x00, ATA_UDMA6, "JMB368"           , 0                               ),
 /*    
-    PCI_DEV_HW_SPEC_BM( 5040, 11ab, 0x00, ATA_SA150, "Marvell 88SX5040" , UNIATA_SATA                             ),
-    PCI_DEV_HW_SPEC_BM( 5041, 11ab, 0x00, ATA_SA150, "Marvell 88SX5041" , UNIATA_SATA                             ),
-    PCI_DEV_HW_SPEC_BM( 5080, 11ab, 0x00, ATA_SA150, "Marvell 88SX5080" , UNIATA_SATA                             ),
-    PCI_DEV_HW_SPEC_BM( 5081, 11ab, 0x00, ATA_SA150, "Marvell 88SX5081" , UNIATA_SATA                             ),
-    PCI_DEV_HW_SPEC_BM( 6041, 11ab, 0x00, ATA_SA300, "Marvell 88SX6041" , UNIATA_SATA                             ),
-    PCI_DEV_HW_SPEC_BM( 6081, 11ab, 0x00, ATA_SA300, "Marvell 88SX6081" , UNIATA_SATA                             ),*/
-    PCI_DEV_HW_SPEC_BM( 6101, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6101" , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 6121, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6121" , 0                                       ),
-    PCI_DEV_HW_SPEC_BM( 6145, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6145" , 0                                       ),
+    PCI_DEV_HW_SPEC_BM( 5040, 11ab, 0x00, ATA_SA150, "Marvell 88SX5040" , UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 5041, 11ab, 0x00, ATA_SA150, "Marvell 88SX5041" , UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 5080, 11ab, 0x00, ATA_SA150, "Marvell 88SX5080" , UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 5081, 11ab, 0x00, ATA_SA150, "Marvell 88SX5081" , UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 6041, 11ab, 0x00, ATA_SA300, "Marvell 88SX6041" , UNIATA_SATA                     ),
+    PCI_DEV_HW_SPEC_BM( 6081, 11ab, 0x00, ATA_SA300, "Marvell 88SX6081" , UNIATA_SATA                     ),*/
+    PCI_DEV_HW_SPEC_BM( 6101, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6101" , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 6102, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6102" , UNIATA_SATA | UNIATA_AHCI       ),
+    PCI_DEV_HW_SPEC_BM( 6111, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6111" , UNIATA_SATA | UNIATA_AHCI       ),
+    PCI_DEV_HW_SPEC_BM( 6121, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6121" , UNIATA_SATA | UNIATA_AHCI       ),
+    PCI_DEV_HW_SPEC_BM( 6141, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6141" , UNIATA_SATA | UNIATA_AHCI       ),
+    PCI_DEV_HW_SPEC_BM( 6145, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6145" , UNIATA_SATA | UNIATA_AHCI       ),
+/*    PCI_DEV_HW_SPEC_BM( 91a4, 1b4b, 0x00, ATA_UDMA6, "Marvell 88SE912x" , 0                                       ),*/
 
-    PCI_DEV_HW_SPEC_BM( 01bc, 10de, 0x00, ATA_UDMA5, "nVidia nForce"    , AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 0065, 10de, 0x00, ATA_UDMA6, "nVidia nForce2"   , AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 0085, 10de, 0x00, ATA_UDMA6, "nVidia nForce2 Pro",AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 008e, 10de, 0x00, ATA_SA150, "nVidia nForce2 Pro S1",UNIATA_SATA                          ),
-    PCI_DEV_HW_SPEC_BM( 00d5, 10de, 0x00, ATA_UDMA6, "nVidia nForce3"   , AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 00e5, 10de, 0x00, ATA_UDMA6, "nVidia nForce3 Pro",AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 00e3, 10de, 0x00, ATA_SA150, "nVidia nForce3 Pro S1",UNIATA_SATA                          ),
-    PCI_DEV_HW_SPEC_BM( 00ee, 10de, 0x00, ATA_SA150, "nVidia nForce3 Pro S2",UNIATA_SATA                          ),
-    PCI_DEV_HW_SPEC_BM( 0035, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP", AMDNVIDIA                               ),
-    PCI_DEV_HW_SPEC_BM( 0036, 10de, 0x00, ATA_SA150, "nVidia nForce MCP S1",NV4OFF | UNIATA_SATA                  ),
-    PCI_DEV_HW_SPEC_BM( 003e, 10de, 0x00, ATA_SA150, "nVidia nForce MCP S2",NV4OFF | UNIATA_SATA                  ),
-    PCI_DEV_HW_SPEC_BM( 0053, 10de, 0x00, ATA_UDMA6, "nVidia nForce CK804", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 0054, 10de, 0x00, ATA_SA300, "nVidia nForce CK804 S1",NV4OFF | UNIATA_SATA                ),
-    PCI_DEV_HW_SPEC_BM( 0055, 10de, 0x00, ATA_SA300, "nVidia nForce CK804 S2",NV4OFF | UNIATA_SATA                ),
-    PCI_DEV_HW_SPEC_BM( 0265, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP51", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 0266, 10de, 0x00, ATA_SA300, "nVidia nForce MCP51 S1",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 0267, 10de, 0x00, ATA_SA300, "nVidia nForce MCP51 S2",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 036e, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP55", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 037e, 10de, 0x00, ATA_SA300, "nVidia nForce MCP55 S1",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 037f, 10de, 0x00, ATA_SA300, "nVidia nForce MCP55 S2",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 03ec, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP61", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 03e7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP61 S1",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 03f6, 10de, 0x00, ATA_SA300, "nVidia nForce MCP61 S2",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 03f7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP61 S3",NV4OFF | NVQ | UNIATA_SATA          ),
-    PCI_DEV_HW_SPEC_BM( 0448, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP65", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 0560, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP67", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 056c, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP73", AMDNVIDIA                             ),
-    PCI_DEV_HW_SPEC_BM( 0759, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP77", AMDNVIDIA                             ),
+    PCI_DEV_HW_SPEC_BM( 01bc, 10de, 0x00, ATA_UDMA5, "nVidia nForce"    , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 0065, 10de, 0x00, ATA_UDMA6, "nVidia nForce2"   , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 0085, 10de, 0x00, ATA_UDMA6, "nVidia nForce2 Pro",0                               ),
+    PCI_DEV_HW_SPEC_BM( 008e, 10de, 0x00, ATA_SA150, "nVidia nForce2 Pro S1",UNIATA_SATA                  ),
+    PCI_DEV_HW_SPEC_BM( 00d5, 10de, 0x00, ATA_UDMA6, "nVidia nForce3"   , 0                               ),
+    PCI_DEV_HW_SPEC_BM( 00e5, 10de, 0x00, ATA_UDMA6, "nVidia nForce3 Pro",0                               ),
+    PCI_DEV_HW_SPEC_BM( 00e3, 10de, 0x00, ATA_SA150, "nVidia nForce3 Pro S1",UNIATA_SATA                  ),
+    PCI_DEV_HW_SPEC_BM( 00ee, 10de, 0x00, ATA_SA150, "nVidia nForce3 Pro S2",UNIATA_SATA                  ),
+    PCI_DEV_HW_SPEC_BM( 0035, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP", 0                               ),
+    PCI_DEV_HW_SPEC_BM( 0036, 10de, 0x00, ATA_SA150, "nVidia nForce MCP S1",NV4OFF | UNIATA_SATA          ),
+    PCI_DEV_HW_SPEC_BM( 003e, 10de, 0x00, ATA_SA150, "nVidia nForce MCP S2",NV4OFF | UNIATA_SATA          ),
+    PCI_DEV_HW_SPEC_BM( 0053, 10de, 0x00, ATA_UDMA6, "nVidia nForce CK804", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 0054, 10de, 0x00, ATA_SA300, "nVidia nForce CK804 S1",NV4OFF | UNIATA_SATA        ),
+    PCI_DEV_HW_SPEC_BM( 0055, 10de, 0x00, ATA_SA300, "nVidia nForce CK804 S2",NV4OFF | UNIATA_SATA        ),
+    PCI_DEV_HW_SPEC_BM( 0265, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP51", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 0266, 10de, 0x00, ATA_SA300, "nVidia nForce MCP51 S1",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 0267, 10de, 0x00, ATA_SA300, "nVidia nForce MCP51 S2",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 036e, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP55", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 037e, 10de, 0x00, ATA_SA300, "nVidia nForce MCP55 S1",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 037f, 10de, 0x00, ATA_SA300, "nVidia nForce MCP55 S2",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 03ec, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP61", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 03e7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP61 S1",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 03f6, 10de, 0x00, ATA_SA300, "nVidia nForce MCP61 S2",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 03f7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP61 S3",NV4OFF | NVQ | UNIATA_SATA  ),
+    PCI_DEV_HW_SPEC_BM( 0448, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP65", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 044c, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A0", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 044d, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A1", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 044e, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A2", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 044f, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A3", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 045c, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A4", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 045d, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A5", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 045e, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A6", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 045f, 10de, 0x00, ATA_SA300, "nVidia nForce MCP65 A7", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0560, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP67", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 0550, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A0", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0551, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A1", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0552, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A2", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0553, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A3", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0554, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A4", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0555, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A5", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0556, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A6", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0557, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A7", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0558, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A8", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0559, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 A9", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 055A, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 AA", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 055B, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 AB", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0584, 10de, 0x00, ATA_SA300, "nVidia nForce MCP67 AC", UNIATA_SATA | UNIATA_AHCI  ),
 
+    PCI_DEV_HW_SPEC_BM( 056c, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP73", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 07f0, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A0", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f1, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A1", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f2, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A2", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f3, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A3", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f4, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A4", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f5, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A5", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f6, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A6", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A7", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f8, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A8", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07f9, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 A9", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 07fa, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 AA", UNIATA_SATA | UNIATA_AHCI  ),
+
+    PCI_DEV_HW_SPEC_BM( 07fb, 10de, 0x00, ATA_SA300, "nVidia nForce MCP73 AB", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0759, 10de, 0x00, ATA_UDMA6, "nVidia nForce MCP77", 0                             ),
+    PCI_DEV_HW_SPEC_BM( 0ad0, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A0", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad1, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A1", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad2, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A2", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad3, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A3", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad4, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A4", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad5, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A5", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad6, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A6", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A7", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad8, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A8", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ad9, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 A9", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ada, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 AA", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0adb, 10de, 0x00, ATA_SA300, "nVidia nForce MCP77 AB", UNIATA_SATA | UNIATA_AHCI  ),
+
+    PCI_DEV_HW_SPEC_BM( 0ab4, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A0", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ab5, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A1", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ab6, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A2", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ab7, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A3", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ab8, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A4", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0ab9, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A5", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0aba, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A6", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0abb, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A7", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0abc, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A8", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0abd, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 A9", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0abe, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 AA", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0abf, 10de, 0x00, ATA_SA300, "nVidia nForce MCP79 AB", UNIATA_SATA | UNIATA_AHCI  ),
+
+    PCI_DEV_HW_SPEC_BM( 0d84, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A0", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d85, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A1", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d86, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A2", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d87, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A3", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d88, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A4", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d89, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A5", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d8a, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A6", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d8b, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A7", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d8c, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A8", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d8d, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 A9", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d8e, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 AA", UNIATA_SATA | UNIATA_AHCI  ),
+    PCI_DEV_HW_SPEC_BM( 0d8f, 10de, 0x00, ATA_SA300, "nVidia nForce MCP89 AB", UNIATA_SATA | UNIATA_AHCI  ),
+
     PCI_DEV_HW_SPEC_BM( 0502, 100b, 0x00, ATA_UDMA2, "National Geode SC1100", 0                                   ),
 
     PCI_DEV_HW_SPEC_BM( 4d33, 105a, 0x00, ATA_UDMA2, "Promise PDC20246" , PROLD | 0x00                            ),
@@ -913,18 +1054,28 @@
     PCI_DEV_HW_SPEC_BM( 7275, 105a, 0x00, ATA_UDMA6, "Promise PDC20277" , PRTX  | 0x00    | UNIATA_RAID_CONTROLLER),
     PCI_DEV_HW_SPEC_BM( 3318, 105a, 0x00, ATA_SA150, "Promise PDC20318" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
     PCI_DEV_HW_SPEC_BM( 3319, 105a, 0x00, ATA_SA150, "Promise PDC20319" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 3371, 105a, 0x00, ATA_SA150, "Promise PDC20371" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 3375, 105a, 0x00, ATA_SA150, "Promise PDC20375" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 3376, 105a, 0x00, ATA_SA150, "Promise PDC20376" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 3377, 105a, 0x00, ATA_SA150, "Promise PDC20377" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 3373, 105a, 0x00, ATA_SA150, "Promise PDC20378" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 3372, 105a, 0x00, ATA_SA150, "Promise PDC20379" , PRMIO | PRSATA  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
-    PCI_DEV_HW_SPEC_BM( 6617, 105a, 0x00, ATA_UDMA6, "Promise PDC20617" , PRMIO | PRDUAL  | UNIATA_RAID_CONTROLLER),
-    PCI_DEV_HW_SPEC_BM( 6626, 105a, 0x00, ATA_UDMA6, "Promise PDC20618" , PRMIO | PRDUAL  | UNIATA_RAID_CONTROLLER),
-    PCI_DEV_HW_SPEC_BM( 6629, 105a, 0x00, ATA_UDMA6, "Promise PDC20619" , PRMIO | PRDUAL  | UNIATA_RAID_CONTROLLER),
-    PCI_DEV_HW_SPEC_BM( 6620, 105a, 0x00, ATA_UDMA6, "Promise PDC20620" , PRMIO | PRDUAL  | UNIATA_RAID_CONTROLLER),
+    PCI_DEV_HW_SPEC_BM( 3371, 105a, 0x00, ATA_SA150, "Promise PDC20371" , PRMIO | PRCMBO  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3375, 105a, 0x00, ATA_SA150, "Promise PDC20375" , PRMIO | PRCMBO  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3376, 105a, 0x00, ATA_SA150, "Promise PDC20376" , PRMIO | PRCMBO  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3377, 105a, 0x00, ATA_SA150, "Promise PDC20377" , PRMIO | PRCMBO  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3373, 105a, 0x00, ATA_SA150, "Promise PDC20378" , PRMIO | PRCMBO  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3372, 105a, 0x00, ATA_SA150, "Promise PDC20379" , PRMIO | PRCMBO  | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3571, 105a, 0x00, ATA_SA150, "Promise PDC20571" , PRMIO | PRCMBO2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3d75, 105a, 0x00, ATA_SA150, "Promise PDC20575" , PRMIO | PRCMBO2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3574, 105a, 0x00, ATA_SA150, "Promise PDC20579" , PRMIO | PRCMBO2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3570, 105a, 0x00, ATA_SA300, "Promise PDC20771" , PRMIO | PRCMBO2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3d73, 105a, 0x00, ATA_SA300, "Promise PDC40775" , PRMIO | PRCMBO2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 6617, 105a, 0x00, ATA_UDMA6, "Promise PDC20617" , PRMIO | 0x00    | UNIATA_RAID_CONTROLLER),
+    PCI_DEV_HW_SPEC_BM( 6626, 105a, 0x00, ATA_UDMA6, "Promise PDC20618" , PRMIO | 0x00    | UNIATA_RAID_CONTROLLER),
+    PCI_DEV_HW_SPEC_BM( 6629, 105a, 0x00, ATA_UDMA6, "Promise PDC20619" , PRMIO | 0x00    | UNIATA_RAID_CONTROLLER),
+    PCI_DEV_HW_SPEC_BM( 6620, 105a, 0x00, ATA_UDMA6, "Promise PDC20620" , PRMIO | 0x00    | UNIATA_RAID_CONTROLLER),
 /*    PCI_DEV_HW_SPEC_BM( 6621, 105a, 0x00, ATA_UDMA6, "Promise PDC20621" , PRMIO | PRSX4X  | UNIATA_RAID_CONTROLLER),
     PCI_DEV_HW_SPEC_BM( 6622, 105a, 0x00, ATA_UDMA6, "Promise PDC20622" , PRMIO | PRSX4X  | UNIATA_RAID_CONTROLLER),*/
+    PCI_DEV_HW_SPEC_BM( 3571, 105a, 0x00, ATA_SA150, "Promise PDC40518" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3d75, 105a, 0x00, ATA_SA150, "Promise PDC40519" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3574, 105a, 0x00, ATA_SA150, "Promise PDC40718" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3570, 105a, 0x00, ATA_SA300, "Promise PDC40719" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 3d73, 105a, 0x00, ATA_SA300, "Promise PDC40779" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA),
 
     PCI_DEV_HW_SPEC_BM( 0211, 1166, 0x00, ATA_UDMA2, "ServerWorks ROSB4", SWKS33  | UNIATA_NO_DPC                 ),
     PCI_DEV_HW_SPEC_BM( 0212, 1166, 0x92, ATA_UDMA5, "ServerWorks CSB5" , SWKS100                                 ),
@@ -990,6 +1141,13 @@
     PCI_DEV_HW_SPEC_BM( 5513, 1039, 0x00, ATA_WDMA2, "SiS ATA-xxx"      , 0                                       ),
     PCI_DEV_HW_SPEC_BM( 0601, 1039, 0x00, ATA_WDMA2, "SiS ATA-xxx"      , 0                                       ),
 
+    PCI_DEV_HW_SPEC_BM( 1183, 1039, 0x00, ATA_UDMA6, "SiS PATA-1183" , SIS133NEW),
+    PCI_DEV_HW_SPEC_BM( 1182, 1039, 0x00, ATA_SA150, "SiS SATA 1182" , SISSATA   | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 0183, 1039, 0x00, ATA_SA150, "SiS SATA 183"  , SISSATA   | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 0182, 1039, 0x00, ATA_SA150, "SiS SATA 182"  , SISSATA   | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 0181, 1039, 0x00, ATA_SA150, "SiS SATA 181"  , SISSATA   | UNIATA_SATA),
+    PCI_DEV_HW_SPEC_BM( 0180, 1039, 0x00, ATA_SA150, "SiS SATA 180"  , SISSATA   | UNIATA_SATA),
+
 /*    PCI_DEV_HW_SPEC_BM( 0586, 1106, 0x41, ATA_UDMA2, "VIA 82C586B"      , VIA33  | 0x00                           ),
     PCI_DEV_HW_SPEC_BM( 0586, 1106, 0x40, ATA_UDMA2, "VIA 82C586B"      , VIA33  | VIAPRQ                         ),
     PCI_DEV_HW_SPEC_BM( 0586, 1106, 0x02, ATA_UDMA2, "VIA 82C586B"      , VIA33  | 0x00                           ),
@@ -1016,7 +1174,7 @@
     PCI_DEV_HW_SPEC_BM( 5337, 1106, 0x00, ATA_SA150, "VIA 8237S"        , 0      | UNIATA_SATA                    ),
     PCI_DEV_HW_SPEC_BM( 5372, 1106, 0x00, ATA_SA300, "VIA 8237"         , 0      | UNIATA_SATA                    ),
     PCI_DEV_HW_SPEC_BM( 7372, 1106, 0x00, ATA_SA300, "VIA 8237"         , 0      | UNIATA_SATA                    ),
-    //PCI_DEV_HW_SPEC_BM( 3349, 1106, 0x00, ATA_SA150, "VIA 8251"         , VIAAHCI| UNIATA_SATA                    ),
+    PCI_DEV_HW_SPEC_BM( 3349, 1106, 0x00, ATA_SA150, "VIA 8251"         , 0      | UNIATA_SATA | UNIATA_AHCI      ),
 
     PCI_DEV_HW_SPEC_BM( c693, 1080, 0x00, ATA_WDMA2, "Cypress 82C693"   ,0                                        ),
 
@@ -1045,7 +1203,8 @@
 
     PCI_DEV_HW_SPEC_BM( 0102, 1078, 0x00, ATA_UDMA2, "Cyrix 5530"       , 0                                       ),
 
-    PCI_DEV_HW_SPEC_BM( 0102, 1042, 0x00, ATA_PIO4,  "RZ 100x"          , 0                                       ),
+    PCI_DEV_HW_SPEC_BM( 1000, 1042, 0x00, ATA_PIO4,  "RZ 100x"          , 0                                       ),
+    PCI_DEV_HW_SPEC_BM( 1001, 1042, 0x00, ATA_PIO4,  "RZ 100x"          , 0                                       ),
 
     PCI_DEV_HW_SPEC_BM( 8172, 1283, 0x00, ATA_UDMA2, "IT8172"           , 0                                       ),
     PCI_DEV_HW_SPEC_BM( 8213, 1283, 0x00, ATA_UDMA6, "IT8213F"          , ITE_133_NEW                             ),
Index: drivers/storage/ide/uniata/bsmaster.h
===================================================================
--- drivers/storage/ide/uniata/bsmaster.h	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/bsmaster.h	(copie de travail)
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2002-2012 Alexandr A. Telyatnikov (Alter)
+Copyright (c) 2002-2014 Alexandr A. Telyatnikov (Alter)
 
 Module Name:
     bsmaster.h
@@ -31,10 +31,10 @@
 Revision History:
 
     Code was created by
-         Alter, Copyright (c) 2002-2008
+         Alter, Copyright (c) 2002-2014
 
-    Some definitions were taken from FreeBSD 4.3-4.6 ATA driver by
-         Søren Schmidt, Copyright (c) 1998,1999,2000,2001
+    Some definitions were taken from FreeBSD 4.3-9.2 ATA driver by
+         Søren Schmidt, Copyright (c) 1998-2014
 
 --*/
 
@@ -245,6 +245,12 @@
         ULONG Reserved:27;
     } BOHC;
 
+#define AHCI_BOHC_BB      0x00000001
+#define AHCI_BOHC_OOC     0x00000002
+#define AHCI_BOHC_SOOE    0x00000004
+#define AHCI_BOHC_OOS     0x00000008
+#define AHCI_BOHC_BOS     0x00000010
+
     UCHAR Reserved2[0x74];
 
     UCHAR VendorSpec[0x60];
@@ -289,7 +295,23 @@
 
 } SATA_SSTATUS_REG, *PSATA_SSTATUS_REG;
 
+#define         ATA_SS_DET_MASK         0x0000000f
+#define         ATA_SS_DET_NO_DEVICE    0x00000000
+#define         ATA_SS_DET_DEV_PRESENT  0x00000001
+#define         ATA_SS_DET_PHY_ONLINE   0x00000003
+#define         ATA_SS_DET_PHY_OFFLINE  0x00000004
 
+#define         ATA_SS_SPD_MASK         0x000000f0
+#define         ATA_SS_SPD_NO_SPEED     0x00000000
+#define         ATA_SS_SPD_GEN1         0x00000010
+#define         ATA_SS_SPD_GEN2         0x00000020
+
+#define         ATA_SS_IPM_MASK         0x00000f00
+#define         ATA_SS_IPM_NO_DEVICE    0x00000000
+#define         ATA_SS_IPM_ACTIVE       0x00000100
+#define         ATA_SS_IPM_PARTIAL      0x00000200
+#define         ATA_SS_IPM_SLUMBER      0x00000600
+
 typedef union _SATA_SCONTROL_REG {
 
     struct {
@@ -322,7 +344,22 @@
 
 } SATA_SCONTROL_REG, *PSATA_SCONTROL_REG;
 
+#define         ATA_SC_DET_MASK         0x0000000f
+#define         ATA_SC_DET_IDLE         0x00000000
+#define         ATA_SC_DET_RESET        0x00000001
+#define         ATA_SC_DET_DISABLE      0x00000004
 
+#define         ATA_SC_SPD_MASK         0x000000f0
+#define         ATA_SC_SPD_NO_SPEED     0x00000000
+#define         ATA_SC_SPD_SPEED_GEN1   0x00000010
+#define         ATA_SC_SPD_SPEED_GEN2   0x00000020
+#define         ATA_SC_SPD_SPEED_GEN3   0x00000040
+
+#define         ATA_SC_IPM_MASK         0x00000f00
+#define         ATA_SC_IPM_NONE         0x00000000
+#define         ATA_SC_IPM_DIS_PARTIAL  0x00000100
+#define         ATA_SC_IPM_DIS_SLUMBER  0x00000200
+
 typedef union _SATA_SERROR_REG {
 
     struct {
@@ -358,6 +395,22 @@
 
 } SATA_SERROR_REG, *PSATA_SERROR_REG;
 
+#define         ATA_SE_DATA_CORRECTED   0x00000001
+#define         ATA_SE_COMM_CORRECTED   0x00000002
+#define         ATA_SE_DATA_ERR         0x00000100
+#define         ATA_SE_COMM_ERR         0x00000200
+#define         ATA_SE_PROT_ERR         0x00000400
+#define         ATA_SE_HOST_ERR         0x00000800
+#define         ATA_SE_PHY_CHANGED      0x00010000
+#define         ATA_SE_PHY_IERROR       0x00020000
+#define         ATA_SE_COMM_WAKE        0x00040000
+#define         ATA_SE_DECODE_ERR       0x00080000
+#define         ATA_SE_PARITY_ERR       0x00100000
+#define         ATA_SE_CRC_ERR          0x00200000
+#define         ATA_SE_HANDSHAKE_ERR    0x00400000
+#define         ATA_SE_LINKSEQ_ERR      0x00800000
+#define         ATA_SE_TRANSPORT_ERR    0x01000000
+#define         ATA_SE_UNKNOWN_FIS      0x02000000
 
 typedef struct _IDE_SATA_REGISTERS {
     union {
@@ -842,6 +895,7 @@
                     PIDE_AHCI_CMD   ahci_cmd_ptr;
                     ULONG           in_bcount;
                     ULONG           in_status;
+                    ULONG           in_serror;
                     USHORT          io_cmd_flags; // out
                     UCHAR           in_error;
                 } ahci;
@@ -1032,6 +1086,7 @@
     ULONG                             AhciPrevCI;
     ULONG                             AhciCompleteCI;
     ULONG                             AhciLastIS;
+    ULONG                             AhciLastSError;
     //PVOID                    AHCI_FIS;  // is not actually used by UniATA now, but is required by AHCI controller
     //ULONGLONG                AHCI_FIS_PhAddr;
     // Note: in contrast to FBSD, we keep PRD and CMD item in AtaReq structure 
Index: drivers/storage/ide/uniata/CMakeLists.txt
===================================================================
--- drivers/storage/ide/uniata/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/CMakeLists.txt	(copie de travail)
@@ -15,7 +15,8 @@
     id_probe.cpp
     id_queue.cpp
     id_sata.cpp
-    ros_glue/ros_glue.cpp)
+    ros_glue/ros_glue.cpp
+    stdafx.h)
 
 add_library(uniata SHARED ${SOURCE} idedma.rc)
 
@@ -26,7 +27,7 @@
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-unused-but-set-variable -Wno-narrowing")
 endif()
 
-add_pch(uniata stdafx.h)
+add_pch(uniata stdafx.h SOURCE)
 set_module_type(uniata kernelmodedriver)
 add_importlibs(uniata scsiport ntoskrnl hal)
 add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/storage/ide/uniata/uniata_ver.h
===================================================================
--- drivers/storage/ide/uniata/uniata_ver.h	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/uniata_ver.h	(copie de travail)
@@ -1,10 +1,10 @@
-#define UNIATA_VER_STR         "44b1"
-#define UNIATA_VER_DOT         0.44.2.1
+#define UNIATA_VER_STR         "45a3"
+#define UNIATA_VER_DOT         0.45.1.3
 #define UNIATA_VER_MJ          0
-#define UNIATA_VER_MN          44
-#define UNIATA_VER_SUB_MJ      2
-#define UNIATA_VER_SUB_MN      1
-#define UNIATA_VER_DOT_COMMA   0,44,2,1
-#define UNIATA_VER_DOT_STR     "0.44.2.1"
-#define UNIATA_VER_YEAR        2013
-#define UNIATA_VER_YEAR_STR    "2013"
+#define UNIATA_VER_MN          45
+#define UNIATA_VER_SUB_MJ      1
+#define UNIATA_VER_SUB_MN      3
+#define UNIATA_VER_DOT_COMMA   0,45,1,3
+#define UNIATA_VER_DOT_STR     "0.45.1.3"
+#define UNIATA_VER_YEAR        2014
+#define UNIATA_VER_YEAR_STR    "2014"
Index: drivers/storage/ide/uniata/id_sata.cpp
===================================================================
--- drivers/storage/ide/uniata/id_sata.cpp	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/id_sata.cpp	(copie de travail)
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2008-2012 Alexandr A. Telyatnikov (Alter)
+Copyright (c) 2008-2014 Alexandr A. Telyatnikov (Alter)
 
 Module Name:
     id_probe.cpp
@@ -649,6 +649,8 @@
     ULONG PI;
 #endif //DBG
     ULONG CAP;
+    ULONG CAP2;
+    ULONG BOHC;
     ULONG GHC;
     BOOLEAN MemIo = FALSE;
 
@@ -658,6 +660,37 @@
     UniataDumpAhciRegs(deviceExtension);
 #endif //DBG
 
+    CAP2 = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP2);
+    if(CAP2 & AHCI_CAP2_BOH) {
+        BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC);
+        KdPrint2((PRINT_PREFIX "  stage 1 BOHC %#x\n", BOHC));
+        UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_BOHC,
+            BOHC | AHCI_BOHC_OOS);
+        for(i=0; i<50; i++) {
+            AtapiStallExecution(500);
+            BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC);
+            KdPrint2((PRINT_PREFIX "  BOHC %#x\n", BOHC));
+            if(BOHC & AHCI_BOHC_BB) {
+                break;
+            }
+            if(!(BOHC & AHCI_BOHC_BOS)) {
+                break;
+            }
+        }
+        KdPrint2((PRINT_PREFIX "  stage 2 BOHC %#x\n", BOHC));
+        if(BOHC & AHCI_BOHC_BB) {
+            for(i=0; i<2000; i++) {
+                AtapiStallExecution(1000);
+                BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC);
+                KdPrint2((PRINT_PREFIX "  BOHC %#x\n", BOHC));
+                if(!(BOHC & AHCI_BOHC_BOS)) {
+                    break;
+                }
+            }
+        }
+        KdPrint2((PRINT_PREFIX "  final BOHC %#x\n", BOHC));
+    }
+
     /* disable AHCI interrupts, for MSI compatibility issue
        see http://www.intel.com/Assets/PDF/specupdate/307014.pdf
        26. AHCI Reset and MSI Request
@@ -729,7 +762,14 @@
     PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI);
     KdPrint2((PRINT_PREFIX "  AHCI PI %#x\n", PI));
 #endif //DBG
-
+    CAP2 = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP2);
+    if(CAP2 & AHCI_CAP2_BOH) {
+        KdPrint2((PRINT_PREFIX "  retry BOHC\n"));
+        BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC);
+        KdPrint2((PRINT_PREFIX "  BOHC %#x\n", BOHC));
+        UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_BOHC,
+            BOHC | AHCI_BOHC_OOS);
+    }
     /* clear interrupts */
     UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_IS,
         UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_IS));
@@ -1061,6 +1101,7 @@
     }
     chan->AhciCompleteCI = (chan->AhciPrevCI ^ CI) & chan->AhciPrevCI; // only 1->0 states
     chan->AhciPrevCI = CI;
+    chan->AhciLastSError = SError.Reg;
     KdPrint((" AHCI: complete mask %#x\n", chan->AhciCompleteCI));
     chan->AhciLastIS = IS.Reg;
     if(CI & (1 << tag)) {
Index: drivers/storage/ide/uniata/id_dma.cpp
===================================================================
--- drivers/storage/ide/uniata/id_dma.cpp	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/id_dma.cpp	(copie de travail)
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2002-2012 Alexander A. Telyatnikov (Alter)
+Copyright (c) 2002-2014 Alexander A. Telyatnikov (Alter)
 
 Module Name:
     id_dma.cpp
@@ -296,7 +296,7 @@
         KdPrint2((PRINT_PREFIX "  get Phys(PRD=%x)\n", &(AtaReq->dma_tab) ));
         dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, NULL, (PUCHAR)&(AtaReq->dma_tab) /*chan->dma_tab*/, &i, &dma_baseu);
     }
-    if(dma_baseu) {
+    if(dma_baseu && i) {
         KdPrint2((PRINT_PREFIX "AtapiDmaSetup: SRB built-in PRD above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
         if(!deviceExtension->Host64) {
             dma_base = chan->DB_PRD_PhAddr;
@@ -312,8 +312,8 @@
 
     KdPrint2((PRINT_PREFIX "  get Phys(data[0]=%x)\n", data ));
     dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, Srb, data, &dma_count, &dma_baseu);
-    if(dma_baseu) {
-        KdPrint2((PRINT_PREFIX "AtapiDmaSetup: 1st block of buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
+    if(dma_baseu && dma_count) {
+        KdPrint2((PRINT_PREFIX "AtapiDmaSetup: 1st block of buffer above 4Gb: %8.8x%8.8x cnt=%x\n", dma_baseu, dma_base, dma_count));
         if(!deviceExtension->Host64) {
 retry_DB_IO:
             use_DB_IO = TRUE;
@@ -378,8 +378,8 @@
         }
         KdPrint2((PRINT_PREFIX "  get Phys(data[n=%d]=%x)\n", i, data ));
         dma_base = AtapiVirtToPhysAddr(HwDeviceExtension, Srb, data, &dma_count, &dma_baseu);
-        if(dma_baseu) {
-            KdPrint2((PRINT_PREFIX "AtapiDmaSetup: block of buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
+        if(dma_baseu && dma_count) {
+            KdPrint2((PRINT_PREFIX "AtapiDmaSetup: block of buffer above 4Gb: %8.8x%8.8x, cnt=%x\n", dma_baseu, dma_base, dma_count));
             if(!deviceExtension->Host64) {
                 if(use_DB_IO) {
                     KdPrint2((PRINT_PREFIX "AtapiDmaSetup: *ERROR* special buffer above 4Gb: %8.8x%8.8x\n", dma_baseu, dma_base));
Index: drivers/storage/ide/uniata/id_init.cpp
===================================================================
--- drivers/storage/ide/uniata/id_init.cpp	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/id_init.cpp	(copie de travail)
@@ -43,6 +43,12 @@
 
 #include "stdafx.h"
 
+static BUSMASTER_CONTROLLER_INFORMATION const AtiSouthAdapters[] = {
+    PCI_DEV_HW_SPEC_BM( 4385, 1002, 0x00, ATA_MODE_NOT_SPEC, "ATI South", 0 ),
+    PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL      , BMLIST_TERMINATOR )
+    };
+
+
 BOOLEAN
 NTAPI
 UniataChipDetectChannels(
@@ -54,7 +60,7 @@
 {
     PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension;
     //ULONG slotNumber = deviceExtension->slotNumber;
-    //ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber;
+    ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber;
     ULONG VendorID =  deviceExtension->DevID        & 0xffff;
     //ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff;
     //ULONG RevID    =  deviceExtension->RevID;
@@ -97,16 +103,26 @@
         if(ChipType != PRMIO) {
             break;
         }
-        deviceExtension->NumberChannels = 4;
-        KdPrint2((PRINT_PREFIX "Promise 4 chan\n"));
+        if(!(ChipFlags & UNIATA_SATA)) {
+            deviceExtension->NumberChannels = 4;
+            KdPrint2((PRINT_PREFIX "Promise up to 4 chan\n"));
+        } else
+        if(ChipFlags & PRCMBO) {
+            deviceExtension->NumberChannels = 3;
+            KdPrint2((PRINT_PREFIX "Promise 3 chan\n"));
+        } else {
+            deviceExtension->NumberChannels = 4;
+            KdPrint2((PRINT_PREFIX "Promise 4 chan\n"));
+        }
         break;
     case ATA_MARVELL_ID:
         KdPrint2((PRINT_PREFIX "Marvell\n"));
+        /* AHCI part has own DevID-based workaround */
         switch(deviceExtension->DevID) {
         case 0x610111ab: 
             /* 88SX6101 only have 1 PATA channel */
             if(BMList[deviceExtension->DevIndex].channel) {
-                KdPrint2((PRINT_PREFIX "88SX6101 has no 2nd PATA chan\n"));
+                KdPrint2((PRINT_PREFIX "88SX6101/11 has no 2nd PATA chan\n"));
                 return FALSE;
             }
             deviceExtension->NumberChannels = 1;
@@ -118,8 +134,8 @@
         KdPrint2((PRINT_PREFIX "ATI\n"));
         switch(deviceExtension->DevID) {
         case ATA_ATI_IXP600:    
-        case ATA_ATI_IXP700:
-            /* IXP600 & IXP700 only have 1 PATA channel */
+            KdPrint2((PRINT_PREFIX "  IXP600\n"));
+            /* IXP600 only have 1 PATA channel */
             if(BMList[deviceExtension->DevIndex].channel) {
                 KdPrint2((PRINT_PREFIX "New ATI no 2nd PATA chan\n"));
                 return FALSE;
@@ -127,6 +143,52 @@
             deviceExtension->NumberChannels = 1;
             KdPrint2((PRINT_PREFIX "New ATI PATA 1 chan\n"));
             break;
+
+        case ATA_ATI_IXP700: {
+            UCHAR satacfg = 0;
+            PCI_SLOT_NUMBER slotData;
+            ULONG i, slotNumber;
+                 
+            KdPrint2((PRINT_PREFIX "  IXP700\n"));
+            /*
+             * When "combined mode" is enabled, an additional PATA channel is
+             * emulated with two SATA ports and appears on this device.
+             * This mode can only be detected via SMB controller.
+             */
+            i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION*)&AtiSouthAdapters[0], -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, &slotData);
+            if(i != BMLIST_TERMINATOR) {
+                slotNumber = slotData.u.AsULONG;
+
+                GetPciConfig1(0xad, satacfg);
+                KdPrint(("SATA controller %s (%s%s channel)\n",
+                    (satacfg & 0x01) == 0 ? "disabled" : "enabled",
+                    (satacfg & 0x08) == 0 ? "" : "combined mode, ",
+                    (satacfg & 0x10) == 0 ? "primary" : "secondary"));
+                /*
+                 * If SATA controller is enabled but combined mode is disabled,
+                 * we have only one PATA channel. Ignore a non-existent channel.
+                 */
+                if ((satacfg & 0x09) == 0x01) {
+                    if(BMList[deviceExtension->DevIndex].channel) {
+                        KdPrint2((PRINT_PREFIX "New ATI no 2nd PATA chan\n"));
+                        return FALSE;
+                    }
+                    deviceExtension->NumberChannels = 1;
+                    KdPrint2((PRINT_PREFIX "New ATI PATA 1 chan\n"));
+                    break;
+                } else {
+                    KdPrint2((PRINT_PREFIX "New ATI 2 chan\n"));
+                    deviceExtension->NumberChannels = 2;
+                    /*
+                    if (BMList[deviceExtension->DevIndex].channel != ((satacfg & 0x10) >> 4)) {
+                        ;
+                    }
+                    */
+
+                }
+            }
+
+            break; }
         }
         /* FALLTHROUGH */
     case ATA_SILICON_IMAGE_ID:
@@ -241,6 +303,7 @@
     ULONG BaseIoAddress2;
     ULONG BaseIoAddressBM;
     BOOLEAN MemIo = FALSE;
+    BOOLEAN IsPata = FALSE;
 
     KdPrint2((PRINT_PREFIX "UniataChipDetect:\n" ));
     KdPrint2((PRINT_PREFIX "HwFlags: %#x\n", deviceExtension->HwFlags));
@@ -292,6 +355,9 @@
     }
 
     static BUSMASTER_CONTROLLER_INFORMATION const SiSAdapters[] = {
+        PCI_DEV_HW_SPEC_BM( 1183, 1039, 0x00, ATA_UDMA6, "SiS 1183" , SIS133NEW),
+        PCI_DEV_HW_SPEC_BM( 1182, 1039, 0x00, ATA_SA150, "SiS 1182" , SISSATA   | UNIATA_SATA),
+        PCI_DEV_HW_SPEC_BM( 0183, 1039, 0x00, ATA_SA150, "SiS 183"  , SISSATA   | UNIATA_SATA),
         PCI_DEV_HW_SPEC_BM( 0182, 1039, 0x00, ATA_SA150, "SiS 182"  , SISSATA   | UNIATA_SATA),
         PCI_DEV_HW_SPEC_BM( 0181, 1039, 0x00, ATA_SA150, "SiS 181"  , SISSATA   | UNIATA_SATA),
         PCI_DEV_HW_SPEC_BM( 0180, 1039, 0x00, ATA_SA150, "SiS 180"  , SISSATA   | UNIATA_SATA),
@@ -371,6 +437,10 @@
     switch(VendorID) {
 
     case ATA_SIS_ID:
+        /*
+           We shall get here for all SIS controllers, even unlisted.
+           Then perform bus scan to find SIS bridge and decide what to do with controller
+         */
         KdPrint2((PRINT_PREFIX "ATA_SIS_ID\n"));
         DevTypeInfo = (BUSMASTER_CONTROLLER_INFORMATION*)&SiSAdapters[0];
         i = AtapiFindListedDev(DevTypeInfo, -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL);
@@ -505,6 +575,7 @@
     if(deviceExtension->MaxTransferMode >= ATA_SA150) {
         deviceExtension->HwFlags |= UNIATA_SATA;
     }
+
 /*
     ConfigInfo->MaximumTransferLength = DEV_BSIZE*256;
     deviceExtension->MaximumDmaTransferLength = ConfigInfo->MaximumTransferLength;
@@ -512,7 +583,26 @@
     ChipType  = deviceExtension->HwFlags & CHIPTYPE_MASK;
     ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK;
 
+    /* for even more ugly AHCI-capable chips */
     if(ChipFlags & UNIATA_AHCI) {
+        /* 
+           Seems, some chips may have inoperable/alternative BAR5 in SATA mode
+           This can be detected via PCI SubClass
+         */
+        switch(VendorID) {
+        case ATA_NVIDIA_ID: 
+        case ATA_ATI_ID: 
+            KdPrint2((PRINT_PREFIX "ATA_xxx_ID check AHCI subclass\n"));
+            if((pciData)->SubClass == PCI_DEV_SUBCLASS_IDE) {
+                KdPrint2((PRINT_PREFIX "Non-AHCI mode\n"));
+                ChipFlags &= ~UNIATA_AHCI;
+                deviceExtension->HwFlags &= ~UNIATA_AHCI;
+            }
+            break;
+        }
+    }
+
+    if(ChipFlags & UNIATA_AHCI) {
         deviceExtension->NumberChannels = 0;
         if(!UniataAhciDetect(HwDeviceExtension, pciData, ConfigInfo)) {
             KdPrint2((PRINT_PREFIX "  AHCI detect failed\n"));
@@ -527,9 +617,6 @@
         return STATUS_UNSUCCESSFUL;
     }
 
-    if(ChipFlags & UNIATA_AHCI) {
-    }
-
     switch(VendorID) {
     case ATA_ACER_LABS_ID:
         if(ChipFlags & UNIATA_SATA) {
@@ -571,6 +658,9 @@
             BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
                                     5, 0, ((ChipFlags & NV4OFF) ? 0x400 : 0) + 0x40*2);
             KdPrint2((PRINT_PREFIX "BaseMemAddress %x\n", BaseMemAddress));
+            if(!BaseMemAddress) {
+                return STATUS_UNSUCCESSFUL;
+            }
             if((*ConfigInfo->AccessRanges)[5].RangeInMemory) {
                 KdPrint2((PRINT_PREFIX "MemIo\n"));
                 MemIo = TRUE;
@@ -600,26 +690,57 @@
             break;
         }
         deviceExtension->AltRegMap = TRUE; // inform generic resource allocator
+
+        /* BAR4 -> res1 */
         BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
                                 4, 0, 0x4000);
-        KdPrint2((PRINT_PREFIX "BaseMemAddress %x\n", BaseMemAddress));
+        KdPrint2((PRINT_PREFIX "BaseMemAddress[4] %x\n", BaseMemAddress));
+        if(!BaseMemAddress) {
+            return STATUS_UNSUCCESSFUL;
+        }
         if((*ConfigInfo->AccessRanges)[4].RangeInMemory) {
             KdPrint2((PRINT_PREFIX "MemIo\n"));
             MemIo = TRUE;
         }
+        deviceExtension->BaseIoAddressSATA_0.Addr  = BaseMemAddress;
+        deviceExtension->BaseIoAddressSATA_0.MemIo = MemIo;
+
+        /* BAR3 -> res2 */
+        BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
+                                3, 0, 0xd0000);
+        KdPrint2((PRINT_PREFIX "BaseMemAddress[3] %x\n", BaseMemAddress));
+        if(!BaseMemAddress) {
+            return STATUS_UNSUCCESSFUL;
+        }
+        if((*ConfigInfo->AccessRanges)[3].RangeInMemory) {
+            KdPrint2((PRINT_PREFIX "MemIo\n"));
+            MemIo = TRUE;
+        }
         deviceExtension->BaseIoAddressBM_0.Addr  = BaseMemAddress;
         deviceExtension->BaseIoAddressBM_0.MemIo = MemIo;
+
+        if(!(ChipFlags & UNIATA_SATA)) {
+            UCHAR reg48;
+
+            reg48 = AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48);
+            deviceExtension->NumberChannels = ((reg48 & 0x01) ? 1 : 0) +
+                                              ((reg48 & 0x02) ? 1 : 0) +
+                                              2;
+            KdPrint2((PRINT_PREFIX "Channels -> %d\n", deviceExtension->NumberChannels));
+        }
+
         for(c=0; c<deviceExtension->NumberChannels; c++) {
 
-            ULONG offs12, offs7;
+            /* res2-based */
+            ULONG offs8, offs7;
 
             chan = &deviceExtension->chan[c];
 
-            offs12 = c << 12;
-            offs7  = c << 7;
+            offs8 = c << 8;
+            offs7 = c << 7;
 
             for (i=0; i<=IDX_IO1_SZ; i++) {
-                chan->RegTranslation[IDX_IO1+i].Addr           = BaseMemAddress + 0x200 + (i << 2) + offs12;
+                chan->RegTranslation[IDX_IO1+i].Addr           = BaseMemAddress + 0x200 + (i << 2) + offs7;
                 chan->RegTranslation[IDX_IO1+i].MemIo          = MemIo;
             }
             chan->RegTranslation[IDX_IO2_AltStatus].Addr       = BaseMemAddress + 0x238 + offs7;
@@ -633,11 +754,37 @@
             chan->RegTranslation[IDX_BM_PRD_Table].MemIo       = MemIo;
             chan->RegTranslation[IDX_BM_DeviceSpecific0].Addr  = BaseMemAddress + (c << 2);
             chan->RegTranslation[IDX_BM_DeviceSpecific0].MemIo = MemIo;
+
+            if((ChipFlags & PRSATA) ||
+               ((ChipFlags & PRCMBO) && c<2)) {
+                KdPrint2((PRINT_PREFIX "Promise SATA\n"));
+
+                chan->RegTranslation[IDX_SATA_SStatus].Addr        = BaseMemAddress + 0x400 + offs7;
+                chan->RegTranslation[IDX_SATA_SStatus].MemIo       = MemIo;
+                chan->RegTranslation[IDX_SATA_SError].Addr         = BaseMemAddress + 0x404 + offs7;
+                chan->RegTranslation[IDX_SATA_SError].MemIo        = MemIo;
+                chan->RegTranslation[IDX_SATA_SControl].Addr       = BaseMemAddress + 0x408 + offs7;
+                chan->RegTranslation[IDX_SATA_SControl].MemIo      = MemIo;
+
+                chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE;
+            } else {
+                KdPrint2((PRINT_PREFIX "Promise PATA\n"));
+                chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA6);
+            }
         }
         break;
 
     case ATA_ATI_ID:
         KdPrint2((PRINT_PREFIX "ATI\n"));
+        if(ChipType == ATI700) {
+            KdPrint2((PRINT_PREFIX "ATI700\n"));
+            if(!(ChipFlags & UNIATA_AHCI)) {
+                KdPrint2((PRINT_PREFIX "IXP700 PATA\n"));
+                chan = &deviceExtension->chan[0];
+                chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA5);
+            }
+            break;
+        }
         /* FALLTHROUGH */
     case ATA_SILICON_IMAGE_ID: {
 
@@ -661,6 +808,9 @@
         BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
                                 5, 0, 0x800);
         KdPrint2((PRINT_PREFIX "BaseMemAddress %x\n", BaseMemAddress));
+        if(!BaseMemAddress) {
+            return STATUS_UNSUCCESSFUL;
+        }
         if((*ConfigInfo->AccessRanges)[5].RangeInMemory) {
             KdPrint2((PRINT_PREFIX "MemIo\n"));
             MemIo = TRUE;
@@ -697,6 +847,10 @@
                 chan->RegTranslation[IDX_BM_DeviceSpecific1].MemIo = MemIo;
             }
 
+            if(chan->MaxTransferMode < ATA_SA150) {
+                // do nothing for PATA part
+                KdPrint2((PRINT_PREFIX "No SATA regs for PATA part\n"));
+            } else
             if(ChipFlags & UNIATA_SATA) {
                 chan->RegTranslation[IDX_SATA_SStatus].Addr        = BaseMemAddress + 0x104 + (unit01 << 7) + (unit10 << 8);
                 chan->RegTranslation[IDX_SATA_SStatus].MemIo       = MemIo;
@@ -725,6 +879,9 @@
         BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
                                 5, 0, 0x400);
         KdPrint2((PRINT_PREFIX "BaseMemAddress %x\n", BaseMemAddress));
+        if(!BaseMemAddress) {
+            return STATUS_UNSUCCESSFUL;
+        }
         if((*ConfigInfo->AccessRanges)[5].RangeInMemory) {
             KdPrint2((PRINT_PREFIX "MemIo\n"));
             MemIo = TRUE;
@@ -802,7 +959,8 @@
                     //deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode;
                     if(SiSSouthAdapters[i].RaidFlags & UNIATA_SATA) {
                         deviceExtension->HwFlags |= UNIATA_SATA;
-                        if(SiSSouthAdapters[i].nDeviceId == 0x1182) {
+                        if(SiSSouthAdapters[i].nDeviceId == 0x1182 ||
+                           SiSSouthAdapters[i].nDeviceId == 0x1183) {
                             SIS_182 = TRUE;
                         }
                     }
@@ -827,25 +985,27 @@
                 BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
                                         5, 0, 0x400);
                 KdPrint2((PRINT_PREFIX "BaseMemAddress %x\n", BaseMemAddress));
-                if((*ConfigInfo->AccessRanges)[5].RangeInMemory) {
-                    KdPrint2((PRINT_PREFIX "MemIo\n"));
-                    MemIo = TRUE;
-                }
-                deviceExtension->BaseIoAddressSATA_0.Addr  = BaseMemAddress;
-                deviceExtension->BaseIoAddressSATA_0.MemIo = MemIo;
+                if(BaseMemAddress) {
+                    if((*ConfigInfo->AccessRanges)[5].RangeInMemory) {
+                        KdPrint2((PRINT_PREFIX "MemIo\n"));
+                        MemIo = TRUE;
+                    }
+                    deviceExtension->BaseIoAddressSATA_0.Addr  = BaseMemAddress;
+                    deviceExtension->BaseIoAddressSATA_0.MemIo = MemIo;
 
-                for(c=0; c<deviceExtension->NumberChannels; c++) {
-                    ULONG offs = c << (SIS_182 ? 5 : 6);
+                    for(c=0; c<deviceExtension->NumberChannels; c++) {
+                        ULONG offs = c << (SIS_182 ? 5 : 6);
 
-                    chan = &deviceExtension->chan[c];
-                    chan->RegTranslation[IDX_SATA_SStatus].Addr        = BaseMemAddress + 0 + offs;
-                    chan->RegTranslation[IDX_SATA_SStatus].MemIo       = MemIo;
-                    chan->RegTranslation[IDX_SATA_SError].Addr         = BaseMemAddress + 4 + offs;
-                    chan->RegTranslation[IDX_SATA_SError].MemIo        = MemIo;
-                    chan->RegTranslation[IDX_SATA_SControl].Addr       = BaseMemAddress + 8 + offs;
-                    chan->RegTranslation[IDX_SATA_SControl].MemIo      = MemIo;
+                        chan = &deviceExtension->chan[c];
+                        chan->RegTranslation[IDX_SATA_SStatus].Addr        = BaseMemAddress + 0 + offs;
+                        chan->RegTranslation[IDX_SATA_SStatus].MemIo       = MemIo;
+                        chan->RegTranslation[IDX_SATA_SError].Addr         = BaseMemAddress + 4 + offs;
+                        chan->RegTranslation[IDX_SATA_SError].MemIo        = MemIo;
+                        chan->RegTranslation[IDX_SATA_SControl].Addr       = BaseMemAddress + 8 + offs;
+                        chan->RegTranslation[IDX_SATA_SControl].MemIo      = MemIo;
 
-                    chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE;
+                        chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE;
+                    }
                 }
             }
         }
@@ -941,7 +1101,6 @@
         break; }
     case ATA_INTEL_ID: {
 
-        BOOLEAN IsPata;
         if(!(ChipFlags & UNIATA_SATA)) {
             break;
         }
@@ -953,6 +1112,9 @@
             KdPrint2((PRINT_PREFIX "UniataChipDetect: Intel 31244, DPA mode\n"));
             BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber,
                                     0, 0, 0x0c00);
+            if(!BaseMemAddress) {
+                return STATUS_UNSUCCESSFUL;
+            }
             if((*ConfigInfo->AccessRanges)[0].RangeInMemory) {
                 KdPrint2((PRINT_PREFIX "MemIo\n"));
                 MemIo = TRUE;
@@ -1527,7 +1689,7 @@
         memcpy(LunExt->IdentifyData.FirmwareRevision, ".10", 4);
         if(!LunExt->IdentifyData.SectorsPerTrack ||
            !LunExt->IdentifyData.NumberOfCylinders ||
-           !LunExt->IdentifyData.SectorsPerTrack) {
+           !LunExt->IdentifyData.NumberOfHeads) {
             // ERROR
             KdPrint2((PRINT_PREFIX "Wrong CHS\n"));
             LunExt->opt_GeomType = GEOM_AUTO;
@@ -2037,8 +2199,13 @@
             break;
         case PRMIO:
             if(c == CHAN_NOT_SPECIFIED) {
-                if(ChipFlags & PRSATA) {
-                    AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x6c, 0x000000ff);
+                /* clear SATA status and unmask interrupts */
+                AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),
+                    (ChipFlags & PRG2) ? 0x60 : 0x6c, 0x000000ff);
+                if(ChipFlags & UNIATA_SATA) {
+                    /* enable "long burst length" on gen2 chips */
+                    AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0), 0x44, 
+                        AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0), 0x44) | 0x2000);
                 }
             } else {
                 chan = &deviceExtension->chan[c];
@@ -2072,6 +2239,7 @@
             KdPrint2((PRINT_PREFIX "ATI\n"));
             break;
         }
+        /* FALLTHROUGH */
     case ATA_SILICON_IMAGE_ID:
   /*      if(ChipFlags & SIIENINTR) {
             SetPciConfig1(0x71, 0x01);
@@ -2190,7 +2358,15 @@
             }
 
             break; }
-        }
+        case ATI700:
+            KdPrint2((PRINT_PREFIX "ATI700\n"));
+            if(c == 0 && !(ChipFlags & UNIATA_AHCI)) {
+                KdPrint2((PRINT_PREFIX "IXP700 PATA\n"));
+                chan = &deviceExtension->chan[c];
+                chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA5);
+            }
+            break;
+        } /* switch(ChipType) */
         break;
     case ATA_SIS_ID:
         if(c == CHAN_NOT_SPECIFIED) {
@@ -2211,6 +2387,7 @@
                 break;
             case SISSATA:
                 ChangePciConfig2(0x04, (a & ~0x0400));
+                break;
             }
         }
         if(ChipType == SIS133NEW) {
Index: drivers/storage/ide/uniata/id_ata.cpp
===================================================================
--- drivers/storage/ide/uniata/id_ata.cpp	(rÃ©vision 61927)
+++ drivers/storage/ide/uniata/id_ata.cpp	(copie de travail)
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2002-2012 Alexandr A. Telyatnikov (Alter)
+Copyright (c) 2002-2014 Alexandr A. Telyatnikov (Alter)
 
 Module Name:
     id_ata.cpp
@@ -37,8 +37,8 @@
     Some parts of code were taken from FreeBSD 4.3-6.1 ATA driver by
          Søren Schmidt, Copyright (c) 1998-2007
 
-    All parts of code are greatly changed/updated by
-         Alter, Copyright (c) 2002-2007:
+    All parts of code are significantly changed/updated by
+         Alter, Copyright (c) 2002-2014:
 
     1. Internal command queueing/reordering
     2. Drive identification
@@ -4182,23 +4182,41 @@
                 return INTERRUPT_REASON_IGNORE;
             }
             break;
-        case PRMIO:
-            status = AtapiReadPortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x0040);
-            if(ChipFlags & PRSATA) {
-                pr_status = AtapiReadPortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x006c);
-                AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x006c, pr_status & 0x000000ff);
+        case PRMIO: {
+            ULONG stat_reg = (ChipFlags & PRG2) ? 0x60 : 0x6c;
+            status = AtapiReadPortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x40);
+            AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x40, status);
+
+            if(status & (1 << (Channel+1))) {
+                // our
+            } else {
+                KdPrint2((PRINT_PREFIX "  Promise mio unexpected\n"));
+                return INTERRUPT_REASON_IGNORE;
             }
+
+            if(!(ChipFlags & UNIATA_SATA))
+                break;
+
+            pr_status = AtapiReadPortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),stat_reg);
+            AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),stat_reg, (pr_status & (0x11 << Channel)));
             if(pr_status & (0x11 << Channel)) {
                 // TODO: reset channel
                 KdPrint2((PRINT_PREFIX "  Promise mio unexpected + reset req\n"));
-                return INTERRUPT_REASON_IGNORE;
+                UniataSataEvent(deviceExtension, lChannel, UNIATA_SATA_EVENT_DETACH, 0);
             }
             if(!(status & (0x01 << Channel))) {
-                KdPrint2((PRINT_PREFIX "  Promise mio unexpected\n"));
+                // Connect event
+                KdPrint2((PRINT_PREFIX "  Promise mio unexpected attach\n"));
+                UniataSataEvent(deviceExtension, lChannel, UNIATA_SATA_EVENT_ATTACH, 0);
+            }
+            if(UniataSataClearErr(HwDeviceExtension, c, UNIATA_SATA_DO_CONNECT, 0)) {
+                OurInterrupt = INTERRUPT_REASON_UNEXPECTED;
+            } else {
                 return INTERRUPT_REASON_IGNORE;
             }
+
             AtapiWritePort4(chan, IDX_BM_DeviceSpecific0, 0x00000001);
-            break;
+            break; }
         }
         break; }
     case ATA_NVIDIA_ID: {
@@ -4551,6 +4569,7 @@
 //    BOOLEAN RestoreUseDpc = FALSE;
     BOOLEAN DataOverrun = FALSE;
     BOOLEAN NoStartIo = TRUE;
+    BOOLEAN NoRetry = FALSE;
 
     KdPrint2((PRINT_PREFIX "AtapiInterrupt:\n"));
     if(InDpc) {
@@ -4763,12 +4782,19 @@
         statusByte = (UCHAR)(AtaReq->ahci.in_status & IDE_STATUS_MASK);
 
         if(chan->AhciLastIS & ~(ATA_AHCI_P_IX_DHR | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_SDB)) {
-            KdPrint3((PRINT_PREFIX "Err intr (%#x)\n", chan->AhciLastIS & ~(ATA_AHCI_P_IX_DHR | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_SDB)));
+            KdPrint3((PRINT_PREFIX "Err intr (%#x), SE (%#x)\n",
+                chan->AhciLastIS & ~(ATA_AHCI_P_IX_DHR | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_SDB),
+                chan->AhciLastSError));
             if(chan->AhciLastIS & ~ATA_AHCI_P_IX_OF) {
                 //KdPrint3((PRINT_PREFIX "Err mask (%#x)\n", chan->AhciLastIS & ~ATA_AHCI_P_IX_OF));
                 // We have some other error except Overflow
                 // Just signal ERROR, operation will be aborted in ERROR branch.
                 statusByte |= IDE_STATUS_ERROR;
+                AtaReq->ahci.in_serror = chan->AhciLastSError;
+                if(chan->AhciLastSError & (ATA_SE_HANDSHAKE_ERR | ATA_SE_LINKSEQ_ERR | ATA_SE_TRANSPORT_ERR | ATA_SE_UNKNOWN_FIS)) {
+                    KdPrint2((PRINT_PREFIX "Unrecoverable\n"));
+                    NoRetry = TRUE;
+                }
             } else {
                 // We have only Overflow. Abort operation and continue
 #ifdef _DEBUG
@@ -4960,6 +4986,13 @@
             UniataDumpAhciPortRegs(chan);
 #endif
             UniataAhciStatus(HwDeviceExtension, lChannel, DEVNUM_NOT_SPECIFIED);
+            if(NoRetry) {
+                AtaReq->retry += MAX_RETRIES;
+                if(!error && (statusByte & IDE_STATUS_ERROR)) {
+                    KdPrint2((PRINT_PREFIX "AtapiInterrupt: force error status\n"));
+                    error |= IDE_STATUS_ERROR;
+                }
+            }
 #ifdef _DEBUG
             UniataDumpAhciPortRegs(chan);
 #endif
@@ -4980,7 +5013,9 @@
             KdPrint2((PRINT_PREFIX "  Bad Lba unknown\n"));
         }
 
-
+        if(deviceExtension->HwFlags & UNIATA_AHCI) {
+            KdPrint2((PRINT_PREFIX "  no wait ready after error\n"));
+        } else
         if(!atapiDev) {
             KdPrint2((PRINT_PREFIX "  wait 100 ready after IDE error\n"));
             AtapiStallExecution(100);
@@ -5012,11 +5047,14 @@
 #endif //IO_STATISTICS
                 if(DmaTransfer /*&&
                    (error & IDE_ERROR_ICRC)*/) {
+                    KdPrint2((PRINT_PREFIX "Errors in DMA mode\n"));
                     if(AtaReq->retry < MAX_RETRIES) {
 //fallback_pio:
-                        AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION;
-                        AtaReq->Flags |= REQ_FLAG_FORCE_DOWNRATE;
+                        if(!(deviceExtension->HwFlags & UNIATA_AHCI)) {
+                            AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION;
+                            AtaReq->Flags |= REQ_FLAG_FORCE_DOWNRATE;
 //                        LunExt->DeviceFlags |= DFLAGS_FORCE_DOWNRATE;
+                        }
                         AtaReq->ReqState = REQ_STATE_QUEUED;
                         goto reenqueue_req;
                     }
@@ -10671,8 +10709,8 @@
 //    KdPrint(( "AtapiCheckRegValue: RegistryPath %ws\n", RegistryPath->Buffer));
 
     paramPath.Length = 0;
-    paramPath.MaximumLength = (USHORT)(RegistryPath->Length +
-        (wcslen(PathSuffix)+2)*sizeof(WCHAR));
+    paramPath.MaximumLength = RegistryPath->Length +
+        (wcslen(PathSuffix)+2)*sizeof(WCHAR);
     paramPath.Buffer = (PWCHAR)ExAllocatePool(NonPagedPool, paramPath.MaximumLength);
     if(!paramPath.Buffer) {
         KdPrint(("AtapiCheckRegValue: couldn't allocate paramPath\n"));
Index: drivers/storage/ide/pciidex/fdo.c
===================================================================
--- drivers/storage/ide/pciidex/fdo.c	(rÃ©vision 61927)
+++ drivers/storage/ide/pciidex/fdo.c	(copie de travail)
@@ -11,6 +11,9 @@
 #define NDEBUG
 #include <debug.h>
 
+#include <initguid.h>
+#include <wdmguid.h>
+
 static NTSTATUS
 GetBusInterface(
 	IN PFDO_DEVICE_EXTENSION DeviceExtension)
Index: drivers/storage/ide/pciidex/pciidex.h
===================================================================
--- drivers/storage/ide/pciidex/pciidex.h	(rÃ©vision 61927)
+++ drivers/storage/ide/pciidex/pciidex.h	(copie de travail)
@@ -1,8 +1,8 @@
+#ifndef _PCIIDEX_PCH_
+#define _PCIIDEX_PCH_
+
 #include <ntifs.h>
-#include <ntddk.h>
 #include <ide.h>
-#include <wdmguid.h>
-#include <stdio.h>
 
 typedef struct _PCIIDEX_DRIVER_EXTENSION
 {
@@ -82,3 +82,5 @@
 PciIdeXPdoPnpDispatch(
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PIRP Irp);
+
+#endif /* _PCIIDEX_PCH_ */
Index: drivers/storage/ide/pciidex/CMakeLists.txt
===================================================================
--- drivers/storage/ide/pciidex/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/ide/pciidex/CMakeLists.txt	(copie de travail)
@@ -7,11 +7,14 @@
     misc.c
     pciidex.c
     pdo.c
+    pciidex.h)
+
+add_library(pciidex SHARED
+    ${SOURCE}
     pciidex.rc
     ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def)
 
-add_library(pciidex SHARED ${SOURCE})
-add_pch(pciidex pciidex.h)
+add_pch(pciidex pciidex.h SOURCE)
 set_module_type(pciidex kernelmodedriver)
 add_importlibs(pciidex ntoskrnl)
 add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/storage/ide/pciidex/miniport.c
===================================================================
--- drivers/storage/ide/pciidex/miniport.c	(rÃ©vision 61927)
+++ drivers/storage/ide/pciidex/miniport.c	(copie de travail)
@@ -6,7 +6,6 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "pciidex.h"
 
 #define NDEBUG
Index: drivers/storage/ide/pciidex/pdo.c
===================================================================
--- drivers/storage/ide/pciidex/pdo.c	(rÃ©vision 61927)
+++ drivers/storage/ide/pciidex/pdo.c	(copie de travail)
@@ -8,6 +8,8 @@
 
 #include "pciidex.h"
 
+#include <stdio.h>
+
 #define NDEBUG
 #include <debug.h>
 
Index: drivers/storage/classpnp/create.c
===================================================================
--- drivers/storage/classpnp/create.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/create.c	(copie de travail)
@@ -21,9 +21,7 @@
 
 --*/
 
-#define CLASS_INIT_GUID 0
 #include "classp.h"
-#include "debug.h"
 
 ULONG BreakOnClose = 0;
 
Index: drivers/storage/classpnp/retry.c
===================================================================
--- drivers/storage/classpnp/retry.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/retry.c	(copie de travail)
@@ -22,7 +22,6 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 /*
  *  InterpretTransferPacketError
Index: drivers/storage/classpnp/class.c
===================================================================
--- drivers/storage/classpnp/class.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/class.c	(copie de travail)
@@ -21,10 +21,13 @@
 
 --*/
 
-#define CLASS_INIT_GUID 1
 #include "classp.h"
-#include "debug.h"
 
+#include <stddef.h>
+
+#include <initguid.h>
+#include <mountdev.h>
+
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(INIT, DriverEntry)
     #pragma alloc_text(PAGE, ClassAddDevice)
Index: drivers/storage/classpnp/clntirp.c
===================================================================
--- drivers/storage/classpnp/clntirp.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/clntirp.c	(copie de travail)
@@ -22,7 +22,6 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 /*
  *  EnqueueDeferredClientIrp
Index: drivers/storage/classpnp/obsolete.c
===================================================================
--- drivers/storage/classpnp/obsolete.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/obsolete.c	(copie de travail)
@@ -24,7 +24,6 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List);
 VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List);
Index: drivers/storage/classpnp/classwmi.c
===================================================================
--- drivers/storage/classpnp/classwmi.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/classwmi.c	(copie de travail)
@@ -23,6 +23,8 @@
 
 #include "classp.h"
 
+#include <wmistr.h>
+
 NTSTATUS
 NTAPI
 ClassSystemControl(
Index: drivers/storage/classpnp/xferpkt.c
===================================================================
--- drivers/storage/classpnp/xferpkt.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/xferpkt.c	(copie de travail)
@@ -22,7 +22,6 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, InitializeTransferPackets)
Index: drivers/storage/classpnp/debug.c
===================================================================
--- drivers/storage/classpnp/debug.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/debug.c	(copie de travail)
@@ -21,9 +21,7 @@
 
 --*/
 
-
 #include "classp.h"
-#include "debug.h"
 
 #if DBG
 
Index: drivers/storage/classpnp/lock.c
===================================================================
--- drivers/storage/classpnp/lock.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/lock.c	(copie de travail)
@@ -23,9 +23,7 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
-
 LONG LockHighWatermark = 0;
 LONG LockLowWatermark = 0;
 LONG MaxLockedMinutes = 5;
Index: drivers/storage/classpnp/classp.h
===================================================================
--- drivers/storage/classpnp/classp.h	(rÃ©vision 61927)
+++ drivers/storage/classpnp/classp.h	(copie de travail)
@@ -25,24 +25,14 @@
 
 --*/
 
-#include <stddef.h>
-#include <stdarg.h>
+#ifndef _CLASSPNP_PCH_
+#define _CLASSPNP_PCH_
+
 #include <ntddk.h>
-
-#include <scsi.h>
-#include <wmidata.h>
 #include <classpnp.h>
-
-#if CLASS_INIT_GUID
-#include <initguid.h>
-#endif
-
-#include <mountdev.h>
 #include <ioevent.h>
 #include <pseh/pseh2.h>
 
-#include "wmistr.h"
-
 extern CLASSPNP_SCAN_FOR_SPECIAL_INFO ClassBadItems[];
 
 extern GUID ClassGuidQueryRegInfoEx;
@@ -876,3 +866,7 @@
 VOID NTAPI FreeDeviceInputMdl(PMDL Mdl);
 NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo);
 VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
+
+#include "debug.h"
+
+#endif /* _CLASSPNP_PCH_ */
Index: drivers/storage/classpnp/debug.h
===================================================================
--- drivers/storage/classpnp/debug.h	(rÃ©vision 61927)
+++ drivers/storage/classpnp/debug.h	(copie de travail)
@@ -22,6 +22,7 @@
 
 --*/
 
+#pragma once
 
 VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...);
 
@@ -144,5 +145,3 @@
     #define DBGGETSRBSTATUSSTR(_pSrb)
     
 #endif
-
-
Index: drivers/storage/classpnp/CMakeLists.txt
===================================================================
--- drivers/storage/classpnp/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/classpnp/CMakeLists.txt	(copie de travail)
@@ -26,11 +26,13 @@
     retry.c
     utils.c
     xferpkt.c
-    ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
+    classp.h)
 
 add_library(classpnp SHARED
     ${SOURCE}
-    class.rc)
+    guid.c
+    class.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
 
 if(ARCH STREQUAL "i386")
     # FIXME: http://www.cmake.org/Bug/view.php?id=12998
@@ -39,7 +41,7 @@
     endif()
 endif()
 
-add_pch(classpnp classp.h)
+add_pch(classpnp classp.h SOURCE)
 target_link_libraries(classpnp ${PSEH_LIB} libcntpr)
 set_module_type(classpnp kernelmodedriver)
 add_importlibs(classpnp hal ntoskrnl)
Index: drivers/storage/classpnp/autorun.c
===================================================================
--- drivers/storage/classpnp/autorun.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/autorun.c	(copie de travail)
@@ -22,8 +22,9 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
+#include <wmidata.h>
+
 #define GESN_TIMEOUT_VALUE (0x4)
 #define GESN_BUFFER_SIZE (0x8)
 #define MAXIMUM_IMMEDIATE_MCN_RETRIES (0x20)
Index: drivers/storage/classpnp/utils.c
===================================================================
--- drivers/storage/classpnp/utils.c	(rÃ©vision 61927)
+++ drivers/storage/classpnp/utils.c	(copie de travail)
@@ -22,7 +22,6 @@
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, ClassGetDeviceParameter)
Index: drivers/storage/classpnp/guid.c
===================================================================
--- drivers/storage/classpnp/guid.c	(rÃ©vision 0)
+++ drivers/storage/classpnp/guid.c	(rÃ©vision 62573)
@@ -0,0 +1,7 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <initguid.h>
+#include <ioevent.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modification de propriÃ©tÃ©s sur drivers/storage/classpnp/guid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: drivers/storage/class/disk_new/data.c
===================================================================
--- drivers/storage/class/disk_new/data.c	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/data.c	(copie de travail)
@@ -79,4 +79,3 @@
 #ifdef ALLOC_DATA_PRAGMA
 #pragma data_seg()
 #endif
-
Index: drivers/storage/class/disk_new/disk.c
===================================================================
--- drivers/storage/class/disk_new/disk.c	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/disk.c	(copie de travail)
@@ -26,9 +26,8 @@
 // Now instantiate the GUIDs
 //
 
-#include "initguid.h"
-#include "ntddstor.h"
-#include "ioevent.h"
+#include <initguid.h>
+#include <ioevent.h>
 
 NTSTATUS
 NTAPI
Index: drivers/storage/class/disk_new/geometry.c
===================================================================
--- drivers/storage/class/disk_new/geometry.c	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/geometry.c	(copie de travail)
@@ -21,9 +21,7 @@
 
 --*/
 
-
 #include "disk.h"
-#include "ntddstor.h"
 
 #if defined (_X86_)
 
Index: drivers/storage/class/disk_new/CMakeLists.txt
===================================================================
--- drivers/storage/class/disk_new/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/CMakeLists.txt	(copie de travail)
@@ -7,11 +7,10 @@
     enum.c
     geometry.c
     part.c
-    pnp.c)
+    pnp.c
+    disk.h)
 
-add_library(disk_new SHARED
-    ${SOURCE}
-    disk.rc)
+add_library(disk_new SHARED ${SOURCE} disk.rc)
 
 target_link_libraries(disk_new libcntpr wdmguid)
 if(ARCH STREQUAL "i386")
@@ -24,4 +23,5 @@
 
 set_module_type(disk_new kernelmodedriver)
 add_importlibs(disk_new classpnp ntoskrnl hal)
+add_pch(disk_new disk.h SOURCE)
 add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/storage/class/disk_new/disk.h
===================================================================
--- drivers/storage/class/disk_new/disk.h	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/disk.h	(copie de travail)
@@ -19,22 +19,24 @@
 Revision History:
 
 --*/
+
+#ifndef _DISK_NEW_H_
+#define _DISK_NEW_H_
+
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
 #define NTDDI_VERSION NTDDI_WINXP
 
-#include "ntddk.h"
-#include "scsi.h"
+#include <ntddk.h>
 #include <wmidata.h>
-#include "classpnp.h"
+#include <classpnp.h>
+
 #if defined(JAPAN) && defined(_X86_)
-#include "machine.h"
+#include <machine.h>
 #endif
 
-#include <wmistr.h>
-
 #if defined(_X86_)
-#include "mountdev.h"
+#include <mountdev.h>
 #endif
 
 #ifdef ExAllocatePool
@@ -977,3 +979,4 @@
 
 #define DiskHashGuid(Guid) (((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0])
 
+#endif /* _DISK_NEW_H_ */
Index: drivers/storage/class/disk_new/enum.c
===================================================================
--- drivers/storage/class/disk_new/enum.c	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/enum.c	(copie de travail)
@@ -1244,4 +1244,3 @@
     KeSetEvent(&(diskData->PartitioningEvent), IO_NO_INCREMENT, FALSE);
     return;
 }
-
Index: drivers/storage/class/disk_new/diskwmi.c
===================================================================
--- drivers/storage/class/disk_new/diskwmi.c	(rÃ©vision 61927)
+++ drivers/storage/class/disk_new/diskwmi.c	(copie de travail)
@@ -22,6 +22,8 @@
 
 #include "disk.h"
 
+#include <wmistr.h>
+
 NTSTATUS
 NTAPI
 DiskSendFailurePredictIoctl(
Index: drivers/storage/class/include/class2.h
===================================================================
--- drivers/storage/class/include/class2.h	(rÃ©vision 61927)
+++ drivers/storage/class/include/class2.h	(copie de travail)
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "ntddscsi.h"
-#include "srb.h"
+#include <ntddscsi.h>
+#include <srb.h>
 
 #define MAXIMUM_RETRIES    15
 #define RETRY_WAIT         2000000 /* 200 ms in units of 100 ns */
Index: drivers/storage/class/cdrom/CMakeLists.txt
===================================================================
--- drivers/storage/class/cdrom/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom/CMakeLists.txt	(copie de travail)
@@ -1,8 +1,13 @@
 
-include_directories(..)
+include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
 
-add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc)
+list(APPEND SOURCE
+    cdrom.c
+    findscsi.c
+    precomp.h)
 
+add_library(cdrom SHARED ${SOURCE} cdrom.rc)
+
 set_module_type(cdrom kernelmodedriver)
 add_importlibs(cdrom
     class2
@@ -10,5 +15,5 @@
     ntoskrnl
     hal)
 
-add_pch(cdrom precomp.h)
+add_pch(cdrom precomp.h SOURCE)
 add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/storage/class/cdrom/findscsi.c
===================================================================
--- drivers/storage/class/cdrom/findscsi.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom/findscsi.c	(copie de travail)
@@ -306,4 +306,3 @@
 #endif
    return (STATUS_OBJECT_PATH_NOT_FOUND);
 }
-
Index: drivers/storage/class/cdrom/cdrom.c
===================================================================
--- drivers/storage/class/cdrom/cdrom.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom/cdrom.c	(copie de travail)
@@ -8,6 +8,13 @@
 
 #include "precomp.h"
 
+#include <ntddk.h>
+#include <scsi.h>
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
+#include <include/class2.h>
+#include <stdio.h>
+
 //#define NDEBUG
 #include <debug.h>
 
Index: drivers/storage/class/cdrom/precomp.h
===================================================================
--- drivers/storage/class/cdrom/precomp.h	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom/precomp.h	(copie de travail)
@@ -1,7 +1,7 @@
-#include <ntddk.h>
-#include <scsi.h>
-#include <ntddscsi.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
-#include <include/class2.h>
-#include <stdio.h>
+#ifndef _CDROM_PCH_
+#define _CDROM_PCH_
+
+#include <ntdef.h>
+#include <ntstatus.h>
+
+#endif /* _CDROM_PCH_ */
Index: drivers/storage/class/cdrom_new/cdrom.h
===================================================================
--- drivers/storage/class/cdrom_new/cdrom.h	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/cdrom.h	(copie de travail)
@@ -28,7 +28,11 @@
 #ifndef __CDROMP_H__
 #define __CDROMP_H__
 
-#include "ntddmmc.h"
+#include <ntddk.h>
+#include <ntddcdvd.h>
+#include <classpnp.h>
+#include <ntddmmc.h>
+
 #include "trace.h"
 
 extern CLASSPNP_SCAN_FOR_SPECIAL_INFO CdromHackItems[];
@@ -872,4 +876,4 @@
     IN BOOLEAN CalledFromWorkItem
     );
 
-#endif // __CDROMP_H__
+#endif /* __CDROMP_H__ */
Index: drivers/storage/class/cdrom_new/data.c
===================================================================
--- drivers/storage/class/cdrom_new/data.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/data.c	(copie de travail)
@@ -17,9 +17,7 @@
 
 --*/
 
-#include "ntddk.h"
-#include "classpnp.h"
-#include "trace.h"
+#include "cdrom.h"
 
 #ifdef ALLOC_DATA_PRAGMA
 #pragma data_seg("PAGE")
Index: drivers/storage/class/cdrom_new/ioctl.c
===================================================================
--- drivers/storage/class/cdrom_new/ioctl.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/ioctl.c	(copie de travail)
@@ -24,19 +24,8 @@
 
 --*/
 
-#include "stddef.h"
-#include "string.h"
-
-#include "ntddk.h"
-
-#include "ntddcdvd.h"
-#include "classpnp.h"
-
-#include "initguid.h"
-#include "ntddstor.h"
 #include "cdrom.h"
 
-
 #if DBG
     PUCHAR READ_DVD_STRUCTURE_FORMAT_STRINGS[DvdMaxDescriptor+1] = {
         "Physical",
Index: drivers/storage/class/cdrom_new/sec.c
===================================================================
--- drivers/storage/class/cdrom_new/sec.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/sec.c	(copie de travail)
@@ -4,9 +4,8 @@
 
 --*/
 
+#include "cdrom.h"
 
-#include "sec.h"
-
 NTSTATUS
 NTAPI
 CdRomGetRpc0Settings(
Index: drivers/storage/class/cdrom_new/CMakeLists.txt
===================================================================
--- drivers/storage/class/cdrom_new/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/CMakeLists.txt	(copie de travail)
@@ -1,11 +1,13 @@
-include_directories(..)
 
+include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
+
 list(APPEND SOURCE
     cdrom.c
     data.c
     ioctl.c
     mmc.c
-    sec.c)
+    sec.c
+    cdrom.h)
 
 add_library(cdrom_new SHARED ${SOURCE})
 
@@ -21,3 +23,4 @@
 
 set_module_type(cdrom_new kernelmodedriver)
 add_importlibs(cdrom_new classpnp ntoskrnl hal)
+add_pch(cdrom_new cdrom.h SOURCE)
Index: drivers/storage/class/cdrom_new/mmc.c
===================================================================
--- drivers/storage/class/cdrom_new/mmc.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/mmc.c	(copie de travail)
@@ -24,8 +24,6 @@
 
 --*/
 
-#include "ntddk.h"
-#include "classpnp.h"
 #include "cdrom.h"
 
 NTSTATUS
Index: drivers/storage/class/cdrom_new/sec.h
===================================================================
--- drivers/storage/class/cdrom_new/sec.h	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/sec.h	(copie de travail)
@@ -1,9 +0,0 @@
-/*--
-
-Copyright (C) Microsoft Corporation, 1999
-
---*/
-
-#include "ntddk.h"
-#include "classpnp.h"
-#include "cdrom.h"
Index: drivers/storage/class/cdrom_new/trace.h
===================================================================
--- drivers/storage/class/cdrom_new/trace.h	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/trace.h	(copie de travail)
@@ -8,6 +8,7 @@
 
 */
 
+#pragma once
 
 #define TraceLogger(x, ...)   DbgPrint(__VA_ARGS__)
 #define TraceLog(x) TraceLogger x
@@ -49,5 +50,3 @@
         WPP_DEFINE_BIT(CdromSecError)           /* bit 30 = 0x00000000 */ \
         WPP_DEFINE_BIT(CdromSecInfo)            /* bit 31 = 0x00000000 */ \
         )
-
-
Index: drivers/storage/class/cdrom_new/cdrom.c
===================================================================
--- drivers/storage/class/cdrom_new/cdrom.c	(rÃ©vision 61927)
+++ drivers/storage/class/cdrom_new/cdrom.c	(copie de travail)
@@ -24,16 +24,6 @@
 
 --*/
 
-#include "stddef.h"
-#include "string.h"
-
-#include "ntddk.h"
-#include "initguid.h"
-
-#include "ntddcdvd.h"
-#include "classpnp.h"
-
-#include "ntddstor.h"
 #include "cdrom.h"
 
 #ifdef ALLOC_PRAGMA
Index: drivers/storage/scsiport/precomp.h
===================================================================
--- drivers/storage/scsiport/precomp.h	(rÃ©vision 61927)
+++ drivers/storage/scsiport/precomp.h	(copie de travail)
@@ -1,10 +1,6 @@
-#include <ntddk.h>
-#include <srb.h>
-#include <scsi.h>
-#include <ntddscsi.h>
-#include <ntddstor.h>
-#include <ntdddisk.h>
-#include <stdio.h>
-#include <stdarg.h>
+#ifndef _SCSIPORT_PCH_
+#define _SCSIPORT_PCH_
 
-#include "scsiport_int.h"
+#include <wdm.h>
+
+#endif /* _SCSIPORT_PCH_ */
Index: drivers/storage/scsiport/CMakeLists.txt
===================================================================
--- drivers/storage/scsiport/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/scsiport/CMakeLists.txt	(copie de travail)
@@ -4,11 +4,14 @@
 list(APPEND SOURCE
     scsiport.c
     stubs.c
+    precomp.h)
+
+add_library(scsiport SHARED
+    ${SOURCE}
     scsiport.rc
     ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def)
-    
-add_library(scsiport SHARED ${SOURCE})
-add_pch(scsiport precomp.h)
+
+add_pch(scsiport precomp.h SOURCE)
 set_module_type(scsiport kernelmodedriver)
 add_importlibs(scsiport ntoskrnl hal)
 
Index: drivers/storage/scsiport/stubs.c
===================================================================
--- drivers/storage/scsiport/stubs.c	(rÃ©vision 61927)
+++ drivers/storage/scsiport/stubs.c	(copie de travail)
@@ -6,10 +6,10 @@
  * PROGRAMMER:      Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "precomp.h"
 
+#include <srb.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -270,4 +270,3 @@
 {
     WRITE_REGISTER_ULONG(Register, Value);
 }
-
Index: drivers/storage/scsiport/scsiport_int.h
===================================================================
--- drivers/storage/scsiport/scsiport_int.h	(rÃ©vision 61927)
+++ drivers/storage/scsiport/scsiport_int.h	(copie de travail)
@@ -5,6 +5,8 @@
  *	An enumeration containing the states in the timer DFA
  */
 
+#pragma once
+
 #define VERSION "0.0.3"
 
 #ifndef PAGE_ROUND_UP
Index: drivers/storage/scsiport/scsiport.c
===================================================================
--- drivers/storage/scsiport/scsiport.c	(rÃ©vision 61927)
+++ drivers/storage/scsiport/scsiport.c	(copie de travail)
@@ -29,17 +29,21 @@
 
 #include "precomp.h"
 
-#ifndef NDEBUG
+#include <ntddk.h>
+#include <stdio.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <ntdddisk.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
+#include "scsiport_int.h"
+
 ULONG InternalDebugLevel = 0x00;
 
 #undef ScsiPortMoveMemory
 
-/* TYPES *********************************************************************/
-
 /* GLOBALS *******************************************************************/
 
 static BOOLEAN
@@ -3282,7 +3286,7 @@
             break;
 
         ScatterGatherList->Length = Srb->DataTransferLength - TotalLength;
-        ScatterGatherList->PhysicalAddress = IoMapTransfer(NULL,
+        ScatterGatherList->PhysicalAddress = IoMapTransfer(DeviceExtension->AdapterObject,
                                                            Irp->MdlAddress,
                                                            MapRegisterBase,
                                                            DataVA + TotalLength,
@@ -6407,5 +6411,4 @@
   return(Address.u.LowPart);
 }
 
-
 /* EOF */
Index: drivers/storage/floppy/csqrtns.h
===================================================================
--- drivers/storage/floppy/csqrtns.h	(rÃ©vision 61927)
+++ drivers/storage/floppy/csqrtns.h	(copie de travail)
@@ -24,6 +24,8 @@
  *                  15-Feb-2004 vizzini - Created
  */
 
+#pragma once
+
 #include <csq.h>
 
 /*
@@ -51,4 +53,3 @@
 
 VOID NTAPI
 CsqCompleteCanceledIrp(PIO_CSQ Csq, PIRP Irp);
-
Index: drivers/storage/floppy/hardware.h
===================================================================
--- drivers/storage/floppy/hardware.h	(rÃ©vision 61927)
+++ drivers/storage/floppy/hardware.h	(copie de travail)
@@ -34,6 +34,8 @@
  *       in favor of shifts or bitfields
  */
 
+#pragma once
+
 #define FLOPPY_DEFAULT_IRQ              0x6
 #define FDC_PORT_BYTES                  0x8
 
@@ -350,4 +352,3 @@
 
 NTSTATUS NTAPI
 HwTurnOffMotor(PCONTROLLER_INFO ControllerInfo);
-
Index: drivers/storage/floppy/readwrite.c
===================================================================
--- drivers/storage/floppy/readwrite.c	(rÃ©vision 61927)
+++ drivers/storage/floppy/readwrite.c	(copie de travail)
@@ -54,6 +54,7 @@
 
 #include "precomp.h"
 
+#include <debug.h>
 
 static IO_ALLOCATION_ACTION NTAPI
 MapRegisterCallback(PDEVICE_OBJECT DeviceObject,
@@ -759,4 +760,3 @@
     IoCompleteRequest(Irp, IO_DISK_INCREMENT);
     StopMotor(DriveInfo->ControllerInfo);
 }
-
Index: drivers/storage/floppy/floppy.c
===================================================================
--- drivers/storage/floppy/floppy.c	(rÃ©vision 61927)
+++ drivers/storage/floppy/floppy.c	(copie de travail)
@@ -42,6 +42,12 @@
 
 #include "precomp.h"
 
+#include <ntddk.h>
+#include <debug.h>
+
+#include "ioctl.h"
+#include "readwrite.h"
+
 /*
  * Global controller info structures.  Each controller gets one.  Since the system
  * will probably have only one, with four being a very unlikely maximum, a static
@@ -1192,4 +1198,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: drivers/storage/floppy/ioctl.c
===================================================================
--- drivers/storage/floppy/ioctl.c	(rÃ©vision 61927)
+++ drivers/storage/floppy/ioctl.c	(copie de travail)
@@ -33,6 +33,7 @@
 
 #include "precomp.h"
 
+#include <debug.h>
 
 NTSTATUS NTAPI
 DeviceIoctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
@@ -267,4 +268,3 @@
     StopMotor(DriveInfo->ControllerInfo);
     return;
 }
-
Index: drivers/storage/floppy/precomp.h
===================================================================
--- drivers/storage/floppy/precomp.h	(rÃ©vision 61927)
+++ drivers/storage/floppy/precomp.h	(copie de travail)
@@ -1,9 +1,10 @@
-#include <ntddk.h>
-#include <debug.h>
+#ifndef _FLOPPY_PCH_
+#define _FLOPPY_PCH_
 
+#include <wdm.h>
+
 #include "floppy.h"
 #include "csqrtns.h"
 #include "hardware.h"
-#include "csqrtns.h"
-#include "ioctl.h"
-#include "readwrite.h"
+
+#endif /* _FLOPPY_PCH_ */
Index: drivers/storage/floppy/readwrite.h
===================================================================
--- drivers/storage/floppy/readwrite.h	(rÃ©vision 61927)
+++ drivers/storage/floppy/readwrite.h	(copie de travail)
@@ -24,6 +24,8 @@
  *                  15-Feb-2004 vizzini - Created
  */
 
+#pragma once
+
 DRIVER_DISPATCH ReadWrite;
 
 NTSTATUS NTAPI
@@ -31,4 +33,3 @@
 
 VOID NTAPI
 ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp);
-
Index: drivers/storage/floppy/CMakeLists.txt
===================================================================
--- drivers/storage/floppy/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/storage/floppy/CMakeLists.txt	(copie de travail)
@@ -1,14 +1,15 @@
 
-add_library(floppy SHARED
+list(APPEND SOURCE
     csqrtns.c
     floppy.c
     hardware.c
     ioctl.c
     readwrite.c
-    floppy.rc)
+    precomp.h)
 
+add_library(floppy SHARED ${SOURCE} floppy.rc)
 target_link_libraries(floppy csq)
-add_pch(floppy precomp.h)
+add_pch(floppy precomp.h SOURCE)
 set_module_type(floppy kernelmodedriver)
 add_importlibs(floppy hal ntoskrnl)
 add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/storage/floppy/csqrtns.c
===================================================================
--- drivers/storage/floppy/csqrtns.c	(rÃ©vision 61927)
+++ drivers/storage/floppy/csqrtns.c	(copie de travail)
@@ -40,6 +40,8 @@
 
 #include "precomp.h"
 
+#include <debug.h>
+
 /* Global CSQ struct that the CSQ functions initialize and use */
 IO_CSQ Csq;
 
@@ -171,4 +173,3 @@
     InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry);
     KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE);
 }
-
Index: drivers/storage/floppy/hardware.c
===================================================================
--- drivers/storage/floppy/hardware.c	(rÃ©vision 61927)
+++ drivers/storage/floppy/hardware.c	(copie de travail)
@@ -49,11 +49,12 @@
 
 #include "precomp.h"
 
+#include <debug.h>
+
 /*
  * Hardware Support Routines
  */
 
-
 static BOOLEAN NTAPI
 ReadyForWrite(PCONTROLLER_INFO ControllerInfo)
 /*
@@ -1041,4 +1042,3 @@
     INFO_(FLOPPY, "MAIN_STATUS_REGISTER =0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER));
     INFO_(FLOPPY, "DIGITAL_INPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER));
 }
-
Index: drivers/storage/floppy/floppy.h
===================================================================
--- drivers/storage/floppy/floppy.h	(rÃ©vision 61927)
+++ drivers/storage/floppy/floppy.h	(copie de travail)
@@ -24,6 +24,8 @@
  *                  15-Feb-2004 vizzini - Created
  */
 
+#pragma once
+
 #define MAX_DEVICE_NAME 255
 #define MAX_ARC_PATH_LEN 255
 #define MAX_DRIVES_PER_CONTROLLER 4
@@ -123,4 +125,3 @@
 #define GEOMETRY_144_TRACKSPERCYLINDER 2
 #define GEOMETRY_144_SECTORSPERTRACK 18
 #define GEOMETRY_144_BYTESPERSECTOR 512
-
Index: drivers/storage/floppy/ioctl.h
===================================================================
--- drivers/storage/floppy/ioctl.h	(rÃ©vision 61927)
+++ drivers/storage/floppy/ioctl.h	(copie de travail)
@@ -24,6 +24,8 @@
  *                  15-Feb-2004 vizzini - Created
  */
 
+#pragma once
+
 DRIVER_DISPATCH DeviceIoctl;
 
 NTSTATUS NTAPI
@@ -31,4 +33,3 @@
 
 VOID NTAPI
 DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp);
-
Index: drivers/hid/hidclass/precomp.h
===================================================================
--- drivers/hid/hidclass/precomp.h	(rÃ©vision 61927)
+++ drivers/hid/hidclass/precomp.h	(copie de travail)
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _HIDCLASS_PCH_
+#define _HIDCLASS_PCH_
 
 #define _HIDPI_NO_FUNCTION_MACROS_
 #include <wdm.h>
@@ -212,4 +213,4 @@
     PHIDP_DEVICE_DESC DeviceDescription,
     ULONG CollectionNumber);
 
-/* eof */
+#endif /* _HIDCLASS_PCH_ */
Index: drivers/hid/hidclass/CMakeLists.txt
===================================================================
--- drivers/hid/hidclass/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/hid/hidclass/CMakeLists.txt	(copie de travail)
@@ -4,13 +4,15 @@
 list(APPEND SOURCE
     fdo.c
     hidclass.c
-    hidclass.rc
     pdo.c
+    precomp.h)
+
+add_library(hidclass SHARED
+    ${SOURCE}
     guid.c
+    hidclass.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def)
 
-add_library(hidclass SHARED ${SOURCE})
-
 set_entrypoint(hidclass 0)
 set_subsystem(hidclass native)
 set_target_properties(hidclass PROPERTIES SUFFIX ".sys")
@@ -18,5 +20,5 @@
 
 add_importlibs(hidclass ntoskrnl hidparse hal)
 add_dependencies(hidclass bugcodes)
-
+add_pch(hidclass precomp.h SOURCE)
 add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/bluetooth/fbtusb/CMakeLists.txt
===================================================================
--- drivers/bluetooth/fbtusb/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bluetooth/fbtusb/CMakeLists.txt	(copie de travail)
@@ -7,7 +7,8 @@
     fbtpwr.c
     fbtrwr.c
 #   fbtwmi.c
-    fbtusb.c)
+    fbtusb.c
+    precomp.h)
 
 add_library(fbtusb SHARED ${SOURCE} fbtusb.rc)
 
@@ -19,4 +20,5 @@
 
 set_module_type(fbtusb kernelmodedriver)
 add_importlibs(fbtusb ntoskrnl hal usbd)
+add_pch(fbtusb precomp.h SOURCE)
 add_cd_file(TARGET fbtusb DESTINATION reactos/system32/drivers FOR all)
Index: drivers/bluetooth/fbtusb/precomp.h
===================================================================
--- drivers/bluetooth/fbtusb/precomp.h	(rÃ©vision 0)
+++ drivers/bluetooth/fbtusb/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,14 @@
+#ifndef _FBTUSB_PCH_
+#define _FBTUSB_PCH_
+
+#include <stdio.h>
+
+#include "fbtusb.h"
+#include "fbtpnp.h"
+#include "fbtpwr.h"
+#include "fbtdev.h"
+#include "fbtwmi.h"
+#include "fbtrwr.h"
+#include "fbtusr.h"
+
+#endif /* _FBTUSB_PCH_ */

Modification de propriÃ©tÃ©s sur drivers/bluetooth/fbtusb/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: drivers/sac/driver/channel.c
===================================================================
--- drivers/sac/driver/channel.c	(rÃ©vision 61927)
+++ drivers/sac/driver/channel.c	(copie de travail)
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 BOOLEAN
@@ -575,4 +573,3 @@
     Status = ChannelDereferenceHandles(Channel);
     return Status;
 }
-
Index: drivers/sac/driver/data.c
===================================================================
--- drivers/sac/driver/data.c	(rÃ©vision 61927)
+++ drivers/sac/driver/data.c	(copie de travail)
@@ -501,4 +501,3 @@
     SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting with status TRUE\n");
     return TRUE;
 }
-
Index: drivers/sac/driver/CMakeLists.txt
===================================================================
--- drivers/sac/driver/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/sac/driver/CMakeLists.txt	(copie de travail)
@@ -1,20 +1,24 @@
 
+include_directories(${REACTOS_SOURCE_DIR})
+
 list(APPEND SOURCE
-     chanmgr.c
-     channel.c
-     cmdchan.c
-     concmd.c
-     conmgr.c
-     data.c
-     dispatch.c
-     init.c
-     memory.c
-     rawchan.c
-     util.c
-     vtutf8chan.c)
+    chanmgr.c
+    channel.c
+    cmdchan.c
+    concmd.c
+    conmgr.c
+    data.c
+    dispatch.c
+    init.c
+    memory.c
+    rawchan.c
+    util.c
+    vtutf8chan.c
+    sacdrv.h)
 
 add_library(sacdrv SHARED ${SOURCE} sacdrv.rc)
 set_module_type(sacdrv kernelmodedriver)
 add_importlibs(sacdrv ntoskrnl hal)
 add_dependencies(sacdrv sacmsg)
+add_pch(sacdrv sacdrv.h SOURCE)
 add_cd_file(TARGET sacdrv DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/sac/driver/cmdchan.c
===================================================================
--- drivers/sac/driver/cmdchan.c	(rÃ©vision 61927)
+++ drivers/sac/driver/cmdchan.c	(copie de travail)
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
Index: drivers/sac/driver/util.c
===================================================================
--- drivers/sac/driver/util.c	(rÃ©vision 61927)
+++ drivers/sac/driver/util.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <ndk/rtlfuncs.h>
+
 /* GLOBALS ********************************************************************/
 
 PCHAR Utf8ConversionBuffer;
Index: drivers/sac/driver/concmd.c
===================================================================
--- drivers/sac/driver/concmd.c	(rÃ©vision 61927)
+++ drivers/sac/driver/concmd.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <ndk/exfuncs.h>
+
 /* GLOBALS ********************************************************************/
 
 PVOID GlobalBuffer;
Index: drivers/sac/driver/init.c
===================================================================
--- drivers/sac/driver/init.c	(rÃ©vision 61927)
+++ drivers/sac/driver/init.c	(copie de travail)
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
Index: drivers/sac/driver/rawchan.c
===================================================================
--- drivers/sac/driver/rawchan.c	(rÃ©vision 61927)
+++ drivers/sac/driver/rawchan.c	(copie de travail)
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
Index: drivers/sac/driver/conmgr.c
===================================================================
--- drivers/sac/driver/conmgr.c	(rÃ©vision 61927)
+++ drivers/sac/driver/conmgr.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <initguid.h>
+
 /* GLOBALS ********************************************************************/
 
 DEFINE_GUID(PRIMARY_SAC_CHANNEL_APPLICATION_GUID,
@@ -890,4 +892,3 @@
     ASSERT(FALSE);
     return STATUS_NOT_IMPLEMENTED;
 }
-
Index: drivers/sac/driver/sacdrv.h
===================================================================
--- drivers/sac/driver/sacdrv.h	(rÃ©vision 61927)
+++ drivers/sac/driver/sacdrv.h	(copie de travail)
@@ -6,17 +6,14 @@
  * PROGRAMMERS: ReactOS Portable Systems Group
  */
 
+#ifndef _SACDRV_H_
+#define _SACDRV_H_
+
 /* INCLUDES *******************************************************************/
 
 #include <ntifs.h>
-#include <intrin.h>
-#include <wchar.h>
 #include <stdio.h>
-#include <ndk/obtypes.h>
-#include <ndk/exfuncs.h>
-#include <ndk/rtlfuncs.h>
-#include <../../../ntoskrnl/include/internal/hdl.h>
-#include <initguid.h>
+#include <ntoskrnl/include/internal/hdl.h>
 #include <sacmsg.h>
 
 /* DEFINES ********************************************************************/
@@ -1517,3 +1514,5 @@
 #define VT_ANSI_HVP_CURSOR_CHAR     L'f'
 #define VT_ANSI_CUP_CURSOR_CHAR     L'H'
 #define VT_ANSI_SCROLL_CHAR         L'r'
+
+#endif /* _SACDRV_H_ */
Index: drivers/filesystems/fastfat/dir.c
===================================================================
--- drivers/filesystems/fastfat/dir.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/dir.c	(copie de travail)
@@ -584,7 +584,33 @@
     return Status;
 }
 
+NTSTATUS VfatNotifyChangeDirectory(PVFAT_IRP_CONTEXT * IrpContext)
+{
+    PVCB pVcb;
+    PVFATFCB pFcb;
+    PIO_STACK_LOCATION Stack;
+    Stack = (*IrpContext)->Stack;
+    pVcb = (*IrpContext)->DeviceExt;
+    pFcb = (PVFATFCB) (*IrpContext)->FileObject->FsContext;
+ 
+    FsRtlNotifyFullChangeDirectory(pVcb->NotifySync,
+                                   &(pVcb->NotifyList),
+                                   (*IrpContext)->FileObject->FsContext2,
+                                   (PSTRING)&(pFcb->PathNameU),
+                                   BooleanFlagOn(Stack->Flags, SL_WATCH_TREE),
+                                   FALSE,
+                                   Stack->Parameters.NotifyDirectory.CompletionFilter,
+                                   (*IrpContext)->Irp,
+                                   NULL,
+                                   NULL);
 
+    /* We don't need the IRP context as we won't handle IRP completion */
+    VfatFreeIrpContext(*IrpContext);
+    *IrpContext = NULL;
+
+    return STATUS_PENDING;
+}
+
 /*
  * FUNCTION: directory control : read/write directory informations
  */
@@ -603,8 +629,7 @@
             break;
 
         case IRP_MN_NOTIFY_CHANGE_DIRECTORY:
-            DPRINT("VFAT, dir : change\n");
-            Status = STATUS_NOT_IMPLEMENTED;
+            Status = VfatNotifyChangeDirectory(&IrpContext);
             break;
 
         default:
@@ -617,7 +642,11 @@
 
     if (Status == STATUS_PENDING)
     {
-        Status = VfatQueueRequest(IrpContext);
+        /* Only queue if there's IRP context */
+        if (IrpContext)
+        {
+            Status = VfatQueueRequest(IrpContext);
+        }
     }
     else
     {
Index: drivers/filesystems/fastfat/fastio.c
===================================================================
--- drivers/filesystems/fastfat/fastio.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/fastio.c	(copie de travail)
@@ -739,4 +739,3 @@
     FastIoDispatch->AcquireForCcFlush = VfatAcquireForCcFlush;
     FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush;
 }
-
Index: drivers/filesystems/fastfat/cleanup.c
===================================================================
--- drivers/filesystems/fastfat/cleanup.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/cleanup.c	(copie de travail)
@@ -57,6 +57,11 @@
             return STATUS_PENDING;
         }
 
+        /* Notify about the cleanup */
+        FsRtlNotifyCleanup(IrpContext->DeviceExt->NotifySync,
+                           &(IrpContext->DeviceExt->NotifyList),
+                           FileObject->FsContext2);
+
         pFcb->OpenHandleCount--;
 
         if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) &&
Index: drivers/filesystems/fastfat/rw.c
===================================================================
--- drivers/filesystems/fastfat/rw.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/rw.c	(copie de travail)
@@ -1000,6 +1000,8 @@
         if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY))
         {
             LARGE_INTEGER SystemTime;
+            ULONG Filter;
+
             // set dates and times
             KeQuerySystemTime (&SystemTime);
             if (Fcb->Flags & FCB_IS_FATX_ENTRY)
@@ -1019,6 +1021,20 @@
             }
             /* set date and times to dirty */
             Fcb->Flags |= FCB_IS_DIRTY;
+
+            /* Time to notify the OS */
+            Filter = FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_ATTRIBUTES;
+            if (ByteOffset.QuadPart != OldFileSize.QuadPart) Filter |= FILE_NOTIFY_CHANGE_SIZE;
+
+            FsRtlNotifyFullReportChange(IrpContext->DeviceExt->NotifySync,
+                                        &(IrpContext->DeviceExt->NotifyList),
+                                        (PSTRING)&Fcb->PathNameU,
+                                        Fcb->PathNameU.Length - Fcb->LongNameU.Length,
+                                        NULL,
+                                        NULL,
+                                        Filter,
+                                        FILE_ACTION_MODIFIED,
+                                        NULL);
         }
     }
 
@@ -1059,4 +1075,3 @@
     DPRINT("%x\n", Status);
     return Status;
 }
-
Index: drivers/filesystems/fastfat/fcb.c
===================================================================
--- drivers/filesystems/fastfat/fcb.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/fcb.c	(copie de travail)
@@ -841,4 +841,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: drivers/filesystems/fastfat/misc.c
===================================================================
--- drivers/filesystems/fastfat/misc.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/misc.c	(copie de travail)
@@ -300,4 +300,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: drivers/filesystems/fastfat/CMakeLists.txt
===================================================================
--- drivers/filesystems/fastfat/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/CMakeLists.txt	(copie de travail)
@@ -21,13 +21,13 @@
     shutdown.c
     string.c
     volume.c
-    vfatfs.rc)
+    vfat.h)
 
-add_library(fastfat SHARED ${SOURCE})
+add_library(fastfat SHARED ${SOURCE} vfatfs.rc)
 
 set_module_type(fastfat kernelmodedriver)
 add_importlibs(fastfat ntoskrnl hal)
 
-add_pch(fastfat vfat.h)
+add_pch(fastfat vfat.h SOURCE)
 
 add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/filesystems/fastfat/create.c
===================================================================
--- drivers/filesystems/fastfat/create.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/create.c	(copie de travail)
@@ -754,6 +754,20 @@
                             &pFcb->FCBShareAccess);
     }
 
+    if (Irp->IoStatus.Information == FILE_CREATED)
+    {
+        FsRtlNotifyFullReportChange(DeviceExt->NotifySync,
+                                    &(DeviceExt->NotifyList),
+                                    (PSTRING)&pFcb->PathNameU,
+                                    pFcb->PathNameU.Length - pFcb->LongNameU.Length,
+                                    NULL,
+                                    NULL,
+                                    ((*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) ?
+                                    FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME),
+                                    FILE_ACTION_ADDED,
+                                    NULL);
+    }
+
     pFcb->OpenHandleCount++;
 
     /* FIXME : test write access if requested */
Index: drivers/filesystems/fastfat/vfat.h
===================================================================
--- drivers/filesystems/fastfat/vfat.h	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/vfat.h	(copie de travail)
@@ -1,5 +1,7 @@
+#ifndef _FASTFAT_PCH_
+#define _FASTFAT_PCH_
+
 #include <ntifs.h>
-#include <bugcodes.h>
 #include <ntdddisk.h>
 #include <dos.h>
 
@@ -289,6 +291,10 @@
     ULONG BaseDateYear;
 
     LIST_ENTRY VolumeListEntry;
+
+    /* Notifications */
+    LIST_ENTRY NotifyList;
+    PNOTIFY_SYNC NotifySync;
 } DEVICE_EXTENSION, VCB, *PVCB;
 
 typedef struct
@@ -949,4 +955,4 @@
 VfatSetVolumeInformation(
     PVFAT_IRP_CONTEXT IrpContext);
 
-/* EOF */
+#endif /* _FASTFAT_PCH_ */
Index: drivers/filesystems/fastfat/fsctl.c
===================================================================
--- drivers/filesystems/fastfat/fsctl.c	(rÃ©vision 61927)
+++ drivers/filesystems/fastfat/fsctl.c	(copie de travail)
@@ -600,6 +600,8 @@
     VolumeFcb->Flags |= VCB_IS_DIRTY;
 
     FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT);
+    FsRtlNotifyInitializeSync(&DeviceExt->NotifySync);
+    InitializeListHead(&DeviceExt->NotifyList);
 
     Status = STATUS_SUCCESS;
 
Index: drivers/filesystems/msfs/CMakeLists.txt
===================================================================
--- drivers/filesystems/msfs/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/msfs/CMakeLists.txt	(copie de travail)
@@ -5,13 +5,13 @@
     fsctrl.c
     msfs.c
     rw.c
-    msfs.rc)
+    msfs.h)
 
-add_library(msfs SHARED ${SOURCE})
+add_library(msfs SHARED ${SOURCE} msfs.rc)
 
 set_module_type(msfs kernelmodedriver)
 add_importlibs(msfs ntoskrnl hal)
 
-add_pch(msfs msfs.h)
+add_pch(msfs msfs.h SOURCE)
 
 add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all)
Index: drivers/filesystems/ntfs/CMakeLists.txt
===================================================================
--- drivers/filesystems/ntfs/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/ntfs/CMakeLists.txt	(copie de travail)
@@ -15,13 +15,13 @@
     ntfs.c
     rw.c
     volinfo.c
-    ntfs.rc)
+    ntfs.h)
 
-add_library(ntfs SHARED ${SOURCE})
+add_library(ntfs SHARED ${SOURCE} ntfs.rc)
 
 set_module_type(ntfs kernelmodedriver)
 add_importlibs(ntfs ntoskrnl hal)
 
-add_pch(ntfs ntfs.h)
+add_pch(ntfs ntfs.h SOURCE)
 
 add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/filesystems/cdfs/cdfs.h
===================================================================
--- drivers/filesystems/cdfs/cdfs.h	(rÃ©vision 61927)
+++ drivers/filesystems/cdfs/cdfs.h	(copie de travail)
@@ -2,7 +2,6 @@
 #define CDFS_H
 
 #include <ntifs.h>
-#include <ntddk.h>
 #include <ntddcdrm.h>
 
 #define CDFS_BASIC_SECTOR 2048
@@ -10,7 +9,6 @@
 #define BLOCKSIZE CDFS_BASIC_SECTOR
 #define CDFS_MAX_NAME_LEN 256
 
-
 /* Volume descriptor types (VdType) */
 #define BOOT_VOLUME_DESCRIPTOR_TYPE		0
 #define PRIMARY_VOLUME_DESCRIPTOR_TYPE		1
@@ -472,4 +470,4 @@
 VOID NTAPI
 CdfsReleaseFromLazyWrite(IN PVOID Context);
 
-#endif //CDFS_H
+#endif /* CDFS_H */
Index: drivers/filesystems/cdfs/cleanup.c
===================================================================
--- drivers/filesystems/cdfs/cleanup.c	(rÃ©vision 61927)
+++ drivers/filesystems/cdfs/cleanup.c	(copie de travail)
@@ -96,4 +96,3 @@
 }
 
 /* EOF */
-
Index: drivers/filesystems/cdfs/CMakeLists.txt
===================================================================
--- drivers/filesystems/cdfs/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/cdfs/CMakeLists.txt	(copie de travail)
@@ -15,13 +15,13 @@
     misc.c
     rw.c
     volinfo.c
-    cdfs.rc)
+    cdfs.h)
 
-add_library(cdfs SHARED ${SOURCE})
+add_library(cdfs SHARED ${SOURCE} cdfs.rc)
 
 set_module_type(cdfs kernelmodedriver)
 add_importlibs(cdfs ntoskrnl hal)
 
-add_pch(cdfs cdfs.h)
+add_pch(cdfs cdfs.h SOURCE)
 
 add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/filesystems/cdfs/close.c
===================================================================
--- drivers/filesystems/cdfs/close.c	(rÃ©vision 61927)
+++ drivers/filesystems/cdfs/close.c	(copie de travail)
@@ -108,4 +108,3 @@
 }
 
 /* EOF */
-
Index: drivers/filesystems/fs_rec/fs_rec.c
===================================================================
--- drivers/filesystems/fs_rec/fs_rec.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/fs_rec.c	(copie de travail)
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
@@ -372,14 +373,14 @@
     if (NT_SUCCESS(Status)) DeviceCount++;
 
     /* Register EXT2 */
-    /*Status = FsRecRegisterFs(DriverObject,
+    Status = FsRecRegisterFs(DriverObject,
                              NULL,
                              NULL,
-                             L"\\Ext2",
+                             L"\\Ext2fs",
                              L"\\FileSystem\\Ext2Recognizer",
                              FS_TYPE_EXT2,
                              FILE_DEVICE_DISK_FILE_SYSTEM);
-    if (NT_SUCCESS(Status)) DeviceCount++;*/
+    if (NT_SUCCESS(Status)){ DeviceCount++; DPRINT1("2 Ext2FS!!!!!\n");}
 
     /* Return appropriate Status */
     return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED;
Index: drivers/filesystems/fs_rec/udfs.c
===================================================================
--- drivers/filesystems/fs_rec/udfs.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/udfs.c	(copie de travail)
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
Index: drivers/filesystems/fs_rec/ext2.c
===================================================================
--- drivers/filesystems/fs_rec/ext2.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/ext2.c	(copie de travail)
@@ -9,6 +9,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
@@ -92,7 +93,7 @@
 
             /* Load the file system */
             Status = FsRecLoadFileSystem(DeviceObject,
-                                         L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2");
+                                         L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2fs");
             break;
 
         default:
Index: drivers/filesystems/fs_rec/fs_rec.h
===================================================================
--- drivers/filesystems/fs_rec/fs_rec.h	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/fs_rec.h	(copie de travail)
@@ -7,27 +7,19 @@
  *                   Eric Kohl
  */
 
-//
-// IFS Headers
-//
+#ifndef _FS_REC_H
+#define _FS_REC_H
+
 #include <ntifs.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
 
-//
-// Tag for memory allocations
-//
+/* Tag for memory allocations */
 #define FSREC_TAG 'cRsF'
 
-//
-// UDFS Offsets
-//
+/* UDFS Offsets */
 #define UDFS_VRS_START_OFFSET  32768
 #define UDFS_AVDP_SECTOR       256
 
-//
-// Non-standard rounding macros
-//
+/* Non-standard rounding macros */
 #define ROUND_UP(n, align) \
     ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
 
@@ -34,9 +26,7 @@
 #define ROUND_DOWN(n, align) \
     (((ULONG)n) & ~((align) - 1l))
 
-//
-// Conversion types and macros taken from internal ntifs headers
-//
+/* Conversion types and macros taken from internal ntifs headers */
 typedef union _UCHAR1
 {
     UCHAR Uchar[1];
@@ -82,9 +72,7 @@
     CopyUchar4(&(Bios)->LargeSectors,      &(Pbios)->LargeSectors[0]     ); \
 }
 
-//
-// Packed versions of the BPB and Boot Sector
-//
+/* Packed versions of the BPB and Boot Sector */
 typedef struct _PACKED_BIOS_PARAMETER_BLOCK
 {
     UCHAR BytesPerSector[2];
@@ -114,9 +102,7 @@
     UCHAR SystemId[8];
 } PACKED_BOOT_SECTOR, *PPACKED_BOOT_SECTOR;
 
-//
-// Unpacked version of the BPB
-//
+/* Unpacked version of the BPB */
 typedef struct BIOS_PARAMETER_BLOCK
 {
     USHORT BytesPerSector;
@@ -149,9 +135,7 @@
     USHORT BackupBootSector;
 } BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK;
 
-//
-// UDFS Structures
-//
+/* UDFS Structures */
 #include <pshpack1.h>
 typedef struct _TAG
 {
@@ -179,9 +163,7 @@
 } AVDP, *PAVDP;
 #include <poppack.h>
 
-//
-// Filesystem Types
-//
+/* Filesystem Types */
 typedef enum _FILE_SYSTEM_TYPE
 {
     FS_TYPE_UNUSED,
@@ -192,9 +174,7 @@
     FS_TYPE_EXT2,
 } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE;
 
-//
-// FS Recognizer State
-//
+/* FS Recognizer State */
 typedef enum _FS_REC_STATE
 {
     Pending,
@@ -202,9 +182,7 @@
     Unloading
 } FS_REC_STATE, *PFS_REC_STATE;
 
-//
-// Device extension
-//
+/* Device extension */
 typedef struct _DEVICE_EXTENSION
 {
     FS_REC_STATE State;
@@ -212,9 +190,7 @@
     PDEVICE_OBJECT Alternate;
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION;
 
-//
-// Prototypes
-//
+/* Prototypes */
 NTSTATUS
 NTAPI
 FsRecCdfsFsControl(
@@ -282,3 +258,5 @@
     IN PDEVICE_OBJECT DeviceObject,
     IN PWCHAR DriverServiceName
 );
+
+#endif /* _FS_REC_H */
Index: drivers/filesystems/fs_rec/blockdev.c
===================================================================
--- drivers/filesystems/fs_rec/blockdev.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/blockdev.c	(copie de travail)
@@ -10,6 +10,10 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -221,4 +225,3 @@
     /* All went well */
     return TRUE;
 }
-
Index: drivers/filesystems/fs_rec/fat.c
===================================================================
--- drivers/filesystems/fs_rec/fat.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/fat.c	(copie de travail)
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
Index: drivers/filesystems/fs_rec/ntfs.c
===================================================================
--- drivers/filesystems/fs_rec/ntfs.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/ntfs.c	(copie de travail)
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
Index: drivers/filesystems/fs_rec/CMakeLists.txt
===================================================================
--- drivers/filesystems/fs_rec/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-add_library(fs_rec SHARED
+list(APPEND SOURCE
     blockdev.c
     cdfs.c
     ext2.c
@@ -7,9 +7,10 @@
     fs_rec.c
     ntfs.c
     udfs.c
-    fs_rec.rc)
+    fs_rec.h)
 
+add_library(fs_rec SHARED ${SOURCE} fs_rec.rc)
 set_module_type(fs_rec kernelmodedriver)
 add_importlibs(fs_rec ntoskrnl hal)
-add_pch(fs_rec fs_rec.h)
+add_pch(fs_rec fs_rec.h SOURCE)
 add_cd_file(TARGET fs_rec DESTINATION reactos/system32/drivers FOR all)
Index: drivers/filesystems/fs_rec/cdfs.c
===================================================================
--- drivers/filesystems/fs_rec/cdfs.c	(rÃ©vision 61927)
+++ drivers/filesystems/fs_rec/cdfs.c	(copie de travail)
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
Index: drivers/filesystems/mup/CMakeLists.txt
===================================================================
--- drivers/filesystems/mup/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/mup/CMakeLists.txt	(copie de travail)
@@ -1,10 +1,11 @@
 
-add_library(mup SHARED
+list(APPEND SOURCE
     create.c
     mup.c
-    mup.rc)
+    mup.h)
 
+add_library(mup SHARED ${SOURCE} mup.rc)
 set_module_type(mup kernelmodedriver)
 add_importlibs(mup ntoskrnl hal)
-add_pch(mup mup.h)
+add_pch(mup mup.h SOURCE)
 add_cd_file(TARGET mup DESTINATION reactos/system32/drivers FOR all)
Index: drivers/filesystems/mup/mup.c
===================================================================
--- drivers/filesystems/mup/mup.c	(rÃ©vision 61927)
+++ drivers/filesystems/mup/mup.c	(copie de travail)
@@ -31,9 +31,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
@@ -100,4 +97,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: drivers/filesystems/mup/mup.h
===================================================================
--- drivers/filesystems/mup/mup.h	(rÃ©vision 61927)
+++ drivers/filesystems/mup/mup.h	(copie de travail)
@@ -1,5 +1,7 @@
+#ifndef _MUP_PCH_
+#define _MUP_PCH_
 
-#include <ntddk.h>
+#include <wdm.h>
 
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 
@@ -19,3 +21,5 @@
 NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
 	    PUNICODE_STRING RegistryPath);
+
+#endif /* _MUP_PCH_ */
Index: drivers/filesystems/ext2/src/fsctrl.c
===================================================================
--- drivers/filesystems/ext2/src/fsctrl.c	(rÃ©vision 61927)
+++ drivers/filesystems/ext2/src/fsctrl.c	(copie de travail)
@@ -782,7 +782,13 @@
 
     if (Status == STATUS_INVALID_PARAMETER) 
 	{
+        DbgPrint("Ext2PerformVerifyDiskRead Invalid Param\n");
+        return FALSE;
+    }
 
+    if (Status == STATUS_NO_MEDIA_IN_DEVICE) 
+	{
+        DbgPrint("Ext2PerformVerifyDiskRead NO MEDIA in DEVICE!!! BS!!\n");
         return FALSE;
     }
 
@@ -792,6 +798,7 @@
 
     if (!NT_SUCCESS(Status)) 
 	{
+	    DbgPrint("Ext2PerformVerifyDiskRead Fail Status %x\n",Status);
             return FALSE;
     }
 
Index: drivers/filesystems/ext2/src/ext2init.c
===================================================================
--- drivers/filesystems/ext2/src/ext2init.c	(rÃ©vision 61927)
+++ drivers/filesystems/ext2/src/ext2init.c	(copie de travail)
@@ -20,7 +20,7 @@
 #define			EXT2_BUG_CHECK_ID				EXT2_FILE_INIT
 #define			DEBUG_LEVEL						(DEBUG_TRACE_INIT)
 
-#define			EXT2_FS_NAME					L"\\ext2"
+#define			EXT2_FS_NAME					L"\\Ext2fs" // Must match others!
 
 // global variables are declared here
 Ext2Data					Ext2GlobalData;
Index: drivers/filesystems/ext2/CMakeLists.txt
===================================================================
--- drivers/filesystems/ext2/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/ext2/CMakeLists.txt	(copie de travail)
@@ -19,8 +19,9 @@
     src/read.c
     src/cleanup.c
     src/misc.c
-    src/shutdown.c)
-    
+    src/shutdown.c
+    inc/ext2fsd.h)
+
 add_library(ext2fs SHARED ${SOURCE})
 
 if(NOT MSVC)
@@ -29,7 +30,7 @@
 
 allow_warnings(ext2fs)
 target_link_libraries(ext2fs ${PSEH_LIB})
-add_pch(ext2fs inc/ext2fsd.h)
+add_pch(ext2fs inc/ext2fsd.h SOURCE)
 set_module_type(ext2fs kernelmodedriver)
 add_importlibs(ext2fs ntoskrnl hal)
 add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/filesystems/npfs/CMakeLists.txt
===================================================================
--- drivers/filesystems/npfs/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filesystems/npfs/CMakeLists.txt	(copie de travail)
@@ -19,11 +19,12 @@
     volinfo.c
     waitsup.c
     write.c
-    writesup.c)
+    writesup.c
+    npfs.h)
 
 add_library(npfs SHARED ${SOURCE})
 set_module_type(npfs kernelmodedriver)
 target_link_libraries(npfs ${PSEH_LIB})
 add_importlibs(npfs ntoskrnl hal)
-add_pch(npfs npfs.h)
+add_pch(npfs npfs.h SOURCE)
 add_cd_file(TARGET npfs DESTINATION reactos/system32/drivers FOR all)
Index: drivers/filesystems/npfs/npfs.h
===================================================================
--- drivers/filesystems/npfs/npfs.h	(rÃ©vision 61927)
+++ drivers/filesystems/npfs/npfs.h	(copie de travail)
@@ -6,13 +6,14 @@
  * PROGRAMMERS: ReactOS Portable Systems Group
  */
 
+#ifndef _NPFS_PCH_
+#define _NPFS_PCH_
+
 /* INCLUDES *******************************************************************/
 
-//
-// System Headers
-//
+/* System Headers */
 #include <ntifs.h>
-#include <ntndk.h>
+#include <ndk/obfuncs.h>
 #include <pseh/pseh2.h>
 //#define UNIMPLEMENTED
 //#define DPRINT1 DbgPrint
@@ -21,9 +22,7 @@
 #include <debug.h>
 #define TRACE(...) /* DPRINT1("%s: ", __FUNCTION__); DbgPrint(__VA_ARGS__) */
 
-//
-// Allow Microsoft Extensions
-//
+/* Allow Microsoft Extensions */
 #ifdef _MSC_VER
 #pragma warning(disable:4201)
 #pragma warning(disable:4214)
@@ -33,7 +32,6 @@
 #define MIN_INDEXED_LENGTH 5
 #define MAX_INDEXED_LENGTH 9
 
-
 /* TYPEDEFS & DEFINES *********************************************************/
 
 //
@@ -110,9 +108,7 @@
                  (NPFS_BUGCHECK_FILE_ID << 16) | __LINE__,  \
                  (p1), (p2), (p3))
 
-//
-// Node Type Codes for NPFS
-//
+/* Node Type Codes for NPFS */
 #define NPFS_NTC_VCB            1
 #define NPFS_NTC_ROOT_DCB       2
 #define NPFS_NTC_FCB            4
@@ -121,9 +117,7 @@
 #define NPFS_NTC_ROOT_DCB_CCB   8
 typedef USHORT NODE_TYPE_CODE, *PNODE_TYPE_CODE;
 
-//
-// Data Queue States
-//
+/* Data Queue States */
 typedef enum _NP_DATA_QUEUE_STATE
 {
     ReadEntries = 0,
@@ -131,9 +125,7 @@
     Empty = 2
 } NP_DATA_QUEUE_STATE;
 
-//
-// Data Queue Entry Types
-//
+/* Data Queue Entry Types */
 typedef enum _NP_DATA_QUEUE_ENTRY_TYPE
 {
     Buffered = 0,
@@ -140,9 +132,7 @@
     Unbuffered
 } NP_DATA_QUEUE_ENTRY_TYPE;
 
-//
-// An Input or Output Data Queue. Each CCB has two of these.
-//
+/* An Input or Output Data Queue. Each CCB has two of these. */
 typedef struct _NP_DATA_QUEUE
 {
     LIST_ENTRY Queue;
@@ -154,9 +144,7 @@
     ULONG Quota;
 } NP_DATA_QUEUE, *PNP_DATA_QUEUE;
 
-//
-// The Entries that go into the Queue
-//
+/* The Entries that go into the Queue */
 typedef struct _NP_DATA_QUEUE_ENTRY
 {
     LIST_ENTRY QueueEntry;
@@ -167,9 +155,7 @@
     ULONG DataSize;
 } NP_DATA_QUEUE_ENTRY, *PNP_DATA_QUEUE_ENTRY;
 
-//
-// A Wait Queue. Only the VCB has one of these.
-//
+/* A Wait Queue. Only the VCB has one of these. */
 typedef struct _NP_WAIT_QUEUE
 {
     LIST_ENTRY WaitList;
@@ -176,9 +162,7 @@
     KSPIN_LOCK WaitLock;
 } NP_WAIT_QUEUE, *PNP_WAIT_QUEUE;
 
-//
-// The Entries in the Queue above, one for each Waiter.
-//
+/* The Entries in the Queue above, one for each Waiter. */
 typedef struct _NP_WAIT_QUEUE_ENTRY
 {
     PIRP Irp;
@@ -189,17 +173,13 @@
     PFILE_OBJECT FileObject;
 } NP_WAIT_QUEUE_ENTRY, *PNP_WAIT_QUEUE_ENTRY;
 
-//
-// The event buffer in the NonPaged CCB
-//
+/* The event buffer in the NonPaged CCB */
 typedef struct _NP_EVENT_BUFFER
 {
     PKEVENT Event;
 } NP_EVENT_BUFFER, *PNP_EVENT_BUFFER;
 
-//
-// The CCB for the Root DCB
-//
+/* The CCB for the Root DCB */
 typedef struct _NP_ROOT_DCB_CCB
 {
     NODE_TYPE_CODE NodeType;
@@ -207,9 +187,7 @@
     ULONG Unknown2;
 } NP_ROOT_DCB_CCB, *PNP_ROOT_DCB_FCB;
 
-//
-// The header that both FCB and DCB share
-//
+/* The header that both FCB and DCB share */
 typedef struct _NP_CB_HEADER
 {
     NODE_TYPE_CODE NodeType;
@@ -220,9 +198,7 @@
     PSECURITY_DESCRIPTOR SecurityDescriptor;
 } NP_CB_HEADER, *PNP_CB_HEADER;
 
-//
-// The footer that both FCB and DCB share
-//
+/* The footer that both FCB and DCB share */
 typedef struct _NP_CB_FOOTER
 {
     UNICODE_STRING FullName;
@@ -230,19 +206,13 @@
     UNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry;
 } NP_CB_FOOTER;
 
-//
-// A Directory Control Block (DCB)
-//
+/* A Directory Control Block (DCB) */
 typedef struct _NP_DCB
 {
-    //
-    // Common Header
-    //
+    /* Common Header */
     NP_CB_HEADER;
 
-    //
-    // DCB-specific data
-    //
+    /* DCB-specific data */
     LIST_ENTRY NotifyList;
     LIST_ENTRY NotifyList2;
     LIST_ENTRY FcbList;
@@ -250,25 +220,17 @@
     ULONG Pad;
 #endif
 
-    //
-    // Common Footer
-    //
+    /* Common Footer */
     NP_CB_FOOTER;
 } NP_DCB, *PNP_DCB;
 
-//
-// A File Control BLock (FCB)
-//
+/* A File Control BLock (FCB) */
 typedef struct _NP_FCB
 {
-    //
-    // Common Header
-    //
+    /* Common Header */
     NP_CB_HEADER;
 
-    //
-    // FCB-specific fields
-    //
+    /* FCB-specific fields */
     ULONG MaximumInstances;
     USHORT NamedPipeConfiguration;
     USHORT NamedPipeType;
@@ -278,17 +240,13 @@
     PVOID Pad[2];
 #endif
 
-    //
-    // Common Footer
-    //
+    /* Common Footer */
     NP_CB_FOOTER;
 } NP_FCB, *PNP_FCB;
 
 C_ASSERT(FIELD_OFFSET(NP_FCB, PrefixTableEntry) == FIELD_OFFSET(NP_DCB, PrefixTableEntry));
 
-//
-// The nonpaged portion of the CCB
-//
+/* The nonpaged portion of the CCB */
 typedef struct _NP_NONPAGED_CCB
 {
     NODE_TYPE_CODE NodeType;
@@ -296,9 +254,7 @@
     ERESOURCE Lock;
 } NP_NONPAGED_CCB, *PNP_NONPAGED_CCB;
 
-//
-// A Client Control Block (CCB)
-//
+/* A Client Control Block (CCB) */
 typedef struct _NP_CCB
 {
     NODE_TYPE_CODE NodeType;
@@ -317,9 +273,7 @@
     LIST_ENTRY IrpList;
 } NP_CCB, *PNP_CCB;
 
-//
-// A Volume Control Block (VCB)
-//
+/* A Volume Control Block (VCB) */
 typedef struct _NP_VCB
 {
     NODE_TYPE_CODE NodeType;
@@ -333,9 +287,7 @@
 
 extern PNP_VCB NpVcb;
 
-//
-// Defines an alias
-//
+/* Defines an alias */
 typedef struct _NPFS_ALIAS
 {
     struct _NPFS_ALIAS *Next;
@@ -343,9 +295,7 @@
     UNICODE_STRING Name;
 } NPFS_ALIAS, *PNPFS_ALIAS;
 
-//
-// Private structure used to enumerate the alias values
-//
+/* Private structure used to enumerate the alias values */
 typedef struct _NPFS_QUERY_VALUE_CONTEXT
 {
     BOOLEAN SizeOnly;
@@ -360,9 +310,7 @@
 extern PNPFS_ALIAS NpAliasList;
 extern PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH];
 
-//
-// This structure is actually a user-mode structure and should go into a share header
-//
+/* This structure is actually a user-mode structure and should go into a share header */
 typedef struct _NP_CLIENT_PROCESS
 {
     PVOID Unknown;
@@ -371,12 +319,10 @@
     WCHAR Buffer[17];
 } NP_CLIENT_PROCESS, *PNP_CLIENT_PROCESS;
 
-
 /* FUNCTIONS ******************************************************************/
 
-//
-// Functions to lock/unlock the global VCB lock
-//
+/* Functions to lock/unlock the global VCB lock */
+
 FORCEINLINE
 VOID
 NpAcquireSharedVcb(VOID)
@@ -401,8 +347,6 @@
     ExReleaseResourceLite(&NpVcb->Lock);
 }
 
-
-
 //
 // Function to process deferred IRPs outside the VCB lock but still within the
 // critical region
@@ -445,7 +389,6 @@
 NTAPI
 NpInitializeWaitQueue(IN PNP_WAIT_QUEUE WaitQueue);
 
-
 NTSTATUS
 NTAPI
 NpUninitializeDataQueue(IN PNP_DATA_QUEUE DataQueue);
@@ -541,7 +484,6 @@
 NpFsdClose(IN PDEVICE_OBJECT DeviceObject,
                      IN PIRP Irp);
 
-
 NTSTATUS
 NTAPI
 NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject,
@@ -564,7 +506,6 @@
                         IN PIRP Irp,
                         IN PLIST_ENTRY List);
 
-
 NTSTATUS
 NTAPI
 NpSetDisconnectedPipeState(IN PNP_CCB Ccb,
@@ -751,4 +692,4 @@
 NpFsdQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject,
                             IN PIRP Irp);
 
-/* EOF */
+#endif /* _NPFS_PCH_ */
Index: drivers/filesystems/npfs/main.c
===================================================================
--- drivers/filesystems/npfs/main.c	(rÃ©vision 61927)
+++ drivers/filesystems/npfs/main.c	(copie de travail)
@@ -330,7 +330,7 @@
     NTSTATUS Status;
     UNREFERENCED_PARAMETER(RegistryPath);
 
-    DPRINT1("Next-Generation NPFS-Advanced\n");
+    DPRINT("Next-Generation NPFS-Advanced\n");
 
     Status = NpInitializeAliases();
     if (!NT_SUCCESS(Status))
Index: drivers/filters/mountmgr/CMakeLists.txt
===================================================================
--- drivers/filters/mountmgr/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/filters/mountmgr/CMakeLists.txt	(copie de travail)
@@ -7,12 +7,12 @@
     point.c
     symlink.c
     uniqueid.c
-    mountmgr.rc)
+    mntmgr.h)
 
-add_library(mountmgr SHARED ${SOURCE})
+add_library(mountmgr SHARED ${SOURCE} mountmgr.rc)
 target_link_libraries(mountmgr wdmguid ioevent)
 set_module_type(mountmgr kernelmodedriver)
 add_importlibs(mountmgr ntoskrnl hal)
-add_pch(mountmgr mntmgr.h)
+add_pch(mountmgr mntmgr.h SOURCE)
 add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)
 
Index: drivers/base/bootvid/precomp.h
===================================================================
--- drivers/base/bootvid/precomp.h	(rÃ©vision 61927)
+++ drivers/base/bootvid/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _BOOTVID_PCH_
+#define _BOOTVID_PCH_
+
 #include <wdm.h>
 #include <drivers/bootvid/bootvid.h>
 
@@ -41,3 +44,5 @@
 extern ULONG_PTR VgaRegisterBase;
 extern ULONG_PTR VgaBase;
 extern UCHAR FontData[256 * BOOTCHAR_HEIGHT];
+
+#endif /* _BOOTVID_PCH_ */
Index: drivers/base/bootvid/CMakeLists.txt
===================================================================
--- drivers/base/bootvid/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/base/bootvid/CMakeLists.txt	(copie de travail)
@@ -1,29 +1,30 @@
 
 spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB)
 
-list(APPEND SOURCE
+if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64"))
+    list(APPEND SOURCE
+        i386/bootvid.c
+        i386/bootdata.c
+        i386/vga.c)
+elseif(ARCH STREQUAL "arm")
+    list(APPEND SOURCE
+        arm/bootvid.c
+        arm/bootdata.c)
+endif()
+
+list(APPEND SOURCE precomp.h)
+
+add_library(bootvid SHARED
+    ${SOURCE}
     bootvid.rc
     ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def)
 
-if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
-list(APPEND SOURCE
-    i386/bootvid.c
-    i386/bootdata.c
-    i386/vga.c)
-elseif(ARCH STREQUAL "arm")
-list(APPEND SOURCE
-    arm/bootvid.c
-    arm/bootdata.c)
-endif(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
-
-add_library(bootvid SHARED ${SOURCE})
-
 set_entrypoint(bootvid 0)
 set_subsystem(bootvid native)
 set_image_base(bootvid 0x00010000)
 
 add_importlibs(bootvid ntoskrnl hal)
-add_pch(bootvid precomp.h)
+add_pch(bootvid precomp.h SOURCE)
 add_dependencies(bootvid psdk bugcodes)
 add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all)
 
Index: drivers/base/condrv/CMakeLists.txt
===================================================================
--- drivers/base/condrv/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/base/condrv/CMakeLists.txt	(copie de travail)
@@ -3,13 +3,17 @@
 
 ## spec2def(condrv.sys condrv.spec ADD_IMPORTLIB)
 
-add_library(condrv SHARED
+list(APPEND SOURCE
     condrv.c
     control.c
+    condrv.h)
+
+add_library(condrv SHARED
+    ${SOURCE}
     condrv.rc)
     # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def)
 
-add_pch(condrv condrv.h)
+add_pch(condrv condrv.h SOURCE)
 
 set_module_type(condrv kernelmodedriver)
 target_link_libraries(condrv ${PSEH_LIB})
Index: drivers/base/kdcom/CMakeLists.txt
===================================================================
--- drivers/base/kdcom/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/base/kdcom/CMakeLists.txt	(copie de travail)
@@ -1,10 +1,14 @@
 
 spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB)
 
-add_library(kdcom SHARED
+list(APPEND SOURCE
     kdcom.c
     kddll.c
     kdserial.c
+    kddll.h)
+
+add_library(kdcom SHARED
+    ${SOURCE}
     kdcom.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def)
 
@@ -15,5 +19,5 @@
 add_importlibs(kdcom ntoskrnl hal)
 target_link_libraries(kdcom cportlib)
 add_dependencies(kdcom psdk bugcodes)
-
+add_pch(kdcom kddll.h SOURCE)
 add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all)
Index: drivers/base/kdcom/kddll.h
===================================================================
--- drivers/base/kdcom/kddll.h	(rÃ©vision 61927)
+++ drivers/base/kdcom/kddll.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Timo Kreuzer (timo.kreuzer@ewactos.org)
  */
 
+#ifndef _KDDLL_H_
+#define _KDDLL_H_
+
 #define NOEXTAPI
 #include <ntifs.h>
 #include <windbgkd.h>
@@ -61,4 +64,4 @@
 NTAPI
 KdpPollBreakIn(VOID);
 
-/* EOF */
+#endif /* _KDDLL_H_ */
Index: drivers/serial/serenum/detect.c
===================================================================
--- drivers/serial/serenum/detect.c	(rÃ©vision 61927)
+++ drivers/serial/serenum/detect.c	(copie de travail)
@@ -11,6 +11,8 @@
 
 #include "serenum.h"
 
+#include <debug.h>
+
 static NTSTATUS
 DeviceIoControl(
 	IN PDEVICE_OBJECT DeviceObject,
Index: drivers/serial/serenum/fdo.c
===================================================================
--- drivers/serial/serenum/fdo.c	(rÃ©vision 61927)
+++ drivers/serial/serenum/fdo.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serenum.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerenumAddDevice(
 	IN PDRIVER_OBJECT DriverObject,
Index: drivers/serial/serenum/misc.c
===================================================================
--- drivers/serial/serenum/misc.c	(rÃ©vision 61927)
+++ drivers/serial/serenum/misc.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serenum.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 /* I really want PCSZ strings as last arguments because
Index: drivers/serial/serenum/CMakeLists.txt
===================================================================
--- drivers/serial/serenum/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/serial/serenum/CMakeLists.txt	(copie de travail)
@@ -1,13 +1,18 @@
 
-add_library(serenum SHARED
+list(APPEND SOURCE
     detect.c
     fdo.c
     misc.c
     pdo.c
     serenum.c
+    serenum.h)
+
+add_library(serenum SHARED
+    ${SOURCE}
+    guid.c
     serenum.rc)
 
-add_pch(serenum serenum.h)
+add_pch(serenum serenum.h SOURCE)
 set_module_type(serenum kernelmodedriver)
 add_importlibs(serenum ntoskrnl hal)
 add_cd_file(TARGET serenum DESTINATION reactos/system32/drivers FOR all)
Index: drivers/serial/serenum/serenum.c
===================================================================
--- drivers/serial/serenum/serenum.c	(rÃ©vision 61927)
+++ drivers/serial/serenum/serenum.c	(copie de travail)
@@ -7,9 +7,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "serenum.h"
 
+#include <debug.h>
+
 static DRIVER_DISPATCH SerenumPnp;
 static DRIVER_DISPATCH IrpStub;
 static DRIVER_UNLOAD DriverUnload;
Index: drivers/serial/serenum/pdo.c
===================================================================
--- drivers/serial/serenum/pdo.c	(rÃ©vision 61927)
+++ drivers/serial/serenum/pdo.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serenum.h"
 
+#include <debug.h>
+
 static NTSTATUS
 SerenumPdoStartDevice(
 	IN PDEVICE_OBJECT DeviceObject)
Index: drivers/serial/serenum/serenum.h
===================================================================
--- drivers/serial/serenum/serenum.h	(rÃ©vision 61927)
+++ drivers/serial/serenum/serenum.h	(copie de travail)
@@ -7,12 +7,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#ifndef _SERENUM_PCH_
+#define _SERENUM_PCH_
+
 #include <ntifs.h>
-#include <ntddk.h>
 #include <ntddser.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <debug.h>
 
 typedef enum
 {
@@ -128,3 +127,5 @@
 DriverEntry(
 	IN PDRIVER_OBJECT DriverObject,
 	IN PUNICODE_STRING RegPath);
+
+#endif /* _SERENUM_PCH_ */
Index: drivers/serial/serenum/guid.c
===================================================================
--- drivers/serial/serenum/guid.c	(rÃ©vision 0)
+++ drivers/serial/serenum/guid.c	(rÃ©vision 62573)
@@ -0,0 +1,7 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <initguid.h>
+#include <ntddser.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modification de propriÃ©tÃ©s sur drivers/serial/serenum/guid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: drivers/serial/serial/create.c
===================================================================
--- drivers/serial/serial/create.c	(rÃ©vision 61927)
+++ drivers/serial/serial/create.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCreate(
 	IN PDEVICE_OBJECT DeviceObject,
Index: drivers/serial/serial/devctrl.c
===================================================================
--- drivers/serial/serial/devctrl.c	(rÃ©vision 61927)
+++ drivers/serial/serial/devctrl.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
 
 static VOID
Index: drivers/serial/serial/legacy.c
===================================================================
--- drivers/serial/serial/legacy.c	(rÃ©vision 61927)
+++ drivers/serial/serial/legacy.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 UART_TYPE
 SerialDetectUartType(
 	IN PUCHAR BaseAddress)
Index: drivers/serial/serial/serial.h
===================================================================
--- drivers/serial/serial/serial.h	(rÃ©vision 61927)
+++ drivers/serial/serial/serial.h	(copie de travail)
@@ -7,11 +7,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#ifndef _SERIAL_PCH_
+#define _SERIAL_PCH_
+
 #include <ntddk.h>
-#include <ndk/haltypes.h>
 #include <ntddser.h>
-#include <stdio.h>
-#include <debug.h>
 
 /* See winbase.h */
 #define PST_RS232 1
@@ -300,3 +300,5 @@
 
 DRIVER_DISPATCH SerialRead;
 DRIVER_DISPATCH SerialWrite;
+
+#endif /* _SERIAL_PCH_ */
Index: drivers/serial/serial/close.c
===================================================================
--- drivers/serial/serial/close.c	(rÃ©vision 61927)
+++ drivers/serial/serial/close.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialClose(
 	IN PDEVICE_OBJECT DeviceObject,
Index: drivers/serial/serial/cleanup.c
===================================================================
--- drivers/serial/serial/cleanup.c	(rÃ©vision 61927)
+++ drivers/serial/serial/cleanup.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCleanup(
 	IN PDEVICE_OBJECT DeviceObject,
Index: drivers/serial/serial/rw.c
===================================================================
--- drivers/serial/serial/rw.c	(rÃ©vision 61927)
+++ drivers/serial/serial/rw.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_WORKITEM_ROUTINE SerialReadWorkItem;
 
 static PVOID
Index: drivers/serial/serial/info.c
===================================================================
--- drivers/serial/serial/info.c	(rÃ©vision 61927)
+++ drivers/serial/serial/info.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialQueryInformation(
 	IN PDEVICE_OBJECT DeviceObject,
Index: drivers/serial/serial/misc.c
===================================================================
--- drivers/serial/serial/misc.c	(rÃ©vision 61927)
+++ drivers/serial/serial/misc.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI
Index: drivers/serial/serial/CMakeLists.txt
===================================================================
--- drivers/serial/serial/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/serial/serial/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-add_library(serial SHARED
+list(APPEND SOURCE
     circularbuffer.c
     cleanup.c
     close.c
@@ -12,9 +12,14 @@
     power.c
     rw.c
     serial.c
+    serial.h)
+
+add_library(serial SHARED
+    ${SOURCE}
+    guid.c
     serial.rc)
 
-add_pch(serial serial.h)
 set_module_type(serial kernelmodedriver)
 add_importlibs(serial ntoskrnl hal)
+add_pch(serial serial.h SOURCE)
 add_cd_file(TARGET serial DESTINATION reactos/system32/drivers FOR all)
Index: drivers/serial/serial/power.c
===================================================================
--- drivers/serial/serial/power.c	(rÃ©vision 61927)
+++ drivers/serial/serial/power.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialPower(
 	IN PDEVICE_OBJECT DeviceObject,
Index: drivers/serial/serial/pnp.c
===================================================================
--- drivers/serial/serial/pnp.c	(rÃ©vision 61927)
+++ drivers/serial/serial/pnp.c	(copie de travail)
@@ -8,9 +8,12 @@
  */
 /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */
 
-#define INITGUID
 #include "serial.h"
 
+#include <stdio.h>
+#include <ndk/haltypes.h>
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialAddDeviceInternal(
 	IN PDRIVER_OBJECT DriverObject,
Index: drivers/serial/serial/circularbuffer.c
===================================================================
--- drivers/serial/serial/circularbuffer.c	(rÃ©vision 61927)
+++ drivers/serial/serial/circularbuffer.c	(copie de travail)
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS
 InitializeCircularBuffer(
 	IN PCIRCULAR_BUFFER pBuffer,
Index: drivers/serial/serial/guid.c
===================================================================
--- drivers/serial/serial/guid.c	(rÃ©vision 0)
+++ drivers/serial/serial/guid.c	(rÃ©vision 62573)
@@ -0,0 +1,7 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <initguid.h>
+#include <ntddser.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modification de propriÃ©tÃ©s sur drivers/serial/serial/guid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: drivers/ksfilter/ks/precomp.h
===================================================================
--- drivers/ksfilter/ks/precomp.h	(rÃ©vision 61927)
+++ drivers/ksfilter/ks/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _KS_PCH_
+#define _KS_PCH_
+
 #define _KSDDK_
 
 #include <ntddk.h>
@@ -45,3 +48,5 @@
     DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\
     DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\
 }
+
+#endif /* _KS_PCH_ */
Index: drivers/ksfilter/ks/property.c
===================================================================
--- drivers/ksfilter/ks/property.c	(rÃ©vision 61927)
+++ drivers/ksfilter/ks/property.c	(copie de travail)
@@ -8,6 +8,9 @@
 
 #include "precomp.h"
 
+/* SEH support with PSEH */
+#include <pseh/pseh2.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -280,8 +283,16 @@
             KSPROPERTY_ITEM_IRP_STORAGE(Irp) = PropertyItem;
         }
 
-        /* call property handler */
-        Status = PropertyHandler(Irp, Property, (OutputBufferLength > 0 ? Irp->AssociatedIrp.SystemBuffer : NULL));
+        _SEH2_TRY
+        {
+            /* call property handler */
+            Status = PropertyHandler(Irp, Property, (OutputBufferLength > 0 ? Irp->AssociatedIrp.SystemBuffer : NULL));
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            _SEH2_YIELD(return _SEH2_GetExceptionCode());
+        }
+        _SEH2_END;
 
         if (Status == STATUS_BUFFER_TOO_SMALL)
         {
@@ -297,9 +308,16 @@
                     /* no memory */
                     return STATUS_INSUFFICIENT_RESOURCES;
                 }
-
-                /* re-call property handler */
-                Status = PropertyHandler(Irp, Property, Irp->AssociatedIrp.SystemBuffer);
+                _SEH2_TRY
+                {
+                    /* re-call property handler */
+                    Status = PropertyHandler(Irp, Property, Irp->AssociatedIrp.SystemBuffer);
+                }
+                _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+                {
+                    Status =  _SEH2_GetExceptionCode();
+                }
+                _SEH2_END;
             }
         }
     }
Index: drivers/ksfilter/ks/CMakeLists.txt
===================================================================
--- drivers/ksfilter/ks/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/ksfilter/ks/CMakeLists.txt	(copie de travail)
@@ -28,14 +28,17 @@
     worker.c
     kcom.c
     swenum.c
-    ks.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/ks.def)
+    precomp.h)
 
 if(MSVC)
     add_asm_files(ks_asm msvc.S)
 endif()
 
-add_library(ks SHARED ${SOURCE} ${ks_asm})
+add_library(ks SHARED
+    ${SOURCE}
+    ${ks_asm}
+    ks.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/ks.def)
 
 set_target_properties(ks PROPERTIES SUFFIX ".sys")
 
@@ -44,7 +47,7 @@
 set_image_base(ks 0x00010000)
 
 target_link_libraries(ks ${PSEH_LIB})
-add_pch(ks priv.h)
+add_pch(ks precomp.h SOURCE)
 add_importlibs(ks ntoskrnl hal)
 add_dependencies(ks psdk bugcodes)
 add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all)
Index: drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt
===================================================================
--- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt	(copie de travail)
@@ -12,13 +12,15 @@
     adapter.cpp
     common.cpp
     mintopo.cpp
-    minwave.cpp)
+    minwave.cpp
+    precomp.h)
 
 add_library(cmipci SHARED
     ${SOURCE}
+    guid.cpp
     cmipci.rc)
 
-target_link_libraries(cmipci stdunk libcntpr)
+target_link_libraries(cmipci stdunk libcntpr uuid)
 
 set_module_type(cmipci wdmdriver UNICODE)
 
@@ -31,6 +33,7 @@
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-write-strings -Wno-switch -Wno-error")
 endif()
 
+add_pch(cmipci precomp.h SOURCE)
 add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all)
 if(ARCH STREQUAL "i386")
     add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x32.inf" DESTINATION reactos/inf FOR all)
Index: drivers/wdm/audio/drivers/CMIDriver/guid.cpp
===================================================================
--- drivers/wdm/audio/drivers/CMIDriver/guid.cpp	(rÃ©vision 0)
+++ drivers/wdm/audio/drivers/CMIDriver/guid.cpp	(rÃ©vision 62573)
@@ -0,0 +1,9 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <wdm.h>
+#include <ks.h>
+#include <punknown.h>
+#include <initguid.h>
+#include "interfaces.hpp"
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modification de propriÃ©tÃ©s sur drivers/wdm/audio/drivers/CMIDriver/guid.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: drivers/wdm/audio/drivers/CMIDriver/precomp.h
===================================================================
--- drivers/wdm/audio/drivers/CMIDriver/precomp.h	(rÃ©vision 0)
+++ drivers/wdm/audio/drivers/CMIDriver/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,9 @@
+#ifndef _CMIDRIVER_PCH_
+#define _CMIDRIVER_PCH_
+
+#include <wdm.h>
+#include <portcls.h>
+
+#include "debug.hpp"
+
+#endif /* _CMIDRIVER_PCH_ */

Modification de propriÃ©tÃ©s sur drivers/wdm/audio/drivers/CMIDriver/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: drivers/wdm/audio/sysaudio/CMakeLists.txt
===================================================================
--- drivers/wdm/audio/sysaudio/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/wdm/audio/sysaudio/CMakeLists.txt	(copie de travail)
@@ -1,16 +1,17 @@
 
 add_definitions(-D_COMDDK_)
 
-add_library(sysaudio SHARED
+list(APPEND SOURCE
     control.c
     deviface.c
     dispatcher.c
     main.c
     pin.c
-    sysaudio.rc)
+    sysaudio.h)
 
-add_pch(sysaudio sysaudio.h)
+add_library(sysaudio SHARED ${SOURCE} sysaudio.rc)
 set_module_type(sysaudio kernelmodedriver)
 target_link_libraries(sysaudio libcntpr)
 add_importlibs(sysaudio ntoskrnl ks hal)
+add_pch(sysaudio sysaudio.h SOURCE)
 add_cd_file(TARGET sysaudio DESTINATION reactos/system32/drivers FOR all)
Index: drivers/wdm/audio/sysaudio/sysaudio.h
===================================================================
--- drivers/wdm/audio/sysaudio/sysaudio.h	(rÃ©vision 61927)
+++ drivers/wdm/audio/sysaudio/sysaudio.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SYSAUDIO_PCH_
+#define _SYSAUDIO_PCH_
+
 #include <portcls.h>
 
 typedef struct
@@ -116,3 +119,4 @@
 FreeItem(
     IN PVOID Item);
 
+#endif /* _SYSAUDIO_PCH_ */
Index: drivers/wdm/audio/sysaudio/deviface.c
===================================================================
--- drivers/wdm/audio/sysaudio/deviface.c	(rÃ©vision 61927)
+++ drivers/wdm/audio/sysaudio/deviface.c	(copie de travail)
@@ -265,4 +265,3 @@
 
     return Status;
 }
-
Index: drivers/wdm/audio/legacy/wdmaud/deviface.c
===================================================================
--- drivers/wdm/audio/legacy/wdmaud/deviface.c	(rÃ©vision 61927)
+++ drivers/wdm/audio/legacy/wdmaud/deviface.c	(copie de travail)
@@ -260,6 +260,3 @@
     /* done */
     return STATUS_SUCCESS;
 }
-
-
-
Index: drivers/wdm/audio/legacy/wdmaud/wdmaud.h
===================================================================
--- drivers/wdm/audio/legacy/wdmaud/wdmaud.h	(rÃ©vision 61927)
+++ drivers/wdm/audio/legacy/wdmaud/wdmaud.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _WDMAUD_PCH_
+#define _WDMAUD_PCH_
+
 #include <portcls.h>
 #include <mmsystem.h>
 
@@ -309,3 +312,4 @@
 FreeItem(
     IN PVOID Item);
 
+#endif /* _WDMAUD_PCH_ */
Index: drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
===================================================================
--- drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt	(copie de travail)
@@ -5,21 +5,21 @@
     ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer
     ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
-add_library(wdmaud SHARED
+list(APPEND SOURCE
     control.c
     deviface.c
     entry.c
     mmixer.c
     sup.c
-    wdmaud.rc)
+    wdmaud.h)
 
+add_library(wdmaud SHARED ${SOURCE} wdmaud.rc)
 set_module_type(wdmaud kernelmodedriver)
 
 target_link_libraries(wdmaud
     mmixer
-    libcntpr
-    ${PSEH_LIB})
+    libcntpr)
 
-add_pch(wdmaud wdmaud.h)
+add_pch(wdmaud wdmaud.h SOURCE)
 add_importlibs(wdmaud ntoskrnl ks hal)
 add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers FOR all)
Index: drivers/wdm/audio/legacy/wdmaud/mmixer.c
===================================================================
--- drivers/wdm/audio/legacy/wdmaud/mmixer.c	(rÃ©vision 61927)
+++ drivers/wdm/audio/legacy/wdmaud/mmixer.c	(copie de travail)
@@ -804,4 +804,3 @@
     else
         return SetIrpIoStatus(Irp, STATUS_NOT_SUPPORTED, sizeof(WDMAUD_DEVICE_INFO));
 }
-
Index: drivers/wdm/audio/filters/kmixer/kmixer.h
===================================================================
--- drivers/wdm/audio/filters/kmixer/kmixer.h	(rÃ©vision 61927)
+++ drivers/wdm/audio/filters/kmixer/kmixer.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _KMIXER_PCH_
+#define _KMIXER_PCH_
+
 #include <portcls.h>
 #include <float_cast.h>
 
@@ -29,3 +32,5 @@
 #define KeSaveFloatingPointState(x) ((void)(x), STATUS_SUCCESS)
 #define KeRestoreFloatingPointState(x) ((void)0)
 #endif
+
+#endif /* _KMIXER_PCH_ */
Index: drivers/wdm/audio/filters/kmixer/CMakeLists.txt
===================================================================
--- drivers/wdm/audio/filters/kmixer/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/wdm/audio/filters/kmixer/CMakeLists.txt	(copie de travail)
@@ -1,11 +1,13 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
 
-add_library(kmixer SHARED
+list(APPEND SOURCE
     kmixer.c
     filter.c
-    pin.c)
+    pin.c
+    kmixer.h)
 
+add_library(kmixer SHARED ${SOURCE})
 set_module_type(kmixer kernelmodedriver)
 
 target_link_libraries(kmixer
@@ -12,6 +14,6 @@
     libcntpr
     libsamplerate)
 
-add_pch(kmixer kmixer.h)
+add_pch(kmixer kmixer.h SOURCE)
 add_importlibs(kmixer ntoskrnl ks hal)
 add_cd_file(TARGET kmixer DESTINATION reactos/system32/drivers FOR all)
Index: drivers/wdm/audio/backpln/portcls/CMakeLists.txt
===================================================================
--- drivers/wdm/audio/backpln/portcls/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/wdm/audio/backpln/portcls/CMakeLists.txt	(copie de travail)
@@ -47,12 +47,13 @@
     undoc.cpp
     unregister.cpp
     version.cpp
-    guid.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/portcls.def)
+    private.hpp)
 
 add_library(portcls SHARED
     ${SOURCE}
-    portcls.rc)
+    guid.cpp
+    portcls.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/portcls.def)
 
 target_link_libraries(portcls
     libcntpr
@@ -59,6 +60,6 @@
     ${PSEH_LIB})
 
 set_module_type(portcls kernelmodedriver ENTRYPOINT 0 )
-add_pch(portcls private.hpp)
+add_pch(portcls private.hpp SOURCE)
 add_importlibs(portcls ntoskrnl ks drmk hal)
 add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all)
Index: drivers/usb/usbccgp/misc.c
===================================================================
--- drivers/usb/usbccgp/misc.c	(rÃ©vision 61927)
+++ drivers/usb/usbccgp/misc.c	(copie de travail)
@@ -190,4 +190,4 @@
             DPRINT1(" Index %lu iInterface %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->iInterface);
         }
     }
-}
\ No newline at end of file
+}
Index: drivers/usb/usbccgp/usbccgp.h
===================================================================
--- drivers/usb/usbccgp/usbccgp.h	(rÃ©vision 61927)
+++ drivers/usb/usbccgp/usbccgp.h	(copie de travail)
@@ -1,14 +1,11 @@
 #ifndef USBEHCI_H__
 #define USBEHCI_H__
 
-#include <ntddk.h>
+#include <wdm.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbdlib.h>
 
-/* FIXME:
-#include <usbprotocoldefs.h> */
-
 #include <stdio.h>
 
 typedef struct
@@ -151,4 +148,4 @@
 USBCCGP_EnumerateFunctions(
     IN PDEVICE_OBJECT DeviceObject);
 
-#endif
+#endif /* USBEHCI_H__ */
Index: drivers/usb/usbccgp/CMakeLists.txt
===================================================================
--- drivers/usb/usbccgp/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/usb/usbccgp/CMakeLists.txt	(copie de travail)
@@ -6,11 +6,23 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c guid.c usbccgp.rc)
+list(APPEND SOURCE
+    descriptor.c
+    fdo.c
+    function.c
+    misc.c
+    pdo.c
+    usbccgp.c
+    usbccgp.h)
 
+add_library(usbccgp SHARED
+    ${SOURCE}
+    guid.c
+    usbccgp.rc)
+
 target_link_libraries(usbccgp ${PSEH_LIB})
 
 set_module_type(usbccgp kernelmodedriver)
 add_importlibs(usbccgp ntoskrnl hal usbd)
-
+add_pch(usbccgp usbccgp.h SOURCE)
 add_cd_file(TARGET usbccgp DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/usb/usbccgp/descriptor.c
===================================================================
--- drivers/usb/usbccgp/descriptor.c	(rÃ©vision 61927)
+++ drivers/usb/usbccgp/descriptor.c	(copie de travail)
@@ -545,4 +545,3 @@
     //
     return Status;
 }
-
Index: drivers/usb/usbccgp/pdo.c
===================================================================
--- drivers/usb/usbccgp/pdo.c	(rÃ©vision 61927)
+++ drivers/usb/usbccgp/pdo.c	(copie de travail)
@@ -11,6 +11,8 @@
 
 #include "usbccgp.h"
 
+#include <ntddk.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -755,7 +757,6 @@
             // invalid parameter
             //
             DPRINT1("InterfaceInformation InterfaceNumber %x Alternative %x NumberOfPipes %x not found\n", InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting, InterfaceInformation->NumberOfPipes);
-            ASSERT(FALSE);
             return STATUS_INVALID_PARAMETER;
         }
 
Index: drivers/usb/usbhub/fdo.c
===================================================================
--- drivers/usb/usbhub/fdo.c	(rÃ©vision 61927)
+++ drivers/usb/usbhub/fdo.c	(copie de travail)
@@ -849,6 +849,12 @@
     // use first interface descriptor available
     //
     InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, 0, -1, -1, -1, -1);
+    if (InterfaceDescriptor == NULL)
+    {
+         DPRINT1("Error USBD_ParseConfigurationDescriptorEx failed to parse interface descriptor\n");
+         return STATUS_INVALID_PARAMETER;
+    }
+
     ASSERT(InterfaceDescriptor);
 
     //
Index: drivers/usb/usbhub/CMakeLists.txt
===================================================================
--- drivers/usb/usbhub/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/usb/usbhub/CMakeLists.txt	(copie de travail)
@@ -3,11 +3,22 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c guid.c usbhub.rc)
+list(APPEND SOURCE
+    fdo.c
+    hub_fdo.c
+    misc.c
+    pdo.c
+    usbhub.c
+    usbhub.h)
 
+add_library(usbhub SHARED
+    ${SOURCE}
+    guid.c
+    usbhub.rc)
+
 target_link_libraries(usbhub ${PSEH_LIB})
 
 set_module_type(usbhub kernelmodedriver)
 add_importlibs(usbhub ntoskrnl hal usbd)
-
+add_pch(usbhub usbhub.h SOURCE)
 add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/usb/usbhub/usbhub.h
===================================================================
--- drivers/usb/usbhub/usbhub.h	(rÃ©vision 61927)
+++ drivers/usb/usbhub/usbhub.h	(copie de travail)
@@ -1,12 +1,11 @@
-#pragma once
+#ifndef _USBHUB_H_
+#define _USBHUB_H_
 
-#include <ntddk.h>
+#include <wdm.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbdlib.h>
 
-//BROKEN: #include <usbprotocoldefs.h>
-
 #define USB_HUB_TAG 'hbsu'
 #define USB_MAXCHILDREN 127
 
@@ -187,3 +186,5 @@
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp);
+
+#endif /* _USBHUB_H_ */
Index: drivers/usb/usbhub
===================================================================
--- drivers/usb/usbhub	(rÃ©vision 61927)
+++ drivers/usb/usbhub	(copie de travail)

Modification de propriÃ©tÃ©s sur drivers/usb/usbhub
___________________________________________________________________
Modified: svn:mergeinfo
   FusionnÃ© /trunk/reactos/drivers/usb/usbhub:r61927-62283
Index: drivers/usb/usbohci/hardware.h
===================================================================
--- drivers/usb/usbohci/hardware.h	(rÃ©vision 61927)
+++ drivers/usb/usbohci/hardware.h	(copie de travail)
@@ -345,4 +345,3 @@
 #define OHCI_ITD_SET_FRAME_COUNT(x)             (((x) - 1) << 24)
 #define OHCI_ITD_GET_CONDITION_CODE(x)          ((x) >> 28)
 #define OHCI_ITD_NO_CONDITION_CODE              0xf0000000
-
Index: drivers/usb/usbohci/guid.cpp
===================================================================
--- drivers/usb/usbohci/guid.cpp	(rÃ©vision 61927)
+++ drivers/usb/usbohci/guid.cpp	(copie de travail)
@@ -1,6 +1,9 @@
 /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
 
+#include <wdm.h>
 #include <initguid.h>
-#include <libusb.h>
+#include <wdmguid.h>
+#include <hubbusif.h>
+#include <usbbusif.h>
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Index: drivers/usb/usbohci/CMakeLists.txt
===================================================================
--- drivers/usb/usbohci/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/usb/usbohci/CMakeLists.txt	(copie de travail)
@@ -11,13 +11,15 @@
     usb_request.cpp
     usb_queue.cpp
     hardware.cpp
-    guid.cpp)
+    usbohci.h)
 
 add_library(usbohci SHARED
     ${SOURCE}
+    guid.cpp
     usbohci.rc)
 
 target_link_libraries(usbohci
+    uuid
     libusb
     libcntpr
     ${PSEH_LIB})
@@ -24,5 +26,5 @@
 
 set_module_type(usbohci kernelmodedriver)
 add_importlibs(usbohci ntoskrnl hal usbd)
-
+add_pch(usbohci usbohci.h SOURCE)
 add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/usb/usbohci
===================================================================
--- drivers/usb/usbohci	(rÃ©vision 61927)
+++ drivers/usb/usbohci	(copie de travail)

Modification de propriÃ©tÃ©s sur drivers/usb/usbohci
___________________________________________________________________
Modified: svn:mergeinfo
   FusionnÃ© /trunk/reactos/drivers/usb/usbohci:r61927-62283
Index: drivers/usb/usbd/usbd.c
===================================================================
--- drivers/usb/usbd/usbd.c	(rÃ©vision 61927)
+++ drivers/usb/usbd/usbd.c	(copie de travail)
@@ -17,7 +17,7 @@
  * Notes:
  *    This driver was obsoleted in Windows XP and most functions
  *    became pure stubs. But some of them were retained for backward
- *    compatibilty with existing drivers.
+ *    compatibility with existing drivers.
  *
  *    Preserved functions:
  *
Index: drivers/usb/usbstor/CMakeLists.txt
===================================================================
--- drivers/usb/usbstor/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/usb/usbstor/CMakeLists.txt	(copie de travail)
@@ -3,9 +3,24 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c guid.c usbstor.rc)
+list(APPEND SOURCE
+    descriptor.c
+    disk.c
+    fdo.c
+    misc.c
+    pdo.c
+    queue.c
+    error.c
+    scsi.c
+    usbstor.c
+    usbstor.h)
 
+add_library(usbstor SHARED
+    ${SOURCE}
+    guid.c
+    usbstor.rc)
+
 set_module_type(usbstor kernelmodedriver)
 add_importlibs(usbstor ntoskrnl hal usbd)
-
+add_pch(usbstor usbstor.h SOURCE)
 add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/usb/usbstor/descriptor.c
===================================================================
--- drivers/usb/usbstor/descriptor.c	(rÃ©vision 61927)
+++ drivers/usb/usbstor/descriptor.c	(copie de travail)
@@ -546,4 +546,4 @@
     // device is configured
     //
     return STATUS_SUCCESS;
-}
\ No newline at end of file
+}
Index: drivers/usb/usbstor/usbstor.c
===================================================================
--- drivers/usb/usbstor/usbstor.c	(rÃ©vision 61927)
+++ drivers/usb/usbstor/usbstor.c	(copie de travail)
@@ -293,4 +293,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: drivers/usb/usbstor/usbstor.h
===================================================================
--- drivers/usb/usbstor/usbstor.h	(rÃ©vision 61927)
+++ drivers/usb/usbstor/usbstor.h	(copie de travail)
@@ -1,6 +1,6 @@
+#ifndef _USBSTOR_H_
+#define _USBSTOR_H_
 
-#pragma once
-
 #include <wdm.h>
 #include <usbdi.h>
 #include <usbbusif.h>
@@ -10,8 +10,6 @@
 #define USB_STOR_TAG 'sbsu'
 #define USB_MAXCHILDREN              (16)
 
-
-
 #define HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8))
 #define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8))
 
@@ -549,3 +547,4 @@
     PDEVICE_OBJECT DeviceObject,
      PVOID Context);
 
+#endif /* _USBSTOR_H_ */
Index: drivers/usb/usbstor/misc.c
===================================================================
--- drivers/usb/usbstor/misc.c	(rÃ©vision 61927)
+++ drivers/usb/usbstor/misc.c	(copie de travail)
@@ -517,4 +517,3 @@
     //
     return FALSE;
 }
-
Index: drivers/usb/usbehci/guid.cpp
===================================================================
--- drivers/usb/usbehci/guid.cpp	(rÃ©vision 61927)
+++ drivers/usb/usbehci/guid.cpp	(copie de travail)
@@ -1,6 +1,9 @@
 /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
 
+#include <wdm.h>
 #include <initguid.h>
-#include <libusb.h>
+#include <wdmguid.h>
+#include <hubbusif.h>
+#include <usbbusif.h>
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Index: drivers/usb/usbehci/CMakeLists.txt
===================================================================
--- drivers/usb/usbehci/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/usb/usbehci/CMakeLists.txt	(copie de travail)
@@ -11,13 +11,15 @@
     usb_request.cpp
     usb_queue.cpp
     hardware.cpp
-    guid.cpp)
+    usbehci.h)
 
 add_library(usbehci SHARED
     ${SOURCE}
+    guid.cpp
     usbehci.rc)
 
 target_link_libraries(usbehci
+    uuid
     libusb
     libcntpr
     ${PSEH_LIB})
@@ -24,5 +26,5 @@
 
 set_module_type(usbehci kernelmodedriver)
 add_importlibs(usbehci ntoskrnl hal usbd)
-
+add_pch(usbehci usbehci.h SOURCE)
 add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/usb/usbehci
===================================================================
--- drivers/usb/usbehci	(rÃ©vision 61927)
+++ drivers/usb/usbehci	(copie de travail)

Modification de propriÃ©tÃ©s sur drivers/usb/usbehci
___________________________________________________________________
Modified: svn:mergeinfo
   FusionnÃ© /trunk/reactos/drivers/usb/usbehci:r61927-62283
Index: drivers/usb/usbuhci/usbuhci.h
===================================================================
--- drivers/usb/usbuhci/usbuhci.h	(rÃ©vision 61927)
+++ drivers/usb/usbuhci/usbuhci.h	(copie de travail)
@@ -47,4 +47,4 @@
 //
 NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest);
 
-#endif
+#endif /* USBUHCI_H__ */
Index: drivers/usb/usbuhci/guid.cpp
===================================================================
--- drivers/usb/usbuhci/guid.cpp	(rÃ©vision 61927)
+++ drivers/usb/usbuhci/guid.cpp	(copie de travail)
@@ -1,6 +1,9 @@
 /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
 
+#include <wdm.h>
 #include <initguid.h>
-#include <libusb.h>
+#include <wdmguid.h>
+#include <hubbusif.h>
+#include <usbbusif.h>
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Index: drivers/usb/usbuhci/CMakeLists.txt
===================================================================
--- drivers/usb/usbuhci/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/usb/usbuhci/CMakeLists.txt	(copie de travail)
@@ -12,13 +12,15 @@
     usb_request.cpp
     usb_queue.cpp
     hardware.cpp
-    guid.cpp)
+    usbuhci.h)
 
 add_library(usbuhci SHARED
     ${SOURCE}
+    guid.cpp
     usbuhci.rc)
 
 target_link_libraries(usbuhci
+    uuid
     libusb
     libcntpr
     ${PSEH_LIB})
@@ -25,5 +27,5 @@
 
 set_module_type(usbuhci kernelmodedriver)
 add_importlibs(usbuhci ntoskrnl hal usbd)
-
+add_pch(usbuhci usbuhci.h SOURCE)
 add_cd_file(TARGET usbuhci DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/bus/pcix/pci.h
===================================================================
--- drivers/bus/pcix/pci.h	(rÃ©vision 61927)
+++ drivers/bus/pcix/pci.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
+#ifndef _PCIX_PCH_
+#define _PCIX_PCH_
+
 #include <ntifs.h>
 #include <wdmguid.h>
 #include <wchar.h>
@@ -1822,4 +1825,4 @@
 /* Exported by NTOS, should this go in the NDK? */
 extern NTSYSAPI BOOLEAN InitSafeBootMode;
 
-/* EOF */
+#endif /* _PCIX_PCH_ */
Index: drivers/bus/pcix/CMakeLists.txt
===================================================================
--- drivers/bus/pcix/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/pcix/CMakeLists.txt	(copie de travail)
@@ -26,7 +26,6 @@
     dispatch.c
     enum.c
     fdo.c
-    guid.c
     hookhal.c
     init.c
     pcivrify.c
@@ -34,14 +33,17 @@
     power.c
     usage.c
     utils.c
+    pci.h)
+
+add_library(pcix SHARED
+    ${SOURCE}
+    guid.c
     pci.rc)
 
-add_library(pcix SHARED ${SOURCE})
-
 set_module_type(pcix kernelmodedriver)
 add_importlibs(pcix ntoskrnl hal)
 
-add_pch(pcix pci.h)
+add_pch(pcix pci.h SOURCE)
 add_dependencies(pcix pciclass)
 
 add_cd_file(TARGET pcix DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/bus/isapnp/fdo.c
===================================================================
--- drivers/bus/isapnp/fdo.c	(rÃ©vision 61927)
+++ drivers/bus/isapnp/fdo.c	(copie de travail)
@@ -4,6 +4,7 @@
  * PURPOSE:         FDO-specific code
  * PROGRAMMERS:     Cameron Gutman (cameron.gutman@reactos.org)
  */
+
 #include <isapnp.h>
 
 #define NDEBUG
Index: drivers/bus/isapnp/isapnp.c
===================================================================
--- drivers/bus/isapnp/isapnp.c	(rÃ©vision 61927)
+++ drivers/bus/isapnp/isapnp.c	(copie de travail)
@@ -4,6 +4,7 @@
  * PURPOSE:         Driver entry
  * PROGRAMMERS:     Cameron Gutman (cameron.gutman@reactos.org)
  */
+
 #include <isapnp.h>
 
 #define NDEBUG
Index: drivers/bus/isapnp/CMakeLists.txt
===================================================================
--- drivers/bus/isapnp/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/isapnp/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,13 @@
 
-add_library(isapnp SHARED
+list(APPEND SOURCE
     isapnp.c
     pdo.c
     fdo.c
     hardware.c
-    isapnp.rc)
+    isapnp.h)
 
+add_library(isapnp SHARED ${SOURCE} isapnp.rc)
 set_module_type(isapnp kernelmodedriver)
 add_importlibs(isapnp ntoskrnl hal)
-add_pch(isapnp isapnp.h)
+add_pch(isapnp isapnp.h SOURCE)
 add_cd_file(TARGET isapnp DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/bus/isapnp/hardware.c
===================================================================
--- drivers/bus/isapnp/hardware.c	(rÃ©vision 61927)
+++ drivers/bus/isapnp/hardware.c	(copie de travail)
@@ -4,6 +4,7 @@
  * PURPOSE:         Hardware support code
  * PROGRAMMERS:     Cameron Gutman (cameron.gutman@reactos.org)
  */
+
 #include <isapnp.h>
 #include <isapnphw.h>
 
Index: drivers/bus/isapnp/isapnp.h
===================================================================
--- drivers/bus/isapnp/isapnp.h	(rÃ©vision 61927)
+++ drivers/bus/isapnp/isapnp.h	(copie de travail)
@@ -1,3 +1,5 @@
+#ifndef _ISAPNP_PCH_
+#define _ISAPNP_PCH_
 
 #include <wdm.h>
 
@@ -95,3 +97,5 @@
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* _ISAPNP_PCH_ */
Index: drivers/bus/isapnp/pdo.c
===================================================================
--- drivers/bus/isapnp/pdo.c	(rÃ©vision 61927)
+++ drivers/bus/isapnp/pdo.c	(copie de travail)
@@ -4,6 +4,7 @@
  * PURPOSE:         PDO-specific code
  * PROGRAMMERS:     Cameron Gutman (cameron.gutman@reactos.org)
  */
+
 #include <isapnp.h>
 
 #define NDEBUG
Index: drivers/bus/pci/CMakeLists.txt
===================================================================
--- drivers/bus/pci/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/pci/CMakeLists.txt	(copie de travail)
@@ -1,11 +1,12 @@
 
-add_library(pci SHARED
+list(APPEND SOURCE
     fdo.c
     pci.c
     pdo.c
-    pci.rc)
+    pci.h)
 
+add_library(pci SHARED ${SOURCE} pci.rc)
 set_module_type(pci kernelmodedriver)
 add_importlibs(pci ntoskrnl hal)
-add_pch(pci pci.h)
+add_pch(pci pci.h SOURCE)
 add_cd_file(TARGET pci DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/bus/pci/pci.h
===================================================================
--- drivers/bus/pci/pci.h	(rÃ©vision 61927)
+++ drivers/bus/pci/pci.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _PCI_PCH_
+#define _PCI_PCH_
+
 #include <ntifs.h>
 
 #define TAG_PCI '0ICP'
@@ -174,3 +177,5 @@
 DriverEntry(
     IN PDRIVER_OBJECT DriverObject,
     IN PUNICODE_STRING RegistryPath);
+
+#endif /* _PCI_PCH_ */
Index: drivers/bus/acpi/compbatt/CMakeLists.txt
===================================================================
--- drivers/bus/acpi/compbatt/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/acpi/compbatt/CMakeLists.txt	(copie de travail)
@@ -3,14 +3,16 @@
     compbatt.c
     compmisc.c
     comppnp.c
+    compbatt.h)
+
+add_library(compbatt SHARED
+    ${SOURCE}
     guid.c
     compbatt.rc)
 
-add_library(compbatt SHARED ${SOURCE})
-
 set_module_type(compbatt kernelmodedriver)
 add_importlibs(compbatt ntoskrnl hal battc)
 
-add_pch(compbatt compbatt.h)
+add_pch(compbatt compbatt.h SOURCE)
 
 add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all)
Index: drivers/bus/acpi/compbatt/compbatt.h
===================================================================
--- drivers/bus/acpi/compbatt/compbatt.h	(rÃ©vision 61927)
+++ drivers/bus/acpi/compbatt/compbatt.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
+#ifndef _COMPBATT_PCH_
+#define _COMPBATT_PCH_
+
 #include <wdm.h>
 #include <batclass.h>
 
@@ -149,7 +152,7 @@
     IN ULONG OutputBufferLength,
     IN BOOLEAN InternalDeviceIoControl
 );
-                               
+
 extern ULONG CompBattDebug;
 
-/* EOF */
+#endif /* _COMPBATT_PCH_ */
Index: drivers/bus/acpi/cmbatt/CMakeLists.txt
===================================================================
--- drivers/bus/acpi/cmbatt/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/acpi/cmbatt/CMakeLists.txt	(copie de travail)
@@ -4,15 +4,17 @@
     cmexec.c
     cmbpnp.c
     cmbwmi.c
+    cmbatt.h)
+
+add_library(cmbatt SHARED
+    ${SOURCE}
     guid.c
     cmbatt.rc)
 
-add_library(cmbatt SHARED ${SOURCE})
-
 set_module_type(cmbatt kernelmodedriver)
 add_importlibs(cmbatt ntoskrnl hal battc wmilib)
 
-add_pch(cmbatt cmbatt.h)
+add_pch(cmbatt cmbatt.h SOURCE)
 
 
 add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all)
Index: drivers/bus/acpi/cmbatt/cmbatt.h
===================================================================
--- drivers/bus/acpi/cmbatt/cmbatt.h	(rÃ©vision 61927)
+++ drivers/bus/acpi/cmbatt/cmbatt.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
+#ifndef _CMBATT_PCH_
+#define _CMBATT_PCH_
+
 #include <wdm.h>
 #include <batclass.h>
 #include <wmilib.h>
@@ -276,4 +279,4 @@
 extern PDEVICE_OBJECT AcAdapterPdo;
 extern ULONG CmBattDebug;
 
-/* EOF */
+#endif /* _CMBATT_PCH_ */
Index: drivers/bus/acpi/CMakeLists.txt
===================================================================
--- drivers/bus/acpi/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/acpi/CMakeLists.txt	(copie de travail)
@@ -7,7 +7,7 @@
     add_definitions(-DWIN64)
 endif()
 
-add_library(acpica
+list(APPEND ACPICA_SOURCE
     acpica/dispatcher/dsargs.c
     acpica/dispatcher/dscontrol.c
     acpica/dispatcher/dsfield.c
@@ -40,7 +40,7 @@
     acpica/executer/exconvrt.c
     acpica/executer/excreate.c
     acpica/executer/exdebug.c
-    acpica/executer/exdump.c
+    #acpica/executer/exdump.c
     acpica/executer/exfield.c
     acpica/executer/exfldio.c
     acpica/executer/exmisc.c
@@ -70,8 +70,8 @@
     acpica/hardware/hwxface.c
     acpica/namespace/nsaccess.c
     acpica/namespace/nsalloc.c
-    acpica/namespace/nsdump.c
-    acpica/namespace/nsdumpdv.c
+    #acpica/namespace/nsdump.c
+    #acpica/namespace/nsdumpdv.c
     acpica/namespace/nseval.c
     acpica/namespace/nsinit.c
     acpica/namespace/nsload.c
@@ -99,7 +99,7 @@
     acpica/resources/rsaddr.c
     acpica/resources/rscalc.c
     acpica/resources/rscreate.c
-    acpica/resources/rsdump.c
+    #acpica/resources/rsdump.c
     acpica/resources/rsinfo.c
     acpica/resources/rsio.c
     acpica/resources/rsirq.c
@@ -122,7 +122,6 @@
     acpica/utilities/utdecode.c
     acpica/utilities/utdelete.c
     acpica/utilities/uteval.c
-    acpica/utilities/utglobal.c
     acpica/utilities/utids.c
     acpica/utilities/utinit.c
     acpica/utilities/utlock.c
@@ -135,12 +134,18 @@
     acpica/utilities/utstate.c
     acpica/utilities/uttrack.c
     acpica/utilities/utxface.c
-    acpica/utilities/utxferror.c)
+    acpica/utilities/utxferror.c
+    acpica/include/acpi.h)
 
+add_library(acpica
+    ${ACPICA_SOURCE}
+    acpica/utilities/utglobal.c)
+
+add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE)
 set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE")
 add_dependencies(acpica bugcodes)
 
-add_library(acpi SHARED
+list(APPEND ACPI_SOURCE
     busmgr/bus.c
     busmgr/button.c
     busmgr/power.c
@@ -153,11 +158,14 @@
     pnp.c
     power.c
     buspdo.c
-    main.c)
+    main.c
+    precomp.h)
 
+add_library(acpi SHARED ${ACPI_SOURCE})
 set_module_type(acpi kernelmodedriver)
 target_link_libraries(acpi wdmguid acpica ${PSEH_LIB})
 add_importlibs(acpi ntoskrnl hal)
+add_pch(acpi precomp.h ACPI_SOURCE)
 add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all)
 
 add_subdirectory(cmbatt)
Index: drivers/bus/acpi/buspdo.c
===================================================================
--- drivers/bus/acpi/buspdo.c	(rÃ©vision 61927)
+++ drivers/bus/acpi/buspdo.c	(copie de travail)
@@ -496,8 +496,8 @@
         {
             acpi_bus_get_device(DeviceData->AcpiHandle, &Device);
 
-            DPRINT1("Device name: %s\n", Device->pnp.device_name);
-            DPRINT1("Hardware ID: %s\n", Device->pnp.hardware_id);
+            DPRINT("Device name: %s\n", Device->pnp.device_name);
+            DPRINT("Hardware ID: %s\n", Device->pnp.hardware_id);
 
             if (strcmp(Device->pnp.hardware_id, "Processor") == 0)
             {
@@ -755,10 +755,10 @@
         }
         else
         {
-            DPRINT1("Using _BBN for bus number\n");
+            DPRINT("Using _BBN for bus number\n");
         }
 
-        DPRINT1("Found PCI root hub: %d\n", BusNumber);
+        DPRINT("Found PCI root hub: %d\n", BusNumber);
 
         ResourceListSize = sizeof(CM_RESOURCE_LIST);
         ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'IPCA');
Index: drivers/bus/acpi/main.c
===================================================================
--- drivers/bus/acpi/main.c	(rÃ©vision 61927)
+++ drivers/bus/acpi/main.c	(copie de travail)
@@ -457,7 +457,7 @@
     PWCHAR Ptr;
     NTSTATUS Status;
 
-    DPRINT1("GetProcessorInformation()\n");
+    DPRINT("GetProcessorInformation()\n");
 
     /* Open the key for CPU 0 */
     Status = AcpiRegOpenKey(NULL,
Index: drivers/bus/pcmcia/CMakeLists.txt
===================================================================
--- drivers/bus/pcmcia/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/bus/pcmcia/CMakeLists.txt	(copie de travail)
@@ -1,11 +1,12 @@
 
-add_library(pcmcia SHARED
+list(APPEND SOURCE
     fdo.c
     pcmcia.c
     pdo.c
-    pcmcia.rc)
+    pcmcia.h)
 
+add_library(pcmcia SHARED ${SOURCE} pcmcia.rc)
 set_module_type(pcmcia kernelmodedriver)
-add_pch(pcmcia pcmcia.h)
+add_pch(pcmcia pcmcia.h SOURCE)
 add_importlibs(pcmcia ntoskrnl hal)
 add_cd_file(TARGET pcmcia DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/bus/pcmcia/pcmcia.h
===================================================================
--- drivers/bus/pcmcia/pcmcia.h	(rÃ©vision 61927)
+++ drivers/bus/pcmcia/pcmcia.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _PCMCIA_PCH_
+#define _PCMCIA_PCH_
+
 #include <wdm.h>
 
 typedef enum
@@ -48,3 +51,4 @@
 PcmciaFdoPlugPlay(PPCMCIA_FDO_EXTENSION FdoExt,
                   PIRP Irp);
 
+#endif /* _PCMCIA_PCH_ */
Index: drivers/bus/pcmcia/pdo.c
===================================================================
--- drivers/bus/pcmcia/pdo.c	(rÃ©vision 61927)
+++ drivers/bus/pcmcia/pdo.c	(copie de travail)
@@ -35,4 +35,3 @@
 
     return STATUS_SUCCESS;
 }
-
Index: drivers/bus/pcmcia/fdo.c
===================================================================
--- drivers/bus/pcmcia/fdo.c	(rÃ©vision 61927)
+++ drivers/bus/pcmcia/fdo.c	(copie de travail)
@@ -24,4 +24,3 @@
 
     return STATUS_NOT_SUPPORTED;
 }
-
Index: drivers/network/ndis/CMakeLists.txt
===================================================================
--- drivers/network/ndis/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/ndis/CMakeLists.txt	(copie de travail)
@@ -32,15 +32,17 @@
     ndis/protocol.c
     ndis/string.c
     ndis/time.c
+    include/ndissys.h)
+
+add_library(ndis SHARED
+    ${SOURCE}
     ndis.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ndis.def)
 
-add_library(ndis SHARED ${SOURCE})
-
 set_module_type(ndis kernelmodedriver)
 add_importlibs(ndis ntoskrnl hal)
 
-add_pch(ndis include/ndissys.h)
+add_pch(ndis include/ndissys.h SOURCE)
 
 add_cd_file(TARGET ndis DESTINATION reactos/system32/drivers FOR all)
 
Index: drivers/network/ndis/ndis/main.c
===================================================================
--- drivers/network/ndis/ndis/main.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/main.c	(copie de travail)
@@ -13,7 +13,6 @@
 
 #include "ndissys.h"
 
-
 #if DBG
 
 /* See debug.h for debug/trace constants */
@@ -133,4 +132,3 @@
 }
 
 /* EOF */
-
Index: drivers/network/ndis/ndis/time.c
===================================================================
--- drivers/network/ndis/ndis/time.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/time.c	(copie de travail)
@@ -359,4 +359,3 @@
 }
 
 /* EOF */
-
Index: drivers/network/ndis/ndis/cm.c
===================================================================
--- drivers/network/ndis/ndis/cm.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/cm.c	(copie de travail)
@@ -10,7 +10,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @unimplemented
  */
Index: drivers/network/ndis/ndis/co.c
===================================================================
--- drivers/network/ndis/ndis/co.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/co.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "ndissys.h"
 
+#include <ndistapi.h>
+
 /*
  * @unimplemented
  */
Index: drivers/network/ndis/ndis/miniport.c
===================================================================
--- drivers/network/ndis/ndis/miniport.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/miniport.c	(copie de travail)
@@ -13,6 +13,8 @@
 
 #include "ndissys.h"
 
+#include <ndisguid.h>
+
 /*
  * Define to 1 to get a debugger breakpoint at the end of NdisInitializeWrapper
  * for each new miniport starting up
@@ -3345,4 +3347,3 @@
 }
 
 /* EOF */
-
Index: drivers/network/ndis/ndis/30stubs.c
===================================================================
--- drivers/network/ndis/ndis/30stubs.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/30stubs.c	(copie de travail)
@@ -10,6 +10,7 @@
 
 #include "ndissys.h"
 
+#include <afilter.h>
 
 /*
  * @unimplemented
Index: drivers/network/ndis/ndis/40stubs.c
===================================================================
--- drivers/network/ndis/ndis/40stubs.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/40stubs.c	(copie de travail)
@@ -10,7 +10,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @unimplemented
  */
Index: drivers/network/ndis/ndis/50stubs.c
===================================================================
--- drivers/network/ndis/ndis/50stubs.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/50stubs.c	(copie de travail)
@@ -10,6 +10,8 @@
 
 #include "ndissys.h"
 
+#include <atm.h>
+
 /*
  * @unimplemented
  */
Index: drivers/network/ndis/ndis/config.c
===================================================================
--- drivers/network/ndis/ndis/config.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/config.c	(copie de travail)
@@ -33,6 +33,8 @@
 
 #include "ndissys.h"
 
+#include <ntifs.h>
+
 #define PARAMETERS_KEY L"Parameters"     /* The parameters subkey under the device-specific key */
 
 /*
Index: drivers/network/ndis/ndis/object.c
===================================================================
--- drivers/network/ndis/ndis/object.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/object.c	(copie de travail)
@@ -37,4 +37,3 @@
 {
   ExFreePool(NdisGenericObject);
 }
-
Index: drivers/network/ndis/ndis/string.c
===================================================================
--- drivers/network/ndis/ndis/string.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/string.c	(copie de travail)
@@ -200,4 +200,3 @@
 }
 
 /* EOF */
-
Index: drivers/network/ndis/ndis/io.c
===================================================================
--- drivers/network/ndis/ndis/io.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/io.c	(copie de travail)
@@ -1256,4 +1256,3 @@
 
 
 /* EOF */
-
Index: drivers/network/ndis/ndis/memory.c
===================================================================
--- drivers/network/ndis/ndis/memory.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/memory.c	(copie de travail)
@@ -418,4 +418,3 @@
 
 
 /* EOF */
-
Index: drivers/network/ndis/ndis/buffer.c
===================================================================
--- drivers/network/ndis/ndis/buffer.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/buffer.c	(copie de travail)
@@ -10,7 +10,6 @@
 
 #include <ndissys.h>
 
-
 __inline ULONG SkipToOffset(
     IN PNDIS_BUFFER Buffer,
     IN UINT Offset,
Index: drivers/network/ndis/ndis/control.c
===================================================================
--- drivers/network/ndis/ndis/control.c	(rÃ©vision 61927)
+++ drivers/network/ndis/ndis/control.c	(copie de travail)
@@ -310,4 +310,3 @@
 }
 
 /* EOF */
-
Index: drivers/network/ndis/include/miniport.h
===================================================================
--- drivers/network/ndis/include/miniport.h	(rÃ©vision 61927)
+++ drivers/network/ndis/include/miniport.h	(copie de travail)
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include <ndis.h>
-#include <ndissys.h>
-
 struct _ADAPTER_BINDING;
 
 typedef struct _HARDWARE_ADDRESS {
Index: drivers/network/ndis/include/buffer.h
===================================================================
--- drivers/network/ndis/include/buffer.h	(rÃ©vision 61927)
+++ drivers/network/ndis/include/buffer.h	(copie de travail)
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "ndissys.h"
-
-
 /* FIXME: Possibly move this to ntddk.h */
 typedef struct _NETWORK_HEADER
 {
Index: drivers/network/ndis/include/ndissys.h
===================================================================
--- drivers/network/ndis/include/ndissys.h	(rÃ©vision 61927)
+++ drivers/network/ndis/include/ndissys.h	(copie de travail)
@@ -10,15 +10,9 @@
 #ifndef __NDISSYS_H
 #define __NDISSYS_H
 
-#include <ntifs.h>
 #include <ndis.h>
-#include <xfilter.h>
-#include <afilter.h>
-#include <atm.h>
-#include <ndistapi.h>
-#include <ndisguid.h>
-#include <debug.h>
 
+#include "debug.h"
 #include "miniport.h"
 #include "protocol.h"
 #include "efilter.h"
@@ -68,5 +62,3 @@
 #endif
 
 #endif /* __NDISSYS_H */
-
-/* EOF */
Index: drivers/network/tcpip/CMakeLists.txt
===================================================================
--- drivers/network/tcpip/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/tcpip/CMakeLists.txt	(copie de travail)
@@ -24,11 +24,13 @@
     tcpip/proto.c
     tcpip/tinfo.c
     tcpip/wait.c
+    include/precomp.h)
+
+add_library(tcpip SHARED
+    ${SOURCE}
     tcpip.rc
     ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def)
 
-add_library(tcpip SHARED ${SOURCE})
-
 target_link_libraries(tcpip
     ip
     lwip
@@ -38,6 +40,6 @@
 set_module_type(tcpip kernelmodedriver)
 add_importlibs(tcpip ndis ntoskrnl hal)
 
-add_pch(tcpip include/precomp.h)
+add_pch(tcpip include/precomp.h SOURCE)
 
 add_cd_file(TARGET tcpip DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/tcpip/tcpip/info.c
===================================================================
--- drivers/network/tcpip/tcpip/info.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/info.c	(copie de travail)
@@ -9,6 +9,7 @@
  */
 
 #include "precomp.h"
+
 #include <debug.h>
 
 VOID AddEntity(ULONG EntityType, PVOID Context, ULONG Flags)
Index: drivers/network/tcpip/tcpip/mocklock.c
===================================================================
--- drivers/network/tcpip/tcpip/mocklock.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/mocklock.c	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS: Art Yerkes
  * REVISIONS:
  */
+
 #include "precomp.h"
 
 KIRQL KernelIrql = PASSIVE_LEVEL;
@@ -44,4 +45,3 @@
 
 VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex ) {
 }
-
Index: drivers/network/tcpip/tcpip/proto.c
===================================================================
--- drivers/network/tcpip/tcpip/proto.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/proto.c	(copie de travail)
@@ -37,4 +37,3 @@
 
   return STATUS_SUCCESS;
 }
-
Index: drivers/network/tcpip/tcpip/wait.c
===================================================================
--- drivers/network/tcpip/tcpip/wait.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/wait.c	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS: Art Yerkes
  * REVISIONS:
  */
+
 #include "precomp.h"
 
 NTSTATUS TcpipWaitForSingleObject( PVOID Object,
Index: drivers/network/tcpip/tcpip/iinfo.c
===================================================================
--- drivers/network/tcpip/tcpip/iinfo.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/iinfo.c	(copie de travail)
@@ -175,4 +175,3 @@
     /* This removes all of them */
     RemoveEntityByContext(Interface);
 }
-
Index: drivers/network/tcpip/tcpip/ninfo.c
===================================================================
--- drivers/network/tcpip/tcpip/ninfo.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/ninfo.c	(copie de travail)
@@ -13,8 +13,6 @@
 #define IP_ROUTE_TYPE_ADD 3
 #define IP_ROUTE_TYPE_DEL 2
 
-
-
 /* Get IPRouteEntry s for each of the routes in the system */
 TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, PNDIS_BUFFER Buffer, PUINT BufferSize ) {
     TDI_STATUS Status;
@@ -214,4 +212,3 @@
 
      return TDI_INVALID_REQUEST;
 }
-
Index: drivers/network/tcpip/tcpip/mockwait.c
===================================================================
--- drivers/network/tcpip/tcpip/mockwait.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/mockwait.c	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS: Art Yerkes
  * REVISIONS:
  */
+
 #include "precomp.h"
 
 NTSTATUS TcpipWaitForSingleObject( PVOID Object,
Index: drivers/network/tcpip/tcpip/lock.c
===================================================================
--- drivers/network/tcpip/tcpip/lock.c	(rÃ©vision 61927)
+++ drivers/network/tcpip/tcpip/lock.c	(copie de travail)
@@ -6,6 +6,7 @@
  * PROGRAMMERS: Art Yerkes
  * REVISIONS:
  */
+
 #include "precomp.h"
 
 KIRQL TcpipGetCurrentIrql() { return KeGetCurrentIrql(); }
@@ -43,4 +44,3 @@
 VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex ) {
     ExReleaseFastMutex( Mutex );
 }
-
Index: drivers/network/tcpip/include/interface.h
===================================================================
--- drivers/network/tcpip/include/interface.h	(rÃ©vision 61927)
+++ drivers/network/tcpip/include/interface.h	(copie de travail)
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <ip.h>
-
 #define IFENT_SOFTWARE_LOOPBACK 24 /* This is an SNMP constant from rfc1213 */
 
 NTSTATUS GetInterfaceIPv4Address( PIP_INTERFACE Interface,
@@ -15,4 +13,4 @@
 NTSTATUS GetInterfaceConnectionStatus( PIP_INTERFACE Interface,
                                        PULONG OperStatus );
 PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address);
-PIP_INTERFACE GetDefaultInterface(VOID);
\ No newline at end of file
+PIP_INTERFACE GetDefaultInterface(VOID);
Index: drivers/network/tcpip/include/transmit.h
===================================================================
--- drivers/network/tcpip/include/transmit.h	(rÃ©vision 61927)
+++ drivers/network/tcpip/include/transmit.h	(copie de travail)
@@ -31,4 +31,5 @@
 
 
 NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE);
+
 /* EOF */
Index: drivers/network/tcpip/include/checksum.h
===================================================================
--- drivers/network/tcpip/include/checksum.h	(rÃ©vision 61927)
+++ drivers/network/tcpip/include/checksum.h	(copie de travail)
@@ -7,7 +7,6 @@
 
 #pragma once
 
-
 ULONG ChecksumFold(
   ULONG Sum);
 
Index: drivers/network/tcpip/include/precomp.h
===================================================================
--- drivers/network/tcpip/include/precomp.h	(rÃ©vision 61927)
+++ drivers/network/tcpip/include/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _TCPIP_PCH_
+#define _TCPIP_PCH_
+
 #include <tags.h>
 #include <tcpip.h>
 #include <loopback.h>
@@ -13,3 +16,5 @@
 #include <lock.h>
 #include <interface.h>
 #include <chew/chew.h>
+
+#endif /* _TCPIP_PCH_ */
Index: drivers/network/tdi/cte/string.c
===================================================================
--- drivers/network/tdi/cte/string.c	(rÃ©vision 61927)
+++ drivers/network/tdi/cte/string.c	(copie de travail)
@@ -1,4 +1,3 @@
-
 #include "precomp.h"
 
 /*
Index: drivers/network/tdi/misc/main.c
===================================================================
--- drivers/network/tdi/misc/main.c	(rÃ©vision 61927)
+++ drivers/network/tdi/misc/main.c	(copie de travail)
@@ -2,6 +2,7 @@
  * DESCRIPTION: Entry point for TDI.SYS
  * (c) Captain Obvious
  */
+
 #include "precomp.h"
 
 extern LONG CteTimeIncrement;
@@ -17,6 +18,4 @@
     return STATUS_SUCCESS;
 }
 
-
-
 /* EOF */
Index: drivers/network/tdi/misc/tdi.spec
===================================================================
--- drivers/network/tdi/misc/tdi.spec	(rÃ©vision 61927)
+++ drivers/network/tdi/misc/tdi.spec	(copie de travail)
@@ -27,6 +27,7 @@
  @ stdcall TdiDeregisterDeviceObject(ptr)
  @ stdcall TdiDeregisterNetAddress(ptr)
  @ stdcall TdiDeregisterNotificationHandler(ptr)
+ @ stdcall TdiDeregisterPnPHandlers(ptr)
  @ stdcall TdiInitialize()
  @ stdcall TdiMapBuffer(ptr)
  @ stdcall TdiMapUserRequest(ptr ptr ptr)
@@ -35,5 +36,6 @@
  @ stdcall TdiRegisterDeviceObject(long long)
  @ stdcall TdiRegisterNetAddress(long ptr ptr ptr)
  @ stdcall TdiRegisterNotificationHandler(long long long)
+ @ stdcall TdiRegisterPnPHandlers(ptr long ptr)
  @ stdcall TdiReturnChainedReceives(ptr long)
  @ stdcall TdiUnmapBuffer(ptr)
Index: drivers/network/tdi/precomp.h
===================================================================
--- drivers/network/tdi/precomp.h	(rÃ©vision 61927)
+++ drivers/network/tdi/precomp.h	(copie de travail)
@@ -1,3 +1,7 @@
-#include <ntddk.h>
+#ifndef _TDI_PCH_
+#define _TDI_PCH_
+
+#include <wdm.h>
 #include <tdikrnl.h>
-#include <tdi.h>
+
+#endif /* _TDI_PCH_ */
Index: drivers/network/tdi/CMakeLists.txt
===================================================================
--- drivers/network/tdi/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/tdi/CMakeLists.txt	(copie de travail)
@@ -15,15 +15,18 @@
     cte/string.c
     cte/timer.c
     misc/main.c
-    misc/tdi.rc
     tdi/dereg.c
     tdi/handler.c
     tdi/obsolete.c
     tdi/stubs.c
+    precomp.h)
+
+add_library(tdi SHARED
+    ${SOURCE}
+    misc/tdi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/tdi.def)
 
-add_library(tdi SHARED ${SOURCE})
-add_pch(tdi precomp.h)
+add_pch(tdi precomp.h SOURCE)
 set_module_type(tdi kernelmodedriver)
 add_importlibs(tdi ntoskrnl hal)
 add_cd_file(TARGET tdi DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/tdi/tdi/obsolete.c
===================================================================
--- drivers/network/tdi/tdi/obsolete.c	(rÃ©vision 61927)
+++ drivers/network/tdi/tdi/obsolete.c	(copie de travail)
@@ -1,4 +1,3 @@
-
 #include "precomp.h"
 
 /*
Index: drivers/network/tdi/tdi/handler.c
===================================================================
--- drivers/network/tdi/tdi/handler.c	(rÃ©vision 61927)
+++ drivers/network/tdi/tdi/handler.c	(copie de travail)
@@ -1,8 +1,12 @@
 /*
  * DESCRIPTION: Default TDI event handlers.
  */
+
 #include "precomp.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
  * ClientEventChainedReceiveDatagram
  *
@@ -23,6 +27,7 @@
 	IN	PVOID	TsduDescriptor
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -44,6 +49,7 @@
 	IN	PVOID			TsduDescriptor
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -65,6 +71,7 @@
 	IN	PVOID			TsduDescriptor
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -88,6 +95,7 @@
 	OUT	PIRP			* AcceptIrp
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -109,6 +117,7 @@
 	IN	ULONG			DisconnectFlags
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -125,6 +134,7 @@
 	IN	NTSTATUS	Status
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -150,6 +160,7 @@
 	OUT	PIRP	* IoRequestPacket
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -172,6 +183,7 @@
 	OUT	PIRP			* IoRequestPacket
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -194,6 +206,7 @@
 	OUT	PIRP			* IoRequestPacket
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -211,7 +224,28 @@
 	IN	ULONG	BytesAvailable
 	)
 {
+    UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
 }
 
+NTSTATUS
+NTAPI
+TdiRegisterPnPHandlers(
+    _In_ PTDI_CLIENT_INTERFACE_INFO ClientInterfaceInfo,
+    _In_ ULONG InterfaceInfoSize,
+    _Out_ HANDLE *BindingHandle)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+NTAPI
+TdiDeregisterPnPHandlers(
+    _In_ HANDLE BindingHandle)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */
Index: drivers/network/tdi/tdi/stubs.c
===================================================================
--- drivers/network/tdi/tdi/stubs.c	(rÃ©vision 61927)
+++ drivers/network/tdi/tdi/stubs.c	(copie de travail)
@@ -1,4 +1,3 @@
-
 #include "precomp.h"
 
 /*
Index: drivers/network/dd/pcnet/pcnet.c
===================================================================
--- drivers/network/dd/pcnet/pcnet.c	(rÃ©vision 61927)
+++ drivers/network/dd/pcnet/pcnet.c	(copie de travail)
@@ -1365,4 +1365,3 @@
 
   return NDIS_STATUS_SUCCESS;
 }
-
Index: drivers/network/dd/pcnet/requests.c
===================================================================
--- drivers/network/dd/pcnet/requests.c	(rÃ©vision 61927)
+++ drivers/network/dd/pcnet/requests.c	(copie de travail)
@@ -510,4 +510,3 @@
 
   return Status;
 }
-
Index: drivers/network/dd/pcnet/CMakeLists.txt
===================================================================
--- drivers/network/dd/pcnet/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/dd/pcnet/CMakeLists.txt	(copie de travail)
@@ -8,10 +8,10 @@
 list(APPEND SOURCE
     pcnet.c
     requests.c
-    pcnet.rc)
+    pcnet.h)
 
-add_library(pcnet SHARED ${SOURCE})
-add_pch(pcnet pcnet.h)
+add_library(pcnet SHARED ${SOURCE} pcnet.rc)
+add_pch(pcnet pcnet.h SOURCE)
 set_module_type(pcnet kernelmodedriver)
 add_importlibs(pcnet ndis ntoskrnl hal)
 add_cd_file(TARGET pcnet DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/dd/pcnet/pcnet.h
===================================================================
--- drivers/network/dd/pcnet/pcnet.h	(rÃ©vision 61927)
+++ drivers/network/dd/pcnet/pcnet.h	(copie de travail)
@@ -25,7 +25,11 @@
  *     - this assumes 32-bit physical addresses
  */
 
+#ifndef _PCNET_PCH_
+#define _PCNET_PCH_
+
 #include <ndis.h>
+
 #include "pci.h"
 #include "pcnethw.h"
 
@@ -159,3 +163,5 @@
 
 /* memory pool tag */
 #define PCNET_TAG 'tNcP'
+
+#endif /* _PCNET_PCH_ */
Index: drivers/network/dd/ne2000/CMakeLists.txt
===================================================================
--- drivers/network/dd/ne2000/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/dd/ne2000/CMakeLists.txt	(copie de travail)
@@ -4,10 +4,10 @@
 list(APPEND SOURCE
     ne2000/8390.c
     ne2000/main.c
-    ne2000.rc)
+    include/ne2000.h)
 
-add_library(ne2000 SHARED ${SOURCE})
-add_pch(ne2000 include/ne2000.h)
+add_library(ne2000 SHARED ${SOURCE} ne2000.rc)
+add_pch(ne2000 include/ne2000.h SOURCE)
 set_module_type(ne2000 kernelmodedriver)
 add_importlibs(ne2000 ndis ntoskrnl hal)
 add_cd_file(TARGET ne2000 DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/dd/ne2000/include/ne2000.h
===================================================================
--- drivers/network/dd/ne2000/include/ne2000.h	(rÃ©vision 61927)
+++ drivers/network/dd/ne2000/include/ne2000.h	(copie de travail)
@@ -5,13 +5,17 @@
  * PURPOSE:     NE2000 driver definitions
  */
 
+#ifndef _NE2000_PCH_
+#define _NE2000_PCH_
+
 #define NDIS_MINIPORT_DRIVER 1
 #define NDIS_LEGACY_MINIPORT 1
 #define NDIS51_MINIPORT 1
 #include <ndis.h>
 #include <8390.h>
-#include <debug.h>
 
+#include "debug.h"
+
 /* Define NOCARD to test NDIS without a card */
 //#define NOCARD
 
@@ -244,4 +248,4 @@
 VOID NICTransmit(
     PNIC_ADAPTER Adapter);
 
-/* EOF */
+#endif /* _NE2000_PCH_ */
Index: drivers/network/dd/ne2000/ne2000/main.c
===================================================================
--- drivers/network/dd/ne2000/ne2000/main.c	(rÃ©vision 61927)
+++ drivers/network/dd/ne2000/ne2000/main.c	(copie de travail)
@@ -7,6 +7,7 @@
  * REVISIONS:
  *   CSH 27/08-2000 Created
  */
+
 #include <ne2000.h>
 
 NTSTATUS
@@ -1055,4 +1056,5 @@
         }
 
 #endif
+
 /* EOF */
Index: drivers/network/dd/ne2000/ne2000/8390.c
===================================================================
--- drivers/network/dd/ne2000/ne2000/8390.c	(rÃ©vision 61927)
+++ drivers/network/dd/ne2000/ne2000/8390.c	(copie de travail)
@@ -7,6 +7,7 @@
  * REVISIONS:
  *   CSH 27/08-2000 Created
  */
+
 #include <ne2000.h>
 
 /* Null-terminated array of ports to probe. This is "semi-risky" (Don Becker).  */
Index: drivers/network/dd/rtl8139/info.c
===================================================================
--- drivers/network/dd/rtl8139/info.c	(rÃ©vision 61927)
+++ drivers/network/dd/rtl8139/info.c	(copie de travail)
@@ -391,4 +391,3 @@
 
     return status;
 }
-
Index: drivers/network/dd/rtl8139/CMakeLists.txt
===================================================================
--- drivers/network/dd/rtl8139/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/dd/rtl8139/CMakeLists.txt	(copie de travail)
@@ -9,10 +9,10 @@
     hardware.c
     info.c
     interrupt.c
-    rtl8139.rc)
+    nic.h)
 
-add_library(rtl8139 SHARED ${SOURCE})
-add_pch(rtl8139 nic.h)
+add_library(rtl8139 SHARED ${SOURCE} rtl8139.rc)
+add_pch(rtl8139 nic.h SOURCE)
 set_module_type(rtl8139 kernelmodedriver)
 add_importlibs(rtl8139 ndis ntoskrnl hal)
 add_cd_file(TARGET rtl8139 DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/dd/rtl8139/interrupt.c
===================================================================
--- drivers/network/dd/rtl8139/interrupt.c	(rÃ©vision 61927)
+++ drivers/network/dd/rtl8139/interrupt.c	(copie de travail)
@@ -215,4 +215,3 @@
     
     NdisDprReleaseSpinLock(&adapter->Lock);
 }
-
Index: drivers/network/dd/rtl8139/ndis.c
===================================================================
--- drivers/network/dd/rtl8139/ndis.c	(rÃ©vision 61927)
+++ drivers/network/dd/rtl8139/ndis.c	(copie de travail)
@@ -524,4 +524,3 @@
 
     return NDIS_STATUS_SUCCESS;
 }
-
Index: drivers/network/dd/rtl8139/nic.h
===================================================================
--- drivers/network/dd/rtl8139/nic.h	(rÃ©vision 61927)
+++ drivers/network/dd/rtl8139/nic.h	(copie de travail)
@@ -5,9 +5,13 @@
  * PURPOSE:     RTL8139 driver definitions
  */
 
+#ifndef _RTL8139_PCH_
+#define _RTL8139_PCH_
+
 #include <ndis.h>
-#include <rtlhw.h>
 
+#include "rtlhw.h"
+
 #define ADAPTER_TAG 'Altr'
 #define RESOURCE_LIST_TAG 'Rltr'
 
@@ -202,4 +206,4 @@
     IN NDIS_HANDLE MiniportAdapterContext
     );
 
-/* EOF */
+#endif /* _RTL8139_PCH_ */
Index: drivers/network/afd/afd/bind.c
===================================================================
--- drivers/network/afd/afd/bind.c	(rÃ©vision 61927)
+++ drivers/network/afd/afd/bind.c	(copie de travail)
@@ -77,6 +77,7 @@
     PFILE_OBJECT FileObject = IrpSp->FileObject;
     PAFD_FCB FCB = FileObject->FsContext;
     PAFD_BIND_DATA BindReq;
+    HANDLE UserHandle = NULL;
 
     UNREFERENCED_PARAMETER(DeviceObject);
 
@@ -99,9 +100,19 @@
     AFD_DbgPrint(MID_TRACE,("FCB->Flags %x\n", FCB->Flags));
 
     if (NT_SUCCESS(Status))
-        FCB->State = SOCKET_STATE_BOUND;
+    {
+        Status = ObOpenObjectByPointer(FCB->AddressFile.Object,
+                                       0,
+                                       NULL,
+                                       MAXIMUM_ALLOWED,
+                                       IoFileObjectType,
+                                       Irp->RequestorMode,
+                                       &UserHandle);
+        if (NT_SUCCESS(Status))
+            FCB->State = SOCKET_STATE_BOUND;
+    }
 
     /* MSAFD relies on us returning the address file handle in the IOSB */
     return UnlockAndMaybeComplete( FCB, Status, Irp,
-                                   (ULONG_PTR)FCB->AddressFile.Handle );
+                                   (ULONG_PTR)UserHandle);
 }
Index: drivers/network/afd/CMakeLists.txt
===================================================================
--- drivers/network/afd/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/afd/CMakeLists.txt	(copie de travail)
@@ -16,12 +16,12 @@
     afd/tdi.c
     afd/tdiconn.c
     afd/write.c
-    afd.rc)
+    include/afd.h)
 
-add_library(afd SHARED ${SOURCE})
+add_library(afd SHARED ${SOURCE} afd.rc)
 target_link_libraries(afd ${PSEH_LIB})
 
 set_module_type(afd kernelmodedriver)
 add_importlibs(afd ntoskrnl hal)
-add_pch(afd include/afd.h)
+add_pch(afd include/afd.h SOURCE)
 add_cd_file(TARGET afd DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/ndisuio/CMakeLists.txt
===================================================================
--- drivers/network/ndisuio/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/network/ndisuio/CMakeLists.txt	(copie de travail)
@@ -7,19 +7,16 @@
     ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio)
 
 list(APPEND SOURCE
-     createclose.c
-     ioctl.c
-     main.c
-     misc.c
-     protocol.c
-     readwrite.c
-     ndisuio.rc)
+    createclose.c
+    ioctl.c
+    main.c
+    misc.c
+    protocol.c
+    readwrite.c
+    ndisuio.h)
 
-add_library(ndisuio SHARED ${SOURCE})
-
+add_library(ndisuio SHARED ${SOURCE} ndisuio.rc)
 set_module_type(ndisuio kernelmodedriver)
 add_importlibs(ndisuio ndis ntoskrnl hal)
-
-add_pch(ndisuio ndisuio.h)
-
+add_pch(ndisuio ndisuio.h SOURCE)
 add_cd_file(TARGET ndisuio DESTINATION reactos/system32/drivers FOR all)
Index: drivers/network/ndisuio/ndisuio.h
===================================================================
--- drivers/network/ndisuio/ndisuio.h	(rÃ©vision 61927)
+++ drivers/network/ndisuio/ndisuio.h	(copie de travail)
@@ -4,10 +4,10 @@
  * FILE:        ndisuio.h
  * PURPOSE:     NDISUIO definitions
  */
+
 #ifndef __NDISUIO_H
 #define __NDISUIO_H
 
-#include <wdm.h>
 #include <ndis.h>
 #include <nuiouser.h>
 
@@ -207,4 +207,5 @@
 NTAPI
 NduDispatchWrite(PDEVICE_OBJECT DeviceObject,
                  PIRP Irp);
+
 #endif /* __NDISUIO_H */
Index: drivers/network/ndisuio/protocol.c
===================================================================
--- drivers/network/ndisuio/protocol.c	(rÃ©vision 61927)
+++ drivers/network/ndisuio/protocol.c	(copie de travail)
@@ -493,4 +493,3 @@
      * invalidating file handles pointer to this adapter for us */
     *Status = UnbindAdapterByContext(ProtocolBindingContext);
 }
-
Index: drivers/network/ndisuio/readwrite.c
===================================================================
--- drivers/network/ndisuio/readwrite.c	(rÃ©vision 61927)
+++ drivers/network/ndisuio/readwrite.c	(copie de travail)
@@ -206,4 +206,4 @@
     IoCompleteRequest(Irp, IO_NETWORK_INCREMENT);
 
     return Status;
-}
\ No newline at end of file
+}
Index: drivers/network/ndisuio/createclose.c
===================================================================
--- drivers/network/ndisuio/createclose.c	(rÃ©vision 61927)
+++ drivers/network/ndisuio/createclose.c	(copie de travail)
@@ -66,4 +66,4 @@
 
     /* Return success */
     return STATUS_SUCCESS;
-}
\ No newline at end of file
+}
Index: drivers/input/i8042prt/CMakeLists.txt
===================================================================
--- drivers/input/i8042prt/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/input/i8042prt/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-add_library(i8042prt SHARED
+list(APPEND SOURCE
     createclose.c
     i8042prt.c
     keyboard.c
@@ -9,10 +9,14 @@
     ps2pp.c
     readwrite.c
     registry.c
+    i8042prt.h)
+
+add_library(i8042prt SHARED
+    ${SOURCE}
     guid.c
     i8042prt.rc)
 
 set_module_type(i8042prt kernelmodedriver)
 add_importlibs(i8042prt ntoskrnl hal)
-add_pch(i8042prt i8042prt.h)
+add_pch(i8042prt i8042prt.h SOURCE)
 add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/input/i8042prt/pnp.c
===================================================================
--- drivers/input/i8042prt/pnp.c	(rÃ©vision 61927)
+++ drivers/input/i8042prt/pnp.c	(copie de travail)
@@ -437,6 +437,7 @@
         Status = EnableInterrupts(DeviceExtension, FlagsToDisable, FlagsToEnable);
         if (!NT_SUCCESS(Status))
         {
+            WARN_(I8042PRT, "EnableInterrupts failed: %lx\n", Status);
             DeviceExtension->Flags &= ~(KEYBOARD_PRESENT | MOUSE_PRESENT);
             return Status;
         }
@@ -454,6 +455,10 @@
         {
             DeviceExtension->Flags |= KEYBOARD_INITIALIZED;
         }
+        else
+        {
+            WARN_(I8042PRT, "i8042ConnectKeyboardInterrupt failed: %lx\n", Status);
+        }
     }
 
     if (DeviceExtension->Flags & MOUSE_PRESENT &&
@@ -467,7 +472,11 @@
         {
             DeviceExtension->Flags |= MOUSE_INITIALIZED;
         }
-
+        else
+        {
+            WARN_(I8042PRT, "i8042ConnectMouseInterrupt failed: %lx\n", Status);
+        }
+        
         /* Start the mouse */
         Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt);
         i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE);
@@ -533,7 +542,7 @@
             {
                 if (ResourceDescriptor->u.Port.Length == 1)
                 {
-                    /* We assume that the first ressource will
+                    /* We assume that the first resource will
                      * be the control port and the second one
                      * will be the data port...
                      */
@@ -551,8 +560,8 @@
                     }
                     else
                     {
-                        WARN_(I8042PRT, "Too much I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length);
-                        return STATUS_INVALID_PARAMETER;
+                        /* FIXME: implement PS/2 Active Multiplexing */
+                        ERR_(I8042PRT, "Unhandled I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length);
                     }
                 }
                 else
Index: drivers/input/sermouse/sermouse.h
===================================================================
--- drivers/input/sermouse/sermouse.h	(rÃ©vision 61927)
+++ drivers/input/sermouse/sermouse.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _SERMOUSE_PCH_
+#define _SERMOUSE_PCH_
+
 #include <ntddk.h>
 #include <ntddser.h>
 #include <kbdmou.h>
@@ -110,3 +113,5 @@
 VOID NTAPI
 SermouseDeviceWorker(
 	PVOID Context);
+
+#endif /* _SERMOUSE_PCH_ */
Index: drivers/input/sermouse/CMakeLists.txt
===================================================================
--- drivers/input/sermouse/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/input/sermouse/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-add_library(sermouse SHARED
+list(APPEND SOURCE
     createclose.c
     detect.c
     fdo.c
@@ -7,9 +7,10 @@
     misc.c
     readmouse.c
     sermouse.c
-    sermouse.rc)
+    sermouse.h)
 
+add_library(sermouse SHARED ${SOURCE} sermouse.rc)
 set_module_type(sermouse kernelmodedriver)
-add_pch(sermouse sermouse.h)
+add_pch(sermouse sermouse.h SOURCE)
 add_importlibs(sermouse ntoskrnl hal)
 add_cd_file(TARGET sermouse DESTINATION reactos/system32/drivers FOR all)
Index: drivers/input/kbdclass/kbdclass.h
===================================================================
--- drivers/input/kbdclass/kbdclass.h	(rÃ©vision 61927)
+++ drivers/input/kbdclass/kbdclass.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _KBDCLASS_PCH_
+#define _KBDCLASS_PCH_
+
 #include <ntifs.h>
 #include <ntddkbd.h>
 
@@ -76,3 +79,5 @@
 	IN ULONG Flags,
 	IN PCUNICODE_STRING SourceString,
 	OUT PUNICODE_STRING DestinationString);
+
+#endif /* _KBDCLASS_PCH_ */
Index: drivers/input/kbdclass/CMakeLists.txt
===================================================================
--- drivers/input/kbdclass/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/input/kbdclass/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,16 @@
 
-add_library(kbdclass SHARED
+list(APPEND SOURCE
     kbdclass.c
     misc.c
+    kbdclass.h)
+
+add_library(kbdclass SHARED
+    ${SOURCE}
     guid.c
     kbdclass.rc)
 
 set_module_type(kbdclass kernelmodedriver)
-add_pch(kbdclass kbdclass.h)
+add_pch(kbdclass kbdclass.h SOURCE)
 target_link_libraries(kbdclass ${PSEH_LIB})
 add_importlibs(kbdclass ntoskrnl hal)
 add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB FOR all)
Index: drivers/input/mouclass/mouclass.h
===================================================================
--- drivers/input/mouclass/mouclass.h	(rÃ©vision 61927)
+++ drivers/input/mouclass/mouclass.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MOUCLASS_PCH_
+#define _MOUCLASS_PCH_
+
 #include <ntifs.h>
 #include <ntddmou.h>
 
@@ -76,3 +79,5 @@
 	IN ULONG Flags,
 	IN PCUNICODE_STRING SourceString,
 	OUT PUNICODE_STRING DestinationString);
+
+#endif /* _MOUCLASS_PCH_ */
Index: drivers/input/mouclass/CMakeLists.txt
===================================================================
--- drivers/input/mouclass/CMakeLists.txt	(rÃ©vision 61927)
+++ drivers/input/mouclass/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,16 @@
 
-add_library(mouclass SHARED
+list(APPEND SOURCE
     misc.c
     mouclass.c
+    mouclass.h)
+
+add_library(mouclass SHARED
+    ${SOURCE}
     guid.c
     mouclass.rc)
 
 set_module_type(mouclass kernelmodedriver)
-add_pch(mouclass mouclass.h)
 target_link_libraries(mouclass ${PSEH_LIB})
 add_importlibs(mouclass ntoskrnl hal)
+add_pch(mouclass mouclass.h SOURCE)
 add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all)
Index: media/doc/3rd Party Files.txt
===================================================================
--- media/doc/3rd Party Files.txt	(rÃ©vision 61927)
+++ media/doc/3rd Party Files.txt	(copie de travail)
@@ -15,7 +15,7 @@
 Website: http://www.geocities.com/dborca/opengl/tc.html
 
 Title: FreeType
-Used Version: 2.5.0
+Used Version: 2.5.2
 Website: http://www.freetype.org
 
 Title: Mesa3D
@@ -61,3 +61,7 @@
 Title:  STLport
 Used Version: 5.2.1
 Website: http://stlport.sourceforge.net/
+
+Title: win-iconv
+Used Version: r44
+Website: https://code.google.com/p/win-iconv/
Index: media/fonts/Marlett.ttf
===================================================================
--- media/fonts/Marlett.ttf	(rÃ©vision 61927)
+++ media/fonts/Marlett.ttf	(copie de travail)
@@ -1,502 +1,30 @@
-BDF K«ÛÍ<–EBDT©»I.Ô0iEBLC¢žf¼_@8FFTM@Zz¢nxGDEF'en”OS/2a´gí˜Vcmap=co¢hBcvt D¬gaspÿÿ4glyf@/ù”p¨headëÅë6hheaüT$hmtx‚ý3hðxloca2*4*°Àmaxp¤bx name¤N:‚
-*postxòHÒDðLÌœüJ_<õÁã¦¥Â…ÿþÿþ ]_1@.=ô3™3™×fPfEdyvDªôôôôôôôôôôôôôôôôôô€€þJ@@@ @ôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôôþþ€À€€„Þ€Ô@€`@@Î@< yÿÿÿÿÿå	
-
- !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^D,,,,,,,,,,,,,,,,,,,,,:Px†”¢°ÄÒààààààààààààààààààààààààààààààààààààààààö,<LZ|žÖ
-@p–¶ÔâVdrˆ–¶ÔDîU.±/<²í2±Ü<²í2±/<²í2²ü<²í23!%!!Dªýš"ýÞUú«DÍ!ÿ€€€!!!û€€û€€ú€€€€
-!!!!!!!€€ü€€€þ€û€ü€€ÿÿü€þ€ýþþ¾~¾~ý€¾û€JÄÊÄJ€Äû€@@€!@ý€€@€@!@ý€ý€@@ò!!!@ûý€€€òý€ÔÔ	þÔýÿþ@€@	@þ€þ€þ€€þø‚²		þD@ý¨þÔBþ¶@zýÆDþ‚‚<		þD@ý¨þÔÌþ¶@zýÆD€€53!5!€ø€€€15%3€€~€ø€€3!5!€€ù€€|ˆü%5!3€|€ù€!úÀÀ@@72#".54>Ë5P™WT™SS™TV™5i4@S™TT˜TT˜TT™S€€€€72#".54>Õ+a·he·dd·eg¸+V+€c¹dd·ee·dd¹c€„|€ 5&547>32&$#"ø5ýÁxŒŒxRÇêyyêÇRZmþêŸžþèlCd77dC4iýO�M®®M�Qt??tQZkstjG°ÆeeÆ°G„€€|7#".'7! 7654'Ë5|xŒŒxRÇêyyêÇRZáAAágwvh5i4|�þ·²²þ·�Qt??tQZÞÞn™™pÞ"7.#".54>76$32Õ+ÆWè‡‡èW7U.fT\Cd77dClžŸm+V+ÆYaaY:“¡X€íY\G°ÆeeÆ°GjtskÞ"7!267>54&'7! 'Õ+þ:¸‡åZWccW\hvwgáþ¿þ¿á+V+þ:º`Z\ê€€ê\\pþç™™þånÞÞ€€€€72#"$54$Õ+¡2­©þÏ¦¦þÏ©¬2+V+€¥þÌ§§þÐ©©0§§4¥Ô*!5!35	5p�ùÔø�¤þB¾ý ŽœùÖ¢�ûÎ¼�ý´@À!	#!@Àû<Äý2òÀßÀøû8Àòý2Àßá€€!5!ý€€€``  3	35	5#	#	`ÆÚàÀþ&ÚÀþ þ&ÆÚþ&`Úþ&ÆÚÚÆþ&ÚÆþ&þ&“[œ 07>32>767.#"2#".54>aþÇ'ŽÞ™™
-l
-
-¾§þ®-e1¢!
-:d66W9Ç0Y31Z10Z12Z*D‡›“Zo¢và‰?ÌþíoŒiKžWN)7Aû´0[10Z11Z01[0@@€!@ý€€@‚@!@ý€ý€@ö@		@€€ý�ý€€ý€þöý€€@@þ@üÿþ**33	3ŽœùÖ¢�ûÎ¼�ý´Žúp,þ�ü\¾þB`ÀÀ!5!#5'5Äû<Àþòý2ßßÀÈøú@Îòü@áßþ@ÆW]W]]d]
-Éo	j8	®	¢	®	®	¼	®	
-’ÒCopyright © TransGaming Technologies. All rights reserved.
-Copyright © 2007 Ged MurphyMediumMarlettVersion 0.3Permission to use, copy, modify and distribute this font or for any purpose with or without fee is hereby granted, provided that the attached copyright notice appears in all copies.
-THIS FONT IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT WITHOUT LIMIMTATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE> THE AUTHORS AND CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNAR.Copyright © 2007 Ged Murphy
-
-Copyright © 2007 Wierd_WMediumMarlettVersion 0.3Permission to use, copy, modify and distribute this font or for any purpose with or without fee is hereby granted, provided that the attached copyright notice appears in all copies.
-THIS FONT IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT WITHOUT LIMIMTATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE> THE AUTHORS AND CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNAR._	
-
- !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\uni001Euni001Fÿÿ	z##
-#######EU_g)1=DJLZapq|P‡`”`¡©«O¹ÊÓäæøù
- (2:GO	[hÿÿÿÿ{�	˜£&®ÂºÅ2Õ2çnû<EO_Yý1DLaq|Z‡`”`¡ «R¹"Ó+æ-ù.7(?:GO
-[hÿÿÿÿ{�	˜£&®ÂºÅ2Õ2çxû<OE�_š>H1PDWLYa`q
-|d‡`”`¡a«\¹cÓlænùox(€:ˆO
-[hÿÿÿÿ{�	˜£&®ÂºÅ2Õ2ç‚ûF�EÒ_Ü€Š1’D™L›a¢q|n‡`”`¡£«j¹¥Ó®æ°ù±º(Â:ÊO[hÿÿÿþ{�˜	£&®ÂºÅ2Õ2ç–ûPÒE_ÂÌ1ÔDÛLÝaäq|x‡`”`¡å«n¹çÓðæòùóü(:O
-[hÿÿÿþ{�˜
-£&®ÂºÅ2Õ2ç ûPEV_`		1	D	L	a	&q|‚‡`”`¡	'«x¹	)Ó	2æ	4ù	5	>(	F:	NO[hÿÿÿþ{�˜
-£&®Âº	Å2Õ2çªûZ	VE	˜_	¢
-F
-P1
-XD
-_L
-aa
-hq|Œ‡`”`¡
-i«†¹
-kÓ
-tæ
-vù
-w
-€(
-ˆ:
-�O[hÿÿÿþ{�˜£&®Âº
-Å2Õ2ç¾ûd
-˜E
-Ú_
-äˆ’1šD¡L£aªq|–‡`”`¡««Š¹­Ó¶æ¸ù¹Â(Ê:ÒO[hÿÿÿþ{�˜£&®Âº
-Å2Õ2çÈûdÚE_&ÊÔ1ÜDãLåaìq| ‡`”`¡í«”¹ïÓøæúùû
-(
-:
-O[hÿÿÿþ{�˜
-£&®ÂºÅ2Õ2çÒûnFONT-FontForge-Marlett-Medium-R-Normal--11-80-96-96-P-79-WinRoman-0FONTBOUNDINGBOX11 11 0 0COMMENTGenerated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FOUNDRYFontForgeFAMILY_NAMEMarlettWEIGHT_NAMEMediumSLANTRSETWIDTH_NAMENormalADD_STYLE_NAMEPIXEL_SIZEPOINT_SIZERESOLUTION_XRESOLUTION_YSPACINGPAVERAGE_WIDTHCHARSET_REGISTRYWinRomanCHARSET_ENCODING0FONTNAME_REGISTRYCHARSET_COLLECTIONSWinRomanFONT_NAMEMarlettFACE_NAMEMarlettFONT_VERSION001.000FONT_ASCENTFONT_DESCENTUNDERLINE_POSITIONUNDERLINE_THICKNESSX_HEIGHTCAP_HEIGHTRAW_ASCENTRAW_DESCENTNORM_SPACERELATIVE_WEIGHTRELATIVE_SETWIDTHAVG_LOWERCASE_WIDTHAVG_UPPERCASE_WIDTH-FontForge-Marlett-Medium-R-Normal--12-90-96-96-P-82-WinRoman-012 12 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--13-100-96-96-P-92-WinRoman-013 13 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--15-110-96-96-P-106-WinRoman-015 15 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--16-120-96-96-P-110-WinRoman-016 16 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--17-130-96-96-P-120-WinRoman-017 17 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--19-140-96-96-P-134-WinRoman-019 19 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--20-150-96-96-P-138-WinRoman-020 20 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000-FontForge-Marlett-Medium-R-Normal--21-160-96-96-P-148-WinRoman-021 21 0 0Generated by fontforge, http://fontforge.sourceforge.net
-Created by Thinkpad,U-LUNACY-INC\Thinkpad,S-1-5-21-507921405- with FontForge 1.0 (http://fontforge.sf.net)FontForgeMarlettMediumRNormalPWinRoman0WinRomanMarlettMarlett001.000ücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàÿü		
-ÿÿà0ÿ€		
-?ŸÈ?ßì	þ	/²	›è#¾ûˆûˆ€
-Œïì€èücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàücÇàä	ä
-
-ÿà€ €  €@ ÿ€
-ÿ€€€€€€€		
-€@ ÿ€		
-ÿÿÿÿÿÿÿÿÿÿ€	{ÿÿýàoöa@€€€€@	†x
-<†	0ž
-<~ÿÿÿÿ~<		
-€€€���’’’		$I’à
-Ãç~<<~çÃ	
-{<Æ0À0#¾ûˆ	#¾¸€
-s		
-€ �"H’$€	€@ �H$’IücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ÿð	
-ÿÿø€`ÿÀ		?ŸÈ?ßì	þsŒïì€q÷ðþøà€	þøà€?€Œïì€èücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?ücÆ?	íÄ
-íÄÿð@ €ÿ		ÿÀ €
-
-@@ð	ÿÿÿÿÿÿÿÿÿ	{ÿÿýàoö
-
-4€ @
-
-
-€ @Ã	0Ð€		@ x
-
-çûÿÿÿÿýþ‡€		
-€€€���’’’	
-6mÛð
-Ãç~<<~çÃ
-{<Ç8Ã0Àq÷ðþøà€
-q÷ð?¾8 s		
-€ �"H’$€	€À`°Øl¶Û		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø
-ÿü
-
-
-ÿÿø€`€ð	
-
-?Ïòýÿ`xÿ
-s
-Œïì€	
-q÷ð
-þøà€
-
-þøà€?€
-Œïì€
-èücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1øücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø		ücÆ1ø
-
->ïŽ
->ïŽ
-
-ÿø€€€€€
-
-
-
-@€ @ÿ€
-
-
-ÿà€ € 
- €@ ÿ€		
-ÿÿÿÿÿÿÿÿÿÿ€
-
-{ÿÿýà	
-oö
-
-
-
-4€ @
-
-
-€ @Ã	
-0Ð€	
-
-@ x
-
-
-çûÿÿÿÿýþ‡€		
-
-€€€���’’’	
-
-6mÛ
-ð		
-ÁñÝÇÁÁñÝÇÁ€
-{<ÃÃÃ	
-q÷ð
-þøà€
-
-q÷ð?¾8 
-s		
-
-€ �"H’$€	
-€À`°Øl¶Û
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ðÿÿ
-ÿÿþÀ`€0ÿ€
-ñÿÿŸù€ø€ˆÿ€	
-Îÿ¼ã	
-†9ïû˜€	
-�ïø	
-ÿ¿�ƒ€€	ÿ¿�ƒ€€ÿŒïì€
-ûˆþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ðþa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð
-
-þa†a‡ð>ïŽ
->ïŽÿþ € € € @€ ÿ€ÿø€€€€€
-
-@€ @ÿ€
-ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ€{ÿÿýà{ÿÿýà�† À€€@
- 0€F
-
-4€ @
-
-€ @Ãüçþÿÿÿÿÿÿçþ?Àð
-@"@ˆ"DHˆ À2Ã0Ì3,Ï3	ø		ÁñÝÇÁÁñÝÇÁ€
-	>?¸üp0pp8�À	
-�ïø		ÿ¿�ƒ€€	�ïøÿs
-€ ˆ@"ˆ„D"!€€	�˜�˜™™™™€ÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿÿ
-ÿÿÿ€€€€ÿð
-ñÿÿŸù€ø€ˆÿ€	Îÿ¼ã	†9ïû˜€	�ïø	
-ÿ¿�ƒ€€	ÿ¿�ƒ€€ÿ
-Œïì€
-ûˆÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒø>ïŽ
->ïŽÿÿ @€ ÿÿ
-
-ÿü @€ @@@ÿðÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ{ÿÿýà{ÿÿýàÁ† À€€@
-@0(aƒð
-
-4€ @
-
-€ @Ãüçþÿÿÿÿÿÿçþ?Àð
-@"@ˆ"DHˆ À2Ã0Ì3,Ï3	øÀ|ÇÁðÁÜqÜ€	>?¸üp0pp8�Àà	�ïø		ÿ¿�ƒ€€	�ïøÿ
-s
-€ ˆ@"ˆ„D"!€€	�˜�˜™™™™€	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿÿÀ
-ÿÿÿàÀ0€`ÿð
-ñÿÿŸù€ø€ˆÿ€	Îÿ¼ã	†9ïû˜€	�ïø	
-ÿ¿�ƒ€€	ÿ¿�ƒ€€ÿŒïì€
-ûˆÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒøÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø	ÿ0`Áƒø
-ŽÜøp ŽÜøp ÿÿ€€€€€€€€€€€€€€€€@ €@ ÿÿ€ÿþ € € € @€ ÿ€
-
-ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ€{ÿÿýà{ÿÿýàÁƒ À€€@`(Áƒð
-
-Œ4€ À
-
-€0@Ãüçþÿÿÿÿÿÿçþ?Àð
-@"@ˆ"DHˆ À2Ã0Ì3,Ï3
-øÀ|ÇÁðÁÜqÜ€	>?¸ü~8888Ààp	�ïø	
-ÿ¿�ƒ€€	�ïøÿs
-€ ˆ@"ˆ„D"!€€	�˜�˜™™™™€
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-ÿÿð
-ÿÿÿø`€`€`ÿü
-ü?ð€Bÿü`€B ÿÀ1Ï÷Ï0@ƒ<ûÿ¼ã
-À|ÇýÿÀÿïøþ€à	ÿïøþ€àÿà	†9ïû˜€þøà€ÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ	�Þüøp 	�Þüøp ÿÿà€ € € €  €@ €@ ÿÿ€ÿÿ€€€€€€€€€€€€€€€€@ €@ ÿÿ€ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ€
-{ÿÿýà<~ÿÿÿÿ~<à`cØ@ €`€`€@ °``~Á† À€€@@0(aƒðÀƒÿþÿÿÿÿÿÿÿÿÿÿ÷ÿ�üà? €@!„@!„"ˆB!0€`ÀÆ01�ŒLccÀü
-
-ÀÜqÁÜÀðÁÇÀ|€‡þùÿððÀøð`ð
-À|ÇýÿÀÿïøþ€àÀ|ÇýÿÀÿïøþ€à	Îÿ¼ã€€€€€€€€€‚‚‚‚‚€€0`À1€cÆ1ŒcÆ0
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-ÿÿÿüÿÿÿÿÿü0`À€?ÿÀþü?ø@€?üøÿñ€?B„ü1Ï÷Ï0@ƒ<ûÿ¼ãÀ|ÇýÿÀÿïøþ€à
-ÿïøþ€àü	†9ïû˜€
-þøà€ÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ
-
-ÿ�����������ÿ		€àøþ÷ñðp		€àøþ÷ñðpÿÿð@ €@ €ÿÿÿÿ€€€€€€€€€€€€€€€@@@@ÿðÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÀ
-{ÿÿýà<~ÿÿÿÿ~<ð@ @€ @€Là
-
-àÁŒÀ@€0€
-
- €€  Áƒðàø?üþþÿÿÿÿÿÿÿÿÿÿÿÿþþ?üøà €@!„@!„"ˆB!0Àp�Àç89ÁÎNssŸœàü
-
-ÀÜqÁÜÀðÁÇÀ|€‡þùÿðð>€ððð`À|ÇýÿÀÿïøþ€àÀ|ÇýÿÀýÿÁð	Îÿ¼ã€€€€€€€€€‚‚‚‚‚€€8pà9Às€ç	Î3œç9Îp	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0üÿÿÿÿ€ÿÿÿÿÿü0`À€0ÿ€þü?ø@€?üøÿñ€?B„ü
-8óïÿ¿><80 
-�ƒ‡�Ÿ¿þùã†
-8à?ƒþ?ûÿà
-ÿûÿ�ø?€ø€
-ÿûÿ�ø?€ø€?þ	†9ïû˜€
-þøà€ÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0üÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü	ÿÀ`0€À`0ü
-
-@0Ç»Ïáð8
-
-@0Ç»Ïáð8ÿÿø€€€€€€€€€@€ @€ @ÿÿ€ÿÿÀ €@ € €@ €@ ÿÿ€ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ€{ÿÿýà<~ÿÿÿÿ~<ð@	 @€ @€Hà
-
-àÀÌÀ@€0€
-
-0€€  �ƒðàø?üþþÿÿÿÿÿÿÿÿÿÿÿÿþþ?üøà €@!„@!„"ˆB!0Àp�Àç89ÁÎNssŸœàþ
-
-à?ƒþ>ûãþà>ø?ãï¾?àþ€‡þùÿððÀøð`ð
-8à?ƒþ?ûÿà
-ÿûÿ�ø?€ø€
-8à?ƒþ?ûÿà?þÿãþà>à	Îÿ¼ã€€€€€€€€€‚‚‚‚‚€€8pà9Às€ç	Î3œç9Îp	¸€	þû^8€
-þú^¸€
-ý
-
-ú
-^
-
-8€ýù^¸€
-ýø^	8€ýø^
-¸€ü	÷^8€ü
-ö^
-¸€ü
-ö^ 01¬2^À
-
-(2<FPZdnx‚Œ– ª´»ËÛâéð÷	ýx
-(2<FPZdnx‚Œ– ª´¾ÈÏÖèý
-*4;HUamzŠ—�ª¶½ÄÎ×çô 01¬2^Àlr
-(2<FPZdnx‚Œ– ª´»ÌÜåî÷�ýì
-(2<FPZdnx‚Œ– ª´¾ÈÑÚï(6@GYky‡™©¶¼ÉÖßèöÿ 01¬2^À!,7BMXcny„�š¥°»ÆÍßðù )/=		ý
-¯!,7BMXcny„�š¥°»ÆÑÜèô&8M]gn€’ ®ÀÐÝãó
-!*:G 01¬2^À
-ö
-ü
-'4AN[hu‚�œ©¶ÃÐÝêñ'2=HV_fb
-
-üú
-'4AN[hu‚�œ©¶ÃÐÝê÷:\sŽ£­·Íãõ5JP`tŠ�¦½Ò 01¬2^ÀÌÒ-<KZix‡–¥´ÃÒáðÿ+ALWbm{„‹]
-ü-<KZix‡–¥´ÃÒáðÿ,8Df‹¦ÄÛåï/AXo„ŠŸ´¿ÊÝæý 01¬2^À-3-<KZix‡–¥´ÃÒáðÿ/EP[fqˆ�Â
-	ü€-<KZix‡–¥´ÃÒáðÿ,9Fk•³Õðú2DVm„™Ÿ´ÊÕàóü( 01¬2^À¨®$6HZl~�¢´ÆØêü 2DLh„’ ®¼ÎÙâ�
-
-
-û‡$6HZl~�¢´ÆØêü 2DVhv„²å
-4V`m‹©À×õ5;Vuƒ‘ªµ×õ 01¬2^À!|!‚$6HZl~�¢´ÆØêü 2DMm�›©·ÅØãì#n
-
-
-û$e$6HZl~�¢´ÆØêü 2DVhxˆ»òEeo|žÀÛö=[a|™§µÏÚü 01¬2^À((…*?Ti~“¨½Òçü&;Pez„¦Æ×èù
-!,5*º	û+ê*?Ti~“¨½Òçü&;Pez�¤¶Èÿ<f™»ÅÒô1Lq“±·Òñ4?aÁ¯?„¼Îÿ”ÁÜ;‰^
\ No newline at end of file
+€0OS/2»X˜8Ncmap²Û¢¡ØBgaspÿÿøglyf–Vú‰hˆhead×u¼6hheaQ
++ô$hmtx/5&|ˆNloca^Lmaxp—ç name~cãŽðšpostÑ+Œl`…Ž_<õ
+(ËwJÑÏfV
+(
+(	
+(
+(
+(%¶/B
+�š3š3Ñf ¯PxûHL  0z
+(
+(
+(X�Š„„ôôôèŠXXÈÈ�„ ÈÝ�pX�XY�Xôôôèd	
+
+ !"#$(9zÿÿ0aÿÿÿÑÿª&>dr€Žœ°¾Ìàô$4BXn”¼â<^l�ÀÎÜðþ>D!!%!!ü Àü@û ÀXW %X°ûP È�XÐ–!X­ûRÇ@$åûP>ùÃŠPÐ˜
+!3!!!!!âZÌüÚÄ²þlûNèüäDþË]þÒZû®þ
+îüåêþ„ô¤4¤üà4ùÀ „ô¤4	¤üàüà@ô„4¤	! ùÀ¤üàô„4¤	!üà@„ ôX4¤	!!5üà@ùÀ„ ü|ÈÈèY¤Ð	¤ýEýEwŠ¶r	!FýDw¶¼XO		X� üàxþfþq šüàXÐ	X� üà@þfþp šüàÈ	`
+(73!5!È˜ö È˜È
+(
+(5!3!	`ÈõØÈ	`õØÈ�˜	`3!5!ÈÈø0�ÈÈÈ	`	`!#È˜È�È˜ø0��˜™!�˜øø	„„¤¤7'  °ÈÈôüà °ddþ   	7'  °ÈÈXüé°ddý¨èÈÕO	`
+! ! 5Ùþ;ü|ç–þçL(•ý¾È˜ü|þ8á–,Lþë—ý`dÈÝÈ	`L
+! '7! 75TÀ„à–û´ýÜþí–Â�„Áá–þíýÛû´–¥aÈ�o¸˜
+! &! 5sþ¡ýD±–ã„Ãá–ý”ÈÐýDþ ¯–áÄ„â–ý“Èdp�˜¸
+! '7! '7µ_¼°–âü|þ=á–ªÈÈX¼_¯–áþ=ü|â–pddXXÐÐ7'  °ÈÈ úˆx°ddüàx�
+(˜!5	53!5 üèùÀÈý¨Ð÷h ÈüxÈùÀÐÈ÷hX
+(Ð!	!	!˜�üà úˆ�èø0�@��üàè�úˆÐø0@Yx@@!!Yçü@È�XÐ˜	53	3	#	#�Xý¨ÈXXÈý¨XÈý¨ý¨È XXÈý¨XÈý¨ý¨ÈXý¨XX	˜54! !47$! !„,,ÈþÔ,Ç+ý©ý§�,@dÈÈdddþpÈed,ôý¨ýCþÕ,ô„4¤	! ùÀ¤üàô„4¤	!üà@„ ô�4˜	!! ùÀ@üà˜üàÈüàèY¤Ð¤ýDÐú‰»˜˜!!3	èü XÈùÀ˜÷hÐèÈüà@Èúˆ˜Èø0ÐÐ!)! üà�X�úˆ@�ø0 þpþpxþpXùÀÐdõ	Å!%5=APX\et‡�“›Ÿµ33#3737##53###3%#3#375'#5373537'##53573#3#737'#3#3##%#'#53533#573#7!5'735#37'#3#37'#3#573#'5335'75#ÑYYYY²YY²XY²±YYY÷×Y³ZYY²XY¼±YYY²²XXY±YYYYYYý¿YYYYYYY²XYYYYX±Y²YYYYXYYXYYþÊXYYYY±þöYYYYYYYYY²YYYYYYY²Y
+YYY,,YYYYY00Y®XþúW]þúX¯XVWX^¯¯û�Wd¯WþúWWXWWXXWWXWý�®XWWþú´]XWWWWXþ£WWWXXþúþ£µXþ£]þ£WWWX®®XþúþLWXX¯W¯XX®W¯Wþ£XX´XXþL´þKWWµWWþKµWWXX®,,®XXWW®.*®WzÖ,	<	`	T	`	`	8n	`
+Ö¦Öô¶ÄÖÖÖæôÖÖ$-
+ÖÖ
+ÖÖoby
+ejnénormalStandardš±½¿½¹º¬"Funky Buttons" font is © 2012 Dmitri Poguliayev / WKStudio.   Licensed under Creative Commons BY-SA.   http://wks.arai-kibou.ru/fontlab.phpMediumMarlettVersion 1.01 Febrary 7, 2014NormaaliNormaleStandaardNormalny1KG=K9NormálneNavadnoArruntaÿ'–%DEFGHIJKLMNOPQRSTUVWXYZ[\]ÿÿ
\ No newline at end of file
Index: media/fonts/CMakeLists.txt
===================================================================
--- media/fonts/CMakeLists.txt	(rÃ©vision 61927)
+++ media/fonts/CMakeLists.txt	(copie de travail)
@@ -50,6 +50,7 @@
     symbol.ttf
     tahoma.ttf
     tahomabd.ttf
+    UniVGA16.ttf
 )
 
 foreach(item ${FONT_FILES})
Index: media/fonts/doc/UniVGA/README.txt
===================================================================
--- media/fonts/doc/UniVGA/README.txt	(rÃ©vision 0)
+++ media/fonts/doc/UniVGA/README.txt	(rÃ©vision 62573)
@@ -0,0 +1,31 @@
+Unicode VGA font
+================
+Author : Dmitry Bolkhovityanov
+E-mail : bolkhov@inp.nsk.su
+
+Copyright © 2001 by Dmitry Yu. Bolkhovityanov
+
+http://www.inp.nsk.su/~bolkhov/files/fonts/univga/
+
+The UNI-VGA font can be distributed and modified freely, according to the X license.
+The Basic Latin block was taken almost unchanged from DosEmu's vga.bdf. All the other blocks (except noted) were created mainly from scratch by me, Dmitry Bolkhovityanov.
+Letters in the Hebrew block were taken unchanged from a public domain hebrew console font.
+Glyphs in Arabic, Arabic Presentation Forms-A, Arabic Presentation Forms-B and U+262B Farsi symbol were kindly donated by Behdad Esfahbod.
+Thanks to Birger Langkjer for idea, to Mark Leisher for his wonderful XmBDFEd, and to many others for their support.
+
+
++=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+
+Adapted version, converted to TTF, by Roy Tam
+See http://www.reactos.org/forum/viewtopic.php?f=2&t=12930#p105065
+and http://www.reactos.org/forum/viewtopic.php?f=2&t=12930&start=15#p105307
+for more information.
+
+Unicode VGA font - Medium size 16px (UniVGA16.ttf)
+==================================================
+Author : Roy Tam
+Credits: Dmitry Bolkhovityanov
+
+http://rtoss.googlecode.com/svn/UniVGA16/
+https://code.google.com/p/rtoss/source/browse/UniVGA16

Modification de propriÃ©tÃ©s sur media/fonts/doc/UniVGA/README.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: media/fonts/doc/UniVGA
===================================================================
--- media/fonts/doc/UniVGA	(rÃ©vision 0)
+++ media/fonts/doc/UniVGA	(copie de travail)

Modification de propriÃ©tÃ©s sur media/fonts/doc/UniVGA
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: media/fonts/UniVGA16.ttf
===================================================================
--- media/fonts/UniVGA16.ttf	(rÃ©vision 0)
+++ media/fonts/UniVGA16.ttf	(rÃ©vision 62573)
@@ -0,0 +1,649 @@
+€`FFTMiØö,]ÀOS/2RdÈhVcmapHÞ1Æ/�˜cvt "ˆ5(gaspÿÿ]¸glyfÊW¤Íc¨Ðhead‹™¡ì6hhea‚õ$$hmtxæ"À-Ðloca·ÃÔ5,-ÔmaxpÖH name¸VÚ"ÐDpostª!‘~
+P¡propÍîz6]Ü8ªÞ4ó_<õ‹ÎÕs¯Ïáôÿ€€€ÿ€tt @ô™Ì�™Ìë3		ä.ÿÀyû,PfEd@ÿý3ÿ3€€`ÿÿÿ"€@@@@@@@€@€€€@€À@À€@@@€@@€€€€@€@@À@€@@@À@@€@@@ÀÀ€@@€€@@@@€€@@@@@@@€€€€@€€@@@@@@@@@@€€@À@@€@@@@@@@@@@€€€@€@@@€€€À@@@À@À@À@À@@À@€@@À@@€€€À@@@€€@À@€@@@@€@@€@@@@@@@@€@@@€@@@@@@@@@@@@€@@@@@@@@@@@@@@@@@@€€@@€@@@@@@@€@@@@@@@@@@@€@À@@€À@À€@€À@€€€@€@@€€@@ÀÀ@@@@@ÀÀ@À@ÀÀ@@@€@ÀÀÀ€€@€@€€@@@@@@€€€À€€€ÀÀ@@@@€À@@@À@@@@@@@@@@@@@@@@@@@@@@À@À@@@@@@@@@€€@À€ÀÀÀ@À€€@@€€€€À@@€@@@€@@@@@@@@@€€€€@@@@@@@@€€€€@@€€À@ÀÀ@À@@@@@€@€€@@@@@@@@@€À@@€@@@@@@@@À@À@@@@@@@@@@@€€À@@@@@@À@@@€@@@@@@@@@@@@@À@@ÀÀ@À@À@@€€€€€€ÀÀÀÀÀ€ÀÀ@@ÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀ€À€€À€€À€€ÀÀÀÀÀÀÀÀÀÀ@À@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@€À@@€€@@@@@@@@@@@@@@@@@@@@€@€ÀÀÀÀÀ€À€ÀÀ€ÀÀÀ@€@@€€€€€@€@€€€À€€€€@@€À@@ÀÀ€@@@@@@@@@@€@@@@€@€ŽrØ€X
+3­ÏÝî	#Auz~ŠŒ¡Î×ó†ÎõùV_‡Š¡¹Äêô:UmíþÓ×ÚÝæ›ù ' F M p � ¯!:!ƒ!ó"ñ#######!#*#½#Î$
+$$$&%•%÷&&
+&& &"&&&+&7&S&g&oûû±ûéûÿücü�üôý?ýòþRþfþkþrþtþüþÿÿýÿÿ
+ "P°Øî	#@tz~„ŒŽ£ÐÚˆÐø0Ya‰‘£»Ðð!@`pðÓ×ÚÝæ   0 H p t  !!S!�"####### #)#›#Î$	$#$&%% &&&& &"&&&(&.&9&`&iûûPûÓûüü[ü�üòý<ýòþPþTþhþpþtþvþÿÿýÿÿÿâÿàÿÄÿÂÿºÿªÿ™ÿ˜ÿ“ÿ‹ÿ}ÿaÿ/ÿ+ÿ(ÿ#ÿ"ÿ!ÿ ÿÿÿÿÿÿ
+ÿþçþåþäþãþÝþÜþÛþÐþËþ´þ¦þ£þ¢þ�þ“þ‘þ�ô»ô¸ô¶ô´ô¬ç“ç�ç‰æ‘æ‰æˆæfæcæSæåëåßåÓåÅåÄå¿å»å´å³å¯å¨å8å(äîäÙäØãÿãõãíãëãéãÝãÜãÙãØãÖãÕãÉãÈ8îÍ»`4
+Ó
+ŒÚ}|{wvusvÖ
+	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�¦§©«³¸¾ÃÂÄÆÅÇÉËÊÌÍÏÎÐÑÓÕÔÖØ×ÜÛÝÞ±’„…‰³˜Á�‹%–Š3¨ºñ“78‡—ÕäâàþŒœÉÈÚ¡ƒŽítÙ��·‚¢¥·45¤¥­®©ªÙ	¿áZÍÿÂÃ
+9
+:²™«¯¹¤¬£­ª¯°±®µ¶´¼½»ˆ–‘’“”š—•‰"ˆ((dôdÀP˜äL˜ôT¬ð`¤è4x¸TpÀô(d À		H	€	€	¸	è
+D
+°Œ¬è$p ÀÜø
+D
+¬
+Ü<ŒÜ p°Px¨(„Ðd´X¤ìL€°è8p°ð,pÀl ÌP¸üX€Èð4Lp´ø4€Èd¨à p˜ÔH”Ü |¼ô ( h À!!X!”!À""4"|"|"´##X#¬$$0$Ì$ô%¤%è&L&p&Œ''('`'œ'ì(<(`(˜(Ø(ô))H)Œ)ô*l*ð+„+Ð,8, --Œ-ø.p.À/0/�/ð0\0À11@1˜1à2@2 2ð3@3”3ô4H4”55L5”5à6,6€6Ì77p7È808˜8ø9`9Ä::p:È;0;”;Ð<<X<œ<ü=\=¬=ü>\>¼??H?´@@L@¨@üATAœAüB\B¬CC|CèDDD°EExEØF<FˆGG`GÌH8H˜HðIHI˜JJ`J¸KKpKÌL8L M M”NN|NèOHOÀP(PpPÜQ,Q|QÌRRTRŒRØS SdS°SìTT`TÄUUtUØV@V�VØWWdW WôX<X€X¸YY<YŒYÜZ4ZˆZè[L[œ[ä\$\l\´]]d]Ä^$^t^Ì_,_„_è`@`¬aaŒaüb|büctcädhdèe4eˆeÜf4fxfÈg g|g¼hhPh¨hüi\i¸jj`j´kktkÐl8l�mmhmÔn4n°o(odo´pp\p¨qqHq qür@r røsDs˜ttPt˜tôu8u€uävHvŒv¼vüw`w¼wøxpx°xðy(ypy¼zzXz¤zð{D{¤||`|È}}d}¤}ð~(~d~°~ü8Œà€@€”€ð�L� ‚‚d‚°‚üƒTƒ¬ƒÈƒô„4„l„ä…`…Ø††€†Ü‡‡|‡ÜˆLˆ´‰‰L‰¨ŠŠ`Š¼‹‹h‹ÀŒ$ŒˆŒì�H�¬�ðŽdŽÌ�0�Œ�è�X�È‘0‘°’$’”““\“¬””l”ä•`•¸––p–Ì—@—¤—ì˜8˜ˆ˜Ø™P™Àš$šœ› ›œœœ„œô�T�Èž4žœžüŸPŸ Ÿì 4 ” ô¡L¡¤¢¢|¢à£@£œ£ü¤L¤¤¥¥Œ¥Ô¦,¦ˆ¦Ü§4§˜§ô¨L¨´©©t©Äª(ª„ªä«@«¬¬¬\¬¤¬ü­P­œ­ð®4®x®¼¯¯L¯ ¯ø°P°”°Ø±D±”±ä²L²˜²Ü³<³Œ³Ø´´|´Àµµhµ°µØ¶¶L¶”¶Ä·0·p·´·ø¸<¸|¸¸¸ü¹L¹ ¹ôº8º|ºÌ»»X»�»È¼¼`¼Ì½½h½¤½ô¾4¾t¾À¿¿<¿p¿°¿ôÀ0À�ÁÁTÁ´ÁøÂ<Â€ÂÀÃ,Ã|ÃÈÄÄHÄœÄìÅ$ÅxÅÌÆ Æ|ÆðÇ\ÇØÈHÈ°ÉÉxÉÈÊLÊˆÊ´ÊèË$ËTËˆË¼ËüÌ<ÌtÌ ÌèÍÍ0ÍTÍ€Í¬ÍàÎÎTÎ�ÎÈÏÏ4ÏhÏ€ÏœÏÀÏäÏüÐÐ4ÐTÐ€ÐœÐÐÐøÑ,Ñ`Ñ�Ñ´ÑØÒÒ8Ò\Ò€Ò¤ÒÀÒàÓÓ,ÓTÓ€Ó°ÓÐÔÔpÔŒÔÜÕ ÕdÕ´ÖÖhÖ¼××`×˜×èØ4Ø�ØÄÙÙ<ÙŒÙÜÚÚ\Ú¼ÚøÛ ÛdÛÌÜÜDÜœÝÝPÝœÝäÞ<Þ”ÞøßDß€ßäà(àtà¸á ápáÔââTâ|âÌã0ãhã°ääTäŒäÈååPå|å´ææŒæØç,çpçÀèè`èÈé é|éÜê@ê¸ëëlëèìDì„ìÈíí\í îîlîÀïï\ï˜ïàð<ð�ððñ`ñÈòòTò¤òèóXó°óìô,ôŒôðõ<õ„õäöDötö¼öô÷@÷�÷Ôø8øŒøìù$ùxùÄúúLú”úàûDûœûÜü8üˆü¼üüý0ýlý”ýØþ0þdþ¤þüÿdÿ˜ÿÈÿü<ˆÔ|Ì\°4xÀX”ì<p¬Ø8„Àø<�èHx¸		D	ˆ	Ì
+
+d
+¼ xÀdœà
+ 
+h
+¬
+ü\¬D”ä<�ôLœðP° pèH¼<„ÈT˜èXÌ(€Ü4˜ülØ(d´Ø4X¼P´h´l¤Ø   h Ä!(!˜!ð"`"È#$#€#Ô$$$€$à%4%ˆ%È&&@&x&Ä''|'ä(T(¨(ä)$)h)¤)ø*D*¸++X+˜+Ô,,P,�,À,ì-L-¨. .�.À/D/¬00t0´0ô181t1´1ì2(2`2¬2ô3d3Ä404�4à5D5¬66T6˜6ø7X7È8(8˜99X9¬9ü:D:œ:ð;D;˜;à<$<€<à=X=¸>>\>¸??„?ð@<@€@àA<A€AÌB(B€BØC(CxCÀDDTD DàE8E|E¼EüF„F¼FøGDG€G¸H HTHˆHàI,I\I„IÀJJ@J¨KK<K”KÈLLPL˜LÈMMPM¸MôN NTNÀNðOLOˆOäP0PlPÌPøQ$QPQ|Q¨QäRRXRŒRÌSS8StS¬SàT4TtT¤TÄUU\UŒU¼V VPV¨VÜWW4WŒW¸XXPX°XàYY@Y|Y¨YìZZPZœZÔ[8[p[˜[Ä[ø\(\\\€\°\Ø]]D]l]”]Ä]ì^^T^´^è__8_`_„_¼_ð``P`„`°`Ð`øa@ata˜aàbbLbdbˆb¸bÐbôcc@c\ctc˜c´cÐcìdd0dLd¤dÔee<epe”eÐffHftf¨fØggTgœgÐgøh@h„h¼høi<i”iØiüj8jlj¤jäk(kLk€k¨kÜl0lxl´lømtm¸n8nXn nüoLo¨pp|pìq0q„qÈrrtrðsTsÄttptÐu<uXuÀvDv väw,w„wäx8xˆxðy$y„y¸yÜz z@z€z¸zä{{L{x{°{ð|@| }}<}Œ}Ü~ ~Ð4Œ¨€€P€¤€Ø��˜‚H‚ÀƒƒpƒÄ„8„”„ð…T…¸†@†¼‡8‡´ˆ8ˆ¼‰L‰°ŠŠlŠÜ‹8‹”‹üŒdŒÔ�8�œ�ôŽ@Ž Žø�P�´�$�Œ‘‘œ’’ ““�“ì”T”È•D•À–D–¼—H—¬˜˜x˜à™X™ÐšPšà›tœœ �4�”�äžHž¬ŸŸ\ŸÌ H ´¡¡¤¢¢@¢˜¢à£H£œ¤¤˜¤ü¥t¥à¦X¦¨§§€§ä¨X¨Ô© ©�©¬©ðªHª¸ªè«0«Œ«¼¬­­œ­È­ä®$®H®¨®Ø¯$¯X¯Œ¯Ì°ˆ°è±H±t±˜±Ô²²L²œ²ä³P³¤³ô´D´ˆµµ|µð¶T¶¼·@·œ¸0¸ˆ¹¹€¹èº@º”ºô»H»¤»ô¼t¼Ü½4½Œ½è¾@¾˜¾ð¿T¿´À$ÀŒÀôÁXÁÄÂ,ÂœÃÃpÃØÄXÄÐÅ Å|ÅèÆDÆ„ÆÔÇÇhÇ´ÈÈ\È¸ÉÉhÉ¸ÊÊhÊ¸ËËtËÐÌ0ÌˆÌäÍ(Í\Í¬ÍðÎ4ÎhÎÀÏÏ\Ï°ÏøÐDÐ”ÐàÑ(ÑpÑÀÒÒXÒ ÓÓhÓÜÔLÔÄÕ8Õ�ÕìÖDÖ Öô×T× ×øØLØœØôÙDÙ¨ÚÚ`Ú¬ÛÛˆÛôÜ\ÜÜÝXÝàÞlÞèß`ß¤ßôà4à€àÀáá`áÀââ\â¬ããTã¬ää€äÔå4å¤ææPæ�æèç<ç”çèèDè èðé@éŒéØêLê´ë0ë¤ëðì@ìÀí4í îîlîÌïïxïàðLð¬ðôñXñ¨òòpòøótóøôtõõ|öö ÷$÷˜øø�ùù„úúŒûû”üü€üÜý0ý”ýôþdþÐÿLÿÌPÌPÐTÔPÈPŒÐ\°|ðdÔD¸	4	¨
+
+x
+Ø<œdÐ
+@
+´l¨ð<�äD˜øP¸ŒÔ,|Ô(xÔ4˜\¸(˜xôt4ð¤X Ô˜,Ä t!!È"x##x#è$$l$ˆ$¤$À$Ü%%0%T%x%˜%¼%ð&$&X&Œ&¼&ø'$'X't'œ'Ð'ì(T(È(è))X)x)¨)è*(*p*¼+l+°,,,L,€,À-(-D-ˆ-¸-è.L.°.Ü//P/ˆ/Ä00@0„0À11X1ˆ1¤1Ì1ü2(2`2œ2È33h3¨3ä4(4`4´4ø5(5D5l5˜5Ä5ü6L6¨6ü7D7¤88p8Ü9D9Ä::p:Ü;<;�<<„==l=Ì>@>À?@?œ@@\@ÐA˜B4BxBÌC,C DD´E4EˆEàF4FÌGXG GüHtIItIÔJ8J˜JÜK,K¤L0L¤LðM<MÀMìN<N¼ODOÌP PxPøQtQ¼R RpRøS<S„S¼SôT<TÀUTUÔV`VøWˆXX¬YHZZ°[X[°[à\\X\ \ä],]|]Ü^,^”^ä_L_„_Ü`(`h`�`Ða(a|a°bbhbäc@c˜côdpd˜dÔe e\e´ff´ggHg|g¸gìh<hˆhÔi ili´jjTj�jÌk(kxkØl(l„làm$m`m¤män4n€nÌo(oˆoìp<p�pÔqqXqœqÔrr\r¤rüspsÈt tLtxt tÈtôu uHupuÜv<v¤wwTw¼xxLx”xìyLy yÜzz\zœzô{P{È|H|À}4}„}Ô~,~ˆ~à8�ì€D€¤€ì�4�„�à‚0‚€‚ôƒ`ƒÈ„0„´…H…¨…ü†P†Ô‡0‡l‡Ìˆˆ\ˆØ‰(‰x‰ÀŠ0ŠxŠÄ‹<‹„‹ ‹ØŒŒ€ŒœŒØ��`�¬ŽŽ<ŽhŽ°�$���Ø�,�L�”�ø‘H‘d‘¤‘Ð’’`’¬’Ø““H“”””¤••Ä–(–¸—D—|—´—Ü˜ ˜H˜€˜Ð™ ™T™ˆ™ÌššHšœšÜ››t›Àœœ„œØ�D�¤žžhž°ŸŸ<ŸtŸ¸  D ˆ Ì¡¡T¡œ¡ü¢X¢¨££t£Ð¤¤t¤¨¥ ¥`¥¨¥ð¦D¦˜¦ø§`§à¨l¨à©4©„©Øª8ªœªø«T«Ì¬@¬¤­­|­è®,®p®Ô¯8¯œ°°\°´°ä±±l±Ä²²@²¤³³P³˜´´t´Üµµ,µ`µ”µ¼µä¶X¶Ä·\·à¸d¸ô¹p¹èºXº¨ºä»H»”»¼»ä¼¼,¼T¼„¼´¼ì½0½l½¼¾¾d¾Ì¿¿`¿¨¿ðÀDÀ˜ÀäÁ0ÁhÁ¨ÁÌÂ(Â„ÂàÃÃhÃ´ÄÄ@Ä€ÄÄÄàÅÅÈÆ8Æ°Ç0Ç¨ÈÈLÈ”ÈÜÉ<ÉœÊÊ|ÊÔËËtËØÌ¬Í�ÎÎxÎÀÏÏlÏÐÐDÐ¼ÑÑtÑ¸ÑøÒ`ÒÈÓ8Ó¨ÔÔ\ÔÈÕ4ÕlÕ ÕØÖÖ”ÖÜ×× ×@×`×„Ø,Ø¼Ù@ÙlÙ˜ÙðÚHÚˆÚ¤ÚàÛ Û@Û|Û Û¼ÛÜÜÜ Ü@ÜlÜ¬ÜØÜôÝ Ý`ÝŒÝ¨ÝÄÞÞ@Þ„ÞÈÞìßßLß€ßœß¼ßØßôàà,àˆàÌááTá˜áìââPâœâ¸âÔâðãã<ãpã¬ãèä ä`äœäØäüåå@å`å€å åÀåàææ æ@æ`æ€æ æÀæàçç0çXç€ç¨çÐçøè èHèpèœèÈèðééHépé˜éÀéèêê8ê`êˆê°êÔëë(ëLëpëœëÄëèììHìxì¨ìØíí8ílíœíÌíüî,î\îŒî¼îìïï8ï`ïˆï°ïÜðð8ðlð”ðÀðôññHñ|ñ¤ñÐòò4òlò°òàóó`ó�óÄôô8ôhô¨ôèõ0õˆõ¼õðö öPö¼÷,÷à÷üøø4øPøløˆø¤øÀøàùù ù@ù\ùtù�ù¬ùÈùäúúú8úTúpúŒú¨úÄúàúüûü�þÔ <\x¤ä p´PÈ<Øô8`|¬Ð@¤ÐL°ÜDˆÀ L„È	,	X	Œ	À
+
+T
+ð¨<Ø
+H
+àHì,€Ô4ŒôHt ÜL�Ô0\ˆÐP�Ð\Œ¼ü<xè0xä \˜ÔHÄ@´H�èT¬„œäL|È ( ˜!H!¸""H"�##¼$<$À$ü%D%Œ%Ü&$&t&Ä' ' ( („))l)Ì*8*�*è+@+”+ì,`,Ô--x-à.0.¨//|/Ì0 0€0ì1t1Ü2(2¤3,3t44D4�4ü5$5\5œ5à606|6è7D7œ7ì8L8¨8ü9X9¼::`:¨:ð;L;¤;ô<D<¬==h=Ä>>h>°>ø?\?À@@|@ØA4A„AØBTBØC@C´D8DÈE<E¼F8F¼GG|GøH|HÐI8I¼JHJ¨KK¬LDL¬M(M„MäN@N¤OOtOØPDP¨PüQ`Q´RRˆRÐS$S¤T0T�TüU”V8V°W4WÈXlXäYhY´ZZtZä[4[ˆ[ô\|\À\ð](]X]È^8^˜__P_„_ô`P`ÈaDa¬b b¨c4c¨d d„dìeœffŒfàgXgÐhLh´iiTiœiÌjj\j jäk,k€kÔl4l¼m$m|mðnDn”nèoPoÐp0p�pèq`qØrlr�r´rÐrüs sls”s°sàttDtxtœtÀuuŒuÌuüvvTv�v¸vôwdw°xx4xˆxèyy@yxy¼zz4zhz¨zô{,{t{¼{ø|@|„|Ô}P}Ð~~`~Ô@˜ô€€<€„€Ì��H�¤‚‚l‚¼ƒƒPƒ¬„„T„¨……”…à†@†¤‡‡T‡¨ˆˆ”ˆà‰@‰„‰ÐŠ$Š|ŠÀŠô‹D‹„‹àŒ<ŒˆŒà�\�ØŽDŽ¼� �€�Ð� ��‘‘`‘À’’l’´““d“Ì” ”€”à•l•œ•ä–P–è—$—|—ä˜T˜¨™™ŒššpšØ›4› ›èœ<œ€œÈœð�$�l�Àžž\ž´ŸŸLŸŒŸÐ 0 �¡¡d¡¼¢¢P¢¸££X£ ¤0¤¨¥,¥”¦,¦¤§§l¨`¨Ð"2ª3!'3#"îÌÌªýV"f€
+730!5!##0353À@þ€@@À@€À€Àþ@@€@@
+€À!'-3%5#!5#5#!5#0305%0305%0305%0305%0305%0305€@€À€@€À@@@þ@@@@þ@@@@€@@@@@@@@@þ@€€€€€@€€€€€@€€€€€€#5!335'5#!5#!5!0#0!30#0)5!€ÿ@€€@@ÿ€þ€@À@@þ€€þ€€@@@@À@@@@þ€@@þ@€
+%30#5!#03!%5#5!#53353À@@þ€@@€ÿ@@À@€@À@@þ@À@@@@@@@@€À€%353530#5##5##03333@@@@€@€@@@@@À@@@@@@ÿ@@@ÀÀ€5#5#5#5####333353535À@@@@@@@@@@@@@€@@@@@@@@@@@@@@€À	%5#05#0#75335#05#5##0#€@€@@€À€@€@€€@€€@ÀÀÀÀ€@@€À€À%5#0535305#5#5#5####0330#€@€@@@@€@@@@€@€@€@€@@@@@@€@€@€€
+305#5##033@@@€@@€@€@@€@ÿ€€0!05#0535330#þÀ@@€@@€üý€@€@@€@@ÀÀ@
+!530#5!#035#0535330#€@@ÿ@€@@€@@@@@@ÿ@€@@€@ÿ€€!0!05#035!30#'305#5##033þ€@@@@@@@€@@€€üý@@@@ÿ@€€@@€@€À%7!530#5#5353030!3####03030@@@@@@@ÿ@@@@@€€À@@@@@€@@@@@ÿÿ@€À!5#53530#5!#033#30305'030À€@@@ÿ@@@€€€€€@@@@@ÿ@@@€€Àÿ@7330#353!0#353€@À@€@þ@@€@À€ÀÿÀ@@þÀ@@@€À#'5#75#5#5###3#353353575#53'5#€€€@€@€€€€@€@€€À€À€@@€@@ÀÀ@@@@@ÀÀ@€@@€@@€@@€À@5#5#5#5#5#5#3535353535À€@@@@@@@@@@À@@@@@@ý@@@@@@€À@%3######3333€@@@@@@€€@@@À@À@@@@@@@@@@@ÀÀ5#535#5#5###3#333535À€€@@€@@€€@@€@@@À@@@@@@À@@@@@@€À030530305333@€€€þ€€€€€€€€þ@Àþ@À€3330!#3753À€@€þ@@@@@ÀþÀ@ýÀ€@À@@ÀÀ@À@5C%5#5#535305#5#5#5#5335#5!#33##03333#5#3!5'5#0535330#À@@@@@@€@À€@þÀ@@@@@@@€@À€@@À@@@@@€@@@@€@@@@@@@@@@@@€@@@@@@@@À@€@@€@€À€0!0À€ÿ@€À%5#53535#535#5#5###3#33#À€@@€€@@€@@€€@@€€@@@@À@@@@@@À@@@@@€À5#5#5###33À@@€@@€€@@@@@@@þ@À@€À5###333535À€€€@@€@@Àþ@@@@@@À@5#5#5#3!!#3535À@@€@ÿ@€@€@@@@@@@@@@À@5#5!5!535###33@ÿ@€@@@@@@@@@@@@@@À5!5#0ÀþÀ€@ÀÿÀ@5#5#5#0#05###33305303535À@@@@@@@@@@@@@€@@@€€@@@@@€€@@ÀÀ€0!05#05#05#5##0#0À@@@@@@@€€€€@@€€ÀÀ€305305305!0303033@@@þ@@@@@€€€€€€@€€€03053535#5##À€€€@@€@€€ÀÀÀ@@À@@À@
+30#!35#03€@€@@€@€@ÀÀÿ€ÀÀ#'5#535#05#0#05#0#3#3030530305'53À@@@€@€@@@@€@€À@@À@€€€€@À@€€€€@ÀÀÀ€/703053530#5!533305#5#05#0##3!0#5#5#03À€@@@ÿÀ@@@@€€@@À@@@€€€@@À@@€@€€@À@ÿ@@€@€À€#)73535353535305#######03%03050305@@@@@@@@@@@@@@@€þ@€À@@@@@€@@@@@@€€€€€€€€À*0%5#035##535305#5##03##0335#03330530À@@€@@@@À@@@@@À€@@@€@€@@@@@€@@€@@ÿ@@@À@À€€€@@35#03À@€@€Àÿ€€€%5#5#03535###033€@@@@€@@@@€@@€@@@@þ€@@€€€%3530#5#5#330##3@@@@€@@@@€À@€@@@@þ€@@@5#535#535##5#3#3#353À@€€@€€€@€€@€€@@@@@@@@@@@@@@@À@5#05#0#30305À€€€€€€@€€@€€€@@@%35##3@€@€€ÀÀ@€ÀÀ5!Àþ@€@@À€@0305À€€€€À€73535353535305#######03@@@@@@@@@@@@@@@À@@@@@€@@@@@@€€À#)7353530#5#5###0335#035330#0305€À@@@@À@@@€@@@@@@@À@@@€@@@@þ€@@€@@þ€@@€€@€À%5####30#À€€@@€€€@@@@@þ€@€À'!05##0535353535305#5!#3530####À€À@@@@@@þÀ@€À@@@@@À€@€@@@@€@@@@€@@@@€À7!530#535#5!#353#30#5#@@@@@@þÀ@€ÀÀÀÀ€À@@@À@@@@À@ÿ@@€À%5#535######0!#53530À@@@€@@@@@@@@€@À@@@@@@€À@@@@€€À5!!0#5#3!530#5!5Àþ@@À€@@@@ÿÀ@þÀÿ@@@@@À€À5###3!530#5!0535030@À@@@@@@ÿ@@ÀÀ@@@þ@@@@€@þÿ€À030353530!0353##€€@@@þ@€À@@€ÿ@@€@À@@€À7!530#535#5!#3#0303053@@@@@@þÀ@@@€ÀÀÀÀ@@@À@@À@ÿÿ@ÀÀ€À%353#5!#3!##!53@@@@þÀ@@@ÀÀÀÀ@À@@À@À@@€ÀÀÀÀ@€03050305À€€€@€€@€€€€@€	%305#0#30305@€@€@€À€€@€€@€ÀÀ#%5#5#5#5#535353535#####3333À@@@@@@@@€@@@@@@@@€@@@@@@@@@@@@@@@@@@@@À@5!%5!Àþ€€þ€@@@À@@@€ÀÀ#5#5#5#5#5#3333####35353535À@@@@€@@@@@@@@€@@@€@@@@@@@@@@@@@@@@@@€À03053535305#5!#030530#À€€€@@@þÀ@€À@€€ÀÀ@€@@€€€@€ÀÀ%5!30#0353#5!#3€ÿÀ€À@@þÀ@@€@À€ÿ@@@@þ@@€À30303#5#5#5###0535330€À€@@@@@@@@@@@þ@ÿÀ@@@@@@€€@@€€À7#!530#535#5!3003053@@€@@@@þ€@€€€€À@@@À@@þÿ@ÀÀ€À#7!5305###5#03533305#5!##03€@@@€@@€@@@ÿ@@@À@@€@@@€@@@€@@@þ€@€À7#!53530#5#5!300330#@@@@@@@þÀ@€@@@À@@@€@@@þ@þ€@€À7#!5###0335##53335!30@@À@@€@@@@€@@þ@@À@À@@@À@À@@À@€À%5#0335##53335!30#@@@@@€@@þ@@@€@@À@À@@À@þ@€À$735#5#03533305#5!##03!3!3€À€@@€@@@ÿ@@@@@ÿ€À@@@€@@@€@@@þ€@@@@À€À03330#0#0€À€€Àý€@þÀ€ÿ€€€
+%5#035!30#€@@ÿ@@€@@@þ@€À5!30#5#3!530Àÿ@€€@@À@@þÀÀ@@€À7#303335#5#053535###0#30@@À@@€@@@@€@@À@À@@ÀÀ@€@ÀÀ@@€À5!30#!5###0ÿ@@À@@€À@@þ@À@@€À0303353030###5#5€@@@€€@@@ý€€@@þ€€@@@@€À030333030##5#5#5€@@@€€@@@ý€€@@ÿ€À@@@€À
+7!530#5!#03030@@@@þÀ@€ÀÀ@@@@þþ€À%5#03535#5!30#53@À@@þ€@@À€€@@À@@þ@€ÀÀÀ!5#0530#5!#0330'03#5#0À@@@þÀ@@À€À@@@€@@þ@€Àþ@@€€À7#333030#0535#5!3053@@À@@€@@@þ€@€€À@@@ÿ€À@@ÀÀÀ€À)7!535#5#5#5#0530305#5!#03333#05#0@@@@@€@À€@þÀ@@@€@À€À@@À@@@€€€@@€@@@À€€@€À%5#335!353#€@@@þ€@@@€@À@ÀÀ@þ@@€À7!53###@@@€À€À@@@ýÀ@ýÀ€À%35353###5##3333@@@€@@@€@@@@À@@Àþ@@@Àþ@@@@€À730530353##5###@€@€@€@@@€À@€€@@þ@ÀÀÀýÀ€À1030535330305#05#05305305#0##5#05#03030#0€@@@€@@@@€@@@€@@@€€@@€€€€€€€@@€€€€€@€À%5#03530#0#0#0330#€@@@€€€@@@€@@ÿÿ@ÿ@€À%!5###053535353535!353530####À@@À@@@@@þ@@@À@@@@@ÀÀ@@€@@@@ÀÀ@@€@@@@€€€	%5#035!0€€€ÿ€@@ý€€ÀÀ%35#5#5#5#5#5#5#33333€@@@@@@@@@@@@@À@À@@@@@@À@@@@@€€€	%#!0!30€ÿ€À@€@€À€5#5#5#5####353533À@@@@@@@€@@@€@@@@@@@@@@@@@!5!þ@@€À@€	5#05#03@@€@À@€€@€À@%5##5!3##335#533À@@ÿÀÀ@@À€€@€@@@@@@À@@ÀÀ@€À!530#5#5#5#330@@@@@€ÀÀ@@ÀýÀ@@@À@þ@@ÿ€À@%5##335#5!#3!5À€ÀÀ€@þÀ@@@À@@@@@@@þÀ@@€À%5##30###0335#03533À@À@€@@@À€@@@€@@@€@@ÿ@@@þÀ@€À@%5##5!05#5!#3!553À€À@@þÀ@@@ÿÀÀ@@À€@@þÀ@@@@€€%5#035#533305#5###30#@@@@@@@À@@@@€@@À@@€@@À@ÿ@ÿÀÀ@5###35##330#5#3!530À€@€€À@@À€€@@@@þÀ@@@þÀ@€@@@@€À
+7#335#0#30030#5#@@À@@À@€@€À@@@@Àþ€€@@€€€
+%5#0#3#0305€@À@@@€€@€@þÀ@€€€@ÿÀÀ3!53#30#05#00305€@À@€€€@@@@þ€€€€€À5####30#35330305#5#0535À€@@À@@À@@€@@@@@@@@þ@À@€€@€@€€€
+%5##30#€@À@@€@@@þ@€À@33030330#5##5€@@@€@€@@þ@@ÿþÀ€@@@€À@	030#5#!030#5#@€@€@€@Àþ€€@@þ€€@@€À@7!53#5!#33@@@@þÀ@€ÀÀ@@@@@þÀ@þÀÿÀÀ@5#05353#5##5#30#3@À@@À@€@@À€@@€@@@@@@þ@@þÀÿÀÀ@5#035###35##330#À@@€@€€À@@À@@@@@þÀ@@@þÀ@€@€À@%5#03530305#5##5#3#@@@€@À@€@@€@@€€@@@@þÀ@€À@#%5#5#5#5#5335#5!#3333#5#3!5À@@€@À€@þÀ@@@€@À€@@À@@@@@@@@@@@@@@@@@@€À%5##35#5##0#3335À€@€€@@€€@ÀÀ@@@@À@€@þÀ@@€À@%5#0#0#0#03353À@€€€@À@€@€þ€€þ€@@@@€À@%353###333@@@€€€@@€À@@þÀ@þÀ@@€À@%30##5###033533€@€@@@€@€@€À€þÀÀÀ@þ€@@@€À@#%5#5#53535###5#5#33##353533À@@@@€@@@€@@@@€@@@€@@À@@@@@@@@À@@@@@@ÿÀÀ@!3530#0#0#03!#!!@@@€À€@@ÿ@@þ€€þ€@@@@€À@ 5!0353####0!05##535353535Àþ@€€@@@@À€À@@@@@€@@@@@€€@@@@@@@€À%5#0#53535###303À€@@€À@€€@€@@À@@À@ÿ@À€@	3030À€€€ÀþÀ@@ÿ@€À5#5#5#33#0#3530À€@À€@@€À@À@À@@À@ÿ@@€À5##5##35335À€@À@€@ÀÀ@@@@@@@@ÀÀ€0!0#5#5#5###53533À@@@@@@@@@@Àÿ@@@@@@ÀÀ@@À€€€%35#5##330305@@@€@@€€€ÀÀÀÀÀ@€€€@€À@5##335#5#05#0##33030535À€€€€@@€@@@@€@@@@@@@@€€@þÀ@€€@€À@ %5##35#533305#5###30#0!5À€€@@@@@@À@@@@€À@@@@À@@€@@À@ÿ€@@ÀÀ€%5#535#535##5#3#3#353'53À@@@@€€€@@@@€€€€À@@À@@@@@@À@@@@€ÀÀ@€À#5#535#535305#0#05#033#3#335À€€€@@€€€@@€€€€€@@@@@@€€€€@@@@@ÀÀÀ€@	3030À€€€ÀþÀ@@ÿ@À@5C%5#5#535305#5#5#5#5335#5!#33##03333#5#3!5'5#0535330#À@@@@@@€@À€@þÀ@@@@@@@€@À€@@À@@@@@€@@@@€@@@@@@@@@@@@€@@@@@@@@À@€@@€@@€€030530305@€@€€€€€€#)-1595##3575#!5!5#!35#!0#0!30#00#035+35#5#%!5!€@€€@@Àÿ@@@@þÀ@À@@ÿ@@€€€@@€@ÿÿ@@@@@À@@þÀ@@@@@€þ€€þÀÿ@@@@@@@@ÀÀ@5!%5#5!#0370530Àþ€€@ÿ@@@@À@@€@À@€@@€€À@'5#5#53535####53535###3335#533À@@@@€@@@@@€@@@@€@@@@@@@@@@@@@@@@@@@@@@@ÀÀ03!@€þ@Àÿ@@€€€À5!€ÿ€@@	@À#'+35#5#!35#!5#;5335#535#35#!35#35+35#€ÀÀ@@@ÿ@€@@@@@À@@þÀ@@@@ÀÀÀ€@@@@@ÀÀ@@@@@ÀÀ@@@@@€€À5!€þÀ€@@@@€@
+35305#5##030530€À@@À@€@€@@€@@€€€@ÀÀ€%5!5#05#0#30305Àþ€€€€€€€À@@@€€@€€À@@5#5##3##0!05##53535#53@@À@€@@@@€@@€@À@@@@@@€€@@@@@@À@@5#5##330#5#335305#5#53@@À@€@@€@À@@€@À@@@@@€@@@@€@@@À€€5##35€€@€À@@@@ÿÀÀ@%5#0#0#0#035353À@€€€€€@€@€þ€€ý€À@@€3330!#3753À€@€þ@@@@@ÀþÀ@ýÀ€@À@@ÀÀÀ@@€5#@€@@@€ÿÀ€€!5#5#3#35€@€@€À@@@@@@@À@@5###3#@@€@@@À@@@@À@@À€@5!735305#5##030530€þÀ@À@@À@€@À@@À@@€@@€€€À@'5#5#5##5#33##353353553=#533À@@€@€@@@@€@€@À@@@@€@@@@@@@@@@@@@@@@@@@@@@À@
++/%030####'3535353535305#######033@€€@@@@@@@@@@@@@@@@@@@€€€€@@@@€@@@@@€@@@@@@€€þÀ@À@15!5#53535#5#3###3535353535305#######033À€@@@À€@@@@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@@@€@@@@@@€€þÀ@À@1?5#5#3#3#3###0353535353535305####535#5030####@À€@@€À@@@@@@@@@@@@@@@@€€€@@@À@@@@@@@@@@€@@@@@@€@@@@@@ýÀ€€@@@@€À7!5305#0#535305#0##0305@@@€À@@€@@€€À@@€€À@€€@À@€€€À€'5#5#3035330#5#5#5###0535330@€@€€À€@@@@@@@@@@@@@@ÿþ€ÀÀ€@@@@@@€€@@€€À€'5##35035330#5#5#5###0535330€€@€þÀ€À€@@@@@@@@@@@@@@@þÀþ€ÀÀ€@@@@@@€€@@€€À€%/5#5#5###3###035330#5#5#5#530535330€@@@@@€@@@€À€@@@@@€@@@À@@@@@@@@@þ€ÀÀ€@@@@@þÀ€@@€€À€%/5##5##35335035330#5#5#5###0535330À€@À@€@Àþ€€À€@@@@@@@@@@@@@@@@@@@þÀþ€ÀÀ€@@@@@@€€@@€€À€%+035330#5#5#5###0535330030530305€À€@@@@@@@@@@ÿ€@€þ€ÀÀ€@@@@@@€€@@€€€€€€À€!+/5#5##33###035330#5#5#535053533053€@À@@@@@@€À€@@@@À@@@€@@@@@@@@@þ€ÀÀ€@@@@þ€€@@€€@@€À%5#035#535!##03305353À@@@@þÀ@@€€€@@€@@À@@@þ@þÀ€€@ÀÿÀÀ/!5#535305###5#03533305#5!##03333#35€@@@@@€@@€@@@ÿ@@@@@@€À@@@€@@@€@@@€@@@þ€@@@@@@€À€#5#5#3#!5###5335##53335!3@@€@€@À@@€@@@@€@@þ@@@@@@ýÀ@À@@À@À@À@@À@€À€#5##35#!5###5335##53335!3€€@€ÿ@À@@€@@@@€@@þ@@@@@@@ý€@À@@À@À@À@@À@€À€#+7#!5###5335##53335#5##5##3735#5##@@À@@€@@@@€@@@@À@@@@À@@@À@À@@À@À@À@@À@@@@@€@@@€À€!'7#!5###5335##53335!3030530305@@À@@€@@@@€@@þ@@€@€À@À@@À@À@À@@À@€€€€€€€€%5#35!3#5#5#3€@@ÿ@@À@€@€@À@@þ@@€@@@@€€€€%5#35!3#5##35€@@ÿ@@€@€€@À@@þ@@À@@@@@€À€%5#35!3#5#!5#7!5#5##€@@ÿ@@@@ÿ@@@€@€@À@@þ@@@@@@@@@@@@€À€%5#35!3#030530305€@@ÿ@@@€€€€@À@@þ@@€€€€€À
+#5#5330##0#!53530#5#5!3#30@@@@@€@@@@@@þÀ@@@À@À@þ€@ÿ@@@€@@@À@€À€#5##5##3533533333##5#5#5À€@À@€@Àþ€€@@@€€@@@@@@@@@@@@€ýÀ@@@À@À@@@€À€5#5#3!53#5!#33@€@@@@@þÀ@€À@@@@ýÀ@@À@@þ@Àþ@€À€5##35!53#5!#33€€@€ÿ@@@þÀ@€À@@@@@ý€@@À@@þ@Àþ@€À€7!53#05##5#0#3335#5##@@@@@À@@€ÀÀÀ@@@À@@À€@@€þ@Àþ@@@@@€À€5##5##35335!53#5!#33À€@À@€@ÀþÀ@@@þÀ@€À@@@@@@@@@ý€@@À@@þ@Àþ@€À€7!53#5!#33030530305@@@@þÀ@€Àÿ€@€À@@À@@þ@Àþ@À€€€€@À@5#5#53535##5#33##353À@@@@€€€@@@@€€@@@@@@@@@@@@@@€À!+5###0#0#35!#3#353!53#553053053À@@@@@Àÿ@@@@@@@ÿ@@@À@@@€€@@@þ@@@@@@À@þ@€€þÀ€À€5#5#3!530#0#0#0@€@@@@€À€@@@@ýÀ@@þþ€À€5##35!530#0#0#0€€@€ÿ@@€À€@@@@@ý€@@þþ€À€7!530#5####035#5##@@@@@À@@€À@@@À@@@ýÀ@@þ@@@@€À€7!530#0#0#0030530305@@@€À€@€@€À@@þþÀ€€€€@€À€%5#03535##5#330#5##35€@@@€€€@@@€@€€@@ÀÀÀÀ@ÿ@À@@@@€À%5#53530#5#535!30#7030@À@@À@ÿ@@À€€@@@@@@@þ@Àÿ€À7#33#30#3530#535#5!#0@@À€@@@€@@@@ÿ@À@@À@ÿ@@@À@@€À%5##5!3##335#5335#5#3À@@ÿÀÀ@@À€€@@@€@€@@@@@@À@@ÀÀ@@@@@€À%5##5!3##335#5335##35À@@ÿÀÀ@@À€€@€@€€@@@@@@À@@ÀÀ@@@@@@€À@'%5##5!3##335#5335#5#5###353À@@ÿÀÀ@@À€€@@@@@@@€@€@@@@@@À@@ÀÀ@@@@@@@@@€À'%5##5!3##335#5335##5##35335À@@ÿÀÀ@@À€€@€€@À@€@À€@@@@@@À@@ÀÀ@@@@@@@@@@€À#%5##5!3##335#533030530305À@@ÿÀÀ@@À€€@ÿ€@€€@@@@@@À@@ÀÀ@€€€€€€À@#'%5##5!3##335#5335#5##335#53À@@ÿÀÀ@@À€€@@@À@@À€@€@@@@@@À@@ÀÀ@@@@@@@@@@€À@#)%5#0535#5##5#33##0335#053030530À€€@€€€@@@@@€@@@@€@€À@@@@@@@€@@€€@€€ÿÀÀ@!5#53535##335#5!#333#35€@@@€ÀÀ€@þÀ@@€@€À@@@@@@@@@@þÀ@@@@@€À%5##5!05#5!#3!55#5#353À€À@@þÀ@@@€@€@ÀÀ@@À€@@þÀ@@À@@@@À@@€À%5##5!05#5!#3!55##3553À€À@@þÀ@@@€@€ÀÀÀ@@À€@@þÀ@@@@@@ÿ@@€À@"&%5##5!05#5!#3!55#5#5###35353À€À@@þÀ@@@@@@@@€@€ÀÀ@@À€@@þÀ@@À@@@@@@@@À@@€À"%5##5!05#5!#3!553030530305À€À@@þÀ@@@ÿÀÿ€@€À@@À€@@þÀ@@@@@€€€€€€€
+%5#0#3#5#5#3€@À@@À@€@€@€@þÀ@@@@@€€€
+%5#0#3#5##35€@À@@€@€€@€@þÀ@@@@@@@€€@
+%5#0#3#5#5#5###353€@À@@@@@@@€@€@€@þÀ@@@@@@@@@@€À
+%5#0#3#030530305€@À@@@€€€€@€@þÀ@€€€€€€À"5##5#3#3!#03!530#05030À€@À€@Àÿ@@@@@ÿÀÀ@@@@@@@@ÿ@@€€þÿ€À#5##5##35335030#5#!030#5#À€@À@€@ÀþÀ€@€@€@ÀÀ@@@@@@@@Àþ€€@@þ€€@@€À5#5#3!53#5!#33@€@@@@@þÀ@€À€@@@@þ@@@@@@þÀ@þÀ€À5##35!53#5!#33€€@€ÿ@@@þÀ@€ÀÀ@@@@þ@@@@@þÀ@þÀ€À@5#5#5###353!53#5!#33€@@@@@€@À@@@þÀ@€À€@@@@@@@@þ@@@@@@þÀ@þÀ€À5##5##35335!53#5!#33À€@À@€@ÀþÀ@@@þÀ@€ÀÀ@@@@@@@@þ@@@@@þÀ@þÀ€À7!53#5!#33030530305@@@@þÀ@€Àÿ€@€À@@@@@þÀ@þÀ@€€€€@ÀÀ€	5!03050305Àþ€€€€€€@@@€€@€€€À@!)5#####535!#03#353!530#5535353À@@@@@Àÿ@@@@@@@ÿ@@@@@@@@À@@ÿ@@@@@@þÀ@@@À€À%5#0#0#0#033535#5#3À@€€€@À@@@€@€@€þ€€þ€@@@@@@@€À%5#0#0#0#033535##35À@€€€@À@€@€€@€þ€€þ€@@@@@@@@€À@#%5#0#0#0#033535#5#5###353À@€€€@À@@@@@@@€@€@€þ€€þ€@@@@@@@@@@@€À%5#0#0#0#03353030530305À@€€€@À@þÀ€€€€@€þ€€þ€@@@€€€€€ÿÀÀ5##353530#0#0#03!#!!€€@€@@€À€@@ÿ@À@@@@ý@@þ€€þ€@@@@ÿÀÀ5#05353#5#5#3#3@À@@ÀÀ@@À€@@€@@@À@ý@@@þÀÿÀÀ#!3530#0#0#03!#!!030530305@@@€À€@@ÿ@ÿ€@€@þ€€þ€@@@@@€€€€€À@#5!035330#5#5#5###0535330€þÀ@€À€@@@@@@@@@@@@ÿþ€ÀÀ€@@@@@@€€@@€€ÀÀ%5##5!3##335#5335!À@@ÿÀÀ@@À€€@@þÀ€@@@@@@À@@ÀÀ@@@€À€!+5##5#335035330#5#5#5###0535330€€@€@ÀþÀ€À€@@@@@@@@@@@@@@@@@þÀþ€ÀÀ€@@@@@@€€@@€€À#%5##5!3##335#5335##5#335À@@ÿÀÀ@@À€€@@€@€@À€@@@@@@À@@ÀÀ@@@@@@@@ÿÀÀ!+5#5353#5#5#5####3030##30535330À€@@@@@@@@@€À@@@€@@@@@@@À@@@@@@þ@ÿ@@@€@@€ÿÀÀ@#5#53535##5!3##33#3=#533À€@@@@ÿÀÀ@@À@@€€@@@@@@@@@@@À@@@@À@ÀÀ@€À€)5##35!5305###5#3533305#5!##3€€@€À@@@€@@€@@@ÿ@@@@@@@@ý€@@€@@@@@@@€@@@þÀ@€À%5##335#5!#3!55##35À€ÀÀ€@þÀ@@@€@€À@@@@@@@þÀ@@@@@@€À€$(07!5305###5#3533305#05####35#735#5##€@@@€@@€@@@@À@@@@@@À@@@À@@€@@@@@@@€€@@@þÀ@@@@@@@€À@#%5##335#5!#3!55#5#5###353À€ÀÀ€@þÀ@@@@@@@@€@À@@@@@@@þÀ@@À@@@@@@@@€À€!'7!5305###5#3533305#5!##30305€@@@€@@€@@@ÿ@@@€€À@@€@@@@@@@€@@@þÀ@À€€€À%5##335#5!#3!50305À€ÀÀ€@þÀ@@@ÿ€À@@@@@@@þÀ@@@€€€À€15##5#33###33!5305###5#3533305#5#535€€@€@@@@@@@@@@€@@€@@@€@@@@@@@@@@þÀ@@@€@@@@@@@€@@@€À@#%5##335#5!#3!55##5#333535À€ÀÀ€@þÀ@@@€@€@@@@À@@@@@@@þÀ@@@@@@@@@@@€À€'5##5#33#3#!5353#5#5#53533#€€@€@@À@@@@@@@@@€@@@@@@@@@@@þ@@@@@@@@@ý€À@þÀ@€À€+%5#0#0###0335#035335##5#333535À@€€@@@À€@@@@€@€@@@@€@€@@ÿ@@@þÀ@À@@@@@@@@€À
+#5#5330##0#!53530#5#5!3#30@@@@@€@@@@@@þÀ@@@À@À@þ€@ÿ@@@€@@@À@€À!%5#35#5##3###0335#03533À@@@€€€€@@@À€@@@€@À@@@@@@@ÿ@@@þÀ@€À@5!#!5###5335##53335!3€þÀ@À@@€@@@@€@@þ@@@@ýÀ@À@@À@À@À@@À@€ÀÀ%5##5!05#5!#3!55!53À€À@@þÀ@@@þÀ@ÀÀ@@À€@@þÀ@@À@@À@@€À€'5##5#335#!5###5335##53335!3€€@€@Àÿ@À@@€@@@@€@@þ@@@@@@@@@ý€@À@@À@À@À@@À@€À"%5##5!05#5!#3!55##5#33553À€À@@þÀ@@@€@€@ÀÀÀÀ@@À€@@þÀ@@@@@@@@ÿ@@€À€!7#!5###5335##53335!30305@@À@@€@@@@€@@þ@@€€À@À@@À@À@À@@À@€€€À%5##5!05#5!#3!5530305À€À@@þÀ@@@ÿÀÀ€À@@À€@@þÀ@@@@@€€ÿÀÀÀ'5#53535###5335##53335!3#3#3€€@€@@€@@@@€@@þ@@@À@@@@@@À@@À@À@À@@À@þ@@@@@ÿÀÀ@"5#5353535##5!05#5!#33#353@€@€@€À@@þÀ@@@@@À@@@@@@@À€@@þÀ@@@@@@€À€+5##5#33#3#!5###5335##53335#535€€@€@@À@@À@@€@@@@€@@À@@@@@@@@@þ@@À@@À@À@À@@À@@€À@"&%5##5!05#5!#3!55##5#33353553À€À@@þÀ@@@€@€@@@@ÀÀÀ@@À€@@þÀ@@@@@@@@@@@þÀ@@€À€%)1735#5#3533305#05####3!3!35#735#5##€À€@@€@@@@À@@@@@ÿ€À@@À@@@À@@@@@@@€€@@@þÀ@@@@À@@@@@@ÿÀÀ@-5###35##330#5#3!530=#5#5###353À€@€€À@@À€€@@@@@@@€@@@þÀ@@@þÀ@€@@@@€@@@@@@@@€À€&.5##5#33535#5#3533305#5!##3!3!3€€@€@ÀÀÀ€@@€@@@ÿ@@@@@ÿ€@@@@@@@ý€@@@@@@@€@@@þÀ@@@@ÀÿÀÀ)5###35##330#5#3!530=##5#335À€@€€À@@À€€@@€@€@À@@þÀ@@@þÀ@€@@@@À@@@@@@€À€"(735#5#3533305#5!##3!3!30305€À€@@€@@@ÿ@@@@@ÿ€€€À@@@@@@@€@@@þÀ@@@@ÀÀ€€ÿÀÀ#5###35##330#5#3!5300305À€@€€À@@À€€@@ÿ€@@þÀ@@@þÀ@€@@@@€€ÿ€À	&.305#0#335#5#03533305#5!##03!3!3@€@€€À€@@€@@@ÿ@@@@@ÿ€@€€@@@@@€@@@€@@@þ€@@@@ÀÿÀÀ@'5###35##330#5#3!5305##0305À€@€€À@@À€€@@@€@€@@þÀ@@@þÀ@€@@@@@@€€€À€5#5##30303#0#0@@@@€€À€€À@@@@@ýÀÿ@ÿ€À€%5##335#5#5##3030#5#35#5##€@ÿ@À@@@@@@€@€€À@@@À@@þ@@@À@@@€þ€€@@@@@€5#5##5##3033300530@€€€@@€€€ÿ€€@@@@@@þ@þÀ€€€€À5#5##3#335#05030#5#@€€@@@À@@€€@€€@@@@þ@@@@€€þ€€@@€À€%5#35!3#5##5##35335€@@ÿ@@@€@À@€@À€@À@@þ@@À@@@@@@@@€À
+%5#0#3#5##5##35335€@À@@@€@À@€@À€@€@þÀ@@@@@@@@@@@€À@%5#35!3#5!€@@ÿ@@@þ€€@À@@þ@@€@@@€ÀÀ
+%5#0#3#5!€@À@@@þ€€@€@þÀ@@@@€À€%5#35!3#5##5#3!5€@@ÿ@@@€€€@€@À@@þ@@À@@@@@@@€À
+%5#0#3#5##5#3!5€@À@@@€€€@€@€@þÀ@@@@@@@@€ÿÀ€À5#53535#35!3#3#3€€@@@@ÿ@@@@@@@@@@À@@þ@@@@@€ÿÀ€5#53535#0#3#3#30305€€@@@À@@@@@€@@@@@€@þÀ@@@@@€€€€€€%5#35!3#0305€@@ÿ@@@€€@À@@þ@@€€€€€@
+%5#0#3#€@À@@€@€@þÀ@€5!30#353353#30#05#0ÿ@@À@À@À@@€À@@þ@@@@@@þ€€ÿÀÀ
+%%5#0#3#!53#30#5#030530305@À@@€@À@€€€€€€@€@þÀ@€@@@@þ@@€€€€€À€7!53305##3#5#5#735#5##@@@@À@€€À@@À@@@À@@À€@@þ@ÀÀ@@@@@@@ÿÀ@ 5#5#5###353!53#30#05#0@@@@@€@ÿ@À@€€€@@@@@@@@ý€@@@@þ€€ÿ€À	)305#0#3#303335#5#053535###0#30@€@€À@À@@€@@@@€@@À@@€€@@@@ÀÀ@€@ÀÀ@@ÿ€À)5####30#35330305#5#0535305#0#3À€@@À@@À@@€@@@€@€@€@@@@@þ@À@€€@€@ýÀ€€@€À@5###05#3#35330305#5#0535À€@@À@@À@@€@@@@@@€@þÀ@À@€€@€@€À€5!3#!5###75##35ÿ@@À@@€€€@€€@@þ@@À@@ÀÀ@@@@€€€€
+%5#0#3#5##35€@À@@€@€€@@þ@@À@@@@ÿ€À5!30#!5###0305#0#3ÿ@@À@@€@@€@€À@@þ@À@@ý€€@€ÿ€€
+%5##30#305#0#3€@À@@€@€@€€@@@þ@À€€@€À€5##5#33#3#!5###30535€€@€@@À@@À@@€@@@@@@@@@@þ@@À@@À€@@€€€%5#0#53535##5#33#3#€@@@@€@€@@@@@€@@@@@@@@@@þ@@€À5!30#!5###00305ÿ@@À@@€€€À@@þ@À@@À€€@€À
+%5##30#0305@@À@@€€@@@þ@€€€€À5#535!30#3#!5###0@€@ÿ@@@@À@@€À@À@@ÿ@À@À@@@€À%5#035#0#30#3#€@€€À@€€@€@@@ÿ@À@€À€5##3533333##5#5#5€€@€þÀ€@@@€€@@@@@@@@€ýÀ@@@À@À@@@€À5##35030#5#!030#5#€€@€ÿ€@€@€@ÀÀ@@@@Àþ€€@@þ€€@@ÿ€À	!305#0#3030333030##5#5#5@€@€ÿ€@@@€€@@@@€€@€ý€€@@ÿ€À@@@ÿ€À@	305#0#3030#5#!030#5#@€@€À€@€@€@À@€€@€þ€€@@þ€€@@€À€#5##5#33353533333##5#5#5€€@€@@@@þÀ€@@@€€@@@@@@@@@@@@€ýÀ@@@À@À@@@€À@#5##5#333535030#5#!030#5#€€@€@@@@ÿ€@€@€@À@@@@@@@@ÿþ€€@@þ€€@@€À@	030#5#!030#5#'305#0#3@€@€@€@À@@€@€þ€€@@þ€€@@À€€@ÿÀÀ!30##5#5#5#0303330#3€@€@@@€€@@@€ÀÀ@@@ý€€@@þ€@ÿÀÀ@!30#5##5#303030#3€@@À@€@€€€À@@@@þ€€þ@€À@5!!53#5!#33€þÀ@@@þÀ@€À@@ýÀ@@À@@þ@Àþ@€ÀÀ5!!53#5!#33€þÀ@@@þÀ@€À€@@þ@@@@@@þÀ@þÀ€À€5##5#335!53#5!#33€€@€@Àÿ@@@þÀ@€À@@@@@@@ý€@@À@@þ@Àþ@€À5##5#335!53#5!#33€€@€@Àÿ@@@þÀ@€ÀÀ@@@@@@þ@@@@@þÀ@þÀ€À€5##35!5##35!53#5!#33À€@€@€@€þÀ@@@þÀ@€À@@@@@@@@@ý€@@À@@þ@Àþ@€À5##35!5##35!53#5!#33À€@€@€@€þÀ@@@þÀ@€ÀÀ@@@@@@@@þ@@@@@þÀ@þÀ€À%5#035#535##0#035##03353À€€€€À@@@€@@€@€@@À@@þ@@þ@@@€À@ %5#0535#5###35##33530530À€€@€@@@€@@€@@€@€À@@þÀ@@@þÀ@@@€€€À€!5##35#303335#0535#5!353€€@€ÿ@À@@€@@@þ€@€€@@@@@ý€@@ÀÀ€À@@ÀÀÀ€À %5#03530305#5##5#3#5##35@@@€@À@€@@€€@€€@@€€@@@@þÀ@@@@@@ÿ€À	!%305#0#3#333030#0535#5!3053@€@€À@À@@€@@@þ€@€€@€€@@@@@ÿ€À@@ÀÀÀÿ€À@"%5#03530305#5##5#3#305#0#3@@@€@À@€@@@€@€€@@€€@@@@þÀ@À€€@€À€%)5##5#33#3#303335#0535#5#53553€€@€@@À@@À@@€@@@€@€€@@@@@@@@þ@@@ÀÀ€À@@@þ€ÀÀ€À@(%5#03530305#5##5#3#5##5#333535@@@€@À@€@@€€@€@@@@€@@€€@@@@þÀ@€@@@@@@@@€À€35##35!5305#5#5#5#0530305#5!#033330#05#0€€@€ÿ@@@@€@À€@þÀ@@@€@À€@@@@@ý€@@€@@@€€€@@€@@@€€€€À#+%5#5#5#5#5335#5!#3333#5#3!55##35À@@€@À€@þÀ@@@€@À€@@€@€À@@@@@@@@@@@@@@@@@@@@@@€À€197!5305#5#5#5#0530305#05##5#0#033330#05#035#5##@@@@@€@À€@@À@@@@€@À€€À@@@À@@€@@@€€€€@@€€@@@€€€@@@@€À@#3%5#5#5#5#5335#5!#3333#5#3!55#5#5###353À@@€@À€@þÀ@@@€@À€@@@@@@@€@À@@@@@@@@@@@@@@@@@@À@@@@@@@@ÿÀÀÀ7!5#535305#5#5#5#0530305#5!#033330#05#0333#35€@@@@@€@À€@þÀ@@@€@À€@€@€À@@@€@@@€€€@@€@@@€€€@@@@@ÿÀÀ@/!5#53535#5#5#5#5335#5!#3333#5#333#35€@@@@@€@À€@þÀ@@@€@À€@€@€À@@@@@@@@@@@@@@@@@@@@@@@@€À€;5##5#33##033330#05#03!5305#5#5#5#0530305#5#535€€@€@@€@@@€@À€@@@@@€@À€@€@@@@@@@@@€@@@€€€@@€@@@€€€@@@€À@#3%5#5#5#5#5335#5!#3333#5#3!55##5#333535À@@€@À€@þÀ@@@€@À€@@€@€@@@@À@@@@@@@@@@@@@@@@@@@@@@@@@@@@ÿÀÀ!5#535#335!353#33#35€@@@@@þ€@@@@@€À@@@À@ÀÀ@þ@@@@@@ÿÀÀ!!5#53535##35#5##0#3303#35€@@@€@€€@@€€@@€À@@@@@@@À@€@þÀ€@@@@€À€!%5#0335#53535##5#33#3530#€@@@À@@€@€@@€@@@€@€@À@@@@@@@@À@þ€@€À€"%5##35#53535##5#330##3335À€@€€@@€@€@@@€€@ÀÀ@@@@À@@@@@@€@@þÀ@@@€À%5#535#5335!353#3#€@@@@@þ€@@@@@€@À@À@ÀÀ@À@À@€À%5##535#535#5##0#3#3335À€@€€€€@@€€€€@ÀÀ@@À@@@À@€@@@À@@€À€5##5##35335!530#0#0#0À€@À@€@ÀþÀ@@€À€@@@@@@@@@ý€@@þþ€À#%5#0#0#0#033535##5##35335À@€€€@À@€€@À@€@À€@€þ€€þ€@@@@@@@@@@@@€À@5!!530#0#0#0€þÀ@@€À€@@ýÀ@@þþ€ÀÀ%5#0#0#0#033535!À@€€€@À@ÿ€@€þ€€þ€@@@@@€À€5##5#335!530#0#0#0€€@€@Àÿ@@€À€@@@@@@@ý€@@þþ€À%5#0#0#0#033535##5#3!5À@€€€@À@@€€€@€@€þ€€þ€@@@@@@@@@@€À€5#5##3#03!530#0#035#53€@À@@€@@@€ÀÀ€@@@@@@þ@@þ@@@€À@#%5#0#0#0#033535#5##335#53À@€€€@À@@@À@@À€@€@€þ€€þ€@@@@@@@@@@@@€À€5##35!5##35!530#0#0#0À€@€@€@€þÀ@@€À€@@@@@@@@@ý€@@þþ€À#%5#0#0#0#033535##35!5##35À@€€€@À@€€@€@€@€€@€þ€€þ€@@@@@@@@@@@@ÿÀÀÀ5#5353530#0#0#033#3@€@€@€À€@@@@@@@@@þþ@@@@ÿÀÀ@5#5305#0#033#3%5#0#03@€@€€@@@@@@€@@@@€€þ€@@@@À@€þ€@€À€#7305303530#5##5####035#5##@€@€@@@@@@@@€À@@@À@€€@@þ@ÀÀÀ@þ@@@@€À@%5#5#5###35330##5###033533€@@@@@€@€@€@@@€@€@€€@@@@@@@@þ@€þÀÀÀ@þ€@@@@€À€#%5#03535#5#0#5#5#0330#35#5##€@@@@@€@@@@@À@@@€@@À@ÿÀ@ÿ@ÿ@€@@@ÿÀÀ@'5#5#5###3533530#0#0#03!#!!€@@@@@€@@@@€À€@@ÿ@€@@@@@@@@ý€@þ€€þ€@@@@@€À€!%5#03535##5#330#030530305€@@@€€€@@@@€€€€@@ÀÀÀÀ@ÿ@€€€€€À€-5##35!5###0535353535305!35353####€€@€þÀÀ@@À@@@@@þ@@@À@@@@@@@@@þÀÀ@@€@@@@€À@@@@@@@€À (5!0353####0!05##53535353=##35Àþ@€€@@@@À€À@@@@€@€@€@@@@@€€@@@@@@À@@@@€À€%+!5###0535353535305!35353####0305À@@À@@@@@þ@@@À@@@@€€@ÀÀ@@€@@@@€À@@@@@@@@€€€À &5!0353####0!05##5353535350305Àþ@€€@@@@À€À@@@@À€@€@@@@@€€@@@@@@€€€À€55##5#33#35353#####!5###0535353535305#535€€@€@@À@@À@@@@@À@@À@@@@@À@@@@@@@@À@@@@@@@ÀÀ@@€@@@@€@@€À@ 05!0353####0!05##5353535355##5#333535Àþ@€€@@@@À€À@@@@€@€@@@@@€@@@@@€€@@@@@@@@@@@@@@€€%5#033305#5##0#@@@@@À@@€@@@€@@þ@€À5#5##30!530#5#5#5330@€€@@@@@@€@@€@@@@þ@@@@þ@@@ÿ€!7#!530#535#5!#03053003053€@€@@@@þ€@@@€€€€À@@@À@@€€þÿ@ÀÀ€À7#!530#5#53305!30030@@€@@À€@þ€@€€À@@@À@€@þÿ@€À0!530#5#5#053305330@@@@@€À@ÿ@@ý€@@@€@€ýÀ@@ÿ€À7#!530#535#5!#03003053@@€@@@@þÀ@@€€€€À@@@À@@€þ€ÿ@ÀÀ€À!530#5#5#5##0330@@@@@€€@À@@@þ@@@@À@€þ€@@ÿ€À#7!53530#5#5!#03535330##5#5#0@@@@@ÿ@@@€@@€@@À@@@€@@@€@@@þ€@@@€€@$5#!##033!5305###5#0353335€ÿ@@@@@@@€@@€@@@@@@þ€@@@€@@@€@@@À€€%5##330535#!#3!5À€ÀÀ€@€þÀ@@@À@@@@€@@@þÀ@@€À
+#5#5330##0#!53530#5#5!3#30@@@@@€@@@@@@þÀ@@@À@À@þ€@ÿ@@@€@@@À@€!7#!53530#5#5!#0305300330#€@@@@@@þÀ@@@€@@@À@@@€@@@€€þ@þ€@€À%5#035!0353##037030À@@þ€@€À@@@€€@@€@À@ÿ@@ÿ€À%5#!03530###0335#03533À@þÀ@€€@@@À€@@@€@@€@€@@ÿ@@@þÀ@ÿÀÀ@!'!5#5#53530#5!#03333#5#3!5030€@@€@@þÀ@@@@@€€@ÀÀ@@@@@@ÿ@@@@@@@@ÿ€À%5#035!35353#5#3530#5#5#À@@þ@@@€@@@@€@@€@@À@@À@À@ÿ@@À€À7!530#5!#3530!0353@@@@þÀ@€ÀþÀ€ÀÀ@@@@@@ÿÿÀÀ€À#5#533305#5!#3#03!5305###0@ÀÀ@@@þÀ@@@@@@@@ÀÀ@À@@€@@À@ÿ@@€@@ÿÀÀ;335##53335!3#3€@@@@@€@@þ@@@€À@À@À@@À@ý@@ÿÀÀ5#533305#5###3#353@@@@@@À@@@€À@À@À@@€@@À@þ@@@À€@%5#!##03335#5#03533353!3€ÿ@@@@À€@@€@@@@ÿ€@@@@þ€@@@@€@@@ÀýÀ@@@ÀÀ%)%5#5#53053535###5#5#3303##335#53€@@@@@€@@@€@@@@@@À€@@@@@€ÀÀÀÀÀÀÀÀ€@@@@@@@€030333530#0##5#5€@@À@€@@€ý€€þÀ@@€þ€@@À@€À%5###30335À€@À@@ÀÀ@@@@þ@@€€€%5#035#535!3#30#€@@@@ÿ@@@@€@@À@@À@ÿ@€'5##303335#5#5#53530535##0#5#30@þ€@À@@€@@@@@@€@@À@€@@þ@@@ÀÀ@@@@€@@€À@€À&5###0335#5##0#35330305#5#0535À€@@@€@À@@À@@€@@@@@@@@@@þ@À@€€@€@€€€%5#035#0#3#30#€@@@À@@@@€@@@À@ÿ@€À,0403053053303305#05#05#05305####30#053'5#€@@@@@@@@@@€@@€@@@@€€€€@€@€€€€€@@@@€€@@À@@€À%3#0#0#0#0#03533€@€@@@€À@€À@þþý€@@ÿÀÀ;33030##5#05#0#3€@@@€€@@€@€À@ÿ€À@€ý@ÿÀÀ@3#5##5#3030@€@À@€@€ýÀ@@@@@þ€€€À
+7!530#5!#0303053@@@@þÀ@€ÀÀÀÀ@@@@þÿ@ÀÀ€€
+7!530#5!#0303035305#@@@ÿ@€€€@@€À@@@@þþ@€€7!53#5!#3335305#0#@@@ÿ@€€@€@€@À@@@@@þÀ@þÀ€@€€ÿÀ3##5##03353030€€€€À@@À@À@€ý@@@@@þ@@Àþ@þÿÀ@030##5##335303€€€€À@@À@À@Àþ€@@@þÀ@@ÿ@þÀ€%5#03535#5!#030530#53@@À@@þ€@@@@À€€@@À@@€€þ@€ÀÀÿÀÀ5#05353#5#05335#5###3@À@@À@€@À@@À€@@€@@@€@@@@ý@@@þÀ@À!'5!30#353030305#05#535305#5#50530ÿ@@À@@€@@@@@À€À@@þ@À€€€€@@€@@ÿ€€€À)7!5305#0#5353535305#5!#030530####@@@€À@€@@@þÀ@€À@€@@À@@€€À@@@€@@€€€@@@À€À@#%5##535353535#5!#353####3!5À€À@€@@@þÀ@€À@€@@@@À@@@@@@@@@@@@@@@@@@€À+0!5###53535305#5#5#53335!03330##À@@À@@@@@@À@@þ@@@@@@€À@@@@@€@@@@@À€@@€@@ÿÀ!5###5##3333553€@@À@@€@ÀþÀ@@@À@@@@ýÀ@@€@@ÿÀÀ!%5##35#5##0#3330#5#33535À€@€€@@€€@@@€@À@À@@@@À@€@þÀ@€@@@@À€À%5#335!#0335#53#€@@@þ€@@@@€@€@À@À@€@@@þ@@€À%5##35#05335#5##0#3335À€@€€@€@À@€€@ÀÀ@@@@€@@@@€@þÀ@@@ÿÀÀ5#0335!35303À€@@þ€@@@@@€@ÀÀ@ý€@€€7!53035305#0###@@@@€€€€À@@@€€ýÀ@ýÀ€%5#035305#0##0#0#03353À@@@€@@€€@À@€@€@€€@þ€€þ€@@@€À5#03#30#3#3!53#5ÀÀ@À@À@@@@@@À@ÿþÀ@@ÀþÀ@@@À€À7!5353#5#3###@@@@€@@€€À@@@À@@þ@@@ýÀ€!%5#03530#0#5#5##03053330#À@@@€€@€@@@@@@€@@ÿÀ@@€€À@ÿ@ÿÀÀ5#35335###0#033##!@À@@@€@€€@À@À@@@ýÀ@@@@þ@€þ€@@@@€À%5#535!353530##3##!5###053535À@@þ@@@À@À@@@À@@À@@À@@ÀÀ@@€@@@@ÀÀ@@€@@€À@ 5#53535!0353##3#0!05##535€@@@þ@€€@À@@À€À@@@@@@€@@@@@€€@@@À"7!53#5#53535305!!####!#5#@@@@€@@@þ@@@@@@À€@@@@@@@@€@@@@@@þÀ@@À"%5##!5#5#5#5#5!5!0333##3!5À€À@@@@@þ@@@@€@@@@@@@@@@@@@€@@@@þÀ@@ÿÀÀ@ !5##035#5#5#5!5!033##03!5À€ÀÀ@@@@þ@@@@@@@@@@@@@@€@@@ÿ@@ÿÀÀ@(!5##05!535#5#535305!!###3!#03!5À€À@@@@@þ@@@@@Àÿ@@@@@€@@@@@€@@@@@@@€@@€À'5#5305#5!#3530##3##!05##053535À@@@þÀ@€À@À@@@À€À@@À@@€@@@@€@@@@À€@€@@€À5!3330#5#3!530#5#5#05Àþ@@À@€€@@@@€À@@À@ÿ@@@@@@€€À@5!30330#5#3!5305#5#5#5Àþ@@À@€€@@@@€@@€@€@@@@€@@@€€%5#5##0#30330#5#5#0335305#5#05€€@@€€@@@@@@À@@@@À@€@€@€@@€@@€@€ÿÀÀ@ 5#0535353535#5##5#30#03#@@@@@@À@€@@À€@@@€@@@À@@@@þ@@À@À€@030À€ý€€@€€0303030@€@€ý€€ý€€@€À5#535#5##3#3030À€€€€€€€€€€@@@ÀÀ@@@ÿ€€€03053535#5##À€€€@@€@€€ÀÀÀ@@À€€(,%5#05##5!!535##5#33030#3535#5353€@@ÿ@À€@€@@€@@@€@þÀ@€@€@@ýÀ@@À@@@@@€€ÀÀÀ@@ý€Àþ@€#)-%5#5#03#35305#05#5!0!535##3503035#€@€@@@À@ÿ@À@@@þÀ@€@@€@@@ÀÀ€€@ý€@@@@@@@þþ@€+/%5#5#03#35305#05335#5!30##335#335#€@€@@@À@@@ÿ@€@@€@@@@€@@@ÀÀ€€@@@@€@þÀ@@@þÀ@@@@€0!5#3353#30#5#€€@€@À@@@ý€@@ýÀ@@@@þ@ÿÀ &5!30#!0#5#3353#3###070305ÿ@@€@€@À@À@@@@À€À@@þ@€@@@@@@À@@@€€ÿÀ
+%5##30#!53#30#5#0305@À@@À@À@€€€€@@@þ@€@@@@þ@@€€€033!53###0#05€@@€@€@ý€@þÀ@@ýÀ@€€ÿÀ &3!53#5#0#05#030303030#5#0305À@À€@€€@€@€€€@@@À€€ý€ÿ€þ@@€€ÿÀ%3!53##5##5#30303030#5#0305À@À@€@@€@€@€€€@@@@@@@þ@€þ€€þ@@€€€À€#-5##5#330###035330#5#5#05350535330€€@€@@@@@€À€@@@@À@@@@@@@@@€@@þ€ÀÀ€@@€@þ@€@@€€À@'%5##5!3##335#5335##5#333535À@@ÿÀÀ@@À€€@@€@€@@@@€@@@@@@À@@ÀÀ@€@@@@@@@@@€€€%5#35#53535##5#33#3#€@@€@@€@€@@@@@€@À@@@@@@@@@@þ@@@€€@
+%5#0#3#5##5#333535€@À@@€@€@@@@€@€@þÀ@€@@@@@@@@€À€5##5#33##3!53#5#5353€€@€@@€@@@@@€@ÀÀ@@@@@@@@þ@@@À@@@ý€Àþ@€À@5##5#333535!53#5!#33€€@€@@@@ÿ@@@þÀ@€À@@@@@@@@ýÀ@@@@@þÀ@þÀ€À€5##5#333535!530#0#0#0€€@€@@@@ÿ@@€À€@@@@@@@@@ý€@@þþ€À@#%5#0#0#0#033535##5#333535À@€€€@À@@€@€@@@@€@€þ€€þ€@@@€@@@@@@@@€À€5#!5#75!!53###À€@€€þÀ@@€À€À@@@@€@@ý€@@Àþ@Àþ@€À@%5#0#0#0#033535#!5#75!À@€€€@À@À€€€@ÿ€@€þ€€þ€@@@@@@@€@@€À€5#75###3535!53###€€@@@€€@À@@€À€À@@€@@@@@@ý€@@Àþ@Àþ@€À€#%5#0#0#0#033535#!5#75##35À@€€€@À@À€€€@€@€€@€þ€€þ€@@@@@@@À@@@@€À€5#75###3535!53###5#€€@@@€€@À@@€À€À@À@@€@@@@@@ý€@@Àþ@Àþ@€@@€À€#%5#0#0#0#033535#!5#75!335À@€€€@À@À€€€@ÿ@€€@€þ€€þ€@@@@@@@À@@@@€À€5#!53####3535#15#€€À@@€À€À€€@@@À@@þ@@Àþ@Àþ@@@@@@@€À€#%5#0#0#0#033535#!5#=#5#3À@€€€@À@À€€€@€@€@€þ€€þ€@@@@@@@€@@@@€À@7!53#5!#353!0353@@@@þÀ@€ÀþÀ€ÀÀ@@@@@@@À€@@€À€'+5#####035330#5#5#575!05353305#€€@@@@€À€@@@€þÀ@@@@€€À@@@@@þ€ÀÀ€@@@€@@þ@€@@€@@@€À@#%5##5!3##335#5335#!5#75!À@@ÿÀÀ@@À€€@€€@€€þÀ€@@@@@@À@@ÀÀ@@@@@€@@€À€&5!303###035330#5#5#50535330€þÀ@@@@@€À€@@@€@@@@@@€@@@þ€ÀÀ€@@Àþ@€@@€€À@%5##5!3##335#5335#%5!À@@ÿÀÀ@@À€€@@€þÀ€@@@@@@À@@ÀÀ@@@€@@€À@ %5#535#535!##30305!05353À@@@@þÀ@@€€€þÀ@@@€@À@À@@@þ@ÿ€@@þÀ€@À€ÀÀ#'-%5#0535#5##5#33##0335#053035!0530À€€@€€€@@@@@€@@@€þÀÀ@€@€À@@@@@@@€@@€€@@@ÿ€€€.5#05!3##03533305#5!##03335#533305@ÿ€€@@€@@@ÿ@@@@À€€@@@€@@@€@@@€@@@þ€@@@@@@€ÿÀÀ@#'%5#035##0#035##033##3!53553À@@€@€€À@@À€€@@ÿ€@@€@@ÿ@@ÿ@@@@@@@@@@€À€*25##5#33###3335#5#3533305#5#5353!3€€@€@@@@@@@À€@@€@@@€@@@ÿ€@@@@@@@@@þÀ@@@@@@@@€@@@ý€@@@ÀÿÀÀ@-5###35##330#5#3!5305##5#333535À€@€€À@@À€€@@€@€@@@@@@þÀ@@@þÀ@€@@@@@@@@@@@@€À€-5##5#33#3#303335#5#53535###03535€€@€@@À@@À@@€@@@@€@@@@@@@@@@@@þ@@@ÀÀ@@@ÀÀ@@@€À€/5###0#3#35330305#5#05355##5#333535À€@@À@@À@@€@@@€@€@@@@@@@@þ@@À@€€@€@@@@@@@@@@ÿÀÀ5#5353530#5!#033#3030@€@€@@þÀ@@@@@À@@@@@@@þ@@@@þÿÀÀ@5#535353#5!#33#33@€@€@@þÀ@@@@@À@@@@@@@@þÀ@@@@@þÀÿÀÀ@5#535353#5!#33#35!3@€@€@@þÀ@@@@@þÀ@À@@@@@À@@þ@@@@@@@@ýÀÀþ@ÿÀÀÀ5#535353#5!#33#35!3@€@€@@þÀ@@@@@þÀ@À@@@@@@@@þÀ@@@@À@@þ@@þÀÀ€/5#53535##5#33#!###!#5#3!53#5#53535ÀÀ@@€@€@@À@@@À€@@@@€@@€@@@@@@@@@@@@@@þÀ@@@@@@@@@ÿÀÀ@05##5#333535!530#5#535305!!###30#5#€€@€@@@@ÿ@@@@@@þ@@@@@ÀÀ€@@@@@@@@ý@@@@@€@@@@@ÿ@@@ÿÀ@ 5##5#333535!53#30#05#0€@€@@@@þÀ@À@€€@@@@@@@@ý@@@@þ€€€#%5#05#0#5!0!53'030730#0;5#30€@@ÿ@À@À@@@@À€€@€€@ý€@@@þ€À@€!%5#5#03#35305#05#5!0!53'030€@€@@@À@ÿ@À@€@@@ÀÀ€€@ý€@@@þ€$%5#5#03#35305#5#30##335#33€@€@@@ÀÀ@€@@€@@@€@@@ÀÀ€À@€@þÀ@@@þÀ@€À€"*5##3535#5#3533305#5!##3!3!3€€@€ÀÀ€@@€@@@ÿ@@@@@ÿ€@@@@@ý€@@@@@@@€@@@þÀ@@@@ÀÿÀÀ%5###35##330#5#3!530'5##35À€@€€À@@À€€@@@€@€@@þÀ@@@þÀ@€@@@@À@@@@€033033530#0##0#0€@@À@€@€@ý€@ÿ@@€þ€@ÿÿÀÀ3#335353530#5!330#@@À@@@@@þ€@€€@@@@@@@@þÀ@ÿ@€À€5#5#333333##5#5#5@€@€€@@@€€@@@@@@@@ýÀ@@@À@À@@@€À5#5#3030#5#!030#5#@@€@€€@€@€@À€@@@@€þ€€@@þ€€@@€À€",05#0535####30##305303#5#05053533053€@@€@@@@@@€À€@@À@@@€@€@€@@@@@€@þÀ€€@@€þÀ€@@€@@@€À€)-%5##0535#0535####3#3##335#53353À@@@@@€@@@@@ÀÀ@@À€€@€@€@@€@€@@@@@@@@@À@@ÀÀ@@@€À€$%5#535#535!##30305##3505353À@@@@þÀ@@€€€€@€À@@€@À@À@@@þ@ÿÀ@@@@þ€€@À€À#+1%5#0535#5##5#33##0335#053035##350530À€€@€€€@@@@@€@@@€€@€@@€@€À@@@@@@@€@@€€@@@@@@þÀ€€€À€#+55###0##035!#03#353!530#=##3553053530À@@@@@Àÿ@@@@@@@€@€À@@@€@@@€@@@þ€@@@@@€@À@@@@ý€@€@ÿ€À!)15#####535!#03#353!530#=##35535353À@@@@@Àÿ@@@@@@@€@€À@@@@@@@@À@@ÿ@@@@@@À@@@@þ@@@À€À€%/5#5#3!5#5#3035330#5#5#5###0535330À@€@€@€@þÀ€À€@@@@@@@@@@@@@@@@@@ÿþ€ÀÀ€@@@@@@€€@@€€À'%5##5!3##335#5335#5#3!5#5#3À@@ÿÀÀ@@À€€@€@€@€@€@€@@@@@@À@@ÀÀ@@@@@@@@@€À€!+5#5##353035330#5#5#5###0535330€@À@€@ÿ€À€@@@@@@@@@@@@@@@@ÿþ€ÀÀ€@@@@@@€€@@€€À#%5##5!3##335#5335#5##353À@@ÿÀÀ@@À€€@@@À@€@€@@@@@@À@@ÀÀ@@@@@@@€À€+5#5#3!5#5#3#!5###5335##53335!3À@€@€@€@ÿ@À@@€@@@@€@@þ@@@@@@@@@@ýÀ@À@@À@À@À@@À@€À"&%5##5!05#5!#3!55#5#3!5#5#353À€À@@þÀ@@@À@€@€@€@ÀÀÀ@@À€@@þÀ@@À@@@@@@@@À@@€À€'5#5##353#!5###5335##53335!3€@À@€@À@À@@€@@@@€@@þ@@@@@@@@ýÀ@À@@À@À@À@@À@€À"%5##5!05#5!#3!55#5##35353À€À@@þÀ@@@@À@€@€ÀÀ@@À€@@þÀ@@À@@@@@@À@@€À€%5#35!3#5#5#3!5#5#3€@@ÿ@@@@€@€@€@€@À@@þ@@€@@@@@@@@€À
+%5#0#3#5#5#3!5#5#3€@À@@@@€@€@€@€@€@þÀ@@@@@@@@@@€À€%5#35!3#5#5!#353€@@ÿ@@@@ÿ@€€€@À@@þ@@€@@@@@@@€À
+%5#0#3#5#5!#353€@À@@@@ÿ@€€€@€@þÀ@@@@@@@€À€5#5#3!5#5#3!53#5!#33À@€@€@€@ÿ@@@þÀ@€À@@@@@@@@ýÀ@@À@@þ@Àþ@€À5#5#3!5#5#3!53#5!#33À@€@€@€@ÿ@@@þÀ@€À€@@@@@@@@þ@@@@@@þÀ@þÀ€À€5#5##353!53#5!#33€@À@€@À@@@þÀ@€À@@@@@@ýÀ@@À@@þ@Àþ@€À5#5##353!53#5!#33€@À@€@À@@@þÀ@€À€@@@@@@þ@@@@@@þÀ@þÀ€À€%)5#5#3!5#5#3#303335#0535#5!353À@€@€@€@ÿ@À@@€@@@þ€@€€@@@@@@@@ýÀ@@ÀÀ€À@@ÀÀÀ€À (%5#03530305#5##5#3#5#5#3!5#5#3@@@€@À@€@@À@€@€@€@€@@€€@@@@þÀ@@@@@@@@@€À€!%5#5##353#303335#0535#5!353€@À@€@À@À@@€@@@þ€@€€@@@@@@ýÀ@@ÀÀ€À@@ÀÀÀ€À$%5#03530305#5##5#3#5#5##353@@@€@À@€@@€@À@€@€@@€€@@@@þÀ@@@@@@@€À€5#5#3!5#5#3!530#0#0#0À@€@€@€@ÿ@@€À€@@@@@@@@ýÀ@@þþ€À#%5#0#0#0#033535#5#3!5#5#3À@€€€@À@€@€@€@€@€@€þ€€þ€@@@@@@@@@@@€À€5#5##353!530#0#0#0€@À@€@À@@€À€@@@@@@ýÀ@@þþ€À%5#0#0#0#033535#5!#353À@€€€@À@@@ÿ@€€€@€þ€€þ€@@@@@@@@@ÿ€À	3305#0#3!535#5#5#5#0530305#5!#03333#05#0@€@€À@@@@€@À€@þÀ@@@€@À€@€€@@@@À@@@€€€@@€@@@À€€ÿ€À@#-%5#5#5#5#5335#5!#3333#5#3!5305#0#3À@@€@À€@þÀ@@@€@À€@@€@€@€À@@@@@@@@@@@@@@@@@@ÿ€€@@ÿ€À%5#335!353#305#0#3€@@@þ€@@@€@€@€€@À@ÀÀ@þ@@À€€@ÿ€À %5##35#5##0#3335305#0#3À€@€€@@€€@À€@€@€À@@@@À@€@þÀ@@ÿ€€@À$%3530#0535#5!#035353##353##!€@@@@þÀ@@@À€€À@€À@@€À@@€@@À@@@þÀ@@À@ %35305#535#5!#3530##30##!€@@@@þÀ@€À@€À€À@@€@À@@@@€@@€@@€À€5##5#33353530303#0#0€€@€@@@@þÀ€À€€À@@@@@@@@@€ýÀÿ@ÿ€À€%5##5#33#3#335#53535030#5#€€@€@@À@@À@@@@€@€@@@@@@@@þ@@@@À@@þÀþ€€@@€À#5##3#03!530#535#5#3#5030À€@@@@@@@@@€@ÀÀÀ@@À@ÿ@@@À@@ÀÀþÿ@€À!7!530#535#5#0#0##3#03030€@@@@@€@@@@€€À@@@À@ÿ@À@ÿÿÀ)%5#5!053535353535!353530#####!#35À@ÿ@@@@@þ@@@À@@@@@@@€@@@€@@@@ÀÀ@@€@@@@À@@@À@%%5#5!53535353535!0353####0!#35À@ÿ@@@@@þ@€€@@@@@@€@@@@@@@@@€@@@@@€@@@€À€%035330#5#5#5###05353300305€À€@@@@@@@@@@À€þ€ÀÀ€@@@@@@€€@@€€€€À%5##5!3##335#5330305À@@ÿÀÀ@@À€€@À€€@@@@@@À@@ÀÀ@€€€ÿÀÀ)!5#535###0335##53335!30#33#35€@€@@€@@@@€@@þ@@@À@€À@@À@@@À@À@@À@þ@@@@@ÿÀÀ@"!5#53535##5!05#5!#333#3553€@@@€À@@þÀ@@€@€ÀÀÀ@@@@@À€@@þÀ@@@@@À@@€À€5#!5#75!!530#5!#03030À€@€€þÀ@@@þÀ@€ÀÀ@@@@€@@ý€@@€@@þ€€þ€€À@5#!5#75!!53#5!#33À€@€€þÀ@@@þÀ@€À€@@@@€@@ýÀ@@@@@þÀ@þÀ€À€"&5##5##3#03!530#0=!03053À@€À@@@@@@@þÀ@Àÿ€À@@@@@@þ€@@€€€@@ý€€þ€À@@€À€#5##5##3533=!!53#5!#33À€@À@€@ÀþÀ@@@þÀ@€ÀÀ@@@@@@@@€@@ý€@@@@@þÀ@þÀ€À€7!53#5!#330305@@@@þÀ@€ÀÀ€À@@À@@þ@Àþ@À€€€À7!53#5!#330305@@@@þÀ@€ÀÀ€À@@@@@þÀ@þÀ@€€€À€5#%5!!530#5!#03030€þÀ@@@þÀ@€ÀÀ@@€@@ý€@@€@@þ€€þ€€À@5#%5!!53#5!#33€þÀ@@@þÀ@€À€@@€@@ýÀ@@@@@þÀ@þÀ@€À@%5#03535##5#330#5!€@@@€€€@@@ÿ€@@ÀÀÀÀ@ÿ@€@@ÿÀÀÀ5!3530#0#0#03!#!!€þÀ@@€À€@@ÿ@€@@ý€@þ€€þ€@@@@€À@%5#53535#5##5#33753€ÀÀ@@À@€@@@€€@@@À@@@@þÀ@ÀÀÀ€À@%5#0###35##3353À@@@€€À@@À@€@€@þÀ@@@þÀ@@@€À@73353#5##5#30373€@À@@À@€@@@€À@@@@@@@þ€@@þÀ@€À5#5##!530#5#5#053330€@À@@@@@€@@@@€@@@ýÀ@@@€@þ@@@ÿ€À@7!53#5!#353#5#@@@@þÀ@€ÀÀ€À@@@@@@@þÀ@@@À@%5#5##0335#5!#3#35!5#53À@À@À€@þÀ@@@@@À€À@@@@@@@þÀ@@@@@@ÿÀ"!5##0#30###0330335%0353@@À@€@@@À@€þÀ@@@@@€@@ÿ@€@@À@þÀ€#%5#0335#5##0###0335#03533À@@@@€@€@@@À€@@@€@@@@@€@@ÿ@@@þÀ@€À@7!53#5!#0!#5#53@@@@þÀ@@À€€ÀÀ@@@@@€À@@@@€À@7!53#5!#353!0353@@@@þÀ@€ÀþÀ€ÀÀ@@@@@@@À€@@€@",5##5###353530###3353535#5053530#€@À@@@€@@@@@À@@@À@@@@@@@@@@@€@@@@@@À@þÀ€@€@€À@%5##0535#05335#5!#03#03!5À€ÀÀÀÀ€@þÀ@@@@@À@@€@€@@@@€@€@@€À@7!5305#5305#5!#3530#30#5#@@@@@@þÀ@€ÀÀÀÀ€À@@€@€@@@@€@€@@€@%)7!5305#5305#5!#3530#30#5#0305#35#@@@@@ÿ@€€€€€€À@€@@À@@€@€@@@@€@€@@@€€@€À@7!5305#5305#5!#330#30@@@@@@þÀ@€À€€À@@€@€@@þÀ@€@€@ÿÀ@5#5#30#3#05#03!53@À@€€€€@@@@À@€@þÀ€€@@@ÿÀÀ!5#!53035####330#5#73@þ€@@€@À@@À€€€€@@@ýÀ@@€@@@@þÀ@€@@À@þÀÿÀÀ@5###35##330#5#3!530À€@€€À@@À€€@@@@þÀ@@@þÀ@€@@@@€À@5#5!#3!5#330#30À@þÀ@@ÀÀ@@À@À@@@þÀ@@@@ÿ@@€ÿÀÀ@70335305#0##5#05#303À€@@€@@@€@@Àÿ@À€€ÀÀ€@€À€À@"%5#5##05#5#33#3355##3553€@@@@€@@@@À€@@@À@À@À@€@@@À@@@@@@@@þÀ@@ÿÀÀ@5#035###0#033530À@@À@@€@€@@@@þÀ@€þ€@@ÿ€À5#5##0#335#53030#5#€@À@@À@@@@€@€€@@@þ@@@À@€þ€€@@ÿÀÀ 5#5##0#335#5330#5#30#3€@À@@À@@@€@@€@€À€@@@þ@@@À@ý€@@þ@€€€%5#0535#5#30#30#0305€@@@À@@@@@€€@€@À@€@€@€€€€€À@
+%5#0#33À€À@@€@€@þÀ@€€€@%5#35!3#€@@ÿ@@€@@@@þÀ@€%5#53535###3##3530#€@€@€@À@€@€@@€@À@@@@@À@@@ÿ@@€À%5#0535#0#3#0330#53€@€€À@€@@@@€@€@€@À€@€@@@€ÿÀ!5##0#3335€@À@@À@@@ý@@@ÿÀ#+%5#530#5#3!530#5#535305!5#30#753##@À€€@@@@@@þÀÀ@@ÀÀ@@€@@ÿ@@@@@@@€À@þ@ÀÀ@@@€À@%3##0#0##0335À€@@@€@€À@ÀþÀÿ@þ€@@ÿÀÀ@%30##0#0##03353@€€@@@€@€@€À€þÀÿ@þ€@@@ÿÀÀ@!30#5##5#330303#3€@@€@À€@@@€À@@@þ@@ÿþ@@ÿÀÀ@
+;0#5#30#3030#5#€@@€@@€À€@À@@þ@@þ€€@@ÿÀ@5#0#5##5#3030303@@À@€@€€@@@@@@@þ€€þ@€À@353333##5#5#5€@@@€€@@@@þ@À@@@ÀÀ@@@€À@7!53#5!#30530'0530@@@@þÀ@€ÀÀÀÀ@@@@@þÀ€€À€€€À@%5#0535#0535###35##3353À€€€€À@@@€@@€@€@€@€@@þÀ@@@þÀ@@@€À@5##335#3353#5#3#0#0À€@@€@@@€@@€@@@@@þÀ@@@þÀ@@@@@þÀÿÀÀ735353#5#5###37333À@€@@€@€@@@@@@€ÀÀ@@@ÀÀ@þÀ@@@þÀ@þÀ€À@%5#35!30##05#03353À@@ÿ@@@€@À@€@@@@ÿ@€€@@@€À%5#035!3##05#03353À@@ÿ@@@€@À@€@@@þ@@€€@@@ÿÀ@!5##035!30##05#03353335@@@ÿ@@@€@€@@€@@@@ÿ@€€@@À@@ÿÀÀ@5#3530305#5##5#30#@@@€@À@€@@@@À@€€@@@@þ@ÿÀÀ@!5##3530305#5##5#30335€€@@@€@À@€@@À@@À@€€@@@@þ@@€À@%5#30305#5!##@€€@ÿ@@€@@€€@@þÀ@€À@%5##5!#03053#À@@ÿ@€€@€@@@@€€þÀ@€À@7#35330305#05305#5!30530@@À@@€@@@þ€@€€À@À@€€€€@@€€€€À@7#!5305#05305#0##5#30530@@€@@@€@@À@€€À@@€€€€@À@þÀ€€ÿÀÀ@-!5##05!535#5#5#5#5335#5!#3333#5#0335@€@@@@€@À€@þÀ@@@€@À€@À@@€@@@@@@@@@@@@@@@@ÿ@@ÿÀ335333305#5###5#5#0@À@@@@@À@@@@@@À@@€@@ý@@@€ÿÀ%%5#033305#5##0#30#5#5#0335305€@@@@@À@@@@@@@À@€@@@€@@þ@€@@€@@€€€%5##0#5##3530335€@@À@€@@ÀÀ@@€@@@@þ€@@ÿÀ€%5#335#5####3353553À€@€@À@€@@À@À@@@À@@@@þ@@@@@@@@@€À5##5##353#335305À€@À@€@€€@@@@@@@@@þÀ@À@€ÿÀÀ!5##035#5##0#30335À€@€€@@€€@À@@@À@€@þ@@€@%5#0535#5##5##30335#05303@@@€€€@@@À€€@€@€@ÀÀÀÀ@€@@€€@€À@5#3#535#30#3!535#05ÀÀ@À@À@@@@@@@ÀÀÀÀ@€À@@À€€À@7!53#5#3#0#0@@@@€@À€À@@@@@þÀ€þ€@€À@333#5#5##@€€€@@€@ÀþÀ@þÀ@@@@@€À@03335330#5##5#€@@@€@€@€þ€@ÀÀþÀ€@@@@€À5!##0303030#5!535ÀþÀ@@€À€@ÿ@À@@@þ€þ€€@@@@€À@%5#053535##5#330#€@@@€€€@@@€@€@ÀÀÀÀ@€@ÿÀ@'5#0##53535353535!0353####0!03@€À@@@@@þ@€€@@@@@@@@@@@@@@@€@@@@@€€@@@)-%5#5###53535353535!0353####033535#53@€@€@@@@@þ@€€@@@@À@À€@À@@@@@@@@@@€@@@@@€@@@@@ÿÀÀ@ 3!530#5#535305!!###30#5#@@@@@@@þ@@@@@ÀÀ€@@@@@€@@@@@ÿ@@ÿÀ@!%!5#5#5#535305!!###30!#3!5!53@@@@@þ@@@@@Àÿ@@@ÿÀ@À@@@€@@@@@€@@@@@@€À%5#03535#5!#03053##€@@@@þÀ@€À€@€@@À@@€€ÀþÀ@€À%5##530305#5!#330#@@€À€@þÀ@@@@€@@À€€@@À@ÿ@€À5!33#05#03!535#5#0€ÿ@€À€@@@@@À@@þÀÀ€€@@À@ÿÀÀ@!5##0335#5!#03!5À€ÀÀ€@þÀ@@@@@@@@@þ@@€#)7!53530#5#5!##0335#035330#0305€@@@@ÿ@@@€@@€@@€€À@@@€@@@@þ€@@€@@þ€@@€€€À@7#!5305#5305#5!30530'0530@@€@@@@þ€@€€€€À@@€@€@@þÀ€€À€€€À@	5#053#05!53#5!#03#0€ÀÀ@@@@þÀ@@@@@€þÀ€€@@@@@€@€€€5#!#3!5#330530#30€þÀ@@ÀÀ€@@À@@@@@þÀ@@@@€þ€@@€€À@3533##5€À€€À@þ@ÀÀÀÀÀÿÀÀ%5##30##3!535530305À@À@À@@@ÿ€€@@À@þ€@@@@@@@@€€ÿÀÀ@5#035##5#05#0330##35353À@@À@@€@@@@€@@@@@À@€€@€@@@@þÀ€À@5!3#!5###ÿ@@À@@€@@þÀ@À@@@ÿÀÀ5#0335#5####330#3À@@@@€@À@@À@@€@@€@@@@@@þÀ@€@@þÀ€À"%5#0535#53535#5!#03053#0#30#€@€€@@@þÀ@€À€€€@€@€@@@À@@€€À€@€@€À"%5#0535#05#530305#5!#33#30#@@€€€À€@þÀ@@@€€@€@€@€À€€@@À@@@€@€$%5#5#03#35305#5#30##335#33€@€@@@ÀÀ@€@@€@@@€@@@ÀÀ€À@€@þÀ@@@þÀ@ÿÀ*0!3530#0535#5#30##335#3330530#5#0530À@@@ÀÀ@€@@€@@@@@@€€@@@€ÀÀ@€@þÀ@@@þÀ@€ÿ@@€€€@'+%35#05##03305#5#30##335#3333=3€€@@@€@ÀÀ@€@@€@@@@@@€À€À@€À@€@þÀ@@@þÀ@@€@@€.25#35#30330#35305#5#0535##5#5##0#3;5#@þÀ€@@@@@€@@@@€@@@@@@À@@À@@ÿ@@@€@€@@€@€@@@À@€@þÀ@ÿÀ $(5#35335##0#5##0#3330#5#73@ÿ€@@€@@@@@@@€@@@@€@@ý€@@À@@€À@€@þÀ@€@@À@þÀ€*%5##535#5335#5###35#5##0#3335335@@@@@@@€@@@@@@@@@€@€À@@@@À@@@@þÀ@@À@€@þÀ@@@@ÿÀ!5#5##30303030#3530#5!053@@À@€@€@€À@@þÀ@€@@@ýÀ€þ€€þ@@@€@€*5##!5##30335305#5#0535##0330#5#@þ€@@À@À@€@@@@€@@@@@À@@ÿ@@@@þ@@€@€@@€@€@€!7#!05##053535!03530##0##30@@@@@@ÿ@@@@@À@À@€@€@À€@€@€@@€À?73053035305305#0#5##05#0303053035305305#0#5##05#0303€@@@@@€@@@€@@@@@@@€@@@€@@À@€€@€€€@@€€€€€@€€€@@€€€€À	035330035330€À€þ@€À€€ÿÀÀ€ÿÀÀÀ@@
+035335#5#05€@€@€@þ€ÀÀÀ@€À@@5##35335#5#5À@€@€@€@@þÀÀÀÀ@@€@@5#3530#3#5#@€€À@À@@€@@þÀ@@@À@@À@À5#5##5#0353@@€@@€@@@@@@ÿÀ@À@À35#5#!30#@€@€@€@@@@@À€€À5#0##5#33530€@€@€@€@€@À@@@@€À@@0!5305#5305#0#050530@@@€@@@þ€@€@€€€þÀ€€ÀÀÀ305305#0#5##05#03035€@€@@@€@€@€€€@@€€€@€@À30#0#05#033#3@€@€@€€ÀÀ€€€@@@@€@@5###3535@€@@€@@@@@@@€À@5###35353535###3À€@@€@ÿ@@€@@€@@@@@@@@@@@@€€@@	5##0305@€@€@@€€€€@@	305#0#3@€@€À€€@€€@@	5#05#03@@€@€@€€@À€€@5#5#3#35€@€@@€À@@@@@@@€@5#535##3@@€@@€@@@@@@À@0305305#5##3530€€@@À@€@@€€€@@@@€À@5#5##030305#053@@À@@€@@€@@@€€€€@À@5#5#53535###33@@€€@€€@@€À@@@@@@@@@@À@5#5#5#33##3535@@€€@€€@€€@@@@@@@@@@@À@@030530305#05#05#0#0€@€@@@@@€€€€€€€€À@@0305305305#0#05#030€@@@€@€@@€€€€€€€€@€€@5#5#5###353€@@@@@€@€@@@@@@@@@€€@5##5#333535€€@€@@@@@@@@@@@@À€@@35À€@ÀÀ@€€À5!€þÀ€@@À€€5##35€€@€À@@@@@€5#5#3@€@€@@@@ÀÿÀ@€735À€€ÀÀ@€@!5!€þÀ@@ÀÿÀ€@5#5#3€@€@@@@@@@ÿÀ@!5##35€@€@@@@@€€5##5#335€€@€@ÀÀ@@@@@@À€@0305À€€€@€€@5#5##335#53€@À@@À€@À@@@@@@@@€ÿÀ€€5#535##3€€@€@@@@@@@@@€À5##5##35335À€@À@€@ÀÀ@@@@@@@@€À5##35!5##35À€@€@€@€À@@@@@@@@@@€@
+35#03735#03€@€@À@€@€Àÿ@Àÿ@€5#5#3@€@€@@@@À€€5##35€€@€À@@@@@€€5##5##35335€@@€@@@€À@@@@@@@@@€@@5#5#3#35@@À€@€À@@@@@@€€@@	5##0305@€@€@@€€€€@@	305#0#3@€@€À€€@€€@@	5#05#03@@€@€@€€@ÀÿÀ@@70305À€@€€À€5#5#3À@€@@@@@@€5##35€@€@@@@@@€@
+5#0#3535€@@@@€@@@@@
+%5###305@@@€À@@@@€€ÿÀ€€
+!5##05#0335€@@€@€@@€€@@€€@€	%305#0#30305@€@€@€À€€@€€À€5##35À€@€@@@@@@€€€5#!5#75##35À€@€€€@€€@@@@À@@@@€À€'5##3530303#5#5#5###0535330À€@€€€À€@@@@@@@@@@@@@@@ÿþ@ÿÀ@@@@@@€€@@€À@@À0305À€À€€€À€5##30!05##0335##53305!5À€@€@@€@@@@€@þÀ@@@@ý€€@@À@À@€@€€5##303330#0#0#5À€@€€€€€€€@@@@ý€@þÀ€ÿ@€€€
+%5#035!30#5##35€@@ÿ@@@€@€€@@@þ@À@@@@€À€5##3#03!530#5!5030À€@€@@@@ÿ@€@@@@@þ@@@@ý€þ€À€!%5#03530#0#0#535##30330#€@@@€€@@€@@@@@€@@ÿ@@@@ÿ@ÿ@€€!%5#53#5!#3#30#3#05##35@@@þÀ@@@À@À@€€@€€@À@@@þÀÀ@@þÀÿÀ@@@@@€À€
+%5#0#335#!5#75##35À€À@@@€@€€€@€€@€@þÀ@@@@@À@@@@€À30303#5#5#5###0535330€À€@@@@@@@@@@@þ@ÿÀ@@@@@@€€@@€€À7#!530#535#5!3003053@@€@@@@þ€@€€€€À@@@À@@þÿ@ÀÀ€À%5#03335!30#@€@@þ@@@€@@@À@þ@€À!0!0#05#05#05#0#0#05305303À@@@@@@@@@@€ÿ€€€€€€ÀÀ€€À€À7#!5###0335##53335!30@@À@@€@@@@€@@þ@@À@À@@@À@À@@À@€À%!5###053535353535!353530####À@@À@@@@@þ@@@À@@@@@ÀÀ@@€@@@@ÀÀ@@€@@@@€À03330#0#0€À€€Àý€@þÀ€ÿ€À
+7!530#5!#0303053@@@@þÀ@€ÀÀÀÀ@@@@þÿ@ÀÀ€€€
+%5#035!30#€@@ÿ@@€@@@þ@€À7#303335#5#053535###0#30@@À@@€@@@@€@@À@À@@ÀÀ@€@ÀÀ@@€À#030305303030#05#05#05#0#0#0€@@@€@@@@@@€ÿ€€ÿ€€€€€€€À0303353030###5#5€@@@€€@@@ý€€@@þ€€@@@@€À030333030##5#5#5€@@@€€@@@ý€€@@ÿ€À@@@€À#!5###5#5%35##5#35'5353335!À@@À@@@À@@@@À@@þ@@ÀÀ@@@@€@À@@À@€@@@@ÀÀ€À
+7!530#5!#03030@@@@þÀ@€ÀÀ@@@@þþ€À	03330€À€ý€@ýÀ€€À%5#03535#5!30#53@À@@þ€@@À€€@@À@@þ@€ÀÀ€À+0!5###53535305#5#5#53335!03330##À@@À@@@@@@À@@þ@@@@@@€À@@@@@€@@@@@À€@@€@@@€À%5#335!353#€@@@þ€@@@€@À@ÀÀ@þ@@@€À%5#03530#0#0#0330#€@@@€€€@@@€@@ÿÿ@ÿ@€À0305353#5#5###37333À@€@@€@€@@@@@@€€@@@@@@þÀ@@@þÀ@þÀ€À1030535330305#05#05305305#0##5#05#03030#0€@@@€@@@@€@@@€@@@€€@@€€€€€€€@@€€€€€€À03053530######5#03À@€@@@@@@@@@€€@€@þÀÀþ@@@þ€@€À%5#53#5!#3#30#3#0À@@@þÀ@@@À@À@€@À@@@þÀÀ@@þÀÿ@€À€%5#35!3#030530305€@@ÿ@@@€€€€@À@@þ@@€€€€@€À€!%5#03535##5#330#030530305€@@@€€€@@@@€€€€@@ÀÀÀÀ@ÿ@€€€€€À%5#35###35##33535##35À@@€@€€À@@À@@€@€€@@@@þÀ@@@þÀ@@@@@@@@€À'%5##0535#05335#5!#03#03!55##35À€ÀÀÀÀ€@þÀ@@@@@€@€À@@€@€@@@@€@€@@@@@@ÿÀÀ5##353#5##5#3030€€@€€@À@€@€À@@@@ÀýÀ@@@@@þ€€€€À
+%5#0#335##35À€À@@€€@€€@€@þÀ@@@@@@€À€!5#!5#75##35!53#5#3#0#0À€@€€€@€ÿ@@@€@À€€@@@@À@@@@ý€@@@@@þÀ€þ€€À@%5#35###35##3353À@@€@€€À@@À@€@@@@þÀ@@@þÀ@@@@ÿÀÀ0303#30#3530#535#5!@€€@@@€@@@@ÿÀýÀ@ÿ@@@À@@ÿÀÀ@70335305#0##5#05#303À€@@€@@@€@@Àÿ@À€€ÀÀ€@€À€À!'5#5!#33##03!530#5#5#5#53030À@ÿ@@@€@@@@@@@@€ÀÀ€@@@@@@@ÿ@@@@@@@þ@ÿ€À@%5##0535#05335#5!#03#03!5À€ÀÀÀÀ€@þÀ@@@@@À@@€@€@@@@€@€@@ÿÀÀ*5##5#03##0#3!0#35305#5!5305353535À€À@€@@@@€À@@ÿ@@@@À@@@€@@€À@€@@€@À€@@@ÿÀÀ@3#5##5#3030@€@À@€@€ýÀ@@@@@þ€€@€À
+7!530#5!#0303053€@@ÿ@€€€€À@@@@þÿ@ÀÀ€€À@
+%5#0#33À€À@@€@€@þÀ@€À@5###05#3#35330305#5#0535À€@@À@@À@@€@@@@@@€@þÀ@À@€€@€@€À(,03053053303305#05#05#05#5#03#0#05#€@@@@@@@@@@@@@@€€€€@€@€€€€@€@€€À@@ÿÀÀ@%5#0#0#0#035353À@€€€€€@€@€þ€€ý€À@@€À@%3530535###05#05#0303033@@@€@@@€@@@@À@€ÀÀ@€€€€€@ÿÀÀ,5#5353535##5#30#3##3!0#35305#5!535€À@€@€€€@@@@@@€À@@ÿ@À@@@@@@@@€@@@À@€@@€@À@€À@7!53#5!#33@@@@þÀ@€ÀÀ@@@@@þÀ@þÀ€À@%5#35!303033À@@þ@@€@@€@@@@þ€€þÀ@@ÿÀÀ@35353#5!3@€À@@ÿ@€ýÀÀ@@@@þÀ@þÀÀ@5#5!#03!0#35305#5!03À@þÀ@@€À@@ÿÀÀ@@@ÿ@€@@€@@€À@5!#3!533Àþ€@@@ÿ€@@þÀ@@@þÀ@þÀ@€À@%5#35!33À€€þ€€@€@@@@þÀ@€À@7!53#5#3#0#0@@@@€@À€À@@@@@þÀ€þ€ÿÀÀ@735353#5###35##373À@€@@€@@@€@@À@€ÀÀ@@@@þÀ@@@þÀ@@@þÀÿÀÀ@-37;5#%030530530335#05#535305305#0#0###005#0=#=#À@þ€€@@@@@@@@@€@@@@€@@@@@@€€€€€@@€@@€€€€@@€€€€@@@@@ÿÀÀ@7353530###0#0##5#03À@€@@@@@@@@@€ÀÀ@€@þÀ€þ€@@þ€@€À@5##335#3353#5#3#0#0À€@@€@@@€@@€@@@@@þÀ@@@þÀ@@@@@þÀ@€À
+%5#0#33030530305À€À@@À€€€€@€@þÀ@€€€€€€À7!53#5#3#0#0030530305@@@@€@À€@€@€À@@@@@þÀ€þ€@€€€€€À5##35!53#5!#33€€@€ÿ@@@þÀ@€ÀÀ@@@@þ@@@@@þÀ@þÀ€À5##35!53#5#3#0#0€€@€ÿ@@@€@À€À@@@@þ@@@@@þÀ€þ€€À%5##335#%5##353353#5#3#0#0À€@@€@€@€€@€@@€@@@@@þÀ@@@À@@@@þ@@@@@þÀ@€À 7!530#05305#5!#03030530#€@@@@ÿ@€€€€@À@@€€@@þÿ@À€@€À#7!530#5!#03330#5#5#35#053€@@ÿ@@@€€@€@À@€À@@@@€@@ÿÀ@@À@@€À€"%5#0#05#5#3303#5#305#0;5#€@€@€@@@@€@€@@@@@€@€€@@@€þÀ@@@@€@€€%%5#0#05#5#0303#5##0305%5##35À@€@@@@@@@@@ÿ€@€€@€€@€€þÀ@@@@€€€@@@@€€"(.%5##05#5#33030#5#305#0;5#%030530305€@€@€@@@@€@€@@@@@þÀ€@€€@@€@@@€ÿ@À@@@€@À€€€€ÿÀÀ735353#5#5###37333À@€@@€@€@@@@@@€ÀÀ@@@ÀÀ@þÀ@@@þÀ@þÀ€À@#5!3#0335#035330#3530#535#Àþ@@@@€@@@@@€@@À@@@@@ÿ@@@@ÿ@@@þÀÀÀ@,04%5####35305%030535303535305#0##05###3535#À@@@@€@þ€€@@@@@€@@@@@@@@À@@@@@@€@€€@€À@€€@€À@@@@À$%305#5#5#3533305#5!##3330#3€@@À@@€@@@ÿ@@@@À€À@€@@@@@@€@@@þÀ@@€@ÿÀÀ@5!#3!0#35305#5!Àþ€@@€À@@ÿ@@þÀ@€@@€@@€À%5#03305#53335!30#@@@€€@@þ@@@€@@€À@@À@þ@@ÿÀÀ@33305#53305!€€@@€€@þ€ýÀ@@€À@€@€@)%5#05305305##05305#5#30#0#03530#03À@@@€À@@€@@@€À@@€@€€€@€€@@€€€@€€@€À0305305305!05305#0#0#0!0À€@@ÿ@€@@€€€€€€€€€€ÿÀ)!#35353#05#5#5!#35335330#0#03030€@@@@@@@ÿ@@@@@@@@€@@@@À€@@@@@ÀÀ@€€ÿ€ÿÀÀ€,%035#5#05#5#5#5#333##353530##35353€@@@@@@€@@@@@@@@@@@@@@€ÀÀ€@@@@@@@@@@@€@@@@À%3#####33533!!'53À@€@€@€@€@€ÿ@@@@ÀýÀ@ýÀ@ýÀ@@@@@€@@@!%30#0#0#0#0#033533!!'53À@€@€@€@€@€þÀ€@@@þ€€þ€€þ€@@@@@€@@€À030##03305##03@€€À@@À@@€ÿ€þÀ@€@ÿ@@€À5##033030##0€@@À€€€À@@ÿ@ÿ€þÀÿÀÀ3353#5!0#033#5##35ÀÀ@@ÿ€€À@À@@@@À@ý€@þ@@@@@€À€#7!53#5#5###335#53353#5##35€@@@@À@@€@@@@€€@@À@@@@@@@@@@@@@þÀ@@@@€À!7!535##5353535#5!#03053###@@@€À@À@@þÀ@€ÀÀ@@À@@ÀÀÀ@@À@@€€À@@À€À!%7!5305###5353535#5!#033##53@@@@@À€€@@ÿ@@@€@À€À@@€@@À@@À@@€@@@À@ÀÀ€À$.5###5#5#330#0#0!05#05#05#53055305303À€@@@€@@@@À@@@@ÿ@€@À@@@@@@@ÿ€€€€€@€þ@€€@€À@"&5#0!05#05#535#5##35305353035#À@þÀ@@@@€€@@@@@@@@À@@À€€€@@@@@@ÿ@@@€@@€À5!#03!530#5##3530#0Àþ€@@@@@€@@@ÀÀ@@þ@@€@@@@þ€€À@5!#3!535#5#3#Àþ€@@@@@À€À@@þÀ@@À@@À@€%5#0335#5#535!3##3530#€@€@@€@ÿ@€@@€@€@€@@@@@@@@@@þ€@@€À5#535#5##03530#330À€@@€€@@@@€@@@@À€@ÿ@@€€À@%)-%5##35%030535303535305#0##05###3535#À@@@þ€€@@@@@€@@@@@@@@À@@@@@€€@€À@€€@€À@@@@ÿÀÀ@5#5#5#5!530#5!#0333030À@À@@@þÀ@@@ÀÀÀ@@@@@@@@þ€@@@@ÿ€À@%5##335#5!#3!5À€ÀÀ€@þÀ@@@À@@@@@@@þÀ@@@ÿÀÀ3!53#30#05#00305€@À@€€€@@@@þ€€€€€À€#5#5#3#!5###5335##53335!3@@€@€@À@@€@@@@€@@þ@@@@@@ýÀ@À@@À@À@À@@À@€À€!'7#!5###5335##53335!3030530305@@À@@€@@@@€@@þ@@€@€À@À@@À@À@À@@À@€€€€%3#5#053305!0353303#3À@@À€@þ@@@€€@€@À@€@€€@ýÀ€þ@@€À€%5#3335!3#5##35@€@@þ@@@€€@€€@À@@À@þ@@À@@@@€À'5#053533305#5!##033!5305###5#5@À@€@@@ÿ@@@@@@@€@À@€@@@€@@@þ€@@@€@@@À€À)7!535#5#5#5#0530305#5!#03333#05#0@@@@@€@À€@þÀ@@@€@À€À@@À@@@€€€@@€@@@À€€€€€
+%5#035!30#€@@ÿ@@€@@@þ@@€À€%5#35!3#030530305€@@ÿ@@@€€€€@À@@þ@@€€€€€À5!30#5#3!530Àÿ@€€@@À@@þÀÀ@@€33!530#5#0!030€@@@€ÿ@ÀýÀ@ýÀ@@@þÿ€033!530#5#0#0#0030€@@@€€@À@ý€@þÀ@@ÿýÀÿ€303030#5#053305!035€€€€@À€@þ@@ÀýÀ€þ€€@€@€€@€À€%5##35#303335#5#53535###0#3€€@€ÿ@À@@€@@@@€@@À@@@@@@ý€@@ÀÀ@@@ÀÀ@@€À€5#5#33053535303#0###0@@€@À€@@@€€@@@@@@@@ýÀ€@@ÿ@€@@€À€#5##5#335!530#0#0#03!#5#€€@€@Àÿ@@€À€@À€@@@@@@@ý€@@ÿÿ@À@@ÿÀÀ703053530###03À@@€€À€€@€€@€ýÀ@ý€@€À30303#5#5#5###0535330€À€@@@@@@@@@@@þ@ÿÀ@@@@@@€€@@€€À7#!530#5#53335!30030@@€@@À€@@þ@@€€À@@@À@@À@þÿ€À7#!530#535#5!3003053@@€@@@@þ€@€€€€À@@@À@@þÿ@ÀÀ€À%5#03335!30#@€@@þ@@@€@@@À@þ@À7353335#!#0#37030@@À@@@ÿ@@@€@@@@@À@@þÀÀþ€À7#!5###0335##53335!30@@À@@€@@@@€@@þ@@À@À@@@À@À@@À@€À)03030303030#5#53535##5##5#33#€@@@€@@@@€@@@€@@@€ÿÿÿ@@@ÀÀÀÀÀÀ@@@€À#7!530#535#5!#035353#30#5#5#0@@@@@@þÀ@@@ÀÀÀÀ@@À@@@À@@€@@À@ÿ@@€€À030535353030####€@@@€€@@@ý€€@@ÿ€À@@@€À€#5##5#3#030535353030####35€€@€@€€@@@€€@@@À@@@@@@ý€€@@ÿ€À@@@@€À7#303335#5#053535###0#30@@À@@€@@@@€@@À@À@@ÀÀ@€@ÀÀ@@€À730330!#0#3€@€€þÀ@@€ÀýÀ€@þ@€À0303353030###5#5€@@@€€@@@ý€€@@þ€€@@@@€À03330#0#0€À€€Àý€@þÀ€ÿ€À
+7!530#5!#03030@@@@þÀ@€ÀÀ@@@@þþ€À	03330€À€ý€@ýÀ€€À%5#03535#5!30#53@À@@þ€@@À€€@@À@@þ@€ÀÀ€À#7!5305###5#03533305#5!##03€@@@€@@€@@@ÿ@@@À@@€@@@€@@@€@@@þ€@@€À%5#335!353#€@@@þ€@@@€@À@ÀÀ@þ@@€À7!53###3!#5#@@@€À€@À€À@@@þÀ@þÀ@À@@€À0305353#5#5###37333À@€@@€@€@@@@@@€€@@@@@@þÀ@@@þÀ@þÀ€À1030535330305#05#05305305#0##5#05#03030#0€@@@€@@@@€@@@€@@@€€@@€€€€€€€@@€€€€€À%35####0!€@@€€€@@@À@ýÀ@ý€@€À
+030###3@€€À€@€ÿ€þÀ@þÀ@€À0!0##0#0#À€@@@ý€€ýÀþ@%35###0#0##0!À@@€@@@€€@@À@ýÀþ@ý€@€À5!30530#!530#5#5030@þÀ@@@@@@€@À@À€þ@@@Àþÿ€0!530#5#0030030@@€@À€ý€@@ýÀÿ@ý€€€À5!30#!530#5#5030ÿ@@€@@À€À@@þ@@@Àþÿ€À'7!53530#5#5!#03535330#3##5#5#0@@@@@ÿ@@@€@ÀÀ@€@@À@@@€@@@€@@@€@À@@@€€À033033530#5###0030@@@À@@À@@À@ý€@ÿ@@@@ÀýÀþ€À%5#035!#3#3530353À@@þ€@@@€@@€€€@@@ÀþÀ@@þÀ€ÀÀ€À@%5##5!3##335#533À@@ÿÀÀ@@À€€@€@@@@@@À@@ÀÀ@€À5#!#3!530#5!05!5030À€ÿ@@@@@ÿÿÀÀ@@@þ@@@@€@þÿ€À@7#!5305#5305#5!30530'0530@@€@@@@þ€@€€€€À@@€@€@@þÀ€€À€€€À@%5#3335!3#@€@@þ@@@€@@@@À@þÀ@À@7353335#0!##373@@À@@@ÿ@@@€@@@@@À€@þÀÀÀ@þÀ€À@%5##5!05#5!#3!553À€À@@þÀ@@@ÿÀÀ@@À€@@þÀ@@@@€À@35335335#535##5##5#3€@@@€@@€@@@€@@ÀÀÀÀÀÀ@ÀÀÀÀÀÀ@€À@7!5305#5305#5!#3530#30#5#@@@@@@þÀ@€ÀÀÀÀ€À@@€@€@@@@€@€@@€À@7353533####5#3€@@@€€@@@€€À@@ÀÀ@@@Àþ@€À5##5#335353533####5#3€€@€@ÀÀ@@@€€@@@€€À@@@@@@þ@@ÀÀ@@@Àþ@€À@5###05#3#35330305#5#0535À€@@À@@À@@€@@@@@@€@þÀ@À@€€@€@€À@73303!##3€@€€þÀ@@€À@þ€À@þÀ@€À@3533533###5#5€@@@€€@@@@þ@À@@ÀÀ@@@@€À@3533##5€À€€À@þ@ÀÀÀÀÀ€À@7!53#5!#33@@@@þÀ@€ÀÀ@@@@@þÀ@þÀ€À@	30303€À€@þ@€þ€ÀÿÀÀ@5#05353#5##5#30#3@À@@À@€@@À€@@€@@@@@@þ@@þÀ€À@%5##335#5!#3!5À€ÀÀ€@þÀ@@@À@@@@@@@þÀ@@@€À@%5#3305!0353#€@@@þ€@@@€@@@€€@þÀ@ÿÀÀ@!3530#0#0#03!#!!@@@€À€@@ÿ@@þ€€þ€@@@@ÿÀÀ€735353#5#5###37333À@€@@€@€@@@@@@€ÀÀ@@@@@@þÀ@@@þÀ@þÀ€À@#%5#5#53535###5#5#33##353533À@@@@€@@@€@@@@€@@@€@@À@@@@@@@@À@@@@@@À@%35#0#0#0#!€@@€€€@@@À€þ€€þ@@€À@3##5#3@€€À€@@ÀÀÀÀÀ@€À@
+!#0###0À€@@@@þ@Àþ€@þÀ€@%35#0#0###0#!À@@€@@@€€@@À€þ€@þÀ€þ@@€À@5!0353#!5305#5#050530@þÀ@@@@@@€@@€@þÀ@@€@€þÀ€€€@
+!5305#5#505303@@€@À€@þ@@€@Àþ€€€€þ@À€À@5!3#!5305#5#050530ÿ@@€@@À€@@þÀ@@€@€þÀ€€€À@7!53#5!#3530#30#5#@@@@þÀ@€ÀÀÀÀ€À@@@@@@@€@€@@€À@35303353#5##0#53@@@À@@À@@À@@þ@À€@@@@@€Àþ€@þÀ€À@%5#35!#03#3530530530À@@þ€@@@€@@€€€@@@@€À@@€À€€€À%5##5!05#5!#3!55#5#353À€À@@þÀ@@@€@€@ÀÀ@@À€@@þÀ@@À@@@@À@@€À"%5##5!05#5!#3!553030530305À€À@@þÀ@@@ÿÀÿ€@€À@@À€@@þÀ@@@@@€€€€ÿÀÀ 5#5##3#335#0530#5#30#3@€€@@@À@@À@@€@€À€@@@@þ@@@@€ý€@@þ@€À%5#3335!3#5##35@€@@þ@@@€€@€€@@@@À@þÀ@@@@@@€À@%5##0535#05335#5!#3!5À€ÀÀÀÀ€@þÀ@@@À@@€@€@@@@þÀ@@€À@#%5#5#5#5#5335#5!#3333#5#3!5À@@€@À€@þÀ@@@€@À€@@À@@@@@@@@@@@@@@@@@@€€€
+%5#0#3#0305€@À@@@€€@€@þÀ@€€€@€À
+%5#0#3#030530305€@À@@@€€€€@€@þÀ@€€€€€@ÿÀÀ3!53#30#05#00305€@À@€€€@@@@þ€€€€€@03030!5305#5#5!0530€@@@€ÿ@þ€€þ€@€@À@þÀ€€€@353!5305#5#5##50530€@@@€€@À@@þ@ÀÀ@€@ÀÀÀþ€€€€À5#5##3#335#05030#5#@€€@@@À@@€€@€€@@@@þ@@@@€€þ€€@@€À'5###05#3#35330305#5#053=##35À€@@À@@À@@€@@@€@€@@@€@þÀ@À@€€@€@À@@@@€À5#5#3353533####5#3@€@@@@€€@@@€€€@@@@þ@@@ÀÀ@@@Àþ@ÿÀÀ#5##5#3353530#0#0#03!#!!€€@€@À@@€À€@@ÿ@À@@@@@@ý@@þ€€þ€@@@@ÿÀÀ@70305353#0#0#3À@@€€À€€@€€@Àþ€€þ@@€À5##033533530#5#3###À€@@€@€@@€@@@@À@@þ@@@@@@þ@@þÀÀ€À@5##3353353#5#30#5##0À€@@€@€@@€@@@@@@þÀ@@@@@@@ÿÀÀ€À!7#!530#5#053305#5##0353030€@@@@€@@€€€@@€@À@@@€@€@@€@þ@ÿ€À!7#!5305#5#053305#5##03530530€@@@@€@@€€€@@€@À@@€@€@€ÀÀ€@þÀ€€€)5#533305#5###0#0330335305###0À€@@@@À@@€€@@À@@@@À@À@@€@@Àý€@ÿ@@€@@€@#%5##0535#05335#5##0#5#3530335€@€€@€@À@@€€@@ÀÀ@@€@€@@@@€Àþ@À€@@€À035335330#5#05#5##0#353€@@@€@@@@@@€@€ÿÀÀÀÀÀ€@@€ÀÀÀ€À@!%03053030530305#05#05#5##0#0753€@@@€@@@@@@€@€€€€€€€€@@€€@@@€!%035335330#5#05#5#0#0#053753À@@@€@@@@@€@€@ý€ÀÀÀÀÀ€@€€þÀÀ€ÀÀ€@%)3053030530305#05#05#5#0##50530753À@@@€@@@@@€@€@@þ@€€€€€€€@€@Àþ€€€€@@€À%/03030303030#5#5305305!0303#705#53#0€@@@€@@@@þ@@@@€@À@€ÿÿÿ@@€€€€@@€€@@€€À@35335335#05305!03075#53#€@@@€@@þ@@€@À@@ÀÀÀÀÀÀ€€€€@@@@@€ '10353353305#05#0530530503#5303305#530#À@@@€@@@@þ@€@@@@@@À@ý€ÀÀÀÀ€€€€€ýÀ@À@À€@€@€@€@&35335335#05305!03#5053075#53#À@@@€@@þ€@€@€@À@@þ@ÀÀÀÀÀ€€€@Àþ€€€À@@@@À€/!5!5!535#535#5#53535##5#33##353!!!#3€ÿ@@@@€@@€@€@@€@€Àÿÿ@@@@@À@À@@@@@@@@@@@@À@À@@@À@#3!5!5!5305#5305#5!#35!0!!0!#35##5#333535€ÿ@@@@þÀ@@ÿÿ@@@€@€@@@@@@@€@€@@@@€@€@@@@@@@@@@@€À03053530#0####5#03À@€@€@@@@@@€€@€þ€Àþ@@@þ€@ÿÀÀ7353530#0####5#03À@€@€@@@@@@€ÀÀ@€þ€@ýÀ@@þ€@€À
+7!530#5!#0303053@@@@þÀ@€ÀÀÀÀ@@@@þÿ@ÀÀ€À@7!53#5!#30530'0530@@@@þÀ@€ÀÀÀÀ@@@@@þÀ€€À€€€À%353535####05##3303@@@@@@@@€@@€ÀÀÀÀ@ÀÀ€@þÀÀ€€À@"%305305305##0##05#05#0303033@@@@@@@@€@@@@À€€€@€@€€€€€@€À€-5#5#3!5#5#33535305###0#05#0#03303À@€@€@€@@@@@@@@@@€@@€@@@@@@@@ýÀÀÀ€@À€€ÿÀ€€À25#5#3!5#5#3305305305##0##05#05#0303033À@€@€@€@@@@@@@@@@€@@@@€@@@@@@@@þ@€€€@€@€€€€€@ÿÀ%!3530#0#0#5##0335#03033##3€@@€@@À@@€@@@€@€À@þ€@@þ@@þ@@@@ÿÀ@!!3530#0##5##335#333##3€@@€@@À@@€@@@€@€À@þ€@@@þÀ@@@þÀ@@@@@À@#%3530#5#5###0333'033530#5#€@@€@€@@€@€@@@@@€@@@@@þ@@€@@þ@@@À€%353#5#5###333'3353#5#€@@€@€@@€@€@@@@@€@@@@@@þÀ@@€@@@þÀ@@€À€&5#5!05#!#3353353#5#30#0#0#0À@@ÿ@@€@€@@€@@@@€@@€@Àþ@@@@@À@@þ€ÿ€€À@'5##3353353#5#30#5##05!05#!03À€@@€@€@@€@@@@@ÿ@@@þÀ@@@@@@@ÿÀÀÀ€@€€À€-5##3353353#5#30#0#0#07305!035335À€@@€@€@@€@@@@À@þÀ@@@€@@þ@@@@@À@@þ€ÿ€À@€€@@@€À+5##3353353#5#30#5##07305!035335À€@@€@€@@€@@@@À@þÀ@@@@@þÀ@@@@@@@ÿÀÀÀ@€€@@@ÿÀÀ%30#5#03533305#5!##033€À@@€@@@ÿ@@@@€À@€@@@€@@@þ€@@À@5#5!#33035#3À@þÀ@@€€ÀÀÀ@@@þÀ@€À@@€!5#530535#5305#0#3#0#3#0305€€@À€@€À€@À€@€@@€@@€€@@€@@€€@€€@	!05#!03€@ÿ@À€@€@€€@
+#3535#30305#35#€@@@@À@À€€À@@@€€@@€€@5!5#35€ÿ@@À@@À@@€€@35#!@@@ÿÀ@À@@À5##35'5#!5#75#5##3535#À€€€À€€@€€€€€€€€@@@@@€@@@@€@@ÿ@@@@@@
+€%)-3%5##35'5#75#!5#=#=##350305%5#!5#0305@@@@@€@@À@€@@@€@þ€@À@þÀ@À@@@@@@@€@@@@À@@€@@@@þ€€€€@@@@€€€(5##5#3#03053535303335#####35€€@€@€€@@@@@@@€@@@À@@@@@@ý€€@@ÿ@@À@À@@@@&5##5#33535#0####5#35353533€€@€@À€@@€@@@€€@@@@À@@@@@@ý€@À€@@@Àþ@@@@À@€À@5#5##30#!530#5#5030@€@@@€@@À€À@@@@þ@@@Àþÿ€À€5#5##3#!5305#5#050530@€@@@€@@À€@@@@þÀ@@€@€þÀ€€€À %5#035#53#3335#5305#5!30#@€€€@@@@@@@þ€@@€@@À@@@@@@€@@þ@ÿÀÀ@$5#0535##5#30#%5#'3530#5#3#3@€€@€@@À@@@@@À€@@@@€@@@@þ@À@@@@@@À@€À€%5#0!5##!30#@@@þÀ@@€@À@@@þ@€ÀÀ%5#!5##!3#@@@þÀ@@€@@À@@@þÀ@€À%5#035#53335!3#30#@€€€@@þ@@@@@€@@À@@À@À@ÿ@€À@%5#0535#053335!30#30#@€€€@@þ@@@@@€@€@€@@À@€@€@ÿÀÀ!%5#03#353#5#53335!30#5#@€@€@@À€@@þ@@@@€@þ@@@À@À@@À@þ@€@@ÿÀÀ@#'%5#05330#3530#5#5#053335!3#5#@@@@€@@@€€@@þ@@@@€@€@ÿ@@@@€@@À@þÀ@€@@.%35#5#5#53535##5##5#33##0303030303À@@@@@@€@@@€@@@@€@@@@@@ÀÀ@@@ÀÀÀÀÀÀ@@@ÿÿÿ@@"%35#05#535##5##5#3#3533533À@@@@€@@@€@@€@@@@@@À€@ÀÀÀÀÀÀ@ÀÀÀÀÀ@ÿÀÀ/5#5353530#535#5!#035353#30#5#5#033#3@€@€@@@@þÀ@@@ÀÀÀÀ@@@@@@@@@@@@À@@€@@À@ÿ@@€@@@@ÿÀÀ@+5#53535305#5305#5!#3530#30#5#33#3@€@€@@@@þÀ@€ÀÀÀÀ€@@@@@@@@@€@€@@@@€@€@@@@@@&%35#05#5#053535###0#30#30333À@@@@@@€@@À@@À@@@@@À€@€@ÀÀ@@þ@@À@@$5###05#3#353303335#5#5#0535À€@@À@@À@@@@@@@@@@@@€@þÀ@À@€@@À@@€@€À!0333053030#5#53535##05##0€@@@€@@@@€@@@ý€@À€ÿ@@@ÀÀ€À€À@!35303530305#5#535305#0#5#0#5€@@@€@@@@€@@@@þ@À€@€€@@@€€@€À€À'7#303335#5#053535###535#05#3#30@@À@@€@@@@€@@@@À@@@À@@ÀÀ@€@ÀÀ@@@€@@@€À)5###0535#05#3#30#35330305#5#0535À€@@@@À@@@@À@@€@@@@@@€@€@@@þ€@À@€€@€@€"7#303335#5#053535###0!30530€@À@@€@@@@€@@ÿ@@À@@ÀÀ@€@ÀÀ@À€€@"5###05!3053#35330305#5#0535€@@ÿ@@@À@@€@@@@@@€À€þÀ@À@€€@€@%35##0#0#0333À@@€À€€À@@@À@ÿý€@þÀ@@%35#0##5#3533À@@€À€€À@@@À€ÀÀþ@ÀÀ@€03333335!0#0€@€@@@þÀ@ý€@þÀ@@@Àÿ€@353303335!#5€@€@@@þÀ@@þ@ÀÀ€@@ÀÀÀÿÀ!353#5#0!03333#5#@€@@€þÀ€@€@@@@@À@ý€@ýÀ@þ@@@ÿÀ@!353#5#5##5#353353#5#@€@@€€@€€@€@@@@@@@ÀÀÀþ@ÀÀÀþÀ@@€À!%%5#5###3#0!5!#03!5353#53À@@@€@@€þÀ@@@@@€@€@@@@@þÀ@@@þ@@@@@þ€@þÀ€À@!'%5#5###03#!5!#3!535305#50530À@@@€@@€þÀ@@@@@€@€@@@@@@€@@@@þÀ@@@€@À€€ÿÀÀ/!5#535305###5#03533305#5!##03333#35€@@@@@€@@€@@@ÿ@@@@@@€À@@@€@@@€@@@€@@@þ€@@@@@@ÿÀÀ@!5#53535##335#5!#333#35€@@@€ÀÀ€@þÀ@@€@€À@@@@@@@@@@þÀ@@@@@@À%35#335!353#3@@@@@þ€@@@€@@ÀÀ@ÀÀ@þ@@@@À@%35#3305!0353#3@@@@@þ€@@@€@@À@@€€@þÀ@@@€À%5#03530#0#0#0330#€@@@€€€@@@€@@ÿÿ@ÿ@@ÿÀÀ@5#5353###33#€@@@€€€@@@@@À@@þÀ@þÀ@À@@€À!%5#0535#53530#0#0#033#30#€@€€@@€€€@@€€@€@€@@@ÿÿ@@@€@@ÿÀÀ@5#535#5353###33#3#€@€€@@€€€@@€€@@@@@@@@þÀ@þÀ@@@@@6%35#5#05#05305305#0##5#05#03030#0#0305353303À@@@@@@€@@@€@@@@€@@@@@@À@€€€€€@@€€€€€€€@@€@@'5###5#5#33##3535333335#5#535À€@@@€@@@@€@@@@@@€@@@@@@@@@À@@@@@@@@À@À@5!3!335###0ÿ@@@@@€€À@@ýÀ@@À@ýÀ@5!30!335#0#0#ÿ@@@@@€€@@þ€@@À€þ€@%35####3!03À@@€À€@@@@À@þÀ@þÀ@ÿ@@%35#0##5#3!3À@@€À€@@@@À€ÀÀÀ@À@€À030##05#0##330305@€€@@@€@€@€ÿ€þÀ€€@þÀ@€€€À@3##05#0#5#330305@€€@@@€@€@@ÀÀÀ€€ÀÀ@€€€À
+0333#5!0€À€@ÿý€@þÀ@@€À@35335#5!5€À€@ÿ@þ@ÀÀÀ@À€"%5##0!0#5!##303!505#0!53€€@ÿ@@@@þ€@€À@@@@À@ÿ@@@€€ÀÀ€@ %5##5!05#5!##33!505#0!53€€@ÿ@@@@þ€@€À@@À€@@@@À@@€€@@ÿÀ$*.5#5353535##0!0#5!##3033#305#0!53À€@@@€€@ÿ@@@@@@@À@€@@@@@@@@@À@ÿ@@@@@€€ÀÀÿÀ@"(,5#5353535##5!05#5!##333#305#0!53À€@@@€€@ÿ@@@@@@@À@€@@@@@@@À€@@@@À@@@@€€@@€€€
+%5#035!30#€@@ÿ@@€@@@þ@€À€155##5#3#33##03030303030#5#53535##53553€€@€@€@@@@€@@@€@@@@€@@À@@@@@@@À@@@ÿÿÿ@@@ÀÀÀ@ÿÀÀ€À'5##5#33535335335#535##5##5#3€€@€@ÀþÀ€@@@€@@€@@@€@À@@@@@@þ€ÀÀÀÀÀÀ@ÀÀÀÀÀÀ@ÿÀÀ#'!353#5#053535###0#30#3033#5#€@@@@@€@@À@@À@@@@@@@@€@ÀÀ@@þ@@þÀ@@ÿÀÀ@#'5###05#3#35330#3530#5#05355#À€@@À@@À@@@€@@@@€@@@@€@þÀ@À@ÿ@@@€@þ@@%35#!#0#353033À@@þÀ@@€@€@@@À@@þ@@ýÀ@@%35#0!##353303À@@þÀ@@€@€@@@À€@þÀ@@@þ€@ÿÀÀ!3530#0#0#033#5#€@€À€€À@@@@ÿý€@þ@@@ÿÀÀ@!353##5#353#5#€@€À€€À@@@@@ÀÀþ@ÀþÀ@@%35##0#0#0333À@@€À€€À@@@À@ÿý€@þÀ@@%35#0##5#3533À@@€À€€À@@@À€ÀÀþ@ÀÀ@À%3530###3!#3@@@€À€@@@@@€þÀ@þÀ@ÀÀÀ@%353##5#3!0#3@@@€À€@@@@@ÀÀÀÀ@€À%35####5#5#030335303À@@€@@@€€@@@@@@À@@@@@ý€€@@þ€@@%35#0###5#5#3533533À@@€@@@€€@@@@@@À€@@@@þ@À@@À@€À€!+5##5#335035330#5#5#5###0535330€€@€@ÀþÀ€À€@@@@@@@@@@@@@@@@@þÀþ€ÀÀ€@@@@@@€€@@€€À#%5##5!3##335#5335##5#335À@@ÿÀÀ@@À€€@@€@€@À€@@@@@@À@@ÀÀ@@@@@@@@€À€%+035330#5#5#5###0535330030530305€À€@@@@@@@@@@ÿ€@€þ€ÀÀ€@@@@@@€€@@€€€€€€À#%5##5!3##335#533030530305À@@ÿÀÀ@@À€€@ÿ€@€€@@@@@@À@@ÀÀ@€€€€€€À%5#035#535!##03305353À@@@@þÀ@@€€€@@€@@À@@@þ@þÀ€€@À€À@#)%5#0535#5##5#33##0335#053030530À€€@€€€@@@@@€@@@@€@€À@@@@@@@€@@€€@€€€À€'5##5#335#!5###5335##53335!3€€@€@Àÿ@À@@€@@@@€@@þ@@@@@@@@@ý€@À@@À@À@À@@À@€À"%5##5!05#5!#3!55##5#33553À€À@@þÀ@@@€@€@ÀÀÀÀ@@À€@@þÀ@@@@@@@@ÿ@@€À7!530#5!#3530!0353@@@@þÀ@€ÀþÀ€ÀÀ@@@@@@ÿÿÀÀ€À@7!53#5!#353!0353@@@@þÀ@€ÀþÀ€ÀÀ@@@@@@@À€@@€À€"7!53#5!#353!0353030530305@@@@þÀ@€ÀþÀ€Àÿ€@€À@@À@@@@ÀÿÀÀÀ€€€€€À"7!53#5!#353!0353030530305@@@@þÀ@€ÀþÀ€Àÿ€@€À@@@@@@@À€@@@€€€€€À€#)/35335335#5#53535##5##5#33#030530305€@@@€@@@@€@@@€@@@€@€@ÀÀÀÀÀÀ@@@ÀÀÀÀÀÀ@@@@€€€€€À!'35335335#535##5##5#3030530305€@@@€@@€@@@€@€@€@ÀÀÀÀÀÀ@ÀÀÀÀÀÀ@À€€€€€À€!'-7!535#535#5!#035353#3#5#5#0030530305@@@@@@þÀ@@@ÀÀÀÀ@@@€@€À@@À@À@@€@@À@À@@€À€€€€€À%+7!5305#5305#5!#3530#30#5#030530305@@@@@@þÀ@€ÀÀÀÀ€@€@€À@@€@€@@@@€@€@@@€€€€€À#7!530#5#535305!!###30#5#5#0@@@@@@@þ@@@@@ÀÀ@@À@@@@@€@@@@@ÿ@@€ÿÀÀ@ 3!530#5#535305!!###30#5#@@@@@@@þ@@@@@ÀÀ€@@@@@€@@@@@ÿ@@€À@5!3053535303#0###0€þÀ@€@@@€€@@@@@@ýÀ€@@ÿ@€@@€ÀÀ5!353533####5#3€þÀ@@@@€€@@@€€€@@þ@@@ÀÀ@@@Àþ@€À€#3053535303#0###0'030530305€@@@€€@@@@€@€ÀýÀ€@@ÿ@€@@À€€€€€À7353533####5#3030530305€@@@€€@@@€€@€@€À@@ÀÀ@@@Àþ@€€€€€€À€7!53#5!#33030530305@@@@þÀ@€Àÿ€@€À@@À@@þ@Àþ@À€€€€€À7!53#5!#33030530305@@@@þÀ@€Àÿ€@€À@@@@@þÀ@þÀ@€€€€€À
+7!530#5!#0303053@@@@þÀ@€ÀÀÀÀ@@@@þÿ@ÀÀ€À@7!53#5!#30530'0530@@@@þÀ@€ÀÀÀÀ@@@@@þÀ€€À€€€À€7!53#5!#35353030530305@@@@þÀ@€ÀÀÀÿ€@€À@@À@@þ@ÀÀÀÀÀ€€€€€À#7!53#5!#30530'0530030530305@@@@þÀ@€ÀÀÀÿ€@€À@@@@@þÀ€€À€€€€€€€€À€'-37!5353#5#5!#03535330#30##5#5#0030530305@@@@@ÿ@@@€@ÀÀ@€@@@€@€À@@@@@@@€@@@€@€@@@€À€€€€€À%7!53#5!#3530#30#5#030530305@@@@þÀ@€ÀÀÀÀ€@€@€À@@@@@@@€@€@@@€€€€€À@5!!530#0#0#03!#5#€þÀ@@€À€@À€@@ýÀ@@ÿÿ@À@@ÿÀÀÀ5!3530#0#0#03!#!!€þÀ@@€À€@@ÿ@€@@ý€@þ€€þ€@@@@€À€#7!530#0#0#03!#5#030530305@@@€À€@À€@€@€À@@ÿÿ@À@@À€€€€ÿÀÀ#!3530#0#0#03!#!!030530305@@@€À€@@ÿ@ÿ€@€@þ€€þ€@@@@@€€€€€À€'5##35!5##35!530#0#0#03!#5#À€@€@€@€þÀ@@€À€@À€@@@@@@@@@ý€@@ÿÿ@À@@ÿÀÀ'5##35!5##353530#0#0#03!#!!À€@€@€@€@@@€À€@@ÿ@À@@@@@@@@ý@@þ€€þ€@@@@€À€03#0#0#03030530305@€€À€@€@€€ÿ@ÿÿ@€€€€€À3##5#3030530305@€€À€@€@€@ÀÀÀÀÀ@À€€€€€€
+ !530#5#50303%030530305@@€@À€þ@€@€ÀýÀ@@ÀþÿýÀ@À€€€€€
+ !5305#5#505303%030530305@@€@À€þ@€@€@þ@@€@Àþ€€€€þ@ÀÀ€€€€€À%5#035!3##037030À@@ÿ@À@@@€€@@@À@ÿ@@ÿ€À%5##30###0335#03533À@À@€@@@À€@@@€@@@€@@ÿ@@@þÀ@€!5!3##0335#030335#030#0Àÿ@À@@À€€@€@@@@À@@À@ÿ@@ÿ@@þ€ 735#0353335##30###0!35#@À€@@@€@À@€@@À@@À@@@þÀ@@@@€@@ÿÀ€"%35#0#535#5!#035353#30;0#0@€@@@@ÿ@@@€€€À@@À@@@À@@€@@À@ÿ€@%35#05#5305#5!#3530#30;5#@€@@@@ÿ@€€€€À@@À@@€@€@@@@€@€À%35#0#535#5!#035353#33À@@@@@þÀ@@@ÀÀÀ@@@À@À@@€@@À@þÀ@@%35#05#5305#5!#3530#33À@@@@@þÀ@€ÀÀÀ@@@À€@€@@@@€@À@€73030335#!#0#3%30#0€@@@€@ÿ@@€@@@Àþ@@@@þ@@€@733335#0!##3%35#€@@@€@ÿ@@€@@@À@þÀ@@€@þÀ@@À€0330335##0#030#0€€@€@€€@@@ý€@ÿ@@@ÿýÀ€@3530335#0##535#€€@€@€€@@@@þ@À€@@€ÀÀþ€À€À#7!530#3#5#03533305#5!##03€@À@€@@€@@@ÿ@@@À@@@À@€@@@€@@@þ€@€À@5#5!#3!535#30#3À@þÀ@@@@À@ÀÀÀ@@@þÀ@@À@€@@@€%3530#0#335!353À@€@@@þ€@@À@@ÿÀ@ÀÀ@þ@@€@%3535##3305!0353À@€@@@þ€@@À@@ÀÀ@@€€@þÀ	ÀÀ€	
+%+/335#05#0;5#1535#5##3;05#005#0%305#035#;5#€€€@À€€@@@@@À@@þÀ@@@@ÿ€€€€€@@€€@@@@@@@€@€€@€@@@€7!53305#0###@@€€€€€À@@@€ýÀ@ýÀ@€À5!03030#5!#305Àÿ€€@ÿ@€@€ÿ@@ýÀ€€5#0#5!#033030%030€@ÿ@@À€ÿ€€@@@ÿ@ÿ@ÿ€5#0#5!#3330€@ÿ@€€€€@@@þÀ@ýÀ@€À5!5#3!53##Àÿ€@@€€€@@ýÀ@@@þÀÀ@!'%5#5#53530#5!#033###5#35!030@€@@@ÿ@@À@@@€€À€@@@@@€@@ÿ@@@@@À@@€ÿ@@À%5#5#0!5!05#0!À@Àÿ€@@@€@€ý€@@€À%5!033#5!#Àÿ€€@ÿ@€@þÀ@@@ýÀ€5#5#5!#33##033530030@@þÀ@€À@@@€@À@@@@@@ýÀ@@@ÿ@@ÿÿ€5#0#0##03!530030€€À@@@ÿ€À@ÿ@ÿ@@ÿÿ@€À
+0333#5#05@€€€@Àý€ÀþÀ@@€@@À
+%5#5##0!À@À€@@@@ý€@€À03303353###05€@@€@€@€ý€Àÿ@@@þÀ@€€5!5#33#03!530#53þ€€@@@@@@À€€@@@@@þ€@@€@þ@Àþ@@€À
+030###3@€€€€@€þÀÀþ@@@À+%5#5#5#5353535#5#535##33####33335À@€@@@@@@@€@@@@@@@€€@@€@@@@@@@@@@@@@@@@@@@@@@€À%%5#53530#5!#3530###535##3353À€@@@ÿ@€€@@@@€@@€@€@@@€@@ÀÀþ€@@@@@@@@@€%5#0#5!#33€@ÿ@€€€@@@þÀ@ýÀ€À5!###30!#5#5#535330Àÿ@@@@€@@€@@@@À@@@@@þ€@@@@@þ@@ÿ€5!##3!530ÿ€€@@À@ýÀ@ýÀ@@@€À7!530#535#5!#353!!0#05#0€@@@@ÿ@€€ÿ€€À@@@À@@@@À@ÿ€€€À7!53###30€@€€À@À@@@þÀ@@þ@€À7!5305#0#0335#5!3##0€@€€€€@ÿÀÀ@À@@€€€@À@@@@þ€@€À333#5!@€€€@ÿÀýÀ@ýÀ@@@@€À%5#53530#5!#3530##5#33À€@@@ÿ@€€@@€@€€@@@€@@ÀÀþ€@@@@@€À3#5!#333@€@þÀ@€@@ÀýÀ@@@þÀ@þ@À@ '%5#5#53530#5!#0330##5#35!5#530@€@@@ÿ@€@@@€€€@€@@@@@€@@ÿ@€@@À@@€@Àÿ€5#0#5!#3330€@ÿ@€€€€@@@ýÀ@ýÀ@€À7!53###€@€€€À@@@ýÀ@ýÀ€%5##0#0#033€€€€@À€@@þ€ÿ@À€À/7!5305#5#5#5#5#0530305#5!#0333330#05#0@@@@@@@@À€@þÀ@@@@@@À€À@@€@@@@€€€@@€@@@@€€€@€À333#5!@€€€@ÿÀýÀ@þÀ@@@@€À!7!530#535#5!#3#3530#5#53€@@@@ÿ@@@€€€€€€À@@@À@@À@@@ÿ@@@ÀÀ@€5#0#5#05#03303@@À€€€@@@€ý€Àÿ@€À!%3530#5#5###0333'0303030€@@€@€@@€@€@@@À@€@@@@þ€@@€€þ€€þ€€À5!053535#5!#0#3030553ÀÿÀ@@ÿ@@@€€@€@À@@þ€@€€ÀÀ@€À
+7!530#5!#03030€@@ÿ@€€À@@@@þþ€À"7!530#5#0##330#5#!03053@@@@€À@@€@€@À@À@@@@À@ÿ@@ÿ@ÀÀ€@@@
+5#0535##03@@@€@@@@€@@€@€@@@
+305#5#30#3@@€@@€€€@@€@@€@@5###3535@€@@€@@@@@@@@€À@5###3535À€À@€À@@@@@@€€€@5#5#5#33€@@€@@€@@@@@@@€À@5#5###35335#53À@À@@€@€€@À@@@@@@@@@@@€À@
+5!535#03Àÿ@À@€@@@€@€À@	735#0#0;35#0#03#0@€@€À@@@@À@€À@@€þ€@@€þ€@Àþ€@ÿÀÀ@%5!335#5!035Àÿ€€@þÀ€€@@ÀÀ@ý€ÀÿÀ@%5#0!#3335%3€þÀ@@À€ÿ€€@€@þÀ@ÀÀ@@þÀÿÀ@%5##5!30335€@þÀ€€€€@@@þ@€ýÀÀ@€À5!05#3!#0#0Àÿ€@@€€@@€ýÀ@@ÿ€ÿÀ@5#!#333€þÀ@@À€€@@@@þÀ@À@þÀ@€%5#5#35#5#03#35€@€ÀÀ€À@€@@@@@Àý€@@@@ÿÀÀ@5!03030#5!0Àÿ€€@þÀ@@þ€€@ý€ÿÀ@ 5#05#5!0330##03353050530@@þ€€À@@@€@À@@@€@ý€@€@€@@€€€€€5#5###3!03€€À@@@ÿ€@ÀÀ@þÀ@€þÀ@þÀ@ÿÀÀ
+33030#5#5@€€€@ÀüÀ@þ€€@À€ÿÀÀ@5##0ÀÀ€@@@ý€ÿÀÀ33335#0#53#0€@@@@€@€üÀ@þÀ@@€ÀýÀ@Àþ€€5#5#5#5#33##3!533€@€€@€À@@@ÿ€@@@@@@@@þÀ@@@þÀ@þÀ@ÿÀÀ
+%30#0##3@€€€€@€À€þ€@ýÀ@@€À0303030#5#5@€€€@Àý€€þ€€@À@€+7!5#030303305#05#05#5305#5#33###0€À€@@@@@@@€€@@@@@À@@€€@€€€@€@@@@@@ÿÿÀ@
+5#0#5!303€@þÀ€€@@@þ@€ýÀ€À5####33!#5#5#535330ÀÀ@@€@@@@@@@€@@À@@@@@þÀ@@@@@@þ@@ÿ€
+5!#0#03!ÿ€€@@À@ýÀ€þ€@@@ÿÀ€@3353##5#€À@€@€@@@ýÀ@@€À
+7!#0##30€@€€À@À@Àþ€@@þ@ÿÀÀ@!5!535353530#5!#3530####3Àÿ@@@@@ÿ@€€@@@@@@@@@@@@@ÀÀÿ@@@@@@€À@303030#5@€€€@@þ@€þ€€@@ÿÀÀ@%5!535353535#5#0535##033####3Àÿ@@@@@@@€@@@@@@@@@@@@@@@@€@@€@@@@@@@ÿÀÀ@%30#0#0#0#0#03@€€@@@€@€À€þ€€þ€€þ€@@ÿÀÀ@#5!535353530#5!#030##35#530Àÿ@@@@@ÿ@€@@@€@€@@@@@@@@ÿ€@@@@@Àÿ€@
+%5##5!3030€@þÀ€€€@@@þ@€þ€@€À@7!#0#0#0€@€€€À@Àþ€€þ€ÿÀ5#0##0#033€€€€@À@@ýÀ€þ€@À€À@7303030#5#0#0#0@À@€@À@€À@€þ€€@þ€€þ€@ÿÀÀ@033030#5@€€€@@ý€@þ€€@@ÿÀÀ@3!53!#330#5#73€@þÀ@@À€€€€@@@@þÀ@€@@À@þÀ€€À@%5#0#ÀÀ€€@€þ@ÿÀÀ733030#5#5##0#03À@@€@€@@€@€À@þ€€@ÀýÀ€þ€@ÿÀÀ@%5!53530#5!#3030=030ÀÿÀ@@þÀ@@€€@@@@@þ@@€€Àÿ@€À@7!53#5!#33€@@ÿ@€€À@@@@@þÀ@þÀÿÀÀ$735353#5#5##033#5#3730530À@€@@€À@@€@€@À@À@€ÀÀ@@@À@€@þÀ@@@@@þÀ€€€€%5#0#0##3353€€€€@À@€@ÿ@ýÀ@@@À€@@03050305À€€€€€@€€€À@
+5##05#03!5À€À€@@À@@€€@@@ÿ€€€5#5#05#0##353€@@@@@€@€@@€€@@@@@ÀÀ€5#!5#=#À€€€€À@@@@€@@€@@€5#5305##3#035@@@@€@@@€@@€@@@€@ÀÀ@€5#75#@€€€À@@€@@@À€€5#75#'35€€€€À€À@@€@@@ÀÀÀÿÀ€€
+5#5#5#03€@@@@@@@@€@€À@€5#5##335@@@@@@@@@@@@ÀÀ€5#5#0#05##33053035À@@@À@@@@À@@€€@@@€€@ÀÀ€
+305#5#3€@@€@@€@@@@ÿÀ€5#535##3@@€@@@@@@@@@€ÿÀ@€
+!305###3'5#@@@@€@@€@@@€@@ÀÀ€€
+5##03535€€@@@@@@€@@@À€
+5##03535€@@@@@@€@@€À€
+5##035353535##03€@@@ÿ@@€@@@@@€@@@@@@€€À€5##5#353535##=#735#35#À@@@@@ÿ@@@@@@@@@@@@À@@@@À@@@@@@@@@€À€5##5#3535'35#À@@@@@@@@@@@À@@@@€€5##05#0#03535@@@@@€@@€€€@@€ÿÀ€€!#!5#0€€@À€ÿÀ@€5#535##3@@@€@@@@@@@@@@ÿÀ€
+;05###3À@@@@€€@@@ÿÀ€€;35305###05###3€@€@@@@@@@€@@€@@€@@@€ÿ€@€5##3575##35@@€€@€@€@@@@@€@@@@@À€
+305#5#3À@@€@@€@@@€À€35##=#735#€@@@@@@@À@À@@@@@@@@ÿ€€€%5##5#33030535€€@€@@@@@@@@@@€€@€À@€5#535##3@@@€@@À@@@@@@€À€€#!5#0€€@À@ÿÀ€
+5#5#5#03@@@@@@@@€@À@€	
+030535#5#;05#035#@€@@@€@@À@@@€€@@@@@€@@@À€€5#5##335#53€@À@@À€@@@@@@@@@ÀÿÀ@€5#75#@€€€@@@€@@ÿÀ€5#!5#%5#!5#!5#€€€ÿ€@€@€@@@@@€@@@@@@ÿÀÀ€5#'5!!5#À€@ÿÀ€@@@€@@@@ÿÀÀ€
+5#'5!30305!5#À€@ÿ@€€@@@€@@€€@@À@@€%5#@€@@@@@À€75#!5#À€€€@@@@@@ÿÀÀ€5#=#!5#@€€€€@@@€@@@@@À@!5!Àþ€@@@ÿ€À@	!5!30305Àþ€€€@@€€@ÀÀ@0305@€@€€ÿÀ€5#'5#'5#€@€@€@@@@@@@@@À@@À0305À€À€€Àÿ€@@735À€@ÀÀ@ÀÀ5!#!5Àþ€@€€@@@@@À€5!€þÀÀ@@À€@€030À€€þ@ÀÀ@0305@€@€€À€@0305€@€€À€@€03050305À€€€€€€€€ÀÀ@@0305À€@€€€À€%0303330305#0530#0#5#5#05#030€@@@€@@€@@@€@€ÿ@@€€€ÿ@@€€€€À€
+%5#0#5!!0!À@@þÀÿ€@€@@þ€@€À€73530305##5#30###3À@@€@@À€@@€ÀÀ@€€@@@ÿ@@@€À€5!!3Àþ@€@@@þ@À€À€
+03073#5!€À€@þ€€ÿÀþ@À@@@€@€3#5#À€@À@þ@À@@@€À€5!330##3535305#5Àþ€€@@@€@@@@@@À€@@@@€À€À€0303533#5!3€@€€@þ€@þ€€@þ@À@@@€À€7!530#5##030530##@@@@€@@@À€À@@€@@€€þ€Àþ@@@@€35#5#3#3@@À€@€€À@@À@ÿÀÀ€5#035#5!!#À@@@þ€@@@@€À@@Àþ@€À€
+%30#5!!0!!€@@þ€@þÀ€À€@@þ€@€À03053530#5!05#!0#À€@@@ÿ€@@€€@@€Àÿ@€À€
+0!#5!33530À@þ€@@@€þ€À@@@þÀ@@þ€€À€3353530#!#5##5#30€@@@€@À@€@ÀþÀ@@@þ€@À@@@@€€ÿÀ€€5#305#5#30#0€@@@À€@@@À€@@€þ@€€€
+%#!#5#30À@@À€À@À@@€À€7!5353#5!3#3353#@@@@þ€@@€@€@À@@@@@@@þÀ@@þÀ@€À€7#!53530#3###33€€@@@À@@@À@@À@@@€@þÀ@À@þÀÿÀÀ€5##5!3#35#530À@@þÀ@@À@€@@@@@@À@Àý€€À€5#530!!#5!3#À@ÀþÀÀ@þ€@@@@Àþ€@À@@@ÀÿÀÀ€5#353535#30##0#30@€@@À@@@À@@@@@@À@€@@ý€€À€!%!!05#5#5#5#5#30333353535#3@þÀÀ@@@@À@@@@@@@À@À@€@@@À@€@@@€@À@ÿÀÀ€%5#0535#5!!0#0030À@@@þ€@@À€À@€À@@ÿ€þ€À€3#5!@€@þ€@þ@À@@€À€7!53##530###@@@€À€@@€À@@Àþ@@€þÀ@þ@€À€0333#5!3À€€@þ€@€Àþ@À@@þÀ€À€3#5#!3#5#@€@€@€@€@þ@À@@þ@À@@€À€3#5#35#5#3#3@€@€€@@€@@€@þ@À@@ÀÀ@@À@@À€35#5#3#3%35#5#3#3€@@€@@€@@€@@€€À@@À@@À@@À@À€€5##35€€@€À@@@@€À5##35!5##35À€@€@€@€À@@@@@@@@À@@@
+5##305#5@@@€@@@À€@À€	5##03050305€€@€€€À@@€€þÀ€€€À
+5#5#0305#5#505#0735#@@À@€@@@@@ÀÀ@@€@@€€€@@@€€€@€@À€5!#3575#05#0735#Àÿ@@À@€@@€€€@@@@€@@@€€€@@@À€5#!#35!5030À@ÿ@@À@@@@@@@@€þ€€€@€€5##3575##353€À@@€€@@@@À@@@@€@@@@ÀþÀ@@€À@#'+5##3575##35#3535#;5#;5##3'5#735#€À@@ÀÀ@@€€€€€@@@@@€€€@@€€€@@@@€@@@@ýÀ@@@@À@@@@@@@€€À%5##3575##35030€À@@€€@@@@@@@@@€@@@@þ€€€@!)/5##!!5355##0335#0=##3575##350#0@@þÀ@@@À@@€€À@@€€@@@@@@@@@@@@€@@€€@@@@€@@@@ýÀÿ@@À030@Àþ€€€@%5#5##03!5!05305#0@@€@@@€þ€€@@€@@€@@€@@€€€€@À@5#35#35#5#!305#015#'35#À@À@@ÀÀ@@@@€€€@@@@þ€@@ÀÀ€@@@@@€
+5##03!5!0575#35#305#0€@@@€þ€À@À@€@@@@€@@€@@@@@À€@@
+5##03!5!0575#35#=#305#0€@@@€þ€À@À@@À@@@@€@@€€@@@@€@@þ€€@€#'%5#!!5'5#5!###335#53535'#3535#@þÀ@€@ÿ€@@@@@@€À@@ÀÀ€@@@@€@@@@@@À@@À@@@@@@@€#%5#!!55!###335#53535'#3535#@þÀ@@ÿ€@@@@@@€À@@ÀÀ€@@@@€@@@@À@@À@@@@@@@@#'%5#!!55!###335#535355##3535#@þÀ@@ÿ€@@@@@@€@@@@@ÀÀ€@@@@€@@@@À@@À@@@@À@@@@@À€
+!5!5#!305#015#=#€ÿ@@@@@@€@@@@€@@@@@@@À5#!5!5#!305#015#=#@@ÿ@@@@@@À@@þÀ@@@@€@@@@@@ÀÀ@#3535#;5#;05#015#À€€€€€@@@@@@@@@@€@@@ÀÀ5##3535#;5#;05#015#@@@€€€€€@@@@@@À@@þ@@@@@€@@À@5##30!!5305#55#%5#%0305€@@@ÿ@@ÿ@@@À@@@€@@€@ÀÀÀÀ@@€€€À@!%+5##30!!5305#5'5#35#=#5#%5#%0305€@@@ÿ@@@@À@@À@@@À@@@€@@€@À@@@@€@@þÀÀÀ@@€€€À€#35#5#!30535#5#3307305#035#;5#@ÀÀ@@€À€@@À@@À@@@€€@@ÀÀ€@@@@@€@@@À#'5#35#5#!30535#5#3307305#035#;5#€@ÿÀÀ@@€À€@@À@@À@@@€€À@@þ@@@ÀÀ€@@@@@€@@@@À
+!5#535#0#0#5#!305#0#35#@@À@@@@@€@@€€€€@@@@þ€@@€@@À5#!5#535#0#0#5#!305#0#35#€@ÿ@À@@@@@€@@€€€À@@þÀ@@@@þ€@@€@€$%5#!!55##0#335#5353=##0305@þÀ@@€À@@@@@€À@@@@@@@€@@€À@@À@@€@@€€@$(%5#!!55##0#335#5353=##030575#@þÀ@@€À@@@@@€À@@@@@@@@@€@@€À@@À@@€@@€€À@@@€5!þ@@@@ $5##03!535#0#!05%5#5#=#735#€@@@€@@@þÀ@@@@@@€€@@€@@À€@€À@@ÿ@@@@@@@@%+/5##33!5!5#55#35#35#;0#0#3'05#0735#€@@@@ÿ@@À@@@@@@€€€@@€€€@@À@@@@À@@@@@ýÀ@€€@@€€€@@5##3575##35!5!5#!30#0@€@@€€@@€€þ€@À@@@@@@@€@@@@þÀ@@@@€ÀÀ@5##3!5!535#;0#0€@@@ÿ@@@@@À@@À@@ÀÀ@@À€0301!5#05#0#!305#0#35#@@€@@@@€€€€þ€€@€€€@À5##33!5!5#5%5#35#;0#0€@@@@ÿ@@€@@@@@@@À@@@@ÀÀ@@þ@@@À!%335#0530305#5#0##3'05#0735#15#À€€€€@@À€€À@@@€€@€@@€€€@€@@€€€€@@@@€À@7#3535#;5#;5##3'5#735#À€€€€€@@@@@€€€@@€€À@@@@À@@@@@@@€@5##0330!!5305#5#050#0À@@€þ€€@@€ÿ@@@€@€@@€@€þÀÿÿÀ@%5#!5#5##0330!!5305#5#050#0À@@ÀÀ@@€þ€€@@€ÿ@@@@@@@@@€@€@@€@€þÀÿ€€€€5##3575##35€€€€€€€€À@@@@€@@@@@À€ #35#5#35#5#05#!305#05#735#€@À@@€€@@€€€@@€@@€€€@@@@@@@@@€@@@@@€€%5##3575##35€€€€€€€€@@@@@€@@@@€€€5##35€€€€@@@@@À@€€
+#3535305##015#735#@@@@@@@@@@€@@@€@@@@@€€€%5##35€€€€@@@@@€€À€	35#05#0;5#05#305#0À@@@€€@@€@@À@@€€@€€€€À€€5##35#5#735#€@€€€@@€€@@@@@@@@À€5#!#35!5@þ€@@€@@@@@@@À€€€5##3575##35€€@@€€@@À@@@@€@@@@Àÿ€€€5##3575##35€€@@€€@@@@@@@€@@@@@@@5#5##335@@€@@€€@@@@@@@À@30#05#5##0330@@@@@@@€À€€@@€@€À€3#535305##5##0330À@@€@@À@@@@€À@@@€@@@€@€ÀÀ 3#535335305##5##5##0330À@@@@@@@@@€@@@@€À@@@@@€@@@@@€@€@ÀÀ%5#!5#0335355###33#35305#535À@ÿ@@À@€@@@@@@@@€@@@@@€@@@€@@@@@@@@€@@ÀÀ
+%30#!05#3!305#005#5#5##03533€@@þÀ@@@þÀ@@@@@@@@@@À€À@€@€@@@€@@@ÀÀ305#5#!5#033@€@@ÿ@@À@€@@@€@þÀÀÀ!353053535##0#0#05#05#5#330À@@@@@@@@@@@@@€ÀÀ€@À@€€€€@À@€ÀÀ!3053053030335#5#05#5##0##3@@@@@@@@@@@@@@@€€€€@À@€ÀÀ€@ÀÀÀ305#5##5##3353@€@@@À@@ÀÀÀ@€@@@@À@À@@@	€#)/37=CG5########3535353535353535#05#0;05#0#35#%35#05#0;05#0#35#@@@@@@@@@@@@@@@€€€@À@@€€€ÿ€€@À@@€€€€@@@@@@@@@@@@@@@@þ@@@€€€@À@@€€€@@@€70305305305#0#0@€@@€@€€€€€€€€@@#3535305#5##30À@@@@@@@@@@@@€@@@ÀÀÀ#5#5#05#0##33#0353533305#535À€@@@€@@@@@@@@@@À@@€€@@@@€@@@@€@@À€€030À@€ÿ@@€5##5##!53%#3535#;5#@€@@€@ÿ@@@@À€€@@@@@@€þÀ@€@@@@@@À€5#5##%5#3%#3535#À€@@€@ÿ@@@@À@@@@€@@ÀþÀ@€@@@@@ÀÀ%5#5##%5##3535#030À€@@€À@@@@À@@@@@@€@@@@@@þ€€@@5##3575##35À@@ÀÀ@@€@@@@€@@@@À@€5##3575##35030€@@€€@@À@À@@@@€@@@@€þ€€@€€#'+5##3575##35#3535#;5#;5##3'5#735#€@@€€@@À€€€€€@@@@@€€€@@€€À@@@@€@@@@ý€@@@@À@@@@@@@@€€#'+/9=A5##3575##35#3535#;5#;5##3'5#735#'#3535305##015#735#€@@€€@@À€€€€€@@@@@€€€@@€€€@@@@@@@@@@À@@@@€@@@@ý€@@@@À@@@@@@@@@@@€@@@@@€€'-5##0330!!5305#5#0575##3575##350#0À@@€þ€€@@€À€@@€€@@þÀ@@@€@€@@€@€À@@@@€@@@@ý€ÿ@€
+"5##03!5!05305#0%#35#53305#5#€@@@€þ€€@@ÿ@À@@@€@@@€@@€€€À@@@@€@@@
+5##03!5!05%5#75#305#0€@@@€þ€@@@À@@@@€@@€€@@€@@þ€€@@%5#75#5##03!5!05305#0@@@@€@@@€þ€€@@@@@€@@@@@€@@€€€€€!%+%5##355##033#353535!0575#35#305#0€@@@À@@@À@@@€þ€À@À@€@@À@@@@@@@€@@@@@@€@@@@@À€@@
+5##03!5!05%5#=#35#305#0€@@@€þ€@@À@€@@@@€@@€€@@€@@@@þ€€@!5#=#35#5##03!5!05305#0@@@À@À@@@€þ€€@@@@€@@@@€@@€@@€€€@@
+#5##03!5!0575#35#'5#35#305#0€@@@€þ€À@À@@@À@€@@@@€@@€€@@@@€@@@@þ€€@#!5#35#'5#35#5##03!5!05305#0@À@@@À@À@@@€þ€€@@@@@@€@@@@€@@€@@€€€@€+3%5#!!55!###335#5353575####35353575##35@þÀ@@ÿ€@@@@@@€À€@À@@À@€€@@€@@@@€@@@@À@@À@@À@@@@@@@@€@@@@@€#'+%5#!!55!###335#5353575#75##3535#@þÀ@@ÿ€@@@@@@€@@@@À@@ÀÀ€@@@@€@@@@À@@À@@À@@€@@ÿ@@@@€#'+%5#!!5'5#35#5!###335#53535'#3535#@þÀ@À@À@Àÿ€@@@@@@€À@@ÀÀ€@@@@€@@@@@@@@À@@À@@@@@@@€#'+%5#!!5'5#75#%5!###335#53535'#3535#@þÀ@€@@@ÿ€@@@@@@€À@@ÀÀ€@@@@@@@€@@À@@@@À@@À@@@@@@@€#'+/%5#!!55!###335#5353=#35#=##3535#@þÀ@@ÿ€@@@@@@€@À@@À@@ÀÀ€@@@@€@@@@À@@À@@À@@@@€@@ÿ@@@@€'+/%5#!!5'5#=#35#75!###335#53535'#3535#@þÀ@€@@À@Àÿ€@@@@@@€À@@ÀÀ€@@@@@@@€@@@@À@@@@À@@À@@@@@@@€+/3%5#!!5'5#35#'5#35#75!###335#53535'#3535#@þÀ@À@À@@@À@Àÿ€@@@@@@€À@@ÀÀ€@@@@@@@@@€@@@@À@@@@À@@À@@@@@@@@À€
+$!5!5#!305#015#=#=#53305#5##€ÿ@@@@@@@@@€@@€@@@@€@@@@@@@@@€@À@@€À€!%%5##35#5#73535!3'5#!305#015#=#€@@@@@@@@ÿ€€@@@@@@À@@@@@@@@@@@@@€@@@@@@€À€%5#!5!5#!305#015#=#@@€ÿ@@@@@@€@@@@@@€@@@@@@€À€(%5#!5!5#!305#015#=#=#53305#5##@@€ÿ@@@@@@@@@€@@€@@@@@@€@@@@@@@@@€@À@@@À@5#35#!5!5#!305#015#=#@À@Àÿ@@@@@@@@@@þ€@@@@€@@@@@@€À€%5#35#!5!5#!305#015#=#@À@Àÿ@@@@@@€@@@@@@@@€@@@@@@@À€!5#35#=#!5!5#!305#015#=#@À@@€ÿ@@@@@@À@@@@€@@þ@@@@@€@@@@@@@À€!5#=#35#!5!5#!305#015#=#@@@À@Àÿ@@@@@@À@@€@@@@þ@@@@@€@@@@@	@@À€!%5#35#'5#35#!5!5#!305#015#=#@À@@@À@Àÿ@@@@@@À@@@@€@@@@þ@@@@@€@@@@@@ÀÀ€$#3535#;5#;05#015#'#35#53305#5#À€€€€€@@@@@@€@À@@@€@@@@@€@@À@@@@€@@ÀÀ@!5##35#3535#;5#;05#015#5#€@@@€€€€€€@@@@@@@@@@@@þ@@@@€@@@@@€À@ %5##35#5305###3537305#015#À@@@@@@€€€@€@@@À@@@@@€@@@@@À€@@@ÀÀ@%5#'#3535#;5#;05#015#À@À€€€€€@@@@@@À@@@@@@@€@@@À@!%5##35#5#5#3535#;5#;05#015#€@@@@@€€€€€@@@@@@@@@@@@@À@@@@€@@@ÀÀ@%5#'5##3535#;5#;05#015#À@€@€€€€€@@@@@@À@@À@@€@@@@€@@@ÀÀ5#35##3535#;5#;05#015#@À@€€€€€€@@@@@@À@@@@þ@@@@@€@@@ÀÀ€!5#35#=##3535#;5#;05#015#@À@@@€€€€€@@@@@@À@@@@€@@ýÀ@@@@€@@	@ÀÀ€!%5#35#'5#35##3535#;5#;05#015#@À@@@À@€€€€€€@@@@@@À@@@@€@@@@ýÀ@@@@€@@ÀÀ!5#=###353575#5#%5#%0305À@@@ÀÀ@@@ÿ@@@@@À@@À@@ÀÀ@@þ€ÀÀÀ@@€€€@@!%+%5#=#35#5##0##35353055#%5#%0305À@@À@@@@@€€@@ÿ@@@@@@€@@@@@@€@@@@€ÀÀÀÀ@@€€€
+@@!%)-17%5#=#35#5##0##353530=#35#=#5#%5#%0305À@@À@@@@@€€@@@À@@ÿ@@@@@@€@@@@@@€@@@@€À@@@@€@@þÀÀÀ@@€€€	À€%)-%5#35#%35#5#;5#;535#5#337305#035#;5#€@À@þ€€€@À@@@@€À€@@À@@À@@@€€À@@@@@@@ÀÀ@@@@@@@€@@@	À€!'+/5#35#=#35#5#!30535#5#3307305#035#;5#@@À@@ÿÀÀ@@€À€@@À@@À@@@€€À@@@@€@@ýÀ@@ÀÀ€@@@@@€@@@@À€#'5#35#=#!5#535#0#0#5#!305#0#35#@@À@@ÿ@À@@@@@€@@€€€À@@@@€@@þ@@@@@þ€@@€@€$(,0%5#!!55##0#335#5353=##030575#35#=#@þÀ@@€À@@@@@€À@@@@À@@@@@@@€@@€À@@À@@€@@€€€@@@@€@@@€ 5##03!535#0#!055#=#735#€@@@€@@@þÀ@@@@€€@@€@@À€@€@@@@@@@@À€ $%5#5##03!535#0#!055#=#735#À@ÿ@@@€@@@þÀ@@@@€€À@@@@@€@@À€@€@@@@@@@@À $(%5#5##03!535#0#!05%5#5#=#735#@@€@@@€@@@þÀ@@@@@@€€À@@@@@€@@À€@€À@@ÿ@@@@@@@@€ $(,5##03!535#0#!05%5#35#=#5#=#735#€@@@€@@@þÀ@À@@@@@@€€@@€@@À€@€À@@@@€@@þ€@@@@@@@@€ $(,%5#=#35#5##03!535#0#!055#=#735#€@@À@ÿ@@@€@@@þÀ@@@@€€@@@€@@@@@@@€@@À€@€@@@@@@@@@€ $(,05##03!535#0#!05%5#35#'5#35#5#=#735#€@@@€@@@þÀ@À@@@À@@@@€€@@€@@À€@€À@@@@€@@@@þ€@@@@@@@@!'+5##33!5!5#55#35#;0#0#3'05#0735#€@@@@ÿ@@@@@@@@@€€€@@€€€@@À@@@@À@@@ýÀ@€€@@€€€@@€)/35##33!5!5#55#35#=#35#;0#0#3'05#0735#€@@@@ÿ@@À@@@@@@@@€€€@@€€€@@À@@@@À@@@@@€@@ý@@€€@@€€€@@@
+'5##03!5!055####330305#5#53535€@@@@þÀÀ@@@@@@@@@@@@@€@@€@@@@@@€€@@@@À5###3!0!!5305#5!5355#@€@@@@þ€€@@þÀ@€@€@@@@@€@@€@@@þÀ@@@@.5#!!5%5##03055####0335#053305##535À@þÀ@ÿ@@@À@@@@@@@@€@@@€@@@@€@@€€@@@@€@@€@€@@@@€!5##3575##3575#!5!5#!30#0@€@@€€@@À@ÿ€þ€@À@@@@@@@€@@@@€@@þ@@@@@€@€#)5###!5!575##3=#35#=#5#!30#0@€@@€ÿ€€@@@À@@€@À@@À@@@@@@€@@@@€@@@@€@@þ@@@€@#)%5#=#35#5##3575##35!5!5#!30#0@@@À@€@@€€@@€€þ€@À@@@@@€@@@@€@@@@€@@@@þÀ@@@@€@€
+'35##03!5!055####330305#5#53535'5###3535€@@@@þÀÀ@@@@@@@@@@@@@@@@@@@€@@€@@@@@@€€@@@@@@@@@@@@€.:5#!!5%5##03055####0335#053305##535'5###3535À@þÀ@ÿ@@@À@@@@@@@@€@@@@@@@@@€@@@@€@@€€@@@@€@@€@€@@@@@@@@@@@€
+'+/;5##03!5!055####330305#5#53535%5#35#!5###3535€@@@@þÀÀ@@@@@@@@@@@þ€@À@@@@@@@@€@@€@@@@@@€€@@@@@@@@@@@@@@@À€/;%5#35#5##03!5!055####330305#5#53535'5###3535@À@À@@@@þÀÀ@@@@@@@@@@@@@@@@@À@@@@@@@€@@€@@@@@@€€@@@@@@@@@@@@€/;%5#75#5##03!5!055####330305#5#53535'5###3535@@@@€@@@@þÀÀ@@@@@@@@@@@@@@@@@@@@€@@@@@€@@€@@@@@@€€@@@@@@@@@@@@€
+/3;5##03!5!0=#35#%5####330305#5#53535%5#!5##35€@@@@þÀ@À@€@@@@@@@@@@@þÀ@@@@@@@€@@€À@@@@@@@@@@@€€@@@@@@@@@@@ÀÀ€5##3!5!55##3535#;#'5#€@@@ÿ@@@@@@@@@€@À@@À@@À€@@@@ýÀ@À@@@ÀÀ€5##3!5!55#35#;0#0€@@@ÿ@@@@@@@À@@À@@À€@@ýÀ@ÀÀ€!5##3!5!55#35#=#35#;0#0€@@@ÿ€@À@@€@@@@@À@@À@@À@@@@€@@ýÀ@ÿÀÀ@!5#=#35#5##3!5!535#;0#0@@@À@À@@@ÿ@@@@@@@@€@@@@€@@À@@ÀÀ@@!!5#5##33!5!5#55#35#;0#0€@À@@@@ÿ@@€@@@@@@@@@À@@@@À@@þ@À@5##33!5!5#535#;0#0€@@@@ÿ@@@@@@@@@À@@@@Àÿ@À€(5##33!5!5#535#;0#0%#35#53305#5#€@@@@ÿ@@@@@@@ÿ@À@@@€@@@À@@@@Àÿ@€@@@@€@#'-%5##355##333#353535!5#5%5#35#;0#0€@@@À@@@@€@@@@ÿ@@€@@@@@@@@@@À@@À@@@@@@@@ÀÀ@@þ@@À€%5##33!5!5#575#35#=#35#;0#0€@@@@ÿ@À@À@@€@@@@@@@À@@@@ÀÀ@@@@€@@ýÀ@@ÀÀ
+%#35!5#05##0305#005#0735#5#5##3€@@€@@@@ÿ@À€@@@@€@@@@€@@€@€€@@@@@@@'+/3%5#!!5'5#=#35#75!###335#5353=##3535#@þÀ@€@@À@Àÿ€@@@@@@€@€@@ÀÀ€@@@@@@@€@@@@À@@@@À@@À@@À@@€@@@@@À€!%5##3575##3535#5#!305#015#'35#@À@@ÀÀ@@@ÀÀ@@@@€€€À@@@@€@@@@þ@@@ÀÀ€@@@@À@À5#'#3535#€€@@€€@@@@@@@@@5#5##3575##35#3535#€@À@@ÀÀ@@€@@€€@@@@@@@€@@@@þÀ@@@À@À5#5#35##3535#€€@À@@@@€€@@@@@@@@ÿ@@@@€À@#7#353535##15#735#35##3'5#735#À€€€@€@@@@@À@@€€€@@€€À@@@@@@@@@@À@@@@@@@@€À@7#353535!3735##3'5#735#À€€€@ÿ@À@@€€€@@€€À@@@@@@À@@@@@@@@€À@#'5##35#3535#;5#;5##3'5#735#=#€@@@€€€€€€@@@@@€€€@@€€@@@@@ýÀ@@@@À@@@@@@@À@@
+@€À€)-17#3535#;5#;5##3'5#735#'#3535305##015#735#À€€€€€@@@@@€€€@@€€@@@@@@@@@@@À@@@@À@@@@@@@@@@@€@@@@@@€À€!7#3535#;5#;5##3'5#735#030À€€€€€@@@@@€€€@@€€@À@@@@À@@@@@@@@ÿ	@€À@#'5##3535#;5#;5##3'5#735#5#3535#€@€€€€€€@@@@@€€€@@€€@@@@À@@þ@@@@À@@@@@@@À@@@@€À#5#35##3535#;5#;5##3'5#735#@À@€€€€€€@@@@@€€€@@€€À@@@@þ@@@@À@@@@@@@	@€À€#'5#35#=##3535#;5#;5##3'5#735#@À@@@€€€€€@@@@@€€€@@€€À@@@@€@@ý€@@@@À@@@@@@@€@5##0330!!5305#5#050#0À@@€þ€€@@€ÿ@@@€@€@@€@€þÀÿ€€#'5##0330!!5305#5#05'5###35355#À@@€þ€€@@€€@@@@@@@@@€@€@@€@€@@@@@@@þ€ÀÀ€À%)5##0330!!5305#5#05'5##350#05#À@@€þ€€@@€@@@@€@€@@@€@€@@€@€€@@@@þ@ÿÀ@@@€À5##3535#;5#;5##3'5#735#@@@€€€€€@@@@@€€€@@€€À@@þ@@@@À@@@@@@@ÿ€@!'5#75#5##!!5355##0335#050#0@@@@@@þÀ@@@À@@€€ÿ@€@@€@@@@@@@@@@€@@€þÀÿÿ€@%+5#=#35#5##!!5355##0335#050#0@@@À@À@@þÀ@@@À@@€€ÿ@€@@€@@@@@@@@@@@@€@@€þÀÿÀÀ
+%5!5#0%5#35#;5#;5#Àþ€@€@ÿ€€€@@@@@À@@€À@@@@@@ÀÀ
+"&%5!5#0%5#'5##3575##3535#;5#;5#Àþ€@€@€€@@€€@@€€€@@@@@À@@€À@@À@@@@€@@@@þ€@@@€€€À5!€ÿ€@@€@À€
+35#5#!305#015#'35#ÀÀÀ@@@@€€€€@@ÀÀ€@@@@À€5!=#7!5#5##5##0#305#3€þÀ@@€@@@@@@€@€@À@@@@@@@@@@@ÿ€@ÀÀ€$5!5#35#5#7!5#5##0#0#!305#3€þÀ@À@þÀ@@@@@@@@@@€@À@@€@@@@þÀ@@@@@@ÿ€@@€À€5#5#0##3535À@€@€€À@@€@@@@À@€€
+5##5#035'35#105#0;05#0€@@@€@@@@€@@€@@@€@@@€€€€À€!5##35'5#75#5##3#030535#53À@ÀÀ@@€@€@@@@@@@@@@@@@@@€@@@@@€€@@@ÀÀ€€5#35#=#@À@@À@@@@€@@€€!5##3535#05#0;5#;5#15#;5#@@@þ€€€@À@@@@@@€@@@@@@@€@@€€@@@@@ÿÀ@+/3=AGQUY]a!5##355##5#0#35330##0#35353053#535#5#;05#5#03735+0#035305##015#735#35#35#@@@@@@@€€@@@@€€@@@@þ€@@@€@@@@@€€€@@@@@@@@@@€€€À@@@@@@À@@@€@@@þ€@€@@@€À@ý@@@@@€@€@@€þ€€@€@@@@@@@@@	
+#*15735#5#05#!35#0#%0#0!30#00305%30535#5#30'35#À€€@@€@@ÿ@À@@ÿ€ÿ@@€€€@À€€@@@@€ÀÀ€€ÿ@€€@€@ÀÀ@€À@ÀÀ€€5#5##335€@@@@@@@@@@@À@€0305À€€€€@€À€5###3535'#3535#À€@ÀÀ@€@@€€@@@@@@@@@@À@€€	351305#0À@€€ÀÀ€ÿ€€!%5##3535#05#0;5#;5#15#;5#@@@þ€€€@À@@@@@@€@@@@@@@€@@€€@@@@@€À€5##35#35#03À@€€À@€@@@@@@@€€À€@#3535#;5##3'5#735#€€@@@@@@@@@@@@@@@À@@@@@@@@À5!=#7305##ÀþÀ@@€@@@@@@@@€@@€À€5!=#7305##ÀþÀ@@€@@€@@@@@@€@€€À€
+5#35#05#0!305#0@@@ÀÀ@@@@@@€@@€€€À€	
+#'+/37;?C50!05#!513##03005#0!305#05#;5+35#35#35+35#35+35#À@þÀ@@@@€@À@€@@À@€@@À@@€@@€@@À@@€@@@@@€€€@@Àþ@Àþ@þ@€€€@@@@@@@@@@@@@€ÿ€ÀÀ!5###35355#=#735#5#'35#À@@@@@€@@@@@À@@@@@@@@@@@@@@@@@@@@@@@€@À€5###35355#=#735#5#'35#À@@@@@€@@@@@À@@@@À@@@@@@@@@@@@@@@@@@@€€€€
+305#5##033@@@€@@€À€@@€@Àÿ€€À	7351305#0À@€€@ÀÀ€@@€@	35#05#0!305#0#35#€ÀÀ@@@ÀÀÀ€@@€€€@@À@30#05#5##0330@@@@@@@€À€€@@€@€À€3#535305##5##0330À@@€@@À@@@@€À@@@€@@@€@€ÀÀ 3#535335305##5##5##0330À@@@@@@@@@€@@@@€À@@@@@€@@@@@€@€ÀÀ5#5#5##0330333575#ÀÀ€@@@@@@€@À@@@@@€@€À@@€@@ÀÀ*30##5##05#33533305#005#5#5#3533€@@€@€@@€@€þÀ@@@@@€@@@À@@€À@@@€@€@@À@@@ÀÀ 5!535#5###030#0#3535353535ÀÿÀ@€@@@@@@@@@€@@@@@@€€€@@@@@@ÀÀ!353053535##0#0#05#05#5#330À@@@@@@@@@@@@@€ÀÀ€@À@€€€€@À@€ÀÀ!3053053030335#5#05#5##0##3@@@@@@@@@@@@@@@€€€€@À@€ÀÀ€@ÀÀÀ305#5##5##3353@€@@@À@@ÀÀÀ@€@@@@À@À@@@À@#)%5#5###3535'5#35#=#5#%5#%0305À@@@ÀÀ@@@À@@À@@@À@@@@À@@ÀÀ@@@@€@@þÀÀÀ@@€€€À#'+%5#5#35#5#!30535#5#3307305#035#;5#À@@ÿÀÀ@@€À€@@À@@À@@@€€À@@@@þ@@@ÀÀ€@@@@@€@@@@(,%5#!!5'5#5##0#335#5353=##030575#@þÀ@€@€€À@@@@@€À@@@@@@@@@€@@@@€À@@À@@€@@€€À@@€À€!5!#3575#0303030'05#0735#Àÿ@@À@€@@@À@@€€€@@@@€@@ÿÿÿÀ€€€@@À€!%0300303030%!5#05#0#!305#0#35#@@@@@@ÿ€@@@@€€€€þ€€@ÿÿ@@€€€@ÿÀÀ@#'+5#=#'#3535#15#;5+#!#;#!35#35#À@€€@@€€@À€€À@@À@@þÀ€€À€€@@@@@@@@@@@@@@þÀ@þÀ@@@@€À@735##;##353#!35#35#@€€@À@@À@@@@þÀ€€À€€À@@@þÀ@þÀ@@@@@@ÿÀÀ@#'+/5#=#'#3535#15#5#3!35335!35#35#35#À@€€@@€€@@€@þÀ@@@ÿ@@€@@€@@@@@@@@@@@@@@@@þÀ@þÀ@ÀÀÀÀ@@@@@€À@75#5#!#353+35#35#35#€@@€@@@@À@À€€À€€€@@@@þÀ@@@ÀÀ@@@
+ÿÀÀ@#'5#=#'#3535#15#5#3!35#35#35#À@€€@@€€@@€@ÿ@À€€À€€@@@@@@@@@@@@@@þÀ@þÀ@ÀÀ@@@ÿ€À%/5#5##335#5330303#5#5#5###0535330€@À@@À€@ÿ€À€@@@@@@@@@@@@@@@@@@@€þ@ÿÀ@@@@@@€€@@€ÿ€À@#'5#5##33575##5!3##335#53353€@À@@À€@@ÿÀÀ@@À€€@€@@@@@@@@À@@@@@@À@@ÀÀ@À@@€À€7#!535#535#5!353530305@@€@@@@þ€@€€€€€€À@@À@À@@þ@ÀÀÀÀÀ€€€À@!530#5#5#5#3300305@@@@@€ÀÀ@@@€ÀýÀ@@@À@þ@@ÿ€€€ÿÀÀ!70305%#!530#535#5!3003053À€ÿ@€@@@@þ€@€€€€@€€€@@@À@@þÿ@ÀÀÿÀÀ70305!530#5#5#5#330À€ÿ@@@@€ÀÀ@@@€€€ýÀ@@@À@þ@@ÿÀ!5!5#!530#535#5!3003053€þÀ@€@@@@þ€@€€€€@@À@@@À@@þÿ@ÀÀÀ!5!!530#5#5#5#330€þÀ@@@@€ÀÀ@@@@ÀýÀ@@@À@þ@@ÿÿÀÀ€-5!5#535305###5#3533305#5!##3333#355##35€@@@@@€@@€@@@ÿ@@@@@@€À@€@€@@@€@@@@@@@€@@@þÀ@@@@@@@@@@@ÿÀÀ'!5#53535##335#5!#333#355##35€@@@€ÀÀ€@þÀ@@€@€À@€@€@@@@@@@@@@þÀ@@@@@À@@@@€À€7#!5353#5#5!333#0305@@@@@@@þÀ@€@@@€€À@@@@@@@þ@À@þÀ@À€€€À€%5#####0335#035330305À@€€@@@À€@@@ÿ€€@@À@@ÿ@@@þÀ@€€ÿÀÀ!70305'#!53530#5#5!300330#€€À@@@@@@þÀ@€@@@@€€€@@@€@@@þ@þ€@ÿÀÀ"%5##30###0335#035330305À@À@€@@@À€@@@À€€@@@€@@ÿ@@@þÀ@@€€À!5!5#!53530#5#5!300330#€þÀ@@@@@@þÀ@€@@@@@À@@@€@@@þ@þ€@À !5!%5##30###0335#03533€þÀ€@À@€@@@À€@@@@@€@@@€@@ÿ@@@þÀ@ÿÀÀ'!5#5353530#5#5!30#33#35'0330#@@@@@@@þÀ@@€@€À@@@@@@@@€@@@þ@@@@@À@þ€@ÿÀÀ'!5#05#0353335##30###0333#35@@€@@@€@À@€@@@@@€À@€@þÀ@@@@€@@ÿ@@@@@ÿÀÀ!+5#5#5353530#5#5!30#3##3530330#€@@@@@@@þÀ@@À@@€@@@@@@@@@@@€@@@þ@@@@@@@þ€@ÿÀÀ+5#5#05#0353335##30###033##353€@@€@@@€@À@€@@@€@@€@@@@€@þÀ@@@@€@@ÿ@@@@@@€À€'5!75#5#3#!05##05335##053305!3€þÀÀ@€@@@À@À@@@@À@þ@@€@@€@@@@ýÀ@€@€@À@€@€@€À€"%5##5!05#5!#3!55!75#5#353À€À@@þÀ@@@þÀÀ@€@ÀÀ@@À€@@þÀ@@À@@€@@@@þÀ@@€À€'5!%5##35#!05##05335##053305!3€þÀ@€@€ÿ@À@À@@@@À@þ@@€@@À@@@@ý€@€@€@À@€@€@€À€"%5##5!05#5!#3!55!%5##3553À€À@@þÀ@@@þÀ@€@€ÀÀÀ@@À€@@þÀ@@À@@À@@@@þ€@@ÿÀÀ-5#5#535###0335##53335!30#3##353€@@À@@€@@@@€@@þ@@@À@@€@@@@@À@@@À@À@@À@þ@@@@@@ÿÀÀ@"&5#5#53535##5!05#5!#33##35353€@@€@€À@@þÀ@@€@@€@€À@@@@@@@À€@@þÀ@@@@@@@@ÿÀÀ-!5##5##35335%#!5###0335##53335!30À€@À@€@ÀþÀ@À@@€@@@@€@@þ@@@@@@@@@@À@À@@@À@À@@À@ÿÀÀ@"&!5##5##3533575##5!05#5!#3!553À€@À@€@À@€À@@þÀ@@@ÿÀ@@@@@@@@À@@À€@@þÀ@@@@ÿÀÀ€'3!5#535###5335##53335!3#33#355##5#335€@€@@€@@@@€@@þ@@@À@€À@€@€@À@@À@@À@À@À@@À@þ@@@@@@@@@@@@@ÿÀÀ*.!5#53535##5!05#5!#333#355##5#33553€@@@€À@@þÀ@@€@€À@€@€@ÀÀÀ@@@@@À€@@þÀ@@@@@À@@@@@@ÿ@@€À€%5#5335##53335!3#0305@@@@@€@@þ@@@À€€@À@À@À@@À@þ@@€€€€€$%5#035#0533305#5##0#30#0305@@@@@@@À@@@@€€€@@€@@€@@€@ÿ@€€€À@&5!35#5#3533305#5!##3!3!3€þÀ@À€@@€@@@ÿ@@@@@ÿ€@@ýÀ@@@@@@@€@@@þÀ@@@@ÀÿÀÀÀ!5###35##330#5#3!530=!À€@€€À@@À€€@@þÀ@@þÀ@@@þÀ@€@@@@€@@€À€30303#0#050305€À€€À€ÀýÀÿ@ÿÀ€€€À€
+7#335#0#30030#5#0305@@À@@À@€@€€À@@@@Àþ€€@@€€€ÿÀÀ7030503330#0#0€€ÿ€À€€À@€€Àý€@þÀ€ÿÿÀÀ70305%#335#0#30030#5#À€ÿ@À@@À@€@€@€€€@@@@Àþ€€@@€À€30303#0#0'030530305€À€€À@€@€ÀýÀÿ@ÿÀ€€€€€À€!7#335#5#3030#5#030530305@@À@@À@€@€À€@€À@@@À@€þ€€@@€€€€€ÿÀÀ!5#5#330#0#0#033#35@@À€€À€@@€À@@@þÀ€ÿý€@@@@ÿÀÀ#!5#5#35#0#30#33#35030#5#@@@@@À@@€@€À@€@€@@@@@þ@@@@@þ€€@@ÿÀÀ!5##5#33503330#0#0€€@€@ÀþÀ€À€€À@@@@@@ý€@þÀ€ÿÿÀÀ#!5##5#335%#335#0#30030#5#€€@€@Àÿ@À@@À@€@€@@@@@@À@@@@Àþ€€@@ÿÀÀ!5##5##3533=#035!30#À€@À@€@À@@ÿ@@@@@@@@@@€@@@þ@ÿÀÀ !5##5##3533=#0#3#0305À€@À@€@À@À@@@€@@@@@@@@€@€@þÀ@€€€@€À€
+%5#035!30#5#75###3535€@@ÿ@@@€@€@€€€€@€@@þ€@@@@€@@@@@@@€À€
+%5#0#3#5###030530305#5€@À@@€@€€€€€€@€@þÀ@À@@@€€€€@€À€#7#303335#5#53535###0#30305@@À@@€@@@@€@@À@€€À@@ÀÀ@@@ÀÀ@@€€€À@%5####30#35330305#5#05350305À€@@À@@À@@€@@@€€@@@@@þ@À@€€@€@@€€ÿÀÀ%70305%#303335#5#053535###0#30À€ÿ@À@@€@@@@€@@À@@€€€@@ÀÀ@€@ÀÀ@@ÿÀÀ%5####30#35330305#5#05350305À€@@À@@À@@€@@@À€@@@@@þ@À@€€@€@þ@€€À#!5!5#303335#5#053535###0#30€þÀ@À@@€@@@@€@@À@@@À@@ÀÀ@€@ÀÀ@@À#!5!5####30#35330305#5#0535€þÀ€€@@À@@À@@€@@@@@@@@@@þ@À@€€@€@ÿÀÀ5!30#!5###00305ÿ@@À@@€€À@@þ@À@@ý€€€€ÿÀ€
+%5##30#0305€@À@@@€€@@@þ@@€€ÿÀÀ@5!3#!5###75!0305ÿ@@À@@€ÀþÀ€€€@@þ@@À@@À€@@ý@€€@ÿÀ€@
+%5#0#3#5!0305€@À@@þÀ€€€@@þ@@€@@ý@€€À!5!5!30#!5###0€þÀÀÿ@@À@@€@@À@@þ@À@@@À!5!%5##30#Àþ€@@À@@@@€@@@þ@ÿÀÀ!5#5#535###035!30#3##353€@@À@@€@ÿ@@À@@€@@@@@À@@@@þ@@@@@@@ÿÀ€5#5#535##30#3##353€@@€@À@@@@@€@@@@@@@@þ@@@@@@€À€5##35333533###5#5€€@€þÀ€@@@€€@@@@@@@@€ýÀ@@@þÀ@@@@@€À5##3533030330#5##5€€@€þÀ€@@@€@€@À@@@@€þ@@ÿþÀ€@@@€À€333533###5#=0305€@@@€€@@@€ÀýÀ@@@þÀ@@@@@À€€€À33030330#5##5'0305€@@@€@€@@€@þ@@ÿþÀ€@@@À€€ÿÀÀ703050303353030###5#5€€ÿ€@@@€€@@@@€€Àý€€@@þ€€@@@@ÿÀÀ@7030533030330#5##5€€ÿ€@@@€@€@@€€þ@@ÿþÀ€@@@€À€33333##5#5#=0305€@@@€€@@@€ÀýÀ@@@À@À@@@À€€€À	030#5#!030#5#0305@€@€@€@À€þ€€@@þ€€@@€€ÿÀÀ70305030333030##5#5#5€€ÿ€@@@€€@@@@€€Àý€€@@ÿ€À@@@ÿÀÀ@70305030#5#!030#5#À€ÿ€@€@€@À@€€Àþ€€@@þ€€@@À!5!030333030##5#5#5€þÀ@€@@@€€@@@@@ý€€@@ÿ€À@@@À@
+!5!030#5#!030#5#€þÀ€@€@€@À@@þ€€@@þ€€@@ÿÀÀ'5#5#5###353030333030##5#5#5€@@@@@€@ÿ€@@@€€@@@@@@@@@@@@@ý€€@@ÿ€À@@@ÿÀÀ@#5#5#5###353'0#5#30030#5#€@@@@@€@@@€@€@À@@@@@@@@@À€@@þ€€þ€€@@€À€ &*5##53535####3#03!530#0503053À@€@@€@€@@@@@@@ÿÀÿ€À@@@@@@@@@@þ€@@€€þ€þ€À@@€À€#'5##53535####35335!53#5!#33À€@@@€@€@€@ÀþÀ@@@þÀ@€ÀÀ@@@@@@@@@@@@þ@@@@@þÀ@þÀ€À€ &*5##5##3#03!530#05'5#!5#03053À@€À@@@@@@@À€@€€Àÿ€À@@@@@@þ€@@€€€@@@@ý€€þ€À@@€À€#'5##5##35335'5#!5#!53#5!#33À€@À@€@ÀÀ€@€À@@@þÀ@€ÀÀ@@@@@@@@€@@@@ý€@@@@@þÀ@þÀ€À€5#5#5#3#!530#5!#03030€€@€@@@@@þÀ@€ÀÀ@@@@@@þ@@€@@þ€€þ€€À€5!75#5#3!53#5!#33€þÀÀ@€@@@@@þÀ@€À€@@€@@@@ýÀ@@@@@þÀ@þÀ€À€5#535###!530#5!#03030€@@€@€@@@þÀ@€ÀÀ@@@@@@þ@@€@@þ€€þ€€À€5!%5##35!53#5!#33€þÀ@€@€ÿ@@@þÀ@€À€@@À@@@@ý€@@@@@þÀ@þÀ€À€%5#53535#5!3#5##3553@À@@þ€@@€€@€€€€@À@À@@þ@@À@@@@þ€ÀÀÿÀÀ!5#05353#5##5#30#5##353@À@@À@€@@€€@€€€@@€@@@@@@þ@@@@@þ@þÀ€À€%5#53535#5!3#530305@À@@þ€@@À€€€€@À@À@@þ@@@ÀÀÀ€€ÿÀÀ5#05353#5##5#30#30305@À@@À@€@@À€€€@@€@@@@@@þ@@þÀ@€€€À€7#303335#0535#5!3530305@@À@@€@@@þ€@€€€€À@@ÀÀ€À@@ÀÀÀÀ€€€À%5#03530305#5##5#3#0305@@@€@À@€@@À€€@@€€@@@@þÀ@€€€ÿÀÀ!70305%#333030#0535#5!3053À€ÿ@À@@€@@@þ€@€€@€€€@@@ÿ€À@@ÀÀÀÿÀÀ@%5#03530305#5##5#3#0305@@@€@À@€@@À€€@@€€@@@@þÀ@@€€ÿÀÀ@	#5!0305%#303335#0535#5!353€þÀ€€ÿ@À@@€@@@þ€@€€@@ý@€€€@@ÀÀ€À@@ÀÀÀÿÀÀÀ"%5#03530305#5##5#3#5!0305@@@€@À@€@@€þÀ€€€@@€€@@@@þÀ@@@ýÀ€€À!5!5#333030#0535#5!3053€þÀ@À@@€@@@þ€@€€@@À@@@ÿ€À@@ÀÀÀÀ@!5!75#03530305#5##5#3#€þÀÀ@@@€@À@€@@@@€@@€€@@@@þÀ@€À€+17!5305#5#5#5#0530305#5!#033330#05#00305@@@@@€@À€@þÀ@@@€@À€€€À@@€@@@€€€@@€@@@€€€À€€€À#)%5#5#5#5#5335#5!#3333#5#3!50305À@@€@À€@þÀ@@@€@À€@@ÿ€À@@@@@@@@@@@@@@@@@@@€€ÿÀÀ/70305'!535#5#5#5#0530305#5!#03333#05#0€€À@@@@€@À€@þÀ@@@€@À€@€€€@@À@@@€€€@@€@@@À€€ÿÀÀ@#)%5#5#5#5#5335#5!#3333#5#3!50305À@@€@À€@þÀ@@@€@À€@@ÿ€À@@@@@@@@@@@@@@@@@@€€€€À€/55##35!5305#5#5#0530305#5!#03330#05#005#0€€@€ÿ@@@€€À€@þÀ@@€€À€À€@@@@ýÀ@@€@@€€€@@€@@€€€@€€€À€#+1%5#5#5#5#5335#5!#3333#5#3!55##35%0305À@@€@À€@þÀ@@@€@À€@@€@€ÿ€À@@@@@@@@@@@@@@@@@@@@@@À€€€À€3;5##3##03330#05#03!5305#5#5#0530305#5#535'5##35€@À@€@@€€À€@@@@€€À€@€@@€@@@@@@@€@@€€€@@€@@€€€@@@@@@@@€À€+/39%5#5#5#5#5335#5#535#3##3333#5#3!55##5#7305#0À@@€@À€@€@À@€@@@€@À€@@@À@@€€À@@@@@@@@@@@@@@@@@@@@@@@@@@@€ÿÀÀ€1770305'!5305#5#5#5#0530305#5!#033330#05#00305€€À@@@@€@À€@þÀ@@@€@À€€€@€€€@@€@@@€€€@@€@@@€€€À€€ÿÀÀ#)/%5#5#5#5#5335#5!#3333#5#3!503050305À@@€@À€@þÀ@@@€@À€@@ÿ€€€À@@@@@@@@@@@@@@@@@@€€€À€€@€À€%5#0335!3530#0305€@@@þ€@@@@€€@€@ÀÀ@þ€@€€€À@%5##35#5##0#33350305À€@€€@@€€@À@€À@@@@À@€@þÀ@@€€€@ÿÀÀ%5#335!353#0305€@@@þ€@@@@€€@À@ÀÀ@þ@@@€€ÿÀÀ%5##35#5##0#33350305À€@€€@@€€@ÀÀ€À@@@@À@€@þÀ@@€€€@À!5!%5#335!353#Àþ€@@@@þ€@@@@@€@À@ÀÀ@þ@@À!5!%5##35#5##0#3335Àþ€€€@€€@@€€@À@@À@@@@À@€@þÀ@@@ÿÀÀ5#5#535#335!353#3##353€@@€@@@þ€@@@@@@€@@@@@@À@ÀÀ@þ@@@@@@@ÿÀÀ&5#5#53535##35#5##0#333##353À@@@@€@€€@@€€@@@@€@@@@@@@@@@À@€@þÀ@@@@@@ÿÀÀ7030530305%!53###@€@€þÀ@@€À€@€€€€€@@@ýÀ@ýÀÿÀÀ@%5#0#0#0#03353030530305À@€€€@À@ÿ€@€€@€þ€€þ€@@@@€€€€ÿÀÀ!5##5##35335%!53###À€@À@€@ÀþÀ@@€À€@@@@@@@@À@@@ýÀ@ýÀÿÀÀ@#!5##5##3533575#0#0#0#03353À€@À@€@À@@€€€@À@@@@@@@@@€@€þ€€þ€@@@ÿÀÀ5#5#5353###33##353€@@€@€À€@€@@€@@@@@@@ýÀ@ýÀ@@@@@@ÿÀÀ@"5#5#05#0#033##35375#0#03€@@€€@€@@€@À@€@@@@€€þ€@@@@@@À@€þ€@€À€'5##53535####35335!530#0#0#0À@€@@€@€@@€ÀþÀ@@€À€À@@@@@@@@@@@@þ@@€þ€€þ€€À€+%5#0#0#0#033535##53535####35335À@€€€@À@€€@@@€@€@€@À€@€þ€€þ€@@@@@@@@@@@@@@@@€À€5!75#!5#!53###€þÀ€€@€À@@€À€À@@€@@@@ý€@@Àþ@Àþ@€À€#%5#0#0#0#033535!030530305À@€€€@À@@þ€€€€€@€þ€€þ€@@@@@€€€€€À€+5##5##35335353530#0##5#0#03333À€@À@€@À€@@@€@@@€@@@@@@@@@@@@@ý€@@€þ€@@€þ€@@@€À5##5##35335353###333À€@À@€@À@@@€€€@@€À@@@@@@@@þ@@þÀ@þÀ@@ÿÀÀ7030=35353###5##3333€€@@@€@@@€@@@@@€€€@@Àþ@@@Àþ@@@@@ÿÀÀ@7030=353###333À€@@€€€@@€@€€€@@þÀ@þÀ@@€À€!5#5#3305303530#0#5##0#0@€@@€@€@€@@@€@@@@ýÀ@€€@þ€ÀÀ€þ€À5#5#330##5###033533@€@@€@@@€@€@€€@@@@þ@€þÀÀÀ@þ€@@@€À€!5##35305303530#0#5##0#0€€@€ÿ€@€@€@@@€@@@@@ý€@€€@þ€ÀÀ€þ€À5##3530##5###033533€€@€@@€@@@€@€@€À@@@@þ€þÀÀÀ@þ€@@@€À€%7305303530#0#5##0#0030530305@€@€@€@@@€@€@€À@€€@þ€ÀÀ€þÀ€€€€€À!%30##5###033533030530305€@€@@@€@€@€þÀ€@€À€þÀÀÀ@þ€@@@€€€€€€À€7305303530#0#5##0#00305@€@€@€@@@€€€À@€€@þ€ÀÀ€þÀ€€€À%30##5###0335330305€@€@@@€@€@€ÿ€À€þÀÀÀ@þ€@@@€€€ÿÀÀ70305'30530353##5###€€À€@€@€@@@€@€€€@€€@@þ@ÀÀÀýÀÿÀÀ@70305730##5###033533€€€@€@@@€@€@€@€€€€þÀÀÀ@þ€@@@€À€/5030535330305#05#5305305#0##5#05#0303#00305€@@@€@@@@€@@@€@@@@€€€@@€€€@€€€@@€€€@€€€€€À#)%5#5#53535###5#5#33##3535330305À@@@@€@@@€@@@@€@@@À€€@@À@@@@@@@@À@@@@@@€€€€À€/5;030535330305#05#5305305#0##5#05#0303#0030530305€@@@€@@@@€@@@€@@@€@€€€@@€€€@€€€@@€€€@€€€€€€€À#)/%5#5#53535###5#5#33##353533030530305À@@@@€@@@€@@@@€@@@ÿ€@€€@@À@@@@@@@@À@@@@@@€€€€€@€À€%5#03535##5#330#0305€@@@€€€@@@@€€@@ÀÀÀÀ@ÿ@€€ÿÀÀ!3530#0#0#03!#!!0305@@@€À€@@ÿ@À€@þ€€þ€@@@@@€€€À€-5!5###0535353535305#5##5##35353####35#5##À@@À@@@@@@@À@@@@À@@@@@À@@@@ÀÀ@@€@@@@€@@@@À@@@@@@@À@@@€À@ 05!0353####0!05##53535353=#5#5###353Àþ@€€@@@@À€À@@@@@@@@@€@@€@@@@@€€@@@@@@€@@@@@@@@ÿÀÀ+70305!5###053535353535!353530####€€ÿÀ@@À@@@@@þ@@@À@@@@@€€ÀÀ@@€@@@@ÀÀ@@€@@@@ÿÀÀ@ &5!0353####0!05##5353535350305Àþ@€€@@@@À€À@@@@ÿ€@€@@@@@€€@@@@@@þ@€€À)!5!!5###053535353535!353530####€þÀ@À@@À@@@@@þ@@@À@@@@@@@ÀÀ@@€@@@@ÀÀ@@€@@@@À@$!5!5!0353####0!05##535353535€þÀ€þ@€€@@@@À€À@@@@@@@€@@@@@€€@@@@@@À!5!5#335#0#30030#5#€þÀ@À@@À@€@€@@À@@@@Àþ€€@@€À€"%5##35#05###3335030530305À€@€€@@€€@ÀþÀ€@€À@@@@€@@@þÀ@@À€€€€€À@!%5#5##33530##5###03353353€@À@@À@@€@@@€@€@€À@À@@@@@@þ€þÀÀÀ@þ€@@@@@@ÿÀÀ@#'5#5##3353530#0#0#03!#!!53€@À@@À@@€À€@@ÿ@€@À@@@@@@ý@@þ€€þ€@@@@@@€À@#%5##5!3##335#5335#5#3#35À@@ÿÀÀ@@À€€@@@€@@€€@@@@@@À@@ÀÀ@@@@@@@@€€€%5#33305#5###0305@@@@@À@@€€€@À@@€@@þ@@€€ÿÀÀ%7030530303#5#5#5###0535330€€ÿ€À€@@@@@@@@@@@€€þ@ÿÀ@@@@@@€€@@€ÿÀÀ@%5##5!3##335#5330305À@@ÿÀÀ@@À€€@À€€@@@@@@À@@ÀÀ@@€€€À€ *5#5#3#0###035330#5#5#5350535330€@À€@@@@€À€@@@@À@@@@@@@€@@þ€ÀÀ€@@@@þ€€@@€€À@#%5##5!3##335#5335#5#3#35À@@ÿÀÀ@@À€€@@@À€@€€@@@@@@À@@ÀÀ@@@@@@@@€€%-75#5#5###3###305303#5#5#5#53%5##350535330€@@@@@€@@@€À€@@@@@€@€þÀ@@@€@@@@@@@@@þÀ€€@@@@@@À@@@@þ€@@€€€'/%5##5!3##335#5335#5#5###353%5##35À@@ÿÀÀ@@À€€@@@@@@@€@€@€€@@@@@@À@@ÀÀ@@@@@@@@@À@@@@€À€$.65#5#5###3###305303#5#5#05305353305#5#3À@@@@@@@@@€À€@@@@À@@@€@€@€@@@@@@@@@þÀ€€@@@€@þÀ€@@€À@@@@€À€'/%5##5!3##335#5335#5#5###353'5#5#3À@@ÿÀÀ@@À€€@€@@@@@€@€@€@€@@@@@@À@@ÀÀ@@@@@@@@@€@@@@€€0:5#5####3###305303#5#5#5#5335#5#530350535330@À@@@€@@@€À€@@@@@€@@€@þÀ@@@@@@@@@@@@þÀ€€@@@@@@@@@€@þ@€@@€€€2%5##5!3##335#5335#5####35335#5#53035À@@ÿÀÀ@@À€€@À@À@@@€@€@@€@€@@@@@@À@@ÀÀ@€@@@@@@@@@@@€@€À€8B5##5####305303#5#55##5##3530##3535335#5350535330€@@@@@@€À€@@€€@À@€@@@@@@@@€ÿ@@@@@@@@@@þÀ€€@@@@@@@@@€@@@@@@@@þ€@@€€À€5%5##5#5#03##335#5335#5##5##3530#35#535À@@À@ÀÀ@@À€€@@@€€@À@€@@À@€€@@@@€@@À@@ÀÀ@À@@@@@@@@€@@@@ÿÀÀ€%+55#5#5###3###035330#5#5#5#5303050535330€@@@@@€@@@€À€@@@@@€€€@@@À@@@@@@@@@þ€ÀÀ€@@@@@ý€€€@€@@€ÿÀÀ@'-%5##5!3##335#5335#5#5###3530305À@@ÿÀÀ@@À€€@@@@@@@€@€€€@@@@@@À@@ÀÀ@@@@@@@@@ýÀ€€€À€%/35##3###305303#5#5#53575##3505353305#€@À@@@@€À€@@@@@€@€À@@@À@À@@@@@@þÀ€€@@@@@€@@@@þ€@@€€@@€À€'+%5##5!3##335#5335##3575##355#À@@ÿÀÀ@@À€€@@@ÀÀ@€@€À@€@@@@@@À@@ÀÀ@@@@@@€@@@@€@@€À€)35##3###305303#5#5#535'5#5#3#350535330€@À@@@@€À€@@@@@@€@@@@@@À@@@@@@þÀ€€@@@@@@@@@@@@þ@€@@€€À€+%5##5!3##335#5335##35'5#5#3#35À@@ÿÀÀ@@À€€@@@ÀÀ@@€@@@€@@@@@@À@@ÀÀ@@@@@@@@@@@@@€À€!+/375##5##3###305303#5#5#53505353305#735#15#€@@@@@@@@€À€@@@@À@@@À@À@@€À@@@@@@@@þÀ€€@@@@@þ€€@@€€@@@@@@€À€#'+/%5##5!3##335#5335##5##35#5#735#15#À@@ÿÀÀ@@À€€@@@@@@ÀÀ@À@@€€@@@@@@À@@ÀÀ@@@@@@@@@@@@@@€À€0:5##5##333###305303#5#5#535#5#5333050535330À@€À@@@@@@@€À€@@@@À@€€@ÿ@@@@@@@@@@@@@@þÀ€€@@@@@@@@@€þ€@@€€À€2%5##5!3##335#5335##5##3335#5#533305À@@ÿÀÀ@@À€€@€@€À@@@ÀÀ@€€@€@@@@@@À@@ÀÀ@À@@@@@@@@@@@@€ÿÀÀ€'15##5#3350305035330#5#5#5###0535330€€@€@ÀÀ€ÿ€À€@@@@@@@@@@@@@@@@@ý€€Àþ€ÀÀ€@@@@@@€€@@€ÿÀÀ#)%5##5!3##335#5335##5#3350305À@@ÿÀÀ@@À€€@@€@€@ÀÀ€€@@@@@@À@@ÀÀ@@@@@@@@ý€€€ÿÀÀ#70305%#!5###0335##53335!30À€ÿ@À@@€@@@@€@@þ@@@€€€@À@@@À@À@@À@ÿÀÀ@%5##5!05#5!#3!5030553À€À@@þÀ@@@ÿ€€ÀÀ@@À€@@þÀ@@€€€€@@€À€'5#5#3##3#!5###5335##53335#5€@À€@À@@À@@€@@@@€@@€@@@@@@þ@@À@@À@À@À@@À@€À@"%5##5!05#5!#3!55#5#3#3553À€À@@þÀ@@@@À€@€ÀÀÀ@@À€@@þÀ@@@@@@@@ÿ@@€À€+5##5##35335#!5###5335##53335!3À€@À@€@ÀþÀ@À@@€@@@@€@@þ@@@@@@@@@@@ý€@À@@À@À@À@@À@€À"&%5##5!05#5!#3!55##5##3533553À€À@@þÀ@@@@€@À@€@ÀÿÀÀ@@À€@@þÀ@@@@@@@@@@ÿ@@€€*25####5#03#!5###5335##53335#53535#5##€@@À@@@À@@€@@@@€@@€€þ€À@@@@@@@@@€þ@@À@@À@À@À@@À@@@@@@€€"*.%5##5!05#5!#3!55#5#5###353%5##3553À€À@@þÀ@@@@@@@@@€@@€@€þÀÀÀ@@À€@@þÀ@@À@@@@@@@@À@@@@þ€@@€€#+35##5##3#!5###5335##53335%5#5#3;5#5##@À@À@@À@@€@@@@€@@ÿ@€@ÀÀ@@@À@@@@@þ@@À@@À@À@À@@À@@@@@@@@€€"*.%5##5!05#5!#3!55#5#5###353'5#5#353À€À@@þÀ@@@€@@@@@€@À@€@@ÀÀ@@À€@@þÀ@@À@@@@@@@@€@@@@þÀ@@€€65#5####35335#5#53035#!05##05335##053305!3@À@@@€@€@@€@þ€@À@À@@@@À@þ@@@@@@@@@@@@@€@ýÀ@€@€@À@€@€@€€-1%5##5!05#5!#3!55#5####35335#5#5303553À€À@@þÀ@@@€@À@@@€@€@@€@þÀÀÀ@@À€@@þÀ@@@@@@@@@@@@@@€@þÀ@@€À€:5##5##3530###3#!05##05335##053305#5##535#535À€@À@€@@@@@@À@À@@@@À@@@ÀÀ@€@@@@@@@€@@@þÀ@€@€@À@€@€@@@@@@€À€/3%5##5!05#05##5#0#3!55##5##3530#35#53553À€À@@@À@@@@@€@À@€@@À@€ÿÀÀ@@À€€@@€þÀ@@€@@@@@@€@@@@þ€@@ÿÀÀ€)170305%#!5###5335##53335#5##5##3735#5##À€ÿ@À@@€@@@@€@@@@À@@@@À@@@@€€€@À@@À@À@À@@À@@@@@€@@@ÿÀÀ@"(,%5##5!05#5!#3!55#5#5###353030553À€À@@þÀ@@@@@@@@€@€€€ÀÀ@@À€@@þÀ@@À@@@@@@@@ýÀ€€€@@€€€€%5#35#535#5#3##3#€@@@@@À€@@@@€@À@@@@@@@@þ@@€€€@
+%5#0#3#5#5#3#35€@À@@@À€@€€@€@þÀ@@@@@@@@€ÿÀ€
+%5#035!30#0305€@@ÿ@@@€€@@@þ@@€€€ÿÀ€
+%5#0#3#03050305€@À@@@€€€€@€@þÀ@@€€À€€ÿÀÀ70305'!530#5!#03030€€À@@@þÀ@€À@€€€@@@@þþÿÀÀ@70305'!53#5!#33€€À@@@þÀ@€À@€€€@@@@@þÀ@þÀ€À€5#5#3###3!53#5#53€@À€@€@@@@@@ÀÀ@@@@@@þ@@@À@@ýÀÀþ@€À@5#5#3#35!53#5!#33€@À€@€ÿ@@@þÀ@€ÀÀ@@@@@@þ@@@@@þÀ@þÀ€€'5#####3!53#5#53535#735#5##€@@À@@@@@@€þÀÀÿ@@À@@@@@@@@@þ@@@À@@@ý€Àþ@@@@@@@€€#'5#5#5###353%5##35!53#5!#33@@@@@@€@@€@€þ€@@@þÀ@€À€@@@@@@@@À@@@@ý€@@@@@þÀ@þÀ€€'5#!53#5#5###335#5#3;5#5##@þ€@@@€@€@€À€@€@ÀÀ@@@À@@þ@@À@@@@þ@Àþ@@@@@@@@@€€#'5#5#5###353'5#5#3!53#5!#33@@@@@€@À@€@@@@þÀ@€À€@@@@@@@@€@@@@ýÀ@@@@@þÀ@þÀ€€&,5#5####0#03!530#05##535#53035030@À@@@@@@@@@ÀÀ@€@þÀÀ@@@@@€þ€@@€€@@@@€@ýÀ€þ€€€&*5#5####35335#5#53035!53#5!#33@À@@@€@€@@€@þ€@@@þÀ@€À@@@@@@@@@@@€@ýÀ@@@@@þÀ@þÀ€À€,05##5##3530##0#3!53#05##535335#5353À€@À@€@@@@@@@@@À@@@@€ÿÀ@@@@@@@€@€þÀ@@@€@@@@@@@ý€@þÀ€À€(,5##5##3530##0#3!53#05##535#5353À€@À@€@@@@@@@@@ÀÀ@€ÿÀ@@@@@@@€@€þÀ@@@€@@@@@ý€@þÀÿÀÀ€#70305'!53#05##5#0#3335#5##€€À@@@@À@@€ÀÀÀ@@@@€€€@@À€@@€þ@Àþ@@@@@ÿÀÀ@!%5#5#5###3530305'!53#5!#33€@@@@@€@€€À@@@þÀ@€À€@@@@@@@@ýÀ€€€@@@@@þÀ@þÀ€€5##35!53#5!#3335305#@€@€À@@ÿ@€€€@@€@@@@@ý€@@À@@þ@Àþ@À@€€!5##35!53#5!#3335305#0#@€@€À@@ÿ@€€@€@€@À@@@@þ@@@@@þÀ@þÀ€@€€€€5#5#3!53#5!#3335305#@€@@@@ÿ@€€€@@€@@@@ýÀ@@À@@þ@Àþ@À@€€!5#5#3!53#5!#3335305#0#@€@@@@ÿ@€€@€@€@€@@@@þ@@@@@@þÀ@þÀ€@€€€€"5#5#3###3!53#5#5335305#@@À€@@@@@@@€€€@@€@@@@@@þ@@@À@@ýÀÀþ@À@€€@%5#5#3#35!53#5!#3335305#0#@@À€@€À@@ÿ@€€@€@€@À@@@@@@þ@@@@@þÀ@þÀ€@€€€€&5##5##35335!53#5!#3335305#@@@€@@@€À@@ÿ@€€€@@€@@@@@@@@@ý€@@À@@þ@Àþ@À@€€@)5##5##35335!53#5!#3335305#0#@@@€@@@€À@@ÿ@€€@€@€@@@@@@@@@ýÀ@@@@@þÀ@þÀ€@€€ÿÀ€ 70305'!530#5!#0303035305#€€À@@ÿ@€€€@@€@€€€@@@@þþ@€ÿÀ70305'!53#5!#3335305#0#€€À@@ÿ@€€@€@€@@€€€@@@@@þÀ@þÀ€@€€ÿÀÀ70305'!53###€€À@@€À€@€€€@@@ýÀ@ýÀÿÀÀ@%5#0#0#0#033530305À@€€€@À@À€€@€þ€€þ€@@@@€€€À€5#5#3#30#0#03!530#5€@À€@€À€@@@€@@@@@þþ@@@€À@%5#0#0#0#033535#5#3#35À@€€€@À@@À€@€€@€þ€€þ€@@@@@@@@@@€€5##35!5335305#0#0#0#0@€@€À@@@€€€€@@@@@ý€@@À@€€þþ€%%5#035305#0##0#0#033535##35À@@@€@@€€@À@€@€€@€@€€@þ€€þ€@@@@@@@@€€5#5#3!5335305#0#0#0#0@€@@@@@€€€€@@@@ýÀ@@À@€€þþ€%%5#035305#0##0#0#033535#5#3À@@@€@@€€@À@@@€@€@€@€€@þ€€þ€@@@@@@@€€"5#5#3##03!5335305#0#0#035@@À€@€@@@@€€€€@@@@@þ@@À@€€þ@€@)%5#035305#0##0#0#033535#5#3#35À@@@€@@€€@À@@À€@€€@€@€€@þ€€þ€@@@@@@@@@@€€&5##5##35335!5335305#0#0#0#0@@@€@@@€À@@@€€€€@@@@@@@@@ý€@@À@€€þþ€@-%5#035305#0##0#0#033535##5##35335À@@@€@@€€@À@@@€@@@€€@€@€€@þ€€þ€@@@€@@@@@@@@ÿÀ€70305'!53035305#0###€€À@@@€€€€@€€€@@@€€ýÀ@ýÀÿÀ#%5#035305#0##0#0#033530305À@@@€@@€€@À@À€€@€@€€@þ€€þ€@@@@€€@€À€%5#03535##5#330#5#5#3€@@@€€€@@@À@€@€@@ÀÀÀÀ@ÿ@€@@@@ÿÀÀ5#5#33530#0#0#03!#!!@€@À@@€À€@@ÿ@€@@@@ý€@þ€€þ€@@@@@ÿÀÀ%5#03530#0#0#0330#0305€@@@€€€@@@@€€@@ÿÿ@ÿ@@€€ÿÀÀ@%0305#353530###33##!@€À@@@€À€@À@À@€€@@€þÀ@þÀ@@@@@€À€!%5#03535##5#330#5#5#3#35€@@@€€€@@@@À€@€€@@ÀÀÀÀ@ÿ@€@@@@@@ÿÀÀ@#5#5#3#353530#0#0#03!#!!€@À€@€@@€À€@@ÿ@À@@@@@@ý@@þ€€þ€@@@@@€À€%%5#03535##5#330#5##5##35335€@@@€€€@@@@@@À@@@À€@@ÀÀÀÀ@ÿ@À@@@@@@@@ÿÀÀ'5##5##353353530#0#0#03!#!!À€@À@€@À@@@€À€@@ÿ@À@@@@@@@@ý@@þ€€þ€@@@@€À@!%5#35###35##3353305#0#3À@@€@€€À@@À@@@€@€€@@@@þÀ@@@þÀ@@@@€€@€À@!%5#35###35##33535#05#03À@@€@€€À@@À@@€@€@@@@þÀ@@@þÀ@@@@€€@€À@)%5#35###35##33535#5#3'305#0#3À@@€@€€À@@À@€@€@À@€@€€@@@@þÀ@@@þÀ@@@@@@@@€€@€À@!)%5#35###35##33535#05#03!5#5#3À@@€@€€À@@À@€@€@€@€@€@@@@þÀ@@@þÀ@@@@€€@@@@@€À@)%5#35###35##33535##35!305#0#3À@@€@€€À@@À@€€@€ÿ@€@€€@@@@þÀ@@@þÀ@@@@@@@@€€@€À@!)%5#35###35##33535#05#03%5##35À@@€@€€À@@À@€@€@€€@€€@@@@þÀ@@@þÀ@@@@€€@@@@@@€À€+/%5#35###35##33535#5#5##3533#3575#À@@€@€€À@@À@@@@€@@@@@€@@€@@@@þÀ@@@þÀ@@@@@@@@@@@@@@€@@€À€'+/%5#35###35##33535#535#5##3375#53À@@€@€€À@@À@@@@€@@@À@À@€@@@@þÀ@@@þÀ@@@@@@@@@@@À@@@@@	ÿÀÀ€&*8?CG5!75##35%5##535#30535'5##335#55!3#0#05#35!30##5#735#Àþ@À@€€@@@@€@@À€@@@@€þ@€@@@@@€@@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@@@þÀ@@€€þÀ@@ÀÀÀÀ@	ÿÀÀ€&*6=AE5!75##35%5##535#30535'5##335#55!3533##530##5#735#Àþ@À@€€@@@@€@@À€@@@@€þ@@@@@@€@@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@@@@þÀÀÀ@@@ÿ@ÀÀÀÀ@ÿÀÀ€&26D5!75##35%5##535#30535'5##335#575#535#535#5!3#0#05#35Àþ@À@€€@@@@€@@À€@@@@€€@@€ÀÀþ@€@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@€@@@@@þÀ€@@þÀ@@€€þÀ@ÿÀÀ€&26B5!75##35%5##535#30535'5##335#575#535#535#5!3533##5Àþ@À@€€@@@@€@@À€@@@@€€@@€ÀÀþ@@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@€@@@@@þÀ€@@@þÀÀÀ@@@	ÿÀÀ€&.6:FJ5!75##35%5##535#30535'5##335#575##3575##35%5!3533##55#Àþ@À@€€@@@@€@@À€@@@@€@€€@@@@@þ@@@@@@À€@@@À@@@@€@@@@þÀ€@@@@@@@@À@@@@€@@@@À@@@þÀÀÀ@@@@@@ÿÀÀ€&*7C5!75##35%5##535#30535'5##335#55!03#0#05#%3533##5Àþ@À@€€@@@@€@@À€@@@@€þ@€@@@@@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@@@ÿ€@€€ÀÀþÀÀÀ@@@ÿÀÀ€&.:>J5!75##35%5##535#30535'5##335#575##3575##3535#5%5!3533##5Àþ@À@€€@@@@€@@À€@@@@€@@@@€@@@@€þ@@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@À@@@@À@@À@@@€@@@þÀÀÀ@@@ÿÀÀ€&155!75##35%5##535#30535'5##335#55#535#3055!Àþ@À@€€@@@@€@@À€@@@@À@€À@þ@@@@À@@@@€@@@@þÀ€@@@@@@@@@@@þÀ€@@ÿÀÀ€&595!75##35%5##535#30535'5##335#55##535#3053575!Àþ@À@€€@@@@€@@À€@@@@@@@€@@Àþ@@@@À@@@@€@@@@þÀ€@@@@@@@@@@@@@þÀ€@À@@ÿÀÀ€&04D5!75##35%5##535#30535'5##335#55#3030%5!305303#0#05Àþ@À@€€@@@@€@@À€@@@@€À@@@þ@@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@€@@ÿ€@@@þÀ€€@€€ÿÀÀ€&*:5!75##35%5##535#30535'5##335#55!305303#0#05Àþ@À@€€@@@@€@@À€@@@@€þ@€@@@@@@@@À@@@@€@@@@þÀ€@@@@@@@@@@@þÀ€€@€€	ÿÀÀ€&-1;?F5!75##35%5##535#30535'5##335#575#5#05!3#0#0535#;05#3Àþ@À@€€@@@@€@@À€@@@@€€@Àþ@À@@ÿ@@@@À€@@@À@@@@€@@@@þÀ€@@@@@@@@€@@€€@@@þÀ@€€À@€@
+ÿÀÀ€
+ $*48?5!5#5#05!3#0#05#35!35#5#;0#03#0#0535#;05#3Àþ@À€@Àþ@€@@@@@@@@€@@€À@@ÿ@@@@À€@@@@@€€@@ý@@@€€þÀ@@@@@€þÀ@€€À@€@	ÿÀÀ€
+&*15!5#5#05!35#5#;0#03#0#0535#;05#3Àþ@À€@Àþ@À@@@€@@À@@ÿ@@@@À€@@@@@€€@@ý@@@@@€þÀ@€€À@€@ÿÀÀ€$(5!5##535#5#0335335330##05#55!Àþ@@@@@À@€@@@@@@@@Àþ@@@@@@@@ÀÿÀ@þÀ@@@€@€@@ÿÀÀ€&*5!5##535#035303035330##05#5#5%5!Àþ@À@@@€@@€@@@@@€@@þ@@@@À@@@@ÿ@ÿÿ@@@€À@À@@@€€À5!€þÀ€@@€À@%5!%5##535#5335#5#0#30353535#5€ÿ@@€€€€@@À@@Àþ€@@@€@@À@@@@@@@@€@€@þÀÀ@@@€ÀÀ5!Àþ€€@@@€ÀÀ5!Àþ€€@@€À5!þ€@@€À5!þ€@@@€€0303030@€@€ý€€ý€€ÿÀÀ€5!%5!Àþ@Àþ@@@@€@@€@@@5##35@€@€@@ÀÀ€@@@35##3@€@€€ÀÀ@€@%35##3@€@€@ÀÀ@€@@@5#5#3@@€@@@ÀÀ@@À@5##35!5##35À€@€@€@€@@ÀÀ@@ÀÀ@À@35##3%35##3€@€@€@€@€€ÀÀ@@ÀÀ@À735##3%35##3€@€@€@€@€@ÀÀ@@ÀÀ@@À@5#5#3!5#5#3À@€@€@€@@@ÀÀ@@ÀÀ@@€À
+5#5##3030À€€€€€@ÀÀ@þ€€@€À5#0535#5##30#335À€€€€€€€€€@@€@ÀÀ@€@ÀÀ€€
+305#5##033@@@€@@€@€@@€@€À€€5#5#5#5#353535€@@@@@@@€@@@@þ@@@@À€@0305À€€€@€À030530305@€€€€€€€€03053030530305€@€@€€€€€€€À@@À0305À€À€€€ÀÀ#)5######30305#53535353503050305À€@@@@@€€€@@@@@€þ@€@@@@@@@@€€@@@@@þÀ€€À€€€À#)/5######30305#5353535350305303050305À€@@@@@@€@@@@@€@@€þ€@@@@@@@@€€@@@@@þÀ€€€€À€€À@@305#3@€@€€À@@€
+305#37305#3€@€@À@€@€€À@€À@
+305#37305#37305#3@@€@À@€@À@€@€€À@€À@€ÀÀ@@35#0@€€@À€@@€
+35#0!35#0€@€@€€@À€@À€@
+35#0!35#0!35#0@@€@€@€€@À€@À€@À€ÿÀÀÀ5#5#5#5####353533À@@@@@@@€@@@@@@@@@@@@@@@@@À€€%5#5#5#5353535####333€@@@@@@€@@@@@@À@@@@@@@@@@@@@@@À€€5#5#5#5#333###353535€@@@€@@@@@@€@@€@@@@@@@@@@@@@@	ÀÀ€7;?C%5#!5#%5#!5#'5#!5#######3535353335#5#535355#=#=#@@þÀ@À@€@@@@@@@@@@@@@@@@@@À@@@À@@@@À@@@@À@@@@@@@@@@@@@@@@@@@@€@@@@@@@@@€À030530305333@€€€þ€€€€€€€€þ@Àþ@À€030=353535#5!#0305!#05#3À€@@@@þ€@€@€€€€€@@À@@€€À€þÀÀ@5!Àþ@@@À€%5#!!5!5#À@þÀ@þÀ@@@@@@@@À€5#%#35!5!À@þÀ@@@þÀ@@@@@@@ÿÀÀ5#053535#####353€@@@€@@@@€@@@€@@@@@@@@@ÀÀÀ
+)305#5##035!305#5##035305#5##035€@@@@@@@@@@@@@@@@@@€@@€@@€@@€@@@€@@€@€@€À0!05€À€€@€À0305305305305305#0#0#0#0@€@@@@€@@@€€€€€€€€€€€€€
+%5#035#535!0€€€€€ÿ€@@À@ý€€€€
+%#!0!3#30€ÿ€€€À@€@À@€'0305303053535303##5!#030530#€€€€þ€€@@€€@ÿ@€€@€€€€ÀÀ@ÿÀ@@@€€€@€'0305303053030530##3535305#5!#5€€€þ€€€€@@€@@@ÿ@€€€€þ@€€@ÀÀ@€@@@@@ÀÀ%030530!0!0€@þ€À€€€€€03333535#553€@€€@@€@ý€@ýÀ@@À@ÿÀÀÀÀ€!!##333€@þÀ@@@À€@À@@À@@þÀÀÀ€!53535#5#53@@@@@ÿ€€þ@@@À@@þ€@þÀÀ@@
+3530#5##03030@À@@À@€@@@@@ÿÿÀ€@5#0####0335'53€@€@@@À€À@@@@@€@@@@@À@@5!30#5#335305#5#5@þÀÀ@€@À@@€@À€@@@@€@@À@@5!#0335305#5#50530@ÿ@@À@@€@@@ÿ@@€@@ÿ€€À@@0305305305!030=3@€@@þÀ€@@€€€€€€€@@À@@5#5##3#0335305#50530'53@@À@@@@À@@€@@@À@@@@@€@@€@À€€À@@À@@30#5##033#!'0530@@À@@€À€@@@€@@@À€€€@5#05#0#30305€€€€€€€@€€@€€€€À5!€þ€€@@@€5!%5!€þ€€þ€@@@€@@@À@
+5#035##03@@€@@À@@@ÿ@@À@
+30#5#30#3À@@€@@€@@ÿ@À@30#5030#5#€@€€@€þÀ@@ÿ@@@@À
+73530#5##03030@À@@À@€@€@@@@ÿÿ@@@À%5###3#@@€@@@@@@@@À@@@À5#5##3##0!05##53535#53@@À@€@@@@€@@€@@@@@@@@€€@@@@@@@@À5#5##330#5#335305#5#53@@À@€@@€@À@@€@@@@@@@€@@@@€@@@@€À%5#0####0335'53€@€@@@À€À@€@@@@€@@@@@@@À5!30#5#335305#5#5@þÀÀ@€@À@@€€@À€@@@@€@@@@À5!#0335305#5#50530@ÿ@@À@@€@€@@ÿ@@€@@ÿ€€@@À70305305305!030=3@€@@þÀ€@À€€€€€€€@@@@À5#5##3#0335305#50530'53@@À@@@@À@@€@@@@@@@@@€@@€@À€€À@@@@À%30#5##033#!'0530@@À@@€À€@€@@€@@@À€€€€À5#05#0#30305€€€€€€@€€@€€€@5!€þ€@@À€€%5!%5!€þ€€þ€À@@€@@@@À
+%5#035##03@@€@@@@@@ÿ@@@À
+730#5#30#3À@@€@@€€@@ÿ@@@€30#5030#5#€@€€@€€þÀ@@ÿ@@€%5#0535#0535!#335#5!#33€€€€ÿ€€€@ÿ@@À€@€@€@À@@@@@þÀ@ÀÀ€%%5##05#03#3530535#5#0!#03305!5À€€@€@@@€@@ÿ@@@À@@€€ÀÀÀ€@À€@þÀ€@€À%5#5#5##0335#5!#03!55#À€@@@À€@þÀ@@@@€À@À@þÀ@@@@þ@@@@€5##5#35355!0335#5@@€€@€þÀ€€€€@@@þÀÀ@@@ý€@@À€À'%5##535#535#05335#5##0#3#30#0!5À€€€€€€@€@À@@@@@@€À@@À@@@€@@@@€@@@€€@@À€!%5###0#035#33053303030#553À@€@@@À@@@@@€@€@@@@@ÿ@þ@@€@ÿ€@€@@€#'+5#0535#5##5#05##30#33533035%53=3@@@€@@€@@@@€@@€ÿ@@@@€@ÀÀ@€À@€@ÀÀ@€À@@@@@@€&,%5#3##30335#0535#05#5305#5!30#0530@À@@@@€@@@@@@þ€@@À€€@@@@@€@@€@€@€@@þ@À€€€ $(%5#535###05#53535#5!03530335#5353@@€@@@€@@þÀ€@@À€@ÿ€À@@@@@€@@À@ý€À€@@@@@ÀÀ€#'+/5#535#5##5##5##3#335335%53353%5#!35#@@@@@€@@@@@€@€@ÿ@€@þÀ@À@@@@@@@@@@@@@@@ÀÀÀÀ@@@@@ÀÀÀÀ€À€
+0333#50!5#3#@À@@€ÀÀ@@€þÀþÀ@@€þ€@@þÀÀÀ%!5!%5#35#5##3###0335#03533€þÀ€@@@€€€€@@@À€@@@@@€@À@@@@@@@ÿ@@@þÀ@€À-%5##5#0535#535#535335#5####3#303335À€@@€€ÀÀ@@€@À@@@@@@@@ÀÀ@@@€@@@@@@@@@@@@@@€@@@€À'5#535305#0##5#3#30#303335#5#5À€@@€@@À@@@@À@@€@@À@@@€€@À@À@ÿ@@ÀÀ@@@€À!%5#0535#535#05335!353#3#3#€@€€€€@@þ€@@€€€€@€@€@@@€@ÀÀ@À@@@@@€@"273530530#05#5#5###353#0#03535#0533030#0ÀÀ@@@@€@€@@@@@€€@@@@@À@@€€@@@@@@þÀ€€@@€@€ÿ€@À@04%5#535##3'3535353535305###0##33###0353À€€À@@À@@@@@@@@@À@@€@@@@@@@@À@@À@À@@@@@€@@@À@@@@€€ÀÀ@À@8<%5#5#535##33#35%3535353535305###0##33###0353À@@€À@@@€ÀþÀ@@@@@@@@@À@@€@@@@@@€@@@@@@@@@@€@@@@@€@@@À@@@@€€ÀÀ€À%5##0335#5!##033!5%030À@ÀÀ@@ÿ@@@@þÀ@À@@@@@@@þ€@@@@€þ€€"%5##0335#5###3533355#735#@€€@@À€@@@@Àþ€@@@@À@@@@@@@@@þ@@@À@@@@€(.5##0335#5#535!3##033#!05##535!030À@@@@@@@ÿ@€@@€@€@€@ÿ@@@@@@@@@@@@ÿ@@@€@@@ÿ@@155##33###03535333535#5##5353535305###553À@@€@@@@@@@À@@À@@@@@@@ÀÀ@@@À@@@@€@@À@@À@@@@@@€@@Àý€ÀÀ@@,35##33###035353335#0#53535305###53#0À@@€@@@@@@@€@@@@@@@À@@€@@À@@@@€@@À@@@@@€@@Àý€@@ÿ€À#5#533305#5!#3#03!5305###0@ÀÀ@@@þÀ@@@@@@@@ÀÀ@À@@€@@À@ÿ@@€@@€À+7!53530#5#5!#03535330#5#353##5#5#0@@@@@ÿ@@@€@€@@€@€@@À@@@€@@@€@@@€@À@À@@@€€!%5#0335##53305!#335#533#€@@@@@€@þ@@@@@@@@€@@À@À@€@@@@@@þ@@ÿÀ@")-5#5###0##0335305350530'5#73535#0;5#@@@@À@@À@@þÀ€€@@@@€€€€@@À@À€@€@@€ÀþÀ€€ÀÀÀÀ@@@
+€&4>DHLP5###5#0353535#05#0;535#5#0#30730535#05##3'30##30305#0!#3535#35#@@@@€@þ€@@@€@@@@@@À@@@@@@€@@@@@@þ€@@@@@@@@@@Àÿ@@@@@€€À@@€@@€@€À@@@@@€@@@@@ÿÀÀ-17;5##35#35335#5#3530#5#5##5#3#353035#05#0735#@@€€€@@€@@€À@@@@@€@@@@@€ÿ@@@@@@À@@@@ý@@@@@@@@€@@@@ÀÀ@@ÿ@@€€€€@€À03330#0#0030ÀÀ@@À€@ý€@þÀ€ÿýÀþ€#7#3535305#533#3535#5#5#30#0#0@@À@@@@@@€@@€À@@@À@À@€@@ÀÀÀÀ@À@€ÿ€(5#5#30#3#0#3535305#533#3535#5#5À€À@€@@@À@@@@@@€@@€€@@@€@À€@À@€@@ÀÀÀÀ@@€'+/5#053535##30#0###335#535303535#3535#€@@€€@@@€@@ÀÀ€@@@ÿ@@€€@@€À@@@€€@@@@@@@€@@€@@@€(,05##33!5!055##3#3303535#5#0535!#3535#À€@@@ÿ€@À@@@@@@@@@þ€@@ÀÀ@@@@@@@€€@@@@@@ÿ@À@€@@@@€(.4:>5###5#53535#05##30###0335335350530305#005#0%35#@@@@@€€@€@@@@@€@€@þ€@@@@þÀ@€€@@@@À@@€@@€@@€@@@@@@€€€€@€€@@€95###0535#053053530###353535305#5###0##333535@€€@@@@€@@@@@@@@À@@@@@@À€@@@€@€€@€@@@@@@€@@@€À@@@@@€5#5##5#03030!53#5#53À€@€€@@@€@€@@@@ý€þ@@@@þ@@þÀ€À#03030303030#0#05#05#05030À@@@@@@@@€@ý€€€€€€þ€€€€ýÀþ€5#535#5##5#05#0333030=3€€€€@@€€@@€@€@@À@À@€ý€@@ÿÀ@@	€$*.267!5!5#!35#!0#0;0535#0530305#5#030#0!35#5#%!5!€ÿ@@@@þÀ@€@€€€@@À@@@þ€@@€@ÿÿÀ@@@@@€þ€€@€€€@þ€€@@@@@@ÿÀ€ $*95##3#335305#05#5305##553735#05#0;530#5##353€@@@@@€@@@@@@@À@@@€@@@À@@€@@@ÀÀÀ@@€€@€@ÀýÀÀÀÀ@@€€@@@@@€À03035#03030#5030ÀÀÀÀ@@þÀ@ý€@ÿ@ýÀþ@%5#5###035!#03503075#@@@€ÀþÀ@@@À@@@@@@þ@@@@þ@@þ@@@€.2%5##35!353533035#5305335#5!#030530###5#@@@þ€€@@@@€@@@@þÀ@@€@@@@À@@@@@@ÀÀ@@€ÀÀ@@€€€ÀÀ@@€
+/59=%5#5#03355#5#3##5#0##353#5#035303535!05#0735#35#@€@@@@€@€@@@@@@@@€@€@þÀ@@@@€€€À@Àÿ@@€@@@@@À€@@@þÀ@€@@@€€€@@@€À%%5#0353335#5#535#03030#5030À@þ€À@@@@@€ÀÀ@@þÀ@€@@€ý€À@@@@@@ÿ@ýÀþ@!%%305305##535#5!30#33030#0353@€@@@@@þ€@@À@@@@€€€€€@ÀÀ@@þ@@€€€ÀÀÀ@À€"&735#5330305#05#53535#05#!0535#€@@@€€@@@@@€ÿ€À@€€@ÀÀÀ€€€@@À€@ý€€ÀÀ@@@ $305335#5#5##3#35%030##!53À@@@@@À@€€€@@@@ÿ@@@€@@@@@@@@@@€@@@@€À%5#0!30303075#53#5@þ@@@@€@€€€@@ÿÿ€@@À@353305335#5#5!030##@@@@@@@@ÿÀ@@@ÀÀÀÀ€@@@@@@€@@@À€ *.70305;5353#5#3##0#3333'05330#5#@@€@@@€€@@@€@@@@@@@@@€À€€@@À@@@þÀ€þ@@@@€€@þ€@@@@€À
+"(.9%5!5##5#07305#0305#0#305#0305#0#305#0305#0#353305!!Àÿ@@@@@@€@@@@@€@@@@@€@@@@@@þ@€@@@@€€€€€€€€€€€@@€@ÿÀÀ15#53535!0353##!##330#05#03!530#5#0535ÀÀ€@þ@@€@€@@€@À€@@@@@@@@@@€@@@@@@@@ÿ€€@@@€@€À%5#53#5!#3#30#3#0À@@@þÀ@@@À@À@€@À@@@þÀÀ@@þÀÿ€À5#03#30#3#3!53#5ÀÀ@À@À@@@@@@À@ÿþÀ@@ÀþÀ@@@À	€)-17#35335#5#3535##'#3535#15#;05#5#30'#3535#@@@€€€€€@€@@@@€€@À€@€@À@@€€À@@@@@@@ÀÀÀ@@@@@€@@@@@@@€€@
+%5#0#5#3035€@@À€€À@@@þ€@€À7#303335#5#053535###0#30@@À@@€@@@@€@@À@À@@ÀÀ@€@ÀÀ@@€À€'155#5##33#0#0#03053030#05#05#535530530353€@À@@@@@@€À€@@@@À@@@€@@@@@@@€€ÿ€€€€@@þ@@€€@À@@€15;735335#535330#3535#05##530530305#5!#03##5#0530@€@€€@@@@@@@@@@@@@ÿ@@@@@À@À@@@@À@@€@@À€@@€€€@@€ÀÀ@@€€€€*.2%5##355#5#035##03%305#5#05#30#335#35#€ÀÀ€€À@@€@@@@@@@@@€À@@€@@À@@@@À@@þ@@€@@þ€@À€@€À€@€@@@€@%5##05!05#5#5!##33!5%0530À€@@@ÿ@@@@@ÿ€À@@€€@@@@À@@@À€€€À@!%5##0535#5##3355#5##353035@@€ÀÀ@@@ÀÀ@À@@€@À@@€@@@À@@@@@@@€@€#'-15###53535#535#5##3###3!5355#!05#0735#€€€@À€€€@@@@@@@@@@ÿ@À€€@@@À@@@@@@@@@@À@@@€@@€€@@€%)15##053535#####3530##353535355#35##3À@@€@€€@@@@@@@€@@@þÀ@€€À@€@@€@@@@@@@@€À@@À@@þÀ@@@@@€À%5#035!30#5#353#5#5#À@@ÿ@@@@@€@@€@@@ÿ@À@À@@À€
+%%5#%#35305#0330530533##0##0#@þ€@@@@€@@@@@@@@@€@@@@@€À€€À@À€@ÿÀ€À@
+735#0##!35#;535#5##3530@À€@@@@@@@@À@@€À@@@À@@À@@@@€>5#05##0#5#05##033##03#35#053333035305#5#5#05335@@@€@@@@@@@@@À@@@@@@@@@@@@@@€@€@€@€@@@€@@À€@@@€@€@@€@@€À7#!05#53#5!5#03!0##@@À@@@þÀ@@@ÀÀ@€@@@@€@ÿ@€À%35##5#5#0330###!5€@@@À@@€@€@À@À@@@€@ÿ@@@@€À%30305!5#033#03@@@þ€@@À@€À€€@€@þÀ€@€€
+%5#0!3#0305€@ÿ@@@À€@€@þÀ@€€€€@%3535##5!#3!%5!#3€@@@@þÀ@@@þÀ@@@ÀÀÀ@@@þÀ@€À@@@À@15%5#535#5#3#3#35%3535353535305#######033À@@@À€€€€ÀþÀ@@@@@@@@@@@@@@@€@@@@@@@@@@@À@@@@@€@@@@@@€€þÀ@À@@%5#535#5#3#3#355#5#3##03###0353535353535305###535À@@@À€€€€À€@À€@@À@@@@@@@@@@@@À@@@@@@@@@@@@€@@@@@€@@@€@@@@@@€@@@@À@-1%5#5#535!3#35%3535353535305#######033À@@€ÿ€€ÀþÀ@@@@@@@@@@@@@@@€@@@@@À@@@À@@@@@€@@@@@@€€þÀ@À@<%5#5#535!3#355#5#3##03###0353535353535305###535À@@€ÿ€€À€@À€@@À@@@@@@@@@@@@À@@@@@@À@@@€@@@@@€@@@€@@@@@@€@@@@À@A%5#5#535!3#355#5#3#3#3###0353535353535305####535#5À@@€ÿ€€À€@À€@@€À@@@@@@@@@@@@@@@@@@@@@À@@@€@@@@@@@@@@€@@@@@@€@@@@@@À@7;%5#5#535!3#35%3535353535305###0###033###0353À@@€ÿ€€ÀþÀ@@@@@@@@@€@@€@@@@@@@@@@@À@@@À@@@@@€@@@@€@@@@€À@@À@15%5#5#535##335#53%3535353535305#######033À@€€À@@À€@ÿ@@@@@@@@@@@@@@@€@@@@@@À@@@@À@@@@@€@@@@@@€€þÀ@À@=A%5#5#535##3355!3#3###0353535353535305####535#5#553À@€€À@@À€ÿ€€À@@@@@@@@@@@@@@@@@€@@@@@@@À@@À@À@@@@@€@@@@@@€@@@@@@@ý@@@À@9=%5#535#5##3#335#53'53%3535353535305#######033À@@@À@@@@À€@@@ÿ@@@@@@@@@@@@@@@€@@@@@@@@@@@@@€@@@@@@@@€@@@@@@€€þÀ@À@EIM%5#535#5##3#3355#5#3#3#3###0353535353535305####535#553'53À@@@À@@@@À€@À€@@€À@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@€@@@@@@@@@@€@@@@@@€@@@@@@ý€@@€@@À@AEI%5#535#5##3#3355!3#3###0353535353535305####535#5#553'53À@@@À@@@@À€ÿ€€À@@@@@@@@@@@@@@@@€À@@@@@@@@@@@@@@À@À@@@@@€@@@@@@€@@@@@@@ý@@@€@@À@9D%5#535#5##3#335#53'53%3535353535305#######035305!3#À@@@À@@@@À€@@@ÿ@@@@@@@@@@@@@@€@ÿ€@@@@@@@@@@@@@@€@@@@@@@@€@@@@@@€@À€@@ÀÀÀ@!3535353535305#######033@@@@@@@@@@@@@@@@€@@@@@€@@@@@@€€þÀ@€€€
+%5#035!30#€@@ÿ@@€@@@þ@€À
+%5#035!30#7030À@@þ@@@À@€@@@þ@@þ€0!00303030þ€@€@ý€€ýÀþþ€0303053###3033€@@€@€@@@ý€€ýÀ€Àþ@Àþ@€@€À%35353###5##3333@@@€@@@€@@@@À@@Àþ@@@Àþ@@@@€73053###3033030À@@€@€@@@À€À€Àþ@Àþ@€@€ý€€€	350303030#;#@€€@@@þ@@À@@@ÀÀÀý€€ý€€þ@Àþ@À€ 0303030#003030300#0@@@@€À@@@þ@@€ÿÿ€þ€€ý€€ý€€þ€€þ€€0300303030#535##5#3€@€@€@@€@€@ý€€þ€ÿÿÀÀÀÀÀÀ€À1030535330305#05#05305305#0##5#05#03030#0€@@@€@@@@€@@@€@@@€€@@€€€€€€€@@€€€€€€0303030#535##5#3030€@€@@€@€@@€€ÿÿÀÀÀÀÀÀ€ý€€€#0303030030303035#15#;5#@€@@@@@þ@€€@À@@€ÿÿ€ý€€ý€€þ€ÀÀÀÀ€À5!30#!5###0ÿ@@À@@€À@@þ@À@@€À#7!5305###5#03533305#5!##03€@@@€@@€@@@ÿ@@@À@@€@@@€@@@€@@@þ€@€À7#!53530#5#5!300330#@@@@@@@þÀ@€@@@À@@@€@@@þ@þ€@€À0303353030###5#5€@@@€€@@@ý€€@@þ€€@@@@À€@	3'0305À€€€@þ@ÀÀ€€@€€
+333%030530305@€@€þÀ€@€@þ@Àþ@ÀÀ€€€€€33333%03053030530305€@€@€þ€@€@€@þ@Àþ@Àþ@ÀÀ€€€€€€€3353###3330305€@@€@€@@@þ€€@þ@Àþ€@@þÀ@þÀ@@€€€@€À@%353###333@@@€€€@@€À@@þÀ@þÀ@@€7353###3333'0305À@@€@€@@@À€€€À@@þÀ@þÀ@@Àþ@ÀÀ€€€	
+!0305333#;#7030530305@€€@@@þ@@À@@€@@@€€@þ@Àþ@ÀþÀ@þÀ@À€€€€€
+$*3533#03330#003053030530305@@@@€À@@@þ@@À@@@@@@ÀÀÀÀÿþ@Àþ@ÀÿÿÀ€€€€€€€%3030530305#5305#0#05#030305€@€@€@@€@€@ÿ€@þ@ÀþÀ€€€€À€€€€À€€€À@#%5#5#53535###5#5#33##353533À@@@@€@@@€@@@@€@@@€@@À@@@@@@@@À@@@@@@€%030530305#5305#0#05#033'0305€@€@@€@€@@€€€€€€€À€€€€À@þ@ÀÀ€€	€!'-35335333305#0105#0;05#07030530305@€@@@@@þ@€€@À@@€@@@@ÀÀÀÀþ@Àþ@Àÿ€€€€À€€€€€€€
+%5##30#€@À@@€@@@þ@€À@%5##335#5!#3!5À€ÀÀ€@þÀ@@@À@@@@@@@þÀ@@€À%5##30###0335#03533À@À@€@@@À€@@@€@@@€@@ÿ@@@þÀ@€À@33030330#5##5€@@@€@€@@þ@@ÿþÀ€@@@€!7!5#0303530#5#5!##033030€@@@@@@ÿ@@@@@À@@þ@€@@@@þ€@þ€À
+%0!53530#5#5535#03030#5#5330#@@@@@À@@@@@@€@@ý€@@€@@ýÀ@@ÿ@@@þ€@€/9I7!5#0535#053030#3530#0#5#05335#5!##0335#05330'05#053530#30€@@@@@@@@@@@@@@ÿ@@@@@@@@@@@@@À@@€@€€€@@€€@€@@@@@þ€@@€@€À€€@€@€€À#7!53530#5#5!#03535330##5#5#0@@@@@ÿ@@@€@@€@@À@@@€@@@€@@@þ€@@@€@5#5!5!535###33@@þÀ@€@@@@@@@@@@@@@@@€À5#5#5###33À@@€@@€€@@@@@@@þ@À@5#5#5#3!!#3535@@€@þÀ@@€@€@@@@@@@@@@@€À5###333535À€€€@@€@@Àþ@@@@@@@5#5#5#0#05###33305303535@@@€@@@@@@€@@€@@@€€@@@@@€€@@@ÀÀ5#535#5#5###3#333535À€€@@€@@€€@@€@@@À@@@@@@À@@@@@À5#5#5#5#5#535!3533333@@@@@@ÿ@@@@@@@@@@@@@À@@@@@@À35353535335!3#####3€@@@@@@ÿ@@@@@@€@@@@@@À@@@@@@@À€#!5##5#5#5#5#5#33333@@@@@@@@€@@@@@@À@@@@@@@@@@@À€%5#53535353535######5#@@@@@@€@@@@@@À@@@@@@@@@@@@@À@5#53030535#05#0#535###33@€@€@@À@€@@@@@@€€@€€@@@@@@@@5#5#5#3#05#0#303053#3535@@€@€@€@@À@€@€@@@@@€€@€€@@@@@5#5##353'5#3535@À€À@ÀÀ@@@@@@@@@€@À@@@35#5##35!35#3ÀÀ€À@€@@À@€@@@@@@@À@@@#5#535#535###535###3335#533À@€€@€@@@€@@@@€@@@@@@@@@@@@@@@@@@@@@@€À5#5#535#5#5###3##3030À@@€@@€@@€@@€€€@@@@@@@@@@@@ÿ@#5#5#5##5#3#3#353353553'53@@€@€@€€@€@€@À@@@€@@@@@@@@@@@@@@@@@€@@@€À5#53535#0#0#33#333535À€@@€€€@@€@@€@@@@@ÿ@@@@@@@@@#5#53335#5#53535###535###33@€@€@@@@€@€@€@@@@@@@@@@@@@@@@@@@@@@@#5#5#5#3#5#5#33##35353#3535@@€@€@€@@@@€@€@€@€@@@@@@@@@@@@@@@@@@@5#5303#0#535###33@À€€À@€@@@@@@€@€@@@@@@@@€À%5#035#5#5###30#À€€@@€@@€€€@€@@@@@@þ€@@5#5#5#3#05#3053#3535@@€@À€€À@€@€@@@@@€þÀ€@@@@@€À5#035!30#333535À€€þ€€€@@€@@€@@þ€@@@@@@€À%5#53535#535#5#5###3#33#À€@@€€@@€@@€€@@€€@@@@À@@@@@@À@@@@€5#5!5305#5#30#535###33@@@€@À@€@@@@@@@€@@€@@@@@@@€5#5#5#3#0535##03!#3535@@€@À@€@@@€@€@@@@@€@@€@@@@@€$35#533535305#5####375330530€€@@@€@@€À@@@€@@@@@@@@@@€@@@@@@€@@€€€ $5#5#5#0#0535##0333353553'53@@À@@€@@€@€@À@@@€@@@€€@@€@@@@@@@@€@@@!%5#5##5##5##33305303535%35#35#@@@€@@@@@@€@@þÀ@@À@@€@@@@@@@@@@€€@@€@@@@5#5#5#0#05###33305303535@@€@@@@@@€@@@€@@@€€@@@@@€€@@€%%5#05305305##05305#0#0#03530#5#0À@@@€À@€@@€À@@€@€€€@€€€€€@€@ÿ€ÀÀ5#5303!535###33@€€ÿ@€@@@@€@@þ€À@@@@@@@€ÀÀ5#5#5#3!303#3535À@@€@ÿ€€@€@@@@@@þ@€@@@@€ÀÀ%5#5!#0#535###33@€€@€@@@@€@@Àþ€@@@@@@@€ÀÀ5#5#5#3#0#!#3535À@@€@€€@€@@@@@@€þ@@@@@@À%5#5!!0#333535€þ€€@@€@À@À@€@@@@@€À%5#5!0##535###33@€€@€@@@@€@@À@@@@@@@€€5#0335#5!#0#333535€€€€@ÿ@€@@€@@ÀÀ@@ÿ@@@@@€€5#0#5!#3530#333535€@ÿ@€€€@@€@@@@ÀÀÿ@@@@@À%5#5#5#5#5#535!35333335!@@@@@@ÿ@@@@@@€þÀ@@@@@@@À@@@@@@@@€15!535###05#3053303!!#3535303#0#5#05#5ÿ@€@@@@@@@ÿ@€@@@@@@@@@@@@@€þÀ€@€@@@@@@€@€@€@€À!5!35330##5#5#33!53530#5#5Àÿ@@@@€@€@@@@@@€@À@@ÿ@@ÀÀ@@@@@@€À!7!53535###5#035335!3##03€@@€@€@@@@ÿ@@@@À@@@ÀÀ@@@@À@@@ÿ@€@5!535###þÀ@€@@€@@@@@@À5#5!5!33@@þ@@@@@@@@À€À
+5#5#5#03À@@€€@@@@ý€À@€@
+30###À€€@@@þ@€@@@€@5#5#5#3!@@€@þÀ€@@@@@@À5!!#3535þ@@€@€@@@@@@À€À
+5##03535À€€€@@Àý€@@@€@
+730##3À€€€@À@€þ@@@€'%5#5!5!535###335#5#5#3!!#3535@@þÀ@€@@@@€@@€@þÀ@@€@€@@@@@@@@@@À@@@@@@@@@@€#5#5#5###05##333535303030@@@@@@€@@@@@@À€@@@@@@€þ@@@@@@€Àÿÿ€'5#5#5#3!!#35355!535###3335#5@@€@þÀ@@€@@þÀ@€@@@@€@@@@@@@@@@@@@@@@@@@@@@@À'%5#5!5!535###335#5!5!535###33@ÿ@€@@@@€@ÿ@€@@@@@@@@@@@@@@@€@@@@@@@@@@€5#5#5##5###3333@@@€@@@€@€@@@@@@@@@@þ@Àþ@À@À'%5#5#5#3!!#35355#5#5#3!!#3535À@@€@ÿ@€@@@@€@ÿ@€@À@@@@@@@@@@€@@@@@@@@@@€5#####333533535€@€@€@@@€@@@Àþ@Àþ@@@@@@@@À€5!!#353575!535###þ@@€@@þÀ@€@@@@@@@@@€@@@@@@À€%5#5!5!335#5#5#3!@@þ@@€@@€@þÀÀ@@@@@@@@@@@@@5#535#5##5###3335335%53€€@@À@@@@@@€@ÿÀ@@@@@@@@@@@@@@@@@@@#5#5#5##5###333533535!53353@@€@@@@@@€@@@þÀ€@@€@@@@@@@@@@@@@@@@@@@5#5#5##5##3#33533535!53@@@€@€€€@@À@@ÿÀ€@@@@@@@@@@@@@@@@@5!5!5!5###3335þ€€þÀ@@@@@@@@@@@@@@@@@€À5#5#5###330303À@@À@@@€@€@@@@@@@þ@þÀ@5#5#5#!!!!3535@@@þÀ€þ€@@@€@@@@@@@@@@€À5##0#0##333535À@€@€@@@À@@Àþþ@@@@@@@5#5#5##5###333533535!5!@@@€@@@@@@€@@þÀ€@@@@@@@@@@@@@@@@€À#5#035#5#5###30#333535#030À@@@@À@@@@@@À@À@@@@@@@@ÿ@@@@@€þ€€À15#5#5#5#5#535!0353333305#5#5#5#5#533333@@@@@@ÿ@@@@@@@@@@@@@@@@@@@@@@@þ€@@@@@€@@@@@@@@@@€À!%)-17353535330!3#####303'53=3=3=3=3À@@@@@ÿ@@@@@@€@@@@@@@À@@@@€@@@@@@@€€@@@@@@@@@@@@@@€À1%#!0##5#5#5#5#0#3333;5#5#5#5#533333@@@@@@@@€@@@@@@@@@@@@@@@À@€@@@@@€@@@@@@@@@@@@@@@€À1%5#53535353535######535353535305#####5#0@@@@@@€@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@@@@@€@@@@@þ€À€5!5!5!5!5!5####33335þÀ@þÀ@ÿ@@@@@@@@@@@@@@@@@@@@@@À€5#5#5#5#!!!!!!353535@@@@ÿ@þÀ@þÀ@@@€@@@@@@@@@@@@@@@"5#53353305#5##5##535###33@€@@@@@@@@@€@@@@@@@@@€@@@@@@@@@@@@"5#5#5#3#5##5#033533353553@@€@€@@@@@@@€@À@€@@@@@@@@€@@@@@@@@@@€À#5#535#0535#5#5###30#3#30305€@@@€@@€@@€@@@@€@@@€@@@@@@€@@@€€@€À#5#0535#535#05#0#3#30#333535À€@@@@€@@@@€@@€@@€@@@€€@@@€@@@@@@5#5#5335#535###33%5#35#@@@@@@€@@@@@À@@@@@@@@@@@@@€@@@@@€À%5#75#75#%5#5#5###335#53@€€€€€@@€@@€€€€€@@€@@€@@À@@@@@@@@@@@5#35#!5#5#5#3#3#3535#53@@À@€@@€@@@@€@€@€@@@@@@@@@@@@@@@@@€À5##5#333535'5#75#75#35#À€€€@@€@@€€€€€€€@@@@@@@@À@@€@@€@@þ€@@5#5!5!535###05#30533@@ÿ@€@@@@@@@@@@@@@€þÀ€@@@35303#0#5#5#3!!#3@@@@@@@€@ÿ@€@@€@€@@@@@@@À€!!5####3333'5#535!ÿ@@@@@@@@€@@@@@@@@@@@@€@@@À€À5#5####30!0%35#5#'35#À@@À@@@@ÿ@@À@@@@@@þ@À@@þ€€€@@@@@@À€5##!5!35#5#5#!!353535@@þÀ@@@@@ÿ@@@€@@@À@@@@@þÀ@@@@€À5#0!0#33335#5#3#3535À@þÀ@@@@@@@À@@@@@€þ€@@@@@@Àþ@@@@@À!%5#5#0#0##3!5!55335#5#'35#À@@À@@@@þÀ@ÿÀÀ@@À@@@@@@ÿ@@ÀÀÿÀÀ€@@@@@@@@€À!%5#5#03!530##3#!5#5%35#5#'35#À@@@þÀ@@@@@À@ÿ@@À@@@@@@þ€@@€@@ÀÀÀÀ€@@@@@@€À#5#5#5##5###3#!5#5533335#À@@@@@@@@@À@þÀ@À@À@@@@@@@@@@ÀÀÀÀþÀ@@þÀ@@€À%5#5#03#35#5####3#!5#55303À@@@€@@@@@@@@À@þÀ@@@@þ€@À@@@@@@ÀÀÀÀþÀ@€þ@€À@!%)-15#535#5##30#035#5##3#3!'35+35#35+35#À@@@@@@À@@@@@@@@À@@@@@€@@@@@À@@@@@@þ€€@@@@@@þÀ@À@@@@@€À@)-1595#535#5##33!5335#5##3#30#!5#05'35+35#35+35#À@@@@@@@þÀ@@@@@@@@@À@À@@@@@€@@@@@À@@@@@@þÀ@@@@@@@@@€ÀÀ€À@@@@@À€#5##!#3!35#5#5##5#353353535@@ÿ@@@@@@@ÀÀ@@@@€@@@@@@@@@@@@þ@@@@@@À5!353333305#5#5#575!30€ÿ@@@@@@@@@Àþ@@@À@@@@@€@@@€@ýÀ€À%!!#0#!5##5#5#5#5#0333Àþ@@ÿ@@@@@@@@@@À@@þ€@À@@@@@€@@@À#'+/5#535#5###3535355#5##3#335#5#'35#À@@@@@@@@@À@@@@@@@@@À@@@@@À@@þ@@@@@@€@@@À@@À@@À@@@@@@€À'030530530530#0#05#03030705#53#0À@@@@€À€@@@@À@€€€€€€ÿ€€€€@@€@À@%5##335#5!#3!5À€€€€@ÿ@@@@@À@@@@þ@@@€À%7!53530#5#5##35330###35353#@@@@@À@€@@À@@€@€@À@@@€@@@@@@€@@ÀÀ@À@€À
+%!!0!!!!0@þÀÀþ@@ÿÀ@€@À@@À@!7!0#5#!3#3##3375353053€@€@ÿÀ€€@€@@@@@@@€€@@@À@@À@@€À@ÿ@ÀÀ€&15#!##030#35!53530#055353053#'5353##0€ÿ@@@@€@@@ÿ@@@@À@€@@À@@@@ÿ€@@@@€þ@@@€À@€À@@@€€À!0!0#05#05#05#0#0#05305303À@@@@@@@@@@€ÿ€€€€€€ÀÀ€€À€À!030530530530!03030705#53#0À@@@@þ@@@@@À@€€€€ÿ€€€€ÀÀ€€ÀÀ%5!5#05!5!0535!5!##33Àÿ@@þÀ@þÀ@@@@€@@€@€@@@@þÀ@@@À1%5#05##0533535#05#0#053533535#5####33035ÀÀ@@€@€€@€@€@@@@À@@@@@€@€@€@@@€€€@@@@@@@@þÀ@€@ÀÀ€%5!5#5!5!535!5!##33Àÿ@@þÀ@þÀ@@@@À@@@@@@@@@À@@€ÀÀ%353#5#5!!30!!0#!!@@@@@þÀ@þÀ@@ÿ@À@@@@@@€@€@@@À *1735353#5#05#!30##30##33=30530#53530€À@@@@@ÿÀ@€€@@@@@€@@@@€@@@@€@@€@@€@@@€@€€@@@€ÀÀ€3535#5#5!!3!!#!!@@@@@þÀ@þÀ@@ÿ@@À@@@@@@@@@@ÀÀ€!@€€þ@À!5#035!30#33@@þ@@À€@€@@ý€@Àý@!5#035###30#@@À€À@@@€@ý@À@ý€@150!05#!5353535305#5#5#5#5!305!033330###@þÀ@@@@@@@@@@þ@@@@@@@€€€@@@@@€@@@@@€€@@@€@@@@€ÀÀ5!Àþ€€@@@ÀÀ€5#05#0#303055!À€€€€€€þ€@@€€@€€@@@ÀÀÀ5#05#0#303050305À€€€€€€€@@€€@€€€€€@À@#50305305305305305305#0#0#0#0#0€@@@@@€@@@@À€€€€€€€€€€€€@À@#%0305#05#05#05#05#05#030303030@€@@@@@€@@@@À€€€€€€€€€€€€@À@5#75#5##3#353575##5#€@€€€€€@@€@@€@@@€@@@@@@@@€@@@@€@€@	35#05#0;05#0#35#À€€@À@@€€€€@@€€€@€@€@
+305#5##033@@@€@@€€€@@€@€73053535305#0###5#5#33À€@@@€@@@@€@@À@€ÀÀ€€ÀÀ@@@@@€05#535#5#3#3#353053535305#0###5#5#33@@@À€@@€À€@@@€@@@@€@@@@@@@@@@@@þÀ@€ÀÀ€€ÀÀ@@@@@€'+73053535305#0###5#5#33###03'53À€@@@€@@@@€@@€€@@€@@À@€ÀÀ€€ÀÀ@@@@@@@@€@€@@@À@5#05#5##0335#0530375#À€@À@@€@@@À€@@€@@€@@€€@À@@@@!35#0530335305#5##5##0!0530@€@@@À@@€@À@@@€@@€€@@€@@@@€€€€À%5!#0ÀþÀ€€@@þ€€@%5!5353535305#######þÀ@@@@@@@@@@@€@@@@@€@@@@@@@@@"&%5#5##535335305#######!355#@@À@@@@@@@@@@@€@À@€@@@@@@À€@@@@@@@@@@@@ÀÀ€5#535###33#35'53=#À€€À€€€€@@@@@@À@@@@@@@@€@@À@@À€@030À€ý€€@€À5##0###3530335À@@€@@@@€@@@þÀ@@@ÿ@@@€€0303030@€@€ý€€ý€€€À5#5#0#0##303330À@€@€@@€@€@ÀÿþÀ@ÿ@þÀ€€À€#03053053030305#05#05#05#0#0#0€@@@€@@@@@@€€€€€€€€€€€€€À€#0305305305305#0#0#05#05#03030À@@@@€@@@€@@€€€€€€€€€€€€€À€333#5!€À€@þÀ@þ@Àþ@À@@€À€7!53###@@@€À€À@@Àþ@Àþ@@À€5#353035##0#5#À@ÿ€@@€@@@@@ý@@@@@ý@@€
+5##0#3530!5##0#3530€@@€@@€@@€@@@@ý@@@@ý@@À€
+!%)5##0#3530#35335#0#030#0#35#35#À@@@@@þÀ@@@@@@€@@@@@€@@@@@ý@@ý@@@@ý@@@€37A5#353535#0330#35305#5#5#535#####0333#5#5#053530À@ÿ€@@@@@@@@@@@@€@@@@@@@@@@@@@@@ý@@@À@@€@@€@@À@@À@@€@@À@@@€@ÿ€)/5##0#030#35353#353030#035###5030€@@@@€@€@€@@@@€@€€@@@ÿÿÿ@@ÀÀ@@@@ÀÀþÿÀ€17=AE5###5##5#0#030#35335#53335#533030#0030303035#35#À@@@@@@@@@@@@@@@@@@@@@ÿ@@@À@@€@@@@@ÀÀÀÀÿÿÿ@@@@ÀÀ@@ÀÀþÿÿ@@@€!%5#353033#35##5#5#535##0#5#€@ÿ€@@@@À@@@@@€@@@@@ý@@@@@@À@@@À@@ý@@À€+/595#353535#03030#5#535#####3033#5#0530'53À@ÿ€@@@@@@@@€@@@@@@@@@@@@@@@ý@@@À@ÿ@À@@À@@@€@À@@€€À@@@€/395#5##535#5335#5####033#353535#05303055#030@@@@@@@@€@@@@@@€@@@@@þÀ@@@À@@@@@À@@@@À@ÿ@À@@À@€€€þ€@@ÿ@€À@0305303050305@€€€ÿ€€€€€@€€@€À@0305030530305À€ÿ€€€€€@€€€€À€@@03050305À€€€€€@€€@€À@030530305030530305@€€€þ€€€€€€€€@€€€€@€À€	5!0305Àþ€€€€@@€€À€	5!03050305€þ€€€€€€@@@€€@€€@ÀÀ€	5!030530305030530305Àþ€€€€þ€€€€€@@@€€€€@€€€€ÀÀÀ5##5##3533503050305À€@À@€@Àÿ€@€À@@@@@@@@€€€€€€€À5##5##35335À€@À@€@ÀÀ@@@@@@@@€À5#5##5#3353À@À@€@À@€@@@@@@@@@@3530335305#5##05#5##0@@@@À@@@@@À@€@À€@@€@À€@@€€3535##0#5##3530À@€@@À@€@@@@ÀÀ@@ÀÀÿ€€€À5##33#3535#5#5€À@@@€À@@@€@@À@À@@À@ÀÀÀÀ!5##05###3530#03053535'305#0À€@@€@€@@@@€€@@À@@€@@@@€€€@@€€@À@5##5##3533575!À€@À@€@À@þ@€@@@@@@@@€@@@À@5!%5##5##35335Àþ@À€@À@€@À@@@À@@@@@@@@ÀÀÀ"5#53535##5##3530#30305305#0ÀÀ€@€@À@€@À€@@@@@@@@@@@@@@€@€€€À€5!%5!%5##5##35335Àþ@Àþ@À€@À@€@À@@€@@À@@@@@@@@ÀÀ€#5#535#53535##5##3533!3#335ÀÀÀ€@@€@À@€@@ÿÀÀ€@@@@@@@@@@@@@@@@@@@€À$*5!5!5#53535##5##3530#3#30305305#0ÀÿÀ€@€@À@€@À€€@@€@@@@@@@@@@@@@€@@@€€€€À@5##5##3533575##5##35335À€@À@€@À@€@À@€@À@@@@@@@@@À@@@@@@@@€ÀÀ'-5##053535##5##3530##30305#5335305#0À€@€@€@À@€@€@€@@@À€@@@@@€@@@@@@@€@@€€@@@€ÀÀ€#%5!%5##5##3533575##5##35335Àþ@À€@À@€@À@€@À@€@ÀÀ@@À@@@@@@@@À@@@@@@@@ÀÀÀ/5##5##3533575##5##3533575##5##35335À€@À@€@À@€@À@€@À@€@À@€@À@@@@@@@@À@@@@@@@@À@@@@@@@@À€5!%5!%5#5##5#3353Àþ@Àþ@À@À@€@À@@@€@@€@@@@@@@@À@5#5!#3535##5#3!5À@þÀ@€À€€À€@@@@@@@@@@@@@@@À€5##3575#5##3535#À€€€€€€€€€€€€@@@@@À@@À@@@@@@@À€5!%5#'#3535#Àþ€€€€€€€€@@@À@@@@@@@@À
+5!%5!0305Àþ€€þ€€€@@@À@@€€@€À
+5!%5!03050305Àþ€€þ€€€€€@@@À@@ÿ€€€€@€À
+5!%5!03050305Àþ€€þ€€þ€€@@@À@@ÿ€€€€@€À
+5!%5!03050305Àþ€€þ€€€€@@@À@@ÿ€€€€€
+5!%5!03050305þÀ@þÀÀ€€€@@@À@@€€€€€€
+5!%5!03050305@þÀ@þÀ€€€€@@@À@@€€€€€@À5#535!3#753À€€þ@€€À@@@@@@@@@@@@À5!%5!%5##35#5#735#Àþ@Àþ@@@@@@@@@@@@@€@@À@@@@@@@@@ÀÀ5!%5!%5#'#3535#Àþ@Àþ@€@À@@ÀÀ@@@€@@€@@@@@@@À5!%5!%5#'#3535#5#'35#Àþ@Àþ@€@À@@@@À@@@@@@@€@@€@@@@@@@@@@@@À5!%5!5###35355#=#Àþ@Àþ@€@@@@@€@@@@@€@@@@@@@@@@@@@@@À@5!%5!%5#05#0#335335Àþ@Àþ@€€@€@@@@@@@€@@À@€€@@@@@@À@5!%5!0!05##5135#5#'35#Àþ@Àþ@@@@À@@À@@@@@@@€@@€€@@@@@@@@@À@#5!%5!5##5###33533553353Àþ@Àþ@À€€@@@@€@€þÀ@€@@@@€@@@@@@@@@@@@À€@@@@@À5!%5!30530305#50305#35#Àþ@Àþ@@@@@@€@€@@@@@€@@@À€€€@@€€@@À@5!%5#5##5##3=#Àþ@ÀÀ@À@@@@€@@@€@@@@@@@@@@@@ÀÀÀ5#5##3#353575#5##33575#ÀÀ@€€@@@À€@ÀÀ@@@@@@@@@@@@À@@@@@@€@@ÀÀ€%5!%5!%5!Àþ@Àþ@Àþ@À@@À@@À@@@À'+%5!5##3#3535%5#5##33575#5#!!3575#Àÿ@€€@@@À@ÀÀ@À€@ÿ@@@À@@@@@@@@À@@@@@@À@@@@@@€@@€À%5!%5!%5!%5!Àþ@Àþ@Àþ@Àþ@€@@À@@À@@À@@ÀÀ€%5!%5#5#53535###33Àþ@À€€€€À€€€€À@@€@@@@@@@@@@ÀÀ€%5!5#5#5#33##3535Àþ@À€€À€€€€À€À@@@@@@@@@@@@€ÀÀ%5!%5!%5#5#53535###33Àþ@Àþ@À€€€€À€€€€€@@€@@€@@@@@@@@@@€ÀÀ%5!%5!5#5#5#33##3535Àþ@Àþ@À€€À€€€€À€€@@€@@@@@@@@@@@@@ÀÀ&%5#535#535#5#53535###330!3#335ÀÀÀ€€€€€€À€€€€ÿÀÀ€@€@@@@@@@@@@@@@€@@@@@@ÀÀ'%5#535#5#!3#3355#5#5#33##3535ÀÀÀ€@ÿÀÀ€@€€À€€€€À€€@@@@@@@@@@€@@@@@@@@@@À€7%5#5#5#5353535#####5353535####33335#5#5333@@@@@@€@@@@@@@€@@@@@@€@@@@@À@@@@@@@@@@@@@@@@@@@@@@@@@@@@À€#'+75#5#5#5##5#333###35335353553=3=#5#5333@@@€@€@@@@@@€@€@@ÿ@@@@@@@€@@@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@€À!'+%5#5####033#35353530#5#50305#À€€€€@@@@€€€@@@@€€€€€@@@@@@@ÿ@@@@@@@@þ€ÿ€@@ÀÀ€!5#5#53535#5#0#5#33##33053À@€€@€@€€@€€@€@€@@@@@@€@@@@@@@€@ÀÀ5#535#05#0###33#0305'53À€€@@@€€€€@@@@@@À@€€@@@@@€€€@@ÀÀ5#5#5#3#303053535#53'305#0À€€À€€@@@€€@@@@À@@@@À@€€@@@@À€€À!%%5#5##33575#535#05#0###33'53ÀÀ@ÀÀ@À€€@@@€€€€@@À@@@@@@€@À@€€@@@@@€@@€À%%5!5353535#5#5#3#3#33553'305#0ÀþÀ@€€€€À€€@@@@@@@@@À@@@@@@@@À@@@@@@@À€€À€#%5##5##3533575#5#53535###33À€@À@€@À@€€€€À€€€€À@@@@@@@@€@@@@@@@@@@€À€#%5##5##353355#5#5#33##3535À€@À@€@À@€€À€€€€À€À@@@@@@@@@@@@@@@@@@À.2%5##05###30305#533575#535#05#0###33'53À€@@€@€@@@À@€€@@@€€€€@@À@@€@@@€€@@@€@À@€€@@@@@€@@@À%)/%5##5#5353535#5#5#3#30#0353533553'305#0À€@€@€€€€À€€@@@@@ÀÀ@@@@À@@@@@@@@@@À@€€@@@@@@À€€À'5#5#5#33##353575#5#53535###33À€€À€€€€À€€€€€€À€€€€@@@@@@@@@@À@@@@@@@@@@€À'%5#5#53535###335#5#5#33##3535À€€€€À€€€€À€€À€€€€À€€@@@@@@@@@@À@@@@@@@@@@@À@%)-5#5#535#535#5#0##33#3#330535#5353À€@À€€€@€€€@À€€€@€€@@@@@@@À@@€@@@@@À@@€@@@@@@@À@-%5#5#53535#53535#5#0#5#33##3##33053À€€€€À@€€@@À€€€€À@€€@@€@@@@@@@@À€@@@@@@@@@À€@ÀÀ305#5#535305####33€@@€€@@@€ÀÀ€@@€@@@€@@@@@@ÀÀ5#5#5#5#033##0353535ÀÀ€@@@€€@@@€À@@@@€@@@€@@@€À(%305#5#5!337305#5#535305####333€@@€ÿÀ€@@@€€@@@€ÀÀ€@À@€@@@@@€€@@@€@@@@@@€À(5!##035353575#5#5#5#033##0353535Àÿ€@@@€ÀÀ€@@@€€@@@€@@@@€@@@À@@@@€@@@€@@@€À)%5##5##3533=305#5#535305####33À€@À@€@À@@€€@@@€ÀÀ€À@@@@@@@@À@€@@@€@@@@@@€À)%5##5##353355#5#5#5#033##0353535À€@À@€@À@À€@@@€€@@@€À@@@@@@@@@@@@@€@@@€@@@ÀÀ!5#5#53535#5#0###333053'53À@@@@@@@€€€@@@€@@@À@@@€@@@@À€@À@@ÀÀ!5#5#5#0#5#33##33053535#53À€@@@€@@@@@@@€€@À@@À€@@@À@@@€@@@@À€
+5!0!5!#03ÀþÀ@þ€@@@@@ÿ@À€
+30#5!!0!!€@@þ€@þÀ€@@@ÿ@ÀÀÀ!5#05#0#03030535#5#!#03335ÀÀ@@€@€@@ÿ@@@@@€€€€@@@@ÿ@@@ÀÀÀ!!530#5#5#!30#0#3370530530€@@@@ÿÀ@€@@@@@@@@@@€€@@€€€ÿÀÀÀ%5!%5!0!5!#03Àþ@ÀþÀ@þ€@@À@@€@@@ÿ@ÀÀÀ%5!%30#5!!0!!Àþ@€@@þ€@þÀ€À@@À@@ÿ@€À)%5!5!5#05#0#03030535#5#!#033#335ÀÿÀ@@€@€@@ÿ@@@€@@À@@@€€€€@@@@ÿ@@@@@€À(%5!5!530#5#5#!30#0#3#03570530530ÀþÀ@@@@ÿÀ@€@@@€@@À@@@@@@@€€@@€@À€€ÿ€ÀÀ%5#535!0!5!#033!335À€€þÀ@þ€@@ÀÿÀ@À@@@@@ÿ@@@@@€ÀÀ%5#53530#5!!0!3#335ÀÀ€@@þ€@þÀÀÀ€@À@@@@@ÿ@@@@@€À€!%+5#75#5##5#03335#5#0533575#35#;0#0@€€@@@@@ÀÀ@@@@@€@@@@@@@€@@@Àþ€@@@@€@@€@@þÀ@€€À€%735#5#!35#!0#0!30#0305#5##033€ÀÀ@@@ÿ@€@@€@@@@@@À@@@@@€þ€€þÀ€@@€@€À€#5#5##33535#5#!35#!0#0!30#0@@@@@@€ÀÀ@@@ÿ@€@@€@@@@@@À@@@@@€þ€€À€	5!0!5!0ÀþÀ@þ@@@þ€À€	!!0!!0@þÀÀþ@@@@€@ÀÀÀ
+%5!%5!0!5!0Àþ@ÀþÀ@þ@À@@€@@þ€ÀÀÀ
+%5!%!!0!!0Àþ@@þÀÀþ@@À@@À@€@€À€	03330€À€€þÀþ@€À€	0!0##À€À€þþ@ÀÀÀ€!(/35#053#3535##05335#5###335#530'53530€À@€@@@@€@@@À@@@@@€€@@@@€@@@À@€@@@@@À@@@€À@@€ÀÀ€#35#5#!35#!5!35#!5#735#5#'35#€ÀÀ@@@ÿ@@@þÀ@@@@@@ÀÀÀ@@@@@@@À@@ÀÀ@@@@@@
+ÀÀ€#'+/335#5#!35#!5#;5#5#;5#35#15#;5+35#35+35#€ÀÀ@@@ÿ@€@@À@€@@À@@@€@@À@@@@ÀÀÀ@@@@@ÀÀ@@@@À€@@@@@@@@ÀÀ€#'+35#5#!35#!5#;5#35#35#;5+35#35+35#€ÀÀ@@@ÿ@€@@@@À@@@@@À@@@@ÀÀÀ@@@@@ÀÀ@@À€@@@@@@	ÀÀ€#'+5#5##33535#5#!35#!5#!35#!35#5#'35#@@@@@@€ÀÀ@@@ÿ@€@@þÀ@@@@ÀÀÀ€@@@@@@€@@@@@ÀÀÀ@@@@@@ÀÀ€#'+/5##3535#5#!35#!5#!35#5#735+35#5#'35#@@@@€ÀÀ@@@ÿ@€@@À@@@@€@@@@ÀÀÀ€@@@@€@@@@@ÀÀÀ€@@@@@@@@@@ÀÀ€)-335#05303535#5#0#0535###3305#5330753%0530€À@@@@@@@@À@@@@@@@€@ÿ@@@€€@À@€€@@@À@€@@€€@@@€€	ÀÀ€#'35#5#!35#!5#;5#35#!335#5#35+35#€ÀÀ@@@ÿ@€ÀÀ@@þÀ@ÀÀ@@@ÀÀÀ@@@@@ÀÀ@@À@@@@@@	ÀÀ€#5#35#5#!35#!5#!35#!35#5#'35#@ÀÀÀ@@@ÿ@€@@þÀ@@@@ÀÀÀ€@@€@@@@@ÀÀÀ@@@@@@ÀÀ€	!053030530%053030530Àþ€€@€þÀ€@€€þ@Àþ€€€€€À€€€€ÀÀ€	!05!0%05!0Àþ€@þÀ@€þ@Àþ€€€À€€ÀÀ€#!5#533#3533=#5#5#53#353ÀþÀ@@@@@@@@@@À@@@€þ@Àþ€@À@@@@@@@@@@@@@@ÀÀÀ€5#5##335!!@@@@@@ÿÀþ€@€@@@@@@þ@Àþ€@þÀ€À	5!0#30þ€€€€@ýÀ€À	03#0!€€€þ€€ÿ@ÿ@€5!33þÀ€À@@ýÀ@€%5###À€À€@@ýÀ@@€ÀÀ	5!0#30Àÿ€€€@ýÀ@€ÀÀ5!5!5!5#35Àÿÿ€€@@@@ÀýÀÀ€À5!5!5!5#35þ€€þ€€€@@@@ÀýÀÀ€À	
+5#0#303À€€þÀ€€@ýÀ@ýÀ@€À	
+5#0#30333À@@þÀ@@@€@ýÀ@ýÀ@ýÀ@€À5#535#5#353ÀÀÀ€€þÀ€@@@@ÀýÀÀ€ýÀ@€À5#05#0#0#3030#3530575#€@À€€€@@@€@€@€€ýÀ€@@€À@@€À5#535#05#0#5#3530305'53ÀÀ€@À€€@@€€@@@@€€ÀýÀÀ€€@@@€À!5#05#0#0#3535#053030575#%3@@@€€@@@@@@þ@€€@€€ýÀ@@€€€À@@€ýÀ@€À#5#535#5##5#3535#53355#%353@@@@@€€@@@@@@þ@€À@@@@@@@ÀýÀ@@@@@@@€ýÀ@þÀ@@ÀÀ5#5#53535#5#3##33#35À@€€@@€@€ÀÀ€@€@@@@@@@@@@@@@@@ÀÀ5#53535#5#535##33##3À@€ÀÀ€@€@@€€@@@@@@@@@@@@@@@@ÀÀ3####3375#5353@€€€€@@€@€€@@@À@@@@@@@@@@ÀÀÀ5#5#5#5#353535533#À@€€€€€€ÿ@€€À@@@@þ@@@@@À@@@ÀÀ%5!%3####3375#5353Àþ@@€€€€@@€@€€@À@@À@À@@@@@@@@@@ÀÀÀ%5!5#5#5#5#353535533#Àþ@À@€€€€€€ÿ@€€À@@@@@@@þ@@@@@À@@@@5#5#!#35!35!5#735#@@ÿ@@@þ€@@@@€@@@@@@@@@@@@@5##35)5!5##33%35#@@@þÀÿ@@@@@@€@@@@@@@@@€@@@5##35#5!%35#@@@@þÀ@@@€@@@@@@@@ÀÀ€
+5#!5#03050305€€À€€@@@€@@@@@€€@€€@€À5!33Àþ€€€À@@ýÀ@€À'%5!0305305305305#0#0#05#05#03030Àþ@À@@@@€@@@€@@€@@€€€€€€€€€€€€€À'5!03053053030305#05#05#05#0#0#0Àþ@€@@@€@@@@@@À@@þ@€€€€€€€€€€€€€À'5!0305305305305#0#0#05#05#03030Àþ@À@@@@€@@@€@@À@@þ@€€€€€€€€€€€€€€%5#05#0#5335#5#5#0€@À€@@€€€@€€À@@@Àþ€€0!0######5353535353€@@@@@@@@@@€@@@@@@@@@@@@þÀÀÀÀ#03053053030305#05#05#05#0#0#0€@@@€@@@@@@@€€€€€€€€€€€€ÀÀÀ#0305305305305#0#0#05#05#03030À@@@@€@@@€@@@€€€€€€€€€€€€ÀÀÀ0303533030#5#5##€@@@€@@À@@þ€€@@þ€€@@@@ÀÀÀ353530#0##5#0#03€À@@€@@@€@@@@€þ€@@€þ€@@€@5#5#5###333535#53€@@@@@@@@@€@€@@@@@@@@@@@@À@@À0305À€À€€@€@5#05#0#30353305€€@€@@@@€@€€@€@@€	ÀÀ€7;?C%5#!5#%5#!5#'5#!5#######3535353335#5#535355#=#=#@@þÀ@À@€@@@@@@@@@@@@@@@@@@À@@@À@@@@À@@@@À@@@@@@@@@@@@@@@@@@@@€@@@@@@@@ÀÀ€#+35#533#353333####5#5#5#3%5#5353@@@@@@@@@@@@@@@@@@@@@@@À@@@@@@@À@@@@@@þ@€@@@ÀÀÀ€/%5#5######5335#5#5#3535353335#5#53535À@@@@@@@@@@@@@@@@@@@@@@@À@@€@@@@@@À@@@@þ@@@@@@@@@@@ÀÀ€#'+/#3535#3#####3533=#5353'5#=#=#@@@@@@@@@@@@@@@@@@À@@@@@@@@À@@@@@@@@@@@@À€@@@@@@@@
+ÀÀ€#'%5#%#3535#5#'35#5#'35#15#=#=#À@þÀ@@@@@@À@@À@@@@@@@À@@@@@@@@@@@@@@@@@@@@@@@@ÀÀ€'%5#5#######3535353335#5#53535À@@@@@@@@@@@@@@@@@@@À@@€@@@@@@@@@@@@@@@@@@@À@5!%5#5##5#3353Àþ@À@À@€@À@@@@€@@@@@@@@ÀÀÀ%5#05#05#5##0#0#35305303À@@@@@@@€@@@À@€€ÀÀ€€@@€€@ÀÀÀ5##0#05#5#3030335305305À€@@@€@@@@@@€@@€€@@€€ÀÀ€€ÀÀÀ#%5!5#035!5!##033%5#0535##03Àÿ@@þÀ@@@@@€€À@@À@@@@@@ÿ@@€@€@@€@ÀÀÀ#3530#5#5!!30#!!'305#5#30#3@@@@@þÀ@@ÿ@€@@À€€À@@@@@ÿ@@À€@@€@ÀÀÀ	
+#030333703035+35#5#'35#@@@@@@@ÿ@@€@@@@ÀÀÀ@þ€€@þÀ@þÀ@@þ€€@@@@@@@@ÀÀÀ#35#5#!35#!0#0!30#035##;#€ÀÀ@@@ÿ@€@@À@@@€@@@@@@@€þ€€þÀ@@@þÀ@€À!0307333030#5#5#05#0##35@€@@@@@@@@@@@þ€€@þ@À@þ€€@@€€@@@@€À5#0535#5##30#335À€€€€€€€€€@@€@ÀÀ@€@ÀÀÀÀ€'%5#5#5#5353535####333%5#5##335@@@@@@@€@@@@@@@@@@@À@@@@@@@@@@@@@@À@@@@@@ÀÀ€'5#5##335!5#5#5#5#333###353535À@@@@@@@@@€@@@@@@€@@€@@@@@@@@@@@@@@@@@@@@À€/37;?CGKOS%5#5######335#53335#5#53335#5#535355#=#;5+35#35+35#35+35#35#@@@@@@@@@@@@@@@@@@@@@@@þÀ@@€@@@@@€@@@@@€@@@@@€@@À@@€@@@@@@@@@@@@@@@@@@@@@@ÿ@@@@@@@@@@@@@@@À€#'+/37;?CGKOS5####353535#35335#5#35+35#35+35#35+5#;5#35#!5#;5#35#!5#;5#35#@@@@@@@þ€@@@@@@€@@@@@€@@@@@€@@€@€@@€@@ÿ@€@@€@@ÿ@€@@€@@€@@@@@@@@€@@@@@@@@@@@@@@@@@@@@@@@@@@@@À@+%5#5#5#33##35355!%5#5#53535###33À€€À€€€€À€€þ@À€€€€À€€€€€@@@@@@@@@@@@€@@@@@@@@@@À@+!5#5#53535###335!5#5#5#33##3535À€€€€À€€€€Àþ@À€€À€€€€À€@@@@@@@@@@€@@@@@@@@@@@@ÀÀ€%5#5#53535###335!À€€€€À€€€€Àþ@À@@@@@@@@@@€@@ÀÀ€5#5#5#33##35355!À€€À€€€€À€€þ@@@@@@@@@@@@@@€À(%305#5#535305####3335305####!€@@€€@@@€ÀÀ€@€@@@€ÀÀ@€@@@€@@@@@@€@€@@@@€À(5#5#5#5#033##035353575#5#5#5#033ÀÀ€@@@€€@@@€ÀÀ€@@@€@@@@@€@@@€@@@À@@@@€@@€À30305305#5#0533305#5#535305##5#0##30#33€@À@@€@@@@€€@@@@@ÀÀÀÀ€€€@@€@€@@€@@@€@@€@@€@@@€À&-35#0535#5#5#5#033##03#035330535#53530305#0ÀÀÀÀ€@@@€€@@@@@@@À@@@@@@@€@@@@€@@@€@€@@€@@@€@€€À%%5!5!5#05#0#03030535#5#!03#335ÀÿÀ@@€@€@@þÀ€€@@À@@@€€€€@@@þ€@@@@€À$%5!5!0#5#!30#0#3#03570530530ÀþÀ@€@ÿÀ@€@@@€@@À@@€@@@€€@@€@À€€ÿ€ÀÀ%5#535!0!5!0!!335À€€þÀ@þ@ÿÀ@À@@@@þ€@@@@€ÀÀ%5#530!!0!3#335ÀÀÀþ@@þÀÀÀ€@À@@€@ÿ@@@@@@À€)%5##05###3530353575#5#53535###33À€@@€@€@@€@€€€€À€€€€À@@€@@@@€@@€@@@@@@@@@@@À€)%5##05###353035355#5#5#33##3535À€@@€@€@@€@€€À€€€€À€À@@€@@@@€@@@@@@@@@@@@@À/%5##05###3530353=305#5#535305####33À€@@€@€@@€@@€€@@@€ÀÀ€À@@€@@@@€@@À@€@@@€@@@@@@@À/%5##05###353035355#5#5#5#033##0353535À€@@€@€@@€@À€@@@€€@@@€À@@€@@@@€@@@@@@@€@@@€@@@ÀÀ 030533#5#0###33753'53€@€€€@@€@@€@@À@@€€@À@€@@@@@@ÀÀ@@@ÀÀ 5#5#5#5#3305353553753'305#0À@€€€€@@€ÿ@@@@@@À@@@@þ@@€@@@ÀÀ@@@À€€À@
+ $(%5!05#0#33573#5#0###33753'53Àÿ@€@@À€€@@€@@€@@À@À@€€@@@À@À@€@@@@@@ÀÀ@@@€À@"(%5!05353535#5#5#5#3#33553753'305#0Àÿ@€@@€€€€€@@@@@@@@À@€@@@@@@þ@@@@@ÀÀ@@@À€À€@030503050305À€€€€€€€€€€€€03053030530305€@€@€€€€€€€€030503050305€@€@€€€€€€€€030503050305€€þÀ€þÀ€€€€€€€€€35##5!##03#353!53530#505#53530##35353#@@ÿ@@@@@@@@@ÿ@@€@@@@@@@@@@@@ÿ@@@@@@@þ€€À@€@@@@À@ÀÀ€0!0#5#5#5###53533À@@@@@@@@@@Àÿ@@@@@@ÀÀ@@ÀÀÿ€À5!03Àÿ€À@ü€@@ÿ€@30!À€ÿÀüÀ€@À€À€%5##0À€€€@Àý@€@€7#!0#À€€À@ÀÀ5!30Àþ@€À@þÀÀÀ17;?C5##355##5##5##30##335#533533535#05350530%5#735#35#@@@@@@@€@@@@@@@@@@€@@@@ÿ€ÿ@@@@@@@@@@@@@@@@@@@€@@@@@@@@@@€@À€€À@@@@@@€ÀÀ	
+!%)70305#5##5#!35#!535#5#!35##3'35+35#5335#05#03€À@@@@@@ÿÀÀ@€@@@@€@@À@@À@@@À@€€@@@@@@@@ÀÀ@@@@@@@@@€€@€À@!%70!05#05#0#05#0735#5#'35#15#;5+0530305305!030À@@À@@@@À@@@@@€@@€À@@þ@@€€€€€€€@@@@@@@@@€€€€€€Àÿ€
+330305#5#À€@€@ÀÀüÀ@€€@@€@€7353##5#@À@€@€À@@Àý@ÀÀ@€€)%0305#05#05#05305305305#0#0#0#03030€@@@@@@€@@@@@€€€€€€€€€€€€€€€@€€)70305305305305#05#05#05#0303030#0#0@€@@@@@@€@@@@@€€€€€€€€€€€€€€€€ÿ€@5###0##0303530535€@@@@€@@@@@@€ÀþÀ€@€ÿ€€030€€€ü€€!5#5#05#5##33033@@@@€@@@@@@€ÀÀþ@À€@@ÿ€€@030#5#05#5#5#3303€@@@@€@@@€þÀ€@@@@€Àÿ€€€030€€ü€€735305353###0##3€@@@@€@@@@€@@€ÀÀþ@À€@@€ÿ€@5!30þ€€@ü@€€ÿ€€030€€€ü€€!5!#0ÿ€@@ü€ÿ€€@03!€þ€ü€À@ÿ€€€030€€ü€€%!!0#ÿ€€@@€Àÿ€@5###335À@@€@@@@üÀ@@ÿ€@€030#5#5353###3À€@@@@€@€€€þ@@@@þÀ@@@À€
+!5#5#0#033€@€@@@@ý@@Àÿ€@€030À€€üÿ€@@3#5#5#3À€@@À€ÀüÀ@@@@@Àÿ€€5#5##33##03035€@€@@@@€@À@@@þÀ@@@þ@@€
+73530#0##3À@@€@€À@@ý@@Àÿ€@€030À€€ü€À5!þ€@@ÿ€€5###0##35353035À@@@€À@@@@@@@ý@@@@@ÿ€€5#5#0#5#5#33033€@@@À€@@@€@@@@@@ý@@ÿ€735#0#0#05!305!3030À€@@@@@þ@@@ÀÀ€@€Àÿÿ€5!05#!05303035##0#0@þÀ@@@€@@ÀÀ€@€ÀÀÿÿ€	305!035€€þ€À@€€@€	0!05#!5€ÿ€€@@@	305!0350!05#!5€€þ€€€ÿ@@€€@€€@@@€7030#0#05#03030À€€@€@@€€€þ€€€€ÿ€€€030€€ü€ÿ€€030€€€ü€À5!þ€@@@5!þ@@@5!þ@@€À%5!þ€@@€!735!535#5###333735#;#0330ÀÀÿÀ€@@@@@@À@@@@À@@À@@@@@@@@@€@Àþ€@€5##0#05#3053033030À€@€€@@@€€@@€€þÀ€€@ÿ€
+5#535!305'5#0#À@€ÿ€€€€@@@þÀ€À@þÀ€	5!3030%3535#0#05#333ÿ@€ÿ@@€@€@@@€@@ÿ€@À€€À@@€
+5#535!3055#535!305À@€ÿ€À@€ÿ€@@@þÀ€@@@@þÀ€€ 5#5#5#535##3330530305#5#53@À€€À@@€€@€@€@@@@@À@@À@þÀ€€€@@@€À	0!05#!5À@þÀ€€@@€%5#0##0#5#5#305303€@€@@@€@@€@@€@@þÀ€€þÀ€À0305'0305#5#053035#5!#3€€€€@@À€@þÀ@@€€À€€@€€À@@À@€À5!þ€@@@À0!05À€€Àÿ€@€030À€€üÀÿ€€€030ÀÀ€ü@€À5#!5#!5#À€@€@€@@@@@@@@À03053030530305@€@€@@À€€€€€€ÀÿÀ@€	70303030À€€€€€Àÿ€þÀ@@ÿÀÿÀ€€	70303030ÀÀÀÀÀÀÀÿ€þÀ@@ÿ€ÀÀ5#35#35#35#@@À@À@À@€@@@@@@@@@ÀÀ0305303053030530305@@@@@@@À€€€€€€€€ÀÿÀ@€735353535À€€€€€€€€ÀÀÀÀÀÀÀÀÀÿÀ€€735353535ÀÀÀÀÀÀÀÀ€ÀÀÀÀÀÀÀÀÀÿ€À5!30þÀ€€@ýÀÀÿ€À3305À€ÀÀýÀÀ€Àÿ€À5!30þÀÀ€@ýÀÀÿ€À3305ÀÀ€ÀýÀÀ€ÿ€@À03!À€þÀ€þ@@ÿ€@À3!0À€þÀ@þ@@€ÿ€€À03!ÀÀþ€€þ@@ÿ€€À3!0ÀÀþ€@þ@@€À€€5##0À€€@ÀþÀ@€!05#À@À€ýÀ€ÀÀ€€5##0€À€@ÀþÀ@€!05#À@€€ýÀ€À€@€#!0#ÀÀ@€À@@@€0!#@€À€@þ@€€€#!0#ÀÀ€ÀÀ@@€€0!#€ÀÀ€@þ@Àÿ€€	5##030À€€€@ÀüÀÿ€€	03305#À€ÀÀ€üÀ€ÀÀÿ€€	5##030€À€€@ÀüÀÿ€€	5##030À€À€@ÀüÀÿ€€	5##030€ÀÀ€@ÀüÀÿ€€	03305#À€À€€üÀ€ÀÀÿ€€	03305#ÀÀ€À€üÀ€ÀÀÿ€€	03305#ÀÀ€€€üÀ€Àÿ€@€	030##À€€À€þþ@@ÿ€@€	30##0À€€À@þ@þ@€ÿ€€€03030##À€@ÀÀ€þþ@@ÿ€€€
+03###ÀÀ@€À€þ@Àþ@@ÿ€€€	030##ÀÀÀÀ€þþ@@ÿ€€€
+33##0À€@ÀÀ@þ@À@þ@€ÿ€€€
+3###0ÀÀ@€À@þ@@Àþ@€ÿ€€€	30##0ÀÀÀÀ@þ@þ@€ÿ€À	5!3030þÀ€€@@þÿ€À	5!0330þÀ€€@€þ@ÿ€À	03305!À€Àþ€þÀ€@ÿ€À	3305!0À€Àþ@þ@À€€ÿ€À	5!3030þÀÀ€@@þÿ€À	5!0330þÀÀ€@€þ@ÿ€À	03305!ÀÀ€þ€þÀ€@ÿ€À	3305!0ÀÀ€þ@þ@À€€€€5###À€À€@Àþ@@@€
+5###0!5À€À@€@Àþ@€@@€
+!05###À@À€À€@€Àþ@@@€	0!05##À€À€€Àþ@€€5###€ÀÀ€@Àþ@@@€
+5###0!5€ÀÀ€€@Àþ@€@@€
+!05###À@€ÀÀ€@€Àþ@@@€	0!05##€ÀÀ€€Àþ@ÿ€€
+5###3030À€ÀÀ€€@Àþ@@þÿ€€
+5###0330À€ÀÀ€€@Àþ@€þ@ÿ€€
+03305###À€ÀÀ€À€þÀ€Àþ@@ÿ€€
+3305###0À€ÀÀ€À@þ@À€Àþ@€ÿ€€
+5###3030€ÀÀÀ€€@Àþ@@þÿ€€
+5###3030À€ÀÀÀ€@Àþ@@þÿ€€
+5###3030€ÀÀÀÀ€@Àþ@@þÿ€€5###03335€ÀÀÀ€@€@Àþ@€þ@À@ÿ€€
+03305###À€À€ÀÀ€þÀ€Àþ@@ÿ€€
+5###0330À€ÀÀÀ€@Àþ@€þ@ÿ€€
+03305###ÀÀ€À€À€þÀ€Àþ@@ÿ€€
+3305###0À€À€ÀÀ@þ@À€Àþ@€ÿ€€
+3305###0ÀÀ€À€À@þ@À€Àþ@€ÿ€€
+5###0330€ÀÀÀÀ€@Àþ@€þ@ÿ€€
+03305###ÀÀ€€ÀÀ€þÀ€Àþ@@ÿ€€
+3305###0ÀÀ€€ÀÀ@þ@À€Àþ@€€ÀÀ5#!5#ÀÀÀÀ€@@@@@ÀÀ030530305À@ÀÀ€€€€ÀÿÀ@€33À€€€€þ@Àþ@ÀÀÿÀ€€33ÀÀÀÀ€þ@Àþ@À@5!%5!þþ@@@€@@€ÿ€À€0303030€€@€€üüÀÿ€
+5#535!03ÀÀþÀ€@@@@ý€À€ÿ€À5!303030þ€€@€€@ýÀþ€ÿ€
+5#0375!03À€@þ€€@@þÀ€@ý€@ÿ€@
+30!3#À€þÀÀÀ@þ@€@@@ÿ€ÀÀ030303!€€@€þ@€þþ@@ÿ€À
+30!%30!€€ÿ@€þ@@þ@@€ýÀ€@À@€
+5#535#0#ÀÀÀ€@@@@€ýÀ€€€
+5####0@€@€€@Àþ@Àþ€@€
+5!0#%5#0#ÿ€€@€@@ýÀ€@€þ@@@€
+#!#0#3ÀÀ@€ÀÀ€@@þ€@€À€
+#!0###€€À€@€À@þ@À@À€
+!!#0#!#0@þÀÀ€À€€€@@þ€@ÀÀÿ€€
+5#535#0#03ÀÀÀ€€@@@@€üÀ€ÿ€€	5##030030@€€þÀ€€@Àüü€ÿ€€
+5#0375#0#030À€@@€À€@@þÀ€@€þ@Àüÿ€@€
+30#0#3#À€€ÀÀÀ@þ@þ€@@@ÿ€À€	030##030€€€€@€€þþ@@üÿ€À€30!030#!#0€€ÿ@€þÀ€€@þ@@@üþ€@Àÿ€5!3375!þÀ€Àþ@@@þ@À€@@ÿ€À5!30303030þ€€@€€@@þþÿ€
+5#0375!30!À€@þ€€ÿ@@þÀ€@@€þ@@@€
+5!%5#0#0#þÀ€À@@@€@€þ€@€€5#####@€@€€€@Àþ@Àþ@@@€
+5!%5#0#'#!#0þ@€À€€@@@€@€þ@@@Àÿ€€5#535#0#0#3#33ÀÀÀ€ÀÀÀÀ€@@@@€þ€@@@þ@Àÿ€€5#####30303030@€@€€€€@€€@Àþ@Àþ@@þþÿ€€
+5#0375#0#30!7#!#0À€@@€À€ÿ€€€@@þÀ€@€þ@€þ@@À@ÀÀÿ€À5##0#0303535€€@€@@€@@€þ€€@@ÿ€@À030#05#5#33À€@€€@@þ€€€@@@@€@€3053####3€€@€@@@€À€@þÀ@@@À€€5#5#5##303@@@€@€€@@@@þÀ€@ÿ€€#)/103051305#0;05#0;05#0;05#0;05#0;05#0;05#0@@@@@@@@@@@@@@@@@@@@@€€€€€€€€€ÿ€€#)/!0305#05#0505#0505#0505#0505#0505#0505#0À@@@@@@@@@€€€€€€€€€€€€€€€€€€€€€€
+ÿ€€#)/5;AGM10305!0305!305#005#0%305#005#0'30#0105#0;05#0#05#0!305#0!05#0!305#0@€@þ@@@€@ÿ@@@€€€@À@@À@@@@þÀ@À@@€€€€€€€€€€€€€€€€€€€€€€€€@À5!@þÀ€@@À€@€030À€€þÀ€À5!þÀ€@@Àÿ€@À3À€ÀýÀ@@€À0!05€À€€À@€€3ÀÀ€ýÀ@À@À0!05À@À€€Àÿ€€À3ÀÀÀýÀ@@À!05!À@þ€@€@Àÿ€€€03#ÀÀ@€ü@À@À5!0!5þ€€@€@Àÿ€€€033À€@€üÀ@À€!€þ@Àÿ€10!05€€ÿ€€50!0€ÿÿ€0!0þ€€ÿ€€0!0€þÿ€0!0ý€€ÿ€€0!0€ýÿ€0!0ü€€ÿ€€0!0€üÿ€À€0!0À€üÿ€€€0!0€€üÿ€@€0!0@€üÿ€€0!0€üÿ€À€030À€üÿ€€€030€€üÿ€@€030@€üÿ€€0!0€ü @ÿ€€#'+/37;?CGKOSW[_cgkosw{5#!5#'5#!5#%5#!5#'5#!5#%5#!5#'5#!5#%5#!5#'5#!5#%5#!5#'5#!5#%5#!5#'5#!5#%5#!5#'5#!5#%5#!5#'5#!5#€@@@@@@@þÀ@@@@@@@þÀ@@@@@@@þÀ@@@@@@@þÀ@@@@@@@þÀ@@@@@@@þÀ@@@@@@@þÀ@@@@@@@€@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ÿ€€/Oo�¯ÏÓ×Ûßãçëïó÷ûÿ5##3575####35353575######353535353575########3535353535353575########3535353535353575########3535353535353575########3535353535353575########353535353535355#735#15#;5+35#35+5#;5#35+35#35#35#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@þ€@@@@@€@@@@@€@@€@€@@€@@À@@€@@€@@@@@@@€@@@@@@@@€@@@@@@@@@@@@€@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@@@@€@@@@@@@@@@@@@@@@þÀ@@@@@@@@@@@@@@@@@@@@ÿ€€.26:>BFJNRVZ^bfjnrvz~‚35330##5##5#3#3#3#3#3#3#3#353353'53'53353'53'53353'53'53353'53'53353'53'53353'53'53353'53@À@À@@À@€@@@@@@@@@@@@@@€@À@À@À@À@À@À@À@À@À@À@À@À@À@À@À@À@À@À@À@À@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@€0!05€€€Àÿ€€030À@€ü€ÀÀ!ÀÀýÀ@€ÀÀ!!Àþ€@ÀýÀ@þÀþ@€ÀÀ7!5!#!3#)5!@@þÀ@€@@þÀ@þÀÀ@@Àþ@À@€ÀÀ!!3Àþ€@ÿÀÀýÀ@þÀþ@€þÀ@€ÀÀ!5!%5!%5!%5!Àþ€@þÀ@þÀ@þÀ@ÀýÀ@þ@@€@@€@@€@@€ÀÀ!33333Àþ€@@@@@ÀýÀ@þÀþ@Àþ@Àþ@
+€ÀÀ#'+/3!53353353%53353353%53353353%53353353Àþ€@@@@@þÀ@@@@@þÀ@@@@@þÀ@@@@@ÀýÀ@þ@@@@@@€@@@@@@€@@@@@@€@@@@@@€ÀÀ'+!5335#5#533333'5#5#5#5#533353Àþ€@@@@@@@@@@@@@@À@@@@ÀýÀ@þ@@@@À@@@@@€@@@@@@@À@@€ÀÀ'+!535#535#53353####3535353##353Àþ€@@@@@@À@@@@@@@@@@@@ÀýÀ@þ@@À@@@@@@@@@@@@À@@@@€ÀÀ7;!5335#5#533#3533#353'5#5#5#5#533533#35353Àþ€@@@@@@@@@@@@@@@@@@@@@@@@@@@ÀýÀ@þ@@@@À@@@@@@@@@€@@@@@@@@@@@À@@@€€À!@@ÀþÀ@@€€À!53@@ÿÀÀþÀ@ÿÀÀ€ÀÀ!ÀÀþÀ@€ÀÀ!5!Àþ€@ÀþÀ@ÿÀÀÀ0!0ÀýÀ0!00!0Àþ€@ýý@€ý€€À!535!€@þ€@ÀÀÀÀ€À	!5#0!051305!035!€@ÿ@@þ€@ÀÀ€€€€À€À@0!05#05#05#5##0#0À@@@@@@€€€€@@€€€À@	!%0!05#!51305#005#0'305#005#0'35#À@þÀ@@@@À@@À@@@@€€@@€€€€€€€€€€@@€€€
+%5#05#5##0#€@@@@@€@€@@€@@€€€%5#05#0#05#0#735#€@@@@@€@@€@€€€€@À@€€@5#5#5#5#5#5#3535353535€@@@@@@@@@@@À@@@@@@ý@@@@@@€€@'5#####33335#5#5#5#5#3535353535€@@@@@@@@@@@@@@@@@@@À@@@@@À@@@@@@@@ý@@@@@@@€@À5#5#5#3535@@€@@€@@@þÀ@@@€@À5##535#5#3535@@€€€@@€@@@@@þÀ@@ÀÀ€5#5#5#5#353535À€€€@@€€€@@@@þ@@@@ÀÀ€5###5335#5#5#353535À€€€€€€€@@€€€@@@À@@@@þ@@@@@À305305305!0303033@@@þ@@@@@€€€€€€€@@À	%35#05#0;05#0#05#0!305#0!5!305!0À@@@€@@€@@@ÿ@@þ@€@@€€€€€€@@€€@€€€
+5!30335305€þÀ@@@@@@@€@@€@€€€5!30335#0530305€þÀ@@@@@@@@@€@@€€€@€À@%3######3333€@@@@@@@@@@@À@À@@@@@@@@@@@€À@'%3######3333=#5#5#53535353€@@@@@@@@@@@@@@@@@@À@À@@@@@@@@@@@@@@@@@@þ@@€@À%3###3@@€@@À@@@@@@@€@À%3###3=3@@€@@€À@@@@@@@@@ÀÀ€3####33€@@€€€€€@À@@@@@@ÀÀ€3####33=#5353€@@€€€€€€€€@À@@@@@@@@@@À€À!%35305305#05#5#5###0#030333@@@@@@@@@@@@@@À@€€€@@@@€€€@@€À#)/37;735#5#;5+05#0!305#0!05#0!305#0!305#005#0'35#5#'35#À@@@€@@€@@@ÿ@€@@þÀ@@@@À@@À@@@@À@@@@@€€€€€€€€€€€@@@@@@
+€À+17=AEI735#5#;5+05#0!305#0!05#0!305#5##0337305#0!305#0305#0#35#5#'35#À@@@€@@€@@@ÿ@@@@@@@€@@þÀ@@@@À@@À@@@@À@@@@@€€€€€€@@€@@€€€€@@@@@@	€%)-17!5!5#!35#!0#0!30#030#5##03335#5#%!5!€ÿ@@@@þÀ@À@@€@@€@@€ÿ@@€@ÿÿÀ@@@@@€þ€€þÀ@@ÿ@€@@@@@@€À	#'+17;735#05#0;05#0#5#!35#!05#0!305#0!35#5#'305#005#0'35#À@@@€@@€@@@ÿ@€@@þÀ@@@@À@@À@@@@À@@€€€@@@€€€@@@@@€€€€€@€#7!5!5#!35#!0#0!30#0!35#5#%!5!€ÿ@@@@þÀ@À@@þ€@@€@ÿÿÀ@@@@@€þ€€@@@@@@€#'+/75#35#75#%5#%5#%5#%5#%5#%5#%5#75#35#À@À@À@þÀ@@þ€@@þ€@@þÀ@À@À@€@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@€!'7!535#03030#5#5!##033030%030€@@@@@@ÿ@@@€€ÿ@À@@@€þ€€@@@@þ€@þ@€þ€€!'+/377!5!5#!35#!0#0!30#035#0#0;0#0#35+35#5#%!5!€ÿ@@@@þÀ@À@@ÿ€€@À@@€€€€@@€@ÿÿÀ@@@@@€þ€€þÀ@@ÿ@@@@@@@€%3530#5#5!##033!€@@@@ÿ@@@@À@€@@@@þ€@@€7!5#0330#3530#5#5!##03€€€@@@@@@ÿ@@@À@@@þ€@@€@@@@þ€@€7!53530#5#5!##0335#03530€@@@@ÿ@@@@@@€À@@@€@@@@þ€@@€@þ€%3530#!5#033!35#5#%!5!€@@@þ€@@@þÀ@@€@ÿÿÀ@€ÀÀþ€@@@@@@@@€7!5!5#!35#!5!30#5#5!##0€ÿ@@@@þÀ€@@@ÿ@@À@@@@@ÀÀ€@@@@þ€€#7!5!5#!35#!0#0!30#5#5!#35303€ÿ@@@@þÀ@À@@@ÿ@@€ÀÀ@@@@@€þ€€@@@@@ÿ€%3530#5#5!##033!53530€@@@@ÿ@@@@þÀ@€À@€@@@@þ€@@@À@ÿ€
+730###03€€€@@@À@€@@þ€@€
+%3530#5#5#03€@@@@€€À@€@@ý€ÿ€€0!05#0535330#þÀ@@€@@€üý€@€@@€@ÿ€€
+)0!0##!5#5!530#5!#03535!330!0@@ÿ@@@@ÿ@@@@@@þþ€€@@@@@@€@@þ€€@@@@ÿÀ€!5#5!#535!330!0@€@ÿ@@@@þ€ÀÀ@@@@@@ÿÿ€À
+0!0##!5#5!535!3@@ÿ@@@þ€@þ€€@@@@@@ÀÀÀ5###3535€@@@@À@@@ÀÀ@À35#5#=#À@@@€€ÀÀ@@@@@€À%#3535#;5#€€€@@@@@À@@@À€À%5#=#=#€@@€@@@@@@ÀÀÀ35!35!35#5#%!5!@€@þ@@@€@ÿÿ€ÀÀÀÀ@@@@@@€À7!5!5#!35#!5#!35#€ÿ@@@@þÀ@À@@À@@@@@ÀÀÀÿ€€10!0#0#0#0#0#0#0#0@@@@@@@€€€€€€€€ÿ€€0!05#05#05#05#05#05#05#05@@@@@@@€ü€€€€€€€€ÿ€€0305305305305305305305305@@@@@@@@€ü€€€€€€€€ÿ€€!030!0303030303030À@þ@@@@@@€€€€€€€€@ÀÀ@
+!530#5!#035#0535330#€@@ÿ@€@@€@@@@@@ÿ@€@@€@€0!0030ÿÀý€€ýÀþ€0!0030þ@Àý€€ýÀþ€0!05353530535353þ@@@@@@@ý€€ýÀ@@@€@@þ@€0!0!###0##þ@€@@@@@ý€€þÀ@@@€@@€0!00303030þ@€€€ý€€ýÀþþ€ÀÀ
+%+5#'!5#0!051305#005#0'305#005#0'305#0@ÀÀ@þÀ@@@@À@@À@@@@@@@ÀÀ€€€€€€€€€€€€€€ÀÀ!5#0#030305#05#05#0#0#0À@€@@@@@@@@ÀÀ€€€€€€€€€ÀÀ!5#05#05#05#0#0#00530530À@@@@@@@@@ÀÀ€€€€€€€€€ÿ@7!5!5#!35#!#!3#!35#5#%!5!€ÿ@@@@þÀ@À@@þ€@@€@ÿÿ€@@@@@Àþ@À@@@@@@€ÀÀ
+!530353Àþ€À€þÀ€ÀýÀ@þÀþ@ÀÀ€ÀÀ!5330#5!Àþ€€@À@ÀýÀ@þÀÀÀþ@€ÀÀ
+!!#0353Àþ€@À@€ÀýÀ@þÀÀÿÀÀ€ÀÀ
+!30353Àþ€€À€€ÀýÀ@þÀÿÀÀÀ€#*7!5!5#!35#!05!33030#5#5!##0753530€ÿ@@@@þÀ@@@@@ÿ@@@@€À@@@@@€@@þ€€@@@@þ€ÀÀ@ÿ€
+"&*7!5#!05#0335#530;5#;0#0!35#5#%!5!€@ÿ@@@@À€@@@@@þ€@@€@ÿÿÀ@@@€þ€@@Àÿ@€@@@@@@€"&*7!5#03#3530#0!#5#50#035#5#%!5!€€À@@@@ÿ@@@@@@€@ÿÿÀ@@À@@€€þÀ@@@€þ€€@@@@@@€*7!5!5#!35#!0#0!30##0335#5!#353!0€ÿ@@@@þÀ@À@@À€@@ÿ@@@À@@@@@€þ€€À@@@@@@þÀ€ÀÀ#5#75#5#5###3#353353575##5#€@€€@@@€€@@@@@@@À@@@€@@ÀÀ@@@@@ÀÀ@€@@@@€€5#5#5#5###0@@€€@@€@@@@@@€€ÀÀ%5##355#5#5###33€@@@€@@À@@À@À@@@@@@@@@@@þÀ@ÀÀÀ#5#5#05#0##33#0353533305#535À€@@@€@@@@@@@@@@À@@€€@@@@€@@@@€@@ÀÀÀ!%+5#5#030#33035#05305##303735#5305#0À€@@@@@ÿ@@@@€@@@@@@@À@@€€@@À@€€@@ÿ€@À€À€"#!5##5#5#53535305#####333À@@@@@@@@@@@@@@@@@À@@@@@@€@@@@@@@À%30333#!5##5#5#5353530553##€@@@@@@@@@@@þÀÀ@@ýÀ@@@@À@@@@@@€ÿÀ@@@	ÀÀ€#5#35#5#!35#!5#!35#!35#5#'35#@@ÀÀ@@@ÿ@€@@þÀ@@@@ÀÀÀ€@@€@@@@@ÀÀÀ@@@@@@€€	#'+/3735#05#0;05#035#05#0;05#0!35#35#!35#5#'35#@@@@€@@@@@€@@þ€@@@@@ÿ@@@€€€À@@€€€€@@€€€ÀÀÀ@@@@@@€€%+/3735#5#;5+5#!35#!05#0;05#005#0;05#0!35#35#À€€@À@@À@@@@þÀ@€@@@€@@þ€@@@@@À@@@@@ÀÀÀ€€€€€€€@@@€À@5####3!535#53553À€@À@@@@@ÿ€@@@@À@@À@@þÀÀÀ€À!'-735305#053535305#5##030###0305300530@À@@@@@@À@@@@@€@@@À@@€€@@€@@€€@@€€€€€€€À€0!00!0Àþ€@€þþ@€þ€€À€0!00!###33530530Àþ€@@@€@@@@€þþ@€@@@@@@€ÿ€À€
+!0!053533%053030530'5#5!#Àþ€€@€þÀ@À@À€@€€þþ@@@@@€€€€€€@@@@€ÀÀ373535333305#05#5305305####5#5#5#0303#0#03@@@@@@@@@@@@@@@@@@@@@@@À@@@@@€€@€€@@@@@@€€@€€
+ÿÀÀ@ '+7;?C!5#03575#5#0##3305355#35#05##35#5335##5#=#!35#)5!À€@@@@À€@@À€@À@€@@€ÀÀÀ@@À@@€@@þÀ@þÀ@€@€@@€@@@€@@@@@þ€@@@@@@À@@ÀÀÀÀÀ@ÀÀÀ '+35#5#53030#5###5#5##0333%053#35#@@@@€@@@@@@@@@@Àÿ€@ÀÀ@@@€@@@@@@ÿ@@€€@@@@€5#535#0535#5##30#30#3035À€ÀÀ€€€€€ÀÀ€€€@@@@€@@@@€@€@€À€5#0535#5##30#33À€€€€€ÀÀ€À@€@@@@€@þÀ@€ÀÀ%5#5335##535#3#5#353#@@€@@€@À@€@@€@€@À@À@À@@À@À@À@€!3%5##5#5#03535335#5!##033!55#5##30353305À@€@@@@€@@ÿ@@@@€€@€@@@@À@@@@@@@@@@@þ€@@@@@@@€@@€ÀÀ17;?CG5####0#335#5##53030335#0#533030#5#50#035#;5#15#;5#€@@@@@@À@@@@@@@@@@@@@@ÿ@@@@@@@@€@@À@@@@ÿ@@@@@@ÿ@@@@ÿ@@þ€ÿ@@@@@€%+57!5#05303530#0#5#0335#5!##0330530'03530#€@@@@@@@@@@ÿ@@@@@€@@@À@@€€@€ÿ@@@@@@þ€@€€À@ÿ@€ $(,5#3530#0#5#5##5#033!%5335#5#%!5!€@@@@@€@€@@@@ÿ@€@@€@ÿÿ@@þÀ@€ÿ@@@Àþ€@@€@@€@@@@@@€À0!050!050!05Àþ@Àþ@À€€€€€€€À0!050!05030530305Àþ@Àþ@À@À€€€€€€€€€À0!050305303050!05Àþ@À@Àþ@À€€€€€€€€€À0!05030530305030530305Àþ@À@Àþ@À@À€€€€€€€€€€€À0305303050!050!05À@Àþ@Àþ@À€€€€€€€€€À0305303050!05030530305À@Àþ@Àþ@À@À€€€€€€€€€€€À0305303050305303050!05À@Àþ@À@Àþ@À€€€€€€€€€€€À#030530305030530305030530305À@Àþ@À@Àþ@À@À€€€€€€€€€€€€	€#'5#5#!5#!5!0#0!30#0#3535#!5!€@€@@ÿ€þ€@À@@ÿ@@€€€€þ€@@@@@@@þ€@@þþ€@@@@@€#'5##35'5#!5#!5!0#0!30#05#!5!€@€€€@@ÿ€þ€@À@@ÿ@@€þ€€@@@@À@@@@þ€@@þþÀ@@@@€
+!%30#5!#03!%5#533=3%53353À@@þ€@@€ÿ@@€@ÿ@€@À@@þ@À@@@@@@@À@@@@	€ÀÀ#'+/5#75###353575##35#3535#15#735#15#;5#€@€€@@@@@@@@À@@@@€€@@@€@@@@€@@@ÀÀ@€@@@@À@@@@@@@@@À@€À#7#!5#5#35+30#030#0#5335#5!3À€@@€@@@@@€@@€@@@ÿ€À@@@@@€þ€€@@@@@@@€À#%5#5##5!##0335#03030#5335À€@@ÿ@@@@@@@@@@€@@@@@@@@þ€@@€þ€€@@@@@À@'-%5#53530#5305#0#05#03#033#30305'030À€@@@@€€€@@@@€€€€€À@@@@€€€€@ÿ@@@€€Àÿ@€À!5#53530#5!#033#30305'030À€@@@ÿ@@@€€€€€@@@@@ÿ@@@€€Àÿ@€À!5#05#0#3##03!530#5#5030À€€€€@@@@@@€€@@€€@@@ÿ@@@@þ€ÿ€À!7!530#05330!3####03030@@@@@ÿ€@@€@€€À@@€@@@@@@ÿÿ@%3##5!#3530###%53530€€€@ÿ@€€@@€@@ÀÀ@À@@ÀÀÿ@@@@@@€€#%5#0535#5##0535#5##303353#03@@@À@@@€@@€@€@@€@€À@@€@@@@þ@@À€@@À+/5#35##5##5#3#3#0335#0530305#5#53#53À@@€@@@€@@€@@ÀÀÀ@@@@À@@@@@ÀÀÀÀ@þÀ@@€@@€€€@ÀÀÀÀ)/%5#5353530#0#035#5###0333#30305030€@@@@€@@@€@€@@@@@€À@€@@@@ÿ@@@@ÿ@@@@€€ÿ@À
+%5!03530#5!030ÀþÀÀ@@þÀ€€@@@@ý@€ÿ@!%03030#0#05#00305!0305!35#35#À€@@€@€@€@þ@@@@@@Àþ€€€€ÿ€€€€@@@À!'5##0#0#5#303#03!530#530030€@€@€@@@@@@@ÿ€€@@ÿ@@ÿ@ÿ@@@ýÀÿ€%5#035#!5#30#35!'030@@€ÿ€@@€À€€@@@@@þ@@@€€þ€€#)/5#5!#03353053!5305#5##0#5#!05300530@þ€@@À@@þÀ€@@À@@€@@ÿ@€@@@€@@€@þ@@@€@@€@@€€€€€$%3#5!#03##033530#030%0530À@@ÿ@@€@@À@@€ÿ@@@À@@ÿ@@€@@ý€€€€)-!5#5#03030##5##5##3030303#3535#@@@@@@@@@€@@@@@@@þÀ@@@€þ€@À@@@ýÀþýÀ@@@À@@À%5!%5#530#5!#03#3030þ€@@ÿ@@€À€À@@€@@@@ÿ@@€þ€!5#5##5##30303035#€@@@€@@@@ÿ@@@@À@@@ýÀþýÀ€@@)3533305#0535303!3###5#5#030#03@@@@@@@@€þÀ€@@@@@@@@@@@@€€@€@@@@@@@€€€&*7#3535#;5#0530305#5#5#'303535#0#5#5#À@@@@@À€€@@€@À@@@@@@@@@@@@€€€@À€þ@@À€@@@ÀÀÀ735##5##5###3533533535##5##5###35335335€@@@@@@@@@@@@@@@@@@@@@@@@@@@@À@@@@@@@@@@@@@@À@@@@@@@@@@@@@+%5#035#035##0#0#5#30#30#3530303@@@@€@€@€@@@@€@€@@@@@@ÿ@@ÿ@ÿ@@ÿ@€À%5#0535305#5#5#5####0330#€@€@@@@€@@@@€@€@€@€@@@@@@€@€@	€À€'+735#5#;5+5#!35#!0#0!30#0!335#5#35#À@@@€@@€@@@ÿ@€@@þÀ€@@€À€€À@@@@@@@@ÿ@@@@@	ÀÀ€#'+/5####3535355#=#=#735#5#'35#5#'35#À@@@@@@@À@@@@@@@@À@@À@@@@€@@@@@@@@€@@@@@@@@@@@@@@@@@@@@€À	%5#05#0#75335#05#5##0#€@€@@€À€@€@€€@€€@ÀÀÀÀ€@@€À
+€À	
+!%)-1%5#05#0#75#!35#!05#0!305#0!35#5#%35#5#'35#€@€@@€€€ÿ@À@@þ€@@€@ÿ@@@€€€€@€€@À@@@€€€@@@@@@@@@@@€À€%353530#5##5##03333@@@@€@€@@@@@À@@@@@@ÿ@@@ÀÀ€5#5#5#5####333353535À@@@@@@@@@@@@@€@@@@@@@@@@@@@@€À	#'%5#05#0#75335#05##5#0#753!5335#€@€@@€À€@€@€@@@ÿ€€€@€€@ÀÀÀÀ€@@€À@@@@@@@€@
+%3###03@€@@ÀÀ@þ@@€€À7303305#5#5###03À@€@@€€@@ÀÀ€@€@@þ@@€@%3!5##35333#3À@ÿÀ@€@@€@€€@@þ@À@À@þÀÀ@733#3530!0#353€@À@€@þ@@€@À€ÀþÀÀ@€þÀ@@@€À035#0535#035#;5305#5##30À@@@@€€€@@@€@€ý€@€@€ýÀ@@€@@@@€030###0#03535#5353#@@@€@@@€€€@€ÿ€@@ý€@@À@À@À#+5#535#05###05##3#30353530355353#À@@@@€@@@@@@@€@@ÿ€@€@@À@€À@€À@À@€À@€À@À@À@€#%5#035#535###535###30#7030@@@@€@€€À@@@@À€€@@À@@ÀÀ@@À@ÿ@@ÿ€%5#!533305#5!##30#7030@ÿ@@€@ÿ@@@@À€€@@À@@€@@À@ÿ@@ÿ€%5#!##30#70305330@þÀ@@@@À€€@@€@@@À@ÿ@@ÿ@À@€€$!0#530305#5###535#0303030À@€@À@@@€@@€@ÀýÀ€À€€@@ÀÀ@@þÿÿ€!0!##535#030303053ÿ@@@€@@€@@@ÀýÀ€@ÀÀ@@þÿÿ@ÀÀ€%5##35#05#5##0#!5#030335@@€€@À@@@@@€À@@@@€@@þ@@þ@@@€5##5##!5030%#3535#;5#@€@@€@ÿ@@@@À€€@@@@@@€þ€€€@@@@@€5#5##5##!5##3535#;5#€€@€@@@@À@@@@À€€@@@@@@@@þ@@þÀÀ@@@@@@%5#75#5##03!5!05305#0@@@@€@@@€þ€€@@@@@€@@@@@€@@€€€@@%5#75#%5#!!5%5##0305@@@@@þ€€þÀ@@@@@@€@@À@@@@€@@€€@€@%5#75#7!!5305#015#@@@@@þÀ@@@@@@@€@@À@@€@@@%5#75#%5#'!!5305#0@@@@À@ÿ@@@@@€@@€@@@@@€@@%5#=#35#5##03!5!05305#0@@@À@À@@@€þ€€@@@@@€@@@@@@@€@@€€€@@%5#=#35#75#!!5%5##0305@@@À@À@þ€€þÀ@@@@@@€@@@@À@@@@€@@€€@€@%5#=#35#5!!5305#015#@@@À@þÀ@@@@@@@€@@@@À@@€@@@%5#=#35#75#'!!5305#0@@@À@ÀÀ@ÿ@@@@@€@@@@€@@@@@€@@#%5#35#'5#35#5##03!5!05305#0@À@@@À@À@@@€þ€€@@@@@@@€@@@@@@@€@@€€€@@!%5#35#'5#35#75#!!5%5##0305@À@@@À@À@þ€€þÀ@@@@@@@@€@@@@À@@@@€@@€€@€@%5#35#'5#35#5!!5305#015#@À@@@À@þÀ@@@@@@@@@€@@@@À@@€@@@%5#35#'5#35#75#'!!5305#0@À@@@À@ÀÀ@ÿ@@@@@@@€@@@@€@@@@@€@@
+5##03!5!05%5#75#305#0€@@@€þ€@@@À@@@@€@@€€@@€@@þ€€@@5#!!5%5##0305%5#75#@þ€€þÀ@@@@@@€@@@@€@@€€€@@€@@@€@5#75#!!5305#015#@@@@@þÀ@@@@€@@€@@þ€@@€@@@@5#5#75#!!5305#0À@@@ÿ@@@@@@@@€@@þ€@@€@@
+#5##03!5!0575#35#'5#35#305#0€@@@€þ€À@À@@@À@€@@@@€@@€€@@@@€@@@@þ€€@@!5#!!5%5##030575#35#'5#35#@þ€€þÀ@@@À@À@@@À@€@@@@€@@€€€@@@@€@@@@@€@5#35#'5#35#!!5305#015#@À@@@À@þÀ@@@@€@@@@€@@@@þ€@@€@@@@5#5#35#'5#35#!!5305#0À@@À@@@À@@ÿ@@@@@@@@@@€@@@@þ€@@€@€
+"5##03!5!05305#0%#35#53305#5#€@@@€þ€€@@ÿ@À@@@€@@@€@@€€€À@@@@€@@€ 5#!!5%5##03057#35#53305#5#@þ€€þÀ@@@€@À@@@€@€@@@@€@@€€À@@@@€@@€€	
+!!5305#015#'#35#53305#5#@þÀ@@@@@@À@@@€@€@@€@@À@@@@€@@€
+5#'!!5305#0'#35#53305#5#À@ÿ@@@@À@@@€@@@@@@@€À@@@@€@@€ $(,5##03!535#0#!05%5#35#=#5#=#735#€@@@€@@@þÀ@À@@@@@@€€@@€@@À€@€À@@@@€@@þ€@@@@@@@@€!'-15#%5##03!535#!05%5#35#=#05#0;05#0#35#@þÀ@@@@@€ÿ@À@@@À@@€€€@@@À@@€@@@@€À@@@@€@@þ€€€€@@À€"5#35#=#35#0#!!'5#=#735#@À@@€@@@þÀ€@@@@€€À@@@@€@@þ@À€@@€@@@@@@@	@€#'5#5#35#=#!!535#105#0;05#0#35#€€@À@@ÿ€€@À@@€€€@@@€@@@@€@@þ@@@@€€€@@€ $(,05##03!535#0#!05%5#35#'5#35#5#=#735#€@@@€@@@þÀ@À@@@À@@@@€€@@€@@À€@€À@@@@€@@@@þ€@@@@@@@	@€!%+155#%5##03!535#!05%5#35#'5#35#05#0;05#0#35#@þÀ@@@@@€ÿ@À@@@À@@@À@@€€€@@@À@@€@@@@€À@@@@€@@@@þ€€€€@@À€"&5#35#'5#35#35#0#!!'5#=#735#@À@@@À@@@@@þÀ€@@@@€€À@@@@€@@@@þ@À€@@€@@@@@@@
+@€!'+5#5#35#'5#35#!!535#105#0;05#0#35#€€@À@@@À@@ÿ€€@À@@€€€@@@€@@@@€@@@@þ@@@@€€€@@€#'+%5#!!5'5#75#%5!###335#53535'#3535#@þÀ@€@@@ÿ€@@@@@@€À@@ÀÀ€@@@@@@@€@@À@@@@À@@À@@@@@@@'+/!5!75#75#%5#75!###335#53535335%#3535#ÀþÀÀ@@@@@ÿ€@@@@@@€€@þ€@@ÀÀ@@€@@€@@@@@€@@@@À@@À@@@@@@@@@@%5#75#5###3535'#3535#€@@@ÀÀ€ÀÀ€À@@ÀÀ@@@€@@@@@@@@@@@@@@#%5#75#%5#75!##3535335%#3535#@@@@@@ÿ€€€€€@þ€@@ÀÀ@@@€@@€@@€@@@@@@@@@@@@@€#'+%5#!!5'5#35#5!###335#53535'#3535#@þÀ@À@À@Àÿ€@@@@@@€À@@ÀÀ€@@@@€@@@@@@@@À@@À@@@@@@@'+/!5!75#35#75#75!###335#53535335%#3535#ÀþÀ€@À@À@@ÿ€@@@@@@€€@þ€@@ÀÀ@@À@@@@€@@€@@@@À@@À@@@@@@@@€@%5#35#5###3535'#3535#@@À@€À€ÀÀ€À@@ÀÀ€@@@@@@@@@@@@@@@€@#%5#35#75#75!##3535335%#3535#@À@À@@ÿ€€€€€@þ€@@ÀÀ€@@@@À@@€@@@@@@@@@@@@@€'+/%5#!!5'5#=#35#75!###335#53535'#3535#@þÀ@€@@À@Àÿ€@@@@@@€À@@ÀÀ€@@@@@@@€@@@@À@@@@À@@À@@@@@@@+/3!5!75#=#35#75#75!###335#53535335%#3535#ÀþÀÀ@@À@À@@ÿ€@@@@@@€€@þ€@@ÀÀ@@€@@€@@@@@@@€@@@@À@@À@@@@@@@@@@%5#=#35#5###3535'#3535#€@@À@€À€ÀÀ€À@@ÀÀ@@@€@@@@@@@@@@@@@@@@#'%5#=#35#75#75!##3535335%#3535#@@@À@À@@ÿ€€€€€@þ€@@ÀÀ@@@€@@@@€@@€@@@@@@@@@@@@@€+/3%5#!!5'5#35#'5#35#75!###335#53535'#3535#@þÀ@À@À@@@À@Àÿ€@@@@@@€À@@ÀÀ€@@@@@@@@@€@@@@À@@@@À@@À@@@@@@	@/37!5!75#35#'5#35#75#75!###335#53535335%#3535#ÀþÀ€@À@@@À@À@@ÿ€@@@@@@€€@þ€@@ÀÀ@@€@@@@€@@@@@@@€@@@@À@@À@@@@@@@@@@#%5#35#'5#35#5###3535'#3535#@@À@@@À@€À€ÀÀ€À@@ÀÀ@@@@@€@@@@@@@@@@@@@@@@#'+%5#35#'5#35#75#75!##3535335%#3535#@À@@@À@À@@ÿ€€€€€@þ€@@ÀÀ@@@@@€@@@@€@@€@@@@@@@@@@@@@€À€%5#35#!5!5#!305#015#=#@À@Àÿ@@@@@@€@@@@@@@@€@@@@@@€€ %5#35#75#%35#5#!35#5#0105#0@À@À@þÀÀÀ@€@@@€@@@@À@@@@@@@@@€€@@À5#35#!5!5#!305#015#=#À@À@€ÿ@@@@@@À@@@@þÀ@@@@€@@@@@@@ 5#5#35#35#5#!35#5#0105#0@ÿ@À@€ÀÀ@€@@@@@@€@@@@þÀ@@@@@@€€@@À€!5#35#=#!5!5#!305#015#=#À@À@@@ÿ@@@@@@À@@@@€@@þ@@@@@€@@@@@@@€$5#5#35#=#35#5#!35#5#0105#0@ÿ@À@@@ÀÀ@€@@@@@@€@@@@€@@þ@@@@@@@€€@@À€
+$!5!5#!305#015#=#=#53305#5##€ÿ@@@@@@@@@€@@€@@@@€@@@@@@@@@€@À@@@€'5#%35#5#!35#5#0105#0=#53305#5##@þÀÀÀ@€@@@@@@€@@@@@@@@@@@@€€€@@@€@À@@ÀÀ€!5#35#=##3535#;5#;05#015#@À@@@€€€€€@@@@@@À@@@@€@@ýÀ@@@@€@@@€5#5###3535355#35#=#€@€€€€@€@À@@@@@À@@@@@@@@@€@@@ÀÀ€$#3535#;5#;05#015#'#35#53305#5#À€€€€€@@@@@@€@À@@@€@@@@@€@@À@@@@€@@€€5#5###353535#35#53305#5#€@€€€€@À@À@@@€@@@@À@@@@@€@@@@€@@@
+'5##03!5!055####330305#5#53535€@@@@þÀÀ@@@@@@@@@@@@@€@@€@@@@@@€€@@@@@@+5#%5##03!5!055####03335#5#053535@þÀ@@@@þÀÀ@@@@@@@@@@@@@@À@@€@@€@@@@€@@@@€@@@À5###330!!5305#5#535À€€@@@ÿ@@@€À@@@@@€@@€@@@@5#5###033!!535#5#0535À€€€@@@ÿ@@@€@@@€@@@€@@@@@@€@@€
+'35##03!5!055####330305#5#53535'5###3535€@@@@þÀÀ@@@@@@@@@@@@@@@@@@@€@@€@@@@@@€€@@@@@@@@@@@@€+75#%5##03!5!055####03335#5#053535'5###3535@þÀ@@@@þÀÀ@@@@@@@@@@@@@@@@@@@@À@@€@@€@@@@€@@@@€@@@@@@@@@@À€%5###330!!5305#5#53575###3535À€€@@@ÿ@@@€@€€@@€À@@@@@€@@€@@@€@@@@@@@€)5#5###033!!535#5#053575###3535À€€€@@@ÿ@@@€@€€@@€@@@€@@@€@@@@@@€@€@@@@@@@€/;%5#75#5##03!5!055####330305#5#53535'5###3535@@@@@@@@þÀÀ@@@@@@@@@@@@@@@@@@@@€@@@@@€@@€@@@@@@€€@@@@@@@@@@@@€3?%5#75#%5#%5##03!5!055####03335#5#053535'5###3535@@@@@þÀ@@@@þÀÀ@@@@@@@@@@@@@@@@@@@@€@@€@@À@@€@@€@@@@€@@@@€@@@@@@@@@@À€!-%5#75#5###330!!5305#5#53575###3535@@@€€@@@ÿ@@@€@€€@@€@@@€@@@@@@@€@@€@@@€@@@@@@@€%1%5#75#%5#5###033!!535#5#053575###3535@@@@À€€€@@@ÿ@@@€@€€@@€@@@€@@€@@€@@@€@@@@@@€@€@@@@@@@€
+'+/;5##03!5!055####330305#5#53535%5#35#!5###3535€@@@@þÀÀ@@@@@@@@@@@þ€@À@@@@@@@@€@@€@@@@@@€€@@@@@@@@@@@@@@@@€+/3?5#%5##03!5!055####03335#5#053535%5#35#!5###3535@þÀ@@@@þÀÀ@@@@@@@@@@@þ€@À@@@@@@@@@À@@€@@€@@@@€@@@@€@@@@@@@@@@@@@@€!-5###330!!5305#5#535%5#35#!5###3535€€@@@þÀ@@@@€þÀ@À@@@€@@€À@@@@@€@@€@@@€@@@@@@@@@@@€!%15#5###033!!535#5#0535%5#35#!5###3535€€€€@@@þÀ@@@@€þÀ@À@@@€@@€@@@€@@@€@@@@@@€@€@@@@@@@@@@À@5##33!5!5#535#;0#0€@@@@ÿ@@@@@@@@@À@@@@Àÿ@@À5##033!5!5#0535#;0#0€@@@@ÿ@@@@@@@@@@€@@@@€À@À€(5##33!5!5#535#;0#0%#35#53305#5#€@@@@ÿ@@@@@@@ÿ@À@@@€@@@À@@@@Àÿ@€@@@@€@@€*5##033!5!5#0535#;0#0#35#53305#5#€@@@@ÿ@@@@@@@ÿ@À@@@€@@@@€@@@@€À@@@@@€@@€€	
+!!5305#015#'#35#53305#5#@þÀ@@@@@@À@@@€@€@@€@@À@@@@€@@€
+5#'!!5305#0'#35#53305#5#À@ÿ@@@@À@@@€@@@@@@@€À@@@@€@@@À€!%5##3575##3535#5#!305#015#'35#@À@@ÀÀ@@@ÀÀ@@@@€€€À@@@@€@@@@þ@@@ÀÀ€@@@@	@€%)-5#5##3575##355#%35#5#!305#035#;5#€€À@@ÀÀ@@@@ÿÀÀ@@@À€€€@@@@@€@@@@€@@@@þ@@@@@@@@€@@@€@À€
+35#5#!305#015#'35#ÀÀÀ@@@@€€€€@@ÀÀ€@@@@À@À5#'#3535#€€@@€€@@@@@@@€€À%5##35#0##30€@@@@@ÀÀÀ@@@@@@€€À5##35#05##À@@@@À@@@ÀÀ€@@@À)5#!#35!5#05##0305#005#0735#5#5##3@þÀ@@€@@@@ÿ@À€@@@@€@@@@@@€@@€@€€@@@@@@@À)5#!#35!5#05##0305#005#0735#5#5##3@þÀ@@€@@@@ÿ@À€@@@@€@@@@@@€@@€@€€@@@@@@@ÀÀ
+"#!5#05##305#005#0735#5#5##3€€€€@@@@ÿ@À€@@@@€€@@€@@€@€€@@@@@@@À&5#%#!5#05##305#005#0735#5#5##3@þÀ€€€@@@@ÿ@À€@@@@€@@@@@@€@@€@€€@@@@@@ÀÀ
+%5!5#0%5#35#;5#;5#Àþ€@€@ÿ€€€@@@@@À@@€À@@@@@@€€€%5!5#0%5##35þÀ@€À€€€@@€À@@@@ÀÀ
+"&%5!5#0%5#'5##3575##3535#;5#;5#Àþ€@€@@À@@ÀÀ@@€€€@@@@@À@@€À@@À@@@@€@@@@þ€@@@€€%5!5#0%5##355##3575##35þÀ@€À€€@À@@ÀÀ@@€@@€À@@@@@@@@€@@@@@€#)5###!5!575##3=#35#=#5#!30#0@€@@€ÿ€€@@@À@@€@À@@À@@@@@@€@@@@€@@@@€@@þ@@@€@€#*5#'5##3!5#575##3575#35#=#30##@À€€@À€€@@@@À@@€€@@@@@€@@@@@@€@@@@€@@@@€@@þ@€þÀ@€!%5#35#!5###330!!5305#5#535%5#@@À@€€€@@@þÀ@@@@€ÿ@À@@@@@@@@@€@@€@@@€@@@€%)5#5#35#!5###033!!535#5#0535%5#€þÀ@À@€€€@@@þÀ@@@@€ÿ@@@@€@@@@@@@€@@@@@@€@€@@
+@€À€)-17#3535#;5#;5##3'5#735#'#3535305##015#735#À€€€€€@@@@@€€€@@€€@@@@@@@@@@@À@@@@À@@@@@@@@@@@€@@@@@@@€#-155#5##3###35353535'5#735#'#3535305##015#735#@@€€@€€€€@@À@@€€@@@@@@@@@@@@@@@@@@@@@@@@@@@@@€@@@€@@@@@@€À@#'5##35#3535#;5#;5##3'5#735#=#€@@@€€€€€€@@@@@€€€@@€€@@@@@ýÀ@@@@À@@@@@@@À@@@@@#'+5#5##3###353535355##355#735#5#@@€€@€€€€@@@@@@@@@€€@@@@@@@@@@@@@@À@@@@þ€@@@@@@@€À€!7#3535#;5#;5##3'5#735#030À€€€€€@@@@@€€€@@€€@À@@@@À@@@@@@@@ÿ@@€%5#5##3###35353535'5#735#030@@€€@€€€€@@À@@€€@@@@@@@@@@@@@@@@@@@€ÿ@€€#'+/9=A5##3575##35#3535#;5#;5##3'5#735#'#3535305##015#735#€@@€€@@À€€€€€@@@@@€€€@@€€€@@@@@@@@@@À@@@@€@@@@ý€@@@@À@@@@@@@@@@@€@@@@@	@€À@#'5#35#=##3535#;5#;5##3'5#735#@À@@@€€€€€@@@@@€€€@@€€€@@@@€@@ýÀ@@@@À@@@@@@@@@#'+5#5##3###353535355#35#=#5#735#@@€€@€€€€@@À@À@@@@€€@@@@@@@@@@@@@@@@@€@@þÀ@@@@@€À@7#353535!3735##3'5#735#À€€€@ÿ@À@@€€€@@€€À@@@@@@À@@@@@@@@@@#'+5#5##3!3#353535355##355#735#5#@@€€ÿ@€€€@@@@@@@@@€€@@@@@@@@@@@@@@À@@@@þ€@@@@@@	@€À@#'5##3535#;5#;5##3'5#735#5#3535#€@€€€€€€@@@@@€€€@@€€@@@@À@@þ@@@@À@@@@@@@À@@@@@@#'+5#5##3###353535355#5#735##3535#@@€€@€€€€@@@@@@@€€@@@@@@@@@@@@@@@@@€@@þÀ@@@@@@@ÿ€@%5#75#5##0330!!5305#5#050#0@@@@À@@€þ€€@@€ÿ@€@@€@@@@€@€@@€@€þÀÿÿ€€5#5##33!33535305#55#@@À@@€þ€€@À@Àÿ@€@@À@@@@@@@@@€@ÀÀÀ@€@%5#75#7!!5305#015#@@@@@þÀ@@@@@@@€@@À@@€@@@%5#75#%5#'!!5305#0@@@@À@ÿ@@@@@€@@€@@@@@€@€@	
+!!5305#015#@þÀ@@@@€@@€@@@
+5#'!!5305#0À@ÿ@@@@@@@@€€@5##!!5355##0335#050#0@@þÀ@@@À@@€€ÿ@@@@@@@@@€@@€þÀÿ@€5##33!!5305#55#À@@€þ€€@Àÿ@@@@@@@@@€@ÀÀÀ€€@%5#35#!!5305#015#@À@þÀ@@@@€@@@@@@€@@€%5#35#75#'!!5305#0@À@ÀÀ@ÿ@@€@@@@À@@@@@€@@À€
+!5!5#!305#015#=#030€ÿ@@@@@@€@€@@@@€@@@@@@ÿ@ÀÀ€#3535#;5#;05#015#030À€€€€€@@@@@@€@@@@@€@@€ÿ€€#5##0330!!5305#5#050#0030À@@€þ€€@@€ÿ@À@@@€@€@@€@€þÀÿÀÿ@À€ $(,05####35353535#05#0;5#05#35#%5#75#735#€@€€@€@€ÿ€€@ÀÀ€@À@@þÀ@À@@€€@@@@@@@@þ€@@€€@€€À@@@@@@@@€À€ &5##3575##35'35#05#0;5#5#0305#0ÀÀÀÀÀÀÀÀÀ€€@ÀÀ€@À@@À@@@@€@@@@€@@€€@@@€@€€5##3535#05#0;5#5#0305#0@€€€@@@@€€@@€@@@@@@@ÿ@@€€@@@€@€€€"&*5###353535#05#0;5#5#0305#0'5#735#@@@€€@€@@@€€@@€@@€@@@@@@@@@@þÀ@@€€@@@€€@@@@@€€5##35'35#05#0;5#5#0305#0€€€€€@@@€€@@€@@@@@@@€@@€€@@@€@€€	35#05#0;5#5#0305#0'0305€@@@€€@@€@@€@@@@€€@@@€€€€@€5##33!!5305#55#030À@@€þ€€@Àÿ@À@@@@@@@@@€@ÀÀÀÿ@€"5!5#!!535#05#0;5#5#0305#0þÀÀÿÀ€€@ÀÀ€@À@@@@@@@@@ÿ@@€€@@@€@€ &*.5!5##5###353505#0;5#5#0305#0'5#735#þÀ€@€@€€€€ÿ@ÀÀ€@À@@À@@€€@@@@@À@@@@@@þÀ€€@@@€€@@@@@€ 5!5##35'35#5#;5#5#0305#0þÀÀÀÀÀ€€@ÀÀ€@À@@@@@@@@@€@@@@@@@€@@€5#5###3533#55#735#;5#À@@@@@@@€@@@@@@@@@@À@@@@@þÀ@@@@@@@@€@€€5###353030#55#735#;5#€@@@@@@@€@@@@@@@@@@@@þ€€@@@@@@@@À€#+/%5#75#75##05#0##3530335#053575##355#€@@@@@@@@@@@@@@@@@@@À@À@@À@@€@@€€@@@€@@€@À@@@@À@@€ÀÀ#'+/5#75##05#0##3530##353530535#5#75#=#À@@@@@@@@@@@@@@@À@€@@€@@€@@€€@@@€@@@@€@@@€@@@@@	@@$(,045##3535#0###3;35#5#30#05335#5#;5#À@@@À@@@@@@À@€€@À@@þ€@@@@@€@@@@@@þ€@@@@@@@@ÀÀÀ@@@@@@@@ÀÀ@@5##35@@@@@@@@ÀÀ@@%5#=#@@@À@@@@@À@5#@@@ÀÀ@5##3575#@@@@@@@@@@À@@À5#75#@@@@@À@@€À€@%5#5###3535'#3535#@À@@@@@€@@€€À@@@@@@@@@@@@ÀÀ@	%5#030@@À@@€ÿ€@€€5!€ÿ@@@À€@@%5#5##3@@@@@@€@@€@@þÀ@À€@@%#353#15#@@@@@À@@@@@€€@@%5#05#5##35305@@@€€@@@€@€À€@À@@€À€€@
+5##0#3=#30€@@@€€@@@@€@À@À@€À€@@%5#35#@@@€€@@@þ@À€@@%#3#3@€€@À@À@@À€5#535#5##5##3#335335'53€@@@@@@@@@@@@@€@@@@@@@@@@@@@@@@@@€€À@#)-%5#75###353505#075#'35#105#0;05#0#35#À@@@@€€@À@À@@@@@€@@@@@€@@€@@@@@@@€€@@@@@€€€@@À€@%5#75#05#0#30#35305€@@€@€@@@ÀÀ@@À@€€@€@@€@À€5#05#0#30305€€@€€@@@€€@€€€@€€5!€ÿ@@@€À@%5#5###335#535@@@@@@@@@@À@@@@@@@@@@€À@5###353=#=#@@@@@@@@@@@@@@@@@@@@@€€À5!%5!€ÿÿ@@€@@€À€@	%5#505#0505#0=#€@@@@À@@@€€€€€€@@@€€€%)-5##535#05335#5#5###330#33535#5#753€@@@@@@@@@@@@@@@@@À@@@@@@@€@@@@@@@@€@@@@@@À@@€À€@%5#5#!5##0#0#35305305€@€@@@@@@@@À@@@@@@@€€@@€€@À€@	%5#50#07035#5305#0#35#@À@€€@@@@ÀÀÀÀ@@@ÿÀ€@@@€@€€€€5##3575##35€€€€€€€€À@@@@€@@@@@€5!5###353575###3535þÀ€€€€€€€€€€€@@@@@@@@@@À@@@@@@@À€ #35#5#35#5#05#!305#05#735#€@À@@€€@@€€€@@€@@€€€@@@@@@@@@€@@@@@€€%5##3575##35€€€€€€€€@@@@@€@@@@€€€5##35€€€€@@@@@@@5!5###3535þÀ€€€€€@@@À@@@@@@À@€€
+#3535305##015#735#@@@@@@@@@@€@@@€@@@@@@€5!#3535#5#0305#05#735#þÀ€€€@@€@@€@@€€@@@@@@@@@€@@@@@€€€%5##35€€€€@@@@@€%5###353575!À€€€€€Àþ€@@@@@@À@@€€À€	35#05#0;5#05#305#0À@@@€€@@€@@À@@€€@€€€@€
+5!35#05#0;5#05#35#þ@€€@ÀÀ€@À@@@@@@@@€€@€€À€À€€5##35#5#735#€@€€€@@€€@@@@@@@@@€
+5!35#05#0;05#0#35#þÀ€€@À@@€€€@@@€@@€€€@€@À€5!#3575#05#0735#Àÿ@@À@€@@€€€@@@@€@@@€€€@@@À€5#!#35!5030À@ÿ@@À@@@@@@@@€þ€€@@€5#5#!#35!5#ÀÀ@þÀ@@@€@@@@@@@@@@þ@@þÀ€@€€5##3575##353€À@@€€@@@@À@@@@€@@@@ÀþÀ@À@€5#5##3575##350#0€@À@@€€@@€@@@@€@@@@€@@@@þ@ÿ@€À@#'+5##3575##35#3535#;5#;5##3'5#735#€À@@ÀÀ@@€€€€€@@@@@€€€@@€€€@@@@€@@@@ýÀ@@@@À@@@@@@@@@@'+/5#5##3###353535355##3575##355#735#@@€€@€€€€@@@À@@ÀÀ@@@@@€€@@@@@@@@@@@@@@@@@@€@@@@þ€@@@@ÀÀÀ%5##3575##35030ÀÀ@@€€@@@@@@@@@€@@@@þ€€ÀÀ%5##3575##35%5#5#ÀÀ@@€€@@€@@@@@@€@@@@€@@@@þÀ€@'-5##0330!!5305#5#0=##3575##350#0À@@€þ€€@@€À@@€€@@@@@@€@€@@€@€€@@@@€@@@@ýÀÿ@@"&5##33!!5305#55##3575##355#À@@€þ€€@ÀÀ@@€€@@@@@@@@@@@@€@@@@@@€@@@@ý€ÀÀ@€@5##3575##35!!5305#015#€À@@ÀÀ@@€þÀ@@@@€@@@@€@@@@þ€@@€@@@@5#5##3575##35!!5305#0À@À@@ÀÀ@@@ÿ@@@@@@@@@@€@@@@þ€@@€@@À030@Àþ€€@À5#5#À@@@@@@þÀ€@%5#5##03!5!05305#0@@€@@@€þ€€@@€@@€@@€@@€€€€@%5#5#!!5%5##0305@@@þ€€þÀ@@@€@@@@@@€@@€€€€@
+%5#!!5305#015#@€þÀ@@@@€@@@@€@@€%5#%5#'!!5305#0@@À@ÿ@@€@@À@@@@@€€@À@5#35#35#5#!305#015#'35#À@À@@ÀÀ@@@@€€€@@@@þ€@@ÀÀ€@@@@	@@!'5#5#35#5#%35#5#!305#035#;05#0€ÿ@À@À@ÿÀÀ@@@À€€€@@@@@À@@@@þ€@@@@@@@€@@€@€
+5##03!5!0575#35#305#0€@@@€þ€À@À@€@@@@€@@€@@@@@À€@À5#!!5%5##030575#35#@þ€€þÀ@@@À@À@€@@@@€@@€€€@@@@@€À5#35#!!5305#015#@À@þÀ@@@@€@@@@ÿ@@€@@@À5#5#35#!!5305#0À@@À@@ÿ@@@@@@@@@@ÿ@@€@@
+5##03!5!0575#35#=#305#0€@@@€þ€À@À@@À@@@@€@@€€@@@@€@@þ€€@@5#!!5%5##030575#35#=#@þ€€þÀ@@@À@À@@€@@@@€@@€€€@@@@€@@@€@5#35#=#!!5305#015#@À@@@þÀ@@@@€@@@@€@@þ€@@€@@@@5#5#35#=#!!5305#0À@@À@@ÿ@@@@@@@@@@€@@þ€@@€@€#'%5#!!5'5#5!###335#53535'#3535#@þÀ@€@ÿ€@@@@@@€À@@ÀÀ€@@@@€@@@@@@À@@À@@@@@@@#'+!5!75#%5#75!###335#53535335%#3535#ÀþÀÀ@@@ÿ€@@@@@@€€@þ€@@ÀÀ@@À@@€@@€@@@@À@@À@@@@@@@@€@%5#5###3535'#3535#@@À€ÀÀ€À@@ÀÀ€@@@@@@@@@@@@@€@%5#%5#75!##3535335%#3535#@@@@ÿ€€€€€@þ€@@ÀÀ€@@À@@€@@@@@@@@@@@@@€#%5#!!55!###335#53535'#3535#@þÀ@@ÿ€@@@@@@€À@@ÀÀ€@@@@€@@@@À@@À@@@@@@@#'!5!5#75!###335#53535335%#3535#ÀþÀ€@@ÿ€@@@@@@€€@þ€@@ÀÀ@@@@@€@@@@À@@À@@@@@@@@@@5###3535'#3535#À€ÀÀ€À@@ÀÀÀ@@@@@@@@@@@@5#75!##3535335%#3535#@@ÿ€€€€€@þ€@@ÀÀ@@@€@@@@@@@@@@@@@@#'%5#!!55!###335#535355##3535#@þÀ@@ÿ€@@@@@@€@@@@@ÀÀ€@@@@€@@@@À@@À@@@@À@@@#'+!5!5#75!###335#535353355##3535#ÀþÀ€@@ÿ€@@@@@@€€@ÿ@@@@ÀÀ@@@@@€@@@@À@@À@@@@@@À@@@@À5###3535'5##3535#À€ÀÀ€@@@@@ÀÀÀ@@@@@@À@@€@@@@5#75!##35353355##3535#@@ÿ€€€€€@À@€@@ÀÀ@@@€@@@@@@@@@@À@@@@@À€
+!5!5#!305#015#=#€ÿ@@@@@@€@@@@€@@@@@@@€5#%35#5#!35#5#0105#0@þÀÀÀ@€@@@@@@@@@@@@@€€@@À5#!5!5#!305#015#=#@@ÿ@@@@@@À@@þÀ@@@@€@@@@@@@5#5#35#5#!35#5#0105#0@À@@ÀÀ@€@@@@@@€@@þÀ@@@@@@€€@ÀÀ@#3535#;5#;05#015#À€€€€€@@@@@@@@@@€@@@€À5#5###353535€@€€€€@@@@À@@@@@@ÀÀ5##3535#;5#;05#015#@@@€€€€€@@@@@@À@@þ@@@@@€@@@€€5#5###3535355#€@€€€€@@@@@@À@@@@@@@À@5##30!!5305#55#%5#%0305€@@@ÿ@@ÿ@@@À@@@€@@€@ÀÀÀÀ@@€€€€5##30!!5305#55#%5#%0305€@@@ÿ@@ÿ@@@€@@@€@@€@ÀÀÀÀ@@€€€@#35335#5#335#5#305#0ÀÀÀ@@@@€@@@@€@@€@@@@@@@@@@€@À5#%#35335#5#335#5#35#@þÀ€€@@@@€@@@@€@@@@@@@@@@@@@@@@@À@!%+5##30!!5305#5'5#35#=#5#%5#%0305€@@@ÿ@@@@À@@À@@@À@@@€@@€@À@@@@€@@þÀÀÀ@@€€€€!%+5##30!!5305#5'5#35#=#5#%5#%0305€@@@ÿ@@@@À@@À@@@€@@@€@@€@À@@@@€@@þÀÀÀ@@€€€@@%5#35#=##35335#5#335#5#305#0@@À@@€ÀÀ@@@@€@@@@€@@€@@@@€@@þ€@@@@@@@@@@€@@#'5#5#35#=##35335#5#335#5#35#@À@À@@€€€@@@@€@@@@€@@@@@@@@@@€@@þ€@@@@@@@@@@@À€#35#5#!30535#5#3307305#035#;5#@ÀÀ@@€À€@@À@@À@@@€€@@ÀÀ€@@@@@€@@@€@#735#5#!30535#5#3307305#035#;5#@ÀÀ@@€À€@@À@@À@@@€€À@@ÀÀ€@@@@@€@@@@@!5#5#5#0#35!305#035#;5#ÀÀ@@€€@@@À@@@€€€@@@@€@@€@@@@@!5#5#5#0#35!305#035#;5#ÀÀ@@€€@@@À@@@€€€@@@@€@@€@@@À#'5#35#5#!30535#5#3307305#035#;5#€@ÿÀÀ@@€À€@@À@@À@@@€€À@@þ@@@ÀÀ€@@@@@€@@@€À#'5#35#5#!30535#5#3307305#035#;5#€@ÿÀÀ@@€À€@@À@@À@@@€€€@@þ@@@ÀÀ€@@@@@€@@@@ 5#!5#5#5#0#35!305#035#;5#€@€À@@€€@@@À@@@€€À@@þÀ@@@@€@@€@@@@ 5#!5#5#5#0#35!305#035#;5#€@€À@@€€@@@À@@@€€À@@þÀ@@@@€@@€@@@@À
+!5#535#0#0#5#!305#0#35#@@À@@@@@€@@€€€€@@@@þ€@@€@@5#%!5#535#0#0#5#!305#0#35#@þ€@À@@@@@€@@€€€@@@@@@@@þ€@@€@@À
+#!5#535#0#0305#0#35#€€€À@@@@@€€€€@@@@þ€€@@5#%#!5#535#0#0305#0#35#@þÀ€€À@@@@@€€€@@@@@@@@þ€€@@À5#!5#535#0#0#5#!305#0#35#€@ÿ@À@@@@@€@@€€€À@@þÀ@@@@þ€@@€@@#5#5#!5#535#0#0#5#!305#0#35#@@@ÿ@À@@@@@€@@€€€@@@€@@þÀ@@@@þ€@@€@@À5##!5#535#0#0305#0#35#€@À€€À@@@@@€€€À@@þÀ@@@@þ€€@@5#5##!5#535#0#0305#0#35#@@@À€€À@@@@@€€€@@@€@@þÀ@@@@þ€€@€$%5#!!55##0#335#5353=##0305@þÀ@@€À@@@@@€À@@@@@@@€@@€À@@À@@€@@€€
+€#'.%5#!!55#5#=#735#;5#5#'35#15#!305!3@þÀ@@@þÀ@@@@@@@@@@ÀÀÀ@@ÿÀ@@@@@@@ÿ@@@ÀÀÀ@@@@@@@@@€@@À@	
+5#05#0#%5#ÀÀ@ÀÀÀ@@€€@À@@@@5#'#3535#15#!305!3€ÀÀÀÀÀ@@ÿÀ@@@@@@@@@€@@$(%5#!!55##0#335#5353=##030575#@þÀ@@€À@@@@@€À@@@@@@@@@€@@€À@@À@@€@@€€À@@@#'+2%5#!!55#5#5#=#735#;5#5#'35#15#!305!3@þÀ@@@€@€@@@@@@@@@@ÀÀÀ@@ÿÀ@@@@@@@À@@ý@@@@ÀÀÀ@@@@@@@@@€@@À	
+5#05#0#%5#=#ÀÀ@ÀÀÀ@@@€€@À@@À@@@5#5##3535#15#!305!3€@@@ÀÀÀÀ@@ÿÀ@@@€@@þÀ@@@@@€@@ $5##03!535#0#!05%5#5#=#735#€@@@€@@@þÀ@@@@@@€€@@€@@À€@€À@@ÿ@@@@@@@@%)5#%5##03!535#!05%5#05#0;05#0#35#@þÀ@@@@@€ÿ@@@À@@€€€@@@À@@€@@@@€À@@ÿ€€€@@À5#35#0#!!'5#=#735#@@€@@@þÀ€@@@@€€À@@þÀÀ€@@€@@@@@@@@5#5#!!535#105#0;05#0#35#€@@ÿ€€@À@@€€€@@@€@@þÀ@@@€€€@@%+/5##33!5!5#55#35#35#;0#0#3'05#0735#€@@@@ÿ@@À@@@@@@€€€@@€€€@@À@@@@À@@@@@ýÀ@€€@@€€€@@%+/5##33!5!5#55#35#35#;#0#30'05#0735#€@@@@ÿ@@À@@@@@@€€€@@€€€@@À@@@@À@@@@@ýÀ@@€@@€€€@@À@5#35#35#0#!!'5#=#735#@À@@@@@þÀ€@@@@€€@@@@þ€À€@@€@@@@@@@@@#5#5#35#!!535#105#0;05#0#35#€€@À@@ÿ€€@À@@€€€@@@À@@@@þ€@@@€€€@@5##3575##35!5!5#!30#0@€@@€€@@€€þ€@À@@@@@@@€@@@@þÀ@@@@€@"5#5##3575##35!5!5#!30##@À€@@€€@@@ÿ@@€@@@@@@@@@€@@@@þÀ@@@@€þÀ@À5###330!!5305#5#535À€€@@@ÿ@@@€À@@@@@€@@€@@@@5#5###033!!535#5#0535À€€€@@@ÿ@@@€@@@€@@@€@@@@@@€@ÀÀ@5##3!5!535#;0#0€@@@ÿ@@@@@À@@À@@ÀÀ@À5##3!5!5%5###3535€@@@ÿÀ@@@@@@@À@@À@@@ýÀ@@À@@	!!530#0ÿ@@€@@€@
+5#'!!530#0À@ÿ@@@@@@@@€@À€0301!5#05#0#!305#0#35#@@€@@@@€€€€þ€€@€€€@@
+5#0#3535%0300535#5##30€@@@þ€@À@@@€€@@€@@@@þ€€€€@@@@€@À@#35335#05##305#0#35#€€€€€€@@@@€€€€@@@@€@@€@@@5#%#35335#05##305#0#35#@þÀ€€€€€@@@@€€€@@@@@@@@€@@€@À5##33!5!5#5%5#35#;0#0€@@@@ÿ@@€@@@@@@@À@@@@ÀÀ@@þ@@@5##033!5!5#05%5#35#;0#0€@@@@ÿ@@€@@@@@@@@€@@@@€€@@þÀ@@€À
+5#!!5305#015#@€þÀ@@@@€@@ÿ@@€@@@À5#5#!!5305#0À@ÿ@@@@@@@@ÿ@@€€@À€
+35#5#!305#015#'35#ÀÀÀ@@@@€€€€@@ÀÀ€@@@@@À5#=#%35#5#!305#035#;05#0€@ÿÀÀ@@@À€€€@@@@@@@@@@@@@€@@€@À!%335#0530305#5#0##3'05#0735#15#À€€€€@@À€€À@@@€€@€@@€€€@€@@€€€€@@@€€!'+/%5#5#3%5##35535#05#0#3735#;05#035#;5#€@€@€@@À@@@€€€@@@@@€@@@@@€@@@@À@@@@@@@€€@@€@€@@@@€À@7#3535#;5#;5##3'5#735#À€€€€€@@@@@€€€@@€€À@@@@À@@@@@@@@@5#5##3###35353535'5#735#@@€€@€€€€@@À@@€€@@@@@@@@@@@@@@@@@@€@5##0330!!5305#5#050#0À@@€þ€€@@€ÿ@@@€@€@@€@€þÀÿ@€5##33!!5305#55#À@@€þ€€@Àÿ@@@@@@@@@€@ÀÀÀÿÀ@%5#!5#5##0330!!5305#5#050#0À@@ÀÀ@@€þ€€@@€ÿ@@@@@@@@@€@€@@€@€þÀÿÿÀ€5#!5#5##33!!5305#55#À@@ÀÀ@@€þ€€@Àÿ@@@@@@€@@@@@@@€@ÀÀÀ€€@%5#35#!!5305#015#@À@þÀ@@@@€@@@@@@€@@€%5#35#75#'!!5305#0@À@ÀÀ@ÿ@@€@@@@À@@@@@€	À€$(,045##5##!55##35305##75#;0#05#=#'#3535#À@€@@@@@@€@@@@€@@€@@@@@€€@@@@@@@@@@@þ@€@@@@À@@@@@À@@@@€ $(5#5##3530##05##!05#3#3535#@€@@@€@@@@€€€@€@@€€@@@@@@@þ@€þÀ€À@€@@@@@À€&.45##5##!55##353333#305#5#5#=##3530#0À@€@@€À@@@@@@@€@@@€@@@@@@@@@@@@€@@@@@@@@@€@@@€@@@@þÀ@@€'5#5##35303#!530##05#0=##35@€À@@@@€@@@@€@@@@@€@@@@€À@@€þÀ€€€@@@@	@ÿÀÀ"&,048!5##3575##35%5##5##!5'305##75#;0#05#=#=#€À@@€€@@@€@@€€@@@@€@@€@@@@@@@€@@@@À@@@@@@@€@@@@À@@@@@@@@€ÿÀ!'+!5##3575##35%5#'30##05##!05#0=#€À@@€€@@@@@@@@@€€@@@@@@€@@@@À@@@€þÀ€À@€€€@@@À $(5##5##!5'305##75#;0#05#=#=#À@€@@€€@@@@€@@€@@@@@@@@@@@€@@@@À@@@@@@@@€@5#'30##05##!05#0=#@@@@@@€€@@@@@@€þÀ€À@€€€@@ÿ€€%,0DHLT^b75#3#35#55##535#305##535%5#5#0305355303053330#0#5#=35#35#5!33;35#05#035#ÀÀ€€À€À@@@€À@@@ÿ€@@€€@þ€@@@@@@@@@À@@ÿ€@€@@@@€@@€@À@@À@@@@@@þÀ€@@@€@@€þ€þÀ€À€@@Àÿ€@@€@@À@@@@À@@@@@€€À@À@/%30530#05#5##0#03033'53'5305##535330#@@@@@À@@@@À€€€@@€@À@@€€€€@@€þ€€@À@@€@€@@@@€@®,
+	)	2	J	Š	82	J	j	„FontForge : VGA : 17-12-2013Version 1.00 VGAMediumFontForge : VGA : 17-12-2013Version 1.00 VGAMediumÿ*t	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ												
+			
+																			 	!	"	#	$	%	&	'	(	)	*	+	,	-	.	/	0	1	2	3	4	5	6	7	8	9	:	;	<	=	>	?	@	A	B	C	D	E	F	G	H	I	J	K	L	M	N	O	P	Q	R	S	T	U	V	W	X	Y	Z	[	\	]	^	_	`	a	b	c	d	e	f	g	h	i	j	k	l	m	n	o	p	q	r	s	t	u	v	w	x	y	z	{	|	}	~		€	�	‚	ƒ	„	…	†	‡	ˆ	‰	Š	‹	Œ	�	Ž	�	�	‘	’	“	”	•	–	—	˜	™	š	›	œ	�	ž	Ÿ	 	¡	¢	£	¤	¥	¦	§	¨	©	ª	«	¬	­	®	¯	°	±	²	³	´	µ	¶	·	¸	¹	º	»	¼	½	¾	¿	À	Á	Â	Ã	Ä	Å	Æ	Ç	È	É	Ê	Ë	Ì	Í	Î	Ï	Ð	Ñ	Ò	Ó	Ô	Õ	Ö	×	Ø	Ù	Ú	Û	Ü	Ý	Þ	ß	à	á	â	ã	ä	å	æ	ç	è	é	ê	ë	ì	í	î	ï	ð	ñ	ò	ó	ô	õ	ö	÷	ø	ù	ú	û	ü	ý	þ	ÿ
+
+
+
+
+
+
+
+
+
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+!
+"
+#
+$
+%
+&
+'
+(
+)
+*
++
+,
+-
+.
+/
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+:
+;
+<
+=
+>
+?
+@
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+M
+N
+O
+P
+Q
+R
+S
+T
+U
+V
+W
+X
+Y
+Z
+[
+\
+]
+^
+_
+`
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+m
+n
+o
+p
+q
+r
+s
+t
+u
+v
+w
+x
+y
+z
+{
+|
+}
+~
+
+€
+�
+‚
+ƒ
+„
+…
+†
+‡
+ˆ
+‰
+Š
+‹
+Œ
+�
+Ž
+�
+�
+‘
+’
+“
+”
+•
+–
+—
+˜
+™
+š
+›
+œ
+�
+ž
+Ÿ
+ 
+¡
+¢
+£
+¤
+¥
+¦
+§
+¨
+©
+ª
+«
+¬
+­
+®
+¯
+°
+±
+²
+³
+´
+µ
+¶
+·
+¸
+¹
+º
+»
+¼
+½
+¾
+¿
+À
+Á
+Â
+Ã
+Ä
+Å
+Æ
+Ç
+È
+É
+Ê
+Ë
+Ì
+Í
+Î
+Ï
+Ð
+Ñ
+Ò
+Ó
+Ô
+Õ
+Ö
+×
+Ø
+Ù
+Ú
+Û
+Ü
+Ý
+Þ
+ß
+à
+á
+â
+ã
+ä
+å
+æ
+ç
+è
+é
+ê
+ë
+ì
+í
+î
+ï
+ð
+ñ
+ò
+ó
+ô
+õ
+ö
+÷
+ø
+ù
+ú
+û
+ü
+ý
+þ
+ÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ	
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrsuni000D0000uni0001uni0002uni0003uni0004uni0005uni0006uni0007uni0008uni0009uni000Auni000Buni000Cuni000Euni000Funi0010uni0011uni0012uni0013uni0014uni0015uni0016uni0017uni0018uni0019uni001Auni001Buni001Cuni001Duni001Euni001F0020002100220023002400250026002700280029002A002B002C002D002E002F0030003100320033003400350036003700380039003A003B003C003D003E003F0040004100420043004400450046004700480049004A004B004C004D004E004F0050005100520053005400550056005700580059005A005B005C005D005E005F0060006100620063006400650066006700680069006A006B006C006D006E006F0070007100720073007400750076007700780079007A007B007C007D007E007F00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF00D000D100D200D300D400D500D600D700D800D900DA00DB00DC00DD00DE00DF00E000E100E200E300E400E500E600E700E800E900EA00EB00EC00ED00EE00EF00F000F100F200F300F400F500F600F700F800F900FA00FB00FC00FD00FE00FF0100010101020103010401050106010701080109010A010B010C010D010E010F0110011101120113011401150116011701180119011A011B011C011D011E011F0120012101220123012401250126012701280129012A012B012C012D012E012F0130013101320133013401350136013701380139013A013B013C013D013E013F0140014101420143014401450146014701480149014A014B014C014D014E014F0150015101520153015401550156015701580159015A015B015C015D015E015F0160016101620163016401650166016701680169016A016B016C016D016E016F0170017101720173017401750176017701780179017A017B017C017D017E017F0180018101820183018401850186018701880189018A018B018C018D018E018F0190019101920193019401950196019701980199019A019B019C019D019E019F01A001A101A201A301A401A501A601A701A801A901AA01AB01AC01AD01AE01AF01B001B101B201B301B401B501B601B701B801B901BA01BB01BC01BD01BE01BF01C001C101C201C301C401C501C601C701C801C901CA01CB01CC01CD01CE01CF01D001D101D201D301D401D501D601D701D801D901DA01DB01DC01DD01DE01DF01E001E101E201E301E401E501E601E701E801E901EA01EB01EC01ED01EE01EF01F001F101F201F301F401F501F601F701F801F901FA01FB01FC01FD01FE01FF0200020102020203020402050206020702080209020A020B020C020D020E020F0210021102120213021402150216021702180219021A021B021C021D021E021F02220223022402250226022702280229022A022B022C022D022E022F02300231023202330250025102520253025402550256025702580259025A025B025C025D025E025F0260026102620263026402650266026702680269026A026B026C026D026E026F0270027102720273027402750276027702780279027A027B027C027D027E027F0280028102820283028402850286028702880289028A028B028C028D028E028F0290029102920293029402950296029702980299029A029B029C029D029E029F02A002A102A202A302A402A502A602A702A802A902AA02AB02AC02AD02B002B102B202B302B402B502B602B702B802B902BA02BB02BC02BD02BE02BF02C002C102C202C302C402C502C602C702C802C902CA02CB02CC02CD02CE02CF02D802D902DA02DB02DC02DD02EE030003010303030903120313031403230340034103740375037A037E038403850386038703880389038A038C038E038F0390039103920393039403950396039703980399039A039B039C039D039E039F03A003A103A303A403A503A603A703A803A903AA03AB03AC03AD03AE03AF03B003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF03C003C103C203C303C403C503C603C703C803C903CA03CB03CC03CD03CE03D003D103D203D303D403D503D603D703DA03DB03DC03DD03DE03DF03E003E103E203E303E403E503E603E703E803E903EA03EB03EC03ED03EE03EF03F003F103F203F30400040104020403040404050406040704080409040A040B040C040D040E040F0410041104120413041404150416041704180419041A041B041C041D041E041F0420042104220423042404250426042704280429042A042B042C042D042E042F0430043104320433043404350436043704380439043A043B043C043D043E043F0440044104420443044404450446044704480449044A044B044C044D044E044F0450045104520453045404550456045704580459045A045B045C045D045E045F0460046104620463046404650466046704680469046A046B046C046D046E046F0470047104720473047404750476047704780479047A047B047C047D047E047F048004810482048304840485048604880489048A048B048C048D048E048F0490049104920493049404950496049704980499049A049B049C049D049E049F04A004A104A204A304A404A504A604A704A804A904AA04AB04AC04AD04AE04AF04B004B104B204B304B404B504B604B704B804B904BA04BB04BC04BD04BE04BF04C004C104C204C304C404C504C604C704C804C904CA04CB04CC04CD04CE04D004D104D204D304D404D504D604D704D804D904DA04DB04DC04DD04DE04DF04E004E104E204E304E404E504E604E704E804E904EA04EB04EC04ED04EE04EF04F004F104F204F304F404F504F804F90500050105020503050405050506050705080509050A050B050C050D050E050F0530053105320533053405350536053705380539053A053B053C053D053E053F0540054105420543054405450546054705480549054A054B054C054D054E054F05500551055205530554055505560559055A055B055C055D055E055F056105620563056405650566056705680569056A056B056C056D056E056F0570057105720573057405750576057705780579057A057B057C057D057E057F058005810582058305840585058605870589058A059105920593059405950596059705980599059A059B059C059D059E059F05A005A105A305A405A505A605A705A805A905AA05AB05AC05AD05AE05AF05B005B105B205B305B405B505B605B705B805B905BB05BC05BD05BE05BF05C005C105C205C305C405D005D105D205D305D405D505D605D705D805D905DA05DB05DC05DD05DE05DF05E005E105E205E305E405E505E605E705E805E905EA05F005F105F205F305F4060C061B061F062106220623062406250626062706280629062A062B062C062D062E062F0630063106320633063406350636063706380639063A0640064106420643064406450646064706480649064A064B064C064D064E064F0650065106520653065406550660066106620663066406650666066706680669066A066B066C066D0670067106720673067406750676067706780679067A067B067C067D067E067F0680068106820683068406850686068706880689068A068B068C068D068E068F0690069106920693069406950696069706980699069A069B069C069D069E069F06A006A106A206A306A406A506A606A706A806A906AA06AB06AC06AD06AE06AF06B006B106B206B306B406B506B606B706B806B906BA06BB06BC06BD06BE06BF06C006C106C206C306C406C506C606C706C806C906CA06CB06CC06CD06CE06CF06D006D106D206D306D406D506D606D706D806D906DA06DB06DC06DD06DE06DF06E006E106E206E306E406E506E606E706E806E906EA06EB06EC06ED06F006F106F206F306F406F506F606F706F806F906FA06FB06FC06FD06FE10D310D710DA10DD10E61E001E011E021E031E041E051E061E071E081E091E0A1E0B1E0C1E0D1E0E1E0F1E101E111E121E131E141E151E161E171E181E191E1A1E1B1E1C1E1D1E1E1E1F1E201E211E221E231E241E251E261E271E281E291E2A1E2B1E2C1E2D1E2E1E2F1E301E311E321E331E341E351E361E371E381E391E3A1E3B1E3C1E3D1E3E1E3F1E401E411E421E431E441E451E461E471E481E491E4A1E4B1E4C1E4D1E4E1E4F1E501E511E521E531E541E551E561E571E581E591E5A1E5B1E5C1E5D1E5E1E5F1E601E611E621E631E641E651E661E671E681E691E6A1E6B1E6C1E6D1E6E1E6F1E701E711E721E731E741E751E761E771E781E791E7A1E7B1E7C1E7D1E7E1E7F1E801E811E821E831E841E851E861E871E881E891E8A1E8B1E8C1E8D1E8E1E8F1E901E911E921E931E941E951E961E971E981E991E9A1E9B1EA01EA11EA21EA31EA41EA51EA61EA71EA81EA91EAA1EAB1EAC1EAD1EAE1EAF1EB01EB11EB21EB31EB41EB51EB61EB71EB81EB91EBA1EBB1EBC1EBD1EBE1EBF1EC01EC11EC21EC31EC41EC51EC61EC71EC81EC91ECA1ECB1ECC1ECD1ECE1ECF1ED01ED11ED21ED31ED41ED51ED61ED71ED81ED91EDA1EDB1EDC1EDD1EDE1EDF1EE01EE11EE21EE31EE41EE51EE61EE71EE81EE91EEA1EEB1EEC1EED1EEE1EEF1EF01EF11EF21EF31EF41EF51EF61EF71EF81EF91F001F011F021F031F041F051F061F072000200120022003200420052006200720082009200A200B200C200D200E200F2010201120122013201420152016201720182019201A201B201C201D201E201F202020212022202320242025202620272030203120322033203420352036203720382039203A203B203C203D203E203F204020412042204320442045204620482049204A204B204C204D2070207420752076207720782079207A207B207C207D207E207F2080208120822083208420852086208720882089208A208B208C208D208E208F20A020A120A220A320A420A520A620A720A820A920AA20AB20AC20AD20AE20AF2100210121022103210421052106210721082109210A210B210C210D210E210F2110211121122113211421152116211721182119211A211B211C211D211E211F2120212121222123212421252126212721282129212A212B212C212D212E212F2130213121322133213421352136213721382139213A2153215421552156215721582159215A215B215C215D215E215F2160216121622163216421652166216721682169216A216B216C216D216E216F2170217121722173217421752176217721782179217A217B217C217D217E217F21802181218221832190219121922193219421952196219721982199219A219B219C219D219E219F21A021A121A221A321A421A521A621A721A821A921AA21AB21AC21AD21AE21AF21B021B121B221B321B421B521B621B721B821B921BA21BB21BC21BD21BE21BF21C021C121C221C321C421C521C621C721C821C921CA21CB21CC21CD21CE21CF21D021D121D221D321D421D521D621D721D821D921DA21DB21DC21DD21DE21DF21E021E121E221E321E421E521E621E721E821E921EA21EB21EC21ED21EE21EF21F021F121F221F32200220122022203220422052206220722082209220A220B220C220D220E220F2210221122122213221422152216221722182219221A221B221C221D221E221F2220222122222223222422252226222722282229222A222B222C222D222E222F2230223122322233223422352236223722382239223A223B223C223D223E223F2240224122422243224422452246224722482249224A224B224C224D224E224F2250225122522253225422552256225722582259225A225B225C225D225E225F2260226122622263226422652266226722682269226A226B226C226D226E226F2270227122722273227422752276227722782279227A227B227C227D227E227F2280228122822283228422852286228722882289228A228B228C228D228E228F2290229122922293229422952296229722982299229A229B229C229D229E229F22A022A122A222A322A422A522A622A722A822A922AA22AB22AC22AD22AE22AF22B022B122B222B322B422B522B622B722B822B922BA22BB22BC22BD22BE22BF22C022C122C222C322C422C522C622C722C822C922CA22CB22CC22CD22CE22CF22D022D122D222D322D422D522D622D722D822D922DA22DB22DC22DD22DE22DF22E022E122E222E322E422E522E622E722E822E922EA22EB22EC22ED22EE22EF22F022F12300230223082309230A230B23102318231A231B232023212329232A239B239C239D239E239F23A023A123A223A323A423A523A623A723A823A923AA23AB23AC23AD23AE23AF23B023B123B223B323B423B523B623B723B823B923BA23BB23BC23BD23CE2409240A240B240C240D2423242424262500250125022503250425052506250725082509250A250B250C250D250E250F2510251125122513251425152516251725182519251A251B251C251D251E251F2520252125222523252425252526252725282529252A252B252C252D252E252F2530253125322533253425352536253725382539253A253B253C253D253E253F2540254125422543254425452546254725482549254A254B254C254D254E254F2550255125522553255425552556255725582559255A255B255C255D255E255F2560256125622563256425652566256725682569256A256B256C256D256E256F2570257125722573257425752576257725782579257A257B257C257D257E257F2580258125822583258425852586258725882589258A258B258C258D258E258F25902591259225932594259525A025A125A225A325A425A525A625A725A825A925AA25AB25AC25AD25AE25AF25B025B125B225B325B425B525B625B725B825B925BA25BB25BC25BD25BE25BF25C025C125C225C325C425C525C625C725C825C925CA25CB25CC25CD25CE25CF25D025D125D225D325D425D525D625D725D825D925DA25DB25DC25DD25DE25DF25E025E125E225E325E425E525E625E725E825E925EA25EB25EC25ED25EE25EF25F025F125F225F325F425F525F625F726002601260226052606260726082609260A260B260C260D261026112612261326202622262626282629262A262B262E262F263026312632263326342635263626372639263A263B263C263D263E263F2640264126422643264426452646264726482649264A264B264C264D264E264F2650265126522653266026612662266326642665266626672669266A266B266C266D266E266FFB00FB01FB02FB03FB04FB05FB50FB51FB52FB53FB54FB55FB56FB57FB58FB59FB5AFB5BFB5CFB5DFB5EFB5FFB60FB61FB62FB63FB64FB65FB66FB67FB68FB69FB6AFB6BFB6CFB6DFB6EFB6FFB70FB71FB72FB73FB74FB75FB76FB77FB78FB79FB7AFB7BFB7CFB7DFB7EFB7FFB80FB81FB82FB83FB84FB85FB86FB87FB88FB89FB8AFB8BFB8CFB8DFB8EFB8FFB90FB91FB92FB93FB94FB95FB96FB97FB98FB99FB9AFB9BFB9CFB9DFB9EFB9FFBA0FBA1FBA2FBA3FBA4FBA5FBA6FBA7FBA8FBA9FBAAFBABFBACFBADFBAEFBAFFBB0FBB1FBD3FBD4FBD5FBD6FBD7FBD8FBD9FBDAFBDBFBDCFBDDFBDEFBDFFBE0FBE1FBE2FBE3FBE4FBE5FBE6FBE7FBE8FBE9FBFCFBFDFBFEFBFFFC5BFC5CFC5DFC5EFC5FFC60FC61FC62FC63FC90FCF2FCF3FCF4FD3CFD3DFD3EFD3FFDF2FE50FE51FE52FE54FE55FE56FE57FE58FE59FE5AFE5BFE5CFE5DFE5EFE5FFE60FE61FE62FE63FE64FE65FE66FE68FE69FE6AFE6BFE70FE71FE72FE74FE76FE77FE78FE79FE7AFE7BFE7CFE7DFE7EFE7FFE80FE81FE82FE83FE84FE85FE86FE87FE88FE89FE8AFE8BFE8CFE8DFE8EFE8FFE90FE91FE92FE93FE94FE95FE96FE97FE98FE99FE9AFE9BFE9CFE9DFE9EFE9FFEA0FEA1FEA2FEA3FEA4FEA5FEA6FEA7FEA8FEA9FEAAFEABFEACFEADFEAEFEAFFEB0FEB1FEB2FEB3FEB4FEB5FEB6FEB7FEB8FEB9FEBAFEBBFEBCFEBDFEBEFEBFFEC0FEC1FEC2FEC3FEC4FEC5FEC6FEC7FEC8FEC9FECAFECBFECCFECDFECEFECFFED0FED1FED2FED3FED4FED5FED6FED7FED8FED9FEDAFEDBFEDCFEDDFEDEFEDFFEE0FEE1FEE2FEE3FEE4FEE5FEE6FEE7FEE8FEE9FEEAFEEBFEECFEEDFEEEFEEFFEF0FEF1FEF2FEF3FEF4FEF5FEF6FEF7FEF8FEF9FEFAFEFBFEFCFEFFFFFDÿÿÌ=¢ÏÎÅß¼ÎÕs …
+
+!""
+$#'%)(**++,,--..//10;2<<==>>??@@BA]]^^__b`}}~~�€‚‚ƒƒ‡„‹ˆ‘�“’•”––š˜››¡�¹¹ÙÙ|{—„¤™¨¦ªª™”mm¿nÀÀçÁòèüóýýÿþfmgnnuowv~xˆ�‰›‘
+žœ Ÿ
+¸¡½¹Á¾ÂÂÃÃÌÄÍÍÎÎÏÏÕÐÜÖÞÝßßààááìãîíïïððññòòó	&!((**,,11J=äoååææÆçÇÇÈÈÉÉÊÊÐËÑÑÒÒ
+7Ó
+É
+>
+Ë
+Ê
+Ì
+Ì
+Í
+Í
+Î
+Î
+Ï
+Ï
+Ð
+Ð
+Ñ
+Ñ
+Ú
+Ò
+Û
+Û
+Ý
+Ü
+ß
+Þ
+ã
+à
+å
+ä
+æ
+æq
+çsrÿÿÿÿ
\ No newline at end of file

Modification de propriÃ©tÃ©s sur media/fonts/UniVGA16.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: media/inf/machine.inf
===================================================================
--- media/inf/machine.inf	(rÃ©vision 61927)
+++ media/inf/machine.inf	(copie de travail)
@@ -91,6 +91,8 @@
 
 %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F
 
+%SWENUM.DeviceDesc%   = SWENUM_Inst, ROOT\SWENUM
+
 
 
 %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton
@@ -147,6 +149,64 @@
 
 
 
+
+
+;-------------------------- SWENUM BUS DRIVER --------------------------
+
+
+
+[SWENUM_Inst.NT]
+
+CopyFiles = SWENUM_CopyFiles.NT
+
+
+
+[SWENUM_CopyFiles.NT]
+
+swenum.sys
+
+
+
+[SWENUM_Inst.NT.Services]
+
+AddService = swenum, 0x00000002, SWENUM_Service_Inst
+
+
+
+[SWENUM.CoInstallers]
+
+AddReg          = SWENUM_Inst_CoInstallers_AddReg
+
+CopyFiles       = SWENUM_Inst_CoInstallers_CopyFiles
+
+
+
+[SWENUM_Inst_CoInstallers_AddReg]
+
+HKR,,CoInstallers32,0x10000,"streamci.dll,SwEnumCoInstaller"
+
+
+
+[SWENUM_Inst_CoInstallers_CopyFiles]
+
+streamci.dll
+
+
+
+[SWENUM_Service_Inst]
+
+ServiceType    = 1
+
+StartType      = 0
+
+ErrorControl   = 3
+
+ServiceBinary  = %12%\swenum.sys
+
+LoadOrderGroup = Boot Bus Extender
+
+
+
 ;-------------------------- PCI-ISA BUS DRIVER --------------------------
 
 
@@ -284,6 +344,8 @@
 
 PCI\CC_0C05.DeviceDesc = "SMBus Controller"
 
+SWENUM.DeviceDesc  = "Plug & Play Software Bus Enumerator"
+
 
 
 IntelMfg = "Intel"
Index: media/inf/shortcuts.inf
===================================================================
--- media/inf/shortcuts.inf	(rÃ©vision 61927)
+++ media/inf/shortcuts.inf	(copie de travail)
@@ -16,12 +16,14 @@
 
 AccessoriesShortcuts=2, %ACCESSORIES%
 
-SystemToolsShortcuts=2, %SYSTOOLS%
+SystemToolsShortcuts=2, %ACCESSORIES%\%SYSTOOLS%
 
-AccessibilityShortcuts=2, %ACCESSIBILITY%
+AccessibilityShortcuts=2, %ACCESSORIES%\%ACCESSIBILITY%
 
-EntertainmentShortcuts=2, %ENTERTAINMENT%
+EntertainmentShortcuts=2, %ACCESSORIES%\%ENTERTAINMENT%
 
+CommunicationsShortcuts=2, %ACCESSORIES%\%COMMUNICATIONS%
+
 GamesShortcuts=2, %GAMES%
 
 
@@ -52,6 +54,12 @@
 
 
 
+[CommunicationsShortcuts]
+
+%SystemRoot%\system32\mstsc.exe, %MSTSC_TITLE%, %MSTSC_DESC%, 0
+
+
+
 [AccessoriesShortcuts]
 
 %SystemRoot%\system32\calc.exe, %CALC_TITLE%, %CALC_DESC%, 0
@@ -60,8 +68,6 @@
 
 %SystemRoot%\system32\notepad.exe, %NOTEPAD_TITLE%, %NOTEPAD_DESC%, 0
 
-%SystemRoot%\system32\mstsc.exe, %MSTSC_TITLE%, %MSTSC_DESC%, 0
-
 %SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0
 
 %SystemRoot%\system32\wordpad.exe, %WORDPAD_TITLE%, %WORDPAD_DESC%, 0
@@ -76,7 +82,7 @@
 
 %SystemRoot%\system32\kbswitch.exe, %KBSWITCH_TITLE%, %KBSWITCH_DESC%, 0
 
-%SystemRoot%\system32\regedit32.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0
+%SystemRoot%\system32\regedt32.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0
 
 %SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0
 
@@ -124,6 +130,8 @@
 
 ENTERTAINMENT=Entertainment
 
+COMMUNICATIONS=Communications
+
 GAMES=Games
 
 
@@ -164,9 +172,9 @@
 
 NOTEPAD_DESC=Launch Text Editor
 
-MSTSC_TITLE=Remote Desktop
+MSTSC_TITLE=Remote Desktop Connection
 
-MSTSC_DESC=Launch Registry Editor
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -176,7 +184,7 @@
 
 WORDPAD_DESC=Launch Document Editor
 
-MSPAINT_TITLE=MSPaint
+MSPAINT_TITLE=Paint
 
 MSPAINT_DESC=Launch Paint
 
@@ -188,7 +196,7 @@
 
 KBSWITCH_DESC=Keyboard Layout Switcher
 
-REGEDIT_TITLE=Regedit
+REGEDIT_TITLE=Registry Editor
 
 REGEDIT_DESC=Launch Registry Editor
 
@@ -208,7 +216,7 @@
 
 SNDVOL_DESC=Launch Volume Control
 
-SNDREC32_TITLE=Audiorecorder
+SNDREC32_TITLE=Sound Recorder
 
 SNDREC32_DESC=Launch Sound Recorder
 
@@ -238,6 +246,8 @@
 
 ENTERTAINMENT=0102;5=85
 
+COMMUNICATIONS=Communications
+
 GAMES=3@8
 
 
@@ -280,7 +290,7 @@
 
 MSTSC_TITLE=0;5G=0 @01>B=0 ?;>I
 
-MSTSC_DESC=CA:0=5 =0 @538AB@>>1@01>B20I0B0
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=!=8<:0
 
@@ -352,6 +362,8 @@
 
 ENTERTAINMENT=Zábava
 
+COMMUNICATIONS=Communications
+
 GAMES=Hry
 
 
@@ -474,6 +486,8 @@
 
 ENTERTAINMENT=Unterhaltung
 
+COMMUNICATIONS=Kommunikation
+
 GAMES=Spiele
 
 
@@ -516,7 +530,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Starte Registrierungseditor
+MSTSC_DESC=Remote Desktop Verbindung starten
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -588,6 +602,8 @@
 
 ENTERTAINMENT=”¹±Ãº­´±Ã·
 
+COMMUNICATIONS=Communications
+
 GAMES= ±¹Ç½¯´¹±
 
 
@@ -630,7 +646,7 @@
 
 MSTSC_TITLE=£Í½´µÃ· ±À¿¼±ºÁÅÃ¼­½·Â µÀ¹Æ¬½µ¹±Â µÁ³±Ã¯±Â
 
-MSTSC_DESC=•Àµ¾µÁ³±ÃÄ®Â ¼·ÄÁÎ¿Å
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -702,6 +718,8 @@
 
 ENTERTAINMENT=Entretenimiento
 
+COMMUNICATIONS=Communications
+
 GAMES=Juegos
 
 
@@ -744,7 +762,7 @@
 
 MSTSC_TITLE=Escritorio Remoto
 
-MSTSC_DESC=Ejecutar Editor del registro
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -816,6 +834,8 @@
 
 ENTERTAINMENT=Meelelahutus
 
+COMMUNICATIONS=Communications
+
 GAMES=Mängud
 
 
@@ -858,7 +878,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Ava Registriredaktor
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -930,6 +950,8 @@
 
 ENTERTAINMENT=Divertissement
 
+COMMUNICATIONS=Communications
+
 GAMES=Jeux
 
 
@@ -972,7 +994,7 @@
 
 MSTSC_TITLE=Bureau Distant
 
-MSTSC_DESC=Lancer l'Éditeur de Registre
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=Capture d'écran
 
@@ -1044,6 +1066,8 @@
 
 ENTERTAINMENT=ÑÙÓÕè
 
+COMMUNICATIONS=Communications
+
 GAMES=Þé×çÙÝ
 
 
@@ -1086,7 +1110,7 @@
 
 MSTSC_TITLE=éÕÜ×ß âÑÕÓÔ ÞèÕ×ç
 
-MSTSC_DESC=âÕèÚ ÔèÙéÕÝ
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -1158,6 +1182,8 @@
 
 ENTERTAINMENT=Entertainment
 
+COMMUNICATIONS=Communications
+
 GAMES=Játékok
 
 
@@ -1200,7 +1226,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Launch Registry Editor
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -1272,6 +1298,8 @@
 
 ENTERTAINMENT=Entertainment
 
+COMMUNICATIONS=Communications
+
 GAMES=Games
 
 
@@ -1314,7 +1342,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Jalankan Editor Registri
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -1386,6 +1414,8 @@
 
 ENTERTAINMENT=Divertimento
 
+COMMUNICATIONS=Communications
+
 GAMES=Giochi
 
 
@@ -1428,7 +1458,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Lancia l'editor del registro
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -1500,6 +1530,8 @@
 
 ENTERTAINMENT=¨0ó0¿0ü0Æ0¤0á0ó0È0
 
+COMMUNICATIONS=Communications
+
 GAMES=²0ü0à0
 
 
@@ -1542,7 +1574,7 @@
 
 MSTSC_TITLE=ê0â0ü0È0 Ç0¹0¯0È0Ã0×0¥cš}
 
-MSTSC_DESC=ì0¸0¹0È0ê0 ¨0Ç0£0¿0’0w�ÕRW0~0Y0
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=¹0Ê0Ã0×0·0ç0Ã0È0
 
@@ -1614,6 +1646,8 @@
 
 ENTERTAINMENT=Entertainment
 
+COMMUNICATIONS=Communications
+
 GAMES=Games
 
 
@@ -1656,7 +1690,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Launch Registry Editor
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -1728,6 +1762,8 @@
 
 ENTERTAINMENT=Underholdning
 
+COMMUNICATIONS=Communications
+
 GAMES=Spill
 
 
@@ -1770,7 +1806,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Start Registerredigering
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -1842,6 +1878,8 @@
 
 ENTERTAINMENT=Rozrywka
 
+COMMUNICATIONS=Communications
+
 GAMES=Gry
 
 
@@ -1884,7 +1922,7 @@
 
 MSTSC_TITLE=Dostp zdalny
 
-MSTSC_DESC=Uruchom Edytor rejestru
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=Zrzut ekranu
 
@@ -1956,6 +1994,8 @@
 
 ENTERTAINMENT=Entretenimento
 
+COMMUNICATIONS=Communications
+
 GAMES=Jogos
 
 
@@ -1998,7 +2038,7 @@
 
 MSTSC_TITLE=Remote Desktop
 
-MSTSC_DESC=Iniciar Editor do Registro
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -2070,6 +2110,8 @@
 
 ENTERTAINMENT=Distracie
 
+COMMUNICATIONS=Communications
+
 GAMES=Jocuri
 
 
@@ -2112,7 +2154,7 @@
 
 MSTSC_TITLE=Birou la distan
 
-MSTSC_DESC=Deschide Editor de registru
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=Captur de ecran
 
@@ -2184,6 +2226,8 @@
 
 ENTERTAINMENT= 072;5G5=8O
 
+COMMUNICATIONS=Communications
+
 GAMES=3@K
 
 
@@ -2226,7 +2270,7 @@
 
 MSTSC_TITLE=#40;5==K9 @01>G89 AB>;
 
-MSTSC_DESC=0?CAB8BL @540:B>@ @55AB@0
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=SnapShot
 
@@ -2298,6 +2342,8 @@
 
 ENTERTAINMENT=Zábava
 
+COMMUNICATIONS=Communications
+
 GAMES=Hry
 
 
@@ -2344,7 +2390,7 @@
 
 MSTSC_TITLE=Vzdialená pracovná plocha
 
-MSTSC_DESC=Spustie Editor registrov
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=Momentka //SnapShot
 
@@ -2422,6 +2468,8 @@
 
 ENTERTAINMENT=Elence
 
+COMMUNICATIONS=Communications
+
 GAMES=Oyunlar
 
 
@@ -2464,7 +2512,7 @@
 
 MSTSC_TITLE=Uzak Masaüstü Balant1s1
 
-MSTSC_DESC=Kay1t Düzenleyicisi'ni ba_lat
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=Ekran Görüntüsü
 
@@ -2536,6 +2584,8 @@
 
 ENTERTAINMENT= >72038
 
+COMMUNICATIONS=Communications
+
 GAMES=3@8
 
 
@@ -2578,7 +2628,7 @@
 
 MSTSC_TITLE=V440;5=5 :5@C20==O @>1>G8< AB>;><
 
-MSTSC_DESC=0?CAB8B8  540:B>@ @5TAB@C
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE==V<>: 5:@0=C
 
@@ -2650,6 +2700,8 @@
 
 ENTERTAINMENT=Entertainment
 
+COMMUNICATIONS=Communications
+
 GAMES=8nb
 
 
@@ -2694,7 +2746,7 @@
 
 MSTSC_TITLE=Ü�zLhb—Þ�¥c
 
-MSTSC_DESC=èlŒQhˆ‘�hV
+MSTSC_DESC=Launch Remote Desktop Connection
 
 SCREENSHOT_TITLE=O\U^*bþV
 
Index: media/inf/nettcpip.inf
===================================================================
--- media/inf/nettcpip.inf	(rÃ©vision 61927)
+++ media/inf/nettcpip.inf	(copie de travail)
@@ -1,155 +1,78 @@
-ÿþ; NETTCPIP.INF
+ÿþ; NETTCPIP.INF
 
-
+; Installation file for TCP/IP protocol
 
-; Installation file for TCP/IP protocol
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = NetTrans
+ClassGUID  = {4D36E975-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 04/12/2006,1.00
 
-
+;----------------------------- TCP/IP DRIVER ----------------------------
 
-[Version]
+[MS_TCPIP.PrimaryInstall]
+AddReg = TCPIP_AddReg_Global.NT
 
-Signature  = "$Windows NT$"
+[TCPIP_AddReg_Global.NT]
+; The following entries should be generated from .inf files during installation
+; TCPIP Protocol
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip"
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol (TCP/IP)"
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf"
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf"
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}"
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol"
+HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip"
 
-;Signature  = "$ReactOS$"
+; TCP/IP driver
+; NOTE: These settings should be added by the network setup
+; These bindings are of the windows 2000 type, and will probably need to be
+; twiddled to get 3rd-party network-related software to work.
+; NT4 puts additional stuff in the Bind, Export, and Route values.
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll"
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip"
 
-LayoutFile = layout.inf
+[MS_TCPIP.PrimaryInstall.Services]
+AddService = Tcpip, , tcpip_Service_Inst
 
-Class      = NetTrans
+[tcpip_Service_Inst]
+ServiceType   = 1
+StartType     = 1
+ErrorControl  = 1
+ServiceBinary = %12%\tcpip.sys
+LoadOrderGroup = PNP_TDI
+AddReg = tcpip_AddReg
 
-ClassGUID  = {4D36E975-E325-11CE-BFC1-08002BE10318}
+[tcpip_AddReg]
+HKR,"Parameters","DataBasePath",0x00020000,"DataBasePath"
+HKR,"Parameters","Domain",0x00000000,""
+HKR,"Parameters","Hostname",0x00000000,"ROSHost"
+HKR,"Parameters","NameServer",0x00000000,""
+HKR,"Parameters","ForwardBroadcasts",0x00010001,0x00000000
+HKR,"Parameters","IPEnableRouter",0x00010001,0x00000000
+HKR,"Parameters","SearchList",0x00000000,""
+HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000
+;HKR,"Parameters","PersistentRoutes",,0x00000010
 
-Provider   = %ReactOS%
+;-------------------------------- STRINGS -------------------------------
 
-DriverVer  = 04/12/2006,1.00
+[Strings]
+ReactOS = "ReactOS Team"
 
-
+[Strings.0415]
+ReactOS = "Ekipa ReactOS"
 
-;----------------------------- TCP/IP DRIVER ----------------------------
+[Strings.0418]
+ReactOS = "Echipa ReactOS"
 
-
-
-[MS_TCPIP.PrimaryInstall]
-
-AddReg = TCPIP_AddReg_Global.NT
-
-
-
-[TCPIP_AddReg_Global.NT]
-
-; The following entries should be generated from .inf files during installation
-
-; TCPIP Protocol
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol (TCP/IP)"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip"
-
-
-
-; TCP/IP driver
-
-; NOTE: These settings should be added by the network setup
-
-; These bindings are of the windows 2000 type, and will probably need to be
-
-; twiddled to get 3rd-party network-related software to work.
-
-; NT4 puts additional stuff in the Bind, Export, and Route values.
-
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000
-
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010
-
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010
-
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll"
-
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00,00
-
-HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip"
-
-
-
-[MS_TCPIP.PrimaryInstall.Services]
-
-AddService = Tcpip, , tcpip_Service_Inst
-
-
-
-[tcpip_Service_Inst]
-
-ServiceType   = 1
-
-StartType     = 1
-
-ErrorControl  = 1
-
-ServiceBinary = %12%\tcpip.sys
-
-LoadOrderGroup = PNP_TDI
-
-AddReg = tcpip_AddReg
-
-
-
-[tcpip_AddReg]
-
-HKR,"Parameters","DataBasePath",0x00010000,"DataBasePath"
-
-HKR,"Parameters","Domain",0x00010000,""
-
-HKR,"Parameters","Hostname",0x00010000,"ROSHost"
-
-HKR,"Parameters","NameServer",0x00010000,""
-
-HKR,"Parameters","ForwardBroadcasts",0x00010001,0x00000000
-
-HKR,"Parameters","IPEnableRouter",0x00010001,0x00000000
-
-HKR,"Parameters","SearchList",0x00010000,""
-
-HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000
-
-;HKR,"Parameters","PersistentRoutes",,0x00000010
-
-
-
-;-------------------------------- STRINGS -------------------------------
-
-
-
-[Strings]
-
-ReactOS = "ReactOS Team"
-
-
-
-[Strings.0415]
-
-ReactOS = "Ekipa ReactOS"
-
-
-
-[Strings.0418]
-
-ReactOS = "Echipa ReactOS"
-
-
-
-[Strings.0422]
-
-ReactOS = "><0=40 ReactOS"
-
+[Strings.0422]
+ReactOS = "><0=40 ReactOS"
 
\ No newline at end of file
Index: cmake/msvc.cmake
===================================================================
--- cmake/msvc.cmake	(rÃ©vision 61927)
+++ cmake/msvc.cmake	(copie de travail)
@@ -43,6 +43,7 @@
 
 # The following warnings are treated as errors:
 # - C4013: implicit function declaration
+# - C4020: too many actual parameters
 # - C4022: pointer type mismatch for parameter
 # - TODO: C4028: formal parameter different from declaration
 # - C4047: different level of indirection
@@ -54,7 +55,8 @@
 # - TODO: C4133: incompatible types
 # - C4229: modifiers on data are ignored
 # - C4700: uninitialized variable usage
-add_compile_flags("/we4013 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700")
+# - C4603: macro is not defined or definition is different after precompiled header use
+add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700 /we4603")
 
 # Enable warnings above the default level, but don't treat them as errors:
 # - C4115: named type definition in parentheses
@@ -83,6 +85,12 @@
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
 
+if(CMAKE_DISABLE_NINJA_DEPSLOG)
+    set(cl_includes_flag "")
+else()
+    set(cl_includes_flag "/showIncludes")
+endif()
+
 if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
     # for VS builds we'll only have en-US in resource files
     add_definitions(/DLANGUAGE_EN_US)
@@ -89,7 +97,7 @@
 else()
     set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>")
     set(CMAKE_ASM_COMPILE_OBJECT
-        "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
+        "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
         "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
 endif()
 
@@ -112,9 +120,55 @@
 set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})
 set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
 
-macro(add_pch _target_name _FILE)
-endmacro()
+if(PCH)
+    macro(add_pch _target _pch _sources)
 
+        # Workaround for the MSVC toolchain (MSBUILD) /MP bug
+        set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch)
+        if(MSVC_IDE)
+            file(TO_NATIVE_PATH ${_temp_gch} _gch)
+        else()
+            set(_gch ${_temp_gch})
+        endif()
+
+        if(IS_CPP)
+            set(_pch_language CXX)
+            set(_cl_lang_flag "/TP")
+        else()
+            set(_pch_language C)
+            set(_cl_lang_flag "/TC")
+        endif()
+
+        if(MSVC_IDE)
+            set(_pch_path_name_flag "/Fp${_gch}")
+        endif()
+
+        # Build the precompiled header
+        # HEADER_FILE_ONLY FALSE: force compiling the header
+        set_source_files_properties(${_pch} PROPERTIES
+            HEADER_FILE_ONLY FALSE
+            LANGUAGE ${_pch_language}
+            COMPILE_FLAGS "${_cl_lang_flag} /Yc /Fp${_gch}"
+            OBJECT_OUTPUTS ${_gch})
+
+        # Prevent a race condition related to writing to the PDB files between the PCH and the excluded list of source files
+        get_target_property(_target_sources ${_target} SOURCES)
+        list(REMOVE_ITEM _target_sources ${_pch})
+        foreach(_target_src ${_target_sources})
+            set_property(SOURCE ${_target_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch})
+        endforeach()
+
+        # Use the precompiled header with the specified source files, skipping the pch itself
+        list(REMOVE_ITEM ${_sources} ${_pch})
+        foreach(_src ${${_sources}})
+            set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " /FI${_gch} /Yu${_gch} ${_pch_path_name_flag}")
+        endforeach()
+    endmacro()
+else()
+    macro(add_pch _target _pch _sources)
+    endmacro()
+endif()
+
 function(set_entrypoint _module _entrypoint)
     if(${_entrypoint} STREQUAL "0")
         add_target_link_flags(${_module} "/NOENTRY")
@@ -248,7 +302,7 @@
 endfunction()
 
 macro(macro_mc FLAG FILE)
-    set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc)
+    set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos)
 endmacro()
 
 #pseh workaround
@@ -297,9 +351,9 @@
         get_directory_property(_defines COMPILE_DEFINITIONS)
         foreach(_source_file ${ARGN})
             get_filename_component(_source_file_base_name ${_source_file} NAME_WE)
+            get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE)
             set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.tmp)
             set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.obj)
-            set(_source_file_full_path ${CMAKE_CURRENT_SOURCE_DIR}/${_source_file})
             get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS)
             unset(_source_file_defines)
             foreach(_define ${_defines_semicolon_list})
Index: cmake/baseaddress.cmake
===================================================================
--- cmake/baseaddress.cmake	(rÃ©vision 61927)
+++ cmake/baseaddress.cmake	(copie de travail)
@@ -1,4 +1,4 @@
-set(baseaddress_ntdll                0x77f10000)
+set(baseaddress_ntdll                0x7c920000) # should be above 0x7c920000
 set(baseaddress_kernel32             0x77d80000)
 set(baseaddress_msvcrt               0x77cd0000)
 set(baseaddress_advapi32             0x77c20000)
Index: cmake/CMakeMacros.cmake
===================================================================
--- cmake/CMakeMacros.cmake	(rÃ©vision 61927)
+++ cmake/CMakeMacros.cmake	(copie de travail)
@@ -417,7 +417,7 @@
 endfunction()
 
 function(set_module_type MODULE TYPE)
-    cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
+    cmake_parse_arguments(__module "UNICODE;HOTPATCHABLE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
 
     if(__module_UNPARSED_ARGUMENTS)
         message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}")
@@ -457,6 +457,17 @@
         add_target_compile_definitions(${MODULE} UNICODE _UNICODE)
     endif()
 
+    # Handle hotpatchable images.
+    # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH
+    if(__module_HOTPATCHABLE AND MSVC)
+        set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch")
+        if(ARCH STREQUAL "i386")
+            set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5")
+        elseif(ARCH STREQUAL "amd64")
+            set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:6")
+        endif()
+    endif()
+
     # set entry point
     if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0"))
         list(GET __module_ENTRYPOINT 0 __entrypoint)
Index: cmake/gcc.cmake
===================================================================
--- cmake/gcc.cmake	(rÃ©vision 61927)
+++ cmake/gcc.cmake	(copie de travail)
@@ -1,6 +1,6 @@
 
 # Show a note about ccache build
-if(CCACHE STREQUAL "ccache")
+if(ENABLE_CCACHE)
     message("-- Enabling ccache build - done")
 endif()
 
@@ -31,6 +31,11 @@
     add_compile_flags("-mstackrealign")
 endif()
 
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    add_compile_flags_language("-std=gnu89" "C")
+    add_compile_flags("-Wno-microsoft")
+endif()
+
 add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX")
 
 #bug
@@ -40,13 +45,19 @@
  if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
 string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR})
 endif()
-add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS")
 
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS")
+endif()
+
 # Debugging
 if(SEPARATE_DBG)
     add_compile_flags("-gdwarf-2 -g2")
 else()
-    add_compile_flags("-gdwarf-2 -gstrict-dwarf -femit-struct-debug-detailed=none -feliminate-unused-debug-symbols")
+    add_compile_flags("-gdwarf-2 -gstrict-dwarf")
+    if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        add_compile_flags("-femit-struct-debug-detailed=none -feliminate-unused-debug-symbols")
+    endif()
 endif()
 
 # For some reason, cmake sets -fPIC, and we don't want it
@@ -62,9 +73,19 @@
 endif()
 
 # Warnings, errors
-add_compile_flags("-Werror -Wall -Wpointer-arith")
-add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized")
-add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=narrowing")
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    add_compile_flags("-Werror")
+endif()
+
+add_compile_flags("-Wall -Wpointer-arith")
+add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value")
+
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    add_compile_flags("-Wno-maybe-uninitialized")
+    add_compile_flags("-Wno-error=unused-but-set-variable")
+endif()
+
+add_compile_flags("-Wno-error=narrowing")
 add_compile_flags("-Wtype-limits -Wno-error=type-limits")
 
 if(ARCH STREQUAL "amd64")
@@ -96,7 +117,10 @@
 endif()
 
 if(ARCH STREQUAL "i386")
-    add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer")
+    add_compile_flags("-fno-optimize-sibling-calls -fno-omit-frame-pointer")
+    if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable")
+    endif()
     # FIXME: this doesn't work. CMAKE_BUILD_TYPE is always "Debug"
     if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
         add_compile_flags("-momit-leaf-frame-pointer")
@@ -174,9 +198,13 @@
 set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup")
 
-SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> -Wa,--compress-debug-sections <FLAGS> -o <OBJECT> -c <SOURCE>")
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    set(_compress_debug_sections_flag "-Wa,--compress-debug-sections")
+endif()
+
+SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>")
 SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER>  <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -Wa,--compress-debug-sections -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_compress_debug_sections_flag} -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
 
 set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>")
 set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX} -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ")
@@ -297,70 +325,39 @@
 
 # Macros
 if(PCH)
-    macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)
-        # Add the precompiled header to the build
-        get_filename_component(_FILE ${_header_filename} NAME)
-        set(_gch_filename "${_FILE}.gch")
-        list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename})
+    macro(add_pch _target _pch _sources)
+        # When including x.h GCC looks for x.h.gch first
+        set(_pch_final_name "${_target}_pch.h")
+        set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_pch_final_name}.gch)
 
-        # This gets us our includes
-        get_directory_property(DIRINC INCLUDE_DIRECTORIES)
-        foreach(item ${DIRINC})
-            list(APPEND ${_out_compile_flags} -I${item})
-        endforeach()
-
-        # This our definitions
-        get_directory_property(_compiler_flags DEFINITIONS)
-        list(APPEND ${_out_compile_flags} ${_compiler_flags})
-
-        # This gets any specific definitions that were added with set-target-property
-        get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS)
-        if(_target_defs)
-            foreach(item ${_target_defs})
-                list(APPEND ${_out_compile_flags} -D${item})
-            endforeach()
-        endif()
-
         if(IS_CPP)
-            list(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS})
+            set(_pch_language CXX)
         else()
-            list(APPEND ${_out_compile_flags} ${CMAKE_C_FLAGS})
+            set(_pch_language C)
         endif()
 
-        separate_arguments(${_out_compile_flags})
-    endmacro()
+        # Build the precompiled header
+        # HEADER_FILE_ONLY FALSE: force compiling the header
+        # EXTERNAL_SOURCE TRUE: don't use the .gch file when linking
+        set_source_files_properties(${_pch} PROPERTIES
+            HEADER_FILE_ONLY FALSE
+            LANGUAGE ${_pch_language}
+            EXTERNAL_SOURCE TRUE
+            OBJECT_LOCATION ${_gch})
 
-    macro(add_pch _target_name _FILE)
-        set(_header_filename ${CMAKE_CURRENT_SOURCE_DIR}/${_FILE})
-        get_filename_component(_basename ${_FILE} NAME)
-        set(_gch_filename ${_basename}.gch)
-        _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
-
-        if(IS_CPP)
-            set(__lang CXX)
-            set(__compiler ${CCACHE} ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1})
-        else()
-            set(__lang C)
-            set(__compiler ${CCACHE} ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
+        if(ENABLE_CCACHE)
+            set(_ccache_flag "-fpch-preprocess")
         endif()
 
-        add_custom_command(OUTPUT ${_gch_filename}
-            COMMAND ${__compiler} ${_args}
-            IMPLICIT_DEPENDS ${__lang} ${_header_filename}
-            DEPENDS ${_header_filename} ${ARGN})
-        get_target_property(_src_files ${_target_name} SOURCES)
-        add_target_compile_flags(${_target_name} "-fpch-preprocess -Winvalid-pch -Wno-error=invalid-pch")
-        foreach(_item in ${_src_files})
-            get_source_file_property(__src_lang ${_item} LANGUAGE)
-            if(__src_lang STREQUAL __lang)
-                set_source_files_properties(${_item} PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_gch_filename})
-            endif()
+        # Include the gch in the specified source files, skipping the pch file itself
+        list(REMOVE_ITEM ${_sources} ${_pch})
+        foreach(_src ${${_sources}})
+            set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -Winvalid-pch -Werror=invalid-pch -include ${_pch_final_name}")
+            set_property(SOURCE ${_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch})
         endforeach()
-        #set dependency checking : depends on precompiled header only which already depends on deeper header
-        set_target_properties(${_target_name} PROPERTIES IMPLICIT_DEPENDS_INCLUDE_TRANSFORM "\"${_basename}\"=;<${_basename}>=")
     endmacro()
 else()
-    macro(add_pch _target_name _FILE)
+    macro(add_pch _target _pch _sources)
     endmacro()
 endif()
 
Index: subsystems/win/basesrv/CMakeLists.txt
===================================================================
--- subsystems/win/basesrv/CMakeLists.txt	(rÃ©vision 61927)
+++ subsystems/win/basesrv/CMakeLists.txt	(copie de travail)
@@ -10,10 +10,13 @@
     sndsntry.c
     vdm.c
     nls.c
+    basesrv.h)
+
+add_library(basesrv SHARED
+    ${SOURCE}
     basesrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/basesrv.def)
 
-add_library(basesrv SHARED ${SOURCE})
 set_module_type(basesrv win32dll UNICODE ENTRYPOINT DllMain 12)
 #############################################
 ## HACK FOR MSVC COMPILATION WITH win32dll ##
@@ -23,6 +26,6 @@
 target_link_libraries(basesrv ${PSEH_LIB})
 
 add_importlibs(basesrv csrsrv ntdll)
-
+add_pch(basesrv basesrv.h SOURCE)
 add_dependencies(basesrv bugcodes)
 add_cd_file(TARGET basesrv DESTINATION reactos/system32 FOR all)
Index: subsystems/win32/csrsrv/CMakeLists.txt
===================================================================
--- subsystems/win32/csrsrv/CMakeLists.txt	(rÃ©vision 61927)
+++ subsystems/win32/csrsrv/CMakeLists.txt	(copie de travail)
@@ -12,10 +12,13 @@
     session.c
     thredsup.c
     wait.c
+    srv.h)
+
+add_library(csrsrv SHARED
+    ${SOURCE}
     csrsrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def)
 
-add_library(csrsrv SHARED ${SOURCE})
 set_module_type(csrsrv nativedll)
 
 target_link_libraries(csrsrv ${PSEH_LIB} smlib)
@@ -22,7 +25,7 @@
 
 add_importlibs(csrsrv ntdll smdll)
 
-add_pch(csrsrv srv.h)
+add_pch(csrsrv srv.h SOURCE)
 
 add_dependencies(csrsrv psdk bugcodes)
 add_cd_file(TARGET csrsrv DESTINATION reactos/system32 FOR all)
Index: configure.cmd
===================================================================
--- configure.cmd	(rÃ©vision 61927)
+++ configure.cmd	(copie de travail)
@@ -37,6 +37,9 @@
         set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"
     ) else if /I "%1" == "Makefiles" (
         set CMAKE_GENERATOR="MinGW Makefiles"
+    ) else if /I "%1" == "clang" (
+        set BUILD_ENVIRONMENT=Clang
+        set CMAKE_GENERATOR="Ninja"
     ) else (
         set CMAKE_GENERATOR="Ninja"
     )
@@ -150,7 +153,9 @@
 )
 
 if "%BUILD_ENVIRONMENT%" == "MinGW" (
-    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
+) else if "%BUILD_ENVIRONMENT%" == "Clang" (
+    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-clang.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
 ) else (
     cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
 )
Index: tools/obj2bin/obj2bin.c
===================================================================
--- tools/obj2bin/obj2bin.c	(rÃ©vision 61927)
+++ tools/obj2bin/obj2bin.c	(copie de travail)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <typedefs.h>
-#include "../pecoff.h"
+#include <pecoff.h>
 
 static
 void
Index: tools/pecoff.h
===================================================================
--- tools/pecoff.h	(rÃ©vision 61927)
+++ tools/pecoff.h	(copie de travail)
@@ -1,250 +0,0 @@
-#pragma once
-
-#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b
-#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b
-
-#define IMAGE_DOS_MAGIC 0x5a4d
-#define IMAGE_PE_MAGIC 0x00004550
-#define IMAGE_SIZEOF_SHORT_NAME 8
-
-#define IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004
-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008
-#define IMAGE_FILE_DEBUG_STRIPPED   0x0200
-
-#define IMAGE_FILE_MACHINE_I386 0x14c
-#define IMAGE_FILE_MACHINE_AMD64 0x8664
-#define IMAGE_FILE_MACHINE_IA64 0x0200
-
-#define IMAGE_DIRECTORY_ENTRY_BASERELOC	5
-
-#define IMAGE_SCN_TYPE_NOLOAD     0x00000002
-#define IMAGE_SCN_TYPE_NO_PAD     0x00000008
-#define IMAGE_SCN_CNT_CODE        0x00000020
-#define IMAGE_SCN_CNT_INITIALIZED_DATA    0x00000040
-#define IMAGE_SCN_CNT_UNINITIALIZED_DATA  0x00000080
-#define IMAGE_SCN_LNK_OTHER       0x00000100
-#define IMAGE_SCN_LNK_INFO        0x00000200
-#define IMAGE_SCN_LNK_REMOVE      0x00000800
-#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000
-#define IMAGE_SCN_GPREL           0x00008000
-#define IMAGE_SCN_MEM_PURGEABLE   0x00020000
-#define IMAGE_SCN_MEM_LOCKED      0x00040000
-#define IMAGE_SCN_MEM_PRELOAD     0x00080000
-#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000
-#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
-#define IMAGE_SCN_MEM_NOT_CACHED  0x04000000
-#define IMAGE_SCN_MEM_NOT_PAGED   0x08000000
-#define IMAGE_SCN_MEM_SHARED      0x10000000
-#define IMAGE_SCN_MEM_EXECUTE     0x20000000
-#define IMAGE_SCN_MEM_READ        0x40000000
-#define IMAGE_SCN_MEM_WRITE       0x80000000
-
-#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
-
-#define IMAGE_REL_I386_ABSOLUTE 0x0001
-#define IMAGE_REL_I386_DIR32    0x0006
-
-#pragma pack(push,2)
-typedef struct _IMAGE_DOS_HEADER {
-  WORD e_magic;
-  WORD e_cblp;
-  WORD e_cp;
-  WORD e_crlc;
-  WORD e_cparhdr;
-  WORD e_minalloc;
-  WORD e_maxalloc;
-  WORD e_ss;
-  WORD e_sp;
-  WORD e_csum;
-  WORD e_ip;
-  WORD e_cs;
-  WORD e_lfarlc;
-  WORD e_ovno;
-  WORD e_res[4];
-  WORD e_oemid;
-  WORD e_oeminfo;
-  WORD e_res2[10];
-  LONG e_lfanew;
-} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
-#pragma pack(pop)
-
-#pragma pack(push,4)
-typedef struct _IMAGE_FILE_HEADER {
-	WORD Machine;
-	WORD NumberOfSections;
-	DWORD TimeDateStamp;
-	DWORD PointerToSymbolTable;
-	DWORD NumberOfSymbols;
-	WORD SizeOfOptionalHeader;
-	WORD Characteristics;
-} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
-#pragma pack(pop)
-
-typedef struct _IMAGE_DATA_DIRECTORY {
-  DWORD VirtualAddress;
-  DWORD Size;
-} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY;
-
-typedef struct _IMAGE_OPTIONAL_HEADER32 {
-	WORD Magic;
-	BYTE MajorLinkerVersion;
-	BYTE MinorLinkerVersion;
-	DWORD SizeOfCode;
-	DWORD SizeOfInitializedData;
-	DWORD SizeOfUninitializedData;
-	DWORD AddressOfEntryPoint;
-	DWORD BaseOfCode;
-	DWORD BaseOfData;
-	DWORD ImageBase;
-	DWORD SectionAlignment;
-	DWORD FileAlignment;
-	WORD MajorOperatingSystemVersion;
-	WORD MinorOperatingSystemVersion;
-	WORD MajorImageVersion;
-	WORD MinorImageVersion;
-	WORD MajorSubsystemVersion;
-	WORD MinorSubsystemVersion;
-	DWORD Win32VersionValue;
-	DWORD SizeOfImage;
-	DWORD SizeOfHeaders;
-	DWORD CheckSum;
-	WORD Subsystem;
-	WORD DllCharacteristics;
-	DWORD SizeOfStackReserve;
-	DWORD SizeOfStackCommit;
-	DWORD SizeOfHeapReserve;
-	DWORD SizeOfHeapCommit;
-	DWORD LoaderFlags;
-	DWORD NumberOfRvaAndSizes;
-	IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32;
-
-typedef struct _IMAGE_OPTIONAL_HEADER64 {
-	WORD Magic;
-	BYTE MajorLinkerVersion;
-	BYTE MinorLinkerVersion;
-	DWORD SizeOfCode;
-	DWORD SizeOfInitializedData;
-	DWORD SizeOfUninitializedData;
-	DWORD AddressOfEntryPoint;
-	DWORD BaseOfCode;
-	ULONGLONG ImageBase;
-	DWORD SectionAlignment;
-	DWORD FileAlignment;
-	WORD MajorOperatingSystemVersion;
-	WORD MinorOperatingSystemVersion;
-	WORD MajorImageVersion;
-	WORD MinorImageVersion;
-	WORD MajorSubsystemVersion;
-	WORD MinorSubsystemVersion;
-	DWORD Win32VersionValue;
-	DWORD SizeOfImage;
-	DWORD SizeOfHeaders;
-	DWORD CheckSum;
-	WORD Subsystem;
-	WORD DllCharacteristics;
-	ULONGLONG SizeOfStackReserve;
-	ULONGLONG SizeOfStackCommit;
-	ULONGLONG SizeOfHeapReserve;
-	ULONGLONG SizeOfHeapCommit;
-	DWORD LoaderFlags;
-	DWORD NumberOfRvaAndSizes;
-	IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64;
-
-#ifdef _TARGET_PE64
-typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER;
-typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER;
-#else
-typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER;
-typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER;
-#endif
-
-typedef struct _IMAGE_NT_HEADERS32
-{
-  DWORD Signature;
-  IMAGE_FILE_HEADER FileHeader;
-  IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32;
-
-typedef struct _IMAGE_NT_HEADERS64
-{
-  DWORD Signature;
-  IMAGE_FILE_HEADER FileHeader;
-  IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64;
-
-#ifdef _TARGET_PE64
-typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS;
-typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS;
-#else
-typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS;
-typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS;
-#endif
-
-typedef struct _IMAGE_SECTION_HEADER {
-  BYTE Name[IMAGE_SIZEOF_SHORT_NAME];
-  union {
-    DWORD PhysicalAddress;
-    DWORD VirtualSize;
-  } Misc;
-  DWORD VirtualAddress;
-  DWORD SizeOfRawData;
-  DWORD PointerToRawData;
-  DWORD PointerToRelocations;
-  DWORD PointerToLinenumbers;
-  WORD NumberOfRelocations;
-  WORD NumberOfLinenumbers;
-  DWORD Characteristics;
-} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER;
-
-#pragma pack(push,4)
-typedef struct _IMAGE_BASE_RELOCATION {
-	DWORD VirtualAddress;
-	DWORD SizeOfBlock;
-    WORD  TypeOffset[1];
-} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION;
-#pragma pack(pop)
-
-#ifndef UNALIGNED
-#define UNALIGNED
-#endif
-
-#pragma pack(push,2)
-typedef struct _IMAGE_RELOCATION {
-  union {
-    DWORD VirtualAddress;
-    DWORD RelocCount;
-  };
-  DWORD SymbolTableIndex;
-  WORD Type;
-} IMAGE_RELOCATION;
-typedef struct _IMAGE_RELOCATION UNALIGNED *PIMAGE_RELOCATION;
-#pragma pack(pop)
-
-#pragma pack(push,2)
-typedef struct _IMAGE_SYMBOL {
-  union {
-    BYTE ShortName[8];
-    struct {
-      DWORD Short;
-      DWORD Long;
-    } Name;
-    DWORD LongName[2];
-  } N;
-  DWORD Value;
-  SHORT SectionNumber;
-  WORD Type;
-  BYTE StorageClass;
-  BYTE NumberOfAuxSymbols;
-} IMAGE_SYMBOL;
-typedef struct _IMAGE_SYMBOL UNALIGNED *PIMAGE_SYMBOL;
-#pragma pack(pop)
-
-#define IMAGE_DOS_SIGNATURE 0x5A4D
-#define IMAGE_OS2_SIGNATURE 0x454E
-#define IMAGE_OS2_SIGNATURE_LE 0x454C
-#define IMAGE_VXD_SIGNATURE 0x454C
-#define IMAGE_NT_SIGNATURE 0x00004550
-
-#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((ULONG_PTR)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader))
Index: tools/rsym/rsym.h
===================================================================
--- tools/rsym/rsym.h	(rÃ©vision 61927)
+++ tools/rsym/rsym.h	(copie de travail)
@@ -2,7 +2,7 @@
 
 #pragma once
 #include <typedefs.h>
-#include "../pecoff.h"
+#include <pecoff.h>
 
 typedef struct {
   USHORT f_magic;         /* magic number             */
Index: tools/spec2def/spec2def.c
===================================================================
--- tools/spec2def/spec2def.c	(rÃ©vision 61927)
+++ tools/spec2def/spec2def.c	(copie de travail)
@@ -51,6 +51,7 @@
     FL_PRIVATE = 1,
     FL_STUB = 2,
     FL_NONAME = 4,
+    FL_ORDINAL = 8,
 };
 
 enum
@@ -476,7 +477,7 @@
     else
         OutputLine_def_GCC(fileDest, pexp);
 
-    if (pexp->nOrdinal != -1)
+    if (pexp->uFlags & FL_ORDINAL)
     {
         fprintf(fileDest, " @%d", pexp->nOrdinal);
     }
@@ -541,8 +542,13 @@
         //        nLine, TokenLength(pc), pc);
 
         /* Now we should get either an ordinal or @ */
-        if (*pc == '@') exp.nOrdinal = -1;
-        else exp.nOrdinal = atol(pc);
+        if (*pc == '@')
+            exp.nOrdinal = -1;
+        else
+        {
+            exp.nOrdinal = atol(pc);
+            exp.uFlags |= FL_ORDINAL;
+        }
 
         /* Go to next token (type) */
         if (!(pc = NextToken(pc)))
@@ -627,11 +633,14 @@
             {
                 exp.uFlags |= FL_PRIVATE;
             }
-            else if (CompareToken(pc, "-noname") ||
-                     CompareToken(pc, "-ordinal"))
+            else if (CompareToken(pc, "-noname"))
             {
-                exp.uFlags |= FL_NONAME;
+                exp.uFlags |= FL_ORDINAL | FL_NONAME;
             }
+            else if (CompareToken(pc, "-ordinal"))
+            {
+                exp.uFlags |= FL_ORDINAL;
+            }
             else if (CompareToken(pc, "-stub"))
             {
                 exp.uFlags |= FL_STUB;
@@ -667,7 +676,7 @@
             sprintf(namebuffer, "ordinal%d", exp.nOrdinal);
             exp.strName.len = strlen(namebuffer);
             exp.strName.buf = namebuffer;
-            exp.uFlags |= FL_NONAME;
+            exp.uFlags |= FL_ORDINAL | FL_NONAME;
         }
 
         /* Handle parameters */
@@ -804,9 +813,10 @@
         }
 
         /* Check for no-name without ordinal */
-        if ((exp.uFlags & FL_NONAME) && (exp.nOrdinal == -1))
+        if ((exp.uFlags & FL_ORDINAL) && (exp.nOrdinal == -1))
         {
-            fprintf(stderr, "error: line %d, noname export without ordinal!\n", nLine);
+            fprintf(stderr, "error: line %d, ordinal export without ordinal!\n", nLine);
+            return -1;
         }
 
         OutputLine(fileDest, &exp);
Index: boot/freeldr/freeldr/CMakeLists.txt
===================================================================
--- boot/freeldr/freeldr/CMakeLists.txt	(rÃ©vision 61927)
+++ boot/freeldr/freeldr/CMakeLists.txt	(copie de travail)
@@ -32,6 +32,7 @@
 endif()
 
 list(APPEND FREELDR_COMMON_SOURCE
+    include/freeldr.h
     cmdline.c
     debug.c
     linuxboot.c
@@ -121,7 +122,7 @@
         windows/headless.c
         disk/scsiport.c)
     if(NOT MSVC)
-        list(APPEND FREELDR_COMMON_SOURCE arch/i386/drvmap.S)
+        list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S)
     endif()
 elseif(ARCH STREQUAL "amd64")
     list(APPEND FREELDR_COMMON_ASM_SOURCE
@@ -152,12 +153,9 @@
 #TBD
 endif()
 
-if(NOT MSVC)
-    add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE} ${FREELDR_COMMON_ASM_SOURCE})
-else()
-    add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
-    add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm})
-endif()
+add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
+add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm})
+add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE)
 add_dependencies(freeldr_common bugcodes)
 
 if(ARCH STREQUAL "i386" AND NOT MSVC)
@@ -173,24 +171,20 @@
     list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
 endif()
 
-if(NOT MSVC)
-    add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
-    add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
-    if(SEPARATE_DBG)
-        set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
-        set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
-    endif()
-else()
-    add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
-    add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
+add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
+add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
+
+if(NOT MSVC AND SEPARATE_DBG)
+    set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
+    set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
 endif()
 
-if(NOT MSVC)
+if(MSVC)
+    add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ")
+    add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
+else()
     add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
     add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
-else()
-    add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ")
-    add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
 endif()
 
 set_image_base(freeldr_pe 0x10000)
@@ -206,16 +200,9 @@
     target_link_libraries(freeldr_pe_dbg mini_hal)
 endif()
 
-if(MSVC)
-    target_link_libraries(freeldr_pe freeldr_common)
-    target_link_libraries(freeldr_pe_dbg freeldr_common)
-endif()
+target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr)
+target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
 
-target_link_libraries(freeldr_pe cportlib cmlib rtl libcntpr)
-target_link_libraries(freeldr_pe_dbg cportlib cmlib rtl libcntpr)
-
-# add_pch(freeldr_pe include/freeldr.h)
-
 add_dependencies(freeldr_pe asm)
 add_dependencies(freeldr_pe_dbg asm)
 
@@ -237,24 +224,20 @@
     list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
 endif()
 
-if(NOT MSVC)
-    add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-    add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-    if(SEPARATE_DBG)
-        set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
-        set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
-    endif()
-else()
-    add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-    add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
+add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
+add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
+
+if(NOT MSVC AND SEPARATE_DBG)
+    set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
+    set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
 endif()
 
-if(NOT MSVC)
+if(MSVC)
+    add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
+    add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
+else()
     add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
     add_target_link_flags(setupldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
-else()
-    add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
-    add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
 endif()
 
 add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP)
@@ -273,14 +256,9 @@
     target_link_libraries(setupldr_pe_dbg mini_hal)
 endif()
 
-if(MSVC)
-    target_link_libraries(setupldr_pe freeldr_common)
-    target_link_libraries(setupldr_pe_dbg freeldr_common)
-endif()
+target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr)
+target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
 
-target_link_libraries(setupldr_pe cportlib cmlib rtl libcntpr)
-target_link_libraries(setupldr_pe_dbg cportlib cmlib rtl libcntpr)
-
 add_dependencies(setupldr_pe asm)
 add_dependencies(setupldr_pe_dbg asm)
 
Index: boot/freeldr/freeldr/include/freeldr.h
===================================================================
--- boot/freeldr/freeldr/include/freeldr.h	(rÃ©vision 61927)
+++ boot/freeldr/freeldr/include/freeldr.h	(copie de travail)
@@ -122,4 +122,4 @@
 VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem);
 VOID RunLoader(VOID);
 
-#endif  // defined __FREELDR_H
+#endif  /* __FREELDR_H */
Index: boot/freeldr/freeldr/include/arch/pc/pcbios.h
===================================================================
--- boot/freeldr/freeldr/include/arch/pc/pcbios.h	(rÃ©vision 61927)
+++ boot/freeldr/freeldr/include/arch/pc/pcbios.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _PCBIOS_H_
+#define _PCBIOS_H_
+
 #ifndef __ASM__
 
 typedef enum
@@ -139,3 +142,4 @@
 #define REGS_EFLAGS 36
 #define REGS_SIZE 40
 
+#endif /* _PCBIOS_H_ */
Index: boot/freeldr/freeldr/include/registry.h
===================================================================
--- boot/freeldr/freeldr/include/registry.h	(rÃ©vision 61927)
+++ boot/freeldr/freeldr/include/registry.h	(copie de travail)
@@ -78,10 +78,12 @@
          PCWSTR Name);
 
 LONG
-RegEnumKey(FRLDRHKEY Key,
-       ULONG Index,
-       PWCHAR Name,
-       ULONG* NameSize);
+RegEnumKey(
+    _In_ FRLDRHKEY Key,
+    _In_ ULONG Index,
+    _Out_ PWCHAR Name,
+    _Inout_ ULONG* NameSize,
+    _Out_opt_ FRLDRHKEY *SubKey);
 
 LONG
 RegOpenKey(FRLDRHKEY ParentKey,
Index: boot/freeldr/freeldr/windows/wlregistry.c
===================================================================
--- boot/freeldr/freeldr/windows/wlregistry.c	(rÃ©vision 61927)
+++ boot/freeldr/freeldr/windows/wlregistry.c	(copie de travail)
@@ -537,7 +537,7 @@
             {
                 /* Get the Driver's Name */
                 ValueSize = sizeof(ServiceName);
-                rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize);
+                rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize, &hDriverKey);
                 TRACE("RegEnumKey(): rc %d\n", (int)rc);
 
                 /* Make sure it's valid, and check if we're done */
@@ -550,89 +550,6 @@
                 }
                 //TRACE_CH(REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName);
 
-                /* open driver Key */
-                rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey);
-                if (rc == ERROR_SUCCESS)
-                {
-                    /* Read the Start Value */
-                    ValueSize = sizeof(ULONG);
-                    rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize);
-                    if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1;
-                    //TRACE_CH(REACTOS, "  Start: %x  \n", (int)StartValue);
-
-                    /* Read the Tag */
-                    ValueSize = sizeof(ULONG);
-                    rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize);
-                    if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1;
-                    //TRACE_CH(REACTOS, "  Tag:   %x  \n", (int)TagValue);
-
-                    /* Read the driver's group */
-                    DriverGroupSize = sizeof(DriverGroup);
-                    rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize);
-                    //TRACE_CH(REACTOS, "  Group: '%S'  \n", DriverGroup);
-
-                    /* Make sure it should be started */
-                    if ((StartValue == 0) &&
-                        (TagValue == OrderList[TagIndex]) &&
-                        (_wcsicmp(DriverGroup, GroupName) == 0)) {
-
-                            /* Get the Driver's Location */
-                            ValueSize = sizeof(TempImagePath);
-                            rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize);
-
-                            /* Write the whole path if it suceeded, else prepare to fail */
-                            if (rc != ERROR_SUCCESS) {
-                                TRACE_CH(REACTOS, "ImagePath: not found\n");
-                                TempImagePath[0] = 0;
-                                sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName);
-                            } else if (TempImagePath[0] != L'\\') {
-                                sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath);
-                            } else {
-                                sprintf(ImagePath, "%S", TempImagePath);
-                                TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath);
-                            }
-
-                            TRACE("Adding boot driver: '%s'\n", ImagePath);
-
-                            Status = WinLdrAddDriverToList(BootDriverListHead,
-                                L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
-                                TempImagePath,
-                                ServiceName);
-
-                            if (!Status)
-                                ERR("Failed to add boot driver\n");
-                    } else
-                    {
-                        //TRACE("  Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n",
-                        //    ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName);
-                    }
-                }
-
-                Index++;
-            }
-        }
-
-        Index = 0;
-        while (TRUE)
-        {
-            /* Get the Driver's Name */
-            ValueSize = sizeof(ServiceName);
-            rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize);
-
-            //TRACE_CH(REACTOS, "RegEnumKey(): rc %d\n", (int)rc);
-            if (rc == ERROR_NO_MORE_ITEMS)
-                break;
-            if (rc != ERROR_SUCCESS)
-            {
-                FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME);
-                return;
-            }
-            TRACE("Service %d: '%S'\n", (int)Index, ServiceName);
-
-            /* open driver Key */
-            rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey);
-            if (rc == ERROR_SUCCESS)
-            {
                 /* Read the Start Value */
                 ValueSize = sizeof(ULONG);
                 rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize);
@@ -650,20 +567,20 @@
                 rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize);
                 //TRACE_CH(REACTOS, "  Group: '%S'  \n", DriverGroup);
 
-                for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) {
-                    if (TagValue == OrderList[TagIndex]) break;
-                }
-
+                /* Make sure it should be started */
                 if ((StartValue == 0) &&
-                    (TagIndex > OrderList[0]) &&
+                    (TagValue == OrderList[TagIndex]) &&
                     (_wcsicmp(DriverGroup, GroupName) == 0)) {
 
+                        /* Get the Driver's Location */
                         ValueSize = sizeof(TempImagePath);
                         rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize);
+
+                        /* Write the whole path if it suceeded, else prepare to fail */
                         if (rc != ERROR_SUCCESS) {
                             TRACE_CH(REACTOS, "ImagePath: not found\n");
                             TempImagePath[0] = 0;
-                            sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName);
+                            sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName);
                         } else if (TempImagePath[0] != L'\\') {
                             sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath);
                         } else {
@@ -670,8 +587,9 @@
                             sprintf(ImagePath, "%S", TempImagePath);
                             TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath);
                         }
-                        TRACE("  Adding boot driver: '%s'\n", ImagePath);
 
+                        TRACE("Adding boot driver: '%s'\n", ImagePath);
+
                         Status = WinLdrAddDriverToList(BootDriverListHead,
                             L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
                             TempImagePath,
@@ -678,14 +596,88 @@
                             ServiceName);
 
                         if (!Status)
-                            ERR(" Failed to add boot driver\n");
-                } else
+                            ERR("Failed to add boot driver\n");
+                }
+                else
                 {
-                    //TRACE("  Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n",
-                    //    ServiceName, StartValue, TagValue, DriverGroup, GroupName);
+                    //TRACE("  Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n",
+                    //    ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName);
                 }
+
+                Index++;
             }
+        }
 
+        Index = 0;
+        while (TRUE)
+        {
+            /* Get the Driver's Name */
+            ValueSize = sizeof(ServiceName);
+            rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize, &hDriverKey);
+
+            //TRACE_CH(REACTOS, "RegEnumKey(): rc %d\n", (int)rc);
+            if (rc == ERROR_NO_MORE_ITEMS)
+                break;
+            if (rc != ERROR_SUCCESS)
+            {
+                FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME);
+                return;
+            }
+            TRACE("Service %d: '%S'\n", (int)Index, ServiceName);
+
+            /* Read the Start Value */
+            ValueSize = sizeof(ULONG);
+            rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize);
+            if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1;
+            //TRACE_CH(REACTOS, "  Start: %x  \n", (int)StartValue);
+
+            /* Read the Tag */
+            ValueSize = sizeof(ULONG);
+            rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize);
+            if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1;
+            //TRACE_CH(REACTOS, "  Tag:   %x  \n", (int)TagValue);
+
+            /* Read the driver's group */
+            DriverGroupSize = sizeof(DriverGroup);
+            rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize);
+            //TRACE_CH(REACTOS, "  Group: '%S'  \n", DriverGroup);
+
+            for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) {
+                if (TagValue == OrderList[TagIndex]) break;
+            }
+
+            if ((StartValue == 0) &&
+                (TagIndex > OrderList[0]) &&
+                (_wcsicmp(DriverGroup, GroupName) == 0)) {
+
+                    ValueSize = sizeof(TempImagePath);
+                    rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize);
+                    if (rc != ERROR_SUCCESS) {
+                        TRACE_CH(REACTOS, "ImagePath: not found\n");
+                        TempImagePath[0] = 0;
+                        sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName);
+                    } else if (TempImagePath[0] != L'\\') {
+                        sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath);
+                    } else {
+                        sprintf(ImagePath, "%S", TempImagePath);
+                        TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath);
+                    }
+                    TRACE("  Adding boot driver: '%s'\n", ImagePath);
+
+                    Status = WinLdrAddDriverToList(BootDriverListHead,
+                        L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
+                        TempImagePath,
+                        ServiceName);
+
+                    if (!Status)
+                        ERR(" Failed to add boot driver\n");
+            }
+            else
+            {
+                //TRACE("  Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n",
+                //    ServiceName, StartValue, TagValue, DriverGroup, GroupName);
+            }
+
             Index++;
         }
 
Index: boot/freeldr/freeldr/reactos/registry.c
===================================================================
--- boot/freeldr/freeldr/reactos/registry.c	(rÃ©vision 61927)
+++ boot/freeldr/freeldr/reactos/registry.c	(copie de travail)
@@ -259,13 +259,13 @@
     return NULL;
 }
 
-// FIXME: optionally return the subkey node/handle as optimization
 LONG
 RegEnumKey(
     _In_ FRLDRHKEY Key,
     _In_ ULONG Index,
     _Out_ PWCHAR Name,
-    _Inout_ ULONG* NameSize)
+    _Inout_ ULONG* NameSize,
+    _Out_opt_ FRLDRHKEY *SubKey)
 {
     PHHIVE Hive = &CmHive->Hive;
     PCM_KEY_NODE KeyNode, SubKeyNode;
@@ -305,6 +305,11 @@
 
     *NameSize = CmCopyKeyName(SubKeyNode, Name, *NameSize);
 
+    if (SubKey != NULL)
+    {
+        *SubKey = (FRLDRHKEY)SubKeyNode;
+    }
+
     TRACE("RegEnumKey done -> %u, '%.*s'\n", *NameSize, *NameSize, Name);
     return STATUS_SUCCESS;
 }
Index: boot/freeldr/fdebug/fdebug.rc
===================================================================
--- boot/freeldr/fdebug/fdebug.rc	(rÃ©vision 61927)
+++ boot/freeldr/fdebug/fdebug.rc	(copie de travail)
@@ -28,3 +28,4 @@
 #include "lang/ru-RU.rc"
 #include "lang/tr-TR.rc"
 #include "lang/uk-UA.rc"
+#include "lang/sq-AL.rc"
Index: boot/freeldr/fdebug/lang/tr-TR.rc
===================================================================
--- boot/freeldr/fdebug/lang/tr-TR.rc	(rÃ©vision 61927)
+++ boot/freeldr/fdebug/lang/tr-TR.rc	(copie de travail)
@@ -81,5 +81,5 @@
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼rdÃ¼r, yÃ¢ni bu yazÄ±lÄ±mÄ± Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±nladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n 2. sÃ¼rÃ¼mÃ¼ veyÃ¢ daha sonraki sÃ¼rÃ¼mleri altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bilhassa SATILABÄ°LÄ°RLÄ°K ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUK aÃ§Ä±sÄ±ndan olmak Ã¼zere bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retine de iye olmanÄ±z gerekir, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± A.Åž.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "Ã–NEMLÄ°: AÅŸaÄŸÄ±daki metin, Ã¶zgÃ¼n metnin resmÃ® olmayan Ã§evirisidir. Ã‡eviri metniyle Ã¶zgÃ¼n metin arasÄ±nda ayrÄ±m olabilir. Ã–zgÃ¼n metin, Ã§eviri metninin altÄ±ndadÄ±r.\r\n\r\n***\r\n\r\nBu yazÄ±lÄ±m Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r; bu yazÄ±lÄ±mÄ±, Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ±'nÄ±n yayÄ±mladÄ±ÄŸÄ± GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n, 2. sÃ¼rÃ¼mÃ¼nÃ¼n ya da daha sonraki herhangi bir sÃ¼rÃ¼mÃ¼nÃ¼n (OrasÄ± size baÄŸlÄ±.) koÅŸullarÄ± altÄ±nda yeniden daÄŸÄ±tabilir veyÃ¢ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu yazÄ±lÄ±m, kullanÄ±ÅŸlÄ± olabileceÄŸi beklentisiyle daÄŸÄ±tÄ±lmÄ±ÅŸtÄ±r ancak bu yazÄ±lÄ±mÄ±n HÄ°Ã‡BÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLÄ°ÄžÄ°N ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN  demek istenilen garantisi bile. Daha Ã§ok bilgi iÃ§in GNU UmÃ»mÃ® Kamu RuhsatÄ±'na bakÄ±nÄ±z.\r\n\r\nBu yazÄ±lÄ±mla birlikte GNU UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n bir sÃ»retini almÄ±ÅŸ olmalÄ±sÄ±nÄ±z, eÄŸer yoksa Ã–zgÃ¼r YazÄ±lÄ±m VakfÄ± AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazÄ±nÄ±z.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
Index: boot/freeldr/fdebug/lang/sq-AL.rc
===================================================================
--- boot/freeldr/fdebug/lang/sq-AL.rc	(rÃ©vision 0)
+++ boot/freeldr/fdebug/lang/sq-AL.rc	(rÃ©vision 62573)
@@ -0,0 +1,87 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TR:  18-01-2014
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+/* Menu */
+IDC_FDEBUG MENU
+BEGIN
+    POPUP "&Skeda"
+    BEGIN
+        MENUITEM "&Lidhu", IDM_FILE_CONNECT
+        MENUITEM "&Shkeputu", IDM_FILE_DISCONNECT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Pastro Ekranin", IDM_FILE_CLEARDISPLAY
+        MENUITEM SEPARATOR
+        MENUITEM "&Fillo Regjistrimin", IDM_FILE_STARTCAPTURE
+        MENUITEM "N&dalo rregjistrimin", IDM_FILE_STOPCAPTURE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Eko vendase", IDM_FILE_LOCALECHO
+        MENUITEM SEPARATOR
+        MENUITEM "D&il", IDM_EXIT
+    END
+    POPUP "&NdihmÃ«"
+    BEGIN
+        MENUITEM "&Rreth ...", IDM_ABOUT
+    END
+END
+
+/* Accelerators */
+IDC_FDEBUG ACCELERATORS
+BEGIN
+    63, IDM_ABOUT, ASCII, ALT // "?"
+    47, IDM_ABOUT, ASCII, ALT // "/"
+END
+
+/* Dialogs */
+
+IDD_ABOUTBOX DIALOGEX 22, 17, 259, 210
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "About FreeLoader Debugger"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26
+    DEFPUSHBUTTON "OK", IDOK, 183, 189, 44, 14, WS_GROUP
+    ICON IDI_FDEBUG, IDC_STATIC, 19, 30, 20, 20
+    EDITTEXT IDC_LICENSE_EDIT, 53, 63, 174, 107, ES_MULTILINE | ES_READONLY | WS_VSCROLL
+END
+
+IDD_CONNECTION DIALOGEX 0, 0, 196, 100
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Opsione lidhje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Indiko njÃ« port COM (e.g. COM1):", IDC_STATIC, 7, 7, 108, 8
+    EDITTEXT IDC_COMPORT, 7, 17, 182, 14, ES_AUTOHSCROLL
+    LTEXT "Indiko baud rate (e.g. 115200):", IDC_STATIC, 7, 38, 114, 8
+    EDITTEXT IDC_BAUTRATE, 7, 48, 182, 14, ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 45, 79, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 100, 79, 50, 14
+END
+
+IDD_CAPTURE DIALOGEX 0, 0, 251, 95
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dokumenti per rretgjistrim"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Emri i dokumentit pÃ«r kapur:", IDC_STATIC, 7, 17, 62, 8
+    EDITTEXT IDC_CAPTUREFILENAME, 7, 26, 181, 14, ES_AUTOHSCROLL
+    PUSHBUTTON "&Shfleto", IDC_BROWSE, 194, 26, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 139, 74, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 194, 74, 50, 14
+END
+
+/* String Tables */
+
+STRINGTABLE
+BEGIN
+    IDS_APP_TITLE "fdebug"
+    IDS_HELLO "Hello World!"
+    IDC_FDEBUG "FDEBUG"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE "Ky program Ã«shtÃ« software falas; ju mund ta shpÃ«rndani dhe / ose modifikoni sipas kushteve tÃ« GNU General Public License publikuar nga Free Software Foundation; sipas versionit 2 tÃ« LiÃ§encÃ«s, ose (sipas opinionit tuaj) Ã§do versioni tÃ« mÃ«vonshÃ«m.\r\n\r\nKy program shpÃ«rndahet me shpresÃ«n qÃ« do t'ju jetÃ« i dobishÃ«m, por PA ASNJÃ‹ GARANCI; madje edhe pa garancinÃ« e shprehur tÃ« TREGTUESHMÃ‹RISÃ‹ ose PÃ‹RSHTATJES PÃ‹R NJÃ‹ QÃ‹LLIM TÃ‹ CAKTUAR.  Shiko LiÃ§encÃ«n Publike tÃ« PÃ«rgjithshme GNU pÃ«r mÃ« shumÃ« detaje.\r\n\r\nJu duhet tÃ« keni marrÃ« njÃ« kopje tÃ« LiÃ§ensÃ«s sÃ« PÃ«rgjithshme Publike GNU sÃ« bashku me kÃ«tÃ« program; nÃ«se jo, shkruani nÃ« Free Software Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+END

Modification de propriÃ©tÃ©s sur boot/freeldr/fdebug/lang/sq-AL.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: boot/bootdata/hivecls.inf
===================================================================
--- boot/bootdata/hivecls.inf	(rÃ©vision 61927)
+++ boot/bootdata/hivecls.inf	(copie de travail)
@@ -100,6 +100,7 @@
 HKCR,"exefile\Defaulticon","",0x00000000,"%1"
 HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*"
 HKCR,"exefile\shell\runas\command","",0x00020000,"""%1"" %*"
+HKCR,"exefile\shellex\DropHandler","",0x00020000,"{86C86720-42A0-1069-A2E8-08002B30309D}"
 
 ; Fonts
 HKCR,".fon","",0x00000000,"fonfile"
@@ -127,11 +128,11 @@
 HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1"
 
 ; set MIME type for .html and .htm because Tiny webserver needs it
-HKCR,".htm","",0x00000000,"html"
+HKCR,".htm","",0x00000000,"htmlfile"
 HKCR,".htm","Content Type",0x00000000,"text/html"
-
-HKCR,".html","",0x00000000,"html"
+HKCR,".html","",0x00000000,"htmlfile"
 HKCR,".html","Content Type",0x00000000,"text/html"
+HKCR,"htmlfile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
 
 ; Icons
 HKCR,".ico","",0x00000000,"icofile"
@@ -191,6 +192,7 @@
 HKCR,"lnkfile","IsShortcut",0x00000000,"yes"
 HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}"
 HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}"
+HKCR,"lnkfile\shellex\DropHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}"
 HKCR,"lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}","",0x00000000,""
 HKCR,"lnkfile\shellex\PropertySheetHandlers\Shellink Property Page", "", 0x00000000, "{00021401-0000-0000-C000-000000000046}"
 
Index: boot/bootdata/hivesys.inf
===================================================================
--- boot/bootdata/hivesys.inf	(rÃ©vision 61927)
+++ boot/bootdata/hivesys.inf	(copie de travail)
@@ -1561,6 +1561,14 @@
 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001
 
+; MountMgr driver
+;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ErrorControl",0x00010001,0x00000001
+;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"Boot Bus Extender"
+;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ImagePath",0x00020000,"system32\drivers\mountmgr.sys"
+;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Start",0x00010001,0x00000000
+;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Tag",0x00010001,0x00000008
+;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Type",0x00010001,0x00000001
+
 ; ACPI driver
 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus Extender"
@@ -1859,7 +1867,7 @@
 ; EXT2 Filesystem driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System"
-HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys"
 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003
 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002
 
@@ -1885,6 +1893,7 @@
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter"
 
 ; This is not true but it allows to use 3rd party drivers while having the VBE driver installed
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1
Index: hal/halx86/generic.cmake
===================================================================
--- hal/halx86/generic.cmake	(rÃ©vision 61927)
+++ hal/halx86/generic.cmake	(copie de travail)
@@ -24,4 +24,3 @@
 add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE})
 add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm})
 add_dependencies(lib_hal_generic asm)
-add_pch(lib_hal_generic include/hal.h)
Index: hal/halx86/minihal.cmake
===================================================================
--- hal/halx86/minihal.cmake	(rÃ©vision 61927)
+++ hal/halx86/minihal.cmake	(copie de travail)
@@ -1,31 +0,0 @@
-
-list(APPEND MINI_HAL_SOURCE
-    generic/portio.c
-    legacy/bus/bushndlr.c
-    legacy/bus/cmosbus.c
-    legacy/bus/isabus.c
-    legacy/bus/pcibus.c
-    legacy/bus/sysbus.c
-    legacy/bussupp.c
-    generic/beep.c
-    generic/bios.c
-    generic/cmos.c
-    generic/dma.c
-    generic/display.c
-    generic/drive.c
-    generic/misc.c
-    generic/profil.c
-    generic/reboot.c
-    generic/spinlock.c
-    generic/sysinfo.c
-    generic/timer.c
-    generic/usage.c
-    up/halinit_mini.c
-    up/pic.c
-    up/processor.c)
-
-# mini_hal
-add_asm_files(mini_hal_asm generic/systimer.S)
-add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm})
-add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_)
-add_dependencies(mini_hal psdk bugcodes asm)
Index: hal/halx86/generic/drive.c
===================================================================
--- hal/halx86/generic/drive.c	(rÃ©vision 61927)
+++ hal/halx86/generic/drive.c	(copie de travail)
@@ -9,6 +9,9 @@
 /* INCLUDES ******************************************************************/
 
 #include <hal.h>
+
+#include <ntdddisk.h>
+
 #define NDEBUG
 #include <debug.h>
 
Index: hal/halx86/CMakeLists.txt
===================================================================
--- hal/halx86/CMakeLists.txt	(rÃ©vision 61927)
+++ hal/halx86/CMakeLists.txt	(copie de travail)
@@ -56,7 +56,7 @@
     include(legacy.cmake)
     include(up.cmake)
     include(pic.cmake)
-    include(minihal.cmake)
+    add_subdirectory(minihal)
 
     # hal
     add_hal(hal SOURCES up/halup.rc COMPONENTS generic legacy up pic)
Index: hal/halx86/include/hal.h
===================================================================
--- hal/halx86/include/hal.h	(rÃ©vision 61927)
+++ hal/halx86/include/hal.h	(copie de travail)
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _HAL_PCH_
+#define _HAL_PCH_
+
 /* INCLUDES ******************************************************************/
 
 /* C Headers */
@@ -24,8 +27,6 @@
 
 /* IFS/DDK/NDK Headers */
 #include <ntifs.h>
-#include <bugcodes.h>
-#include <ntdddisk.h>
 #include <arc/arc.h>
 
 #include <ndk/asm.h>
@@ -62,4 +63,4 @@
 #include "mps.h"
 #include "halacpi.h"
 
-/* EOF */
+#endif /* _HAL_PCH_ */
Index: hal/halx86/minihal/CMakeLists.txt
===================================================================
--- hal/halx86/minihal/CMakeLists.txt	(rÃ©vision 0)
+++ hal/halx86/minihal/CMakeLists.txt	(rÃ©vision 62573)
@@ -0,0 +1,32 @@
+
+list(APPEND MINI_HAL_SOURCE
+    ../generic/portio.c
+    ../legacy/bus/bushndlr.c
+    ../legacy/bus/cmosbus.c
+    ../legacy/bus/isabus.c
+    ../legacy/bus/pcibus.c
+    ../legacy/bus/sysbus.c
+    ../legacy/bussupp.c
+    ../generic/beep.c
+    ../generic/bios.c
+    ../generic/cmos.c
+    ../generic/dma.c
+    ../generic/display.c
+    ../generic/drive.c
+    ../generic/misc.c
+    ../generic/profil.c
+    ../generic/reboot.c
+    ../generic/spinlock.c
+    ../generic/sysinfo.c
+    ../generic/timer.c
+    ../generic/usage.c
+    ../up/halinit_mini.c
+    ../up/pic.c
+    ../up/processor.c
+    ../include/hal.h)
+
+add_asm_files(mini_hal_asm ../generic/systimer.S)
+add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm})
+add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_)
+add_dependencies(mini_hal psdk bugcodes asm)
+add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE)

Modification de propriÃ©tÃ©s sur hal/halx86/minihal/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: hal/halx86/minihal
===================================================================
--- hal/halx86/minihal	(rÃ©vision 0)
+++ hal/halx86/minihal	(copie de travail)

Modification de propriÃ©tÃ©s sur hal/halx86/minihal
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: lib/3rdparty/freetype/devel/ft2build.h
===================================================================
--- lib/3rdparty/freetype/devel/ft2build.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/devel/ft2build.h	(rÃ©vision 62573)
@@ -0,0 +1,40 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ft2build.h                                                             */
+/*                                                                         */
+/*    FreeType 2 build and setup macros (development version).             */
+/*                                                                         */
+/*  Copyright 1996-2001, 2003, 2006, 2013 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+ /*
+  *  This is a development version of <ft2build.h> to build the library in
+  *  debug mode.  Its only difference to the default version is that it
+  *  includes a local `ftoption.h' header file with different settings for
+  *  many configuration macros.
+  *
+  *  To use it, simply ensure that the directory containing this file is
+  *  scanned by the compiler before the default FreeType header directory.
+  *
+  */
+
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__
+
+#define FT_CONFIG_OPTIONS_H  <ftoption.h>
+
+#include <config/ftheader.h>
+
+#endif /* __FT2BUILD_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/devel/ft2build.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/devel/ftoption.h
===================================================================
--- lib/3rdparty/freetype/devel/ftoption.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/devel/ftoption.h	(rÃ©vision 62573)
@@ -0,0 +1,833 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftoption.h (for development)                                           */
+/*                                                                         */
+/*    User-selectable configuration macros (specification only).           */
+/*                                                                         */
+/*  Copyright 1996-2013 by                                                 */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTOPTION_H__
+#define __FTOPTION_H__
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                 USER-SELECTABLE CONFIGURATION MACROS                  */
+  /*                                                                       */
+  /* This file contains the default configuration macro definitions for    */
+  /* a standard build of the FreeType library.  There are three ways to    */
+  /* use this file to build project-specific versions of the library:      */
+  /*                                                                       */
+  /*  - You can modify this file by hand, but this is not recommended in   */
+  /*    cases where you would like to build several versions of the        */
+  /*    library from a single source directory.                            */
+  /*                                                                       */
+  /*  - You can put a copy of this file in your build directory, more      */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
+  /*                                                                       */
+  /*    The default FreeType Makefiles and Jamfiles use the build          */
+  /*    directory `builds/<system>' by default, but you can easily change  */
+  /*    that for your own projects.                                        */
+  /*                                                                       */
+  /*  - Copy the file <ft2build.h> to `$BUILD/ft2build.h' and modify it    */
+  /*    slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to       */
+  /*    locate this file during the build.  For example,                   */
+  /*                                                                       */
+  /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
+  /*      #include <config/ftheader.h>                                     */
+  /*                                                                       */
+  /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
+  /*    definitions.                                                       */
+  /*                                                                       */
+  /*    Note also that you can similarly pre-define the macro              */
+  /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
+  /*    that are statically linked to the library at compile time.  By     */
+  /*    default, this file is <config/ftmodule.h>.                         */
+  /*                                                                       */
+  /*  We highly recommend using the third method whenever possible.        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /**** G E N E R A L   F R E E T Y P E   2   C O N F I G U R A T I O N ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Uncomment the line below if you want to activate sub-pixel rendering  */
+  /* (a.k.a. LCD rendering, or ClearType) in this build of the library.    */
+  /*                                                                       */
+  /* Note that this feature is covered by several Microsoft patents        */
+  /* and should not be activated in any default build of the library.      */
+  /*                                                                       */
+  /* This macro has no impact on the FreeType API, only on its             */
+  /* _implementation_.  For example, using FT_RENDER_MODE_LCD when calling */
+  /* FT_Render_Glyph still generates a bitmap that is 3 times wider than   */
+  /* the original size in case this macro isn't defined; however, each     */
+  /* triplet of subpixels has R=G=B.                                       */
+  /*                                                                       */
+  /* This is done to allow FreeType clients to run unmodified, forcing     */
+  /* them to display normal gray-level anti-aliased glyphs.                */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
+  /* by FreeType to speed up some computations.  However, this will create */
+  /* some problems when compiling the library in strict ANSI mode.         */
+  /*                                                                       */
+  /* For this reason, the use of 64-bit integers is normally disabled when */
+  /* the __STDC__ macro is defined.  You can however disable this by       */
+  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
+  /*                                                                       */
+  /* For most compilers, this will only create compilation warnings when   */
+  /* building the library.                                                 */
+  /*                                                                       */
+  /* ObNote: The compiler-specific 64-bit integers are detected in the     */
+  /*         file `ftconfig.h' either statically or through the            */
+  /*         `configure' script on supported platforms.                    */
+  /*                                                                       */
+#undef FT_CONFIG_OPTION_FORCE_INT64
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* If this macro is defined, do not try to use an assembler version of   */
+  /* performance-critical functions (e.g. FT_MulFix).  You should only do  */
+  /* that to verify that the assembler function works properly, or to      */
+  /* execute benchmark tests of the various implementations.               */
+/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* If this macro is defined, try to use an inlined assembler version of  */
+  /* the `FT_MulFix' function, which is a `hotspot' when loading and       */
+  /* hinting glyphs, and which should be executed as fast as possible.     */
+  /*                                                                       */
+  /* Note that if your compiler or CPU is not supported, this will default */
+  /* to the standard and portable implementation found in `ftcalc.c'.      */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_INLINE_MULFIX
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* LZW-compressed file support.                                          */
+  /*                                                                       */
+  /*   FreeType now handles font files that have been compressed with the  */
+  /*   `compress' program.  This is mostly used to parse many of the PCF   */
+  /*   files that come with various X11 distributions.  The implementation */
+  /*   uses NetBSD's `zopen' to partially uncompress the file on the fly   */
+  /*   (see src/lzw/ftgzip.c).                                             */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.             */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_USE_LZW
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Gzip-compressed file support.                                         */
+  /*                                                                       */
+  /*   FreeType now handles font files that have been compressed with the  */
+  /*   `gzip' program.  This is mostly used to parse many of the PCF files */
+  /*   that come with XFree86.  The implementation uses `zlib' to          */
+  /*   partially uncompress the file on the fly (see src/gzip/ftgzip.c).   */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.  See also   */
+  /*   the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below.                       */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_USE_ZLIB
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* ZLib library selection                                                */
+  /*                                                                       */
+  /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
+  /*   It allows FreeType's `ftgzip' component to link to the system's     */
+  /*   installation of the ZLib library.  This is useful on systems like   */
+  /*   Unix or VMS where it generally is already available.                */
+  /*                                                                       */
+  /*   If you let it undefined, the component will use its own copy        */
+  /*   of the zlib sources instead.  These have been modified to be        */
+  /*   included directly within the component and *not* export external    */
+  /*   function names.  This allows you to link any program with FreeType  */
+  /*   _and_ ZLib without linking conflicts.                               */
+  /*                                                                       */
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Bzip2-compressed file support.                                        */
+  /*                                                                       */
+  /*   FreeType now handles font files that have been compressed with the  */
+  /*   `bzip2' program.  This is mostly used to parse many of the PCF      */
+  /*   files that come with XFree86.  The implementation uses `libbz2' to  */
+  /*   partially uncompress the file on the fly (see src/bzip2/ftbzip2.c). */
+  /*   Contrary to gzip, bzip2 currently is not included and need to use   */
+  /*   the system available bzip2 implementation.                          */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.             */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_USE_BZIP2
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  PNG bitmap support.                                                  */
+  /*                                                                       */
+  /*   FreeType now handles loading color bitmap glyphs in the PNG format. */
+  /*   This requires help from the external libpng library.  Uncompressed  */
+  /*   color bitmaps do not need any external libraries and will be        */
+  /*   supported regardless of this configuration.                         */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.             */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_USE_PNG
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define to disable the use of file stream functions and types, FILE,   */
+  /* fopen() etc.  Enables the use of smaller system libraries on embedded */
+  /* systems that have multiple system libraries, some with or without     */
+  /* file stream support, in the cases where file stream support is not    */
+  /* necessary such as memory loading of font files.                       */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* DLL export compilation                                                */
+  /*                                                                       */
+  /*   When compiling FreeType as a DLL, some systems/compilers need a     */
+  /*   special keyword in front OR after the return type of function       */
+  /*   declarations.                                                       */
+  /*                                                                       */
+  /*   Two macros are used within the FreeType source code to define       */
+  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
+  /*                                                                       */
+  /*     FT_EXPORT( return_type )                                          */
+  /*                                                                       */
+  /*       is used in a function declaration, as in                        */
+  /*                                                                       */
+  /*         FT_EXPORT( FT_Error )                                         */
+  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
+  /*                                                                       */
+  /*                                                                       */
+  /*     FT_EXPORT_DEF( return_type )                                      */
+  /*                                                                       */
+  /*       is used in a function definition, as in                         */
+  /*                                                                       */
+  /*         FT_EXPORT_DEF( FT_Error )                                     */
+  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
+  /*         {                                                             */
+  /*           ... some code ...                                           */
+  /*           return FT_Err_Ok;                                           */
+  /*         }                                                             */
+  /*                                                                       */
+  /*   You can provide your own implementation of FT_EXPORT and            */
+  /*   FT_EXPORT_DEF here if you want.  If you leave them undefined, they  */
+  /*   will be later automatically defined as `extern return_type' to      */
+  /*   allow normal compilation.                                           */
+  /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+/* #define FT_EXPORT(x)      extern x */
+/* #define FT_EXPORT_DEF(x)  x */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Glyph Postscript Names handling                                       */
+  /*                                                                       */
+  /*   By default, FreeType 2 is compiled with the `psnames' module.  This */
+  /*   module is in charge of converting a glyph name string into a        */
+  /*   Unicode value, or return a Macintosh standard glyph name for the    */
+  /*   use with the TrueType `post' table.                                 */
+  /*                                                                       */
+  /*   Undefine this macro if you do not want `psnames' compiled in your   */
+  /*   build of FreeType.  This has the following effects:                 */
+  /*                                                                       */
+  /*   - The TrueType driver will provide its own set of glyph names,      */
+  /*     if you build it to support postscript names in the TrueType       */
+  /*     `post' table.                                                     */
+  /*                                                                       */
+  /*   - The Type 1 driver will not be able to synthesize a Unicode        */
+  /*     charmap out of the glyphs found in the fonts.                     */
+  /*                                                                       */
+  /*   You would normally undefine this configuration macro when building  */
+  /*   a version of FreeType that doesn't contain a Type 1 or CFF driver.  */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Postscript Names to Unicode Values support                            */
+  /*                                                                       */
+  /*   By default, FreeType 2 is built with the `PSNames' module compiled  */
+  /*   in.  Among other things, the module is used to convert a glyph name */
+  /*   into a Unicode value.  This is especially useful in order to        */
+  /*   synthesize on the fly a Unicode charmap from the CFF/Type 1 driver  */
+  /*   through a big table named the `Adobe Glyph List' (AGL).             */
+  /*                                                                       */
+  /*   Undefine this macro if you do not want the Adobe Glyph List         */
+  /*   compiled in your `PSNames' module.  The Type 1 driver will not be   */
+  /*   able to synthesize a Unicode charmap out of the glyphs found in the */
+  /*   fonts.                                                              */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Support for Mac fonts                                                 */
+  /*                                                                       */
+  /*   Define this macro if you want support for outline fonts in Mac      */
+  /*   format (mac dfont, mac resource, macbinary containing a mac         */
+  /*   resource) on non-Mac platforms.                                     */
+  /*                                                                       */
+  /*   Note that the `FOND' resource isn't checked.                        */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_MAC_FONTS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Guessing methods to access embedded resource forks                    */
+  /*                                                                       */
+  /*   Enable extra Mac fonts support on non-Mac platforms (e.g.           */
+  /*   GNU/Linux).                                                         */
+  /*                                                                       */
+  /*   Resource forks which include fonts data are stored sometimes in     */
+  /*   locations which users or developers don't expected.  In some cases, */
+  /*   resource forks start with some offset from the head of a file.  In  */
+  /*   other cases, the actual resource fork is stored in file different   */
+  /*   from what the user specifies.  If this option is activated,         */
+  /*   FreeType tries to guess whether such offsets or different file      */
+  /*   names must be used.                                                 */
+  /*                                                                       */
+  /*   Note that normal, direct access of resource forks is controlled via */
+  /*   the FT_CONFIG_OPTION_MAC_FONTS option.                              */
+  /*                                                                       */
+#ifdef FT_CONFIG_OPTION_MAC_FONTS
+#define FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Allow the use of FT_Incremental_Interface to load typefaces that      */
+  /* contain no glyph data, but supply it via a callback function.         */
+  /* This is required by clients supporting document formats which         */
+  /* supply font data incrementally as the document is parsed, such        */
+  /* as the Ghostscript interpreter for the PostScript language.           */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_INCREMENTAL
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* The size in bytes of the render pool used by the scan-line converter  */
+  /* to do all of its work.                                                */
+  /*                                                                       */
+  /* This must be greater than 4KByte if you use FreeType to rasterize     */
+  /* glyphs; otherwise, you may set it to zero to avoid unnecessary        */
+  /* allocation of the render pool.                                        */
+  /*                                                                       */
+#define FT_RENDER_POOL_SIZE  16384L
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* FT_MAX_MODULES                                                        */
+  /*                                                                       */
+  /*   The maximum number of modules that can be registered in a single    */
+  /*   FreeType library object.  32 is the default.                        */
+  /*                                                                       */
+#define FT_MAX_MODULES  32
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Debug level                                                           */
+  /*                                                                       */
+  /*   FreeType can be compiled in debug or trace mode.  In debug mode,    */
+  /*   errors are reported through the `ftdebug' component.  In trace      */
+  /*   mode, additional messages are sent to the standard output during    */
+  /*   execution.                                                          */
+  /*                                                                       */
+  /*   Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode.     */
+  /*   Define FT_DEBUG_LEVEL_TRACE to build it in trace mode.              */
+  /*                                                                       */
+  /*   Don't define any of these macros to compile in `release' mode!      */
+  /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+#define FT_DEBUG_LEVEL_ERROR
+#define FT_DEBUG_LEVEL_TRACE
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Autofitter debugging                                                  */
+  /*                                                                       */
+  /*   If FT_DEBUG_AUTOFIT is defined, FreeType provides some means to     */
+  /*   control the autofitter behaviour for debugging purposes with global */
+  /*   boolean variables (consequently, you should *never* enable this     */
+  /*   while compiling in `release' mode):                                 */
+  /*                                                                       */
+  /*     _af_debug_disable_horz_hints                                      */
+  /*     _af_debug_disable_vert_hints                                      */
+  /*     _af_debug_disable_blue_hints                                      */
+  /*                                                                       */
+  /*   Additionally, the following functions provide dumps of various      */
+  /*   internal autofit structures to stdout (using `printf'):             */
+  /*                                                                       */
+  /*     af_glyph_hints_dump_points                                        */
+  /*     af_glyph_hints_dump_segments                                      */
+  /*     af_glyph_hints_dump_edges                                         */
+  /*                                                                       */
+  /*   As an argument, they use another global variable:                   */
+  /*                                                                       */
+  /*     _af_debug_hints                                                   */
+  /*                                                                       */
+  /*   Please have a look at the `ftgrid' demo program to see how those    */
+  /*   variables and macros should be used.                                */
+  /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+#define FT_DEBUG_AUTOFIT
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Memory Debugging                                                      */
+  /*                                                                       */
+  /*   FreeType now comes with an integrated memory debugger that is       */
+  /*   capable of detecting simple errors like memory leaks or double      */
+  /*   deletes.  To compile it within your build of the library, you       */
+  /*   should define FT_DEBUG_MEMORY here.                                 */
+  /*                                                                       */
+  /*   Note that the memory debugger is only activated at runtime when     */
+  /*   when the _environment_ variable `FT2_DEBUG_MEMORY' is defined also! */
+  /*                                                                       */
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
+  /*                                                                       */
+#define FT_DEBUG_MEMORY
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Module errors                                                         */
+  /*                                                                       */
+  /*   If this macro is set (which is _not_ the default), the higher byte  */
+  /*   of an error code gives the module in which the error has occurred,  */
+  /*   while the lower byte is the real error code.                        */
+  /*                                                                       */
+  /*   Setting this macro makes sense for debugging purposes only, since   */
+  /*   it would break source compatibility of certain programs that use    */
+  /*   FreeType 2.                                                         */
+  /*                                                                       */
+  /*   More details can be found in the files ftmoderr.h and fterrors.h.   */
+  /*                                                                       */
+#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Position Independent Code                                             */
+  /*                                                                       */
+  /*   If this macro is set (which is _not_ the default), FreeType2 will   */
+  /*   avoid creating constants that require address fixups.  Instead the  */
+  /*   constants will be moved into a struct and additional intialization  */
+  /*   code will be used.                                                  */
+  /*                                                                       */
+  /*   Setting this macro is needed for systems that prohibit address      */
+  /*   fixups, such as BREW.                                               */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_PIC */
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****        S F N T   D R I V E R    C O N F I G U R A T I O N       ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support       */
+  /* embedded bitmaps in all formats using the SFNT module (namely         */
+  /* TrueType & OpenType).                                                 */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to    */
+  /* load and enumerate the glyph Postscript names in a TrueType or        */
+  /* OpenType file.                                                        */
+  /*                                                                       */
+  /* Note that when you do not compile the `PSNames' module by undefining  */
+  /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will   */
+  /* contain additional code used to read the PS Names table from a font.  */
+  /*                                                                       */
+  /* (By default, the module uses `PSNames' to extract glyph names.)       */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to       */
+  /* access the internal name table in a SFNT-based format like TrueType   */
+  /* or OpenType.  The name table contains various strings used to         */
+  /* describe the font, like family name, copyright, version, etc.  It     */
+  /* does not contain any glyph name though.                               */
+  /*                                                                       */
+  /* Accessing SFNT names is done through the functions declared in        */
+  /* `ftsnames.h'.                                                         */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_SFNT_NAMES
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* TrueType CMap support                                                 */
+  /*                                                                       */
+  /*   Here you can fine-tune which TrueType CMap table format shall be    */
+  /*   supported.                                                          */
+#define TT_CONFIG_CMAP_FORMAT_0
+#define TT_CONFIG_CMAP_FORMAT_2
+#define TT_CONFIG_CMAP_FORMAT_4
+#define TT_CONFIG_CMAP_FORMAT_6
+#define TT_CONFIG_CMAP_FORMAT_8
+#define TT_CONFIG_CMAP_FORMAT_10
+#define TT_CONFIG_CMAP_FORMAT_12
+#define TT_CONFIG_CMAP_FORMAT_13
+#define TT_CONFIG_CMAP_FORMAT_14
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****    T R U E T Y P E   D R I V E R    C O N F I G U R A T I O N   ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile   */
+  /* a bytecode interpreter in the TrueType driver.                        */
+  /*                                                                       */
+  /* By undefining this, you will only compile the code necessary to load  */
+  /* TrueType glyphs without hinting.                                      */
+  /*                                                                       */
+  /*   Do not #undef this macro here, since the build system might         */
+  /*   define it for certain configurations only.                          */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile       */
+  /* EXPERIMENTAL subpixel hinting support into the TrueType driver.  This */
+  /* replaces the native TrueType hinting mechanism when anything but      */
+  /* FT_RENDER_MODE_MONO is requested.                                     */
+  /*                                                                       */
+  /* Enabling this causes the TrueType driver to ignore instructions under */
+  /* certain conditions.  This is done in accordance with the guide here,  */
+  /* with some minor differences:                                          */
+  /*                                                                       */
+  /*  http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+  /*                                                                       */
+  /* By undefining this, you only compile the code necessary to hint       */
+  /* TrueType glyphs with native TT hinting.                               */
+  /*                                                                       */
+  /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
+  /*   defined.                                                            */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
+  /* of the TrueType bytecode interpreter is used that doesn't implement   */
+  /* any of the patented opcodes and algorithms.  The patents related to   */
+  /* TrueType hinting have expired worldwide since May 2010; this option   */
+  /* is now deprecated.                                                    */
+  /*                                                                       */
+  /* Note that the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored*  */
+  /* if you define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words,  */
+  /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or                */
+  /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time.    */
+  /*                                                                       */
+  /* This macro is only useful for a small number of font files (mostly    */
+  /* for Asian scripts) that require bytecode interpretation to properly   */
+  /* load glyphs.  For all other fonts, this produces unpleasant results,  */
+  /* thus the unpatented interpreter is never used to load glyphs from     */
+  /* TrueType fonts unless one of the following two options is used.       */
+  /*                                                                       */
+  /*   - The unpatented interpreter is explicitly activated by the user    */
+  /*     through the FT_PARAM_TAG_UNPATENTED_HINTING parameter tag         */
+  /*     when opening the FT_Face.                                         */
+  /*                                                                       */
+  /*   - FreeType detects that the FT_Face corresponds to one of the       */
+  /*     `trick' fonts (e.g., `Mingliu') it knows about.  The font engine  */
+  /*     contains a hard-coded list of font names and other matching       */
+  /*     parameters (see function `tt_face_init' in file                   */
+  /*     `src/truetype/ttobjs.c').                                         */
+  /*                                                                       */
+  /* Here a sample code snippet for using FT_PARAM_TAG_UNPATENTED_HINTING. */
+  /*                                                                       */
+  /*   {                                                                   */
+  /*     FT_Parameter  parameter;                                          */
+  /*     FT_Open_Args  open_args;                                          */
+  /*                                                                       */
+  /*                                                                       */
+  /*     parameter.tag = FT_PARAM_TAG_UNPATENTED_HINTING;                  */
+  /*                                                                       */
+  /*     open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;         */
+  /*     open_args.pathname   = my_font_pathname;                          */
+  /*     open_args.num_params = 1;                                         */
+  /*     open_args.params     = &parameter;                                */
+  /*                                                                       */
+  /*     error = FT_Open_Face( library, &open_args, index, &face );        */
+  /*     ...                                                               */
+  /*   }                                                                   */
+  /*                                                                       */
+/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType    */
+  /* bytecode interpreter with a huge switch statement, rather than a call */
+  /* table.  This results in smaller and faster code for a number of       */
+  /* architectures.                                                        */
+  /*                                                                       */
+  /* Note however that on some compiler/processor combinations, undefining */
+  /* this macro will generate faster, though larger, code.                 */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the        */
+  /* TrueType glyph loader to use Apple's definition of how to handle      */
+  /* component offsets in composite glyphs.                                */
+  /*                                                                       */
+  /* Apple and MS disagree on the default behavior of component offsets    */
+  /* in composites.  Apple says that they should be scaled by the scaling  */
+  /* factors in the transformation matrix (roughly, it's more complex)     */
+  /* while MS says they should not.  OpenType defines two bits in the      */
+  /* composite flags array which can be used to disambiguate, but old      */
+  /* fonts will not have them.                                             */
+  /*                                                                       */
+  /*   http://www.microsoft.com/typography/otspec/glyf.htm                 */
+  /*   http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html                 */
+  /*                                                                       */
+#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_GX_VAR_SUPPORT if you want to include         */
+  /* support for Apple's distortable font technology (fvar, gvar, cvar,    */
+  /* and avar tables).  This has many similarities to Type 1 Multiple      */
+  /* Masters support.                                                      */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_BDF if you want to include support for        */
+  /* an embedded `BDF ' table within SFNT-based bitmap formats.            */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_BDF
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_DICT_DEPTH is the maximum depth of nest dictionaries and       */
+  /* arrays in the Type 1 stream (see t1load.c).  A minimum of 4 is        */
+  /* required.                                                             */
+  /*                                                                       */
+#define T1_MAX_DICT_DEPTH  5
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
+  /* calls during glyph loading.                                           */
+  /*                                                                       */
+#define T1_MAX_SUBRS_CALLS  16
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
+  /* minimum of 16 is required.                                            */
+  /*                                                                       */
+  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+  /*                                                                       */
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define this configuration macro if you want to prevent the            */
+  /* compilation of `t1afm', which is in charge of reading Type 1 AFM      */
+  /* files into an existing face.  Note that if set, the T1 driver will be */
+  /* unable to produce kerning distances.                                  */
+  /*                                                                       */
+#undef T1_CONFIG_OPTION_NO_AFM
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define this configuration macro if you want to prevent the            */
+  /* compilation of the Multiple Masters font support in the Type 1        */
+  /* driver.                                                               */
+  /*                                                                       */
+#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****         C F F   D R I V E R    C O N F I G U R A T I O N        ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF       */
+  /* engine gets compiled into FreeType.  If defined, it is possible to    */
+  /* switch between the two engines using the `hinting-engine' property of */
+  /* the cff driver module.                                                */
+  /*                                                                       */
+#define CFF_CONFIG_OPTION_OLD_ENGINE
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with CJK (Chinese, Japanese, Korean) script    */
+  /* support.                                                              */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_CJK
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with Indic script support.                     */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_INDIC
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with warp hinting.  The idea of the warping    */
+  /* code is to slightly scale and shift a glyph within a single dimension */
+  /* so that as much of its segments are aligned (more or less) on the     */
+  /* grid.  To find out the optimal scaling and shifting value, various    */
+  /* parameter combinations are tried and scored.                          */
+  /*                                                                       */
+  /* This experimental option is only active if the render mode is         */
+  /* FT_RENDER_MODE_LIGHT.                                                 */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_USE_WARPER
+
+  /* */
+
+
+  /*
+   *  This macro is obsolete.  Support has been removed in FreeType
+   *  version 2.5.
+   */
+/* #define FT_CONFIG_OPTION_OLD_INTERNALS */
+
+
+  /*
+   * This macro is defined if either unpatented or native TrueType
+   * hinting is requested by the definitions above.
+   */
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define  TT_USE_BYTECODE_INTERPRETER
+#undef   TT_CONFIG_OPTION_UNPATENTED_HINTING
+#elif defined TT_CONFIG_OPTION_UNPATENTED_HINTING
+#define  TT_USE_BYTECODE_INTERPRETER
+#endif
+
+FT_END_HEADER
+
+
+#endif /* __FTOPTION_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/devel/ftoption.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/freetype/ftmoderr.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftmoderr.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftmoderr.h	(copie de travail)
@@ -1,194 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmoderr.h                                                             */
-/*                                                                         */
-/*    FreeType module error offsets (specification).                       */
-/*                                                                         */
-/*  Copyright 2001-2005, 2010, 2013 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to define the FreeType module error codes.          */
-  /*                                                                       */
-  /* If the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in `ftoption.h' is    */
-  /* set, the lower byte of an error value identifies the error code as    */
-  /* usual.  In addition, the higher byte identifies the module.  For      */
-  /* example, the error `FT_Err_Invalid_File_Format' has value 0x0003, the */
-  /* error `TT_Err_Invalid_File_Format' has value 0x1303, the error        */
-  /* `T1_Err_Invalid_File_Format' has value 0x1403, etc.                   */
-  /*                                                                       */
-  /* Note that `FT_Err_Ok', `TT_Err_Ok', etc. are always equal to zero,    */
-  /* including the high byte.                                              */
-  /*                                                                       */
-  /* If FT_CONFIG_OPTION_USE_MODULE_ERRORS isn't set, the higher byte of   */
-  /* an error value is set to zero.                                        */
-  /*                                                                       */
-  /* To hide the various `XXX_Err_' prefixes in the source code, FreeType  */
-  /* provides some macros in `fttypes.h'.                                  */
-  /*                                                                       */
-  /*   FT_ERR( err )                                                       */
-  /*     Add current error module prefix (as defined with the              */
-  /*     `FT_ERR_PREFIX' macro) to `err'.  For example, in the BDF module  */
-  /*     the line                                                          */
-  /*                                                                       */
-  /*       error = FT_ERR( Invalid_Outline );                              */
-  /*                                                                       */
-  /*     expands to                                                        */
-  /*                                                                       */
-  /*       error = BDF_Err_Invalid_Outline;                                */
-  /*                                                                       */
-  /*     For simplicity, you can always use `FT_Err_Ok' directly instead   */
-  /*     of `FT_ERR( Ok )'.                                                */
-  /*                                                                       */
-  /*   FT_ERR_EQ( errcode, err )                                           */
-  /*   FT_ERR_NEQ( errcode, err )                                          */
-  /*     Compare error code `errcode' with the error `err' for equality    */
-  /*     and inequality, respectively.  Example:                           */
-  /*                                                                       */
-  /*       if ( FT_ERR_EQ( error, Invalid_Outline ) )                      */
-  /*         ...                                                           */
-  /*                                                                       */
-  /*     Using this macro you don't have to think about error prefixes.    */
-  /*     Of course, if module errors are not active, the above example is  */
-  /*     the same as                                                       */
-  /*                                                                       */
-  /*       if ( error == FT_Err_Invalid_Outline )                          */
-  /*         ...                                                           */
-  /*                                                                       */
-  /*   FT_ERROR_BASE( errcode )                                            */
-  /*   FT_ERROR_MODULE( errcode )                                          */
-  /*     Get base error and module error code, respectively.               */
-  /*                                                                       */
-  /*                                                                       */
-  /* It can also be used to create a module error message table easily     */
-  /* with something like                                                   */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     #undef __FTMODERR_H__                                             */
-  /*     #define FT_MODERRDEF( e, v, s )  { FT_Mod_Err_ ## e, s },         */
-  /*     #define FT_MODERR_START_LIST     {                                */
-  /*     #define FT_MODERR_END_LIST       { 0, 0 } };                      */
-  /*                                                                       */
-  /*     const struct                                                      */
-  /*     {                                                                 */
-  /*       int          mod_err_offset;                                    */
-  /*       const char*  mod_err_msg                                        */
-  /*     } ft_mod_errors[] =                                               */
-  /*                                                                       */
-  /*     #include FT_MODULE_ERRORS_H                                       */
-  /*   }                                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTMODERR_H__
-#define __FTMODERR_H__
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                       SETUP MACROS                      *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#undef  FT_NEED_EXTERN_C
-
-#ifndef FT_MODERRDEF
-
-#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = v,
-#else
-#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = 0,
-#endif
-
-#define FT_MODERR_START_LIST  enum {
-#define FT_MODERR_END_LIST    FT_Mod_Err_Max };
-
-#ifdef __cplusplus
-#define FT_NEED_EXTERN_C
-  extern "C" {
-#endif
-
-#endif /* !FT_MODERRDEF */
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****               LIST MODULE ERROR BASES                   *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#ifdef FT_MODERR_START_LIST
-  FT_MODERR_START_LIST
-#endif
-
-
-  FT_MODERRDEF( Base,      0x000, "base module" )
-  FT_MODERRDEF( Autofit,   0x100, "autofitter module" )
-  FT_MODERRDEF( BDF,       0x200, "BDF module" )
-  FT_MODERRDEF( Bzip2,     0x300, "Bzip2 module" )
-  FT_MODERRDEF( Cache,     0x400, "cache module" )
-  FT_MODERRDEF( CFF,       0x500, "CFF module" )
-  FT_MODERRDEF( CID,       0x600, "CID module" )
-  FT_MODERRDEF( Gzip,      0x700, "Gzip module" )
-  FT_MODERRDEF( LZW,       0x800, "LZW module" )
-  FT_MODERRDEF( OTvalid,   0x900, "OpenType validation module" )
-  FT_MODERRDEF( PCF,       0xA00, "PCF module" )
-  FT_MODERRDEF( PFR,       0xB00, "PFR module" )
-  FT_MODERRDEF( PSaux,     0xC00, "PS auxiliary module" )
-  FT_MODERRDEF( PShinter,  0xD00, "PS hinter module" )
-  FT_MODERRDEF( PSnames,   0xE00, "PS names module" )
-  FT_MODERRDEF( Raster,    0xF00, "raster module" )
-  FT_MODERRDEF( SFNT,     0x1000, "SFNT module" )
-  FT_MODERRDEF( Smooth,   0x1100, "smooth raster module" )
-  FT_MODERRDEF( TrueType, 0x1200, "TrueType module" )
-  FT_MODERRDEF( Type1,    0x1300, "Type 1 module" )
-  FT_MODERRDEF( Type42,   0x1400, "Type 42 module" )
-  FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" )
-  FT_MODERRDEF( GXvalid,  0x1600, "GX validation module" )
-
-
-#ifdef FT_MODERR_END_LIST
-  FT_MODERR_END_LIST
-#endif
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                      CLEANUP                            *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#ifdef FT_NEED_EXTERN_C
-  }
-#endif
-
-#undef FT_MODERR_START_LIST
-#undef FT_MODERR_END_LIST
-#undef FT_MODERRDEF
-#undef FT_NEED_EXTERN_C
-
-
-#endif /* __FTMODERR_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/tttables.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/tttables.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/tttables.h	(copie de travail)
@@ -1,777 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttables.h                                                             */
-/*                                                                         */
-/*    Basic SFNT/TrueType tables definitions and interface                 */
-/*    (specification only).                                                */
-/*                                                                         */
-/*  Copyright 1996-2005, 2008-2012 by                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTTABLES_H__
-#define __TTTABLES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    truetype_tables                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    TrueType Tables                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    TrueType specific table types and functions.                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the definition of TrueType-specific tables   */
-  /*    as well as some routines used to access and process them.          */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Header                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType font header table.  All       */
-  /*    fields follow the TrueType specification.                          */
-  /*                                                                       */
-  typedef struct  TT_Header_
-  {
-    FT_Fixed   Table_Version;
-    FT_Fixed   Font_Revision;
-
-    FT_Long    CheckSum_Adjust;
-    FT_Long    Magic_Number;
-
-    FT_UShort  Flags;
-    FT_UShort  Units_Per_EM;
-
-    FT_Long    Created [2];
-    FT_Long    Modified[2];
-
-    FT_Short   xMin;
-    FT_Short   yMin;
-    FT_Short   xMax;
-    FT_Short   yMax;
-
-    FT_UShort  Mac_Style;
-    FT_UShort  Lowest_Rec_PPEM;
-
-    FT_Short   Font_Direction;
-    FT_Short   Index_To_Loc_Format;
-    FT_Short   Glyph_Data_Format;
-
-  } TT_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_HoriHeader                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType horizontal header, the `hhea' */
-  /*    table, as well as the corresponding horizontal metrics table,      */
-  /*    i.e., the `hmtx' table.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Version                :: The table version.                       */
-  /*                                                                       */
-  /*    Ascender               :: The font's ascender, i.e., the distance  */
-  /*                              from the baseline to the top-most of all */
-  /*                              glyph points found in the font.          */
-  /*                                                                       */
-  /*                              This value is invalid in many fonts, as  */
-  /*                              it is usually set by the font designer,  */
-  /*                              and often reflects only a portion of the */
-  /*                              glyphs found in the font (maybe ASCII).  */
-  /*                                                                       */
-  /*                              You should use the `sTypoAscender' field */
-  /*                              of the OS/2 table instead if you want    */
-  /*                              the correct one.                         */
-  /*                                                                       */
-  /*    Descender              :: The font's descender, i.e., the distance */
-  /*                              from the baseline to the bottom-most of  */
-  /*                              all glyph points found in the font.  It  */
-  /*                              is negative.                             */
-  /*                                                                       */
-  /*                              This value is invalid in many fonts, as  */
-  /*                              it is usually set by the font designer,  */
-  /*                              and often reflects only a portion of the */
-  /*                              glyphs found in the font (maybe ASCII).  */
-  /*                                                                       */
-  /*                              You should use the `sTypoDescender'      */
-  /*                              field of the OS/2 table instead if you   */
-  /*                              want the correct one.                    */
-  /*                                                                       */
-  /*    Line_Gap               :: The font's line gap, i.e., the distance  */
-  /*                              to add to the ascender and descender to  */
-  /*                              get the BTB, i.e., the                   */
-  /*                              baseline-to-baseline distance for the    */
-  /*                              font.                                    */
-  /*                                                                       */
-  /*    advance_Width_Max      :: This field is the maximum of all advance */
-  /*                              widths found in the font.  It can be     */
-  /*                              used to compute the maximum width of an  */
-  /*                              arbitrary string of text.                */
-  /*                                                                       */
-  /*    min_Left_Side_Bearing  :: The minimum left side bearing of all     */
-  /*                              glyphs within the font.                  */
-  /*                                                                       */
-  /*    min_Right_Side_Bearing :: The minimum right side bearing of all    */
-  /*                              glyphs within the font.                  */
-  /*                                                                       */
-  /*    xMax_Extent            :: The maximum horizontal extent (i.e., the */
-  /*                              `width' of a glyph's bounding box) for   */
-  /*                              all glyphs in the font.                  */
-  /*                                                                       */
-  /*    caret_Slope_Rise       :: The rise coefficient of the cursor's     */
-  /*                              slope of the cursor (slope=rise/run).    */
-  /*                                                                       */
-  /*    caret_Slope_Run        :: The run coefficient of the cursor's      */
-  /*                              slope.                                   */
-  /*                                                                       */
-  /*    Reserved               :: 8~reserved bytes.                        */
-  /*                                                                       */
-  /*    metric_Data_Format     :: Always~0.                                */
-  /*                                                                       */
-  /*    number_Of_HMetrics     :: Number of HMetrics entries in the `hmtx' */
-  /*                              table -- this value can be smaller than  */
-  /*                              the total number of glyphs in the font.  */
-  /*                                                                       */
-  /*    long_metrics           :: A pointer into the `hmtx' table.         */
-  /*                                                                       */
-  /*    short_metrics          :: A pointer into the `hmtx' table.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields which */
-  /*               are different.                                          */
-  /*                                                                       */
-  /*               This ensures that a single function in the `ttload'     */
-  /*               module is able to read both the horizontal and vertical */
-  /*               headers.                                                */
-  /*                                                                       */
-  typedef struct  TT_HoriHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Width_Max;      /* advance width maximum */
-
-    FT_Short   min_Left_Side_Bearing;  /* minimum left-sb       */
-    FT_Short   min_Right_Side_Bearing; /* minimum right-sb      */
-    FT_Short   xMax_Extent;            /* xmax extents          */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved[4];
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_HMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they are used to connect the metrics header to the relevant    */
-    /* `HMTX' table.                                                      */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_HoriHeader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_VertHeader                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType vertical header, the `vhea'   */
-  /*    table, as well as the corresponding vertical metrics table, i.e.,  */
-  /*    the `vmtx' table.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Version                 :: The table version.                      */
-  /*                                                                       */
-  /*    Ascender                :: The font's ascender, i.e., the distance */
-  /*                               from the baseline to the top-most of    */
-  /*                               all glyph points found in the font.     */
-  /*                                                                       */
-  /*                               This value is invalid in many fonts, as */
-  /*                               it is usually set by the font designer, */
-  /*                               and often reflects only a portion of    */
-  /*                               the glyphs found in the font (maybe     */
-  /*                               ASCII).                                 */
-  /*                                                                       */
-  /*                               You should use the `sTypoAscender'      */
-  /*                               field of the OS/2 table instead if you  */
-  /*                               want the correct one.                   */
-  /*                                                                       */
-  /*    Descender               :: The font's descender, i.e., the         */
-  /*                               distance from the baseline to the       */
-  /*                               bottom-most of all glyph points found   */
-  /*                               in the font.  It is negative.           */
-  /*                                                                       */
-  /*                               This value is invalid in many fonts, as */
-  /*                               it is usually set by the font designer, */
-  /*                               and often reflects only a portion of    */
-  /*                               the glyphs found in the font (maybe     */
-  /*                               ASCII).                                 */
-  /*                                                                       */
-  /*                               You should use the `sTypoDescender'     */
-  /*                               field of the OS/2 table instead if you  */
-  /*                               want the correct one.                   */
-  /*                                                                       */
-  /*    Line_Gap                :: The font's line gap, i.e., the distance */
-  /*                               to add to the ascender and descender to */
-  /*                               get the BTB, i.e., the                  */
-  /*                               baseline-to-baseline distance for the   */
-  /*                               font.                                   */
-  /*                                                                       */
-  /*    advance_Height_Max      :: This field is the maximum of all        */
-  /*                               advance heights found in the font.  It  */
-  /*                               can be used to compute the maximum      */
-  /*                               height of an arbitrary string of text.  */
-  /*                                                                       */
-  /*    min_Top_Side_Bearing    :: The minimum top side bearing of all     */
-  /*                               glyphs within the font.                 */
-  /*                                                                       */
-  /*    min_Bottom_Side_Bearing :: The minimum bottom side bearing of all  */
-  /*                               glyphs within the font.                 */
-  /*                                                                       */
-  /*    yMax_Extent             :: The maximum vertical extent (i.e., the  */
-  /*                               `height' of a glyph's bounding box) for */
-  /*                               all glyphs in the font.                 */
-  /*                                                                       */
-  /*    caret_Slope_Rise        :: The rise coefficient of the cursor's    */
-  /*                               slope of the cursor (slope=rise/run).   */
-  /*                                                                       */
-  /*    caret_Slope_Run         :: The run coefficient of the cursor's     */
-  /*                               slope.                                  */
-  /*                                                                       */
-  /*    caret_Offset            :: The cursor's offset for slanted fonts.  */
-  /*                               This value is `reserved' in vmtx        */
-  /*                               version 1.0.                            */
-  /*                                                                       */
-  /*    Reserved                :: 8~reserved bytes.                       */
-  /*                                                                       */
-  /*    metric_Data_Format      :: Always~0.                               */
-  /*                                                                       */
-  /*    number_Of_HMetrics      :: Number of VMetrics entries in the       */
-  /*                               `vmtx' table -- this value can be       */
-  /*                               smaller than the total number of glyphs */
-  /*                               in the font.                            */
-  /*                                                                       */
-  /*    long_metrics           :: A pointer into the `vmtx' table.         */
-  /*                                                                       */
-  /*    short_metrics          :: A pointer into the `vmtx' table.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields which */
-  /*               are different.                                          */
-  /*                                                                       */
-  /*               This ensures that a single function in the `ttload'     */
-  /*               module is able to read both the horizontal and vertical */
-  /*               headers.                                                */
-  /*                                                                       */
-  typedef struct  TT_VertHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Height_Max;      /* advance height maximum */
-
-    FT_Short   min_Top_Side_Bearing;    /* minimum left-sb or top-sb       */
-    FT_Short   min_Bottom_Side_Bearing; /* minimum right-sb or bottom-sb   */
-    FT_Short   yMax_Extent;             /* xmax or ymax extents            */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved[4];
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_VMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they're used to connect the metrics header to the relevant     */
-    /* `HMTX' or `VMTX' table.                                            */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_VertHeader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_OS2                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType OS/2 table. This is the long  */
-  /*    table version.  All fields comply to the TrueType specification.   */
-  /*                                                                       */
-  /*    Note that we now support old Mac fonts which do not include an     */
-  /*    OS/2 table.  In this case, the `version' field is always set to    */
-  /*    0xFFFF.                                                            */
-  /*                                                                       */
-  typedef struct  TT_OS2_
-  {
-    FT_UShort  version;                /* 0x0001 - more or 0xFFFF */
-    FT_Short   xAvgCharWidth;
-    FT_UShort  usWeightClass;
-    FT_UShort  usWidthClass;
-    FT_Short   fsType;
-    FT_Short   ySubscriptXSize;
-    FT_Short   ySubscriptYSize;
-    FT_Short   ySubscriptXOffset;
-    FT_Short   ySubscriptYOffset;
-    FT_Short   ySuperscriptXSize;
-    FT_Short   ySuperscriptYSize;
-    FT_Short   ySuperscriptXOffset;
-    FT_Short   ySuperscriptYOffset;
-    FT_Short   yStrikeoutSize;
-    FT_Short   yStrikeoutPosition;
-    FT_Short   sFamilyClass;
-
-    FT_Byte    panose[10];
-
-    FT_ULong   ulUnicodeRange1;        /* Bits 0-31   */
-    FT_ULong   ulUnicodeRange2;        /* Bits 32-63  */
-    FT_ULong   ulUnicodeRange3;        /* Bits 64-95  */
-    FT_ULong   ulUnicodeRange4;        /* Bits 96-127 */
-
-    FT_Char    achVendID[4];
-
-    FT_UShort  fsSelection;
-    FT_UShort  usFirstCharIndex;
-    FT_UShort  usLastCharIndex;
-    FT_Short   sTypoAscender;
-    FT_Short   sTypoDescender;
-    FT_Short   sTypoLineGap;
-    FT_UShort  usWinAscent;
-    FT_UShort  usWinDescent;
-
-    /* only version 1 tables: */
-
-    FT_ULong   ulCodePageRange1;       /* Bits 0-31   */
-    FT_ULong   ulCodePageRange2;       /* Bits 32-63  */
-
-    /* only version 2 tables: */
-
-    FT_Short   sxHeight;
-    FT_Short   sCapHeight;
-    FT_UShort  usDefaultChar;
-    FT_UShort  usBreakChar;
-    FT_UShort  usMaxContext;
-
-  } TT_OS2;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Postscript                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType PostScript table.  All fields */
-  /*    comply to the TrueType specification.  This structure does not     */
-  /*    reference the PostScript glyph names, which can be nevertheless    */
-  /*    accessed with the `ttpost' module.                                 */
-  /*                                                                       */
-  typedef struct  TT_Postscript_
-  {
-    FT_Fixed  FormatType;
-    FT_Fixed  italicAngle;
-    FT_Short  underlinePosition;
-    FT_Short  underlineThickness;
-    FT_ULong  isFixedPitch;
-    FT_ULong  minMemType42;
-    FT_ULong  maxMemType42;
-    FT_ULong  minMemType1;
-    FT_ULong  maxMemType1;
-
-    /* Glyph names follow in the file, but we don't   */
-    /* load them by default.  See the ttpost.c file.  */
-
-  } TT_Postscript;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_PCLT                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType PCLT table.  All fields       */
-  /*    comply to the TrueType specification.                              */
-  /*                                                                       */
-  typedef struct  TT_PCLT_
-  {
-    FT_Fixed   Version;
-    FT_ULong   FontNumber;
-    FT_UShort  Pitch;
-    FT_UShort  xHeight;
-    FT_UShort  Style;
-    FT_UShort  TypeFamily;
-    FT_UShort  CapHeight;
-    FT_UShort  SymbolSet;
-    FT_Char    TypeFace[16];
-    FT_Char    CharacterComplement[8];
-    FT_Char    FileName[6];
-    FT_Char    StrokeWeight;
-    FT_Char    WidthType;
-    FT_Byte    SerifStyle;
-    FT_Byte    Reserved;
-
-  } TT_PCLT;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_MaxProfile                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The maximum profile is a table containing many max values which    */
-  /*    can be used to pre-allocate arrays.  This ensures that no memory   */
-  /*    allocation occurs during a glyph load.                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version               :: The version number.                       */
-  /*                                                                       */
-  /*    numGlyphs             :: The number of glyphs in this TrueType     */
-  /*                             font.                                     */
-  /*                                                                       */
-  /*    maxPoints             :: The maximum number of points in a         */
-  /*                             non-composite TrueType glyph.  See also   */
-  /*                             the structure element                     */
-  /*                             `maxCompositePoints'.                     */
-  /*                                                                       */
-  /*    maxContours           :: The maximum number of contours in a       */
-  /*                             non-composite TrueType glyph.  See also   */
-  /*                             the structure element                     */
-  /*                             `maxCompositeContours'.                   */
-  /*                                                                       */
-  /*    maxCompositePoints    :: The maximum number of points in a         */
-  /*                             composite TrueType glyph.  See also the   */
-  /*                             structure element `maxPoints'.            */
-  /*                                                                       */
-  /*    maxCompositeContours  :: The maximum number of contours in a       */
-  /*                             composite TrueType glyph.  See also the   */
-  /*                             structure element `maxContours'.          */
-  /*                                                                       */
-  /*    maxZones              :: The maximum number of zones used for      */
-  /*                             glyph hinting.                            */
-  /*                                                                       */
-  /*    maxTwilightPoints     :: The maximum number of points in the       */
-  /*                             twilight zone used for glyph hinting.     */
-  /*                                                                       */
-  /*    maxStorage            :: The maximum number of elements in the     */
-  /*                             storage area used for glyph hinting.      */
-  /*                                                                       */
-  /*    maxFunctionDefs       :: The maximum number of function            */
-  /*                             definitions in the TrueType bytecode for  */
-  /*                             this font.                                */
-  /*                                                                       */
-  /*    maxInstructionDefs    :: The maximum number of instruction         */
-  /*                             definitions in the TrueType bytecode for  */
-  /*                             this font.                                */
-  /*                                                                       */
-  /*    maxStackElements      :: The maximum number of stack elements used */
-  /*                             during bytecode interpretation.           */
-  /*                                                                       */
-  /*    maxSizeOfInstructions :: The maximum number of TrueType opcodes    */
-  /*                             used for glyph hinting.                   */
-  /*                                                                       */
-  /*    maxComponentElements  :: The maximum number of simple (i.e., non-  */
-  /*                             composite) glyphs in a composite glyph.   */
-  /*                                                                       */
-  /*    maxComponentDepth     :: The maximum nesting depth of composite    */
-  /*                             glyphs.                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is only used during font loading.                   */
-  /*                                                                       */
-  typedef struct  TT_MaxProfile_
-  {
-    FT_Fixed   version;
-    FT_UShort  numGlyphs;
-    FT_UShort  maxPoints;
-    FT_UShort  maxContours;
-    FT_UShort  maxCompositePoints;
-    FT_UShort  maxCompositeContours;
-    FT_UShort  maxZones;
-    FT_UShort  maxTwilightPoints;
-    FT_UShort  maxStorage;
-    FT_UShort  maxFunctionDefs;
-    FT_UShort  maxInstructionDefs;
-    FT_UShort  maxStackElements;
-    FT_UShort  maxSizeOfInstructions;
-    FT_UShort  maxComponentElements;
-    FT_UShort  maxComponentDepth;
-
-  } TT_MaxProfile;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Sfnt_Tag                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify the index of an SFNT table.         */
-  /*    Used in the @FT_Get_Sfnt_Table API function.                       */
-  /*                                                                       */
-  typedef enum  FT_Sfnt_Tag_
-  {
-    ft_sfnt_head = 0,    /* TT_Header     */
-    ft_sfnt_maxp = 1,    /* TT_MaxProfile */
-    ft_sfnt_os2  = 2,    /* TT_OS2        */
-    ft_sfnt_hhea = 3,    /* TT_HoriHeader */
-    ft_sfnt_vhea = 4,    /* TT_VertHeader */
-    ft_sfnt_post = 5,    /* TT_Postscript */
-    ft_sfnt_pclt = 6,    /* TT_PCLT       */
-
-    sfnt_max   /* internal end mark */
-
-  } FT_Sfnt_Tag;
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Table                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a pointer to a given SFNT table within a face.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source.                                    */
-  /*                                                                       */
-  /*    tag  :: The index of the SFNT table.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A type-less pointer to the table.  This will be~0 in case of       */
-  /*    error, or if the corresponding table was not found *OR* loaded     */
-  /*    from the file.                                                     */
-  /*                                                                       */
-  /*    Use a typecast according to `tag' to access the structure          */
-  /*    elements.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The table is owned by the face object and disappears with it.      */
-  /*                                                                       */
-  /*    This function is only useful to access SFNT tables that are loaded */
-  /*    by the sfnt, truetype, and opentype drivers.  See @FT_Sfnt_Tag for */
-  /*    a list.                                                            */
-  /*                                                                       */
-  /*    Here an example how to access the `vhea' table:                    */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      TT_VertHeader*  vert_header;                                     */
-  /*                                                                       */
-  /*                                                                       */
-  /*      vert_header =                                                    */
-  /*        (TT_VertHeader*)FT_Get_Sfnt_Table( face, ft_sfnt_vhea );       */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( void* )
-  FT_Get_Sfnt_Table( FT_Face      face,
-                     FT_Sfnt_Tag  tag );
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Load_Sfnt_Table
-  *
-  * @description:
-  *   Load any font table into client memory.
-  *
-  * @input:
-  *   face ::
-  *     A handle to the source face.
-  *
-  *   tag ::
-  *     The four-byte tag of the table to load.  Use the value~0 if you want
-  *     to access the whole font file.  Otherwise, you can use one of the
-  *     definitions found in the @FT_TRUETYPE_TAGS_H file, or forge a new
-  *     one with @FT_MAKE_TAG.
-  *
-  *   offset ::
-  *     The starting offset in the table (or file if tag == 0).
-  *
-  * @output:
-  *   buffer ::
-  *     The target buffer address.  The client must ensure that the memory
-  *     array is big enough to hold the data.
-  *
-  * @inout:
-  *   length ::
-  *     If the `length' parameter is NULL, then try to load the whole table.
-  *     Return an error code if it fails.
-  *
-  *     Else, if `*length' is~0, exit immediately while returning the
-  *     table's (or file) full size in it.
-  *
-  *     Else the number of bytes to read from the table or file, from the
-  *     starting offset.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   If you need to determine the table's length you should first call this
-  *   function with `*length' set to~0, as in the following example:
-  *
-  *     {
-  *       FT_ULong  length = 0;
-  *
-  *
-  *       error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
-  *       if ( error ) { ... table does not exist ... }
-  *
-  *       buffer = malloc( length );
-  *       if ( buffer == NULL ) { ... not enough memory ... }
-  *
-  *       error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length );
-  *       if ( error ) { ... could not load table ... }
-  *     }
-  */
-  FT_EXPORT( FT_Error )
-  FT_Load_Sfnt_Table( FT_Face    face,
-                      FT_ULong   tag,
-                      FT_Long    offset,
-                      FT_Byte*   buffer,
-                      FT_ULong*  length );
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Sfnt_Table_Info
-  *
-  * @description:
-  *   Return information on an SFNT table.
-  *
-  * @input:
-  *   face ::
-  *     A handle to the source face.
-  *
-  *   table_index ::
-  *     The index of an SFNT table.  The function returns
-  *     FT_Err_Table_Missing for an invalid value.
-  *
-  * @inout:
-  *   tag ::
-  *     The name tag of the SFNT table.  If the value is NULL, `table_index'
-  *     is ignored, and `length' returns the number of SFNT tables in the
-  *     font.
-  *
-  * @output:
-  *   length ::
-  *     The length of the SFNT table (or the number of SFNT tables, depending
-  *     on `tag').
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   While parsing fonts, FreeType handles SFNT tables with length zero as
-  *   missing.
-  *
-  */
-  FT_EXPORT( FT_Error )
-  FT_Sfnt_Table_Info( FT_Face    face,
-                      FT_UInt    table_index,
-                      FT_ULong  *tag,
-                      FT_ULong  *length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_CMap_Language_ID                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return TrueType/sfnt specific cmap language ID.  Definitions of    */
-  /*    language ID values are in `freetype/ttnameid.h'.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap ::                                                         */
-  /*      The target charmap.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The language ID of `charmap'.  If `charmap' doesn't belong to a    */
-  /*    TrueType/sfnt face, just return~0 as the default value.            */
-  /*                                                                       */
-  /*    For a format~14 cmap (to access Unicode IVS), the return value is  */
-  /*    0xFFFFFFFF.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_CMap_Language_ID( FT_CharMap  charmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_CMap_Format                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return TrueType/sfnt specific cmap format.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap ::                                                         */
-  /*      The target charmap.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The format of `charmap'.  If `charmap' doesn't belong to a         */
-  /*    TrueType/sfnt face, return -1.                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_Get_CMap_Format( FT_CharMap  charmap );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __TTTABLES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/freetype.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/freetype.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/freetype.h	(copie de travail)
@@ -1,4012 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  freetype.h                                                             */
-/*                                                                         */
-/*    FreeType high-level API and common types (specification only).       */
-/*                                                                         */
-/*  Copyright 1996-2013 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FREETYPE_H__
-#define __FREETYPE_H__
-
-
-#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error "  #include <ft2build.h>"
-#error "  #include FT_FREETYPE_H"
-#endif
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_TYPES_H
-#include FT_ERRORS_H
-
-
-FT_BEGIN_HEADER
-
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    user_allocation                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    User allocation                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How client applications should allocate FreeType data structures.  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType assumes that structures allocated by the user and passed  */
-  /*    as arguments are zeroed out except for the actual data.  In other  */
-  /*    words, it is recommended to use `calloc' (or variants of it)       */
-  /*    instead of `malloc' for allocation.                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                        B A S I C   T Y P E S                          */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    base_interface                                                     */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Base Interface                                                     */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The FreeType~2 base font interface.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section describes the public high-level API of FreeType~2.    */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Library                                                         */
-  /*    FT_Face                                                            */
-  /*    FT_Size                                                            */
-  /*    FT_GlyphSlot                                                       */
-  /*    FT_CharMap                                                         */
-  /*    FT_Encoding                                                        */
-  /*                                                                       */
-  /*    FT_FaceRec                                                         */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_SCALABLE                                              */
-  /*    FT_FACE_FLAG_FIXED_SIZES                                           */
-  /*    FT_FACE_FLAG_FIXED_WIDTH                                           */
-  /*    FT_FACE_FLAG_HORIZONTAL                                            */
-  /*    FT_FACE_FLAG_VERTICAL                                              */
-  /*    FT_FACE_FLAG_SFNT                                                  */
-  /*    FT_FACE_FLAG_KERNING                                               */
-  /*    FT_FACE_FLAG_MULTIPLE_MASTERS                                      */
-  /*    FT_FACE_FLAG_GLYPH_NAMES                                           */
-  /*    FT_FACE_FLAG_EXTERNAL_STREAM                                       */
-  /*    FT_FACE_FLAG_FAST_GLYPHS                                           */
-  /*    FT_FACE_FLAG_HINTER                                                */
-  /*                                                                       */
-  /*    FT_STYLE_FLAG_BOLD                                                 */
-  /*    FT_STYLE_FLAG_ITALIC                                               */
-  /*                                                                       */
-  /*    FT_SizeRec                                                         */
-  /*    FT_Size_Metrics                                                    */
-  /*                                                                       */
-  /*    FT_GlyphSlotRec                                                    */
-  /*    FT_Glyph_Metrics                                                   */
-  /*    FT_SubGlyph                                                        */
-  /*                                                                       */
-  /*    FT_Bitmap_Size                                                     */
-  /*                                                                       */
-  /*    FT_Init_FreeType                                                   */
-  /*    FT_Done_FreeType                                                   */
-  /*                                                                       */
-  /*    FT_New_Face                                                        */
-  /*    FT_Done_Face                                                       */
-  /*    FT_New_Memory_Face                                                 */
-  /*    FT_Open_Face                                                       */
-  /*    FT_Open_Args                                                       */
-  /*    FT_Parameter                                                       */
-  /*    FT_Attach_File                                                     */
-  /*    FT_Attach_Stream                                                   */
-  /*                                                                       */
-  /*    FT_Set_Char_Size                                                   */
-  /*    FT_Set_Pixel_Sizes                                                 */
-  /*    FT_Request_Size                                                    */
-  /*    FT_Select_Size                                                     */
-  /*    FT_Size_Request_Type                                               */
-  /*    FT_Size_Request                                                    */
-  /*    FT_Set_Transform                                                   */
-  /*    FT_Load_Glyph                                                      */
-  /*    FT_Get_Char_Index                                                  */
-  /*    FT_Get_Name_Index                                                  */
-  /*    FT_Load_Char                                                       */
-  /*                                                                       */
-  /*    FT_OPEN_MEMORY                                                     */
-  /*    FT_OPEN_STREAM                                                     */
-  /*    FT_OPEN_PATHNAME                                                   */
-  /*    FT_OPEN_DRIVER                                                     */
-  /*    FT_OPEN_PARAMS                                                     */
-  /*                                                                       */
-  /*    FT_LOAD_DEFAULT                                                    */
-  /*    FT_LOAD_RENDER                                                     */
-  /*    FT_LOAD_MONOCHROME                                                 */
-  /*    FT_LOAD_LINEAR_DESIGN                                              */
-  /*    FT_LOAD_NO_SCALE                                                   */
-  /*    FT_LOAD_NO_HINTING                                                 */
-  /*    FT_LOAD_NO_BITMAP                                                  */
-  /*    FT_LOAD_CROP_BITMAP                                                */
-  /*                                                                       */
-  /*    FT_LOAD_VERTICAL_LAYOUT                                            */
-  /*    FT_LOAD_IGNORE_TRANSFORM                                           */
-  /*    FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH                                */
-  /*    FT_LOAD_FORCE_AUTOHINT                                             */
-  /*    FT_LOAD_NO_RECURSE                                                 */
-  /*    FT_LOAD_PEDANTIC                                                   */
-  /*                                                                       */
-  /*    FT_LOAD_TARGET_NORMAL                                              */
-  /*    FT_LOAD_TARGET_LIGHT                                               */
-  /*    FT_LOAD_TARGET_MONO                                                */
-  /*    FT_LOAD_TARGET_LCD                                                 */
-  /*    FT_LOAD_TARGET_LCD_V                                               */
-  /*                                                                       */
-  /*    FT_Render_Glyph                                                    */
-  /*    FT_Render_Mode                                                     */
-  /*    FT_Get_Kerning                                                     */
-  /*    FT_Kerning_Mode                                                    */
-  /*    FT_Get_Track_Kerning                                               */
-  /*    FT_Get_Glyph_Name                                                  */
-  /*    FT_Get_Postscript_Name                                             */
-  /*                                                                       */
-  /*    FT_CharMapRec                                                      */
-  /*    FT_Select_Charmap                                                  */
-  /*    FT_Set_Charmap                                                     */
-  /*    FT_Get_Charmap_Index                                               */
-  /*                                                                       */
-  /*    FT_FSTYPE_INSTALLABLE_EMBEDDING                                    */
-  /*    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING                             */
-  /*    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING                              */
-  /*    FT_FSTYPE_EDITABLE_EMBEDDING                                       */
-  /*    FT_FSTYPE_NO_SUBSETTING                                            */
-  /*    FT_FSTYPE_BITMAP_EMBEDDING_ONLY                                    */
-  /*                                                                       */
-  /*    FT_Get_FSType_Flags                                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Glyph_Metrics                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the metrics of a single glyph.  The      */
-  /*    values are expressed in 26.6 fractional pixel format; if the flag  */
-  /*    @FT_LOAD_NO_SCALE has been used while loading the glyph, values    */
-  /*    are expressed in font units instead.                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    width ::                                                           */
-  /*      The glyph's width.                                               */
-  /*                                                                       */
-  /*    height ::                                                          */
-  /*      The glyph's height.                                              */
-  /*                                                                       */
-  /*    horiBearingX ::                                                    */
-  /*      Left side bearing for horizontal layout.                         */
-  /*                                                                       */
-  /*    horiBearingY ::                                                    */
-  /*      Top side bearing for horizontal layout.                          */
-  /*                                                                       */
-  /*    horiAdvance ::                                                     */
-  /*      Advance width for horizontal layout.                             */
-  /*                                                                       */
-  /*    vertBearingX ::                                                    */
-  /*      Left side bearing for vertical layout.                           */
-  /*                                                                       */
-  /*    vertBearingY ::                                                    */
-  /*      Top side bearing for vertical layout.  Larger positive values    */
-  /*      mean further below the vertical glyph origin.                    */
-  /*                                                                       */
-  /*    vertAdvance ::                                                     */
-  /*      Advance height for vertical layout.  Positive values mean the    */
-  /*      glyph has a positive advance downward.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If not disabled with @FT_LOAD_NO_HINTING, the values represent     */
-  /*    dimensions of the hinted glyph (in case hinting is applicable).    */
-  /*                                                                       */
-  /*    Stroking a glyph with an outside border does not increase          */
-  /*    `horiAdvance' or `vertAdvance'; you have to manually adjust these  */
-  /*    values to account for the added width and height.                  */
-  /*                                                                       */
-  typedef struct  FT_Glyph_Metrics_
-  {
-    FT_Pos  width;
-    FT_Pos  height;
-
-    FT_Pos  horiBearingX;
-    FT_Pos  horiBearingY;
-    FT_Pos  horiAdvance;
-
-    FT_Pos  vertBearingX;
-    FT_Pos  vertBearingY;
-    FT_Pos  vertAdvance;
-
-  } FT_Glyph_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Bitmap_Size                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure models the metrics of a bitmap strike (i.e., a set  */
-  /*    of glyphs for a given point size and resolution) in a bitmap font. */
-  /*    It is used for the `available_sizes' field of @FT_Face.            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height :: The vertical distance, in pixels, between two            */
-  /*              consecutive baselines.  It is always positive.           */
-  /*                                                                       */
-  /*    width  :: The average width, in pixels, of all glyphs in the       */
-  /*              strike.                                                  */
-  /*                                                                       */
-  /*    size   :: The nominal size of the strike in 26.6 fractional        */
-  /*              points.  This field is not very useful.                  */
-  /*                                                                       */
-  /*    x_ppem :: The horizontal ppem (nominal width) in 26.6 fractional   */
-  /*              pixels.                                                  */
-  /*                                                                       */
-  /*    y_ppem :: The vertical ppem (nominal height) in 26.6 fractional    */
-  /*              pixels.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Windows FNT:                                                       */
-  /*      The nominal size given in a FNT font is not reliable.  Thus when */
-  /*      the driver finds it incorrect, it sets `size' to some calculated */
-  /*      values and sets `x_ppem' and `y_ppem' to the pixel width and     */
-  /*      height given in the font, respectively.                          */
-  /*                                                                       */
-  /*    TrueType embedded bitmaps:                                         */
-  /*      `size', `width', and `height' values are not contained in the    */
-  /*      bitmap strike itself.  They are computed from the global font    */
-  /*      parameters.                                                      */
-  /*                                                                       */
-  typedef struct  FT_Bitmap_Size_
-  {
-    FT_Short  height;
-    FT_Short  width;
-
-    FT_Pos    size;
-
-    FT_Pos    x_ppem;
-    FT_Pos    y_ppem;
-
-  } FT_Bitmap_Size;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     O B J E C T   C L A S S E S                       */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Library                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a FreeType library instance.  Each `library' is        */
-  /*    completely independent from the others; it is the `root' of a set  */
-  /*    of objects like fonts, faces, sizes, etc.                          */
-  /*                                                                       */
-  /*    It also embeds a memory manager (see @FT_Memory), as well as a     */
-  /*    scan-line converter object (see @FT_Raster).                       */
-  /*                                                                       */
-  /*    In multi-threaded applications, make sure that the same FT_Library */
-  /*    object or any of its children doesn't get accessed in parallel.    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Library objects are normally created by @FT_Init_FreeType, and     */
-  /*    destroyed with @FT_Done_FreeType.  If you need reference-counting  */
-  /*    (cf. @FT_Reference_Library), use @FT_New_Library and               */
-  /*    @FT_Done_Library.                                                  */
-  /*                                                                       */
-  typedef struct FT_LibraryRec_  *FT_Library;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Module                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType module object.  Each module can be a  */
-  /*    font driver, a renderer, or anything else that provides services   */
-  /*    to the formers.                                                    */
-  /*                                                                       */
-  typedef struct FT_ModuleRec_*  FT_Module;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Driver                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType font driver object.  Each font driver */
-  /*    is a special module capable of creating faces from font files.     */
-  /*                                                                       */
-  typedef struct FT_DriverRec_*  FT_Driver;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Renderer                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType renderer.  A renderer is a special    */
-  /*    module in charge of converting a glyph image to a bitmap, when     */
-  /*    necessary.  Each renderer supports a given glyph image format, and */
-  /*    one or more target surface depths.                                 */
-  /*                                                                       */
-  typedef struct FT_RendererRec_*  FT_Renderer;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given typographic face object.  A face object models */
-  /*    a given typeface, in a given style.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Each face object also owns a single @FT_GlyphSlot object, as well  */
-  /*    as one or more @FT_Size objects.                                   */
-  /*                                                                       */
-  /*    Use @FT_New_Face or @FT_Open_Face to create a new face object from */
-  /*    a given filepathname or a custom input stream.                     */
-  /*                                                                       */
-  /*    Use @FT_Done_Face to destroy it (along with its slot and sizes).   */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_FaceRec for the publicly accessible fields of a given face */
-  /*    object.                                                            */
-  /*                                                                       */
-  typedef struct FT_FaceRec_*  FT_Face;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Size                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model a face scaled to a given       */
-  /*    character size.                                                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Each @FT_Face has an _active_ @FT_Size object that is used by      */
-  /*    functions like @FT_Load_Glyph to determine the scaling             */
-  /*    transformation which is used to load and hint glyphs and metrics.  */
-  /*                                                                       */
-  /*    You can use @FT_Set_Char_Size, @FT_Set_Pixel_Sizes,                */
-  /*    @FT_Request_Size or even @FT_Select_Size to change the content     */
-  /*    (i.e., the scaling values) of the active @FT_Size.                 */
-  /*                                                                       */
-  /*    You can use @FT_New_Size to create additional size objects for a   */
-  /*    given @FT_Face, but they won't be used by other functions until    */
-  /*    you activate it through @FT_Activate_Size.  Only one size can be   */
-  /*    activated at any given time per face.                              */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_SizeRec for the publicly accessible fields of a given size */
-  /*    object.                                                            */
-  /*                                                                       */
-  typedef struct FT_SizeRec_*  FT_Size;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_GlyphSlot                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given `glyph slot'.  A slot is a container where it  */
-  /*    is possible to load any of the glyphs contained in its parent      */
-  /*    face.                                                              */
-  /*                                                                       */
-  /*    In other words, each time you call @FT_Load_Glyph or               */
-  /*    @FT_Load_Char, the slot's content is erased by the new glyph data, */
-  /*    i.e., the glyph's metrics, its image (bitmap or outline), and      */
-  /*    other control information.                                         */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_GlyphSlotRec for the publicly accessible glyph fields.     */
-  /*                                                                       */
-  typedef struct FT_GlyphSlotRec_*  FT_GlyphSlot;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_CharMap                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given character map.  A charmap is used to translate */
-  /*    character codes in a given encoding into glyph indexes for its     */
-  /*    parent's face.  Some font formats may provide several charmaps per */
-  /*    font.                                                              */
-  /*                                                                       */
-  /*    Each face object owns zero or more charmaps, but only one of them  */
-  /*    can be `active' and used by @FT_Get_Char_Index or @FT_Load_Char.   */
-  /*                                                                       */
-  /*    The list of available charmaps in a face is available through the  */
-  /*    `face->num_charmaps' and `face->charmaps' fields of @FT_FaceRec.   */
-  /*                                                                       */
-  /*    The currently active charmap is available as `face->charmap'.      */
-  /*    You should call @FT_Set_Charmap to change it.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    When a new face is created (either through @FT_New_Face or         */
-  /*    @FT_Open_Face), the library looks for a Unicode charmap within     */
-  /*    the list and automatically activates it.                           */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_CharMapRec for the publicly accessible fields of a given   */
-  /*    character map.                                                     */
-  /*                                                                       */
-  typedef struct FT_CharMapRec_*  FT_CharMap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_ENC_TAG                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four-letter tags into an unsigned long.  It is */
-  /*    used to define `encoding' identifiers (see @FT_Encoding).          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since many 16-bit compilers don't like 32-bit enumerations, you    */
-  /*    should redefine this macro in case of problems to something like   */
-  /*    this:                                                              */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #define FT_ENC_TAG( value, a, b, c, d )  value                   */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    to get a simple enumeration without assigning special numbers.     */
-  /*                                                                       */
-
-#ifndef FT_ENC_TAG
-#define FT_ENC_TAG( value, a, b, c, d )         \
-          value = ( ( (FT_UInt32)(a) << 24 ) |  \
-                    ( (FT_UInt32)(b) << 16 ) |  \
-                    ( (FT_UInt32)(c) <<  8 ) |  \
-                      (FT_UInt32)(d)         )
-
-#endif /* FT_ENC_TAG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Encoding                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify character sets supported by         */
-  /*    charmaps.  Used in the @FT_Select_Charmap API function.            */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Despite the name, this enumeration lists specific character        */
-  /*    repertories (i.e., charsets), and not text encoding methods (e.g., */
-  /*    UTF-8, UTF-16, etc.).                                              */
-  /*                                                                       */
-  /*    Other encodings might be defined in the future.                    */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_ENCODING_NONE ::                                                */
-  /*      The encoding value~0 is reserved.                                */
-  /*                                                                       */
-  /*    FT_ENCODING_UNICODE ::                                             */
-  /*      Corresponds to the Unicode character set.  This value covers     */
-  /*      all versions of the Unicode repertoire, including ASCII and      */
-  /*      Latin-1.  Most fonts include a Unicode charmap, but not all      */
-  /*      of them.                                                         */
-  /*                                                                       */
-  /*      For example, if you want to access Unicode value U+1F028 (and    */
-  /*      the font contains it), use value 0x1F028 as the input value for  */
-  /*      @FT_Get_Char_Index.                                              */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_SYMBOL ::                                           */
-  /*      Corresponds to the Microsoft Symbol encoding, used to encode     */
-  /*      mathematical symbols in the 32..255 character code range.  For   */
-  /*      more information, see `http://www.ceviz.net/symbol.htm'.         */
-  /*                                                                       */
-  /*    FT_ENCODING_SJIS ::                                                */
-  /*      Corresponds to Japanese SJIS encoding.  More info at             */
-  /*      at `http://langsupport.japanreference.com/encoding.shtml'.       */
-  /*      See note on multi-byte encodings below.                          */
-  /*                                                                       */
-  /*    FT_ENCODING_GB2312 ::                                              */
-  /*      Corresponds to an encoding system for Simplified Chinese as used */
-  /*      used in mainland China.                                          */
-  /*                                                                       */
-  /*    FT_ENCODING_BIG5 ::                                                */
-  /*      Corresponds to an encoding system for Traditional Chinese as     */
-  /*      used in Taiwan and Hong Kong.                                    */
-  /*                                                                       */
-  /*    FT_ENCODING_WANSUNG ::                                             */
-  /*      Corresponds to the Korean encoding system known as Wansung.      */
-  /*      For more information see                                         */
-  /*      `http://www.microsoft.com/typography/unicode/949.txt'.           */
-  /*                                                                       */
-  /*    FT_ENCODING_JOHAB ::                                               */
-  /*      The Korean standard character set (KS~C 5601-1992), which        */
-  /*      corresponds to MS Windows code page 1361.  This character set    */
-  /*      includes all possible Hangeul character combinations.            */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_LATIN_1 ::                                       */
-  /*      Corresponds to a Latin-1 encoding as defined in a Type~1         */
-  /*      PostScript font.  It is limited to 256 character codes.          */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_STANDARD ::                                      */
-  /*      Corresponds to the Adobe Standard encoding, as found in Type~1,  */
-  /*      CFF, and OpenType/CFF fonts.  It is limited to 256 character     */
-  /*      codes.                                                           */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_EXPERT ::                                        */
-  /*      Corresponds to the Adobe Expert encoding, as found in Type~1,    */
-  /*      CFF, and OpenType/CFF fonts.  It is limited to 256 character     */
-  /*      codes.                                                           */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_CUSTOM ::                                        */
-  /*      Corresponds to a custom encoding, as found in Type~1, CFF, and   */
-  /*      OpenType/CFF fonts.  It is limited to 256 character codes.       */
-  /*                                                                       */
-  /*    FT_ENCODING_APPLE_ROMAN ::                                         */
-  /*      Corresponds to the 8-bit Apple roman encoding.  Many TrueType    */
-  /*      and OpenType fonts contain a charmap for this encoding, since    */
-  /*      older versions of Mac OS are able to use it.                     */
-  /*                                                                       */
-  /*    FT_ENCODING_OLD_LATIN_2 ::                                         */
-  /*      This value is deprecated and was never used nor reported by      */
-  /*      FreeType.  Don't use or test for it.                             */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_SJIS ::                                             */
-  /*      Same as FT_ENCODING_SJIS.  Deprecated.                           */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_GB2312 ::                                           */
-  /*      Same as FT_ENCODING_GB2312.  Deprecated.                         */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_BIG5 ::                                             */
-  /*      Same as FT_ENCODING_BIG5.  Deprecated.                           */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_WANSUNG ::                                          */
-  /*      Same as FT_ENCODING_WANSUNG.  Deprecated.                        */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_JOHAB ::                                            */
-  /*      Same as FT_ENCODING_JOHAB.  Deprecated.                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    By default, FreeType automatically synthesizes a Unicode charmap   */
-  /*    for PostScript fonts, using their glyph names dictionaries.        */
-  /*    However, it also reports the encodings defined explicitly in the   */
-  /*    font file, for the cases when they are needed, with the Adobe      */
-  /*    values as well.                                                    */
-  /*                                                                       */
-  /*    FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap  */
-  /*    is neither Unicode nor ISO-8859-1 (otherwise it is set to          */
-  /*    FT_ENCODING_UNICODE).  Use @FT_Get_BDF_Charset_ID to find out      */
-  /*    which encoding is really present.  If, for example, the            */
-  /*    `cs_registry' field is `KOI8' and the `cs_encoding' field is `R',  */
-  /*    the font is encoded in KOI8-R.                                     */
-  /*                                                                       */
-  /*    FT_ENCODING_NONE is always set (with a single exception) by the    */
-  /*    winfonts driver.  Use @FT_Get_WinFNT_Header and examine the        */
-  /*    `charset' field of the @FT_WinFNT_HeaderRec structure to find out  */
-  /*    which encoding is really present.  For example,                    */
-  /*    @FT_WinFNT_ID_CP1251 (204) means Windows code page 1251 (for       */
-  /*    Russian).                                                          */
-  /*                                                                       */
-  /*    FT_ENCODING_NONE is set if `platform_id' is @TT_PLATFORM_MACINTOSH */
-  /*    and `encoding_id' is not @TT_MAC_ID_ROMAN (otherwise it is set to  */
-  /*    FT_ENCODING_APPLE_ROMAN).                                          */
-  /*                                                                       */
-  /*    If `platform_id' is @TT_PLATFORM_MACINTOSH, use the function       */
-  /*    @FT_Get_CMap_Language_ID  to query the Mac language ID which may   */
-  /*    be needed to be able to distinguish Apple encoding variants.  See  */
-  /*                                                                       */
-  /*      http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/README.TXT  */
-  /*                                                                       */
-  /*    to get an idea how to do that.  Basically, if the language ID      */
-  /*    is~0, don't use it, otherwise subtract 1 from the language ID.     */
-  /*    Then examine `encoding_id'.  If, for example, `encoding_id' is     */
-  /*    @TT_MAC_ID_ROMAN and the language ID (minus~1) is                  */
-  /*    `TT_MAC_LANGID_GREEK', it is the Greek encoding, not Roman.        */
-  /*    @TT_MAC_ID_ARABIC with `TT_MAC_LANGID_FARSI' means the Farsi       */
-  /*    variant the Arabic encoding.                                       */
-  /*                                                                       */
-  typedef enum  FT_Encoding_
-  {
-    FT_ENC_TAG( FT_ENCODING_NONE, 0, 0, 0, 0 ),
-
-    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL, 's', 'y', 'm', 'b' ),
-    FT_ENC_TAG( FT_ENCODING_UNICODE,   'u', 'n', 'i', 'c' ),
-
-    FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
-    FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
-    FT_ENC_TAG( FT_ENCODING_BIG5,    'b', 'i', 'g', '5' ),
-    FT_ENC_TAG( FT_ENCODING_WANSUNG, 'w', 'a', 'n', 's' ),
-    FT_ENC_TAG( FT_ENCODING_JOHAB,   'j', 'o', 'h', 'a' ),
-
-    /* for backwards compatibility */
-    FT_ENCODING_MS_SJIS    = FT_ENCODING_SJIS,
-    FT_ENCODING_MS_GB2312  = FT_ENCODING_GB2312,
-    FT_ENCODING_MS_BIG5    = FT_ENCODING_BIG5,
-    FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG,
-    FT_ENCODING_MS_JOHAB   = FT_ENCODING_JOHAB,
-
-    FT_ENC_TAG( FT_ENCODING_ADOBE_STANDARD, 'A', 'D', 'O', 'B' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_EXPERT,   'A', 'D', 'B', 'E' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_CUSTOM,   'A', 'D', 'B', 'C' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_LATIN_1,  'l', 'a', 't', '1' ),
-
-    FT_ENC_TAG( FT_ENCODING_OLD_LATIN_2, 'l', 'a', 't', '2' ),
-
-    FT_ENC_TAG( FT_ENCODING_APPLE_ROMAN, 'a', 'r', 'm', 'n' )
-
-  } FT_Encoding;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_encoding_xxx                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    These constants are deprecated; use the corresponding @FT_Encoding */
-  /*    values instead.                                                    */
-  /*                                                                       */
-#define ft_encoding_none            FT_ENCODING_NONE
-#define ft_encoding_unicode         FT_ENCODING_UNICODE
-#define ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
-#define ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
-#define ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
-#define ft_encoding_sjis            FT_ENCODING_SJIS
-#define ft_encoding_gb2312          FT_ENCODING_GB2312
-#define ft_encoding_big5            FT_ENCODING_BIG5
-#define ft_encoding_wansung         FT_ENCODING_WANSUNG
-#define ft_encoding_johab           FT_ENCODING_JOHAB
-
-#define ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
-#define ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
-#define ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
-#define ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_CharMapRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The base charmap structure.                                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face        :: A handle to the parent face object.                 */
-  /*                                                                       */
-  /*    encoding    :: An @FT_Encoding tag identifying the charmap.  Use   */
-  /*                   this with @FT_Select_Charmap.                       */
-  /*                                                                       */
-  /*    platform_id :: An ID number describing the platform for the        */
-  /*                   following encoding ID.  This comes directly from    */
-  /*                   the TrueType specification and should be emulated   */
-  /*                   for other formats.                                  */
-  /*                                                                       */
-  /*    encoding_id :: A platform specific encoding number.  This also     */
-  /*                   comes from the TrueType specification and should be */
-  /*                   emulated similarly.                                 */
-  /*                                                                       */
-  typedef struct  FT_CharMapRec_
-  {
-    FT_Face      face;
-    FT_Encoding  encoding;
-    FT_UShort    platform_id;
-    FT_UShort    encoding_id;
-
-  } FT_CharMapRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                 B A S E   O B J E C T   C L A S S E S                 */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Face_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an `FT_Face_InternalRec' structure, used to    */
-  /*    model private data of a given @FT_Face object.                     */
-  /*                                                                       */
-  /*    This structure might change between releases of FreeType~2 and is  */
-  /*    not generally available to client applications.                    */
-  /*                                                                       */
-  typedef struct FT_Face_InternalRec_*  FT_Face_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_FaceRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root face class structure.  A face object models a        */
-  /*    typeface in a font file.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_faces           :: The number of faces in the font file.  Some */
-  /*                           font formats can have multiple faces in     */
-  /*                           a font file.                                */
-  /*                                                                       */
-  /*    face_index          :: The index of the face in the font file.  It */
-  /*                           is set to~0 if there is only one face in    */
-  /*                           the font file.                              */
-  /*                                                                       */
-  /*    face_flags          :: A set of bit flags that give important      */
-  /*                           information about the face; see             */
-  /*                           @FT_FACE_FLAG_XXX for the details.          */
-  /*                                                                       */
-  /*    style_flags         :: A set of bit flags indicating the style of  */
-  /*                           the face; see @FT_STYLE_FLAG_XXX for the    */
-  /*                           details.                                    */
-  /*                                                                       */
-  /*    num_glyphs          :: The number of glyphs in the face.  If the   */
-  /*                           face is scalable and has sbits (see         */
-  /*                           `num_fixed_sizes'), it is set to the number */
-  /*                           of outline glyphs.                          */
-  /*                                                                       */
-  /*                           For CID-keyed fonts, this value gives the   */
-  /*                           highest CID used in the font.               */
-  /*                                                                       */
-  /*    family_name         :: The face's family name.  This is an ASCII   */
-  /*                           string, usually in English, which describes */
-  /*                           the typeface's family (like `Times New      */
-  /*                           Roman', `Bodoni', `Garamond', etc).  This   */
-  /*                           is a least common denominator used to list  */
-  /*                           fonts.  Some formats (TrueType & OpenType)  */
-  /*                           provide localized and Unicode versions of   */
-  /*                           this string.  Applications should use the   */
-  /*                           format specific interface to access them.   */
-  /*                           Can be NULL (e.g., in fonts embedded in a   */
-  /*                           PDF file).                                  */
-  /*                                                                       */
-  /*    style_name          :: The face's style name.  This is an ASCII    */
-  /*                           string, usually in English, which describes */
-  /*                           the typeface's style (like `Italic',        */
-  /*                           `Bold', `Condensed', etc).  Not all font    */
-  /*                           formats provide a style name, so this field */
-  /*                           is optional, and can be set to NULL.  As    */
-  /*                           for `family_name', some formats provide     */
-  /*                           localized and Unicode versions of this      */
-  /*                           string.  Applications should use the format */
-  /*                           specific interface to access them.          */
-  /*                                                                       */
-  /*    num_fixed_sizes     :: The number of bitmap strikes in the face.   */
-  /*                           Even if the face is scalable, there might   */
-  /*                           still be bitmap strikes, which are called   */
-  /*                           `sbits' in that case.                       */
-  /*                                                                       */
-  /*    available_sizes     :: An array of @FT_Bitmap_Size for all bitmap  */
-  /*                           strikes in the face.  It is set to NULL if  */
-  /*                           there is no bitmap strike.                  */
-  /*                                                                       */
-  /*    num_charmaps        :: The number of charmaps in the face.         */
-  /*                                                                       */
-  /*    charmaps            :: An array of the charmaps of the face.       */
-  /*                                                                       */
-  /*    generic             :: A field reserved for client uses.  See the  */
-  /*                           @FT_Generic type description.               */
-  /*                                                                       */
-  /*    bbox                :: The font bounding box.  Coordinates are     */
-  /*                           expressed in font units (see                */
-  /*                           `units_per_EM').  The box is large enough   */
-  /*                           to contain any glyph from the font.  Thus,  */
-  /*                           `bbox.yMax' can be seen as the `maximum     */
-  /*                           ascender', and `bbox.yMin' as the `minimum  */
-  /*                           descender'.  Only relevant for scalable     */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*                           Note that the bounding box might be off by  */
-  /*                           (at least) one pixel for hinted fonts.  See */
-  /*                           @FT_Size_Metrics for further discussion.    */
-  /*                                                                       */
-  /*    units_per_EM        :: The number of font units per EM square for  */
-  /*                           this face.  This is typically 2048 for      */
-  /*                           TrueType fonts, and 1000 for Type~1 fonts.  */
-  /*                           Only relevant for scalable formats.         */
-  /*                                                                       */
-  /*    ascender            :: The typographic ascender of the face,       */
-  /*                           expressed in font units.  For font formats  */
-  /*                           not having this information, it is set to   */
-  /*                           `bbox.yMax'.  Only relevant for scalable    */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*    descender           :: The typographic descender of the face,      */
-  /*                           expressed in font units.  For font formats  */
-  /*                           not having this information, it is set to   */
-  /*                           `bbox.yMin'.  Note that this field is       */
-  /*                           usually negative.  Only relevant for        */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    height              :: This value is the vertical distance         */
-  /*                           between two consecutive baselines,          */
-  /*                           expressed in font units.  It is always      */
-  /*                           positive.  Only relevant for scalable       */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*                           If you want the global glyph height, use    */
-  /*                           `ascender - descender'.                     */
-  /*                                                                       */
-  /*    max_advance_width   :: The maximum advance width, in font units,   */
-  /*                           for all glyphs in this face.  This can be   */
-  /*                           used to make word wrapping computations     */
-  /*                           faster.  Only relevant for scalable         */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*    max_advance_height  :: The maximum advance height, in font units,  */
-  /*                           for all glyphs in this face.  This is only  */
-  /*                           relevant for vertical layouts, and is set   */
-  /*                           to `height' for fonts that do not provide   */
-  /*                           vertical metrics.  Only relevant for        */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    underline_position  :: The position, in font units, of the         */
-  /*                           underline line for this face.  It is the    */
-  /*                           center of the underlining stem.  Only       */
-  /*                           relevant for scalable formats.              */
-  /*                                                                       */
-  /*    underline_thickness :: The thickness, in font units, of the        */
-  /*                           underline for this face.  Only relevant for */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    glyph               :: The face's associated glyph slot(s).        */
-  /*                                                                       */
-  /*    size                :: The current active size for this face.      */
-  /*                                                                       */
-  /*    charmap             :: The current active charmap for this face.   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Fields may be changed after a call to @FT_Attach_File or           */
-  /*    @FT_Attach_Stream.                                                 */
-  /*                                                                       */
-  typedef struct  FT_FaceRec_
-  {
-    FT_Long           num_faces;
-    FT_Long           face_index;
-
-    FT_Long           face_flags;
-    FT_Long           style_flags;
-
-    FT_Long           num_glyphs;
-
-    FT_String*        family_name;
-    FT_String*        style_name;
-
-    FT_Int            num_fixed_sizes;
-    FT_Bitmap_Size*   available_sizes;
-
-    FT_Int            num_charmaps;
-    FT_CharMap*       charmaps;
-
-    FT_Generic        generic;
-
-    /*# The following member variables (down to `underline_thickness') */
-    /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
-    /*# for bitmap fonts.                                              */
-    FT_BBox           bbox;
-
-    FT_UShort         units_per_EM;
-    FT_Short          ascender;
-    FT_Short          descender;
-    FT_Short          height;
-
-    FT_Short          max_advance_width;
-    FT_Short          max_advance_height;
-
-    FT_Short          underline_position;
-    FT_Short          underline_thickness;
-
-    FT_GlyphSlot      glyph;
-    FT_Size           size;
-    FT_CharMap        charmap;
-
-    /*@private begin */
-
-    FT_Driver         driver;
-    FT_Memory         memory;
-    FT_Stream         stream;
-
-    FT_ListRec        sizes_list;
-
-    FT_Generic        autohint;   /* face-specific auto-hinter data */
-    void*             extensions; /* unused                         */
-
-    FT_Face_Internal  internal;
-
-    /*@private end */
-
-  } FT_FaceRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_FACE_FLAG_XXX                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flags used in the `face_flags' field of the          */
-  /*    @FT_FaceRec structure.  They inform client applications of         */
-  /*    properties of the corresponding face.                              */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_FACE_FLAG_SCALABLE ::                                           */
-  /*      Indicates that the face contains outline glyphs.  This doesn't   */
-  /*      prevent bitmap strikes, i.e., a face can have both this and      */
-  /*      and @FT_FACE_FLAG_FIXED_SIZES set.                               */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FIXED_SIZES ::                                        */
-  /*      Indicates that the face contains bitmap strikes.  See also the   */
-  /*      `num_fixed_sizes' and `available_sizes' fields of @FT_FaceRec.   */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FIXED_WIDTH ::                                        */
-  /*      Indicates that the face contains fixed-width characters (like    */
-  /*      Courier, Lucido, MonoType, etc.).                                */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_SFNT ::                                               */
-  /*      Indicates that the face uses the `sfnt' storage scheme.  For     */
-  /*      now, this means TrueType and OpenType.                           */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_HORIZONTAL ::                                         */
-  /*      Indicates that the face contains horizontal glyph metrics.  This */
-  /*      should be set for all common formats.                            */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_VERTICAL ::                                           */
-  /*      Indicates that the face contains vertical glyph metrics.  This   */
-  /*      is only available in some formats, not all of them.              */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_KERNING ::                                            */
-  /*      Indicates that the face contains kerning information.  If set,   */
-  /*      the kerning distance can be retrieved through the function       */
-  /*      @FT_Get_Kerning.  Otherwise the function always return the       */
-  /*      vector (0,0).  Note that FreeType doesn't handle kerning data    */
-  /*      from the `GPOS' table (as present in some OpenType fonts).       */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FAST_GLYPHS ::                                        */
-  /*      THIS FLAG IS DEPRECATED.  DO NOT USE OR TEST IT.                 */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_MULTIPLE_MASTERS ::                                   */
-  /*      Indicates that the font contains multiple masters and is capable */
-  /*      of interpolating between them.  See the multiple-masters         */
-  /*      specific API for details.                                        */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_GLYPH_NAMES ::                                        */
-  /*      Indicates that the font contains glyph names that can be         */
-  /*      retrieved through @FT_Get_Glyph_Name.  Note that some TrueType   */
-  /*      fonts contain broken glyph name tables.  Use the function        */
-  /*      @FT_Has_PS_Glyph_Names when needed.                              */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_EXTERNAL_STREAM ::                                    */
-  /*      Used internally by FreeType to indicate that a face's stream was */
-  /*      provided by the client application and should not be destroyed   */
-  /*      when @FT_Done_Face is called.  Don't read or test this flag.     */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_HINTER ::                                             */
-  /*      Set if the font driver has a hinting machine of its own.  For    */
-  /*      example, with TrueType fonts, it makes sense to use data from    */
-  /*      the SFNT `gasp' table only if the native TrueType hinting engine */
-  /*      (with the bytecode interpreter) is available and active.         */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_CID_KEYED ::                                          */
-  /*      Set if the font is CID-keyed.  In that case, the font is not     */
-  /*      accessed by glyph indices but by CID values.  For subsetted      */
-  /*      CID-keyed fonts this has the consequence that not all index      */
-  /*      values are a valid argument to FT_Load_Glyph.  Only the CID      */
-  /*      values for which corresponding glyphs in the subsetted font      */
-  /*      exist make FT_Load_Glyph return successfully; in all other cases */
-  /*      you get an `FT_Err_Invalid_Argument' error.                      */
-  /*                                                                       */
-  /*      Note that CID-keyed fonts which are in an SFNT wrapper don't     */
-  /*      have this flag set since the glyphs are accessed in the normal   */
-  /*      way (using contiguous indices); the `CID-ness' isn't visible to  */
-  /*      the application.                                                 */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_TRICKY ::                                             */
-  /*      Set if the font is `tricky', this is, it always needs the        */
-  /*      font format's native hinting engine to get a reasonable result.  */
-  /*      A typical example is the Chinese font `mingli.ttf' which uses    */
-  /*      TrueType bytecode instructions to move and scale all of its      */
-  /*      subglyphs.                                                       */
-  /*                                                                       */
-  /*      It is not possible to autohint such fonts using                  */
-  /*      @FT_LOAD_FORCE_AUTOHINT; it will also ignore                     */
-  /*      @FT_LOAD_NO_HINTING.  You have to set both @FT_LOAD_NO_HINTING   */
-  /*      and @FT_LOAD_NO_AUTOHINT to really disable hinting; however, you */
-  /*      probably never want this except for demonstration purposes.      */
-  /*                                                                       */
-  /*      Currently, there are about a dozen TrueType fonts in the list of */
-  /*      tricky fonts; they are hard-coded in file `ttobjs.c'.            */
-  /*                                                                       */
-#define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
-#define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
-#define FT_FACE_FLAG_FIXED_WIDTH       ( 1L <<  2 )
-#define FT_FACE_FLAG_SFNT              ( 1L <<  3 )
-#define FT_FACE_FLAG_HORIZONTAL        ( 1L <<  4 )
-#define FT_FACE_FLAG_VERTICAL          ( 1L <<  5 )
-#define FT_FACE_FLAG_KERNING           ( 1L <<  6 )
-#define FT_FACE_FLAG_FAST_GLYPHS       ( 1L <<  7 )
-#define FT_FACE_FLAG_MULTIPLE_MASTERS  ( 1L <<  8 )
-#define FT_FACE_FLAG_GLYPH_NAMES       ( 1L <<  9 )
-#define FT_FACE_FLAG_EXTERNAL_STREAM   ( 1L << 10 )
-#define FT_FACE_FLAG_HINTER            ( 1L << 11 )
-#define FT_FACE_FLAG_CID_KEYED         ( 1L << 12 )
-#define FT_FACE_FLAG_TRICKY            ( 1L << 13 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_HORIZONTAL( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains
-   *   horizontal metrics (this is true for all font formats though).
-   *
-   * @also:
-   *   @FT_HAS_VERTICAL can be used to check for vertical metrics.
-   *
-   */
-#define FT_HAS_HORIZONTAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_HORIZONTAL )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_VERTICAL( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains real
-   *   vertical metrics (and not only synthesized ones).
-   *
-   */
-#define FT_HAS_VERTICAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_VERTICAL )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_KERNING( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains kerning
-   *   data that can be accessed with @FT_Get_Kerning.
-   *
-   */
-#define FT_HAS_KERNING( face ) \
-          ( face->face_flags & FT_FACE_FLAG_KERNING )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_SCALABLE( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a scalable
-   *   font face (true for TrueType, Type~1, Type~42, CID, OpenType/CFF,
-   *   and PFR font formats.
-   *
-   */
-#define FT_IS_SCALABLE( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SCALABLE )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_SFNT( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a font
-   *   whose format is based on the SFNT storage scheme.  This usually
-   *   means: TrueType fonts, OpenType fonts, as well as SFNT-based embedded
-   *   bitmap fonts.
-   *
-   *   If this macro is true, all functions defined in @FT_SFNT_NAMES_H and
-   *   @FT_TRUETYPE_TABLES_H are available.
-   *
-   */
-#define FT_IS_SFNT( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SFNT )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_FIXED_WIDTH( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a font face
-   *   that contains fixed-width (or `monospace', `fixed-pitch', etc.)
-   *   glyphs.
-   *
-   */
-#define FT_IS_FIXED_WIDTH( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_WIDTH )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_FIXED_SIZES( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains some
-   *   embedded bitmaps.  See the `available_sizes' field of the
-   *   @FT_FaceRec structure.
-   *
-   */
-#define FT_HAS_FIXED_SIZES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_FAST_GLYPHS( face )
-   *
-   * @description:
-   *   Deprecated.
-   *
-   */
-#define FT_HAS_FAST_GLYPHS( face )  0
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_GLYPH_NAMES( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains some glyph
-   *   names that can be accessed through @FT_Get_Glyph_Name.
-   *
-   */
-#define FT_HAS_GLYPH_NAMES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_MULTIPLE_MASTERS( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains some
-   *   multiple masters.  The functions provided by @FT_MULTIPLE_MASTERS_H
-   *   are then available to choose the exact design you want.
-   *
-   */
-#define FT_HAS_MULTIPLE_MASTERS( face ) \
-          ( face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_CID_KEYED( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a CID-keyed
-   *   font.  See the discussion of @FT_FACE_FLAG_CID_KEYED for more
-   *   details.
-   *
-   *   If this macro is true, all functions defined in @FT_CID_H are
-   *   available.
-   *
-   */
-#define FT_IS_CID_KEYED( face ) \
-          ( face->face_flags & FT_FACE_FLAG_CID_KEYED )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_TRICKY( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face represents a `tricky' font.
-   *   See the discussion of @FT_FACE_FLAG_TRICKY for more details.
-   *
-   */
-#define FT_IS_TRICKY( face ) \
-          ( face->face_flags & FT_FACE_FLAG_TRICKY )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    FT_STYLE_FLAG_XXX                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-flags used to indicate the style of a given face.    */
-  /*    These are used in the `style_flags' field of @FT_FaceRec.          */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_STYLE_FLAG_ITALIC ::                                            */
-  /*      Indicates that a given face style is italic or oblique.          */
-  /*                                                                       */
-  /*    FT_STYLE_FLAG_BOLD ::                                              */
-  /*      Indicates that a given face is bold.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The style information as provided by FreeType is very basic.  More */
-  /*    details are beyond the scope and should be done on a higher level  */
-  /*    (for example, by analyzing various fields of the `OS/2' table in   */
-  /*    SFNT based fonts).                                                 */
-  /*                                                                       */
-#define FT_STYLE_FLAG_ITALIC  ( 1 << 0 )
-#define FT_STYLE_FLAG_BOLD    ( 1 << 1 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Size_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an `FT_Size_InternalRec' structure, used to    */
-  /*    model private data of a given @FT_Size object.                     */
-  /*                                                                       */
-  typedef struct FT_Size_InternalRec_*  FT_Size_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_Metrics                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The size metrics structure gives the metrics of a size object.     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x_ppem       :: The width of the scaled EM square in pixels, hence */
-  /*                    the term `ppem' (pixels per EM).  It is also       */
-  /*                    referred to as `nominal width'.                    */
-  /*                                                                       */
-  /*    y_ppem       :: The height of the scaled EM square in pixels,      */
-  /*                    hence the term `ppem' (pixels per EM).  It is also */
-  /*                    referred to as `nominal height'.                   */
-  /*                                                                       */
-  /*    x_scale      :: A 16.16 fractional scaling value used to convert   */
-  /*                    horizontal metrics from font units to 26.6         */
-  /*                    fractional pixels.  Only relevant for scalable     */
-  /*                    font formats.                                      */
-  /*                                                                       */
-  /*    y_scale      :: A 16.16 fractional scaling value used to convert   */
-  /*                    vertical metrics from font units to 26.6           */
-  /*                    fractional pixels.  Only relevant for scalable     */
-  /*                    font formats.                                      */
-  /*                                                                       */
-  /*    ascender     :: The ascender in 26.6 fractional pixels.  See       */
-  /*                    @FT_FaceRec for the details.                       */
-  /*                                                                       */
-  /*    descender    :: The descender in 26.6 fractional pixels.  See      */
-  /*                    @FT_FaceRec for the details.                       */
-  /*                                                                       */
-  /*    height       :: The height in 26.6 fractional pixels.  See         */
-  /*                    @FT_FaceRec for the details.                       */
-  /*                                                                       */
-  /*    max_advance  :: The maximum advance width in 26.6 fractional       */
-  /*                    pixels.  See @FT_FaceRec for the details.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The scaling values, if relevant, are determined first during a     */
-  /*    size changing operation.  The remaining fields are then set by the */
-  /*    driver.  For scalable formats, they are usually set to scaled      */
-  /*    values of the corresponding fields in @FT_FaceRec.                 */
-  /*                                                                       */
-  /*    Note that due to glyph hinting, these values might not be exact    */
-  /*    for certain fonts.  Thus they must be treated as unreliable        */
-  /*    with an error margin of at least one pixel!                        */
-  /*                                                                       */
-  /*    Indeed, the only way to get the exact metrics is to render _all_   */
-  /*    glyphs.  As this would be a definite performance hit, it is up to  */
-  /*    client applications to perform such computations.                  */
-  /*                                                                       */
-  /*    The FT_Size_Metrics structure is valid for bitmap fonts also.      */
-  /*                                                                       */
-  typedef struct  FT_Size_Metrics_
-  {
-    FT_UShort  x_ppem;      /* horizontal pixels per EM               */
-    FT_UShort  y_ppem;      /* vertical pixels per EM                 */
-
-    FT_Fixed   x_scale;     /* scaling values used to convert font    */
-    FT_Fixed   y_scale;     /* units to 26.6 fractional pixels        */
-
-    FT_Pos     ascender;    /* ascender in 26.6 frac. pixels          */
-    FT_Pos     descender;   /* descender in 26.6 frac. pixels         */
-    FT_Pos     height;      /* text height in 26.6 frac. pixels       */
-    FT_Pos     max_advance; /* max horizontal advance, in 26.6 pixels */
-
-  } FT_Size_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SizeRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root size class structure.  A size object models a face   */
-  /*    object at a given size.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face    :: Handle to the parent face object.                       */
-  /*                                                                       */
-  /*    generic :: A typeless pointer, which is unused by the FreeType     */
-  /*               library or any of its drivers.  It can be used by       */
-  /*               client applications to link their own data to each size */
-  /*               object.                                                 */
-  /*                                                                       */
-  /*    metrics :: Metrics for this size object.  This field is read-only. */
-  /*                                                                       */
-  typedef struct  FT_SizeRec_
-  {
-    FT_Face           face;      /* parent face object              */
-    FT_Generic        generic;   /* generic pointer for client uses */
-    FT_Size_Metrics   metrics;   /* size metrics                    */
-    FT_Size_Internal  internal;
-
-  } FT_SizeRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SubGlyph                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The subglyph structure is an internal object used to describe      */
-  /*    subglyphs (for example, in the case of composites).                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The subglyph implementation is not part of the high-level API,     */
-  /*    hence the forward structure declaration.                           */
-  /*                                                                       */
-  /*    You can however retrieve subglyph information with                 */
-  /*    @FT_Get_SubGlyph_Info.                                             */
-  /*                                                                       */
-  typedef struct FT_SubGlyphRec_*  FT_SubGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Slot_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an `FT_Slot_InternalRec' structure, used to    */
-  /*    model private data of a given @FT_GlyphSlot object.                */
-  /*                                                                       */
-  typedef struct FT_Slot_InternalRec_*  FT_Slot_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphSlotRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root glyph slot class structure.  A glyph slot is a       */
-  /*    container where individual glyphs can be loaded, be they in        */
-  /*    outline or bitmap format.                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library           :: A handle to the FreeType library instance     */
-  /*                         this slot belongs to.                         */
-  /*                                                                       */
-  /*    face              :: A handle to the parent face object.           */
-  /*                                                                       */
-  /*    next              :: In some cases (like some font tools), several */
-  /*                         glyph slots per face object can be a good     */
-  /*                         thing.  As this is rare, the glyph slots are  */
-  /*                         listed through a direct, single-linked list   */
-  /*                         using its `next' field.                       */
-  /*                                                                       */
-  /*    generic           :: A typeless pointer which is unused by the     */
-  /*                         FreeType library or any of its drivers.  It   */
-  /*                         can be used by client applications to link    */
-  /*                         their own data to each glyph slot object.     */
-  /*                                                                       */
-  /*    metrics           :: The metrics of the last loaded glyph in the   */
-  /*                         slot.  The returned values depend on the last */
-  /*                         load flags (see the @FT_Load_Glyph API        */
-  /*                         function) and can be expressed either in 26.6 */
-  /*                         fractional pixels or font units.              */
-  /*                                                                       */
-  /*                         Note that even when the glyph image is        */
-  /*                         transformed, the metrics are not.             */
-  /*                                                                       */
-  /*    linearHoriAdvance :: The advance width of the unhinted glyph.      */
-  /*                         Its value is expressed in 16.16 fractional    */
-  /*                         pixels, unless @FT_LOAD_LINEAR_DESIGN is set  */
-  /*                         when loading the glyph.  This field can be    */
-  /*                         important to perform correct WYSIWYG layout.  */
-  /*                         Only relevant for outline glyphs.             */
-  /*                                                                       */
-  /*    linearVertAdvance :: The advance height of the unhinted glyph.     */
-  /*                         Its value is expressed in 16.16 fractional    */
-  /*                         pixels, unless @FT_LOAD_LINEAR_DESIGN is set  */
-  /*                         when loading the glyph.  This field can be    */
-  /*                         important to perform correct WYSIWYG layout.  */
-  /*                         Only relevant for outline glyphs.             */
-  /*                                                                       */
-  /*    advance           :: This shorthand is, depending on               */
-  /*                         @FT_LOAD_IGNORE_TRANSFORM, the transformed    */
-  /*                         advance width for the glyph (in 26.6          */
-  /*                         fractional pixel format).  As specified with  */
-  /*                         @FT_LOAD_VERTICAL_LAYOUT, it uses either the  */
-  /*                         `horiAdvance' or the `vertAdvance' value of   */
-  /*                         `metrics' field.                              */
-  /*                                                                       */
-  /*    format            :: This field indicates the format of the image  */
-  /*                         contained in the glyph slot.  Typically       */
-  /*                         @FT_GLYPH_FORMAT_BITMAP,                      */
-  /*                         @FT_GLYPH_FORMAT_OUTLINE, or                  */
-  /*                         @FT_GLYPH_FORMAT_COMPOSITE, but others are    */
-  /*                         possible.                                     */
-  /*                                                                       */
-  /*    bitmap            :: This field is used as a bitmap descriptor     */
-  /*                         when the slot format is                       */
-  /*                         @FT_GLYPH_FORMAT_BITMAP.  Note that the       */
-  /*                         address and content of the bitmap buffer can  */
-  /*                         change between calls of @FT_Load_Glyph and a  */
-  /*                         few other functions.                          */
-  /*                                                                       */
-  /*    bitmap_left       :: This is the bitmap's left bearing expressed   */
-  /*                         in integer pixels.  Of course, this is only   */
-  /*                         valid if the format is                        */
-  /*                         @FT_GLYPH_FORMAT_BITMAP.                      */
-  /*                                                                       */
-  /*    bitmap_top        :: This is the bitmap's top bearing expressed in */
-  /*                         integer pixels.  Remember that this is the    */
-  /*                         distance from the baseline to the top-most    */
-  /*                         glyph scanline, upwards y~coordinates being   */
-  /*                         *positive*.                                   */
-  /*                                                                       */
-  /*    outline           :: The outline descriptor for the current glyph  */
-  /*                         image if its format is                        */
-  /*                         @FT_GLYPH_FORMAT_OUTLINE.  Once a glyph is    */
-  /*                         loaded, `outline' can be transformed,         */
-  /*                         distorted, embolded, etc.  However, it must   */
-  /*                         not be freed.                                 */
-  /*                                                                       */
-  /*    num_subglyphs     :: The number of subglyphs in a composite glyph. */
-  /*                         This field is only valid for the composite    */
-  /*                         glyph format that should normally only be     */
-  /*                         loaded with the @FT_LOAD_NO_RECURSE flag.     */
-  /*                         For now this is internal to FreeType.         */
-  /*                                                                       */
-  /*    subglyphs         :: An array of subglyph descriptors for          */
-  /*                         composite glyphs.  There are `num_subglyphs'  */
-  /*                         elements in there.  Currently internal to     */
-  /*                         FreeType.                                     */
-  /*                                                                       */
-  /*    control_data      :: Certain font drivers can also return the      */
-  /*                         control data for a given glyph image (e.g.    */
-  /*                         TrueType bytecode, Type~1 charstrings, etc.). */
-  /*                         This field is a pointer to such data.         */
-  /*                                                                       */
-  /*    control_len       :: This is the length in bytes of the control    */
-  /*                         data.                                         */
-  /*                                                                       */
-  /*    other             :: Really wicked formats can use this pointer to */
-  /*                         present their own glyph image to client       */
-  /*                         applications.  Note that the application      */
-  /*                         needs to know about the image format.         */
-  /*                                                                       */
-  /*    lsb_delta         :: The difference between hinted and unhinted    */
-  /*                         left side bearing while autohinting is        */
-  /*                         active.  Zero otherwise.                      */
-  /*                                                                       */
-  /*    rsb_delta         :: The difference between hinted and unhinted    */
-  /*                         right side bearing while autohinting is       */
-  /*                         active.  Zero otherwise.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If @FT_Load_Glyph is called with default flags (see                */
-  /*    @FT_LOAD_DEFAULT) the glyph image is loaded in the glyph slot in   */
-  /*    its native format (e.g., an outline glyph for TrueType and Type~1  */
-  /*    formats).                                                          */
-  /*                                                                       */
-  /*    This image can later be converted into a bitmap by calling         */
-  /*    @FT_Render_Glyph.  This function finds the current renderer for    */
-  /*    the native image's format, then invokes it.                        */
-  /*                                                                       */
-  /*    The renderer is in charge of transforming the native image through */
-  /*    the slot's face transformation fields, then converting it into a   */
-  /*    bitmap that is returned in `slot->bitmap'.                         */
-  /*                                                                       */
-  /*    Note that `slot->bitmap_left' and `slot->bitmap_top' are also used */
-  /*    to specify the position of the bitmap relative to the current pen  */
-  /*    position (e.g., coordinates (0,0) on the baseline).  Of course,    */
-  /*    `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Here a small pseudo code fragment which shows how to use           */
-  /*    `lsb_delta' and `rsb_delta':                                       */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_Pos  origin_x       = 0;                                      */
-  /*      FT_Pos  prev_rsb_delta = 0;                                      */
-  /*                                                                       */
-  /*                                                                       */
-  /*      for all glyphs do                                                */
-  /*        <compute kern between current and previous glyph and add it to */
-  /*         `origin_x'>                                                   */
-  /*                                                                       */
-  /*        <load glyph with `FT_Load_Glyph'>                              */
-  /*                                                                       */
-  /*        if ( prev_rsb_delta - face->glyph->lsb_delta >= 32 )           */
-  /*          origin_x -= 64;                                              */
-  /*        else if ( prev_rsb_delta - face->glyph->lsb_delta < -32 )      */
-  /*          origin_x += 64;                                              */
-  /*                                                                       */
-  /*        prev_rsb_delta = face->glyph->rsb_delta;                       */
-  /*                                                                       */
-  /*        <save glyph image, or render glyph, or ...>                    */
-  /*                                                                       */
-  /*        origin_x += face->glyph->advance.x;                            */
-  /*      endfor                                                           */
-  /*    }                                                                  */
-  /*                                                                       */
-  typedef struct  FT_GlyphSlotRec_
-  {
-    FT_Library        library;
-    FT_Face           face;
-    FT_GlyphSlot      next;
-    FT_UInt           reserved;       /* retained for binary compatibility */
-    FT_Generic        generic;
-
-    FT_Glyph_Metrics  metrics;
-    FT_Fixed          linearHoriAdvance;
-    FT_Fixed          linearVertAdvance;
-    FT_Vector         advance;
-
-    FT_Glyph_Format   format;
-
-    FT_Bitmap         bitmap;
-    FT_Int            bitmap_left;
-    FT_Int            bitmap_top;
-
-    FT_Outline        outline;
-
-    FT_UInt           num_subglyphs;
-    FT_SubGlyph       subglyphs;
-
-    void*             control_data;
-    long              control_len;
-
-    FT_Pos            lsb_delta;
-    FT_Pos            rsb_delta;
-
-    void*             other;
-
-    FT_Slot_Internal  internal;
-
-  } FT_GlyphSlotRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                         F U N C T I O N S                             */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Init_FreeType                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Initialize a new FreeType library object.  The set of modules      */
-  /*    that are registered by this function is determined at build time.  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    alibrary :: A handle to a new library object.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    In case you want to provide your own memory allocating routines,   */
-  /*    use @FT_New_Library instead, followed by a call to                 */
-  /*    @FT_Add_Default_Modules (or a series of calls to @FT_Add_Module).  */
-  /*                                                                       */
-  /*    For multi-threading applications each thread should have its own   */
-  /*    FT_Library object.                                                 */
-  /*                                                                       */
-  /*    If you need reference-counting (cf. @FT_Reference_Library), use    */
-  /*    @FT_New_Library and @FT_Done_Library.                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Init_FreeType( FT_Library  *alibrary );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_FreeType                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a given FreeType library object and all of its children,   */
-  /*    including resources, drivers, faces, sizes, etc.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the target library object.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_FreeType( FT_Library  library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_OPEN_XXX                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-field constants used within the `flags' field of the */
-  /*    @FT_Open_Args structure.                                           */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_OPEN_MEMORY   :: This is a memory-based stream.                 */
-  /*                                                                       */
-  /*    FT_OPEN_STREAM   :: Copy the stream from the `stream' field.       */
-  /*                                                                       */
-  /*    FT_OPEN_PATHNAME :: Create a new input stream from a C~path        */
-  /*                        name.                                          */
-  /*                                                                       */
-  /*    FT_OPEN_DRIVER   :: Use the `driver' field.                        */
-  /*                                                                       */
-  /*    FT_OPEN_PARAMS   :: Use the `num_params' and `params' fields.      */
-  /*                                                                       */
-  /*    ft_open_memory   :: Deprecated; use @FT_OPEN_MEMORY instead.       */
-  /*                                                                       */
-  /*    ft_open_stream   :: Deprecated; use @FT_OPEN_STREAM instead.       */
-  /*                                                                       */
-  /*    ft_open_pathname :: Deprecated; use @FT_OPEN_PATHNAME instead.     */
-  /*                                                                       */
-  /*    ft_open_driver   :: Deprecated; use @FT_OPEN_DRIVER instead.       */
-  /*                                                                       */
-  /*    ft_open_params   :: Deprecated; use @FT_OPEN_PARAMS instead.       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME'     */
-  /*    flags are mutually exclusive.                                      */
-  /*                                                                       */
-#define FT_OPEN_MEMORY    0x1
-#define FT_OPEN_STREAM    0x2
-#define FT_OPEN_PATHNAME  0x4
-#define FT_OPEN_DRIVER    0x8
-#define FT_OPEN_PARAMS    0x10
-
-#define ft_open_memory    FT_OPEN_MEMORY     /* deprecated */
-#define ft_open_stream    FT_OPEN_STREAM     /* deprecated */
-#define ft_open_pathname  FT_OPEN_PATHNAME   /* deprecated */
-#define ft_open_driver    FT_OPEN_DRIVER     /* deprecated */
-#define ft_open_params    FT_OPEN_PARAMS     /* deprecated */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Parameter                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to pass more or less generic parameters to */
-  /*    @FT_Open_Face.                                                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tag  :: A four-byte identification tag.                            */
-  /*                                                                       */
-  /*    data :: A pointer to the parameter data.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The ID and function of parameters are driver-specific.  See the    */
-  /*    various FT_PARAM_TAG_XXX flags for more information.               */
-  /*                                                                       */
-  typedef struct  FT_Parameter_
-  {
-    FT_ULong    tag;
-    FT_Pointer  data;
-
-  } FT_Parameter;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Open_Args                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to indicate how to open a new font file or        */
-  /*    stream.  A pointer to such a structure can be used as a parameter  */
-  /*    for the functions @FT_Open_Face and @FT_Attach_Stream.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    flags       :: A set of bit flags indicating how to use the        */
-  /*                   structure.                                          */
-  /*                                                                       */
-  /*    memory_base :: The first byte of the file in memory.               */
-  /*                                                                       */
-  /*    memory_size :: The size in bytes of the file in memory.            */
-  /*                                                                       */
-  /*    pathname    :: A pointer to an 8-bit file pathname.                */
-  /*                                                                       */
-  /*    stream      :: A handle to a source stream object.                 */
-  /*                                                                       */
-  /*    driver      :: This field is exclusively used by @FT_Open_Face;    */
-  /*                   it simply specifies the font driver to use to open  */
-  /*                   the face.  If set to~0, FreeType tries to load the  */
-  /*                   face with each one of the drivers in its list.      */
-  /*                                                                       */
-  /*    num_params  :: The number of extra parameters.                     */
-  /*                                                                       */
-  /*    params      :: Extra parameters passed to the font driver when     */
-  /*                   opening a new face.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream type is determined by the contents of `flags' which     */
-  /*    are tested in the following order by @FT_Open_Face:                */
-  /*                                                                       */
-  /*    If the `FT_OPEN_MEMORY' bit is set, assume that this is a          */
-  /*    memory file of `memory_size' bytes, located at `memory_address'.   */
-  /*    The data are are not copied, and the client is responsible for     */
-  /*    releasing and destroying them _after_ the corresponding call to    */
-  /*    @FT_Done_Face.                                                     */
-  /*                                                                       */
-  /*    Otherwise, if the `FT_OPEN_STREAM' bit is set, assume that a       */
-  /*    custom input stream `stream' is used.                              */
-  /*                                                                       */
-  /*    Otherwise, if the `FT_OPEN_PATHNAME' bit is set, assume that this  */
-  /*    is a normal file and use `pathname' to open it.                    */
-  /*                                                                       */
-  /*    If the `FT_OPEN_DRIVER' bit is set, @FT_Open_Face only tries to    */
-  /*    open the file with the driver whose handler is in `driver'.        */
-  /*                                                                       */
-  /*    If the `FT_OPEN_PARAMS' bit is set, the parameters given by        */
-  /*    `num_params' and `params' is used.  They are ignored otherwise.    */
-  /*                                                                       */
-  /*    Ideally, both the `pathname' and `params' fields should be tagged  */
-  /*    as `const'; this is missing for API backwards compatibility.  In   */
-  /*    other words, applications should treat them as read-only.          */
-  /*                                                                       */
-  typedef struct  FT_Open_Args_
-  {
-    FT_UInt         flags;
-    const FT_Byte*  memory_base;
-    FT_Long         memory_size;
-    FT_String*      pathname;
-    FT_Stream       stream;
-    FT_Module       driver;
-    FT_Int          num_params;
-    FT_Parameter*   params;
-
-  } FT_Open_Args;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Open_Face to open a font by its pathname.  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    pathname   :: A path to the font file.                             */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the font.  The first    */
-  /*                  face has index~0.                                    */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.  If `face_index' is   */
-  /*                  greater than or equal to zero, it must be non-NULL.  */
-  /*                  See @FT_Open_Face for more details.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use @FT_Done_Face to destroy the created @FT_Face object (along    */
-  /*    with its slot and sizes).                                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face( FT_Library   library,
-               const char*  filepathname,
-               FT_Long      face_index,
-               FT_Face     *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Memory_Face                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Open_Face to open a font which has been    */
-  /*    loaded into memory.                                                */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    file_base  :: A pointer to the beginning of the font data.         */
-  /*                                                                       */
-  /*    file_size  :: The size of the memory chunk used by the font data.  */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the font.  The first    */
-  /*                  face has index~0.                                    */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.  If `face_index' is   */
-  /*                  greater than or equal to zero, it must be non-NULL.  */
-  /*                  See @FT_Open_Face for more details.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You must not deallocate the memory before calling @FT_Done_Face.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Memory_Face( FT_Library      library,
-                      const FT_Byte*  file_base,
-                      FT_Long         file_size,
-                      FT_Long         face_index,
-                      FT_Face        *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Open_Face                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a face object from a given resource described by            */
-  /*    @FT_Open_Args.                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    args       :: A pointer to an `FT_Open_Args' structure which must  */
-  /*                  be filled by the caller.                             */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the font.  The first    */
-  /*                  face has index~0.                                    */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.  If `face_index' is   */
-  /*                  greater than or equal to zero, it must be non-NULL.  */
-  /*                  See note below.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
-  /*    slot for the face object which can be accessed directly through    */
-  /*    `face->glyph'.                                                     */
-  /*                                                                       */
-  /*    FT_Open_Face can be used to quickly check whether the font         */
-  /*    format of a given font resource is supported by FreeType.  If the  */
-  /*    `face_index' field is negative, the function's return value is~0   */
-  /*    if the font format is recognized, or non-zero otherwise;           */
-  /*    the function returns a more or less empty face handle in `*aface'  */
-  /*    (if `aface' isn't NULL).  The only useful field in this special    */
-  /*    case is `face->num_faces' which gives the number of faces within   */
-  /*    the font file.  After examination, the returned @FT_Face structure */
-  /*    should be deallocated with a call to @FT_Done_Face.                */
-  /*                                                                       */
-  /*    Each new face object created with this function also owns a        */
-  /*    default @FT_Size object, accessible as `face->size'.               */
-  /*                                                                       */
-  /*    One @FT_Library instance can have multiple face objects, this is,  */
-  /*    @FT_Open_Face and its siblings can be called multiple times using  */
-  /*    the same `library' argument.                                       */
-  /*                                                                       */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Face.                                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Open_Face( FT_Library           library,
-                const FT_Open_Args*  args,
-                FT_Long              face_index,
-                FT_Face             *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Attach_File                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Attach_Stream to attach a file.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: The target face object.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    filepathname :: The pathname.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Attach_File( FT_Face      face,
-                  const char*  filepathname );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Attach_Stream                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    `Attach' data to a face object.  Normally, this is used to read    */
-  /*    additional information for the face object.  For example, you can  */
-  /*    attach an AFM file that comes with a Type~1 font to get the        */
-  /*    kerning values and other metrics.                                  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: The target face object.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    parameters :: A pointer to @FT_Open_Args which must be filled by   */
-  /*                  the caller.                                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The meaning of the `attach' (i.e., what really happens when the    */
-  /*    new file is read) is not fixed by FreeType itself.  It really      */
-  /*    depends on the font format (and thus the font driver).             */
-  /*                                                                       */
-  /*    Client applications are expected to know what they are doing       */
-  /*    when invoking this function.  Most drivers simply do not implement */
-  /*    file attachments.                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Attach_Stream( FT_Face        face,
-                    FT_Open_Args*  parameters );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Reference_Face                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A counter gets initialized to~1 at the time an @FT_Face structure  */
-  /*    is created.  This function increments the counter.  @FT_Done_Face  */
-  /*    then only destroys a face if the counter is~1, otherwise it simply */
-  /*    decrements the counter.                                            */
-  /*                                                                       */
-  /*    This function helps in managing life-cycles of structures which    */
-  /*    reference @FT_Face objects.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.4.2                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Reference_Face( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Face                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard a given face object, as well as all of its child slots and */
-  /*    sizes.                                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Face.                                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Face( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Select_Size                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select a bitmap strike.                                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: A handle to a target face object.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    strike_index :: The index of the bitmap strike in the              */
-  /*                    `available_sizes' field of @FT_FaceRec structure.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Select_Size( FT_Face  face,
-                  FT_Int   strike_index );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Size_Request_Type                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type that lists the supported size request types.   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_SIZE_REQUEST_TYPE_NOMINAL ::                                    */
-  /*      The nominal size.  The `units_per_EM' field of @FT_FaceRec is    */
-  /*      used to determine both scaling values.                           */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_REAL_DIM ::                                   */
-  /*      The real dimension.  The sum of the the `ascender' and (minus    */
-  /*      of) the `descender' fields of @FT_FaceRec are used to determine  */
-  /*      both scaling values.                                             */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_BBOX ::                                       */
-  /*      The font bounding box.  The width and height of the `bbox' field */
-  /*      of @FT_FaceRec are used to determine the horizontal and vertical */
-  /*      scaling value, respectively.                                     */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_CELL ::                                       */
-  /*      The `max_advance_width' field of @FT_FaceRec is used to          */
-  /*      determine the horizontal scaling value; the vertical scaling     */
-  /*      value is determined the same way as                              */
-  /*      @FT_SIZE_REQUEST_TYPE_REAL_DIM does.  Finally, both scaling      */
-  /*      values are set to the smaller one.  This type is useful if you   */
-  /*      want to specify the font size for, say, a window of a given      */
-  /*      dimension and 80x24 cells.                                       */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_SCALES ::                                     */
-  /*      Specify the scaling values directly.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The above descriptions only apply to scalable formats.  For bitmap */
-  /*    formats, the behaviour is up to the driver.                        */
-  /*                                                                       */
-  /*    See the note section of @FT_Size_Metrics if you wonder how size    */
-  /*    requesting relates to scaling values.                              */
-  /*                                                                       */
-  typedef enum  FT_Size_Request_Type_
-  {
-    FT_SIZE_REQUEST_TYPE_NOMINAL,
-    FT_SIZE_REQUEST_TYPE_REAL_DIM,
-    FT_SIZE_REQUEST_TYPE_BBOX,
-    FT_SIZE_REQUEST_TYPE_CELL,
-    FT_SIZE_REQUEST_TYPE_SCALES,
-
-    FT_SIZE_REQUEST_TYPE_MAX
-
-  } FT_Size_Request_Type;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_RequestRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a size request.                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    type           :: See @FT_Size_Request_Type.                       */
-  /*                                                                       */
-  /*    width          :: The desired width.                               */
-  /*                                                                       */
-  /*    height         :: The desired height.                              */
-  /*                                                                       */
-  /*    horiResolution :: The horizontal resolution.  If set to zero,      */
-  /*                      `width' is treated as a 26.6 fractional pixel    */
-  /*                      value.                                           */
-  /*                                                                       */
-  /*    vertResolution :: The vertical resolution.  If set to zero,        */
-  /*                      `height' is treated as a 26.6 fractional pixel   */
-  /*                      value.                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If `width' is zero, then the horizontal scaling value is set equal */
-  /*    to the vertical scaling value, and vice versa.                     */
-  /*                                                                       */
-  typedef struct  FT_Size_RequestRec_
-  {
-    FT_Size_Request_Type  type;
-    FT_Long               width;
-    FT_Long               height;
-    FT_UInt               horiResolution;
-    FT_UInt               vertResolution;
-
-  } FT_Size_RequestRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_Request                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a size request structure.                              */
-  /*                                                                       */
-  typedef struct FT_Size_RequestRec_  *FT_Size_Request;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Request_Size                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Resize the scale of the active @FT_Size object in a face.          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    req  :: A pointer to a @FT_Size_RequestRec.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Although drivers may select the bitmap strike matching the         */
-  /*    request, you should not rely on this if you intend to select a     */
-  /*    particular bitmap strike.  Use @FT_Select_Size instead in that     */
-  /*    case.                                                              */
-  /*                                                                       */
-  /*    The relation between the requested size and the resulting glyph    */
-  /*    size is dependent entirely on how the size is defined in the       */
-  /*    source face.  The font designer chooses the final size of each     */
-  /*    glyph relative to this size.  For more information refer to        */
-  /*    `http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html'      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Request_Size( FT_Face          face,
-                   FT_Size_Request  req );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Char_Size                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Request_Size to request the nominal size   */
-  /*    (in points).                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face            :: A handle to a target face object.               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    char_width      :: The nominal width, in 26.6 fractional points.   */
-  /*                                                                       */
-  /*    char_height     :: The nominal height, in 26.6 fractional points.  */
-  /*                                                                       */
-  /*    horz_resolution :: The horizontal resolution in dpi.               */
-  /*                                                                       */
-  /*    vert_resolution :: The vertical resolution in dpi.                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If either the character width or height is zero, it is set equal   */
-  /*    to the other value.                                                */
-  /*                                                                       */
-  /*    If either the horizontal or vertical resolution is zero, it is set */
-  /*    equal to the other value.                                          */
-  /*                                                                       */
-  /*    A character width or height smaller than 1pt is set to 1pt; if     */
-  /*    both resolution values are zero, they are set to 72dpi.            */
-  /*                                                                       */
-  /*    Don't use this function if you are using the FreeType cache API.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Char_Size( FT_Face     face,
-                    FT_F26Dot6  char_width,
-                    FT_F26Dot6  char_height,
-                    FT_UInt     horz_resolution,
-                    FT_UInt     vert_resolution );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Pixel_Sizes                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Request_Size to request the nominal size   */
-  /*    (in pixels).                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: A handle to the target face object.                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    pixel_width  :: The nominal width, in pixels.                      */
-  /*                                                                       */
-  /*    pixel_height :: The nominal height, in pixels.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should not rely on the resulting glyphs matching, or being     */
-  /*    constrained, to this pixel size.  Refer to @FT_Request_Size to     */
-  /*    understand how requested sizes relate to actual sizes.             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Pixel_Sizes( FT_Face  face,
-                      FT_UInt  pixel_width,
-                      FT_UInt  pixel_height );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Load_Glyph                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to load a single glyph into the glyph slot of a    */
-  /*    face object.                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face        :: A handle to the target face object where the glyph  */
-  /*                   is loaded.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph_index :: The index of the glyph in the font file.  For       */
-  /*                   CID-keyed fonts (either in PS or in CFF format)     */
-  /*                   this argument specifies the CID value.              */
-  /*                                                                       */
-  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   @FT_LOAD_XXX constants can be used to control the   */
-  /*                   glyph loading process (e.g., whether the outline    */
-  /*                   should be scaled, whether to load bitmaps or not,   */
-  /*                   whether to hint the outline, etc).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The loaded glyph may be transformed.  See @FT_Set_Transform for    */
-  /*    the details.                                                       */
-  /*                                                                       */
-  /*    For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument' is        */
-  /*    returned for invalid CID values (this is, for CID values which     */
-  /*    don't have a corresponding glyph in the font).  See the discussion */
-  /*    of the @FT_FACE_FLAG_CID_KEYED flag for more details.              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Load_Glyph( FT_Face   face,
-                 FT_UInt   glyph_index,
-                 FT_Int32  load_flags );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Load_Char                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to load a single glyph into the glyph slot of a    */
-  /*    face object, according to its character code.                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face        :: A handle to a target face object where the glyph    */
-  /*                   is loaded.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    char_code   :: The glyph's character code, according to the        */
-  /*                   current charmap used in the face.                   */
-  /*                                                                       */
-  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   @FT_LOAD_XXX constants can be used to control the   */
-  /*                   glyph loading process (e.g., whether the outline    */
-  /*                   should be scaled, whether to load bitmaps or not,   */
-  /*                   whether to hint the outline, etc).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function simply calls @FT_Get_Char_Index and @FT_Load_Glyph.  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Load_Char( FT_Face   face,
-                FT_ULong  char_code,
-                FT_Int32  load_flags );
-
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FT_LOAD_XXX
-   *
-   * @description:
-   *   A list of bit-field constants used with @FT_Load_Glyph to indicate
-   *   what kind of operations to perform during glyph loading.
-   *
-   * @values:
-   *   FT_LOAD_DEFAULT ::
-   *     Corresponding to~0, this value is used as the default glyph load
-   *     operation.  In this case, the following happens:
-   *
-   *     1. FreeType looks for a bitmap for the glyph corresponding to the
-   *        face's current size.  If one is found, the function returns.
-   *        The bitmap data can be accessed from the glyph slot (see note
-   *        below).
-   *
-   *     2. If no embedded bitmap is searched or found, FreeType looks for a
-   *        scalable outline.  If one is found, it is loaded from the font
-   *        file, scaled to device pixels, then `hinted' to the pixel grid
-   *        in order to optimize it.  The outline data can be accessed from
-   *        the glyph slot (see note below).
-   *
-   *     Note that by default, the glyph loader doesn't render outlines into
-   *     bitmaps.  The following flags are used to modify this default
-   *     behaviour to more specific and useful cases.
-   *
-   *   FT_LOAD_NO_SCALE ::
-   *     Don't scale the loaded outline glyph but keep it in font units.
-   *
-   *     This flag implies @FT_LOAD_NO_HINTING and @FT_LOAD_NO_BITMAP, and
-   *     unsets @FT_LOAD_RENDER.
-   *
-   *     If the font is `tricky' (see @FT_FACE_FLAG_TRICKY for more), using
-   *     FT_LOAD_NO_SCALE usually yields meaningless outlines because the
-   *     subglyphs must be scaled and positioned with hinting instructions.
-   *     This can be solved by loading the font without FT_LOAD_NO_SCALE and
-   *     setting the character size to `font->units_per_EM'.
-   *
-   *   FT_LOAD_NO_HINTING ::
-   *     Disable hinting.  This generally generates `blurrier' bitmap glyphs
-   *     when the glyph are rendered in any of the anti-aliased modes.  See
-   *     also the note below.
-   *
-   *     This flag is implied by @FT_LOAD_NO_SCALE.
-   *
-   *   FT_LOAD_RENDER ::
-   *     Call @FT_Render_Glyph after the glyph is loaded.  By default, the
-   *     glyph is rendered in @FT_RENDER_MODE_NORMAL mode.  This can be
-   *     overridden by @FT_LOAD_TARGET_XXX or @FT_LOAD_MONOCHROME.
-   *
-   *     This flag is unset by @FT_LOAD_NO_SCALE.
-   *
-   *   FT_LOAD_NO_BITMAP ::
-   *     Ignore bitmap strikes when loading.  Bitmap-only fonts ignore this
-   *     flag.
-   *
-   *     @FT_LOAD_NO_SCALE always sets this flag.
-   *
-   *   FT_LOAD_VERTICAL_LAYOUT ::
-   *     Load the glyph for vertical text layout.  In particular, the
-   *     `advance' value in the @FT_GlyphSlotRec structure is set to the
-   *     `vertAdvance' value of the `metrics' field.
-   *
-   *     In case @FT_HAS_VERTICAL doesn't return true, you shouldn't use
-   *     this flag currently.  Reason is that in this case vertical metrics
-   *     get synthesized, and those values are not always consistent across
-   *     various font formats.
-   *
-   *   FT_LOAD_FORCE_AUTOHINT ::
-   *     Indicates that the auto-hinter is preferred over the font's native
-   *     hinter.  See also the note below.
-   *
-   *   FT_LOAD_CROP_BITMAP ::
-   *     Indicates that the font driver should crop the loaded bitmap glyph
-   *     (i.e., remove all space around its black bits).  Not all drivers
-   *     implement this.
-   *
-   *   FT_LOAD_PEDANTIC ::
-   *     Indicates that the font driver should perform pedantic verifications
-   *     during glyph loading.  This is mostly used to detect broken glyphs
-   *     in fonts.  By default, FreeType tries to handle broken fonts also.
-   *
-   *     In particular, errors from the TrueType bytecode engine are not
-   *     passed to the application if this flag is not set; this might
-   *     result in partially hinted or distorted glyphs in case a glyph's
-   *     bytecode is buggy.
-   *
-   *   FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
-   *     Ignored.  Deprecated.
-   *
-   *   FT_LOAD_NO_RECURSE ::
-   *     This flag is only used internally.  It merely indicates that the
-   *     font driver should not load composite glyphs recursively.  Instead,
-   *     it should set the `num_subglyph' and `subglyphs' values of the
-   *     glyph slot accordingly, and set `glyph->format' to
-   *     @FT_GLYPH_FORMAT_COMPOSITE.
-   *
-   *     The description of sub-glyphs is not available to client
-   *     applications for now.
-   *
-   *     This flag implies @FT_LOAD_NO_SCALE and @FT_LOAD_IGNORE_TRANSFORM.
-   *
-   *   FT_LOAD_IGNORE_TRANSFORM ::
-   *     Indicates that the transform matrix set by @FT_Set_Transform should
-   *     be ignored.
-   *
-   *   FT_LOAD_MONOCHROME ::
-   *     This flag is used with @FT_LOAD_RENDER to indicate that you want to
-   *     render an outline glyph to a 1-bit monochrome bitmap glyph, with
-   *     8~pixels packed into each byte of the bitmap data.
-   *
-   *     Note that this has no effect on the hinting algorithm used.  You
-   *     should rather use @FT_LOAD_TARGET_MONO so that the
-   *     monochrome-optimized hinting algorithm is used.
-   *
-   *   FT_LOAD_LINEAR_DESIGN ::
-   *     Indicates that the `linearHoriAdvance' and `linearVertAdvance'
-   *     fields of @FT_GlyphSlotRec should be kept in font units.  See
-   *     @FT_GlyphSlotRec for details.
-   *
-   *   FT_LOAD_NO_AUTOHINT ::
-   *     Disable auto-hinter.  See also the note below.
-   *
-   *   FT_LOAD_COLOR ::
-   *     This flag is used to request loading of color embedded-bitmap
-   *     images.  The resulting color bitmaps, if available, will have the
-   *     @FT_PIXEL_MODE_BGRA format.  When the flag is not used and color
-   *     bitmaps are found, they will be converted to 256-level gray
-   *     bitmaps transparently.  Those bitmaps will be in the
-   *     @FT_PIXEL_MODE_GRAY format.
-   *
-   * @note:
-   *   By default, hinting is enabled and the font's native hinter (see
-   *   @FT_FACE_FLAG_HINTER) is preferred over the auto-hinter.  You can
-   *   disable hinting by setting @FT_LOAD_NO_HINTING or change the
-   *   precedence by setting @FT_LOAD_FORCE_AUTOHINT.  You can also set
-   *   @FT_LOAD_NO_AUTOHINT in case you don't want the auto-hinter to be
-   *   used at all.
-   *
-   *   See the description of @FT_FACE_FLAG_TRICKY for a special exception
-   *   (affecting only a handful of Asian fonts).
-   *
-   *   Besides deciding which hinter to use, you can also decide which
-   *   hinting algorithm to use.  See @FT_LOAD_TARGET_XXX for details.
-   *
-   *   Note that the auto-hinter needs a valid Unicode cmap (either a native
-   *   one or synthesized by FreeType) for producing correct results.  If a
-   *   font provides an incorrect mapping (for example, assigning the
-   *   character code U+005A, LATIN CAPITAL LETTER Z, to a glyph depicting a
-   *   mathematical integral sign), the auto-hinter might produce useless
-   *   results.
-   *
-   */
-#define FT_LOAD_DEFAULT                      0x0
-#define FT_LOAD_NO_SCALE                     ( 1L << 0 )
-#define FT_LOAD_NO_HINTING                   ( 1L << 1 )
-#define FT_LOAD_RENDER                       ( 1L << 2 )
-#define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
-#define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
-#define FT_LOAD_FORCE_AUTOHINT               ( 1L << 5 )
-#define FT_LOAD_CROP_BITMAP                  ( 1L << 6 )
-#define FT_LOAD_PEDANTIC                     ( 1L << 7 )
-#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  ( 1L << 9 )
-#define FT_LOAD_NO_RECURSE                   ( 1L << 10 )
-#define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
-#define FT_LOAD_MONOCHROME                   ( 1L << 12 )
-#define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
-#define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
-  /* Bits 16..19 are used by `FT_LOAD_TARGET_' */
-#define FT_LOAD_COLOR                        ( 1L << 20 )
-
-  /* */
-
-  /* used internally only by certain font drivers! */
-#define FT_LOAD_ADVANCE_ONLY                 ( 1L << 8 )
-#define FT_LOAD_SBITS_ONLY                   ( 1L << 14 )
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_LOAD_TARGET_XXX
-   *
-   * @description:
-   *   A list of values that are used to select a specific hinting algorithm
-   *   to use by the hinter.  You should OR one of these values to your
-   *   `load_flags' when calling @FT_Load_Glyph.
-   *
-   *   Note that font's native hinters may ignore the hinting algorithm you
-   *   have specified (e.g., the TrueType bytecode interpreter).  You can set
-   *   @FT_LOAD_FORCE_AUTOHINT to ensure that the auto-hinter is used.
-   *
-   *   Also note that @FT_LOAD_TARGET_LIGHT is an exception, in that it
-   *   always implies @FT_LOAD_FORCE_AUTOHINT.
-   *
-   * @values:
-   *   FT_LOAD_TARGET_NORMAL ::
-   *     This corresponds to the default hinting algorithm, optimized for
-   *     standard gray-level rendering.  For monochrome output, use
-   *     @FT_LOAD_TARGET_MONO instead.
-   *
-   *   FT_LOAD_TARGET_LIGHT ::
-   *     A lighter hinting algorithm for non-monochrome modes.  Many
-   *     generated glyphs are more fuzzy but better resemble its original
-   *     shape.  A bit like rendering on Mac OS~X.
-   *
-   *     As a special exception, this target implies @FT_LOAD_FORCE_AUTOHINT.
-   *
-   *   FT_LOAD_TARGET_MONO ::
-   *     Strong hinting algorithm that should only be used for monochrome
-   *     output.  The result is probably unpleasant if the glyph is rendered
-   *     in non-monochrome modes.
-   *
-   *   FT_LOAD_TARGET_LCD ::
-   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for horizontally
-   *     decimated LCD displays.
-   *
-   *   FT_LOAD_TARGET_LCD_V ::
-   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for vertically
-   *     decimated LCD displays.
-   *
-   * @note:
-   *   You should use only _one_ of the FT_LOAD_TARGET_XXX values in your
-   *   `load_flags'.  They can't be ORed.
-   *
-   *   If @FT_LOAD_RENDER is also set, the glyph is rendered in the
-   *   corresponding mode (i.e., the mode which matches the used algorithm
-   *   best).  An exeption is FT_LOAD_TARGET_MONO since it implies
-   *   @FT_LOAD_MONOCHROME.
-   *
-   *   You can use a hinting algorithm that doesn't correspond to the same
-   *   rendering mode.  As an example, it is possible to use the `light'
-   *   hinting algorithm and have the results rendered in horizontal LCD
-   *   pixel mode, with code like
-   *
-   *     {
-   *       FT_Load_Glyph( face, glyph_index,
-   *                      load_flags | FT_LOAD_TARGET_LIGHT );
-   *
-   *       FT_Render_Glyph( face->glyph, FT_RENDER_MODE_LCD );
-   *     }
-   *
-   */
-#define FT_LOAD_TARGET_( x )   ( (FT_Int32)( (x) & 15 ) << 16 )
-
-#define FT_LOAD_TARGET_NORMAL  FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL )
-#define FT_LOAD_TARGET_LIGHT   FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT  )
-#define FT_LOAD_TARGET_MONO    FT_LOAD_TARGET_( FT_RENDER_MODE_MONO   )
-#define FT_LOAD_TARGET_LCD     FT_LOAD_TARGET_( FT_RENDER_MODE_LCD    )
-#define FT_LOAD_TARGET_LCD_V   FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V  )
-
-
-  /**************************************************************************
-   *
-   * @macro:
-   *   FT_LOAD_TARGET_MODE
-   *
-   * @description:
-   *   Return the @FT_Render_Mode corresponding to a given
-   *   @FT_LOAD_TARGET_XXX value.
-   *
-   */
-#define FT_LOAD_TARGET_MODE( x )  ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Transform                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to set the transformation that is applied to glyph */
-  /*    images when they are loaded into a glyph slot through              */
-  /*    @FT_Load_Glyph.                                                    */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face   :: A handle to the source face object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to the transformation's 2x2 matrix.  Use~0 for */
-  /*              the identity matrix.                                     */
-  /*    delta  :: A pointer to the translation vector.  Use~0 for the null */
-  /*              vector.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The transformation is only applied to scalable image formats after */
-  /*    the glyph has been loaded.  It means that hinting is unaltered by  */
-  /*    the transformation and is performed on the character size given in */
-  /*    the last call to @FT_Set_Char_Size or @FT_Set_Pixel_Sizes.         */
-  /*                                                                       */
-  /*    Note that this also transforms the `face.glyph.advance' field, but */
-  /*    *not* the values in `face.glyph.metrics'.                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Set_Transform( FT_Face     face,
-                    FT_Matrix*  matrix,
-                    FT_Vector*  delta );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Render_Mode                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type that lists the render modes supported by       */
-  /*    FreeType~2.  Each mode corresponds to a specific type of scanline  */
-  /*    conversion performed on the outline.                               */
-  /*                                                                       */
-  /*    For bitmap fonts and embedded bitmaps the `bitmap->pixel_mode'     */
-  /*    field in the @FT_GlyphSlotRec structure gives the format of the    */
-  /*    returned bitmap.                                                   */
-  /*                                                                       */
-  /*    All modes except @FT_RENDER_MODE_MONO use 256 levels of opacity.   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_RENDER_MODE_NORMAL ::                                           */
-  /*      This is the default render mode; it corresponds to 8-bit         */
-  /*      anti-aliased bitmaps.                                            */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LIGHT ::                                            */
-  /*      This is equivalent to @FT_RENDER_MODE_NORMAL.  It is only        */
-  /*      defined as a separate value because render modes are also used   */
-  /*      indirectly to define hinting algorithm selectors.  See           */
-  /*      @FT_LOAD_TARGET_XXX for details.                                 */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_MONO ::                                             */
-  /*      This mode corresponds to 1-bit bitmaps (with 2~levels of         */
-  /*      opacity).                                                        */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LCD ::                                              */
-  /*      This mode corresponds to horizontal RGB and BGR sub-pixel        */
-  /*      displays like LCD screens.  It produces 8-bit bitmaps that are   */
-  /*      3~times the width of the original glyph outline in pixels, and   */
-  /*      which use the @FT_PIXEL_MODE_LCD mode.                           */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LCD_V ::                                            */
-  /*      This mode corresponds to vertical RGB and BGR sub-pixel displays */
-  /*      (like PDA screens, rotated LCD displays, etc.).  It produces     */
-  /*      8-bit bitmaps that are 3~times the height of the original        */
-  /*      glyph outline in pixels and use the @FT_PIXEL_MODE_LCD_V mode.   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The LCD-optimized glyph bitmaps produced by FT_Render_Glyph can be */
-  /*    filtered to reduce color-fringes by using @FT_Library_SetLcdFilter */
-  /*    (not active in the default builds).  It is up to the caller to     */
-  /*    either call @FT_Library_SetLcdFilter (if available) or do the      */
-  /*    filtering itself.                                                  */
-  /*                                                                       */
-  /*    The selected render mode only affects vector glyphs of a font.     */
-  /*    Embedded bitmaps often have a different pixel mode like            */
-  /*    @FT_PIXEL_MODE_MONO.  You can use @FT_Bitmap_Convert to transform  */
-  /*    them into 8-bit pixmaps.                                           */
-  /*                                                                       */
-  typedef enum  FT_Render_Mode_
-  {
-    FT_RENDER_MODE_NORMAL = 0,
-    FT_RENDER_MODE_LIGHT,
-    FT_RENDER_MODE_MONO,
-    FT_RENDER_MODE_LCD,
-    FT_RENDER_MODE_LCD_V,
-
-    FT_RENDER_MODE_MAX
-
-  } FT_Render_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_render_mode_xxx                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    These constants are deprecated.  Use the corresponding             */
-  /*    @FT_Render_Mode values instead.                                    */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    ft_render_mode_normal :: see @FT_RENDER_MODE_NORMAL                */
-  /*    ft_render_mode_mono   :: see @FT_RENDER_MODE_MONO                  */
-  /*                                                                       */
-#define ft_render_mode_normal  FT_RENDER_MODE_NORMAL
-#define ft_render_mode_mono    FT_RENDER_MODE_MONO
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Render_Glyph                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Convert a given glyph image to a bitmap.  It does so by inspecting */
-  /*    the glyph image format, finding the relevant renderer, and         */
-  /*    invoking it.                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    slot        :: A handle to the glyph slot containing the image to  */
-  /*                   convert.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    render_mode :: This is the render mode used to render the glyph    */
-  /*                   image into a bitmap.  See @FT_Render_Mode for a     */
-  /*                   list of possible values.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Render_Glyph( FT_GlyphSlot    slot,
-                   FT_Render_Mode  render_mode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Kerning_Mode                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify which kerning values to return in   */
-  /*    @FT_Get_Kerning.                                                   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_KERNING_DEFAULT  :: Return scaled and grid-fitted kerning       */
-  /*                           distances (value is~0).                     */
-  /*                                                                       */
-  /*    FT_KERNING_UNFITTED :: Return scaled but un-grid-fitted kerning    */
-  /*                           distances.                                  */
-  /*                                                                       */
-  /*    FT_KERNING_UNSCALED :: Return the kerning vector in original font  */
-  /*                           units.                                      */
-  /*                                                                       */
-  typedef enum  FT_Kerning_Mode_
-  {
-    FT_KERNING_DEFAULT  = 0,
-    FT_KERNING_UNFITTED,
-    FT_KERNING_UNSCALED
-
-  } FT_Kerning_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    ft_kerning_default                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This constant is deprecated.  Please use @FT_KERNING_DEFAULT       */
-  /*    instead.                                                           */
-  /*                                                                       */
-#define ft_kerning_default   FT_KERNING_DEFAULT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    ft_kerning_unfitted                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This constant is deprecated.  Please use @FT_KERNING_UNFITTED      */
-  /*    instead.                                                           */
-  /*                                                                       */
-#define ft_kerning_unfitted  FT_KERNING_UNFITTED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    ft_kerning_unscaled                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This constant is deprecated.  Please use @FT_KERNING_UNSCALED      */
-  /*    instead.                                                           */
-  /*                                                                       */
-#define ft_kerning_unscaled  FT_KERNING_UNSCALED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Kerning                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the kerning vector between two glyphs of a same face.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to a source face object.                   */
-  /*                                                                       */
-  /*    left_glyph  :: The index of the left glyph in the kern pair.       */
-  /*                                                                       */
-  /*    right_glyph :: The index of the right glyph in the kern pair.      */
-  /*                                                                       */
-  /*    kern_mode   :: See @FT_Kerning_Mode for more information.          */
-  /*                   Determines the scale and dimension of the returned  */
-  /*                   kerning vector.                                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    akerning    :: The kerning vector.  This is either in font units   */
-  /*                   or in pixels (26.6 format) for scalable formats,    */
-  /*                   and in pixels for fixed-sizes formats.              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Only horizontal layouts (left-to-right & right-to-left) are        */
-  /*    supported by this method.  Other layouts, or more sophisticated    */
-  /*    kernings, are out of the scope of this API function -- they can be */
-  /*    implemented through format-specific interfaces.                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Kerning( FT_Face     face,
-                  FT_UInt     left_glyph,
-                  FT_UInt     right_glyph,
-                  FT_UInt     kern_mode,
-                  FT_Vector  *akerning );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Track_Kerning                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the track kerning for a given face object at a given size.  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: A handle to a source face object.                    */
-  /*                                                                       */
-  /*    point_size :: The point size in 16.16 fractional points.           */
-  /*                                                                       */
-  /*    degree     :: The degree of tightness.  Increasingly negative      */
-  /*                  values represent tighter track kerning, while        */
-  /*                  increasingly positive values represent looser track  */
-  /*                  kerning.  Value zero means no track kerning.         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    akerning   :: The kerning in 16.16 fractional points, to be        */
-  /*                  uniformly applied between all glyphs.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Currently, only the Type~1 font driver supports track kerning,     */
-  /*    using data from AFM files (if attached with @FT_Attach_File or     */
-  /*    @FT_Attach_Stream).                                                */
-  /*                                                                       */
-  /*    Only very few AFM files come with track kerning data; please refer */
-  /*    to the Adobe's AFM specification for more details.                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Track_Kerning( FT_Face    face,
-                        FT_Fixed   point_size,
-                        FT_Int     degree,
-                        FT_Fixed*  akerning );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Glyph_Name                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the ASCII name of a given glyph in a face.  This only     */
-  /*    works for those faces where @FT_HAS_GLYPH_NAMES(face) returns~1.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to a source face object.                   */
-  /*                                                                       */
-  /*    glyph_index :: The glyph index.                                    */
-  /*                                                                       */
-  /*    buffer_max  :: The maximum number of bytes available in the        */
-  /*                   buffer.                                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    buffer      :: A pointer to a target buffer where the name is      */
-  /*                   copied to.                                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error is returned if the face doesn't provide glyph names or if */
-  /*    the glyph index is invalid.  In all cases of failure, the first    */
-  /*    byte of `buffer' is set to~0 to indicate an empty name.            */
-  /*                                                                       */
-  /*    The glyph name is truncated to fit within the buffer if it is too  */
-  /*    long.  The returned string is always zero-terminated.              */
-  /*                                                                       */
-  /*    Be aware that FreeType reorders glyph indices internally so that   */
-  /*    glyph index~0 always corresponds to the `missing glyph' (called    */
-  /*    `.notdef').                                                        */
-  /*                                                                       */
-  /*    This function is not compiled within the library if the config     */
-  /*    macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in              */
-  /*    `include/freetype/config/ftoptions.h'.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph_Name( FT_Face     face,
-                     FT_UInt     glyph_index,
-                     FT_Pointer  buffer,
-                     FT_UInt     buffer_max );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Postscript_Name                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the ASCII PostScript name of a given face, if available.  */
-  /*    This only works with PostScript and TrueType fonts.                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face object.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to the face's PostScript name.  NULL if unavailable.     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned pointer is owned by the face and is destroyed with    */
-  /*    it.                                                                */
-  /*                                                                       */
-  FT_EXPORT( const char* )
-  FT_Get_Postscript_Name( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Select_Charmap                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select a given charmap by its encoding tag (as listed in           */
-  /*    `freetype.h').                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    encoding :: A handle to the selected encoding.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function returns an error if no charmap in the face           */
-  /*    corresponds to the encoding queried here.                          */
-  /*                                                                       */
-  /*    Because many fonts contain more than a single cmap for Unicode     */
-  /*    encoding, this function has some special code to select the one    */
-  /*    which covers Unicode best (`best' in the sense that a UCS-4 cmap   */
-  /*    is preferred to a UCS-2 cmap).  It is thus preferable to           */
-  /*    @FT_Set_Charmap in this case.                                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Select_Charmap( FT_Face      face,
-                     FT_Encoding  encoding );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Charmap                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select a given charmap for character code to glyph index mapping.  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face    :: A handle to the source face object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap :: A handle to the selected charmap.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function returns an error if the charmap is not part of       */
-  /*    the face (i.e., if it is not listed in the `face->charmaps'        */
-  /*    table).                                                            */
-  /*                                                                       */
-  /*    It also fails if a type~14 charmap is selected.                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Charmap( FT_Face     face,
-                  FT_CharMap  charmap );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Get_Charmap_Index
-   *
-   * @description:
-   *   Retrieve index of a given charmap.
-   *
-   * @input:
-   *   charmap ::
-   *     A handle to a charmap.
-   *
-   * @return:
-   *   The index into the array of character maps within the face to which
-   *   `charmap' belongs.  If an error occurs, -1 is returned.
-   *
-   */
-  FT_EXPORT( FT_Int )
-  FT_Get_Charmap_Index( FT_CharMap  charmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Char_Index                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the glyph index of a given character code.  This function   */
-  /*    uses a charmap object to do the mapping.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /*    charcode :: The character code.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0~means `undefined character code'.              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If you use FreeType to manipulate the contents of font files       */
-  /*    directly, be aware that the glyph index returned by this function  */
-  /*    doesn't always correspond to the internal indices used within the  */
-  /*    file.  This is done to ensure that value~0 always corresponds to   */
-  /*    the `missing glyph'.  If the first glyph is not named `.notdef',   */
-  /*    then for Type~1 and Type~42 fonts, `.notdef' will be moved into    */
-  /*    the glyph ID~0 position, and whatever was there will be moved to   */
-  /*    the position `.notdef' had.  For Type~1 fonts, if there is no      */
-  /*    `.notdef' glyph at all, then one will be created at index~0 and    */
-  /*    whatever was there will be moved to the last index -- Type~42      */
-  /*    fonts are considered invalid under this condition.                 */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Char_Index( FT_Face   face,
-                     FT_ULong  charcode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_First_Char                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to return the first character code in the    */
-  /*    current charmap of a given face.  It also returns the              */
-  /*    corresponding glyph index.                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face object.                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    agindex :: Glyph index of first character code.  0~if charmap is   */
-  /*               empty.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The charmap's first character code.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should use this function with @FT_Get_Next_Char to be able to  */
-  /*    parse all character codes available in a given charmap.  The code  */
-  /*    should look like this:                                             */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_ULong  charcode;                                              */
-  /*      FT_UInt   gindex;                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      charcode = FT_Get_First_Char( face, &gindex );                   */
-  /*      while ( gindex != 0 )                                            */
-  /*      {                                                                */
-  /*        ... do something with (charcode,gindex) pair ...               */
-  /*                                                                       */
-  /*        charcode = FT_Get_Next_Char( face, charcode, &gindex );        */
-  /*      }                                                                */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Note that `*agindex' is set to~0 if the charmap is empty.  The     */
-  /*    result itself can be~0 in two cases: if the charmap is empty or    */
-  /*    if the value~0 is the first valid character code.                  */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_First_Char( FT_Face   face,
-                     FT_UInt  *agindex );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Next_Char                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to return the next character code in the     */
-  /*    current charmap of a given face following the value `char_code',   */
-  /*    as well as the corresponding glyph index.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face      :: A handle to the source face object.                   */
-  /*    char_code :: The starting character code.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    agindex   :: Glyph index of next character code.  0~if charmap     */
-  /*                 is empty.                                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The charmap's next character code.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should use this function with @FT_Get_First_Char to walk       */
-  /*    over all character codes available in a given charmap.  See the    */
-  /*    note for this function for a simple code example.                  */
-  /*                                                                       */
-  /*    Note that `*agindex' is set to~0 when there are no more codes in   */
-  /*    the charmap.                                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_Next_Char( FT_Face    face,
-                    FT_ULong   char_code,
-                    FT_UInt   *agindex );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Name_Index                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the glyph index of a given glyph name.  This function uses  */
-  /*    driver specific objects to do the translation.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: A handle to the source face object.                  */
-  /*                                                                       */
-  /*    glyph_name :: The glyph name.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0~means `undefined character code'.              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Name_Index( FT_Face     face,
-                     FT_String*  glyph_name );
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SUBGLYPH_FLAG_XXX
-   *
-   * @description:
-   *   A list of constants used to describe subglyphs.  Please refer to the
-   *   TrueType specification for the meaning of the various flags.
-   *
-   * @values:
-   *   FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS ::
-   *   FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES ::
-   *   FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID ::
-   *   FT_SUBGLYPH_FLAG_SCALE ::
-   *   FT_SUBGLYPH_FLAG_XY_SCALE ::
-   *   FT_SUBGLYPH_FLAG_2X2 ::
-   *   FT_SUBGLYPH_FLAG_USE_MY_METRICS ::
-   *
-   */
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
-#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
-#define FT_SUBGLYPH_FLAG_SCALE                   8
-#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
-#define FT_SUBGLYPH_FLAG_2X2                  0x80
-#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
-
-
-  /*************************************************************************
-   *
-   * @func:
-   *   FT_Get_SubGlyph_Info
-   *
-   * @description:
-   *   Retrieve a description of a given subglyph.  Only use it if
-   *   `glyph->format' is @FT_GLYPH_FORMAT_COMPOSITE; an error is
-   *   returned otherwise.
-   *
-   * @input:
-   *   glyph ::
-   *     The source glyph slot.
-   *
-   *   sub_index ::
-   *     The index of the subglyph.  Must be less than
-   *     `glyph->num_subglyphs'.
-   *
-   * @output:
-   *   p_index ::
-   *     The glyph index of the subglyph.
-   *
-   *   p_flags ::
-   *     The subglyph flags, see @FT_SUBGLYPH_FLAG_XXX.
-   *
-   *   p_arg1 ::
-   *     The subglyph's first argument (if any).
-   *
-   *   p_arg2 ::
-   *     The subglyph's second argument (if any).
-   *
-   *   p_transform ::
-   *     The subglyph transformation (if any).
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   The values of `*p_arg1', `*p_arg2', and `*p_transform' must be
-   *   interpreted depending on the flags returned in `*p_flags'.  See the
-   *   TrueType specification for details.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_SubGlyph_Info( FT_GlyphSlot  glyph,
-                        FT_UInt       sub_index,
-                        FT_Int       *p_index,
-                        FT_UInt      *p_flags,
-                        FT_Int       *p_arg1,
-                        FT_Int       *p_arg2,
-                        FT_Matrix    *p_transform );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_FSTYPE_XXX                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flags used in the `fsType' field of the OS/2 table   */
-  /*    in a TrueType or OpenType font and the `FSType' entry in a         */
-  /*    PostScript font.  These bit flags are returned by                  */
-  /*    @FT_Get_FSType_Flags; they inform client applications of embedding */
-  /*    and subsetting restrictions associated with a font.                */
-  /*                                                                       */
-  /*    See http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf for  */
-  /*    more details.                                                      */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_FSTYPE_INSTALLABLE_EMBEDDING ::                                 */
-  /*      Fonts with no fsType bit set may be embedded and permanently     */
-  /*      installed on the remote system by an application.                */
-  /*                                                                       */
-  /*    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING ::                          */
-  /*      Fonts that have only this bit set must not be modified, embedded */
-  /*      or exchanged in any manner without first obtaining permission of */
-  /*      the font software copyright owner.                               */
-  /*                                                                       */
-  /*    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING ::                           */
-  /*      If this bit is set, the font may be embedded and temporarily     */
-  /*      loaded on the remote system.  Documents containing Preview &     */
-  /*      Print fonts must be opened `read-only'; no edits can be applied  */
-  /*      to the document.                                                 */
-  /*                                                                       */
-  /*    FT_FSTYPE_EDITABLE_EMBEDDING ::                                    */
-  /*      If this bit is set, the font may be embedded but must only be    */
-  /*      installed temporarily on other systems.  In contrast to Preview  */
-  /*      & Print fonts, documents containing editable fonts may be opened */
-  /*      for reading, editing is permitted, and changes may be saved.     */
-  /*                                                                       */
-  /*    FT_FSTYPE_NO_SUBSETTING ::                                         */
-  /*      If this bit is set, the font may not be subsetted prior to       */
-  /*      embedding.                                                       */
-  /*                                                                       */
-  /*    FT_FSTYPE_BITMAP_EMBEDDING_ONLY ::                                 */
-  /*      If this bit is set, only bitmaps contained in the font may be    */
-  /*      embedded; no outline data may be embedded.  If there are no      */
-  /*      bitmaps available in the font, then the font is unembeddable.    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    While the fsType flags can indicate that a font may be embedded, a */
-  /*    license with the font vendor may be separately required to use the */
-  /*    font in this way.                                                  */
-  /*                                                                       */
-#define FT_FSTYPE_INSTALLABLE_EMBEDDING         0x0000
-#define FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING  0x0002
-#define FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING   0x0004
-#define FT_FSTYPE_EDITABLE_EMBEDDING            0x0008
-#define FT_FSTYPE_NO_SUBSETTING                 0x0100
-#define FT_FSTYPE_BITMAP_EMBEDDING_ONLY         0x0200
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_FSType_Flags                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the fsType flags for a font.                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face object.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The fsType flags, @FT_FSTYPE_XXX.                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use this function rather than directly reading the `fs_type' field */
-  /*    in the @PS_FontInfoRec structure which is only guaranteed to       */
-  /*    return the correct results for Type~1 fonts.                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.8                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UShort )
-  FT_Get_FSType_Flags( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    glyph_variants                                                     */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Glyph Variants                                                     */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The FreeType~2 interface to Unicode Ideographic Variation          */
-  /*    Sequences (IVS), using the SFNT cmap format~14.                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Many CJK characters have variant forms.  They are a sort of grey   */
-  /*    area somewhere between being totally irrelevant and semantically   */
-  /*    distinct; for this reason, the Unicode consortium decided to       */
-  /*    introduce Ideographic Variation Sequences (IVS), consisting of a   */
-  /*    Unicode base character and one of 240 variant selectors            */
-  /*    (U+E0100-U+E01EF), instead of further extending the already huge   */
-  /*    code range for CJK characters.                                     */
-  /*                                                                       */
-  /*    An IVS is registered and unique; for further details please refer  */
-  /*    to Unicode Technical Standard #37, the Ideographic Variation       */
-  /*    Database:                                                          */
-  /*                                                                       */
-  /*      http://www.unicode.org/reports/tr37/                             */
-  /*                                                                       */
-  /*    To date (November 2012), the character with the most variants is   */
-  /*    U+9089, having 31 such IVS.                                        */
-  /*                                                                       */
-  /*    Adobe and MS decided to support IVS with a new cmap subtable       */
-  /*    (format~14).  It is an odd subtable because it is not a mapping of */
-  /*    input code points to glyphs, but contains lists of all variants    */
-  /*    supported by the font.                                             */
-  /*                                                                       */
-  /*    A variant may be either `default' or `non-default'.  A default     */
-  /*    variant is the one you will get for that code point if you look it */
-  /*    up in the standard Unicode cmap.  A non-default variant is a       */
-  /*    different glyph.                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetCharVariantIndex                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the glyph index of a given character code as modified by    */
-  /*    the variation selector.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    charcode ::                                                        */
-  /*      The character code point in Unicode.                             */
-  /*                                                                       */
-  /*    variantSelector ::                                                 */
-  /*      The Unicode code point of the variation selector.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0~means either `undefined character code', or    */
-  /*    `undefined selector code', or `no variation selector cmap          */
-  /*    subtable', or `current CharMap is not Unicode'.                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If you use FreeType to manipulate the contents of font files       */
-  /*    directly, be aware that the glyph index returned by this function  */
-  /*    doesn't always correspond to the internal indices used within      */
-  /*    the file.  This is done to ensure that value~0 always corresponds  */
-  /*    to the `missing glyph'.                                            */
-  /*                                                                       */
-  /*    This function is only meaningful if                                */
-  /*      a) the font has a variation selector cmap sub table,             */
-  /*    and                                                                */
-  /*      b) the current charmap has a Unicode encoding.                   */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Face_GetCharVariantIndex( FT_Face   face,
-                               FT_ULong  charcode,
-                               FT_ULong  variantSelector );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetCharVariantIsDefault                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check whether this variant of this Unicode character is the one to */
-  /*    be found in the `cmap'.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    charcode ::                                                        */
-  /*      The character codepoint in Unicode.                              */
-  /*                                                                       */
-  /*    variantSelector ::                                                 */
-  /*      The Unicode codepoint of the variation selector.                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    1~if found in the standard (Unicode) cmap, 0~if found in the       */
-  /*    variation selector cmap, or -1 if it is not a variant.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is only meaningful if the font has a variation       */
-  /*    selector cmap subtable.                                            */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Int )
-  FT_Face_GetCharVariantIsDefault( FT_Face   face,
-                                   FT_ULong  charcode,
-                                   FT_ULong  variantSelector );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetVariantSelectors                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a zero-terminated list of Unicode variant selectors found   */
-  /*    in the font.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to an array of selector code points, or NULL if there is */
-  /*    no valid variant selector cmap subtable.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The last item in the array is~0; the array is owned by the         */
-  /*    @FT_Face object but can be overwritten or released on the next     */
-  /*    call to a FreeType function.                                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetVariantSelectors( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetVariantsOfChar                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a zero-terminated list of Unicode variant selectors found   */
-  /*    for the specified character code.                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    charcode ::                                                        */
-  /*      The character codepoint in Unicode.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to an array of variant selector code points which are    */
-  /*    active for the given character, or NULL if the corresponding list  */
-  /*    is empty.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The last item in the array is~0; the array is owned by the         */
-  /*    @FT_Face object but can be overwritten or released on the next     */
-  /*    call to a FreeType function.                                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetVariantsOfChar( FT_Face   face,
-                             FT_ULong  charcode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetCharsOfVariant                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a zero-terminated list of Unicode character codes found for */
-  /*    the specified variant selector.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    variantSelector ::                                                 */
-  /*      The variant selector code point in Unicode.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A list of all the code points which are specified by this selector */
-  /*    (both default and non-default codes are returned) or NULL if there */
-  /*    is no valid cmap or the variant selector is invalid.               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The last item in the array is~0; the array is owned by the         */
-  /*    @FT_Face object but can be overwritten or released on the next     */
-  /*    call to a FreeType function.                                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetCharsOfVariant( FT_Face   face,
-                             FT_ULong  variantSelector );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    computations                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Computations                                                       */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Crunching fixed numbers and vectors.                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various functions used to perform            */
-  /*    computations on 16.16 fixed-float numbers or 2d vectors.           */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_MulDiv                                                          */
-  /*    FT_MulFix                                                          */
-  /*    FT_DivFix                                                          */
-  /*    FT_RoundFix                                                        */
-  /*    FT_CeilFix                                                         */
-  /*    FT_FloorFix                                                        */
-  /*    FT_Vector_Transform                                                */
-  /*    FT_Matrix_Multiply                                                 */
-  /*    FT_Matrix_Invert                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulDiv                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation `(a*b)/c'   */
-  /*    with maximum accuracy (it uses a 64-bit intermediate integer       */
-  /*    whenever necessary).                                               */
-  /*                                                                       */
-  /*    This function isn't necessarily as fast as some processor specific */
-  /*    operations, but is at least completely portable.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.                                        */
-  /*    c :: The divisor.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/c'.  This function never traps when trying to */
-  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
-  /*    on the signs of `a' and `b'.                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_MulDiv( FT_Long  a,
-             FT_Long  b,
-             FT_Long  c );
-
-
-  /* */
-
-  /* The following #if 0 ... #endif is for the documentation formatter, */
-  /* hiding the internal `FT_MULFIX_INLINED' macro.                     */
-
-#if 0
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulFix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation             */
-  /*    `(a*b)/0x10000' with maximum accuracy.  Most of the time this is   */
-  /*    used to multiply a given value by a 16.16 fixed-point factor.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
-  /*         possible (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/0x10000'.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function has been optimized for the case where the absolute   */
-  /*    value of `a' is less than 2048, and `b' is a 16.16 scaling factor. */
-  /*    As this happens mainly when scaling from notional units to         */
-  /*    fractional pixels in FreeType, it resulted in noticeable speed     */
-  /*    improvements between versions 2.x and 1.x.                         */
-  /*                                                                       */
-  /*    As a conclusion, always try to place a 16.16 factor as the         */
-  /*    _second_ argument of this function; this can make a great          */
-  /*    difference.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_MulFix( FT_Long  a,
-             FT_Long  b );
-
-  /* */
-#endif
-
-#ifdef FT_MULFIX_INLINED
-#define FT_MulFix( a, b )  FT_MULFIX_INLINED( a, b )
-#else
-  FT_EXPORT( FT_Long )
-  FT_MulFix( FT_Long  a,
-             FT_Long  b );
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_DivFix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation             */
-  /*    `(a*0x10000)/b' with maximum accuracy.  Most of the time, this is  */
-  /*    used to divide a given value by a 16.16 fixed-point factor.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
-  /*         possible (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*0x10000)/b'.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The optimization for FT_DivFix() is simple: If (a~<<~16) fits in   */
-  /*    32~bits, then the division is computed directly.  Otherwise, we    */
-  /*    use a specialized version of @FT_MulDiv.                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_DivFix( FT_Long  a,
-             FT_Long  b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_RoundFix                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to round a 16.16 fixed number.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number to be rounded.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a + 0x8000) & -0x10000'.                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_RoundFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_CeilFix                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to compute the ceiling function of a   */
-  /*    16.16 fixed number.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number for which the ceiling function is to be computed.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a + 0x10000 - 1) & -0x10000'.                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_CeilFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_FloorFix                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to compute the floor function of a     */
-  /*    16.16 fixed number.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number for which the floor function is to be computed.    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `a & -0x10000'.                                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_FloorFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Vector_Transform                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Transform a single vector through a 2x2 matrix.                    */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    vector :: The target vector to transform.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to the source 2x2 matrix.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The result is undefined if either `vector' or `matrix' is invalid. */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Transform( FT_Vector*        vec,
-                       const FT_Matrix*  matrix );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    version                                                            */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    FreeType Version                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Functions and macros related to FreeType versions.                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Note that those functions and macros are of limited use because    */
-  /*    even a new release of FreeType with only documentation changes     */
-  /*    increases the version number.                                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FREETYPE_XXX
-   *
-   * @description:
-   *   These three macros identify the FreeType source code version.
-   *   Use @FT_Library_Version to access them at runtime.
-   *
-   * @values:
-   *   FREETYPE_MAJOR :: The major version number.
-   *   FREETYPE_MINOR :: The minor version number.
-   *   FREETYPE_PATCH :: The patch level.
-   *
-   * @note:
-   *   The version number of FreeType if built as a dynamic link library
-   *   with the `libtool' package is _not_ controlled by these three
-   *   macros.
-   *
-   */
-#define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  5
-#define FREETYPE_PATCH  0
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Library_Version                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the version of the FreeType library being used.  This is    */
-  /*    useful when dynamically linking to the library, since one cannot   */
-  /*    use the macros @FREETYPE_MAJOR, @FREETYPE_MINOR, and               */
-  /*    @FREETYPE_PATCH.                                                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A source library handle.                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amajor  :: The major version number.                               */
-  /*                                                                       */
-  /*    aminor  :: The minor version number.                               */
-  /*                                                                       */
-  /*    apatch  :: The patch version number.                               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The reason why this function takes a `library' argument is because */
-  /*    certain programs implement library initialization in a custom way  */
-  /*    that doesn't use @FT_Init_FreeType.                                */
-  /*                                                                       */
-  /*    In such cases, the library version might not be available before   */
-  /*    the library object has been created.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Library_Version( FT_Library   library,
-                      FT_Int      *amajor,
-                      FT_Int      *aminor,
-                      FT_Int      *apatch );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_CheckTrueTypePatents                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Parse all bytecode instructions of a TrueType font file to check   */
-  /*    whether any of the patented opcodes are used.  This is only useful */
-  /*    if you want to be able to use the unpatented hinter with           */
-  /*    fonts that do *not* use these opcodes.                             */
-  /*                                                                       */
-  /*    Note that this function parses *all* glyph instructions in the     */
-  /*    font file, which may be slow.                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A face handle.                                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    1~if this is a TrueType font that uses one of the patented         */
-  /*    opcodes, 0~otherwise.                                              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since May 2010, TrueType hinting is no longer patented.            */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.5                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Bool )
-  FT_Face_CheckTrueTypePatents( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_SetUnpatentedHinting                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Enable or disable the unpatented hinter for a given face.          */
-  /*    Only enable it if you have determined that the face doesn't        */
-  /*    use any patented opcodes (see @FT_Face_CheckTrueTypePatents).      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A face handle.                                            */
-  /*                                                                       */
-  /*    value :: New boolean setting.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The old setting value.  This will always be false if this is not   */
-  /*    an SFNT font, or if the unpatented hinter is not compiled in this  */
-  /*    instance of the library.                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since May 2010, TrueType hinting is no longer patented.            */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.5                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Bool )
-  FT_Face_SetUnpatentedHinting( FT_Face  face,
-                                FT_Bool  value );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FREETYPE_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftgasp.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftgasp.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftgasp.h	(copie de travail)
@@ -1,128 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgasp.h                                                               */
-/*                                                                         */
-/*    Access of TrueType's `gasp' table (specification).                   */
-/*                                                                         */
-/*  Copyright 2007, 2008, 2011 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef _FT_GASP_H_
-#define _FT_GASP_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-  /***************************************************************************
-   *
-   * @section:
-   *   gasp_table
-   *
-   * @title:
-   *   Gasp Table
-   *
-   * @abstract:
-   *   Retrieving TrueType `gasp' table entries.
-   *
-   * @description:
-   *   The function @FT_Get_Gasp can be used to query a TrueType or OpenType
-   *   font for specific entries in its `gasp' table, if any.  This is
-   *   mainly useful when implementing native TrueType hinting with the
-   *   bytecode interpreter to duplicate the Windows text rendering results.
-   */
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FT_GASP_XXX
-   *
-   * @description:
-   *   A list of values and/or bit-flags returned by the @FT_Get_Gasp
-   *   function.
-   *
-   * @values:
-   *   FT_GASP_NO_TABLE ::
-   *     This special value means that there is no GASP table in this face.
-   *     It is up to the client to decide what to do.
-   *
-   *   FT_GASP_DO_GRIDFIT ::
-   *     Grid-fitting and hinting should be performed at the specified ppem.
-   *     This *really* means TrueType bytecode interpretation.  If this bit
-   *     is not set, no hinting gets applied.
-   *
-   *   FT_GASP_DO_GRAY ::
-   *     Anti-aliased rendering should be performed at the specified ppem.
-   *     If not set, do monochrome rendering.
-   *
-   *   FT_GASP_SYMMETRIC_SMOOTHING ::
-   *     If set, smoothing along multiple axes must be used with ClearType.
-   *
-   *   FT_GASP_SYMMETRIC_GRIDFIT ::
-   *     Grid-fitting must be used with ClearType's symmetric smoothing.
-   *
-   * @note:
-   *   The bit-flags `FT_GASP_DO_GRIDFIT' and `FT_GASP_DO_GRAY' are to be
-   *   used for standard font rasterization only.  Independently of that,
-   *   `FT_GASP_SYMMETRIC_SMOOTHING' and `FT_GASP_SYMMETRIC_GRIDFIT' are to
-   *   be used if ClearType is enabled (and `FT_GASP_DO_GRIDFIT' and
-   *   `FT_GASP_DO_GRAY' are consequently ignored).
-   *
-   *   `ClearType' is Microsoft's implementation of LCD rendering, partly
-   *   protected by patents.
-   *
-   * @since:
-   *   2.3.0
-   */
-#define FT_GASP_NO_TABLE               -1
-#define FT_GASP_DO_GRIDFIT           0x01
-#define FT_GASP_DO_GRAY              0x02
-#define FT_GASP_SYMMETRIC_SMOOTHING  0x08
-#define FT_GASP_SYMMETRIC_GRIDFIT    0x10
-
-
-  /*************************************************************************
-   *
-   * @func:
-   *   FT_Get_Gasp
-   *
-   * @description:
-   *   Read the `gasp' table from a TrueType or OpenType font file and
-   *   return the entry corresponding to a given character pixel size.
-   *
-   * @input:
-   *   face :: The source face handle.
-   *   ppem :: The vertical character pixel size.
-   *
-   * @return:
-   *   Bit flags (see @FT_GASP_XXX), or @FT_GASP_NO_TABLE if there is no
-   *   `gasp' table in the face.
-   *
-   * @since:
-   *   2.3.0
-   */
-  FT_EXPORT( FT_Int )
-  FT_Get_Gasp( FT_Face  face,
-               FT_UInt  ppem );
-
-/* */
-
-#endif /* _FT_GASP_H_ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftbdf.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftbdf.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftbdf.h	(copie de travail)
@@ -1,209 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbdf.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing BDF-specific strings (specification).     */
-/*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2009 by                              */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTBDF_H__
-#define __FTBDF_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bdf_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    BDF and PCF Files                                                  */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    BDF and PCF specific API.                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of functions specific to BDF */
-  /*    and PCF fonts.                                                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /**********************************************************************
-   *
-   * @enum:
-   *    FT_PropertyType
-   *
-   * @description:
-   *    A list of BDF property types.
-   *
-   * @values:
-   *    BDF_PROPERTY_TYPE_NONE ::
-   *      Value~0 is used to indicate a missing property.
-   *
-   *    BDF_PROPERTY_TYPE_ATOM ::
-   *      Property is a string atom.
-   *
-   *    BDF_PROPERTY_TYPE_INTEGER ::
-   *      Property is a 32-bit signed integer.
-   *
-   *    BDF_PROPERTY_TYPE_CARDINAL ::
-   *      Property is a 32-bit unsigned integer.
-   */
-  typedef enum  BDF_PropertyType_
-  {
-    BDF_PROPERTY_TYPE_NONE     = 0,
-    BDF_PROPERTY_TYPE_ATOM     = 1,
-    BDF_PROPERTY_TYPE_INTEGER  = 2,
-    BDF_PROPERTY_TYPE_CARDINAL = 3
-
-  } BDF_PropertyType;
-
-
-  /**********************************************************************
-   *
-   * @type:
-   *    BDF_Property
-   *
-   * @description:
-   *    A handle to a @BDF_PropertyRec structure to model a given
-   *    BDF/PCF property.
-   */
-  typedef struct BDF_PropertyRec_*  BDF_Property;
-
-
- /**********************************************************************
-  *
-  * @struct:
-  *    BDF_PropertyRec
-  *
-  * @description:
-  *    This structure models a given BDF/PCF property.
-  *
-  * @fields:
-  *    type ::
-  *      The property type.
-  *
-  *    u.atom ::
-  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.
-  *
-  *    u.integer ::
-  *      A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
-  *
-  *    u.cardinal ::
-  *      An unsigned integer, if type is @BDF_PROPERTY_TYPE_CARDINAL.
-  */
-  typedef struct  BDF_PropertyRec_
-  {
-    BDF_PropertyType  type;
-    union {
-      const char*     atom;
-      FT_Int32        integer;
-      FT_UInt32       cardinal;
-
-    } u;
-
-  } BDF_PropertyRec;
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_BDF_Charset_ID
-  *
-  * @description:
-  *    Retrieve a BDF font character set identity, according to
-  *    the BDF specification.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  * @output:
-  *    acharset_encoding ::
-  *       Charset encoding, as a C~string, owned by the face.
-  *
-  *    acharset_registry ::
-  *       Charset registry, as a C~string, owned by the face.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function only works with BDF faces, returning an error otherwise.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Charset_ID( FT_Face       face,
-                         const char*  *acharset_encoding,
-                         const char*  *acharset_registry );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_BDF_Property
-  *
-  * @description:
-  *    Retrieve a BDF property from a BDF or PCF font file.
-  *
-  * @input:
-  *    face :: A handle to the input face.
-  *
-  *    name :: The property name.
-  *
-  * @output:
-  *    aproperty :: The property.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function works with BDF _and_ PCF fonts.  It returns an error
-  *   otherwise.  It also returns an error if the property is not in the
-  *   font.
-  *
-  *   A `property' is a either key-value pair within the STARTPROPERTIES
-  *   ... ENDPROPERTIES block of a BDF font or a key-value pair from the
-  *   `info->props' array within a `FontRec' structure of a PCF font.
-  *
-  *   Integer properties are always stored as `signed' within PCF fonts;
-  *   consequently, @BDF_PROPERTY_TYPE_CARDINAL is a possible return value
-  *   for BDF fonts only.
-  *
-  *   In case of error, `aproperty->type' is always set to
-  *   @BDF_PROPERTY_TYPE_NONE.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Property( FT_Face           face,
-                       const char*       prop_name,
-                       BDF_PropertyRec  *aproperty );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTBDF_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftdriver.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftdriver.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftdriver.h	(copie de travail)
@@ -1,409 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftdriver.h                                                             */
-/*                                                                         */
-/*    FreeType font driver interface (specification).                      */
-/*                                                                         */
-/*  Copyright 1996-2003, 2006, 2008, 2011-2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTDRIVER_H__
-#define __FTDRIVER_H__
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef FT_Error
-  (*FT_Face_InitFunc)( FT_Stream      stream,
-                       FT_Face        face,
-                       FT_Int         typeface_index,
-                       FT_Int         num_params,
-                       FT_Parameter*  parameters );
-
-  typedef void
-  (*FT_Face_DoneFunc)( FT_Face  face );
-
-
-  typedef FT_Error
-  (*FT_Size_InitFunc)( FT_Size  size );
-
-  typedef void
-  (*FT_Size_DoneFunc)( FT_Size  size );
-
-
-  typedef FT_Error
-  (*FT_Slot_InitFunc)( FT_GlyphSlot  slot );
-
-  typedef void
-  (*FT_Slot_DoneFunc)( FT_GlyphSlot  slot );
-
-
-  typedef FT_Error
-  (*FT_Size_RequestFunc)( FT_Size          size,
-                          FT_Size_Request  req );
-
-  typedef FT_Error
-  (*FT_Size_SelectFunc)( FT_Size   size,
-                         FT_ULong  size_index );
-
-  typedef FT_Error
-  (*FT_Slot_LoadFunc)( FT_GlyphSlot  slot,
-                       FT_Size       size,
-                       FT_UInt       glyph_index,
-                       FT_Int32      load_flags );
-
-
-  typedef FT_UInt
-  (*FT_CharMap_CharIndexFunc)( FT_CharMap  charmap,
-                               FT_Long     charcode );
-
-  typedef FT_Long
-  (*FT_CharMap_CharNextFunc)( FT_CharMap  charmap,
-                              FT_Long     charcode );
-
-
-  typedef FT_Error
-  (*FT_Face_GetKerningFunc)( FT_Face     face,
-                             FT_UInt     left_glyph,
-                             FT_UInt     right_glyph,
-                             FT_Vector*  kerning );
-
-
-  typedef FT_Error
-  (*FT_Face_AttachFunc)( FT_Face    face,
-                         FT_Stream  stream );
-
-
-  typedef FT_Error
-  (*FT_Face_GetAdvancesFunc)( FT_Face    face,
-                              FT_UInt    first,
-                              FT_UInt    count,
-                              FT_Int32   flags,
-                              FT_Fixed*  advances );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Driver_ClassRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The font driver class.  This structure mostly contains pointers to */
-  /*    driver methods.                                                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root             :: The parent module.                             */
-  /*                                                                       */
-  /*    face_object_size :: The size of a face object in bytes.            */
-  /*                                                                       */
-  /*    size_object_size :: The size of a size object in bytes.            */
-  /*                                                                       */
-  /*    slot_object_size :: The size of a glyph object in bytes.           */
-  /*                                                                       */
-  /*    init_face        :: The format-specific face constructor.          */
-  /*                                                                       */
-  /*    done_face        :: The format-specific face destructor.           */
-  /*                                                                       */
-  /*    init_size        :: The format-specific size constructor.          */
-  /*                                                                       */
-  /*    done_size        :: The format-specific size destructor.           */
-  /*                                                                       */
-  /*    init_slot        :: The format-specific slot constructor.          */
-  /*                                                                       */
-  /*    done_slot        :: The format-specific slot destructor.           */
-  /*                                                                       */
-  /*                                                                       */
-  /*    load_glyph       :: A function handle to load a glyph to a slot.   */
-  /*                        This field is mandatory!                       */
-  /*                                                                       */
-  /*    get_kerning      :: A function handle to return the unscaled       */
-  /*                        kerning for a given pair of glyphs.  Can be    */
-  /*                        set to 0 if the format doesn't support         */
-  /*                        kerning.                                       */
-  /*                                                                       */
-  /*    attach_file      :: This function handle is used to read           */
-  /*                        additional data for a face from another        */
-  /*                        file/stream.  For example, this can be used to */
-  /*                        add data from AFM or PFM files on a Type 1     */
-  /*                        face, or a CIDMap on a CID-keyed face.         */
-  /*                                                                       */
-  /*    get_advances     :: A function handle used to return advance       */
-  /*                        widths of `count' glyphs (in font units),      */
-  /*                        starting at `first'.  The `vertical' flag must */
-  /*                        be set to get vertical advance heights.  The   */
-  /*                        `advances' buffer is caller-allocated.         */
-  /*                        The idea of this function is to be able to     */
-  /*                        perform device-independent text layout without */
-  /*                        loading a single glyph image.                  */
-  /*                                                                       */
-  /*    request_size     :: A handle to a function used to request the new */
-  /*                        character size.  Can be set to 0 if the        */
-  /*                        scaling done in the base layer suffices.       */
-  /*                                                                       */
-  /*    select_size      :: A handle to a function used to select a new    */
-  /*                        fixed size.  It is used only if                */
-  /*                        @FT_FACE_FLAG_FIXED_SIZES is set.  Can be set  */
-  /*                        to 0 if the scaling done in the base layer     */
-  /*                        suffices.                                      */
-  /* <Note>                                                                */
-  /*    Most function pointers, with the exception of `load_glyph', can be */
-  /*    set to 0 to indicate a default behaviour.                          */
-  /*                                                                       */
-  typedef struct  FT_Driver_ClassRec_
-  {
-    FT_Module_Class          root;
-
-    FT_Long                  face_object_size;
-    FT_Long                  size_object_size;
-    FT_Long                  slot_object_size;
-
-    FT_Face_InitFunc         init_face;
-    FT_Face_DoneFunc         done_face;
-
-    FT_Size_InitFunc         init_size;
-    FT_Size_DoneFunc         done_size;
-
-    FT_Slot_InitFunc         init_slot;
-    FT_Slot_DoneFunc         done_slot;
-
-    FT_Slot_LoadFunc         load_glyph;
-
-    FT_Face_GetKerningFunc   get_kerning;
-    FT_Face_AttachFunc       attach_file;
-    FT_Face_GetAdvancesFunc  get_advances;
-
-    /* since version 2.2 */
-    FT_Size_RequestFunc      request_size;
-    FT_Size_SelectFunc       select_size;
-
-  } FT_Driver_ClassRec, *FT_Driver_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DECLARE_DRIVER                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to create a forward declaration of an FT_Driver_ClassRec      */
-  /*    struct instance.                                                   */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_DRIVER                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Driver_ClassRec struct.       */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function has to be */
-  /*    called with a pointer where the allocated structure is returned.   */
-  /*    And when it is no longer needed a `destroy' function needs to be   */
-  /*    called to release that allocation.                                 */
-  /*                                                                       */
-  /*    `fcinit.c' (ft_create_default_module_classes) already contains a   */
-  /*    mechanism to call these functions for the default modules          */
-  /*    described in `ftmodule.h'.                                         */
-  /*                                                                       */
-  /*    Notice that the created `create' and `destroy' functions call      */
-  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
-  /*    initialize any additional global data, like a module specific      */
-  /*    interface, and put them in the global pic container defined in     */
-  /*    `ftpic.h'.  If you don't need them just implement the functions as */
-  /*    empty to resolve the link error.  Also the `pic_init' and          */
-  /*    `pic_free' functions should be declared in `pic.h', to be referred */
-  /*    by driver definition calling `FT_DEFINE_DRIVER' in following.      */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro is     */
-  /*    used).                                                             */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_DRIVER( class_ )  \
-  FT_CALLBACK_TABLE                  \
-  const FT_Driver_ClassRec  class_;
-
-#define FT_DEFINE_DRIVER(                    \
-          class_,                            \
-          flags_,                            \
-          size_,                             \
-          name_,                             \
-          version_,                          \
-          requires_,                         \
-          interface_,                        \
-          init_,                             \
-          done_,                             \
-          get_interface_,                    \
-          face_object_size_,                 \
-          size_object_size_,                 \
-          slot_object_size_,                 \
-          init_face_,                        \
-          done_face_,                        \
-          init_size_,                        \
-          done_size_,                        \
-          init_slot_,                        \
-          done_slot_,                        \
-          load_glyph_,                       \
-          get_kerning_,                      \
-          attach_file_,                      \
-          get_advances_,                     \
-          request_size_,                     \
-          select_size_ )                     \
-  FT_CALLBACK_TABLE_DEF                      \
-  const FT_Driver_ClassRec  class_ =         \
-  {                                          \
-    FT_DEFINE_ROOT_MODULE( flags_,           \
-                           size_,            \
-                           name_,            \
-                           version_,         \
-                           requires_,        \
-                           interface_,       \
-                           init_,            \
-                           done_,            \
-                           get_interface_ )  \
-                                             \
-    face_object_size_,                       \
-    size_object_size_,                       \
-    slot_object_size_,                       \
-                                             \
-    init_face_,                              \
-    done_face_,                              \
-                                             \
-    init_size_,                              \
-    done_size_,                              \
-                                             \
-    init_slot_,                              \
-    done_slot_,                              \
-                                             \
-    load_glyph_,                             \
-                                             \
-    get_kerning_,                            \
-    attach_file_,                            \
-    get_advances_,                           \
-                                             \
-    request_size_,                           \
-    select_size_                             \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_DRIVER( class_ )  FT_DECLARE_MODULE( class_ )
-
-#define FT_DEFINE_DRIVER(                                        \
-          class_,                                                \
-          flags_,                                                \
-          size_,                                                 \
-          name_,                                                 \
-          version_,                                              \
-          requires_,                                             \
-          interface_,                                            \
-          init_,                                                 \
-          done_,                                                 \
-          get_interface_,                                        \
-          face_object_size_,                                     \
-          size_object_size_,                                     \
-          slot_object_size_,                                     \
-          init_face_,                                            \
-          done_face_,                                            \
-          init_size_,                                            \
-          done_size_,                                            \
-          init_slot_,                                            \
-          done_slot_,                                            \
-          load_glyph_,                                           \
-          get_kerning_,                                          \
-          attach_file_,                                          \
-          get_advances_,                                         \
-          request_size_,                                         \
-          select_size_ )                                         \
-  void                                                           \
-  FT_Destroy_Class_ ## class_( FT_Library        library,        \
-                               FT_Module_Class*  clazz )         \
-  {                                                              \
-    FT_Memory        memory = library->memory;                   \
-    FT_Driver_Class  dclazz = (FT_Driver_Class)clazz;            \
-                                                                 \
-                                                                 \
-    class_ ## _pic_free( library );                              \
-    if ( dclazz )                                                \
-      FT_FREE( dclazz );                                         \
-  }                                                              \
-                                                                 \
-                                                                 \
-  FT_Error                                                       \
-  FT_Create_Class_ ## class_( FT_Library         library,        \
-                              FT_Module_Class**  output_class )  \
-  {                                                              \
-    FT_Driver_Class  clazz  = NULL;                              \
-    FT_Error         error;                                      \
-    FT_Memory        memory = library->memory;                   \
-                                                                 \
-                                                                 \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
-      return error;                                              \
-                                                                 \
-    error = class_ ## _pic_init( library );                      \
-    if ( error )                                                 \
-    {                                                            \
-      FT_FREE( clazz );                                          \
-      return error;                                              \
-    }                                                            \
-                                                                 \
-    FT_DEFINE_ROOT_MODULE( flags_,                               \
-                           size_,                                \
-                           name_,                                \
-                           version_,                             \
-                           requires_,                            \
-                           interface_,                           \
-                           init_,                                \
-                           done_,                                \
-                           get_interface_ )                      \
-                                                                 \
-    clazz->face_object_size = face_object_size_;                 \
-    clazz->size_object_size = size_object_size_;                 \
-    clazz->slot_object_size = slot_object_size_;                 \
-                                                                 \
-    clazz->init_face        = init_face_;                        \
-    clazz->done_face        = done_face_;                        \
-                                                                 \
-    clazz->init_size        = init_size_;                        \
-    clazz->done_size        = done_size_;                        \
-                                                                 \
-    clazz->init_slot        = init_slot_;                        \
-    clazz->done_slot        = done_slot_;                        \
-                                                                 \
-    clazz->load_glyph       = load_glyph_;                       \
-                                                                 \
-    clazz->get_kerning      = get_kerning_;                      \
-    clazz->attach_file      = attach_file_;                      \
-    clazz->get_advances     = get_advances_;                     \
-                                                                 \
-    clazz->request_size     = request_size_;                     \
-    clazz->select_size      = select_size_;                      \
-                                                                 \
-    *output_class = (FT_Module_Class*)clazz;                     \
-                                                                 \
-    return FT_Err_Ok;                                            \
-  }
-
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* __FTDRIVER_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftstream.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftstream.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftstream.h	(copie de travail)
@@ -1,536 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstream.h                                                             */
-/*                                                                         */
-/*    Stream handling (specification).                                     */
-/*                                                                         */
-/*  Copyright 1996-2002, 2004-2006, 2011, 2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTSTREAM_H__
-#define __FTSTREAM_H__
-
-
-#include <ft2build.h>
-#include FT_SYSTEM_H
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* format of an 8-bit frame_op value:           */
-  /*                                              */
-  /* bit  76543210                                */
-  /*      xxxxxxes                                */
-  /*                                              */
-  /* s is set to 1 if the value is signed.        */
-  /* e is set to 1 if the value is little-endian. */
-  /* xxx is a command.                            */
-
-#define FT_FRAME_OP_SHIFT         2
-#define FT_FRAME_OP_SIGNED        1
-#define FT_FRAME_OP_LITTLE        2
-#define FT_FRAME_OP_COMMAND( x )  ( x >> FT_FRAME_OP_SHIFT )
-
-#define FT_MAKE_FRAME_OP( command, little, sign ) \
-          ( ( command << FT_FRAME_OP_SHIFT ) | ( little << 1 ) | sign )
-
-#define FT_FRAME_OP_END    0
-#define FT_FRAME_OP_START  1  /* start a new frame     */
-#define FT_FRAME_OP_BYTE   2  /* read 1-byte value     */
-#define FT_FRAME_OP_SHORT  3  /* read 2-byte value     */
-#define FT_FRAME_OP_LONG   4  /* read 4-byte value     */
-#define FT_FRAME_OP_OFF3   5  /* read 3-byte value     */
-#define FT_FRAME_OP_BYTES  6  /* read a bytes sequence */
-
-
-  typedef enum  FT_Frame_Op_
-  {
-    ft_frame_end       = 0,
-    ft_frame_start     = FT_MAKE_FRAME_OP( FT_FRAME_OP_START, 0, 0 ),
-
-    ft_frame_byte      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 0 ),
-    ft_frame_schar     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 1 ),
-
-    ft_frame_ushort_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 0 ),
-    ft_frame_short_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 1 ),
-    ft_frame_ushort_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 0 ),
-    ft_frame_short_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 1 ),
-
-    ft_frame_ulong_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 0 ),
-    ft_frame_long_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 1 ),
-    ft_frame_ulong_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 0 ),
-    ft_frame_long_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 1 ),
-
-    ft_frame_uoff3_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 0 ),
-    ft_frame_off3_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 1 ),
-    ft_frame_uoff3_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 0 ),
-    ft_frame_off3_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 1 ),
-
-    ft_frame_bytes     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 0 ),
-    ft_frame_skip      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 1 )
-
-  } FT_Frame_Op;
-
-
-  typedef struct  FT_Frame_Field_
-  {
-    FT_Byte    value;
-    FT_Byte    size;
-    FT_UShort  offset;
-
-  } FT_Frame_Field;
-
-
-  /* Construct an FT_Frame_Field out of a structure type and a field name. */
-  /* The structure type must be set in the FT_STRUCTURE macro before       */
-  /* calling the FT_FRAME_START() macro.                                   */
-  /*                                                                       */
-#define FT_FIELD_SIZE( f ) \
-          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f )
-
-#define FT_FIELD_SIZE_DELTA( f ) \
-          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f[0] )
-
-#define FT_FIELD_OFFSET( f ) \
-          (FT_UShort)( offsetof( FT_STRUCTURE, f ) )
-
-#define FT_FRAME_FIELD( frame_op, field ) \
-          {                               \
-            frame_op,                     \
-            FT_FIELD_SIZE( field ),       \
-            FT_FIELD_OFFSET( field )      \
-          }
-
-#define FT_MAKE_EMPTY_FIELD( frame_op )  { frame_op, 0, 0 }
-
-#define FT_FRAME_START( size )   { ft_frame_start, 0, size }
-#define FT_FRAME_END             { ft_frame_end, 0, 0 }
-
-#define FT_FRAME_LONG( f )       FT_FRAME_FIELD( ft_frame_long_be, f )
-#define FT_FRAME_ULONG( f )      FT_FRAME_FIELD( ft_frame_ulong_be, f )
-#define FT_FRAME_SHORT( f )      FT_FRAME_FIELD( ft_frame_short_be, f )
-#define FT_FRAME_USHORT( f )     FT_FRAME_FIELD( ft_frame_ushort_be, f )
-#define FT_FRAME_OFF3( f )       FT_FRAME_FIELD( ft_frame_off3_be, f )
-#define FT_FRAME_UOFF3( f )      FT_FRAME_FIELD( ft_frame_uoff3_be, f )
-#define FT_FRAME_BYTE( f )       FT_FRAME_FIELD( ft_frame_byte, f )
-#define FT_FRAME_CHAR( f )       FT_FRAME_FIELD( ft_frame_schar, f )
-
-#define FT_FRAME_LONG_LE( f )    FT_FRAME_FIELD( ft_frame_long_le, f )
-#define FT_FRAME_ULONG_LE( f )   FT_FRAME_FIELD( ft_frame_ulong_le, f )
-#define FT_FRAME_SHORT_LE( f )   FT_FRAME_FIELD( ft_frame_short_le, f )
-#define FT_FRAME_USHORT_LE( f )  FT_FRAME_FIELD( ft_frame_ushort_le, f )
-#define FT_FRAME_OFF3_LE( f )    FT_FRAME_FIELD( ft_frame_off3_le, f )
-#define FT_FRAME_UOFF3_LE( f )   FT_FRAME_FIELD( ft_frame_uoff3_le, f )
-
-#define FT_FRAME_SKIP_LONG       { ft_frame_long_be, 0, 0 }
-#define FT_FRAME_SKIP_SHORT      { ft_frame_short_be, 0, 0 }
-#define FT_FRAME_SKIP_BYTE       { ft_frame_byte, 0, 0 }
-
-#define FT_FRAME_BYTES( field, count ) \
-          {                            \
-            ft_frame_bytes,            \
-            count,                     \
-            FT_FIELD_OFFSET( field )   \
-          }
-
-#define FT_FRAME_SKIP_BYTES( count )  { ft_frame_skip, count, 0 }
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Integer extraction macros -- the `buffer' parameter must ALWAYS be of */
-  /* type `char*' or equivalent (1-byte elements).                         */
-  /*                                                                       */
-
-#define FT_BYTE_( p, i )  ( ((const FT_Byte*)(p))[(i)] )
-
-#define FT_INT16( x )   ( (FT_Int16)(x)  )
-#define FT_UINT16( x )  ( (FT_UInt16)(x) )
-#define FT_INT32( x )   ( (FT_Int32)(x)  )
-#define FT_UINT32( x )  ( (FT_UInt32)(x) )
-
-
-#define FT_BYTE_U16( p, i, s )  ( FT_UINT16( FT_BYTE_( p, i ) ) << (s) )
-#define FT_BYTE_U32( p, i, s )  ( FT_UINT32( FT_BYTE_( p, i ) ) << (s) )
-
-
-#define FT_PEEK_SHORT( p )  FT_INT16( FT_BYTE_U16( p, 0, 8) | \
-                                      FT_BYTE_U16( p, 1, 0) )
-
-#define FT_PEEK_USHORT( p )  FT_UINT16( FT_BYTE_U16( p, 0, 8 ) | \
-                                        FT_BYTE_U16( p, 1, 0 ) )
-
-#define FT_PEEK_LONG( p )  FT_INT32( FT_BYTE_U32( p, 0, 24 ) | \
-                                     FT_BYTE_U32( p, 1, 16 ) | \
-                                     FT_BYTE_U32( p, 2,  8 ) | \
-                                     FT_BYTE_U32( p, 3,  0 ) )
-
-#define FT_PEEK_ULONG( p )  FT_UINT32( FT_BYTE_U32( p, 0, 24 ) | \
-                                       FT_BYTE_U32( p, 1, 16 ) | \
-                                       FT_BYTE_U32( p, 2,  8 ) | \
-                                       FT_BYTE_U32( p, 3,  0 ) )
-
-#define FT_PEEK_OFF3( p )  FT_INT32( FT_BYTE_U32( p, 0, 16 ) | \
-                                     FT_BYTE_U32( p, 1,  8 ) | \
-                                     FT_BYTE_U32( p, 2,  0 ) )
-
-#define FT_PEEK_UOFF3( p )  FT_UINT32( FT_BYTE_U32( p, 0, 16 ) | \
-                                       FT_BYTE_U32( p, 1,  8 ) | \
-                                       FT_BYTE_U32( p, 2,  0 ) )
-
-#define FT_PEEK_SHORT_LE( p )  FT_INT16( FT_BYTE_U16( p, 1, 8 ) | \
-                                         FT_BYTE_U16( p, 0, 0 ) )
-
-#define FT_PEEK_USHORT_LE( p )  FT_UINT16( FT_BYTE_U16( p, 1, 8 ) |  \
-                                           FT_BYTE_U16( p, 0, 0 ) )
-
-#define FT_PEEK_LONG_LE( p )  FT_INT32( FT_BYTE_U32( p, 3, 24 ) | \
-                                        FT_BYTE_U32( p, 2, 16 ) | \
-                                        FT_BYTE_U32( p, 1,  8 ) | \
-                                        FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_ULONG_LE( p )  FT_UINT32( FT_BYTE_U32( p, 3, 24 ) | \
-                                          FT_BYTE_U32( p, 2, 16 ) | \
-                                          FT_BYTE_U32( p, 1,  8 ) | \
-                                          FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_OFF3_LE( p )  FT_INT32( FT_BYTE_U32( p, 2, 16 ) | \
-                                        FT_BYTE_U32( p, 1,  8 ) | \
-                                        FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_UOFF3_LE( p )  FT_UINT32( FT_BYTE_U32( p, 2, 16 ) | \
-                                          FT_BYTE_U32( p, 1,  8 ) | \
-                                          FT_BYTE_U32( p, 0,  0 ) )
-
-
-#define FT_NEXT_CHAR( buffer )       \
-          ( (signed char)*buffer++ )
-
-#define FT_NEXT_BYTE( buffer )         \
-          ( (unsigned char)*buffer++ )
-
-#define FT_NEXT_SHORT( buffer )                                   \
-          ( (short)( buffer += 2, FT_PEEK_SHORT( buffer - 2 ) ) )
-
-#define FT_NEXT_USHORT( buffer )                                            \
-          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT( buffer - 2 ) ) )
-
-#define FT_NEXT_OFF3( buffer )                                  \
-          ( (long)( buffer += 3, FT_PEEK_OFF3( buffer - 3 ) ) )
-
-#define FT_NEXT_UOFF3( buffer )                                           \
-          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3( buffer - 3 ) ) )
-
-#define FT_NEXT_LONG( buffer )                                  \
-          ( (long)( buffer += 4, FT_PEEK_LONG( buffer - 4 ) ) )
-
-#define FT_NEXT_ULONG( buffer )                                           \
-          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG( buffer - 4 ) ) )
-
-
-#define FT_NEXT_SHORT_LE( buffer )                                   \
-          ( (short)( buffer += 2, FT_PEEK_SHORT_LE( buffer - 2 ) ) )
-
-#define FT_NEXT_USHORT_LE( buffer )                                            \
-          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT_LE( buffer - 2 ) ) )
-
-#define FT_NEXT_OFF3_LE( buffer )                                  \
-          ( (long)( buffer += 3, FT_PEEK_OFF3_LE( buffer - 3 ) ) )
-
-#define FT_NEXT_UOFF3_LE( buffer )                                           \
-          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3_LE( buffer - 3 ) ) )
-
-#define FT_NEXT_LONG_LE( buffer )                                  \
-          ( (long)( buffer += 4, FT_PEEK_LONG_LE( buffer - 4 ) ) )
-
-#define FT_NEXT_ULONG_LE( buffer )                                           \
-          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG_LE( buffer - 4 ) ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Each GET_xxxx() macro uses an implicit `stream' variable.             */
-  /*                                                                       */
-#if 0
-#define FT_GET_MACRO( type )    FT_NEXT_ ## type ( stream->cursor )
-
-#define FT_GET_CHAR()       FT_GET_MACRO( CHAR )
-#define FT_GET_BYTE()       FT_GET_MACRO( BYTE )
-#define FT_GET_SHORT()      FT_GET_MACRO( SHORT )
-#define FT_GET_USHORT()     FT_GET_MACRO( USHORT )
-#define FT_GET_OFF3()       FT_GET_MACRO( OFF3 )
-#define FT_GET_UOFF3()      FT_GET_MACRO( UOFF3 )
-#define FT_GET_LONG()       FT_GET_MACRO( LONG )
-#define FT_GET_ULONG()      FT_GET_MACRO( ULONG )
-#define FT_GET_TAG4()       FT_GET_MACRO( ULONG )
-
-#define FT_GET_SHORT_LE()   FT_GET_MACRO( SHORT_LE )
-#define FT_GET_USHORT_LE()  FT_GET_MACRO( USHORT_LE )
-#define FT_GET_LONG_LE()    FT_GET_MACRO( LONG_LE )
-#define FT_GET_ULONG_LE()   FT_GET_MACRO( ULONG_LE )
-
-#else
-#define FT_GET_MACRO( func, type )        ( (type)func( stream ) )
-
-#define FT_GET_CHAR()       FT_GET_MACRO( FT_Stream_GetChar, FT_Char )
-#define FT_GET_BYTE()       FT_GET_MACRO( FT_Stream_GetChar, FT_Byte )
-#define FT_GET_SHORT()      FT_GET_MACRO( FT_Stream_GetUShort, FT_Short )
-#define FT_GET_USHORT()     FT_GET_MACRO( FT_Stream_GetUShort, FT_UShort )
-#define FT_GET_OFF3()       FT_GET_MACRO( FT_Stream_GetUOffset, FT_Long )
-#define FT_GET_UOFF3()      FT_GET_MACRO( FT_Stream_GetUOffset, FT_ULong )
-#define FT_GET_LONG()       FT_GET_MACRO( FT_Stream_GetULong, FT_Long )
-#define FT_GET_ULONG()      FT_GET_MACRO( FT_Stream_GetULong, FT_ULong )
-#define FT_GET_TAG4()       FT_GET_MACRO( FT_Stream_GetULong, FT_ULong )
-
-#define FT_GET_SHORT_LE()   FT_GET_MACRO( FT_Stream_GetUShortLE, FT_Short )
-#define FT_GET_USHORT_LE()  FT_GET_MACRO( FT_Stream_GetUShortLE, FT_UShort )
-#define FT_GET_LONG_LE()    FT_GET_MACRO( FT_Stream_GetULongLE, FT_Long )
-#define FT_GET_ULONG_LE()   FT_GET_MACRO( FT_Stream_GetULongLE, FT_ULong )
-#endif
-
-#define FT_READ_MACRO( func, type, var )        \
-          ( var = (type)func( stream, &error ), \
-            error != FT_Err_Ok )
-
-#define FT_READ_BYTE( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Byte, var )
-#define FT_READ_CHAR( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Char, var )
-#define FT_READ_SHORT( var )      FT_READ_MACRO( FT_Stream_ReadUShort, FT_Short, var )
-#define FT_READ_USHORT( var )     FT_READ_MACRO( FT_Stream_ReadUShort, FT_UShort, var )
-#define FT_READ_OFF3( var )       FT_READ_MACRO( FT_Stream_ReadUOffset, FT_Long, var )
-#define FT_READ_UOFF3( var )      FT_READ_MACRO( FT_Stream_ReadUOffset, FT_ULong, var )
-#define FT_READ_LONG( var )       FT_READ_MACRO( FT_Stream_ReadULong, FT_Long, var )
-#define FT_READ_ULONG( var )      FT_READ_MACRO( FT_Stream_ReadULong, FT_ULong, var )
-
-#define FT_READ_SHORT_LE( var )   FT_READ_MACRO( FT_Stream_ReadUShortLE, FT_Short, var )
-#define FT_READ_USHORT_LE( var )  FT_READ_MACRO( FT_Stream_ReadUShortLE, FT_UShort, var )
-#define FT_READ_LONG_LE( var )    FT_READ_MACRO( FT_Stream_ReadULongLE, FT_Long, var )
-#define FT_READ_ULONG_LE( var )   FT_READ_MACRO( FT_Stream_ReadULongLE, FT_ULong, var )
-
-
-#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
-
-  /* initialize a stream for reading a regular system stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Open( FT_Stream    stream,
-                  const char*  filepathname );
-
-#endif /* FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
-
-
-  /* create a new (input) stream from an FT_Open_Args structure */
-  FT_BASE( FT_Error )
-  FT_Stream_New( FT_Library           library,
-                 const FT_Open_Args*  args,
-                 FT_Stream           *astream );
-
-  /* free a stream */
-  FT_BASE( void )
-  FT_Stream_Free( FT_Stream  stream,
-                  FT_Int     external );
-
-  /* initialize a stream for reading in-memory data */
-  FT_BASE( void )
-  FT_Stream_OpenMemory( FT_Stream       stream,
-                        const FT_Byte*  base,
-                        FT_ULong        size );
-
-  /* close a stream (does not destroy the stream structure) */
-  FT_BASE( void )
-  FT_Stream_Close( FT_Stream  stream );
-
-
-  /* seek within a stream. position is relative to start of stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Seek( FT_Stream  stream,
-                  FT_ULong   pos );
-
-  /* skip bytes in a stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Skip( FT_Stream  stream,
-                  FT_Long    distance );
-
-  /* return current stream position */
-  FT_BASE( FT_Long )
-  FT_Stream_Pos( FT_Stream  stream );
-
-  /* read bytes from a stream into a user-allocated buffer, returns an */
-  /* error if not all bytes could be read.                             */
-  FT_BASE( FT_Error )
-  FT_Stream_Read( FT_Stream  stream,
-                  FT_Byte*   buffer,
-                  FT_ULong   count );
-
-  /* read bytes from a stream at a given position */
-  FT_BASE( FT_Error )
-  FT_Stream_ReadAt( FT_Stream  stream,
-                    FT_ULong   pos,
-                    FT_Byte*   buffer,
-                    FT_ULong   count );
-
-  /* try to read bytes at the end of a stream; return number of bytes */
-  /* really available                                                 */
-  FT_BASE( FT_ULong )
-  FT_Stream_TryRead( FT_Stream  stream,
-                     FT_Byte*   buffer,
-                     FT_ULong   count );
-
-  /* Enter a frame of `count' consecutive bytes in a stream.  Returns an */
-  /* error if the frame could not be read/accessed.  The caller can use  */
-  /* the FT_Stream_Get_XXX functions to retrieve frame data without      */
-  /* error checks.                                                       */
-  /*                                                                     */
-  /* You must _always_ call FT_Stream_ExitFrame() once you have entered  */
-  /* a stream frame!                                                     */
-  /*                                                                     */
-  FT_BASE( FT_Error )
-  FT_Stream_EnterFrame( FT_Stream  stream,
-                        FT_ULong   count );
-
-  /* exit a stream frame */
-  FT_BASE( void )
-  FT_Stream_ExitFrame( FT_Stream  stream );
-
-  /* Extract a stream frame.  If the stream is disk-based, a heap block */
-  /* is allocated and the frame bytes are read into it.  If the stream  */
-  /* is memory-based, this function simply set a pointer to the data.   */
-  /*                                                                    */
-  /* Useful to optimize access to memory-based streams transparently.   */
-  /*                                                                    */
-  /* All extracted frames must be `freed' with a call to the function   */
-  /* FT_Stream_ReleaseFrame().                                          */
-  /*                                                                    */
-  FT_BASE( FT_Error )
-  FT_Stream_ExtractFrame( FT_Stream  stream,
-                          FT_ULong   count,
-                          FT_Byte**  pbytes );
-
-  /* release an extract frame (see FT_Stream_ExtractFrame) */
-  FT_BASE( void )
-  FT_Stream_ReleaseFrame( FT_Stream  stream,
-                          FT_Byte**  pbytes );
-
-  /* read a byte from an entered frame */
-  FT_BASE( FT_Char )
-  FT_Stream_GetChar( FT_Stream  stream );
-
-  /* read a 16-bit big-endian unsigned integer from an entered frame */
-  FT_BASE( FT_UShort )
-  FT_Stream_GetUShort( FT_Stream  stream );
-
-  /* read a 24-bit big-endian unsigned integer from an entered frame */
-  FT_BASE( FT_ULong )
-  FT_Stream_GetUOffset( FT_Stream  stream );
-
-  /* read a 32-bit big-endian unsigned integer from an entered frame */
-  FT_BASE( FT_ULong )
-  FT_Stream_GetULong( FT_Stream  stream );
-
-  /* read a 16-bit little-endian unsigned integer from an entered frame */
-  FT_BASE( FT_UShort )
-  FT_Stream_GetUShortLE( FT_Stream  stream );
-
-  /* read a 32-bit little-endian unsigned integer from an entered frame */
-  FT_BASE( FT_ULong )
-  FT_Stream_GetULongLE( FT_Stream  stream );
-
-
-  /* read a byte from a stream */
-  FT_BASE( FT_Char )
-  FT_Stream_ReadChar( FT_Stream  stream,
-                      FT_Error*  error );
-
-  /* read a 16-bit big-endian unsigned integer from a stream */
-  FT_BASE( FT_UShort )
-  FT_Stream_ReadUShort( FT_Stream  stream,
-                        FT_Error*  error );
-
-  /* read a 24-bit big-endian unsigned integer from a stream */
-  FT_BASE( FT_ULong )
-  FT_Stream_ReadUOffset( FT_Stream  stream,
-                         FT_Error*  error );
-
-  /* read a 32-bit big-endian integer from a stream */
-  FT_BASE( FT_ULong )
-  FT_Stream_ReadULong( FT_Stream  stream,
-                       FT_Error*  error );
-
-  /* read a 16-bit little-endian unsigned integer from a stream */
-  FT_BASE( FT_UShort )
-  FT_Stream_ReadUShortLE( FT_Stream  stream,
-                          FT_Error*  error );
-
-  /* read a 32-bit little-endian unsigned integer from a stream */
-  FT_BASE( FT_ULong )
-  FT_Stream_ReadULongLE( FT_Stream  stream,
-                         FT_Error*  error );
-
-  /* Read a structure from a stream.  The structure must be described */
-  /* by an array of FT_Frame_Field records.                           */
-  FT_BASE( FT_Error )
-  FT_Stream_ReadFields( FT_Stream              stream,
-                        const FT_Frame_Field*  fields,
-                        void*                  structure );
-
-
-#define FT_STREAM_POS()           \
-          FT_Stream_Pos( stream )
-
-#define FT_STREAM_SEEK( position )                               \
-          FT_SET_ERROR( FT_Stream_Seek( stream,                  \
-                                        (FT_ULong)(position) ) )
-
-#define FT_STREAM_SKIP( distance )                              \
-          FT_SET_ERROR( FT_Stream_Skip( stream,                 \
-                                        (FT_Long)(distance) ) )
-
-#define FT_STREAM_READ( buffer, count )                       \
-          FT_SET_ERROR( FT_Stream_Read( stream,               \
-                                        (FT_Byte*)(buffer),   \
-                                        (FT_ULong)(count) ) )
-
-#define FT_STREAM_READ_AT( position, buffer, count )            \
-          FT_SET_ERROR( FT_Stream_ReadAt( stream,               \
-                                          (FT_ULong)(position), \
-                                          (FT_Byte*)buffer,     \
-                                          (FT_ULong)(count) ) )
-
-#define FT_STREAM_READ_FIELDS( fields, object )                          \
-          FT_SET_ERROR( FT_Stream_ReadFields( stream, fields, object ) )
-
-
-#define FT_FRAME_ENTER( size )                                           \
-          FT_SET_ERROR(                                                  \
-            FT_DEBUG_INNER( FT_Stream_EnterFrame( stream,                \
-                                                  (FT_ULong)(size) ) ) )
-
-#define FT_FRAME_EXIT()                                   \
-          FT_DEBUG_INNER( FT_Stream_ExitFrame( stream ) )
-
-#define FT_FRAME_EXTRACT( size, bytes )                                       \
-          FT_SET_ERROR(                                                       \
-            FT_DEBUG_INNER( FT_Stream_ExtractFrame( stream,                   \
-                                                    (FT_ULong)(size),         \
-                                                    (FT_Byte**)&(bytes) ) ) )
-
-#define FT_FRAME_RELEASE( bytes )                                         \
-          FT_DEBUG_INNER( FT_Stream_ReleaseFrame( stream,                 \
-                                                  (FT_Byte**)&(bytes) ) )
-
-
-FT_END_HEADER
-
-#endif /* __FTSTREAM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftobjs.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftobjs.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftobjs.h	(copie de travail)
@@ -1,1569 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftobjs.h                                                               */
-/*                                                                         */
-/*    The FreeType private base classes (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2006, 2008, 2010, 2012-2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file contains the definition of all internal FreeType classes.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTOBJS_H__
-#define __FTOBJS_H__
-
-#include <ft2build.h>
-#include FT_RENDER_H
-#include FT_SIZES_H
-#include FT_LCD_FILTER_H
-#include FT_INTERNAL_MEMORY_H
-#include FT_INTERNAL_GLYPH_LOADER_H
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_AUTOHINT_H
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_PIC_H
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-#include FT_INCREMENTAL_H
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Some generic definitions.                                             */
-  /*                                                                       */
-#ifndef TRUE
-#define TRUE  1
-#endif
-
-#ifndef FALSE
-#define FALSE  0
-#endif
-
-#ifndef NULL
-#define NULL  (void*)0
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The min and max functions missing in C.  As usual, be careful not to  */
-  /* write things like FT_MIN( a++, b++ ) to avoid side effects.           */
-  /*                                                                       */
-#define FT_MIN( a, b )  ( (a) < (b) ? (a) : (b) )
-#define FT_MAX( a, b )  ( (a) > (b) ? (a) : (b) )
-
-#define FT_ABS( a )     ( (a) < 0 ? -(a) : (a) )
-
-
-#define FT_PAD_FLOOR( x, n )  ( (x) & ~((n)-1) )
-#define FT_PAD_ROUND( x, n )  FT_PAD_FLOOR( (x) + ((n)/2), n )
-#define FT_PAD_CEIL( x, n )   FT_PAD_FLOOR( (x) + ((n)-1), n )
-
-#define FT_PIX_FLOOR( x )     ( (x) & ~63 )
-#define FT_PIX_ROUND( x )     FT_PIX_FLOOR( (x) + 32 )
-#define FT_PIX_CEIL( x )      FT_PIX_FLOOR( (x) + 63 )
-
-
-  /*
-   *  Return the highest power of 2 that is <= value; this correspond to
-   *  the highest bit in a given 32-bit value.
-   */
-  FT_BASE( FT_UInt32 )
-  ft_highpow2( FT_UInt32  value );
-
-
-  /*
-   *  character classification functions -- since these are used to parse
-   *  font files, we must not use those in <ctypes.h> which are
-   *  locale-dependent
-   */
-#define  ft_isdigit( x )   ( ( (unsigned)(x) - '0' ) < 10U )
-
-#define  ft_isxdigit( x )  ( ( (unsigned)(x) - '0' ) < 10U || \
-                             ( (unsigned)(x) - 'a' ) < 6U  || \
-                             ( (unsigned)(x) - 'A' ) < 6U  )
-
-  /* the next two macros assume ASCII representation */
-#define  ft_isupper( x )  ( ( (unsigned)(x) - 'A' ) < 26U )
-#define  ft_islower( x )  ( ( (unsigned)(x) - 'a' ) < 26U )
-
-#define  ft_isalpha( x )  ( ft_isupper( x ) || ft_islower( x ) )
-#define  ft_isalnum( x )  ( ft_isdigit( x ) || ft_isalpha( x ) )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                       C H A R M A P S                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* handle to internal charmap object */
-  typedef struct FT_CMapRec_*              FT_CMap;
-
-  /* handle to charmap class structure */
-  typedef const struct FT_CMap_ClassRec_*  FT_CMap_Class;
-
-  /* internal charmap object structure */
-  typedef struct  FT_CMapRec_
-  {
-    FT_CharMapRec  charmap;
-    FT_CMap_Class  clazz;
-
-  } FT_CMapRec;
-
-  /* typecase any pointer to a charmap handle */
-#define FT_CMAP( x )              ((FT_CMap)( x ))
-
-  /* obvious macros */
-#define FT_CMAP_PLATFORM_ID( x )  FT_CMAP( x )->charmap.platform_id
-#define FT_CMAP_ENCODING_ID( x )  FT_CMAP( x )->charmap.encoding_id
-#define FT_CMAP_ENCODING( x )     FT_CMAP( x )->charmap.encoding
-#define FT_CMAP_FACE( x )         FT_CMAP( x )->charmap.face
-
-
-  /* class method definitions */
-  typedef FT_Error
-  (*FT_CMap_InitFunc)( FT_CMap     cmap,
-                       FT_Pointer  init_data );
-
-  typedef void
-  (*FT_CMap_DoneFunc)( FT_CMap  cmap );
-
-  typedef FT_UInt
-  (*FT_CMap_CharIndexFunc)( FT_CMap    cmap,
-                            FT_UInt32  char_code );
-
-  typedef FT_UInt
-  (*FT_CMap_CharNextFunc)( FT_CMap     cmap,
-                           FT_UInt32  *achar_code );
-
-  typedef FT_UInt
-  (*FT_CMap_CharVarIndexFunc)( FT_CMap    cmap,
-                               FT_CMap    unicode_cmap,
-                               FT_UInt32  char_code,
-                               FT_UInt32  variant_selector );
-
-  typedef FT_Bool
-  (*FT_CMap_CharVarIsDefaultFunc)( FT_CMap    cmap,
-                                   FT_UInt32  char_code,
-                                   FT_UInt32  variant_selector );
-
-  typedef FT_UInt32 *
-  (*FT_CMap_VariantListFunc)( FT_CMap    cmap,
-                              FT_Memory  mem );
-
-  typedef FT_UInt32 *
-  (*FT_CMap_CharVariantListFunc)( FT_CMap    cmap,
-                                  FT_Memory  mem,
-                                  FT_UInt32  char_code );
-
-  typedef FT_UInt32 *
-  (*FT_CMap_VariantCharListFunc)( FT_CMap    cmap,
-                                  FT_Memory  mem,
-                                  FT_UInt32  variant_selector );
-
-
-  typedef struct  FT_CMap_ClassRec_
-  {
-    FT_ULong               size;
-    FT_CMap_InitFunc       init;
-    FT_CMap_DoneFunc       done;
-    FT_CMap_CharIndexFunc  char_index;
-    FT_CMap_CharNextFunc   char_next;
-
-    /* Subsequent entries are special ones for format 14 -- the variant */
-    /* selector subtable which behaves like no other                    */
-
-    FT_CMap_CharVarIndexFunc      char_var_index;
-    FT_CMap_CharVarIsDefaultFunc  char_var_default;
-    FT_CMap_VariantListFunc       variant_list;
-    FT_CMap_CharVariantListFunc   charvariant_list;
-    FT_CMap_VariantCharListFunc   variantchar_list;
-
-  } FT_CMap_ClassRec;
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_CMAP_CLASS( class_ )              \
-  FT_CALLBACK_TABLE const  FT_CMap_ClassRec class_;
-
-#define FT_DEFINE_CMAP_CLASS(       \
-          class_,                   \
-          size_,                    \
-          init_,                    \
-          done_,                    \
-          char_index_,              \
-          char_next_,               \
-          char_var_index_,          \
-          char_var_default_,        \
-          variant_list_,            \
-          charvariant_list_,        \
-          variantchar_list_ )       \
-  FT_CALLBACK_TABLE_DEF             \
-  const FT_CMap_ClassRec  class_ =  \
-  {                                 \
-    size_,                          \
-    init_,                          \
-    done_,                          \
-    char_index_,                    \
-    char_next_,                     \
-    char_var_index_,                \
-    char_var_default_,              \
-    variant_list_,                  \
-    charvariant_list_,              \
-    variantchar_list_               \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_CMAP_CLASS( class_ )                  \
-  void                                                   \
-  FT_Init_Class_ ## class_( FT_Library         library,  \
-                            FT_CMap_ClassRec*  clazz );
-
-#define FT_DEFINE_CMAP_CLASS(                            \
-          class_,                                        \
-          size_,                                         \
-          init_,                                         \
-          done_,                                         \
-          char_index_,                                   \
-          char_next_,                                    \
-          char_var_index_,                               \
-          char_var_default_,                             \
-          variant_list_,                                 \
-          charvariant_list_,                             \
-          variantchar_list_ )                            \
-  void                                                   \
-  FT_Init_Class_ ## class_( FT_Library         library,  \
-                            FT_CMap_ClassRec*  clazz )   \
-  {                                                      \
-    FT_UNUSED( library );                                \
-                                                         \
-    clazz->size             = size_;                     \
-    clazz->init             = init_;                     \
-    clazz->done             = done_;                     \
-    clazz->char_index       = char_index_;               \
-    clazz->char_next        = char_next_;                \
-    clazz->char_var_index   = char_var_index_;           \
-    clazz->char_var_default = char_var_default_;         \
-    clazz->variant_list     = variant_list_;             \
-    clazz->charvariant_list = charvariant_list_;         \
-    clazz->variantchar_list = variantchar_list_;         \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /* create a new charmap and add it to charmap->face */
-  FT_BASE( FT_Error )
-  FT_CMap_New( FT_CMap_Class  clazz,
-               FT_Pointer     init_data,
-               FT_CharMap     charmap,
-               FT_CMap       *acmap );
-
-  /* destroy a charmap and remove it from face's list */
-  FT_BASE( void )
-  FT_CMap_Done( FT_CMap  cmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Face_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_Face        */
-  /*    object.  These fields may change between different releases of     */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    max_points ::                                                      */
-  /*      The maximum number of points used to store the vectorial outline */
-  /*      of any glyph in this face.  If this value cannot be known in     */
-  /*      advance, or if the face isn't scalable, this should be set to 0. */
-  /*      Only relevant for scalable formats.                              */
-  /*                                                                       */
-  /*    max_contours ::                                                    */
-  /*      The maximum number of contours used to store the vectorial       */
-  /*      outline of any glyph in this face.  If this value cannot be      */
-  /*      known in advance, or if the face isn't scalable, this should be  */
-  /*      set to 0.  Only relevant for scalable formats.                   */
-  /*                                                                       */
-  /*    transform_matrix ::                                                */
-  /*      A 2x2 matrix of 16.16 coefficients used to transform glyph       */
-  /*      outlines after they are loaded from the font.  Only used by the  */
-  /*      convenience functions.                                           */
-  /*                                                                       */
-  /*    transform_delta ::                                                 */
-  /*      A translation vector used to transform glyph outlines after they */
-  /*      are loaded from the font.  Only used by the convenience          */
-  /*      functions.                                                       */
-  /*                                                                       */
-  /*    transform_flags ::                                                 */
-  /*      Some flags used to classify the transform.  Only used by the     */
-  /*      convenience functions.                                           */
-  /*                                                                       */
-  /*    services ::                                                        */
-  /*      A cache for frequently used services.  It should be only         */
-  /*      accessed with the macro `FT_FACE_LOOKUP_SERVICE'.                */
-  /*                                                                       */
-  /*    incremental_interface ::                                           */
-  /*      If non-null, the interface through which glyph data and metrics  */
-  /*      are loaded incrementally for faces that do not provide all of    */
-  /*      this data when first opened.  This field exists only if          */
-  /*      @FT_CONFIG_OPTION_INCREMENTAL is defined.                        */
-  /*                                                                       */
-  /*    ignore_unpatented_hinter ::                                        */
-  /*      This boolean flag instructs the glyph loader to ignore the       */
-  /*      native font hinter, if one is found.  This is exclusively used   */
-  /*      in the case when the unpatented hinter is compiled within the    */
-  /*      library.                                                         */
-  /*                                                                       */
-  /*    refcount ::                                                        */
-  /*      A counter initialized to~1 at the time an @FT_Face structure is  */
-  /*      created.  @FT_Reference_Face increments this counter, and        */
-  /*      @FT_Done_Face only destroys a face if the counter is~1,          */
-  /*      otherwise it simply decrements it.                               */
-  /*                                                                       */
-  typedef struct  FT_Face_InternalRec_
-  {
-    FT_Matrix           transform_matrix;
-    FT_Vector           transform_delta;
-    FT_Int              transform_flags;
-
-    FT_ServiceCacheRec  services;
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-    FT_Incremental_InterfaceRec*  incremental_interface;
-#endif
-
-    FT_Bool             ignore_unpatented_hinter;
-    FT_Int              refcount;
-
-  } FT_Face_InternalRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Slot_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_GlyphSlot   */
-  /*    object.  These fields may change between different releases of     */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    loader            :: The glyph loader object used to load outlines */
-  /*                         into the glyph slot.                          */
-  /*                                                                       */
-  /*    flags             :: Possible values are zero or                   */
-  /*                         FT_GLYPH_OWN_BITMAP.  The latter indicates    */
-  /*                         that the FT_GlyphSlot structure owns the      */
-  /*                         bitmap buffer.                                */
-  /*                                                                       */
-  /*    glyph_transformed :: Boolean.  Set to TRUE when the loaded glyph   */
-  /*                         must be transformed through a specific        */
-  /*                         font transformation.  This is _not_ the same  */
-  /*                         as the face transform set through             */
-  /*                         FT_Set_Transform().                           */
-  /*                                                                       */
-  /*    glyph_matrix      :: The 2x2 matrix corresponding to the glyph     */
-  /*                         transformation, if necessary.                 */
-  /*                                                                       */
-  /*    glyph_delta       :: The 2d translation vector corresponding to    */
-  /*                         the glyph transformation, if necessary.       */
-  /*                                                                       */
-  /*    glyph_hints       :: Format-specific glyph hints management.       */
-  /*                                                                       */
-
-#define FT_GLYPH_OWN_BITMAP  0x1
-
-  typedef struct  FT_Slot_InternalRec_
-  {
-    FT_GlyphLoader  loader;
-    FT_UInt         flags;
-    FT_Bool         glyph_transformed;
-    FT_Matrix       glyph_matrix;
-    FT_Vector       glyph_delta;
-    void*           glyph_hints;
-
-  } FT_GlyphSlot_InternalRec;
-
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_Size        */
-  /*    object.  Currently, it's empty.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-  typedef struct  FT_Size_InternalRec_
-  {
-    /* empty */
-
-  } FT_Size_InternalRec;
-
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                         M O D U L E S                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ModuleRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A module object instance.                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    clazz   :: A pointer to the module's class.                        */
-  /*                                                                       */
-  /*    library :: A handle to the parent library object.                  */
-  /*                                                                       */
-  /*    memory  :: A handle to the memory manager.                         */
-  /*                                                                       */
-  typedef struct  FT_ModuleRec_
-  {
-    FT_Module_Class*  clazz;
-    FT_Library        library;
-    FT_Memory         memory;
-
-  } FT_ModuleRec;
-
-
-  /* typecast an object to an FT_Module */
-#define FT_MODULE( x )          ((FT_Module)( x ))
-#define FT_MODULE_CLASS( x )    FT_MODULE( x )->clazz
-#define FT_MODULE_LIBRARY( x )  FT_MODULE( x )->library
-#define FT_MODULE_MEMORY( x )   FT_MODULE( x )->memory
-
-
-#define FT_MODULE_IS_DRIVER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_FONT_DRIVER )
-
-#define FT_MODULE_IS_RENDERER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      FT_MODULE_RENDERER )
-
-#define FT_MODULE_IS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_HINTER )
-
-#define FT_MODULE_IS_STYLER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_STYLER )
-
-#define FT_DRIVER_IS_SCALABLE( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      FT_MODULE_DRIVER_SCALABLE )
-
-#define FT_DRIVER_USES_OUTLINES( x )  !( FT_MODULE_CLASS( x )->module_flags & \
-                                         FT_MODULE_DRIVER_NO_OUTLINES )
-
-#define FT_DRIVER_HAS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                     FT_MODULE_DRIVER_HAS_HINTER )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Module_Interface                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Finds a module and returns its specific interface as a typeless    */
-  /*    pointer.                                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object.                     */
-  /*                                                                       */
-  /*    module_name :: The module's name (as an ASCII string).             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A module-specific interface if available, 0 otherwise.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should better be familiar with FreeType internals to know      */
-  /*    which module to look for, and what its interface is :-)            */
-  /*                                                                       */
-  FT_BASE( const void* )
-  FT_Get_Module_Interface( FT_Library   library,
-                           const char*  mod_name );
-
-  FT_BASE( FT_Pointer )
-  ft_module_get_service( FT_Module    module,
-                         const char*  service_id );
-
-  /* */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****   F A C E,   S I Z E   &   G L Y P H   S L O T   O B J E C T S  ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* a few macros used to perform easy typecasts with minimal brain damage */
-
-#define FT_FACE( x )          ((FT_Face)(x))
-#define FT_SIZE( x )          ((FT_Size)(x))
-#define FT_SLOT( x )          ((FT_GlyphSlot)(x))
-
-#define FT_FACE_DRIVER( x )   FT_FACE( x )->driver
-#define FT_FACE_LIBRARY( x )  FT_FACE_DRIVER( x )->root.library
-#define FT_FACE_MEMORY( x )   FT_FACE( x )->memory
-#define FT_FACE_STREAM( x )   FT_FACE( x )->stream
-
-#define FT_SIZE_FACE( x )     FT_SIZE( x )->face
-#define FT_SLOT_FACE( x )     FT_SLOT( x )->face
-
-#define FT_FACE_SLOT( x )     FT_FACE( x )->glyph
-#define FT_FACE_SIZE( x )     FT_FACE( x )->size
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_GlyphSlot                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    It is sometimes useful to have more than one glyph slot for a      */
-  /*    given face object.  This function is used to create additional     */
-  /*    slots.  All of them are automatically discarded when the face is   */
-  /*    destroyed.                                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A handle to a parent face object.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aslot :: A handle to a new glyph slot object.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_New_GlyphSlot( FT_Face        face,
-                    FT_GlyphSlot  *aslot );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_GlyphSlot                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a given glyph slot.  Remember however that all slots are  */
-  /*    automatically destroyed with its parent.  Using this function is   */
-  /*    not always mandatory.                                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot :: A handle to a target glyph slot.                           */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Done_GlyphSlot( FT_GlyphSlot  slot );
-
- /* */
-
-#define FT_REQUEST_WIDTH( req )                                            \
-          ( (req)->horiResolution                                          \
-              ? (FT_Pos)( (req)->width * (req)->horiResolution + 36 ) / 72 \
-              : (req)->width )
-
-#define FT_REQUEST_HEIGHT( req )                                            \
-          ( (req)->vertResolution                                           \
-              ? (FT_Pos)( (req)->height * (req)->vertResolution + 36 ) / 72 \
-              : (req)->height )
-
-
-  /* Set the metrics according to a bitmap strike. */
-  FT_BASE( void )
-  FT_Select_Metrics( FT_Face   face,
-                     FT_ULong  strike_index );
-
-
-  /* Set the metrics according to a size request. */
-  FT_BASE( void )
-  FT_Request_Metrics( FT_Face          face,
-                      FT_Size_Request  req );
-
-
-  /* Match a size request against `available_sizes'. */
-  FT_BASE( FT_Error )
-  FT_Match_Size( FT_Face          face,
-                 FT_Size_Request  req,
-                 FT_Bool          ignore_width,
-                 FT_ULong*        size_index );
-
-
-  /* Use the horizontal metrics to synthesize the vertical metrics. */
-  /* If `advance' is zero, it is also synthesized.                  */
-  FT_BASE( void )
-  ft_synthesize_vertical_metrics( FT_Glyph_Metrics*  metrics,
-                                  FT_Pos             advance );
-
-
-  /* Free the bitmap of a given glyphslot when needed (i.e., only when it */
-  /* was allocated with ft_glyphslot_alloc_bitmap).                       */
-  FT_BASE( void )
-  ft_glyphslot_free_bitmap( FT_GlyphSlot  slot );
-
-
-  /* Allocate a new bitmap buffer in a glyph slot. */
-  FT_BASE( FT_Error )
-  ft_glyphslot_alloc_bitmap( FT_GlyphSlot  slot,
-                             FT_ULong      size );
-
-
-  /* Set the bitmap buffer in a glyph slot to a given pointer.  The buffer */
-  /* will not be freed by a later call to ft_glyphslot_free_bitmap.        */
-  FT_BASE( void )
-  ft_glyphslot_set_bitmap( FT_GlyphSlot  slot,
-                           FT_Byte*      buffer );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                        R E N D E R E R S                        ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#define FT_RENDERER( x )      ((FT_Renderer)( x ))
-#define FT_GLYPH( x )         ((FT_Glyph)( x ))
-#define FT_BITMAP_GLYPH( x )  ((FT_BitmapGlyph)( x ))
-#define FT_OUTLINE_GLYPH( x ) ((FT_OutlineGlyph)( x ))
-
-
-  typedef struct  FT_RendererRec_
-  {
-    FT_ModuleRec            root;
-    FT_Renderer_Class*      clazz;
-    FT_Glyph_Format         glyph_format;
-    FT_Glyph_Class          glyph_class;
-
-    FT_Raster               raster;
-    FT_Raster_Render_Func   raster_render;
-    FT_Renderer_RenderFunc  render;
-
-  } FT_RendererRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                    F O N T   D R I V E R S                      ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* typecast a module into a driver easily */
-#define FT_DRIVER( x )        ((FT_Driver)(x))
-
-  /* typecast a module as a driver, and get its driver class */
-#define FT_DRIVER_CLASS( x )  FT_DRIVER( x )->clazz
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_DriverRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The root font driver class.  A font driver is responsible for      */
-  /*    managing and loading font files of a given format.                 */
-  /*                                                                       */
-  /*  <Fields>                                                             */
-  /*     root         :: Contains the fields of the root module class.     */
-  /*                                                                       */
-  /*     clazz        :: A pointer to the font driver's class.  Note that  */
-  /*                     this is NOT root.clazz.  `class' wasn't used      */
-  /*                     as it is a reserved word in C++.                  */
-  /*                                                                       */
-  /*     faces_list   :: The list of faces currently opened by this        */
-  /*                     driver.                                           */
-  /*                                                                       */
-  /*     glyph_loader :: The glyph loader for all faces managed by this    */
-  /*                     driver.  This object isn't defined for unscalable */
-  /*                     formats.                                          */
-  /*                                                                       */
-  typedef struct  FT_DriverRec_
-  {
-    FT_ModuleRec     root;
-    FT_Driver_Class  clazz;
-    FT_ListRec       faces_list;
-    FT_GlyphLoader   glyph_loader;
-
-  } FT_DriverRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                       L I B R A R I E S                         ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* This hook is used by the TrueType debugger.  It must be set to an */
-  /* alternate truetype bytecode interpreter function.                 */
-#define FT_DEBUG_HOOK_TRUETYPE            0
-
-
-  /* Set this debug hook to a non-null pointer to force unpatented hinting */
-  /* for all faces when both TT_USE_BYTECODE_INTERPRETER and               */
-  /* TT_CONFIG_OPTION_UNPATENTED_HINTING are defined.  This is only used   */
-  /* during debugging.                                                     */
-#define FT_DEBUG_HOOK_UNPATENTED_HINTING  1
-
-
-  typedef void  (*FT_Bitmap_LcdFilterFunc)( FT_Bitmap*      bitmap,
-                                            FT_Render_Mode  render_mode,
-                                            FT_Library      library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_LibraryRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The FreeType library class.  This is the root of all FreeType      */
-  /*    data.  Use FT_New_Library() to create a library object, and        */
-  /*    FT_Done_Library() to discard it and all child objects.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory           :: The library's memory object.  Manages memory   */
-  /*                        allocation.                                    */
-  /*                                                                       */
-  /*    version_major    :: The major version number of the library.       */
-  /*                                                                       */
-  /*    version_minor    :: The minor version number of the library.       */
-  /*                                                                       */
-  /*    version_patch    :: The current patch level of the library.        */
-  /*                                                                       */
-  /*    num_modules      :: The number of modules currently registered     */
-  /*                        within this library.  This is set to 0 for new */
-  /*                        libraries.  New modules are added through the  */
-  /*                        FT_Add_Module() API function.                  */
-  /*                                                                       */
-  /*    modules          :: A table used to store handles to the currently */
-  /*                        registered modules. Note that each font driver */
-  /*                        contains a list of its opened faces.           */
-  /*                                                                       */
-  /*    renderers        :: The list of renderers currently registered     */
-  /*                        within the library.                            */
-  /*                                                                       */
-  /*    cur_renderer     :: The current outline renderer.  This is a       */
-  /*                        shortcut used to avoid parsing the list on     */
-  /*                        each call to FT_Outline_Render().  It is a     */
-  /*                        handle to the current renderer for the         */
-  /*                        FT_GLYPH_FORMAT_OUTLINE format.                */
-  /*                                                                       */
-  /*    auto_hinter      :: XXX                                            */
-  /*                                                                       */
-  /*    raster_pool      :: The raster object's render pool.  This can     */
-  /*                        ideally be changed dynamically at run-time.    */
-  /*                                                                       */
-  /*    raster_pool_size :: The size of the render pool in bytes.          */
-  /*                                                                       */
-  /*    debug_hooks      :: XXX                                            */
-  /*                                                                       */
-  /*    lcd_filter       :: If subpixel rendering is activated, the        */
-  /*                        selected LCD filter mode.                      */
-  /*                                                                       */
-  /*    lcd_extra        :: If subpixel rendering is activated, the number */
-  /*                        of extra pixels needed for the LCD filter.     */
-  /*                                                                       */
-  /*    lcd_weights      :: If subpixel rendering is activated, the LCD    */
-  /*                        filter weights, if any.                        */
-  /*                                                                       */
-  /*    lcd_filter_func  :: If subpixel rendering is activated, the LCD    */
-  /*                        filtering callback function.                   */
-  /*                                                                       */
-  /*    pic_container    :: Contains global structs and tables, instead    */
-  /*                        of defining them globallly.                    */
-  /*                                                                       */
-  /*    refcount         :: A counter initialized to~1 at the time an      */
-  /*                        @FT_Library structure is created.              */
-  /*                        @FT_Reference_Library increments this counter, */
-  /*                        and @FT_Done_Library only destroys a library   */
-  /*                        if the counter is~1, otherwise it simply       */
-  /*                        decrements it.                                 */
-  /*                                                                       */
-  typedef struct  FT_LibraryRec_
-  {
-    FT_Memory          memory;           /* library's memory manager */
-
-    FT_Int             version_major;
-    FT_Int             version_minor;
-    FT_Int             version_patch;
-
-    FT_UInt            num_modules;
-    FT_Module          modules[FT_MAX_MODULES];  /* module objects  */
-
-    FT_ListRec         renderers;        /* list of renderers        */
-    FT_Renderer        cur_renderer;     /* current outline renderer */
-    FT_Module          auto_hinter;
-
-    FT_Byte*           raster_pool;      /* scan-line conversion */
-                                         /* render pool          */
-    FT_ULong           raster_pool_size; /* size of render pool in bytes */
-
-    FT_DebugHook_Func  debug_hooks[4];
-
-#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-    FT_LcdFilter             lcd_filter;
-    FT_Int                   lcd_extra;        /* number of extra pixels */
-    FT_Byte                  lcd_weights[7];   /* filter weights, if any */
-    FT_Bitmap_LcdFilterFunc  lcd_filter_func;  /* filtering callback     */
-#endif
-
-#ifdef FT_CONFIG_OPTION_PIC
-    FT_PIC_Container   pic_container;
-#endif
-
-    FT_Int             refcount;
-
-  } FT_LibraryRec;
-
-
-  FT_BASE( FT_Renderer )
-  FT_Lookup_Renderer( FT_Library       library,
-                      FT_Glyph_Format  format,
-                      FT_ListNode*     node );
-
-  FT_BASE( FT_Error )
-  FT_Render_Glyph_Internal( FT_Library      library,
-                            FT_GlyphSlot    slot,
-                            FT_Render_Mode  render_mode );
-
-  typedef const char*
-  (*FT_Face_GetPostscriptNameFunc)( FT_Face  face );
-
-  typedef FT_Error
-  (*FT_Face_GetGlyphNameFunc)( FT_Face     face,
-                               FT_UInt     glyph_index,
-                               FT_Pointer  buffer,
-                               FT_UInt     buffer_max );
-
-  typedef FT_UInt
-  (*FT_Face_GetGlyphNameIndexFunc)( FT_Face     face,
-                                    FT_String*  glyph_name );
-
-
-#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Memory                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new memory object.                                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to the new memory object.  0 in case of error.           */
-  /*                                                                       */
-  FT_BASE( FT_Memory )
-  FT_New_Memory( void );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Memory                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards memory manager.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory manager.                          */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Done_Memory( FT_Memory  memory );
-
-#endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
-
-
-  /* Define default raster's interface.  The default raster is located in  */
-  /* `src/base/ftraster.c'.                                                */
-  /*                                                                       */
-  /* Client applications can register new rasters through the              */
-  /* FT_Set_Raster() API.                                                  */
-
-#ifndef FT_NO_DEFAULT_RASTER
-  FT_EXPORT_VAR( FT_Raster_Funcs )  ft_default_raster;
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                      P I C   S U P P O R T                      ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* PIC support macros for ftimage.h */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_OUTLINE_FUNCS                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Outline_Funcs struct.         */
-  /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
-  /*    be called with a pre-allocated structure to be filled.             */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_OUTLINE_FUNCS(           \
-          class_,                          \
-          move_to_,                        \
-          line_to_,                        \
-          conic_to_,                       \
-          cubic_to_,                       \
-          shift_,                          \
-          delta_ )                         \
-  static const  FT_Outline_Funcs class_ =  \
-  {                                        \
-    move_to_,                              \
-    line_to_,                              \
-    conic_to_,                             \
-    cubic_to_,                             \
-    shift_,                                \
-    delta_                                 \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_OUTLINE_FUNCS(                     \
-          class_,                                    \
-          move_to_,                                  \
-          line_to_,                                  \
-          conic_to_,                                 \
-          cubic_to_,                                 \
-          shift_,                                    \
-          delta_ )                                   \
-  static FT_Error                                    \
-  Init_Class_ ## class_( FT_Outline_Funcs*  clazz )  \
-  {                                                  \
-    clazz->move_to  = move_to_;                      \
-    clazz->line_to  = line_to_;                      \
-    clazz->conic_to = conic_to_;                     \
-    clazz->cubic_to = cubic_to_;                     \
-    clazz->shift    = shift_;                        \
-    clazz->delta    = delta_;                        \
-                                                     \
-    return FT_Err_Ok;                                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_RASTER_FUNCS                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Raster_Funcs struct.          */
-  /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
-  /*    be called with a pre-allocated structure to be filled.             */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_RASTER_FUNCS(    \
-          class_,                  \
-          glyph_format_,           \
-          raster_new_,             \
-          raster_reset_,           \
-          raster_set_mode_,        \
-          raster_render_,          \
-          raster_done_ )           \
-  const FT_Raster_Funcs  class_ =  \
-  {                                \
-    glyph_format_,                 \
-    raster_new_,                   \
-    raster_reset_,                 \
-    raster_set_mode_,              \
-    raster_render_,                \
-    raster_done_                   \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_RASTER_FUNCS(                        \
-          class_,                                      \
-          glyph_format_,                               \
-          raster_new_,                                 \
-          raster_reset_,                               \
-          raster_set_mode_,                            \
-          raster_render_,                              \
-          raster_done_ )                               \
-  void                                                 \
-  FT_Init_Class_ ## class_( FT_Raster_Funcs*  clazz )  \
-  {                                                    \
-    clazz->glyph_format    = glyph_format_;            \
-    clazz->raster_new      = raster_new_;              \
-    clazz->raster_reset    = raster_reset_;            \
-    clazz->raster_set_mode = raster_set_mode_;         \
-    clazz->raster_render   = raster_render_;           \
-    clazz->raster_done     = raster_done_;             \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /* PIC support macros for ftrender.h */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_GLYPH                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Glyph_Class struct.           */
-  /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
-  /*    be called with a pre-allocated stcture to be filled.               */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_GLYPH(          \
-          class_,                 \
-          size_,                  \
-          format_,                \
-          init_,                  \
-          done_,                  \
-          copy_,                  \
-          transform_,             \
-          bbox_,                  \
-          prepare_ )              \
-  FT_CALLBACK_TABLE_DEF           \
-  const FT_Glyph_Class  class_ =  \
-  {                               \
-    size_,                        \
-    format_,                      \
-    init_,                        \
-    done_,                        \
-    copy_,                        \
-    transform_,                   \
-    bbox_,                        \
-    prepare_                      \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_GLYPH(                              \
-          class_,                                     \
-          size_,                                      \
-          format_,                                    \
-          init_,                                      \
-          done_,                                      \
-          copy_,                                      \
-          transform_,                                 \
-          bbox_,                                      \
-          prepare_ )                                  \
-  void                                                \
-  FT_Init_Class_ ## class_( FT_Glyph_Class*  clazz )  \
-  {                                                   \
-    clazz->glyph_size      = size_;                   \
-    clazz->glyph_format    = format_;                 \
-    clazz->glyph_init      = init_;                   \
-    clazz->glyph_done      = done_;                   \
-    clazz->glyph_copy      = copy_;                   \
-    clazz->glyph_transform = transform_;              \
-    clazz->glyph_bbox      = bbox_;                   \
-    clazz->glyph_prepare   = prepare_;                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DECLARE_RENDERER                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to create a forward declaration of a                          */
-  /*    FT_Renderer_Class struct instance.                                 */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_RENDERER                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Renderer_Class struct.        */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' funtion will need  */
-  /*    to be called with a pointer where the allocated structure is       */
-  /*    returned.  And when it is no longer needed a `destroy' function    */
-  /*    needs to be called to release that allocation.                     */
-  /*    `fcinit.c' (ft_create_default_module_classes) already contains     */
-  /*    a mechanism to call these functions for the default modules        */
-  /*    described in `ftmodule.h'.                                         */
-  /*                                                                       */
-  /*    Notice that the created `create' and `destroy' functions call      */
-  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
-  /*    initialize any additional global data, like a module specific      */
-  /*    interface, and put them in the global pic container defined in     */
-  /*    `ftpic.h'.  If you don't need them just implement the functions as */
-  /*    empty to resolve the link error.  Also the `pic_init' and          */
-  /*    `pic_free' functions should be declared in `pic.h', to be referred */
-  /*    by the renderer definition calling `FT_DEFINE_RENDERER' in the     */
-  /*    following.                                                         */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_RENDERER( class_ )               \
-  FT_EXPORT_VAR( const FT_Renderer_Class ) class_;
-
-#define FT_DEFINE_RENDERER(                  \
-          class_,                            \
-          flags_,                            \
-          size_,                             \
-          name_,                             \
-          version_,                          \
-          requires_,                         \
-          interface_,                        \
-          init_,                             \
-          done_,                             \
-          get_interface_,                    \
-          glyph_format_,                     \
-          render_glyph_,                     \
-          transform_glyph_,                  \
-          get_glyph_cbox_,                   \
-          set_mode_,                         \
-          raster_class_ )                    \
-  FT_CALLBACK_TABLE_DEF                      \
-  const FT_Renderer_Class  class_ =          \
-  {                                          \
-    FT_DEFINE_ROOT_MODULE( flags_,           \
-                           size_,            \
-                           name_,            \
-                           version_,         \
-                           requires_,        \
-                           interface_,       \
-                           init_,            \
-                           done_,            \
-                           get_interface_ )  \
-    glyph_format_,                           \
-                                             \
-    render_glyph_,                           \
-    transform_glyph_,                        \
-    get_glyph_cbox_,                         \
-    set_mode_,                               \
-                                             \
-    raster_class_                            \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_RENDERER( class_ )  FT_DECLARE_MODULE( class_ )
-
-#define FT_DEFINE_RENDERER(                                      \
-          class_,                                                \
-          flags_,                                                \
-          size_,                                                 \
-          name_,                                                 \
-          version_,                                              \
-          requires_,                                             \
-          interface_,                                            \
-          init_,                                                 \
-          done_,                                                 \
-          get_interface_,                                        \
-          glyph_format_,                                         \
-          render_glyph_,                                         \
-          transform_glyph_,                                      \
-          get_glyph_cbox_,                                       \
-          set_mode_,                                             \
-          raster_class_ )                                        \
-  void                                                           \
-  FT_Destroy_Class_ ## class_( FT_Library        library,        \
-                               FT_Module_Class*  clazz )         \
-  {                                                              \
-    FT_Renderer_Class*  rclazz = (FT_Renderer_Class*)clazz;      \
-    FT_Memory           memory = library->memory;                \
-                                                                 \
-                                                                 \
-    class_ ## _pic_free( library );                              \
-    if ( rclazz )                                                \
-      FT_FREE( rclazz );                                         \
-  }                                                              \
-                                                                 \
-                                                                 \
-  FT_Error                                                       \
-  FT_Create_Class_ ## class_( FT_Library         library,        \
-                              FT_Module_Class**  output_class )  \
-  {                                                              \
-    FT_Renderer_Class*  clazz = NULL;                            \
-    FT_Error            error;                                   \
-    FT_Memory           memory = library->memory;                \
-                                                                 \
-                                                                 \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
-      return error;                                              \
-                                                                 \
-    error = class_ ## _pic_init( library );                      \
-    if ( error )                                                 \
-    {                                                            \
-      FT_FREE( clazz );                                          \
-      return error;                                              \
-    }                                                            \
-                                                                 \
-    FT_DEFINE_ROOT_MODULE( flags_,                               \
-                           size_,                                \
-                           name_,                                \
-                           version_,                             \
-                           requires_,                            \
-                           interface_,                           \
-                           init_,                                \
-                           done_,                                \
-                           get_interface_ )                      \
-                                                                 \
-    clazz->glyph_format    = glyph_format_;                      \
-                                                                 \
-    clazz->render_glyph    = render_glyph_;                      \
-    clazz->transform_glyph = transform_glyph_;                   \
-    clazz->get_glyph_cbox  = get_glyph_cbox_;                    \
-    clazz->set_mode        = set_mode_;                          \
-                                                                 \
-    clazz->raster_class    = raster_class_;                      \
-                                                                 \
-    *output_class = (FT_Module_Class*)clazz;                     \
-                                                                 \
-    return FT_Err_Ok;                                            \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /* PIC support macros for ftmodapi.h **/
-
-
-#ifdef FT_CONFIG_OPTION_PIC
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Creator                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to create (allocate) a new module class object.    */
-  /*    The object's members are initialized, but the module itself is     */
-  /*    not.                                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory       :: A handle to the memory manager.                    */
-  /*    output_class :: Initialized with the newly allocated class.        */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_Module_Creator)( FT_Memory          memory,
-                        FT_Module_Class**  output_class );
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Destroyer                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to destroy (deallocate) a module class object.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory manager.                          */
-  /*    clazz  :: Module class to destroy.                                 */
-  /*                                                                       */
-  typedef void
-  (*FT_Module_Destroyer)( FT_Memory         memory,
-                          FT_Module_Class*  clazz );
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DECLARE_MODULE                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to create a forward declaration of a                          */
-  /*    FT_Module_Class struct instance.                                   */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_MODULE                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of an FT_Module_Class struct.       */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' funtion needs to   */
-  /*    be called with a pointer where the allocated structure is          */
-  /*    returned.  And when it is no longer needed a `destroy' function    */
-  /*    needs to be called to release that allocation.                     */
-  /*    `fcinit.c' (ft_create_default_module_classes) already contains     */
-  /*    a mechanism to call these functions for the default modules        */
-  /*    described in `ftmodule.h'.                                         */
-  /*                                                                       */
-  /*    Notice that the created `create' and `destroy' functions call      */
-  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
-  /*    initialize any additional global data, like a module specific      */
-  /*    interface, and put them in the global pic container defined in     */
-  /*    `ftpic.h'.  If you don't need them just implement the functions as */
-  /*    empty to resolve the link error.  Also the `pic_init' and          */
-  /*    `pic_free' functions should be declared in `pic.h', to be referred */
-  /*    by the module definition calling `FT_DEFINE_MODULE' in the         */
-  /*    following.                                                         */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_ROOT_MODULE                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of an FT_Module_Class struct inside */
-  /*    another struct that contains it or in a function that initializes  */
-  /*    that containing struct.                                            */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_MODULE( class_ )  \
-  FT_CALLBACK_TABLE                  \
-  const FT_Module_Class  class_;
-
-#define FT_DEFINE_ROOT_MODULE(  \
-          flags_,               \
-          size_,                \
-          name_,                \
-          version_,             \
-          requires_,            \
-          interface_,           \
-          init_,                \
-          done_,                \
-          get_interface_ )      \
-  {                             \
-    flags_,                     \
-    size_,                      \
-                                \
-    name_,                      \
-    version_,                   \
-    requires_,                  \
-                                \
-    interface_,                 \
-                                \
-    init_,                      \
-    done_,                      \
-    get_interface_,             \
-  },
-
-#define FT_DEFINE_MODULE(         \
-          class_,                 \
-          flags_,                 \
-          size_,                  \
-          name_,                  \
-          version_,               \
-          requires_,              \
-          interface_,             \
-          init_,                  \
-          done_,                  \
-          get_interface_ )        \
-  FT_CALLBACK_TABLE_DEF           \
-  const FT_Module_Class class_ =  \
-  {                               \
-    flags_,                       \
-    size_,                        \
-                                  \
-    name_,                        \
-    version_,                     \
-    requires_,                    \
-                                  \
-    interface_,                   \
-                                  \
-    init_,                        \
-    done_,                        \
-    get_interface_,               \
-  };
-
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_MODULE( class_ )                               \
-  FT_Error                                                        \
-  FT_Create_Class_ ## class_( FT_Library         library,         \
-                              FT_Module_Class**  output_class );  \
-  void                                                            \
-  FT_Destroy_Class_ ## class_( FT_Library        library,         \
-                               FT_Module_Class*  clazz );
-
-#define FT_DEFINE_ROOT_MODULE(                      \
-          flags_,                                   \
-          size_,                                    \
-          name_,                                    \
-          version_,                                 \
-          requires_,                                \
-          interface_,                               \
-          init_,                                    \
-          done_,                                    \
-          get_interface_ )                          \
-    clazz->root.module_flags     = flags_;          \
-    clazz->root.module_size      = size_;           \
-    clazz->root.module_name      = name_;           \
-    clazz->root.module_version   = version_;        \
-    clazz->root.module_requires  = requires_;       \
-                                                    \
-    clazz->root.module_interface = interface_;      \
-                                                    \
-    clazz->root.module_init      = init_;           \
-    clazz->root.module_done      = done_;           \
-    clazz->root.get_interface    = get_interface_;
-
-#define FT_DEFINE_MODULE(                                        \
-          class_,                                                \
-          flags_,                                                \
-          size_,                                                 \
-          name_,                                                 \
-          version_,                                              \
-          requires_,                                             \
-          interface_,                                            \
-          init_,                                                 \
-          done_,                                                 \
-          get_interface_ )                                       \
-  void                                                           \
-  FT_Destroy_Class_ ## class_( FT_Library        library,        \
-                               FT_Module_Class*  clazz )         \
-  {                                                              \
-    FT_Memory memory = library->memory;                          \
-                                                                 \
-                                                                 \
-    class_ ## _pic_free( library );                              \
-    if ( clazz )                                                 \
-      FT_FREE( clazz );                                          \
-  }                                                              \
-                                                                 \
-                                                                 \
-  FT_Error                                                       \
-  FT_Create_Class_ ## class_( FT_Library         library,        \
-                              FT_Module_Class**  output_class )  \
-  {                                                              \
-    FT_Memory         memory = library->memory;                  \
-    FT_Module_Class*  clazz  = NULL;                             \
-    FT_Error          error;                                     \
-                                                                 \
-                                                                 \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
-      return error;                                              \
-    error = class_ ## _pic_init( library );                      \
-    if ( error )                                                 \
-    {                                                            \
-      FT_FREE( clazz );                                          \
-      return error;                                              \
-    }                                                            \
-                                                                 \
-    clazz->module_flags     = flags_;                            \
-    clazz->module_size      = size_;                             \
-    clazz->module_name      = name_;                             \
-    clazz->module_version   = version_;                          \
-    clazz->module_requires  = requires_;                         \
-                                                                 \
-    clazz->module_interface = interface_;                        \
-                                                                 \
-    clazz->module_init      = init_;                             \
-    clazz->module_done      = done_;                             \
-    clazz->get_interface    = get_interface_;                    \
-                                                                 \
-    *output_class = clazz;                                       \
-                                                                 \
-    return FT_Err_Ok;                                            \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-FT_END_HEADER
-
-#endif /* __FTOBJS_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/fttrace.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/fttrace.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/fttrace.h	(copie de travail)
@@ -1,152 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttrace.h                                                              */
-/*                                                                         */
-/*    Tracing handling (specification only).                               */
-/*                                                                         */
-/*  Copyright 2002, 2004-2007, 2009, 2011-2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /* definitions of trace levels for FreeType 2 */
-
-  /* the first level must always be `trace_any' */
-FT_TRACE_DEF( any )
-
-  /* base components */
-FT_TRACE_DEF( calc )      /* calculations            (ftcalc.c)   */
-FT_TRACE_DEF( memory )    /* memory manager          (ftobjs.c)   */
-FT_TRACE_DEF( stream )    /* stream manager          (ftstream.c) */
-FT_TRACE_DEF( io )        /* i/o interface           (ftsystem.c) */
-FT_TRACE_DEF( list )      /* list management         (ftlist.c)   */
-FT_TRACE_DEF( init )      /* initialization          (ftinit.c)   */
-FT_TRACE_DEF( objs )      /* base objects            (ftobjs.c)   */
-FT_TRACE_DEF( outline )   /* outline management      (ftoutln.c)  */
-FT_TRACE_DEF( glyph )     /* glyph management        (ftglyph.c)  */
-FT_TRACE_DEF( gloader )   /* glyph loader            (ftgloadr.c) */
-
-FT_TRACE_DEF( raster )    /* monochrome rasterizer   (ftraster.c) */
-FT_TRACE_DEF( smooth )    /* anti-aliasing raster    (ftgrays.c)  */
-FT_TRACE_DEF( mm )        /* MM interface            (ftmm.c)     */
-FT_TRACE_DEF( raccess )   /* resource fork accessor  (ftrfork.c)  */
-FT_TRACE_DEF( synth )     /* bold/slant synthesizer  (ftsynth.c)  */
-FT_TRACE_DEF( bitmap )    /* bitmap checksum         (ftobjs.c)   */
-
-  /* Cache sub-system */
-FT_TRACE_DEF( cache )     /* cache sub-system        (ftcache.c, etc.) */
-
-  /* SFNT driver components */
-FT_TRACE_DEF( sfdriver )  /* SFNT font driver        (sfdriver.c) */
-FT_TRACE_DEF( sfobjs )    /* SFNT object handler     (sfobjs.c)   */
-FT_TRACE_DEF( ttcmap )    /* charmap handler         (ttcmap.c)   */
-FT_TRACE_DEF( ttkern )    /* kerning handler         (ttkern.c)   */
-FT_TRACE_DEF( ttload )    /* basic TrueType tables   (ttload.c)   */
-FT_TRACE_DEF( ttmtx )     /* metrics-related tables  (ttmtx.c)    */
-FT_TRACE_DEF( ttpost )    /* PS table processing     (ttpost.c)   */
-FT_TRACE_DEF( ttsbit )    /* TrueType sbit handling  (ttsbit.c)   */
-FT_TRACE_DEF( ttbdf )     /* TrueType embedded BDF   (ttbdf.c)    */
-
-  /* TrueType driver components */
-FT_TRACE_DEF( ttdriver )  /* TT font driver          (ttdriver.c) */
-FT_TRACE_DEF( ttgload )   /* TT glyph loader         (ttgload.c)  */
-FT_TRACE_DEF( ttinterp )  /* bytecode interpreter    (ttinterp.c) */
-FT_TRACE_DEF( ttobjs )    /* TT objects manager      (ttobjs.c)   */
-FT_TRACE_DEF( ttpload )   /* TT data/program loader  (ttpload.c)  */
-FT_TRACE_DEF( ttgxvar )   /* TrueType GX var handler (ttgxvar.c)  */
-
-  /* Type 1 driver components */
-FT_TRACE_DEF( t1afm )
-FT_TRACE_DEF( t1driver )
-FT_TRACE_DEF( t1gload )
-FT_TRACE_DEF( t1hint )
-FT_TRACE_DEF( t1load )
-FT_TRACE_DEF( t1objs )
-FT_TRACE_DEF( t1parse )
-
-  /* PostScript helper module `psaux' */
-FT_TRACE_DEF( t1decode )
-FT_TRACE_DEF( psobjs )
-FT_TRACE_DEF( psconv )
-
-  /* PostScript hinting module `pshinter' */
-FT_TRACE_DEF( pshrec )
-FT_TRACE_DEF( pshalgo1 )
-FT_TRACE_DEF( pshalgo2 )
-
-  /* Type 2 driver components */
-FT_TRACE_DEF( cffdriver )
-FT_TRACE_DEF( cffgload )
-FT_TRACE_DEF( cffload )
-FT_TRACE_DEF( cffobjs )
-FT_TRACE_DEF( cffparse )
-
-FT_TRACE_DEF( cf2blues )
-FT_TRACE_DEF( cf2hints )
-FT_TRACE_DEF( cf2interp )
-
-  /* Type 42 driver component */
-FT_TRACE_DEF( t42 )
-
-  /* CID driver components */
-FT_TRACE_DEF( cidafm )
-FT_TRACE_DEF( ciddriver )
-FT_TRACE_DEF( cidgload )
-FT_TRACE_DEF( cidload )
-FT_TRACE_DEF( cidobjs )
-FT_TRACE_DEF( cidparse )
-
-  /* Windows font component */
-FT_TRACE_DEF( winfnt )
-
-  /* PCF font components */
-FT_TRACE_DEF( pcfdriver )
-FT_TRACE_DEF( pcfread )
-
-  /* BDF font components */
-FT_TRACE_DEF( bdfdriver )
-FT_TRACE_DEF( bdflib )
-
-  /* PFR font component */
-FT_TRACE_DEF( pfr )
-
-  /* OpenType validation components */
-FT_TRACE_DEF( otvmodule )
-FT_TRACE_DEF( otvcommon )
-FT_TRACE_DEF( otvbase )
-FT_TRACE_DEF( otvgdef )
-FT_TRACE_DEF( otvgpos )
-FT_TRACE_DEF( otvgsub )
-FT_TRACE_DEF( otvjstf )
-FT_TRACE_DEF( otvmath )
-
-  /* TrueTypeGX/AAT validation components */
-FT_TRACE_DEF( gxvmodule )
-FT_TRACE_DEF( gxvcommon )
-FT_TRACE_DEF( gxvfeat )
-FT_TRACE_DEF( gxvmort )
-FT_TRACE_DEF( gxvmorx )
-FT_TRACE_DEF( gxvbsln )
-FT_TRACE_DEF( gxvjust )
-FT_TRACE_DEF( gxvkern )
-FT_TRACE_DEF( gxvopbd )
-FT_TRACE_DEF( gxvtrak )
-FT_TRACE_DEF( gxvprop )
-FT_TRACE_DEF( gxvlcar )
-
-  /* autofit components */
-FT_TRACE_DEF( afmodule )
-FT_TRACE_DEF( afhints )
-FT_TRACE_DEF( afcjk )
-FT_TRACE_DEF( aflatin )
-FT_TRACE_DEF( aflatin2 )
-FT_TRACE_DEF( afwarp )
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/pshints.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/pshints.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/pshints.h	(copie de travail)
@@ -1,722 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshints.h                                                              */
-/*                                                                         */
-/*    Interface to Postscript-specific (Type 1 and Type 2) hints           */
-/*    recorders (specification only).  These are used to support native    */
-/*    T1/T2 hints in the `type1', `cid', and `cff' font drivers.           */
-/*                                                                         */
-/*  Copyright 2001-2003, 2005-2007, 2009, 2012 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSHINTS_H__
-#define __PSHINTS_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_TYPE1_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****               INTERNAL REPRESENTATION OF GLOBALS              *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct PSH_GlobalsRec_*  PSH_Globals;
-
-  typedef FT_Error
-  (*PSH_Globals_NewFunc)( FT_Memory     memory,
-                          T1_Private*   private_dict,
-                          PSH_Globals*  aglobals );
-
-  typedef FT_Error
-  (*PSH_Globals_SetScaleFunc)( PSH_Globals  globals,
-                               FT_Fixed     x_scale,
-                               FT_Fixed     y_scale,
-                               FT_Fixed     x_delta,
-                               FT_Fixed     y_delta );
-
-  typedef void
-  (*PSH_Globals_DestroyFunc)( PSH_Globals  globals );
-
-
-  typedef struct  PSH_Globals_FuncsRec_
-  {
-    PSH_Globals_NewFunc       create;
-    PSH_Globals_SetScaleFunc  set_scale;
-    PSH_Globals_DestroyFunc   destroy;
-
-  } PSH_Globals_FuncsRec, *PSH_Globals_Funcs;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  PUBLIC TYPE 1 HINTS RECORDER                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T1_Hints
-   *
-   * @description:
-   *   This is a handle to an opaque structure used to record glyph hints
-   *   from a Type 1 character glyph character string.
-   *
-   *   The methods used to operate on this object are defined by the
-   *   @T1_Hints_FuncsRec structure.  Recording glyph hints is normally
-   *   achieved through the following scheme:
-   *
-   *   - Open a new hint recording session by calling the `open' method.
-   *     This rewinds the recorder and prepare it for new input.
-   *
-   *   - For each hint found in the glyph charstring, call the corresponding
-   *     method (`stem', `stem3', or `reset').  Note that these functions do
-   *     not return an error code.
-   *
-   *   - Close the recording session by calling the `close' method.  It
-   *     returns an error code if the hints were invalid or something
-   *     strange happened (e.g., memory shortage).
-   *
-   *   The hints accumulated in the object can later be used by the
-   *   PostScript hinter.
-   *
-   */
-  typedef struct T1_HintsRec_*  T1_Hints;
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T1_Hints_Funcs
-   *
-   * @description:
-   *   A pointer to the @T1_Hints_FuncsRec structure that defines the API of
-   *   a given @T1_Hints object.
-   *
-   */
-  typedef const struct T1_Hints_FuncsRec_*  T1_Hints_Funcs;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_OpenFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to prepare it for a new Type 1
-   *   hints recording session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   * @note:
-   *   You should always call the @T1_Hints_CloseFunc method in order to
-   *   close an opened recording session.
-   *
-   */
-  typedef void
-  (*T1_Hints_OpenFunc)( T1_Hints  hints );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_SetStemFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to record a new horizontal or
-   *   vertical stem.  This corresponds to the Type 1 `hstem' and `vstem'
-   *   operators.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   dimension ::
-   *     0 for horizontal stems (hstem), 1 for vertical ones (vstem).
-   *
-   *   coords ::
-   *     Array of 2 coordinates in 16.16 format, used as (position,length)
-   *     stem descriptor.
-   *
-   * @note:
-   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
-   *   horizontal coordinates (x) for vertical stems (dim=1).
-   *
-   *   `coords[0]' is the absolute stem position (lowest coordinate);
-   *   `coords[1]' is the length.
-   *
-   *   The length can be negative, in which case it must be either -20 or
-   *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
-   *   specification.
-   *
-   *   If the length is -21 (corresponding to a bottom ghost stem), then
-   *   the real stem position is `coords[0]+coords[1]'.
-   *
-   */
-  typedef void
-  (*T1_Hints_SetStemFunc)( T1_Hints   hints,
-                           FT_UInt    dimension,
-                           FT_Fixed*  coords );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_SetStem3Func
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to record three
-   *   counter-controlled horizontal or vertical stems at once.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   dimension ::
-   *     0 for horizontal stems, 1 for vertical ones.
-   *
-   *   coords ::
-   *     An array of 6 values in 16.16 format, holding 3 (position,length)
-   *     pairs for the counter-controlled stems.
-   *
-   * @note:
-   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
-   *   horizontal coordinates (x) for vertical stems (dim=1).
-   *
-   *   The lengths cannot be negative (ghost stems are never
-   *   counter-controlled).
-   *
-   */
-  typedef void
-  (*T1_Hints_SetStem3Func)( T1_Hints   hints,
-                            FT_UInt    dimension,
-                            FT_Fixed*  coords );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_ResetFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to reset the stems hints in a
-   *   recording session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   end_point ::
-   *     The index of the last point in the input glyph in which the
-   *     previously defined hints apply.
-   *
-   */
-  typedef void
-  (*T1_Hints_ResetFunc)( T1_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_CloseFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to close a hint recording
-   *   session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   end_point ::
-   *     The index of the last point in the input glyph.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   The error code is set to indicate that an error occurred during the
-   *   recording session.
-   *
-   */
-  typedef FT_Error
-  (*T1_Hints_CloseFunc)( T1_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_ApplyFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to apply hints to the
-   *   corresponding glyph outline.  Must be called once all hints have been
-   *   recorded.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   outline ::
-   *     A pointer to the target outline descriptor.
-   *
-   *   globals ::
-   *     The hinter globals for this font.
-   *
-   *   hint_mode ::
-   *     Hinting information.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   On input, all points within the outline are in font coordinates. On
-   *   output, they are in 1/64th of pixels.
-   *
-   *   The scaling transformation is taken from the `globals' object which
-   *   must correspond to the same font as the glyph.
-   *
-   */
-  typedef FT_Error
-  (*T1_Hints_ApplyFunc)( T1_Hints        hints,
-                         FT_Outline*     outline,
-                         PSH_Globals     globals,
-                         FT_Render_Mode  hint_mode );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   T1_Hints_FuncsRec
-   *
-   * @description:
-   *   The structure used to provide the API to @T1_Hints objects.
-   *
-   * @fields:
-   *   hints ::
-   *     A handle to the T1 Hints recorder.
-   *
-   *   open ::
-   *     The function to open a recording session.
-   *
-   *   close ::
-   *     The function to close a recording session.
-   *
-   *   stem ::
-   *     The function to set a simple stem.
-   *
-   *   stem3 ::
-   *     The function to set counter-controlled stems.
-   *
-   *   reset ::
-   *     The function to reset stem hints.
-   *
-   *   apply ::
-   *     The function to apply the hints to the corresponding glyph outline.
-   *
-   */
-  typedef struct  T1_Hints_FuncsRec_
-  {
-    T1_Hints               hints;
-    T1_Hints_OpenFunc      open;
-    T1_Hints_CloseFunc     close;
-    T1_Hints_SetStemFunc   stem;
-    T1_Hints_SetStem3Func  stem3;
-    T1_Hints_ResetFunc     reset;
-    T1_Hints_ApplyFunc     apply;
-
-  } T1_Hints_FuncsRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  PUBLIC TYPE 2 HINTS RECORDER                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T2_Hints
-   *
-   * @description:
-   *   This is a handle to an opaque structure used to record glyph hints
-   *   from a Type 2 character glyph character string.
-   *
-   *   The methods used to operate on this object are defined by the
-   *   @T2_Hints_FuncsRec structure.  Recording glyph hints is normally
-   *   achieved through the following scheme:
-   *
-   *   - Open a new hint recording session by calling the `open' method.
-   *     This rewinds the recorder and prepare it for new input.
-   *
-   *   - For each hint found in the glyph charstring, call the corresponding
-   *     method (`stems', `hintmask', `counters').  Note that these
-   *     functions do not return an error code.
-   *
-   *   - Close the recording session by calling the `close' method.  It
-   *     returns an error code if the hints were invalid or something
-   *     strange happened (e.g., memory shortage).
-   *
-   *   The hints accumulated in the object can later be used by the
-   *   Postscript hinter.
-   *
-   */
-  typedef struct T2_HintsRec_*  T2_Hints;
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T2_Hints_Funcs
-   *
-   * @description:
-   *   A pointer to the @T2_Hints_FuncsRec structure that defines the API of
-   *   a given @T2_Hints object.
-   *
-   */
-  typedef const struct T2_Hints_FuncsRec_*  T2_Hints_Funcs;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_OpenFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to prepare it for a new Type 2
-   *   hints recording session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   * @note:
-   *   You should always call the @T2_Hints_CloseFunc method in order to
-   *   close an opened recording session.
-   *
-   */
-  typedef void
-  (*T2_Hints_OpenFunc)( T2_Hints  hints );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_StemsFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to set the table of stems in
-   *   either the vertical or horizontal dimension.  Equivalent to the
-   *   `hstem', `vstem', `hstemhm', and `vstemhm' Type 2 operators.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   dimension ::
-   *     0 for horizontal stems (hstem), 1 for vertical ones (vstem).
-   *
-   *   count ::
-   *     The number of stems.
-   *
-   *   coords ::
-   *     An array of `count' (position,length) pairs in 16.16 format.
-   *
-   * @note:
-   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
-   *   horizontal coordinates (x) for vertical stems (dim=1).
-   *
-   *   There are `2*count' elements in the `coords' array.  Each even
-   *   element is an absolute position in font units, each odd element is a
-   *   length in font units.
-   *
-   *   A length can be negative, in which case it must be either -20 or
-   *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
-   *   specification.
-   *
-   */
-  typedef void
-  (*T2_Hints_StemsFunc)( T2_Hints   hints,
-                         FT_UInt    dimension,
-                         FT_UInt    count,
-                         FT_Fixed*  coordinates );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_MaskFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to set a given hintmask (this
-   *   corresponds to the `hintmask' Type 2 operator).
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   end_point ::
-   *     The glyph index of the last point to which the previously defined
-   *     or activated hints apply.
-   *
-   *   bit_count ::
-   *     The number of bits in the hint mask.
-   *
-   *   bytes ::
-   *     An array of bytes modelling the hint mask.
-   *
-   * @note:
-   *   If the hintmask starts the charstring (before any glyph point
-   *   definition), the value of `end_point' should be 0.
-   *
-   *   `bit_count' is the number of meaningful bits in the `bytes' array; it
-   *   must be equal to the total number of hints defined so far (i.e.,
-   *   horizontal+verticals).
-   *
-   *   The `bytes' array can come directly from the Type 2 charstring and
-   *   respects the same format.
-   *
-   */
-  typedef void
-  (*T2_Hints_MaskFunc)( T2_Hints        hints,
-                        FT_UInt         end_point,
-                        FT_UInt         bit_count,
-                        const FT_Byte*  bytes );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_CounterFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to set a given counter mask
-   *   (this corresponds to the `hintmask' Type 2 operator).
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   end_point ::
-   *     A glyph index of the last point to which the previously defined or
-   *     active hints apply.
-   *
-   *   bit_count ::
-   *     The number of bits in the hint mask.
-   *
-   *   bytes ::
-   *     An array of bytes modelling the hint mask.
-   *
-   * @note:
-   *   If the hintmask starts the charstring (before any glyph point
-   *   definition), the value of `end_point' should be 0.
-   *
-   *   `bit_count' is the number of meaningful bits in the `bytes' array; it
-   *   must be equal to the total number of hints defined so far (i.e.,
-   *   horizontal+verticals).
-   *
-   *    The `bytes' array can come directly from the Type 2 charstring and
-   *    respects the same format.
-   *
-   */
-  typedef void
-  (*T2_Hints_CounterFunc)( T2_Hints        hints,
-                           FT_UInt         bit_count,
-                           const FT_Byte*  bytes );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_CloseFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to close a hint recording
-   *   session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   end_point ::
-   *     The index of the last point in the input glyph.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   The error code is set to indicate that an error occurred during the
-   *   recording session.
-   *
-   */
-  typedef FT_Error
-  (*T2_Hints_CloseFunc)( T2_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_ApplyFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to apply hints to the
-   *   corresponding glyph outline.  Must be called after the `close'
-   *   method.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   outline ::
-   *     A pointer to the target outline descriptor.
-   *
-   *   globals ::
-   *     The hinter globals for this font.
-   *
-   *   hint_mode ::
-   *     Hinting information.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   On input, all points within the outline are in font coordinates. On
-   *   output, they are in 1/64th of pixels.
-   *
-   *   The scaling transformation is taken from the `globals' object which
-   *   must correspond to the same font than the glyph.
-   *
-   */
-  typedef FT_Error
-  (*T2_Hints_ApplyFunc)( T2_Hints        hints,
-                         FT_Outline*     outline,
-                         PSH_Globals     globals,
-                         FT_Render_Mode  hint_mode );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   T2_Hints_FuncsRec
-   *
-   * @description:
-   *   The structure used to provide the API to @T2_Hints objects.
-   *
-   * @fields:
-   *   hints ::
-   *     A handle to the T2 hints recorder object.
-   *
-   *   open ::
-   *     The function to open a recording session.
-   *
-   *   close ::
-   *     The function to close a recording session.
-   *
-   *   stems ::
-   *     The function to set the dimension's stems table.
-   *
-   *   hintmask ::
-   *     The function to set hint masks.
-   *
-   *   counter ::
-   *     The function to set counter masks.
-   *
-   *   apply ::
-   *     The function to apply the hints on the corresponding glyph outline.
-   *
-   */
-  typedef struct  T2_Hints_FuncsRec_
-  {
-    T2_Hints              hints;
-    T2_Hints_OpenFunc     open;
-    T2_Hints_CloseFunc    close;
-    T2_Hints_StemsFunc    stems;
-    T2_Hints_MaskFunc     hintmask;
-    T2_Hints_CounterFunc  counter;
-    T2_Hints_ApplyFunc    apply;
-
-  } T2_Hints_FuncsRec;
-
-
-  /* */
-
-
-  typedef struct  PSHinter_Interface_
-  {
-    PSH_Globals_Funcs  (*get_globals_funcs)( FT_Module  module );
-    T1_Hints_Funcs     (*get_t1_funcs)     ( FT_Module  module );
-    T2_Hints_Funcs     (*get_t2_funcs)     ( FT_Module  module );
-
-  } PSHinter_Interface;
-
-  typedef PSHinter_Interface*  PSHinter_Service;
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_PSHINTER_INTERFACE(        \
-          class_,                            \
-          get_globals_funcs_,                \
-          get_t1_funcs_,                     \
-          get_t2_funcs_ )                    \
-  static const PSHinter_Interface  class_ =  \
-  {                                          \
-    get_globals_funcs_,                      \
-    get_t1_funcs_,                           \
-    get_t2_funcs_                            \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_PSHINTER_INTERFACE(                      \
-          class_,                                          \
-          get_globals_funcs_,                              \
-          get_t1_funcs_,                                   \
-          get_t2_funcs_ )                                  \
-  void                                                     \
-  FT_Init_Class_ ## class_( FT_Library           library,  \
-                            PSHinter_Interface*  clazz )   \
-  {                                                        \
-    FT_UNUSED( library );                                  \
-                                                           \
-    clazz->get_globals_funcs = get_globals_funcs_;         \
-    clazz->get_t1_funcs      = get_t1_funcs_;              \
-    clazz->get_t2_funcs      = get_t2_funcs_;              \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* __PSHINTS_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftvalid.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftvalid.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftvalid.h	(copie de travail)
@@ -1,161 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftvalid.h                                                              */
-/*                                                                         */
-/*    FreeType validation support (specification).                         */
-/*                                                                         */
-/*  Copyright 2004, 2013 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTVALID_H__
-#define __FTVALID_H__
-
-#include <ft2build.h>
-#include FT_CONFIG_STANDARD_LIBRARY_H   /* for ft_setjmp and ft_longjmp */
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                    V A L I D A T I O N                          ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* handle to a validation object */
-  typedef struct FT_ValidatorRec_ volatile*  FT_Validator;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* There are three distinct validation levels defined here:              */
-  /*                                                                       */
-  /* FT_VALIDATE_DEFAULT ::                                                */
-  /*   A table that passes this validation level can be used reliably by   */
-  /*   FreeType.  It generally means that all offsets have been checked to */
-  /*   prevent out-of-bound reads, that array counts are correct, etc.     */
-  /*                                                                       */
-  /* FT_VALIDATE_TIGHT ::                                                  */
-  /*   A table that passes this validation level can be used reliably and  */
-  /*   doesn't contain invalid data.  For example, a charmap table that    */
-  /*   returns invalid glyph indices will not pass, even though it can     */
-  /*   be used with FreeType in default mode (the library will simply      */
-  /*   return an error later when trying to load the glyph).               */
-  /*                                                                       */
-  /*   It also checks that fields which must be a multiple of 2, 4, or 8,  */
-  /*   don't have incorrect values, etc.                                   */
-  /*                                                                       */
-  /* FT_VALIDATE_PARANOID ::                                               */
-  /*   Only for font debugging.  Checks that a table follows the           */
-  /*   specification by 100%.  Very few fonts will be able to pass this    */
-  /*   level anyway but it can be useful for certain tools like font       */
-  /*   editors/converters.                                                 */
-  /*                                                                       */
-  typedef enum  FT_ValidationLevel_
-  {
-    FT_VALIDATE_DEFAULT = 0,
-    FT_VALIDATE_TIGHT,
-    FT_VALIDATE_PARANOID
-
-  } FT_ValidationLevel;
-
-
-#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
-  /* We disable the warning `structure was padded due to   */
-  /* __declspec(align())' in order to compile cleanly with */
-  /* the maximum level of warnings.                        */
-#pragma warning( push )
-#pragma warning( disable : 4324 )
-#endif /* _MSC_VER */
-
-  /* validator structure */
-  typedef struct  FT_ValidatorRec_
-  {
-    const FT_Byte*      base;        /* address of table in memory       */
-    const FT_Byte*      limit;       /* `base' + sizeof(table) in memory */
-    FT_ValidationLevel  level;       /* validation level                 */
-    FT_Error            error;       /* error returned. 0 means success  */
-
-    ft_jmp_buf          jump_buffer; /* used for exception handling      */
-
-  } FT_ValidatorRec;
-
-#if defined( _MSC_VER )
-#pragma warning( pop )
-#endif
-
-#define FT_VALIDATOR( x )  ( (FT_Validator)( x ) )
-
-
-  FT_BASE( void )
-  ft_validator_init( FT_Validator        valid,
-                     const FT_Byte*      base,
-                     const FT_Byte*      limit,
-                     FT_ValidationLevel  level );
-
-  /* Do not use this. It's broken and will cause your validator to crash */
-  /* if you run it on an invalid font.                                   */
-  FT_BASE( FT_Int )
-  ft_validator_run( FT_Validator  valid );
-
-  /* Sets the error field in a validator, then calls `longjmp' to return */
-  /* to high-level caller.  Using `setjmp/longjmp' avoids many stupid    */
-  /* error checks within the validation routines.                        */
-  /*                                                                     */
-  FT_BASE( void )
-  ft_validator_error( FT_Validator  valid,
-                      FT_Error      error );
-
-
-  /* Calls ft_validate_error.  Assumes that the `valid' local variable */
-  /* holds a pointer to the current validator object.                  */
-  /*                                                                   */
-  /* Use preprocessor prescan to pass FT_ERR_PREFIX.                   */
-  /*                                                                   */
-#define FT_INVALID( _prefix, _error )  FT_INVALID_( _prefix, _error )
-#define FT_INVALID_( _prefix, _error ) \
-          ft_validator_error( valid, _prefix ## _error )
-
-  /* called when a broken table is detected */
-#define FT_INVALID_TOO_SHORT \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
-
-  /* called when an invalid offset is detected */
-#define FT_INVALID_OFFSET \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Offset )
-
-  /* called when an invalid format/value is detected */
-#define FT_INVALID_FORMAT \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
-
-  /* called when an invalid glyph index is detected */
-#define FT_INVALID_GLYPH_ID \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Glyph_Index )
-
-  /* called when an invalid field value is detected */
-#define FT_INVALID_DATA \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
-
-
-FT_END_HEADER
-
-#endif /* __FTVALID_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/autohint.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/autohint.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/autohint.h	(copie de travail)
@@ -1,244 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  autohint.h                                                             */
-/*                                                                         */
-/*    High-level `autohint' module-specific interface (specification).     */
-/*                                                                         */
-/*  Copyright 1996-2002, 2007, 2009, 2012 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The auto-hinter is used to load and automatically hint glyphs if a    */
-  /* format-specific hinter isn't available.                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __AUTOHINT_H__
-#define __AUTOHINT_H__
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A small technical note regarding automatic hinting in order to        */
-  /* clarify this module interface.                                        */
-  /*                                                                       */
-  /* An automatic hinter might compute two kinds of data for a given face: */
-  /*                                                                       */
-  /* - global hints: Usually some metrics that describe global properties  */
-  /*                 of the face.  It is computed by scanning more or less */
-  /*                 aggressively the glyphs in the face, and thus can be  */
-  /*                 very slow to compute (even if the size of global      */
-  /*                 hints is really small).                               */
-  /*                                                                       */
-  /* - glyph hints:  These describe some important features of the glyph   */
-  /*                 outline, as well as how to align them.  They are      */
-  /*                 generally much faster to compute than global hints.   */
-  /*                                                                       */
-  /* The current FreeType auto-hinter does a pretty good job while         */
-  /* performing fast computations for both global and glyph hints.         */
-  /* However, we might be interested in introducing more complex and       */
-  /* powerful algorithms in the future, like the one described in the John */
-  /* D. Hobby paper, which unfortunately requires a lot more horsepower.   */
-  /*                                                                       */
-  /* Because a sufficiently sophisticated font management system would     */
-  /* typically implement an LRU cache of opened face objects to reduce     */
-  /* memory usage, it is a good idea to be able to avoid recomputing       */
-  /* global hints every time the same face is re-opened.                   */
-  /*                                                                       */
-  /* We thus provide the ability to cache global hints outside of the face */
-  /* object, in order to speed up font re-opening time.  Of course, this   */
-  /* feature is purely optional, so most client programs won't even notice */
-  /* it.                                                                   */
-  /*                                                                       */
-  /* I initially thought that it would be a good idea to cache the glyph   */
-  /* hints too.  However, my general idea now is that if you really need   */
-  /* to cache these too, you are simply in need of a new font format,      */
-  /* where all this information could be stored within the font file and   */
-  /* decoded on the fly.                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct FT_AutoHinterRec_  *FT_AutoHinter;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalGetFunc                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the global hints computed for a given face object.  The   */
-  /*    resulting data is dissociated from the face and will survive a     */
-  /*    call to FT_Done_Face().  It must be discarded through the API      */
-  /*    FT_AutoHinter_GlobalDoneFunc().                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter       :: A handle to the source auto-hinter.                */
-  /*                                                                       */
-  /*    face         :: A handle to the source face object.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    global_hints :: A typeless pointer to the global hints.            */
-  /*                                                                       */
-  /*    global_len   :: The size in bytes of the global hints.             */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalGetFunc)( FT_AutoHinter  hinter,
-                                  FT_Face        face,
-                                  void**         global_hints,
-                                  long*          global_len );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalDoneFunc                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard the global hints retrieved through                         */
-  /*    FT_AutoHinter_GlobalGetFunc().  This is the only way these hints   */
-  /*    are freed from memory.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter :: A handle to the auto-hinter module.                      */
-  /*                                                                       */
-  /*    global :: A pointer to retrieved global hints to discard.          */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalDoneFunc)( FT_AutoHinter  hinter,
-                                   void*          global );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalResetFunc                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to recompute the global metrics in a given   */
-  /*    font.  This is useful when global font data changes (e.g. Multiple */
-  /*    Masters fonts where blend coordinates change).                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter :: A handle to the source auto-hinter.                      */
-  /*                                                                       */
-  /*    face   :: A handle to the face.                                    */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalResetFunc)( FT_AutoHinter  hinter,
-                                    FT_Face        face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlyphLoadFunc                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to load, scale, and automatically hint a     */
-  /*    glyph from a given face.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to the face.                               */
-  /*                                                                       */
-  /*    glyph_index :: The glyph index.                                    */
-  /*                                                                       */
-  /*    load_flags  :: The load flags.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is capable of loading composite glyphs by hinting    */
-  /*    each sub-glyph independently (which improves quality).             */
-  /*                                                                       */
-  /*    It will call the font driver with @FT_Load_Glyph, with             */
-  /*    @FT_LOAD_NO_SCALE set.                                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_AutoHinter_GlyphLoadFunc)( FT_AutoHinter  hinter,
-                                  FT_GlyphSlot   slot,
-                                  FT_Size        size,
-                                  FT_UInt        glyph_index,
-                                  FT_Int32       load_flags );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_AutoHinter_InterfaceRec                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The auto-hinter module's interface.                                */
-  /*                                                                       */
-  typedef struct  FT_AutoHinter_InterfaceRec_
-  {
-    FT_AutoHinter_GlobalResetFunc  reset_face;
-    FT_AutoHinter_GlobalGetFunc    get_global_hints;
-    FT_AutoHinter_GlobalDoneFunc   done_global_hints;
-    FT_AutoHinter_GlyphLoadFunc    load_glyph;
-
-  } FT_AutoHinter_InterfaceRec, *FT_AutoHinter_Interface;
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_AUTOHINTER_INTERFACE(       \
-          class_,                             \
-          reset_face_,                        \
-          get_global_hints_,                  \
-          done_global_hints_,                 \
-          load_glyph_ )                       \
-  FT_CALLBACK_TABLE_DEF                       \
-  const FT_AutoHinter_InterfaceRec  class_ =  \
-  {                                           \
-    reset_face_,                              \
-    get_global_hints_,                        \
-    done_global_hints_,                       \
-    load_glyph_                               \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_AUTOHINTER_INTERFACE(                            \
-          class_,                                                  \
-          reset_face_,                                             \
-          get_global_hints_,                                       \
-          done_global_hints_,                                      \
-          load_glyph_ )                                            \
-  void                                                             \
-  FT_Init_Class_ ## class_( FT_Library                   library,  \
-                            FT_AutoHinter_InterfaceRec*  clazz )   \
-  {                                                                \
-    FT_UNUSED( library );                                          \
-                                                                   \
-    clazz->reset_face        = reset_face_;                        \
-    clazz->get_global_hints  = get_global_hints_;                  \
-    clazz->done_global_hints = done_global_hints_;                 \
-    clazz->load_glyph        = load_glyph_;                        \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* __AUTOHINT_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftcalc.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftcalc.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftcalc.h	(copie de travail)
@@ -1,167 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcalc.h                                                               */
-/*                                                                         */
-/*    Arithmetic computations (specification).                             */
-/*                                                                         */
-/*  Copyright 1996-2006, 2008, 2009, 2012-2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCALC_H__
-#define __FTCALC_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_FixedSqrt                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Computes the square root of a 16.16 fixed-point value.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    x :: The value to compute the root for.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `sqrt(x)'.                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is not very fast.                                    */
-  /*                                                                       */
-  FT_BASE( FT_Int32 )
-  FT_SqrtFixed( FT_Int32  x );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* FT_MulDiv() and FT_MulFix() are declared in freetype.h.               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulDiv_No_Round                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation `(a*b)/c'   */
-  /*    (without rounding) with maximum accuracy (it uses a 64-bit         */
-  /*    intermediate integer whenever necessary).                          */
-  /*                                                                       */
-  /*    This function isn't necessarily as fast as some processor specific */
-  /*    operations, but is at least completely portable.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.                                        */
-  /*    c :: The divisor.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/c'.  This function never traps when trying to */
-  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
-  /*    on the signs of `a' and `b'.                                       */
-  /*                                                                       */
-  FT_BASE( FT_Long )
-  FT_MulDiv_No_Round( FT_Long  a,
-                      FT_Long  b,
-                      FT_Long  c );
-
-
-  /*
-   *  A variant of FT_Matrix_Multiply which scales its result afterwards.
-   *  The idea is that both `a' and `b' are scaled by factors of 10 so that
-   *  the values are as precise as possible to get a correct result during
-   *  the 64bit multiplication.  Let `sa' and `sb' be the scaling factors of
-   *  `a' and `b', respectively, then the scaling factor of the result is
-   *  `sa*sb'.
-   */
-  FT_BASE( void )
-  FT_Matrix_Multiply_Scaled( const FT_Matrix*  a,
-                             FT_Matrix        *b,
-                             FT_Long           scaling );
-
-
-  /*
-   *  A variant of FT_Vector_Transform.  See comments for
-   *  FT_Matrix_Multiply_Scaled.
-   */
-  FT_BASE( void )
-  FT_Vector_Transform_Scaled( FT_Vector*        vector,
-                              const FT_Matrix*  matrix,
-                              FT_Long           scaling );
-
-
-  /*
-   *  Return -1, 0, or +1, depending on the orientation of a given corner.
-   *  We use the Cartesian coordinate system, with positive vertical values
-   *  going upwards.  The function returns +1 if the corner turns to the
-   *  left, -1 to the right, and 0 for undecidable cases.
-   */
-  FT_BASE( FT_Int )
-  ft_corner_orientation( FT_Pos  in_x,
-                         FT_Pos  in_y,
-                         FT_Pos  out_x,
-                         FT_Pos  out_y );
-
-  /*
-   *  Return TRUE if a corner is flat or nearly flat.  This is equivalent to
-   *  saying that the angle difference between the `in' and `out' vectors is
-   *  very small.
-   */
-  FT_BASE( FT_Int )
-  ft_corner_is_flat( FT_Pos  in_x,
-                     FT_Pos  in_y,
-                     FT_Pos  out_x,
-                     FT_Pos  out_y );
-
-
-  /*
-   *  Return the most significant bit index.
-   */
-  FT_BASE( FT_Int )
-  FT_MSB( FT_UInt32  z );
-
-
-  /*
-   *  Return sqrt(x*x+y*y), which is the same as `FT_Vector_Length' but uses
-   *  two fixed-point arguments instead.
-   */
-  FT_BASE( FT_Fixed )
-  FT_Hypot( FT_Fixed  x,
-            FT_Fixed  y );
-
-
-#define INT_TO_F26DOT6( x )    ( (FT_Long)(x) << 6  )
-#define INT_TO_F2DOT14( x )    ( (FT_Long)(x) << 14 )
-#define INT_TO_FIXED( x )      ( (FT_Long)(x) << 16 )
-#define F2DOT14_TO_FIXED( x )  ( (FT_Long)(x) << 2  )
-#define FLOAT_TO_FIXED( x )    ( (FT_Long)( x * 65536.0 ) )
-#define FIXED_TO_INT( x )      ( FT_RoundFix( x ) >> 16 )
-
-#define ROUND_F26DOT6( x )     ( x >= 0 ? (    ( (x) + 32 ) & -64 )     \
-                                        : ( -( ( 32 - (x) ) & -64 ) ) )
-
-
-FT_END_HEADER
-
-#endif /* __FTCALC_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svpostnm.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svpostnm.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svpostnm.h	(copie de travail)
@@ -1,81 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpostnm.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript name services (specification).               */
-/*                                                                         */
-/*  Copyright 2003, 2007, 2009, 2012 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPOSTNM_H__
-#define __SVPOSTNM_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-  /*
-   *  A trivial service used to retrieve the PostScript name of a given
-   *  font when available.  The `get_name' field should never be NULL.
-   *
-   *  The corresponding function can return NULL to indicate that the
-   *  PostScript name is not available.
-   *
-   *  The name is owned by the face and will be destroyed with it.
-   */
-
-#define FT_SERVICE_ID_POSTSCRIPT_FONT_NAME  "postscript-font-name"
-
-
-  typedef const char*
-  (*FT_PsName_GetFunc)( FT_Face  face );
-
-
-  FT_DEFINE_SERVICE( PsFontName )
-  {
-    FT_PsName_GetFunc  get_ps_font_name;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
-  static const FT_Service_PsFontNameRec  class_ =                    \
-  {                                                                  \
-    get_ps_font_name_                                                \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
-  void                                                               \
-  FT_Init_Class_ ## class_( FT_Library                 library,      \
-                            FT_Service_PsFontNameRec*  clazz )       \
-  {                                                                  \
-    FT_UNUSED( library );                                            \
-                                                                     \
-    clazz->get_ps_font_name = get_ps_font_name_;                     \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPOSTNM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svprop.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svprop.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svprop.h	(copie de travail)
@@ -1,81 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svprop.h                                                               */
-/*                                                                         */
-/*    The FreeType property service (specification).                       */
-/*                                                                         */
-/*  Copyright 2012 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPROP_H__
-#define __SVPROP_H__
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_PROPERTIES  "properties"
-
-
-  typedef FT_Error
-  (*FT_Properties_SetFunc)( FT_Module    module,
-                            const char*  property_name,
-                            const void*  value );
-
-  typedef FT_Error
-  (*FT_Properties_GetFunc)( FT_Module    module,
-                            const char*  property_name,
-                            void*        value );
-
-
-  FT_DEFINE_SERVICE( Properties )
-  {
-    FT_Properties_SetFunc  set_property;
-    FT_Properties_GetFunc  get_property;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PROPERTIESREC( class_,          \
-                                         set_property_,   \
-                                         get_property_ )  \
-  static const FT_Service_PropertiesRec  class_ =         \
-  {                                                       \
-    set_property_,                                        \
-    get_property_                                         \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PROPERTIESREC( class_,                \
-                                         set_property_,         \
-                                         get_property_ )        \
-  void                                                          \
-  FT_Init_Class_ ## class_( FT_Service_PropertiesRec*  clazz )  \
-  {                                                             \
-    clazz->set_property = set_property_;                        \
-    clazz->get_property = get_property_;                        \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPROP_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svgxval.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svgxval.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svgxval.h	(copie de travail)
@@ -1,72 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svgxval.h                                                              */
-/*                                                                         */
-/*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
-/*                                                                         */
-/*  Copyright 2004, 2005 by                                                */
-/*  Masatake YAMATO, Red Hat K.K.,                                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/*                                                                         */
-/* gxvalid is derived from both gxlayout module and otvalid module.        */
-/* Development of gxlayout is supported by the Information-technology      */
-/* Promotion Agency(IPA), Japan.                                           */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVGXVAL_H__
-#define __SVGXVAL_H__
-
-#include FT_GX_VALIDATE_H
-#include FT_INTERNAL_VALIDATE_H
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_GX_VALIDATE           "truetypegx-validate"
-#define FT_SERVICE_ID_CLASSICKERN_VALIDATE  "classickern-validate"
-
-  typedef FT_Error
-  (*gxv_validate_func)( FT_Face   face,
-                        FT_UInt   gx_flags,
-                        FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
-                        FT_UInt   table_length );
-
-
-  typedef FT_Error
-  (*ckern_validate_func)( FT_Face   face,
-                          FT_UInt   ckern_flags,
-                          FT_Bytes  *ckern_table );
-
-
-  FT_DEFINE_SERVICE( GXvalidate )
-  {
-    gxv_validate_func  validate;
-  };
-
-  FT_DEFINE_SERVICE( CKERNvalidate )
-  {
-    ckern_validate_func  validate;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVGXVAL_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svtteng.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svtteng.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svtteng.h	(copie de travail)
@@ -1,53 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svtteng.h                                                              */
-/*                                                                         */
-/*    The FreeType TrueType engine query service (specification).          */
-/*                                                                         */
-/*  Copyright 2006 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVTTENG_H__
-#define __SVTTENG_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_MODULE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  SFNT table loading service.
-   */
-
-#define FT_SERVICE_ID_TRUETYPE_ENGINE  "truetype-engine"
-
-  /*
-   * Used to implement FT_Get_TrueType_Engine_Type
-   */
-
-  FT_DEFINE_SERVICE( TrueTypeEngine )
-  {
-    FT_TrueTypeEngineType  engine_type;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVTTENG_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svpscmap.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svpscmap.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svpscmap.h	(copie de travail)
@@ -1,177 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpscmap.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript charmap service (specification).             */
-/*                                                                         */
-/*  Copyright 2003, 2006, 2009, 2012 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPSCMAP_H__
-#define __SVPSCMAP_H__
-
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_POSTSCRIPT_CMAPS  "postscript-cmaps"
-
-
-  /*
-   *  Adobe glyph name to unicode value.
-   */
-  typedef FT_UInt32
-  (*PS_Unicode_ValueFunc)( const char*  glyph_name );
-
-  /*
-   *  Macintosh name id to glyph name.  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_Macintosh_NameFunc)( FT_UInt  name_index );
-
-  /*
-   *  Adobe standard string ID to glyph name.  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_Adobe_Std_StringsFunc)( FT_UInt  string_index );
-
-
-  /*
-   *  Simple unicode -> glyph index charmap built from font glyph names
-   *  table.
-   */
-  typedef struct  PS_UniMap_
-  {
-    FT_UInt32  unicode;      /* bit 31 set: is glyph variant */
-    FT_UInt    glyph_index;
-
-  } PS_UniMap;
-
-
-  typedef struct PS_UnicodesRec_*  PS_Unicodes;
-
-  typedef struct  PS_UnicodesRec_
-  {
-    FT_CMapRec  cmap;
-    FT_UInt     num_maps;
-    PS_UniMap*  maps;
-
-  } PS_UnicodesRec;
-
-
-  /*
-   *  A function which returns a glyph name for a given index.  Returns
-   *  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_GetGlyphNameFunc)( FT_Pointer  data,
-                          FT_UInt     string_index );
-
-  /*
-   *  A function used to release the glyph name returned by
-   *  PS_GetGlyphNameFunc, when needed
-   */
-  typedef void
-  (*PS_FreeGlyphNameFunc)( FT_Pointer  data,
-                           const char*  name );
-
-  typedef FT_Error
-  (*PS_Unicodes_InitFunc)( FT_Memory             memory,
-                           PS_Unicodes           unicodes,
-                           FT_UInt               num_glyphs,
-                           PS_GetGlyphNameFunc   get_glyph_name,
-                           PS_FreeGlyphNameFunc  free_glyph_name,
-                           FT_Pointer            glyph_data );
-
-  typedef FT_UInt
-  (*PS_Unicodes_CharIndexFunc)( PS_Unicodes  unicodes,
-                                FT_UInt32    unicode );
-
-  typedef FT_UInt32
-  (*PS_Unicodes_CharNextFunc)( PS_Unicodes  unicodes,
-                               FT_UInt32   *unicode );
-
-
-  FT_DEFINE_SERVICE( PsCMaps )
-  {
-    PS_Unicode_ValueFunc       unicode_value;
-
-    PS_Unicodes_InitFunc       unicodes_init;
-    PS_Unicodes_CharIndexFunc  unicodes_char_index;
-    PS_Unicodes_CharNextFunc   unicodes_char_next;
-
-    PS_Macintosh_NameFunc      macintosh_name;
-    PS_Adobe_Std_StringsFunc   adobe_std_strings;
-    const unsigned short*      adobe_std_encoding;
-    const unsigned short*      adobe_expert_encoding;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
-                                      unicode_value_,                       \
-                                      unicodes_init_,                       \
-                                      unicodes_char_index_,                 \
-                                      unicodes_char_next_,                  \
-                                      macintosh_name_,                      \
-                                      adobe_std_strings_,                   \
-                                      adobe_std_encoding_,                  \
-                                      adobe_expert_encoding_ )              \
-  static const FT_Service_PsCMapsRec  class_ =                              \
-  {                                                                         \
-    unicode_value_, unicodes_init_,                                         \
-    unicodes_char_index_, unicodes_char_next_, macintosh_name_,             \
-    adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_         \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
-                                      unicode_value_,                       \
-                                      unicodes_init_,                       \
-                                      unicodes_char_index_,                 \
-                                      unicodes_char_next_,                  \
-                                      macintosh_name_,                      \
-                                      adobe_std_strings_,                   \
-                                      adobe_std_encoding_,                  \
-                                      adobe_expert_encoding_ )              \
-  void                                                                      \
-  FT_Init_Class_ ## class_( FT_Library              library,                \
-                            FT_Service_PsCMapsRec*  clazz )                 \
-  {                                                                         \
-    FT_UNUSED( library );                                                   \
-                                                                            \
-    clazz->unicode_value         = unicode_value_;                          \
-    clazz->unicodes_init         = unicodes_init_;                          \
-    clazz->unicodes_char_index   = unicodes_char_index_;                    \
-    clazz->unicodes_char_next    = unicodes_char_next_;                     \
-    clazz->macintosh_name        = macintosh_name_;                         \
-    clazz->adobe_std_strings     = adobe_std_strings_;                      \
-    clazz->adobe_std_encoding    = adobe_std_encoding_;                     \
-    clazz->adobe_expert_encoding = adobe_expert_encoding_;                  \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPSCMAP_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svotval.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svotval.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svotval.h	(copie de travail)
@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svotval.h                                                              */
-/*                                                                         */
-/*    The FreeType OpenType validation service (specification).            */
-/*                                                                         */
-/*  Copyright 2004, 2006 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVOTVAL_H__
-#define __SVOTVAL_H__
-
-#include FT_OPENTYPE_VALIDATE_H
-#include FT_INTERNAL_VALIDATE_H
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_OPENTYPE_VALIDATE  "opentype-validate"
-
-
-  typedef FT_Error
-  (*otv_validate_func)( FT_Face volatile  face,
-                        FT_UInt           ot_flags,
-                        FT_Bytes         *base,
-                        FT_Bytes         *gdef,
-                        FT_Bytes         *gpos,
-                        FT_Bytes         *gsub,
-                        FT_Bytes         *jstf );
-
-
-  FT_DEFINE_SERVICE( OTvalidate )
-  {
-    otv_validate_func  validate;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVOTVAL_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svxf86nm.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svxf86nm.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svxf86nm.h	(copie de travail)
@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svxf86nm.h                                                             */
-/*                                                                         */
-/*    The FreeType XFree86 services (specification only).                  */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVXF86NM_H__
-#define __SVXF86NM_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A trivial service used to return the name of a face's font driver,
-   *  according to the XFree86 nomenclature.  Note that the service data
-   *  is a simple constant string pointer.
-   */
-
-#define FT_SERVICE_ID_XF86_NAME  "xf86-driver-name"
-
-#define FT_XF86_FORMAT_TRUETYPE  "TrueType"
-#define FT_XF86_FORMAT_TYPE_1    "Type 1"
-#define FT_XF86_FORMAT_BDF       "BDF"
-#define FT_XF86_FORMAT_PCF       "PCF"
-#define FT_XF86_FORMAT_TYPE_42   "Type 42"
-#define FT_XF86_FORMAT_CID       "CID Type 1"
-#define FT_XF86_FORMAT_CFF       "CFF"
-#define FT_XF86_FORMAT_PFR       "PFR"
-#define FT_XF86_FORMAT_WINFNT    "Windows FNT"
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVXF86NM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svpfr.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svpfr.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svpfr.h	(copie de travail)
@@ -1,66 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpfr.h                                                                */
-/*                                                                         */
-/*    Internal PFR service functions (specification).                      */
-/*                                                                         */
-/*  Copyright 2003, 2006 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPFR_H__
-#define __SVPFR_H__
-
-#include FT_PFR_H
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_PFR_METRICS  "pfr-metrics"
-
-
-  typedef FT_Error
-  (*FT_PFR_GetMetricsFunc)( FT_Face    face,
-                            FT_UInt   *aoutline,
-                            FT_UInt   *ametrics,
-                            FT_Fixed  *ax_scale,
-                            FT_Fixed  *ay_scale );
-
-  typedef FT_Error
-  (*FT_PFR_GetKerningFunc)( FT_Face     face,
-                            FT_UInt     left,
-                            FT_UInt     right,
-                            FT_Vector  *avector );
-
-  typedef FT_Error
-  (*FT_PFR_GetAdvanceFunc)( FT_Face   face,
-                            FT_UInt   gindex,
-                            FT_Pos   *aadvance );
-
-
-  FT_DEFINE_SERVICE( PfrMetrics )
-  {
-    FT_PFR_GetMetricsFunc  get_metrics;
-    FT_PFR_GetKerningFunc  get_kerning;
-    FT_PFR_GetAdvanceFunc  get_advance;
-
-  };
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __SVPFR_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svttcmap.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svttcmap.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svttcmap.h	(copie de travail)
@@ -1,107 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svttcmap.h                                                             */
-/*                                                                         */
-/*    The FreeType TrueType/sfnt cmap extra information service.           */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  Masatake YAMATO, Redhat K.K.                                           */
-/*                                                                         */
-/*  Copyright 2003, 2008, 2009, 2012 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/* Development of this service is support of
-   Information-technology Promotion Agency, Japan. */
-
-#ifndef __SVTTCMAP_H__
-#define __SVTTCMAP_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_TT_CMAP  "tt-cmaps"
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_CMapInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to store TrueType/sfnt specific cmap information  */
-  /*    which is not covered by the generic @FT_CharMap structure.  This   */
-  /*    structure can be accessed with the @FT_Get_TT_CMap_Info function.  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    language ::                                                        */
-  /*      The language ID used in Mac fonts.  Definitions of values are in */
-  /*      freetype/ttnameid.h.                                             */
-  /*                                                                       */
-  /*    format ::                                                          */
-  /*      The cmap format.  OpenType 1.5 defines the formats 0 (byte       */
-  /*      encoding table), 2~(high-byte mapping through table), 4~(segment */
-  /*      mapping to delta values), 6~(trimmed table mapping), 8~(mixed    */
-  /*      16-bit and 32-bit coverage), 10~(trimmed array), 12~(segmented   */
-  /*      coverage), and 14 (Unicode Variation Sequences).                 */
-  /*                                                                       */
-  typedef struct  TT_CMapInfo_
-  {
-    FT_ULong  language;
-    FT_Long   format;
-
-  } TT_CMapInfo;
-
-
-  typedef FT_Error
-  (*TT_CMap_Info_GetFunc)( FT_CharMap    charmap,
-                           TT_CMapInfo  *cmap_info );
-
-
-  FT_DEFINE_SERVICE( TTCMaps )
-  {
-    TT_CMap_Info_GetFunc  get_cmap_info;
-  };
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
-  static const FT_Service_TTCMapsRec  class_ =                  \
-  {                                                             \
-    get_cmap_info_                                              \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
-  void                                                          \
-  FT_Init_Class_ ## class_( FT_Library              library,    \
-                            FT_Service_TTCMapsRec*  clazz )     \
-  {                                                             \
-    FT_UNUSED( library );                                       \
-                                                                \
-    clazz->get_cmap_info = get_cmap_info_;                      \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __SVTTCMAP_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svbdf.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svbdf.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svbdf.h	(copie de travail)
@@ -1,82 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svbdf.h                                                                */
-/*                                                                         */
-/*    The FreeType BDF services (specification).                           */
-/*                                                                         */
-/*  Copyright 2003, 2009, 2012 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVBDF_H__
-#define __SVBDF_H__
-
-#include FT_BDF_H
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_BDF  "bdf"
-
-  typedef FT_Error
-  (*FT_BDF_GetCharsetIdFunc)( FT_Face       face,
-                              const char*  *acharset_encoding,
-                              const char*  *acharset_registry );
-
-  typedef FT_Error
-  (*FT_BDF_GetPropertyFunc)( FT_Face           face,
-                             const char*       prop_name,
-                             BDF_PropertyRec  *aproperty );
-
-
-  FT_DEFINE_SERVICE( BDF )
-  {
-    FT_BDF_GetCharsetIdFunc  get_charset_id;
-    FT_BDF_GetPropertyFunc   get_property;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
-                                  get_charset_id_,                       \
-                                  get_property_ )                        \
-  static const FT_Service_BDFRec  class_ =                               \
-  {                                                                      \
-    get_charset_id_, get_property_                                       \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
-                                  get_charset_id_,                       \
-                                  get_property_ )                        \
-  void                                                                   \
-  FT_Init_Class_ ## class_( FT_Service_BDFRec*  clazz )                  \
-  {                                                                      \
-    clazz->get_charset_id = get_charset_id_;                             \
-    clazz->get_property   = get_property_;                               \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVBDF_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svpsinfo.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svpsinfo.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svpsinfo.h	(copie de travail)
@@ -1,111 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpsinfo.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript info service (specification).                */
-/*                                                                         */
-/*  Copyright 2003, 2004, 2009, 2011, 2012 by                              */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPSINFO_H__
-#define __SVPSINFO_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_POSTSCRIPT_INFO  "postscript-info"
-
-
-  typedef FT_Error
-  (*PS_GetFontInfoFunc)( FT_Face          face,
-                         PS_FontInfoRec*  afont_info );
-
-  typedef FT_Error
-  (*PS_GetFontExtraFunc)( FT_Face           face,
-                          PS_FontExtraRec*  afont_extra );
-
-  typedef FT_Int
-  (*PS_HasGlyphNamesFunc)( FT_Face  face );
-
-  typedef FT_Error
-  (*PS_GetFontPrivateFunc)( FT_Face         face,
-                            PS_PrivateRec*  afont_private );
-
-  typedef FT_Long
-  (*PS_GetFontValueFunc)( FT_Face       face,
-                          PS_Dict_Keys  key,
-                          FT_UInt       idx,
-                          void         *value,
-                          FT_Long       value_len );
-
-
-  FT_DEFINE_SERVICE( PsInfo )
-  {
-    PS_GetFontInfoFunc     ps_get_font_info;
-    PS_GetFontExtraFunc    ps_get_font_extra;
-    PS_HasGlyphNamesFunc   ps_has_glyph_names;
-    PS_GetFontPrivateFunc  ps_get_font_private;
-    PS_GetFontValueFunc    ps_get_font_value;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
-                                     get_font_info_,             \
-                                     ps_get_font_extra_,         \
-                                     has_glyph_names_,           \
-                                     get_font_private_,          \
-                                     get_font_value_ )           \
-  static const FT_Service_PsInfoRec  class_ =                    \
-  {                                                              \
-    get_font_info_, ps_get_font_extra_, has_glyph_names_,        \
-    get_font_private_, get_font_value_                           \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
-                                     get_font_info_,             \
-                                     ps_get_font_extra_,         \
-                                     has_glyph_names_,           \
-                                     get_font_private_,          \
-                                     get_font_value_ )           \
-  void                                                           \
-  FT_Init_Class_ ## class_( FT_Library             library,      \
-                            FT_Service_PsInfoRec*  clazz )       \
-  {                                                              \
-    FT_UNUSED( library );                                        \
-                                                                 \
-    clazz->ps_get_font_info    = get_font_info_;                 \
-    clazz->ps_get_font_extra   = ps_get_font_extra_;             \
-    clazz->ps_has_glyph_names  = has_glyph_names_;               \
-    clazz->ps_get_font_private = get_font_private_;              \
-    clazz->ps_get_font_value   = get_font_value_;                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPSINFO_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svkern.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svkern.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svkern.h	(copie de travail)
@@ -1,51 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svkern.h                                                               */
-/*                                                                         */
-/*    The FreeType Kerning service (specification).                        */
-/*                                                                         */
-/*  Copyright 2006 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVKERN_H__
-#define __SVKERN_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-#define FT_SERVICE_ID_KERNING  "kerning"
-
-
-  typedef FT_Error
-  (*FT_Kerning_TrackGetFunc)( FT_Face    face,
-                              FT_Fixed   point_size,
-                              FT_Int     degree,
-                              FT_Fixed*  akerning );
-
-  FT_DEFINE_SERVICE( Kerning )
-  {
-    FT_Kerning_TrackGetFunc  get_track;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVKERN_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svcid.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svcid.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svcid.h	(copie de travail)
@@ -1,89 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svcid.h                                                                */
-/*                                                                         */
-/*    The FreeType CID font services (specification).                      */
-/*                                                                         */
-/*  Copyright 2007, 2009, 2012 by Derek Clegg, Michael Toftdal.            */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVCID_H__
-#define __SVCID_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_CID  "CID"
-
-  typedef FT_Error
-  (*FT_CID_GetRegistryOrderingSupplementFunc)( FT_Face       face,
-                                               const char*  *registry,
-                                               const char*  *ordering,
-                                               FT_Int       *supplement );
-  typedef FT_Error
-  (*FT_CID_GetIsInternallyCIDKeyedFunc)( FT_Face   face,
-                                         FT_Bool  *is_cid );
-  typedef FT_Error
-  (*FT_CID_GetCIDFromGlyphIndexFunc)( FT_Face   face,
-                                      FT_UInt   glyph_index,
-                                      FT_UInt  *cid );
-
-  FT_DEFINE_SERVICE( CID )
-  {
-    FT_CID_GetRegistryOrderingSupplementFunc  get_ros;
-    FT_CID_GetIsInternallyCIDKeyedFunc        get_is_cid;
-    FT_CID_GetCIDFromGlyphIndexFunc           get_cid_from_glyph_index;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
-                                  get_ros_,                                 \
-                                  get_is_cid_,                              \
-                                  get_cid_from_glyph_index_ )               \
-  static const FT_Service_CIDRec class_ =                                   \
-  {                                                                         \
-    get_ros_, get_is_cid_, get_cid_from_glyph_index_                        \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
-                                  get_ros_,                                 \
-                                  get_is_cid_,                              \
-                                  get_cid_from_glyph_index_ )               \
-  void                                                                      \
-  FT_Init_Class_ ## class_( FT_Library          library,                    \
-                            FT_Service_CIDRec*  clazz )                     \
-  {                                                                         \
-    FT_UNUSED( library );                                                   \
-                                                                            \
-    clazz->get_ros                  = get_ros_;                             \
-    clazz->get_is_cid               = get_is_cid_;                          \
-    clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_;            \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVCID_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svwinfnt.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svwinfnt.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svwinfnt.h	(copie de travail)
@@ -1,50 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svwinfnt.h                                                             */
-/*                                                                         */
-/*    The FreeType Windows FNT/FONT service (specification).               */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVWINFNT_H__
-#define __SVWINFNT_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_WINFONTS_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_WINFNT  "winfonts"
-
-  typedef FT_Error
-  (*FT_WinFnt_GetHeaderFunc)( FT_Face               face,
-                              FT_WinFNT_HeaderRec  *aheader );
-
-
-  FT_DEFINE_SERVICE( WinFnt )
-  {
-    FT_WinFnt_GetHeaderFunc  get_header;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVWINFNT_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svgldict.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svgldict.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svgldict.h	(copie de travail)
@@ -1,88 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svgldict.h                                                             */
-/*                                                                         */
-/*    The FreeType glyph dictionary services (specification).              */
-/*                                                                         */
-/*  Copyright 2003, 2009, 2012 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVGLDICT_H__
-#define __SVGLDICT_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A service used to retrieve glyph names, as well as to find the
-   *  index of a given glyph name in a font.
-   *
-   */
-
-#define FT_SERVICE_ID_GLYPH_DICT  "glyph-dict"
-
-
-  typedef FT_Error
-  (*FT_GlyphDict_GetNameFunc)( FT_Face     face,
-                               FT_UInt     glyph_index,
-                               FT_Pointer  buffer,
-                               FT_UInt     buffer_max );
-
-  typedef FT_UInt
-  (*FT_GlyphDict_NameIndexFunc)( FT_Face     face,
-                                 FT_String*  glyph_name );
-
-
-  FT_DEFINE_SERVICE( GlyphDict )
-  {
-    FT_GlyphDict_GetNameFunc    get_name;
-    FT_GlyphDict_NameIndexFunc  name_index;  /* optional */
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
-                                        get_name_,                     \
-                                        name_index_)                   \
-  static const FT_Service_GlyphDictRec  class_ =                       \
-  {                                                                    \
-    get_name_, name_index_                                             \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
-                                        get_name_,                     \
-                                        name_index_)                   \
-  void                                                                 \
-  FT_Init_Class_ ## class_( FT_Library                library,         \
-                            FT_Service_GlyphDictRec*  clazz )          \
-  {                                                                    \
-    FT_UNUSED( library );                                              \
-                                                                       \
-    clazz->get_name   = get_name_;                                     \
-    clazz->name_index = name_index_;                                   \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVGLDICT_H__ */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svmm.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svmm.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svmm.h	(copie de travail)
@@ -1,113 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svmm.h                                                                 */
-/*                                                                         */
-/*    The FreeType Multiple Masters and GX var services (specification).   */
-/*                                                                         */
-/*  Copyright 2003, 2004, 2009, 2012 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVMM_H__
-#define __SVMM_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A service used to manage multiple-masters data in a given face.
-   *
-   *  See the related APIs in `ftmm.h' (FT_MULTIPLE_MASTERS_H).
-   *
-   */
-
-#define FT_SERVICE_ID_MULTI_MASTERS  "multi-masters"
-
-
-  typedef FT_Error
-  (*FT_Get_MM_Func)( FT_Face           face,
-                     FT_Multi_Master*  master );
-
-  typedef FT_Error
-  (*FT_Get_MM_Var_Func)( FT_Face      face,
-                         FT_MM_Var*  *master );
-
-  typedef FT_Error
-  (*FT_Set_MM_Design_Func)( FT_Face   face,
-                            FT_UInt   num_coords,
-                            FT_Long*  coords );
-
-  typedef FT_Error
-  (*FT_Set_Var_Design_Func)( FT_Face    face,
-                             FT_UInt    num_coords,
-                             FT_Fixed*  coords );
-
-  typedef FT_Error
-  (*FT_Set_MM_Blend_Func)( FT_Face   face,
-                           FT_UInt   num_coords,
-                           FT_Long*  coords );
-
-
-  FT_DEFINE_SERVICE( MultiMasters )
-  {
-    FT_Get_MM_Func          get_mm;
-    FT_Set_MM_Design_Func   set_mm_design;
-    FT_Set_MM_Blend_Func    set_mm_blend;
-    FT_Get_MM_Var_Func      get_mm_var;
-    FT_Set_Var_Design_Func  set_var_design;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
-                                           get_mm_,                         \
-                                           set_mm_design_,                  \
-                                           set_mm_blend_,                   \
-                                           get_mm_var_,                     \
-                                           set_var_design_ )                \
-  static const FT_Service_MultiMastersRec  class_ =                         \
-  {                                                                         \
-    get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_    \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
-                                           get_mm_,                         \
-                                           set_mm_design_,                  \
-                                           set_mm_blend_,                   \
-                                           get_mm_var_,                     \
-                                           set_var_design_ )                \
-  void                                                                      \
-  FT_Init_Class_ ## class_( FT_Service_MultiMastersRec*  clazz )            \
-  {                                                                         \
-    clazz->get_mm         = get_mm_;                                        \
-    clazz->set_mm_design  = set_mm_design_;                                 \
-    clazz->set_mm_blend   = set_mm_blend_;                                  \
-    clazz->get_mm_var     = get_mm_var_;                                    \
-    clazz->set_var_design = set_var_design_;                                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __SVMM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svttglyf.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svttglyf.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svttglyf.h	(copie de travail)
@@ -1,68 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svttglyf.h                                                             */
-/*                                                                         */
-/*    The FreeType TrueType glyph service.                                 */
-/*                                                                         */
-/*  Copyright 2007, 2009, 2012 by David Turner.                            */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-#ifndef __SVTTGLYF_H__
-#define __SVTTGLYF_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_TT_GLYF  "tt-glyf"
-
-
-  typedef FT_ULong
-  (*TT_Glyf_GetLocationFunc)( FT_Face    face,
-                              FT_UInt    gindex,
-                              FT_ULong  *psize );
-
-  FT_DEFINE_SERVICE( TTGlyf )
-  {
-    TT_Glyf_GetLocationFunc  get_location;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
-  static const FT_Service_TTGlyfRec  class_ =                 \
-  {                                                           \
-    get_location_                                             \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
-  void                                                        \
-  FT_Init_Class_ ## class_( FT_Service_TTGlyfRec*  clazz )    \
-  {                                                           \
-    clazz->get_location = get_location_;                      \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __SVTTGLYF_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/services/svsfnt.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/services/svsfnt.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/services/svsfnt.h	(copie de travail)
@@ -1,103 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svsfnt.h                                                               */
-/*                                                                         */
-/*    The FreeType SFNT table loading service (specification).             */
-/*                                                                         */
-/*  Copyright 2003, 2004, 2009, 2012 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVSFNT_H__
-#define __SVSFNT_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  SFNT table loading service.
-   */
-
-#define FT_SERVICE_ID_SFNT_TABLE  "sfnt-table"
-
-
-  /*
-   * Used to implement FT_Load_Sfnt_Table().
-   */
-  typedef FT_Error
-  (*FT_SFNT_TableLoadFunc)( FT_Face    face,
-                            FT_ULong   tag,
-                            FT_Long    offset,
-                            FT_Byte*   buffer,
-                            FT_ULong*  length );
-
-  /*
-   * Used to implement FT_Get_Sfnt_Table().
-   */
-  typedef void*
-  (*FT_SFNT_TableGetFunc)( FT_Face      face,
-                           FT_Sfnt_Tag  tag );
-
-
-  /*
-   * Used to implement FT_Sfnt_Table_Info().
-   */
-  typedef FT_Error
-  (*FT_SFNT_TableInfoFunc)( FT_Face    face,
-                            FT_UInt    idx,
-                            FT_ULong  *tag,
-                            FT_ULong  *offset,
-                            FT_ULong  *length );
-
-
-  FT_DEFINE_SERVICE( SFNT_Table )
-  {
-    FT_SFNT_TableLoadFunc  load_table;
-    FT_SFNT_TableGetFunc   get_table;
-    FT_SFNT_TableInfoFunc  table_info;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ )  \
-  static const FT_Service_SFNT_TableRec  class_ =                      \
-  {                                                                    \
-    load_, get_, info_                                                 \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ ) \
-  void                                                                \
-  FT_Init_Class_ ## class_( FT_Service_SFNT_TableRec*  clazz )        \
-  {                                                                   \
-    clazz->load_table = load_;                                        \
-    clazz->get_table  = get_;                                         \
-    clazz->table_info = info_;                                        \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVSFNT_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/psaux.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/psaux.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/psaux.h	(copie de travail)
@@ -1,877 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  psaux.h                                                                */
-/*                                                                         */
-/*    Auxiliary functions and data structures related to PostScript fonts  */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 1996-2004, 2006, 2008, 2009, 2012 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSAUX_H__
-#define __PSAUX_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                             T1_TABLE                          *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct PS_TableRec_*              PS_Table;
-  typedef const struct PS_Table_FuncsRec_*  PS_Table_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_Table_FuncsRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A set of function pointers to manage PS_Table objects.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    table_init    :: Used to initialize a table.                       */
-  /*                                                                       */
-  /*    table_done    :: Finalizes resp. destroy a given table.            */
-  /*                                                                       */
-  /*    table_add     :: Adds a new object to a table.                     */
-  /*                                                                       */
-  /*    table_release :: Releases table data, then finalizes it.           */
-  /*                                                                       */
-  typedef struct  PS_Table_FuncsRec_
-  {
-    FT_Error
-    (*init)( PS_Table   table,
-             FT_Int     count,
-             FT_Memory  memory );
-
-    void
-    (*done)( PS_Table  table );
-
-    FT_Error
-    (*add)( PS_Table    table,
-            FT_Int      idx,
-            void*       object,
-            FT_PtrDist  length );
-
-    void
-    (*release)( PS_Table  table );
-
-  } PS_Table_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_TableRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A PS_Table is a simple object used to store an array of objects in */
-  /*    a single memory block.                                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    block     :: The address in memory of the growheap's block.  This  */
-  /*                 can change between two object adds, due to            */
-  /*                 reallocation.                                         */
-  /*                                                                       */
-  /*    cursor    :: The current top of the grow heap within its block.    */
-  /*                                                                       */
-  /*    capacity  :: The current size of the heap block.  Increments by    */
-  /*                 1kByte chunks.                                        */
-  /*                                                                       */
-  /*    init      :: Set to 0xDEADBEEF if `elements' and `lengths' have    */
-  /*                 been allocated.                                       */
-  /*                                                                       */
-  /*    max_elems :: The maximum number of elements in table.              */
-  /*                                                                       */
-  /*    num_elems :: The current number of elements in table.              */
-  /*                                                                       */
-  /*    elements  :: A table of element addresses within the block.        */
-  /*                                                                       */
-  /*    lengths   :: A table of element sizes within the block.            */
-  /*                                                                       */
-  /*    memory    :: The object used for memory operations                 */
-  /*                 (alloc/realloc).                                      */
-  /*                                                                       */
-  /*    funcs     :: A table of method pointers for this object.           */
-  /*                                                                       */
-  typedef struct  PS_TableRec_
-  {
-    FT_Byte*           block;          /* current memory block           */
-    FT_Offset          cursor;         /* current cursor in memory block */
-    FT_Offset          capacity;       /* current size of memory block   */
-    FT_Long            init;
-
-    FT_Int             max_elems;
-    FT_Int             num_elems;
-    FT_Byte**          elements;       /* addresses of table elements */
-    FT_PtrDist*        lengths;        /* lengths of table elements   */
-
-    FT_Memory          memory;
-    PS_Table_FuncsRec  funcs;
-
-  } PS_TableRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       T1 FIELDS & TOKENS                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct PS_ParserRec_*  PS_Parser;
-
-  typedef struct T1_TokenRec_*   T1_Token;
-
-  typedef struct T1_FieldRec_*   T1_Field;
-
-
-  /* simple enumeration type used to identify token types */
-  typedef enum  T1_TokenType_
-  {
-    T1_TOKEN_TYPE_NONE = 0,
-    T1_TOKEN_TYPE_ANY,
-    T1_TOKEN_TYPE_STRING,
-    T1_TOKEN_TYPE_ARRAY,
-    T1_TOKEN_TYPE_KEY, /* aka `name' */
-
-    /* do not remove */
-    T1_TOKEN_TYPE_MAX
-
-  } T1_TokenType;
-
-
-  /* a simple structure used to identify tokens */
-  typedef struct  T1_TokenRec_
-  {
-    FT_Byte*      start;   /* first character of token in input stream */
-    FT_Byte*      limit;   /* first character after the token          */
-    T1_TokenType  type;    /* type of token                            */
-
-  } T1_TokenRec;
-
-
-  /* enumeration type used to identify object fields */
-  typedef enum  T1_FieldType_
-  {
-    T1_FIELD_TYPE_NONE = 0,
-    T1_FIELD_TYPE_BOOL,
-    T1_FIELD_TYPE_INTEGER,
-    T1_FIELD_TYPE_FIXED,
-    T1_FIELD_TYPE_FIXED_1000,
-    T1_FIELD_TYPE_STRING,
-    T1_FIELD_TYPE_KEY,
-    T1_FIELD_TYPE_BBOX,
-    T1_FIELD_TYPE_MM_BBOX,
-    T1_FIELD_TYPE_INTEGER_ARRAY,
-    T1_FIELD_TYPE_FIXED_ARRAY,
-    T1_FIELD_TYPE_CALLBACK,
-
-    /* do not remove */
-    T1_FIELD_TYPE_MAX
-
-  } T1_FieldType;
-
-
-  typedef enum  T1_FieldLocation_
-  {
-    T1_FIELD_LOCATION_CID_INFO,
-    T1_FIELD_LOCATION_FONT_DICT,
-    T1_FIELD_LOCATION_FONT_EXTRA,
-    T1_FIELD_LOCATION_FONT_INFO,
-    T1_FIELD_LOCATION_PRIVATE,
-    T1_FIELD_LOCATION_BBOX,
-    T1_FIELD_LOCATION_LOADER,
-    T1_FIELD_LOCATION_FACE,
-    T1_FIELD_LOCATION_BLEND,
-
-    /* do not remove */
-    T1_FIELD_LOCATION_MAX
-
-  } T1_FieldLocation;
-
-
-  typedef void
-  (*T1_Field_ParseFunc)( FT_Face     face,
-                         FT_Pointer  parser );
-
-
-  /* structure type used to model object fields */
-  typedef struct  T1_FieldRec_
-  {
-    const char*         ident;        /* field identifier               */
-    T1_FieldLocation    location;
-    T1_FieldType        type;         /* type of field                  */
-    T1_Field_ParseFunc  reader;
-    FT_UInt             offset;       /* offset of field in object      */
-    FT_Byte             size;         /* size of field in bytes         */
-    FT_UInt             array_max;    /* maximum number of elements for */
-                                      /* array                          */
-    FT_UInt             count_offset; /* offset of element count for    */
-                                      /* arrays; must not be zero if in */
-                                      /* use -- in other words, a       */
-                                      /* `num_FOO' element must not     */
-                                      /* start the used structure if we */
-                                      /* parse a `FOO' array            */
-    FT_UInt             dict;         /* where we expect it             */
-  } T1_FieldRec;
-
-#define T1_FIELD_DICT_FONTDICT ( 1 << 0 ) /* also FontInfo and FDArray */
-#define T1_FIELD_DICT_PRIVATE  ( 1 << 1 )
-
-
-
-#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname, _dict ) \
-          {                                                 \
-            _ident, T1CODE, _type,                          \
-            0,                                              \
-            FT_FIELD_OFFSET( _fname ),                      \
-            FT_FIELD_SIZE( _fname ),                        \
-            0, 0,                                           \
-            _dict                                           \
-          },
-
-#define T1_NEW_CALLBACK_FIELD( _ident, _reader, _dict ) \
-          {                                             \
-            _ident, T1CODE, T1_FIELD_TYPE_CALLBACK,     \
-            (T1_Field_ParseFunc)_reader,                \
-            0, 0,                                       \
-            0, 0,                                       \
-            _dict                                       \
-          },
-
-#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max, _dict ) \
-          {                                                      \
-            _ident, T1CODE, _type,                               \
-            0,                                                   \
-            FT_FIELD_OFFSET( _fname ),                           \
-            FT_FIELD_SIZE_DELTA( _fname ),                       \
-            _max,                                                \
-            FT_FIELD_OFFSET( num_ ## _fname ),                   \
-            _dict                                                \
-          },
-
-#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max, _dict ) \
-          {                                                       \
-            _ident, T1CODE, _type,                                \
-            0,                                                    \
-            FT_FIELD_OFFSET( _fname ),                            \
-            FT_FIELD_SIZE_DELTA( _fname ),                        \
-            _max, 0,                                              \
-            _dict                                                 \
-          },
-
-
-#define T1_FIELD_BOOL( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BOOL, _fname, _dict )
-
-#define T1_FIELD_NUM( _ident, _fname, _dict )                                 \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER, _fname, _dict )
-
-#define T1_FIELD_FIXED( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED, _fname, _dict )
-
-#define T1_FIELD_FIXED_1000( _ident, _fname, _dict )                     \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_1000, _fname, \
-                               _dict )
-
-#define T1_FIELD_STRING( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_STRING, _fname, _dict )
-
-#define T1_FIELD_KEY( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_KEY, _fname, _dict )
-
-#define T1_FIELD_BBOX( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BBOX, _fname, _dict )
-
-
-#define T1_FIELD_NUM_TABLE( _ident, _fname, _fmax, _dict )         \
-          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
-                              _fname, _fmax, _dict )
-
-#define T1_FIELD_FIXED_TABLE( _ident, _fname, _fmax, _dict )     \
-          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
-                              _fname, _fmax, _dict )
-
-#define T1_FIELD_NUM_TABLE2( _ident, _fname, _fmax, _dict )         \
-          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
-                               _fname, _fmax, _dict )
-
-#define T1_FIELD_FIXED_TABLE2( _ident, _fname, _fmax, _dict )     \
-          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
-                               _fname, _fmax, _dict )
-
-#define T1_FIELD_CALLBACK( _ident, _name, _dict )       \
-          T1_NEW_CALLBACK_FIELD( _ident, _name, _dict )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                            T1 PARSER                          *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef const struct PS_Parser_FuncsRec_*  PS_Parser_Funcs;
-
-  typedef struct  PS_Parser_FuncsRec_
-  {
-    void
-    (*init)( PS_Parser  parser,
-             FT_Byte*   base,
-             FT_Byte*   limit,
-             FT_Memory  memory );
-
-    void
-    (*done)( PS_Parser  parser );
-
-    void
-    (*skip_spaces)( PS_Parser  parser );
-    void
-    (*skip_PS_token)( PS_Parser  parser );
-
-    FT_Long
-    (*to_int)( PS_Parser  parser );
-    FT_Fixed
-    (*to_fixed)( PS_Parser  parser,
-                 FT_Int     power_ten );
-
-    FT_Error
-    (*to_bytes)( PS_Parser  parser,
-                 FT_Byte*   bytes,
-                 FT_Offset  max_bytes,
-                 FT_Long*   pnum_bytes,
-                 FT_Bool    delimiters );
-
-    FT_Int
-    (*to_coord_array)( PS_Parser  parser,
-                       FT_Int     max_coords,
-                       FT_Short*  coords );
-    FT_Int
-    (*to_fixed_array)( PS_Parser  parser,
-                       FT_Int     max_values,
-                       FT_Fixed*  values,
-                       FT_Int     power_ten );
-
-    void
-    (*to_token)( PS_Parser  parser,
-                 T1_Token   token );
-    void
-    (*to_token_array)( PS_Parser  parser,
-                       T1_Token   tokens,
-                       FT_UInt    max_tokens,
-                       FT_Int*    pnum_tokens );
-
-    FT_Error
-    (*load_field)( PS_Parser       parser,
-                   const T1_Field  field,
-                   void**          objects,
-                   FT_UInt         max_objects,
-                   FT_ULong*       pflags );
-
-    FT_Error
-    (*load_field_table)( PS_Parser       parser,
-                         const T1_Field  field,
-                         void**          objects,
-                         FT_UInt         max_objects,
-                         FT_ULong*       pflags );
-
-  } PS_Parser_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_ParserRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A PS_Parser is an object used to parse a Type 1 font very quickly. */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    cursor :: The current position in the text.                        */
-  /*                                                                       */
-  /*    base   :: Start of the processed text.                             */
-  /*                                                                       */
-  /*    limit  :: End of the processed text.                               */
-  /*                                                                       */
-  /*    error  :: The last error returned.                                 */
-  /*                                                                       */
-  /*    memory :: The object used for memory operations (alloc/realloc).   */
-  /*                                                                       */
-  /*    funcs  :: A table of functions for the parser.                     */
-  /*                                                                       */
-  typedef struct  PS_ParserRec_
-  {
-    FT_Byte*   cursor;
-    FT_Byte*   base;
-    FT_Byte*   limit;
-    FT_Error   error;
-    FT_Memory  memory;
-
-    PS_Parser_FuncsRec  funcs;
-
-  } PS_ParserRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                         T1 BUILDER                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct T1_BuilderRec_*  T1_Builder;
-
-
-  typedef FT_Error
-  (*T1_Builder_Check_Points_Func)( T1_Builder  builder,
-                                   FT_Int      count );
-
-  typedef void
-  (*T1_Builder_Add_Point_Func)( T1_Builder  builder,
-                                FT_Pos      x,
-                                FT_Pos      y,
-                                FT_Byte     flag );
-
-  typedef FT_Error
-  (*T1_Builder_Add_Point1_Func)( T1_Builder  builder,
-                                 FT_Pos      x,
-                                 FT_Pos      y );
-
-  typedef FT_Error
-  (*T1_Builder_Add_Contour_Func)( T1_Builder  builder );
-
-  typedef FT_Error
-  (*T1_Builder_Start_Point_Func)( T1_Builder  builder,
-                                  FT_Pos      x,
-                                  FT_Pos      y );
-
-  typedef void
-  (*T1_Builder_Close_Contour_Func)( T1_Builder  builder );
-
-
-  typedef const struct T1_Builder_FuncsRec_*  T1_Builder_Funcs;
-
-  typedef struct  T1_Builder_FuncsRec_
-  {
-    void
-    (*init)( T1_Builder    builder,
-             FT_Face       face,
-             FT_Size       size,
-             FT_GlyphSlot  slot,
-             FT_Bool       hinting );
-
-    void
-    (*done)( T1_Builder   builder );
-
-    T1_Builder_Check_Points_Func   check_points;
-    T1_Builder_Add_Point_Func      add_point;
-    T1_Builder_Add_Point1_Func     add_point1;
-    T1_Builder_Add_Contour_Func    add_contour;
-    T1_Builder_Start_Point_Func    start_point;
-    T1_Builder_Close_Contour_Func  close_contour;
-
-  } T1_Builder_FuncsRec;
-
-
-  /* an enumeration type to handle charstring parsing states */
-  typedef enum  T1_ParseState_
-  {
-    T1_Parse_Start,
-    T1_Parse_Have_Width,
-    T1_Parse_Have_Moveto,
-    T1_Parse_Have_Path
-
-  } T1_ParseState;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Structure>                                                           */
-  /*    T1_BuilderRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*     A structure used during glyph loading to store its outline.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory       :: The current memory object.                         */
-  /*                                                                       */
-  /*    face         :: The current face object.                           */
-  /*                                                                       */
-  /*    glyph        :: The current glyph slot.                            */
-  /*                                                                       */
-  /*    loader       :: XXX                                                */
-  /*                                                                       */
-  /*    base         :: The base glyph outline.                            */
-  /*                                                                       */
-  /*    current      :: The current glyph outline.                         */
-  /*                                                                       */
-  /*    max_points   :: maximum points in builder outline                  */
-  /*                                                                       */
-  /*    max_contours :: Maximum number of contours in builder outline.     */
-  /*                                                                       */
-  /*    pos_x        :: The horizontal translation (if composite glyph).   */
-  /*                                                                       */
-  /*    pos_y        :: The vertical translation (if composite glyph).     */
-  /*                                                                       */
-  /*    left_bearing :: The left side bearing point.                       */
-  /*                                                                       */
-  /*    advance      :: The horizontal advance vector.                     */
-  /*                                                                       */
-  /*    bbox         :: Unused.                                            */
-  /*                                                                       */
-  /*    parse_state  :: An enumeration which controls the charstring       */
-  /*                    parsing state.                                     */
-  /*                                                                       */
-  /*    load_points  :: If this flag is not set, no points are loaded.     */
-  /*                                                                       */
-  /*    no_recurse   :: Set but not used.                                  */
-  /*                                                                       */
-  /*    metrics_only :: A boolean indicating that we only want to compute  */
-  /*                    the metrics of a given glyph, not load all of its  */
-  /*                    points.                                            */
-  /*                                                                       */
-  /*    funcs        :: An array of function pointers for the builder.     */
-  /*                                                                       */
-  typedef struct  T1_BuilderRec_
-  {
-    FT_Memory       memory;
-    FT_Face         face;
-    FT_GlyphSlot    glyph;
-    FT_GlyphLoader  loader;
-    FT_Outline*     base;
-    FT_Outline*     current;
-
-    FT_Pos          pos_x;
-    FT_Pos          pos_y;
-
-    FT_Vector       left_bearing;
-    FT_Vector       advance;
-
-    FT_BBox         bbox;          /* bounding box */
-    T1_ParseState   parse_state;
-    FT_Bool         load_points;
-    FT_Bool         no_recurse;
-
-    FT_Bool         metrics_only;
-
-    void*           hints_funcs;    /* hinter-specific */
-    void*           hints_globals;  /* hinter-specific */
-
-    T1_Builder_FuncsRec  funcs;
-
-  } T1_BuilderRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                         T1 DECODER                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
-  /* calls during glyph loading.                                           */
-  /*                                                                       */
-#define T1_MAX_SUBRS_CALLS  8
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
-  /* minimum of 16 is required.                                            */
-  /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  32
-
-#endif /* 0 */
-
-
-  typedef struct  T1_Decoder_ZoneRec_
-  {
-    FT_Byte*  cursor;
-    FT_Byte*  base;
-    FT_Byte*  limit;
-
-  } T1_Decoder_ZoneRec, *T1_Decoder_Zone;
-
-
-  typedef struct T1_DecoderRec_*              T1_Decoder;
-  typedef const struct T1_Decoder_FuncsRec_*  T1_Decoder_Funcs;
-
-
-  typedef FT_Error
-  (*T1_Decoder_Callback)( T1_Decoder  decoder,
-                          FT_UInt     glyph_index );
-
-
-  typedef struct  T1_Decoder_FuncsRec_
-  {
-    FT_Error
-    (*init)( T1_Decoder           decoder,
-             FT_Face              face,
-             FT_Size              size,
-             FT_GlyphSlot         slot,
-             FT_Byte**            glyph_names,
-             PS_Blend             blend,
-             FT_Bool              hinting,
-             FT_Render_Mode       hint_mode,
-             T1_Decoder_Callback  callback );
-
-    void
-    (*done)( T1_Decoder  decoder );
-
-    FT_Error
-    (*parse_charstrings)( T1_Decoder  decoder,
-                          FT_Byte*    base,
-                          FT_UInt     len );
-
-  } T1_Decoder_FuncsRec;
-
-
-  typedef struct  T1_DecoderRec_
-  {
-    T1_BuilderRec        builder;
-
-    FT_Long              stack[T1_MAX_CHARSTRINGS_OPERANDS];
-    FT_Long*             top;
-
-    T1_Decoder_ZoneRec   zones[T1_MAX_SUBRS_CALLS + 1];
-    T1_Decoder_Zone      zone;
-
-    FT_Service_PsCMaps   psnames;      /* for seac */
-    FT_UInt              num_glyphs;
-    FT_Byte**            glyph_names;
-
-    FT_Int               lenIV;        /* internal for sub routine calls */
-    FT_UInt              num_subrs;
-    FT_Byte**            subrs;
-    FT_PtrDist*          subrs_len;    /* array of subrs length (optional) */
-
-    FT_Matrix            font_matrix;
-    FT_Vector            font_offset;
-
-    FT_Int               flex_state;
-    FT_Int               num_flex_vectors;
-    FT_Vector            flex_vectors[7];
-
-    PS_Blend             blend;       /* for multiple master support */
-
-    FT_Render_Mode       hint_mode;
-
-    T1_Decoder_Callback  parse_callback;
-    T1_Decoder_FuncsRec  funcs;
-
-    FT_Long*             buildchar;
-    FT_UInt              len_buildchar;
-
-    FT_Bool              seac;
-
-  } T1_DecoderRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                            AFM PARSER                         *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct AFM_ParserRec_*  AFM_Parser;
-
-  typedef struct  AFM_Parser_FuncsRec_
-  {
-    FT_Error
-    (*init)( AFM_Parser  parser,
-             FT_Memory   memory,
-             FT_Byte*    base,
-             FT_Byte*    limit );
-
-    void
-    (*done)( AFM_Parser  parser );
-
-    FT_Error
-    (*parse)( AFM_Parser  parser );
-
-  } AFM_Parser_FuncsRec;
-
-
-  typedef struct AFM_StreamRec_*  AFM_Stream;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    AFM_ParserRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An AFM_Parser is a parser for the AFM files.                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory    :: The object used for memory operations (alloc and      */
-  /*                 realloc).                                             */
-  /*                                                                       */
-  /*    stream    :: This is an opaque object.                             */
-  /*                                                                       */
-  /*    FontInfo  :: The result will be stored here.                       */
-  /*                                                                       */
-  /*    get_index :: A user provided function to get a glyph index by its  */
-  /*                 name.                                                 */
-  /*                                                                       */
-  typedef struct  AFM_ParserRec_
-  {
-    FT_Memory     memory;
-    AFM_Stream    stream;
-
-    AFM_FontInfo  FontInfo;
-
-    FT_Int
-    (*get_index)( const char*  name,
-                  FT_Offset    len,
-                  void*        user_data );
-
-    void*         user_data;
-
-  } AFM_ParserRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                     TYPE1 CHARMAPS                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef const struct T1_CMap_ClassesRec_*  T1_CMap_Classes;
-
-  typedef struct T1_CMap_ClassesRec_
-  {
-    FT_CMap_Class  standard;
-    FT_CMap_Class  expert;
-    FT_CMap_Class  custom;
-    FT_CMap_Class  unicode;
-
-  } T1_CMap_ClassesRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                        PSAux Module Interface                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct  PSAux_ServiceRec_
-  {
-    /* don't use `PS_Table_Funcs' and friends to avoid compiler warnings */
-    const PS_Table_FuncsRec*    ps_table_funcs;
-    const PS_Parser_FuncsRec*   ps_parser_funcs;
-    const T1_Builder_FuncsRec*  t1_builder_funcs;
-    const T1_Decoder_FuncsRec*  t1_decoder_funcs;
-
-    void
-    (*t1_decrypt)( FT_Byte*   buffer,
-                   FT_Offset  length,
-                   FT_UShort  seed );
-
-    T1_CMap_Classes  t1_cmap_classes;
-
-    /* fields after this comment line were added after version 2.1.10 */
-    const AFM_Parser_FuncsRec*  afm_parser_funcs;
-
-  } PSAux_ServiceRec, *PSAux_Service;
-
-  /* backwards-compatible type definition */
-  typedef PSAux_ServiceRec   PSAux_Interface;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                 Some convenience functions                    *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#define IS_PS_NEWLINE( ch ) \
-  ( (ch) == '\r' ||         \
-    (ch) == '\n' )
-
-#define IS_PS_SPACE( ch )  \
-  ( (ch) == ' '         || \
-    IS_PS_NEWLINE( ch ) || \
-    (ch) == '\t'        || \
-    (ch) == '\f'        || \
-    (ch) == '\0' )
-
-#define IS_PS_SPECIAL( ch )       \
-  ( (ch) == '/'                || \
-    (ch) == '(' || (ch) == ')' || \
-    (ch) == '<' || (ch) == '>' || \
-    (ch) == '[' || (ch) == ']' || \
-    (ch) == '{' || (ch) == '}' || \
-    (ch) == '%'                )
-
-#define IS_PS_DELIM( ch )  \
-  ( IS_PS_SPACE( ch )   || \
-    IS_PS_SPECIAL( ch ) )
-
-#define IS_PS_DIGIT( ch )        \
-  ( (ch) >= '0' && (ch) <= '9' )
-
-#define IS_PS_XDIGIT( ch )            \
-  ( IS_PS_DIGIT( ch )              || \
-    ( (ch) >= 'A' && (ch) <= 'F' ) || \
-    ( (ch) >= 'a' && (ch) <= 'f' ) )
-
-#define IS_PS_BASE85( ch )       \
-  ( (ch) >= '!' && (ch) <= 'u' )
-
-#define IS_PS_TOKEN( cur, limit, token )                                \
-  ( (char)(cur)[0] == (token)[0]                                     && \
-    ( (cur) + sizeof ( (token) ) == (limit) ||                          \
-      ( (cur) + sizeof( (token) ) < (limit)          &&                 \
-        IS_PS_DELIM( (cur)[sizeof ( (token) ) - 1] ) ) )             && \
-    ft_strncmp( (char*)(cur), (token), sizeof ( (token) ) - 1 ) == 0 )
-
-
-FT_END_HEADER
-
-#endif /* __PSAUX_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftgloadr.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftgloadr.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftgloadr.h	(copie de travail)
@@ -1,168 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgloadr.h                                                             */
-/*                                                                         */
-/*    The FreeType glyph loader (specification).                           */
-/*                                                                         */
-/*  Copyright 2002, 2003, 2005, 2006 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTGLOADR_H__
-#define __FTGLOADR_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphLoader                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The glyph loader is an internal object used to load several glyphs */
-  /*    together (for example, in the case of composites).                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The glyph loader implementation is not part of the high-level API, */
-  /*    hence the forward structure declaration.                           */
-  /*                                                                       */
-  typedef struct FT_GlyphLoaderRec_*  FT_GlyphLoader ;
-
-
-#if 0  /* moved to freetype.h in version 2.2 */
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
-#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
-#define FT_SUBGLYPH_FLAG_SCALE                   8
-#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
-#define FT_SUBGLYPH_FLAG_2X2                  0x80
-#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
-#endif
-
-
-  typedef struct  FT_SubGlyphRec_
-  {
-    FT_Int     index;
-    FT_UShort  flags;
-    FT_Int     arg1;
-    FT_Int     arg2;
-    FT_Matrix  transform;
-
-  } FT_SubGlyphRec;
-
-
-  typedef struct  FT_GlyphLoadRec_
-  {
-    FT_Outline   outline;       /* outline                   */
-    FT_Vector*   extra_points;  /* extra points table        */
-    FT_Vector*   extra_points2; /* second extra points table */
-    FT_UInt      num_subglyphs; /* number of subglyphs       */
-    FT_SubGlyph  subglyphs;     /* subglyphs                 */
-
-  } FT_GlyphLoadRec, *FT_GlyphLoad;
-
-
-  typedef struct  FT_GlyphLoaderRec_
-  {
-    FT_Memory        memory;
-    FT_UInt          max_points;
-    FT_UInt          max_contours;
-    FT_UInt          max_subglyphs;
-    FT_Bool          use_extra;
-
-    FT_GlyphLoadRec  base;
-    FT_GlyphLoadRec  current;
-
-    void*            other;            /* for possible future extension? */
-
-  } FT_GlyphLoaderRec;
-
-
-  /* create new empty glyph loader */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_New( FT_Memory        memory,
-                      FT_GlyphLoader  *aloader );
-
-  /* add an extra points table to a glyph loader */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CreateExtra( FT_GlyphLoader  loader );
-
-  /* destroy a glyph loader */
-  FT_BASE( void )
-  FT_GlyphLoader_Done( FT_GlyphLoader  loader );
-
-  /* reset a glyph loader (frees everything int it) */
-  FT_BASE( void )
-  FT_GlyphLoader_Reset( FT_GlyphLoader  loader );
-
-  /* rewind a glyph loader */
-  FT_BASE( void )
-  FT_GlyphLoader_Rewind( FT_GlyphLoader  loader );
-
-  /* check that there is enough space to add `n_points' and `n_contours' */
-  /* to the glyph loader                                                 */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CheckPoints( FT_GlyphLoader  loader,
-                              FT_UInt         n_points,
-                              FT_UInt         n_contours );
-
-
-#define FT_GLYPHLOADER_CHECK_P( _loader, _count )                         \
-   ( (_count) == 0 || ((_loader)->base.outline.n_points    +              \
-                       (_loader)->current.outline.n_points +              \
-                       (unsigned long)(_count)) <= (_loader)->max_points )
-
-#define FT_GLYPHLOADER_CHECK_C( _loader, _count )                          \
-  ( (_count) == 0 || ((_loader)->base.outline.n_contours    +              \
-                      (_loader)->current.outline.n_contours +              \
-                      (unsigned long)(_count)) <= (_loader)->max_contours )
-
-#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points,_contours )      \
-  ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points )   &&                  \
-      FT_GLYPHLOADER_CHECK_C( _loader, _contours ) )                   \
-    ? 0                                                                \
-    : FT_GlyphLoader_CheckPoints( (_loader), (_points), (_contours) ) )
-
-
-  /* check that there is enough space to add `n_subs' sub-glyphs to */
-  /* a glyph loader                                                 */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CheckSubGlyphs( FT_GlyphLoader  loader,
-                                 FT_UInt         n_subs );
-
-  /* prepare a glyph loader, i.e. empty the current glyph */
-  FT_BASE( void )
-  FT_GlyphLoader_Prepare( FT_GlyphLoader  loader );
-
-  /* add the current glyph to the base glyph */
-  FT_BASE( void )
-  FT_GlyphLoader_Add( FT_GlyphLoader  loader );
-
-  /* copy points from one glyph loader to another */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CopyPoints( FT_GlyphLoader  target,
-                             FT_GlyphLoader  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGLOADR_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftmemory.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftmemory.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftmemory.h	(copie de travail)
@@ -1,378 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmemory.h                                                             */
-/*                                                                         */
-/*    The FreeType memory management macros (specification).               */
-/*                                                                         */
-/*  Copyright 1996-2002, 2004-2007, 2010, 2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMEMORY_H__
-#define __FTMEMORY_H__
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_SET_ERROR                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used to set an implicit `error' variable to a given  */
-  /*    expression's value (usually a function call), and convert it to a  */
-  /*    boolean which is set whenever the value is != 0.                   */
-  /*                                                                       */
-#undef  FT_SET_ERROR
-#define FT_SET_ERROR( expression ) \
-          ( ( error = (expression) ) != 0 )
-
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                           M E M O R Y                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*
-   *  C++ refuses to handle statements like p = (void*)anything, with `p' a
-   *  typed pointer.  Since we don't have a `typeof' operator in standard
-   *  C++, we have to use a template to emulate it.
-   */
-
-#ifdef __cplusplus
-
-  extern "C++"
-  template <typename T> inline T*
-  cplusplus_typeof(        T*,
-                    void  *v )
-  {
-    return static_cast <T*> ( v );
-  }
-
-#define FT_ASSIGNP( p, val )  (p) = cplusplus_typeof( (p), (val) )
-
-#else
-
-#define FT_ASSIGNP( p, val )  (p) = (val)
-
-#endif
-
-
-
-#ifdef FT_DEBUG_MEMORY
-
-  FT_BASE( const char* )  _ft_debug_file;
-  FT_BASE( long )         _ft_debug_lineno;
-
-#define FT_DEBUG_INNER( exp )  ( _ft_debug_file   = __FILE__, \
-                                 _ft_debug_lineno = __LINE__, \
-                                 (exp) )
-
-#define FT_ASSIGNP_INNER( p, exp )  ( _ft_debug_file   = __FILE__, \
-                                      _ft_debug_lineno = __LINE__, \
-                                      FT_ASSIGNP( p, exp ) )
-
-#else /* !FT_DEBUG_MEMORY */
-
-#define FT_DEBUG_INNER( exp )       (exp)
-#define FT_ASSIGNP_INNER( p, exp )  FT_ASSIGNP( p, exp )
-
-#endif /* !FT_DEBUG_MEMORY */
-
-
-  /*
-   *  The allocation functions return a pointer, and the error code
-   *  is written to through the `p_error' parameter.  See below for
-   *  for documentation.
-   */
-
-  FT_BASE( FT_Pointer )
-  ft_mem_alloc( FT_Memory  memory,
-                FT_Long    size,
-                FT_Error  *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_qalloc( FT_Memory  memory,
-                 FT_Long    size,
-                 FT_Error  *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_realloc( FT_Memory  memory,
-                  FT_Long    item_size,
-                  FT_Long    cur_count,
-                  FT_Long    new_count,
-                  void*      block,
-                  FT_Error  *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_qrealloc( FT_Memory  memory,
-                   FT_Long    item_size,
-                   FT_Long    cur_count,
-                   FT_Long    new_count,
-                   void*      block,
-                   FT_Error  *p_error );
-
-  FT_BASE( void )
-  ft_mem_free( FT_Memory    memory,
-               const void*  P );
-
-
-#define FT_MEM_ALLOC( ptr, size )                               \
-          FT_ASSIGNP_INNER( ptr, ft_mem_alloc( memory,          \
-                                               (FT_Long)(size), \
-                                               &error ) )
-
-#define FT_MEM_FREE( ptr )                \
-          FT_BEGIN_STMNT                  \
-            ft_mem_free( memory, (ptr) ); \
-            (ptr) = NULL;                 \
-          FT_END_STMNT
-
-#define FT_MEM_NEW( ptr )                        \
-          FT_MEM_ALLOC( ptr, sizeof ( *(ptr) ) )
-
-#define FT_MEM_REALLOC( ptr, cursz, newsz )                        \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,           \
-                                                 1,                \
-                                                 (FT_Long)(cursz), \
-                                                 (FT_Long)(newsz), \
-                                                 (ptr),            \
-                                                 &error ) )
-
-#define FT_MEM_QALLOC( ptr, size )                               \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qalloc( memory,          \
-                                                (FT_Long)(size), \
-                                                &error ) )
-
-#define FT_MEM_QNEW( ptr )                        \
-          FT_MEM_QALLOC( ptr, sizeof ( *(ptr) ) )
-
-#define FT_MEM_QREALLOC( ptr, cursz, newsz )                        \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,           \
-                                                  1,                \
-                                                  (FT_Long)(cursz), \
-                                                  (FT_Long)(newsz), \
-                                                  (ptr),            \
-                                                  &error ) )
-
-#define FT_MEM_ALLOC_MULT( ptr, count, item_size )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,               \
-                                                 (FT_Long)(item_size), \
-                                                 0,                    \
-                                                 (FT_Long)(count),     \
-                                                 NULL,                 \
-                                                 &error ) )
-
-#define FT_MEM_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz )           \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
-                                                 (FT_Long)(itmsz),  \
-                                                 (FT_Long)(oldcnt), \
-                                                 (FT_Long)(newcnt), \
-                                                 (ptr),             \
-                                                 &error ) )
-
-#define FT_MEM_QALLOC_MULT( ptr, count, item_size )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,               \
-                                                  (FT_Long)(item_size), \
-                                                  0,                    \
-                                                  (FT_Long)(count),     \
-                                                  NULL,                 \
-                                                  &error ) )
-
-#define FT_MEM_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz)            \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
-                                                  (FT_Long)(itmsz),  \
-                                                  (FT_Long)(oldcnt), \
-                                                  (FT_Long)(newcnt), \
-                                                  (ptr),             \
-                                                  &error ) )
-
-
-#define FT_MEM_SET_ERROR( cond )  ( (cond), error != 0 )
-
-
-#define FT_MEM_SET( dest, byte, count )     ft_memset( dest, byte, count )
-
-#define FT_MEM_COPY( dest, source, count )  ft_memcpy( dest, source, count )
-
-#define FT_MEM_MOVE( dest, source, count )  ft_memmove( dest, source, count )
-
-
-#define FT_MEM_ZERO( dest, count )  FT_MEM_SET( dest, 0, count )
-
-#define FT_ZERO( p )                FT_MEM_ZERO( p, sizeof ( *(p) ) )
-
-
-#define FT_ARRAY_ZERO( dest, count )                        \
-          FT_MEM_ZERO( dest, (count) * sizeof ( *(dest) ) )
-
-#define FT_ARRAY_COPY( dest, source, count )                        \
-          FT_MEM_COPY( dest, source, (count) * sizeof ( *(dest) ) )
-
-#define FT_ARRAY_MOVE( dest, source, count )                        \
-          FT_MEM_MOVE( dest, source, (count) * sizeof ( *(dest) ) )
-
-
-  /*
-   *  Return the maximum number of addressable elements in an array.
-   *  We limit ourselves to INT_MAX, rather than UINT_MAX, to avoid
-   *  any problems.
-   */
-#define FT_ARRAY_MAX( ptr )           ( FT_INT_MAX / sizeof ( *(ptr) ) )
-
-#define FT_ARRAY_CHECK( ptr, count )  ( (count) <= FT_ARRAY_MAX( ptr ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The following functions macros expect that their pointer argument is  */
-  /* _typed_ in order to automatically compute array element sizes.        */
-  /*                                                                       */
-
-#define FT_MEM_NEW_ARRAY( ptr, count )                              \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
-                                                 sizeof ( *(ptr) ), \
-                                                 0,                 \
-                                                 (FT_Long)(count),  \
-                                                 NULL,              \
-                                                 &error ) )
-
-#define FT_MEM_RENEW_ARRAY( ptr, cursz, newsz )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
-                                                 sizeof ( *(ptr) ), \
-                                                 (FT_Long)(cursz),  \
-                                                 (FT_Long)(newsz),  \
-                                                 (ptr),             \
-                                                 &error ) )
-
-#define FT_MEM_QNEW_ARRAY( ptr, count )                              \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
-                                                  sizeof ( *(ptr) ), \
-                                                  0,                 \
-                                                  (FT_Long)(count),  \
-                                                  NULL,              \
-                                                  &error ) )
-
-#define FT_MEM_QRENEW_ARRAY( ptr, cursz, newsz )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
-                                                  sizeof ( *(ptr) ), \
-                                                  (FT_Long)(cursz),  \
-                                                  (FT_Long)(newsz),  \
-                                                  (ptr),             \
-                                                  &error ) )
-
-#define FT_ALLOC( ptr, size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_ALLOC( ptr, size ) )
-
-#define FT_REALLOC( ptr, cursz, newsz )                           \
-          FT_MEM_SET_ERROR( FT_MEM_REALLOC( ptr, cursz, newsz ) )
-
-#define FT_ALLOC_MULT( ptr, count, item_size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_ALLOC_MULT( ptr, count, item_size ) )
-
-#define FT_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz )              \
-          FT_MEM_SET_ERROR( FT_MEM_REALLOC_MULT( ptr, oldcnt,      \
-                                                 newcnt, itmsz ) )
-
-#define FT_QALLOC( ptr, size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QALLOC( ptr, size ) )
-
-#define FT_QREALLOC( ptr, cursz, newsz )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QREALLOC( ptr, cursz, newsz ) )
-
-#define FT_QALLOC_MULT( ptr, count, item_size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QALLOC_MULT( ptr, count, item_size ) )
-
-#define FT_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz )              \
-          FT_MEM_SET_ERROR( FT_MEM_QREALLOC_MULT( ptr, oldcnt,      \
-                                                  newcnt, itmsz ) )
-
-#define FT_FREE( ptr )  FT_MEM_FREE( ptr )
-
-#define FT_NEW( ptr )  FT_MEM_SET_ERROR( FT_MEM_NEW( ptr ) )
-
-#define FT_NEW_ARRAY( ptr, count )                           \
-          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
-
-#define FT_RENEW_ARRAY( ptr, curcnt, newcnt )                           \
-          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
-
-#define FT_QNEW( ptr )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QNEW( ptr ) )
-
-#define FT_QNEW_ARRAY( ptr, count )                          \
-          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
-
-#define FT_QRENEW_ARRAY( ptr, curcnt, newcnt )                          \
-          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
-
-
-  FT_BASE( FT_Pointer )
-  ft_mem_strdup( FT_Memory    memory,
-                 const char*  str,
-                 FT_Error    *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_dup( FT_Memory    memory,
-              const void*  address,
-              FT_ULong     size,
-              FT_Error    *p_error );
-
-
-#define FT_MEM_STRDUP( dst, str )                                            \
-          (dst) = (char*)ft_mem_strdup( memory, (const char*)(str), &error )
-
-#define FT_STRDUP( dst, str )                           \
-          FT_MEM_SET_ERROR( FT_MEM_STRDUP( dst, str ) )
-
-#define FT_MEM_DUP( dst, address, size )                                    \
-          (dst) = ft_mem_dup( memory, (address), (FT_ULong)(size), &error )
-
-#define FT_DUP( dst, address, size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_DUP( dst, address, size ) )
-
-
-  /* Return >= 1 if a truncation occurs.            */
-  /* Return 0 if the source string fits the buffer. */
-  /* This is *not* the same as strlcpy().           */
-  FT_BASE( FT_Int )
-  ft_mem_strcpyn( char*        dst,
-                  const char*  src,
-                  FT_ULong     size );
-
-#define FT_STRCPYN( dst, src, size )                                         \
-          ft_mem_strcpyn( (char*)dst, (const char*)(src), (FT_ULong)(size) )
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTMEMORY_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftpic.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftpic.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftpic.h	(copie de travail)
@@ -1,71 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftpic.h                                                                */
-/*                                                                         */
-/*    The FreeType position independent code services (declaration).       */
-/*                                                                         */
-/*  Copyright 2009, 2012 by                                                */
-/*  Oran Agra and Mickey Gabel.                                            */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Modules that ordinarily have const global data that need address     */
-  /*  can instead define pointers here.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTPIC_H__
-#define __FTPIC_H__
-
-
-FT_BEGIN_HEADER
-
-#ifdef FT_CONFIG_OPTION_PIC
-
-  typedef struct  FT_PIC_Container_
-  {
-    /* pic containers for base */
-    void*  base;
-
-    /* pic containers for modules */
-    void*  autofit;
-    void*  cff;
-    void*  pshinter;
-    void*  psnames;
-    void*  raster;
-    void*  sfnt;
-    void*  smooth;
-    void*  truetype;
-
-  } FT_PIC_Container;
-
-
-  /* Initialize the various function tables, structs, etc. */
-  /* stored in the container.                              */
-  FT_BASE( FT_Error )
-  ft_pic_container_init( FT_Library  library );
-
-
-  /* Destroy the contents of the container. */
-  FT_BASE( void )
-  ft_pic_container_destroy( FT_Library  library );
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTPIC_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/t1types.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/t1types.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/t1types.h	(copie de travail)
@@ -1,255 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t1types.h                                                              */
-/*                                                                         */
-/*    Basic Type1/Type2 type definitions and interface (specification      */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2004, 2006, 2008, 2009, 2011, 2013 by                   */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __T1TYPES_H__
-#define __T1TYPES_H__
-
-
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
-#include FT_INTERNAL_SERVICE_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***              REQUIRED TYPE1/TYPE2 TABLES DEFINITIONS              ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_EncodingRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling a custom encoding.                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_chars  :: The number of character codes in the encoding.       */
-  /*                  Usually 256.                                         */
-  /*                                                                       */
-  /*    code_first :: The lowest valid character code in the encoding.     */
-  /*                                                                       */
-  /*    code_last  :: The highest valid character code in the encoding     */
-  /*                  + 1. When equal to code_first there are no valid     */
-  /*                  character codes.                                     */
-  /*                                                                       */
-  /*    char_index :: An array of corresponding glyph indices.             */
-  /*                                                                       */
-  /*    char_name  :: An array of corresponding glyph names.               */
-  /*                                                                       */
-  typedef struct  T1_EncodingRecRec_
-  {
-    FT_Int       num_chars;
-    FT_Int       code_first;
-    FT_Int       code_last;
-
-    FT_UShort*   char_index;
-    FT_String**  char_name;
-
-  } T1_EncodingRec, *T1_Encoding;
-
-
-  /* used to hold extra data of PS_FontInfoRec that
-   * cannot be stored in the publicly defined structure.
-   *
-   * Note these can't be blended with multiple-masters.
-   */
-  typedef struct  PS_FontExtraRec_
-  {
-    FT_UShort  fs_type;
-
-  } PS_FontExtraRec;
-
-
-  typedef struct  T1_FontRec_
-  {
-    PS_FontInfoRec   font_info;         /* font info dictionary   */
-    PS_FontExtraRec  font_extra;        /* font info extra fields */
-    PS_PrivateRec    private_dict;      /* private dictionary     */
-    FT_String*       font_name;         /* top-level dictionary   */
-
-    T1_EncodingType  encoding_type;
-    T1_EncodingRec   encoding;
-
-    FT_Byte*         subrs_block;
-    FT_Byte*         charstrings_block;
-    FT_Byte*         glyph_names_block;
-
-    FT_Int           num_subrs;
-    FT_Byte**        subrs;
-    FT_PtrDist*      subrs_len;
-
-    FT_Int           num_glyphs;
-    FT_String**      glyph_names;       /* array of glyph names       */
-    FT_Byte**        charstrings;       /* array of glyph charstrings */
-    FT_PtrDist*      charstrings_len;
-
-    FT_Byte          paint_type;
-    FT_Byte          font_type;
-    FT_Matrix        font_matrix;
-    FT_Vector        font_offset;
-    FT_BBox          font_bbox;
-    FT_Long          font_id;
-
-    FT_Fixed         stroke_width;
-
-  } T1_FontRec, *T1_Font;
-
-
-  typedef struct  CID_SubrsRec_
-  {
-    FT_UInt    num_subrs;
-    FT_Byte**  code;
-
-  } CID_SubrsRec, *CID_Subrs;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                AFM FONT INFORMATION STRUCTURES                    ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct  AFM_TrackKernRec_
-  {
-    FT_Int    degree;
-    FT_Fixed  min_ptsize;
-    FT_Fixed  min_kern;
-    FT_Fixed  max_ptsize;
-    FT_Fixed  max_kern;
-
-  } AFM_TrackKernRec, *AFM_TrackKern;
-
-  typedef struct  AFM_KernPairRec_
-  {
-    FT_Int  index1;
-    FT_Int  index2;
-    FT_Int  x;
-    FT_Int  y;
-
-  } AFM_KernPairRec, *AFM_KernPair;
-
-  typedef struct  AFM_FontInfoRec_
-  {
-    FT_Bool        IsCIDFont;
-    FT_BBox        FontBBox;
-    FT_Fixed       Ascender;
-    FT_Fixed       Descender;
-    AFM_TrackKern  TrackKerns;   /* free if non-NULL */
-    FT_Int         NumTrackKern;
-    AFM_KernPair   KernPairs;    /* free if non-NULL */
-    FT_Int         NumKernPair;
-
-  } AFM_FontInfoRec, *AFM_FontInfo;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                ORIGINAL T1_FACE CLASS DEFINITION                  ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct T1_FaceRec_*   T1_Face;
-  typedef struct CID_FaceRec_*  CID_Face;
-
-
-  typedef struct  T1_FaceRec_
-  {
-    FT_FaceRec      root;
-    T1_FontRec      type1;
-    const void*     psnames;
-    const void*     psaux;
-    const void*     afm_data;
-    FT_CharMapRec   charmaprecs[2];
-    FT_CharMap      charmaps[2];
-
-    /* support for Multiple Masters fonts */
-    PS_Blend        blend;
-
-    /* undocumented, optional: indices of subroutines that express      */
-    /* the NormalizeDesignVector and the ConvertDesignVector procedure, */
-    /* respectively, as Type 2 charstrings; -1 if keywords not present  */
-    FT_Int           ndv_idx;
-    FT_Int           cdv_idx;
-
-    /* undocumented, optional: has the same meaning as len_buildchar */
-    /* for Type 2 fonts; manipulated by othersubrs 19, 24, and 25    */
-    FT_UInt          len_buildchar;
-    FT_Long*         buildchar;
-
-    /* since version 2.1 - interface to PostScript hinter */
-    const void*     pshinter;
-
-  } T1_FaceRec;
-
-
-  typedef struct  CID_FaceRec_
-  {
-    FT_FaceRec       root;
-    void*            psnames;
-    void*            psaux;
-    CID_FaceInfoRec  cid;
-    PS_FontExtraRec  font_extra;
-#if 0
-    void*            afm_data;
-#endif
-    CID_Subrs        subrs;
-
-    /* since version 2.1 - interface to PostScript hinter */
-    void*            pshinter;
-
-    /* since version 2.1.8, but was originally positioned after `afm_data' */
-    FT_Byte*         binary_data; /* used if hex data has been converted */
-    FT_Stream        cid_stream;
-
-  } CID_FaceRec;
-
-
-FT_END_HEADER
-
-#endif /* __T1TYPES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftserv.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftserv.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftserv.h	(copie de travail)
@@ -1,763 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftserv.h                                                               */
-/*                                                                         */
-/*    The FreeType services (specification only).                          */
-/*                                                                         */
-/*  Copyright 2003-2007, 2009, 2012, 2013 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Each module can export one or more `services'.  Each service is      */
-  /*  identified by a constant string and modeled by a pointer; the latter */
-  /*  generally corresponds to a structure containing function pointers.   */
-  /*                                                                       */
-  /*  Note that a service's data cannot be a mere function pointer because */
-  /*  in C it is possible that function pointers might be implemented      */
-  /*  differently than data pointers (e.g. 48 bits instead of 32).         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTSERV_H__
-#define __FTSERV_H__
-
-
-FT_BEGIN_HEADER
-
-  /*
-   * @macro:
-   *   FT_FACE_FIND_SERVICE
-   *
-   * @description:
-   *   This macro is used to look up a service from a face's driver module.
-   *
-   * @input:
-   *   face ::
-   *     The source face handle.
-   *
-   *   id ::
-   *     A string describing the service as defined in the service's
-   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
-   *     `multi-masters').  It is automatically prefixed with
-   *     `FT_SERVICE_ID_'.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable that receives the service pointer.  Will be NULL
-   *     if not found.
-   */
-#ifdef __cplusplus
-
-#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
-  FT_BEGIN_STMNT                                                            \
-    FT_Module    module = FT_MODULE( FT_FACE( face )->driver );             \
-    FT_Pointer   _tmp_  = NULL;                                             \
-    FT_Pointer*  _pptr_ = (FT_Pointer*)&(ptr);                              \
-                                                                            \
-                                                                            \
-    if ( module->clazz->get_interface )                                     \
-      _tmp_ = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
-    *_pptr_ = _tmp_;                                                        \
-  FT_END_STMNT
-
-#else /* !C++ */
-
-#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
-  FT_BEGIN_STMNT                                                            \
-    FT_Module   module = FT_MODULE( FT_FACE( face )->driver );              \
-    FT_Pointer  _tmp_  = NULL;                                              \
-                                                                            \
-    if ( module->clazz->get_interface )                                     \
-      _tmp_ = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
-    ptr = _tmp_;                                                            \
-  FT_END_STMNT
-
-#endif /* !C++ */
-
-
-  /*
-   * @macro:
-   *   FT_FACE_FIND_GLOBAL_SERVICE
-   *
-   * @description:
-   *   This macro is used to look up a service from all modules.
-   *
-   * @input:
-   *   face ::
-   *     The source face handle.
-   *
-   *   id ::
-   *     A string describing the service as defined in the service's
-   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
-   *     `multi-masters').  It is automatically prefixed with
-   *     `FT_SERVICE_ID_'.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable that receives the service pointer.  Will be NULL
-   *     if not found.
-   */
-#ifdef __cplusplus
-
-#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
-  FT_BEGIN_STMNT                                                   \
-    FT_Module    module = FT_MODULE( FT_FACE( face )->driver );    \
-    FT_Pointer   _tmp_;                                            \
-    FT_Pointer*  _pptr_ = (FT_Pointer*)&(ptr);                     \
-                                                                   \
-                                                                   \
-    _tmp_ = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
-    *_pptr_ = _tmp_;                                               \
-  FT_END_STMNT
-
-#else /* !C++ */
-
-#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
-  FT_BEGIN_STMNT                                                   \
-    FT_Module   module = FT_MODULE( FT_FACE( face )->driver );     \
-    FT_Pointer  _tmp_;                                             \
-                                                                   \
-                                                                   \
-    _tmp_ = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
-    ptr   = _tmp_;                                                 \
-  FT_END_STMNT
-
-#endif /* !C++ */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****         S E R V I C E   D E S C R I P T O R S                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   *  The following structure is used to _describe_ a given service
-   *  to the library.  This is useful to build simple static service lists.
-   */
-  typedef struct  FT_ServiceDescRec_
-  {
-    const char*  serv_id;     /* service name         */
-    const void*  serv_data;   /* service pointer/data */
-
-  } FT_ServiceDescRec;
-
-  typedef const FT_ServiceDescRec*  FT_ServiceDesc;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_SERVICEDESCREC1                                          */
-  /*    FT_DEFINE_SERVICEDESCREC2                                          */
-  /*    FT_DEFINE_SERVICEDESCREC3                                          */
-  /*    FT_DEFINE_SERVICEDESCREC4                                          */
-  /*    FT_DEFINE_SERVICEDESCREC5                                          */
-  /*    FT_DEFINE_SERVICEDESCREC6                                          */
-  /*    FT_DEFINE_SERVICEDESCREC7                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an array of FT_ServiceDescRec structures.       */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function needs to  */
-  /*    be called with a pointer to return an allocated array.  As soon as */
-  /*    it is no longer needed, a `destroy' function needs to be called to */
-  /*    release that allocation.                                           */
-  /*                                                                       */
-  /*    These functions should be manually called from the `pic_init' and  */
-  /*    `pic_free' functions of your module (see FT_DEFINE_MODULE).        */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the array will be         */
-  /*    allocated in the global scope (or the scope where the macro is     */
-  /*    used).                                                             */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
-                                   serv_id_1, serv_data_1 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { serv_id_5, serv_data_5 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { serv_id_5, serv_data_5 },                                             \
-    { serv_id_6, serv_data_6 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC7( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6,                  \
-                                   serv_id_7, serv_data_7 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { serv_id_5, serv_data_5 },                                             \
-    { serv_id_6, serv_data_6 },                                             \
-    { serv_id_7, serv_data_7 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
-                                   serv_id_1, serv_data_1 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 2 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = NULL;                                              \
-    clazz[1].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 3 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = NULL;                                              \
-    clazz[2].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 4 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = NULL;                                              \
-    clazz[3].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 5 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = NULL;                                              \
-    clazz[4].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 6 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = serv_id_5;                                         \
-    clazz[4].serv_data = serv_data_5;                                       \
-    clazz[5].serv_id   = NULL;                                              \
-    clazz[5].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class)            \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 7 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = serv_id_5;                                         \
-    clazz[4].serv_data = serv_data_5;                                       \
-    clazz[5].serv_id   = serv_id_6;                                         \
-    clazz[5].serv_data = serv_data_6;                                       \
-    clazz[6].serv_id   = NULL;                                              \
-    clazz[6].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC7( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6,                  \
-                                   serv_id_7, serv_data_7 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class)            \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 8 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = serv_id_5;                                         \
-    clazz[4].serv_data = serv_data_5;                                       \
-    clazz[5].serv_id   = serv_id_6;                                         \
-    clazz[5].serv_data = serv_data_6;                                       \
-    clazz[6].serv_id   = serv_id_7;                                         \
-    clazz[6].serv_data = serv_data_7;                                       \
-    clazz[7].serv_id   = NULL;                                              \
-    clazz[7].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /*
-   *  Parse a list of FT_ServiceDescRec descriptors and look for
-   *  a specific service by ID.  Note that the last element in the
-   *  array must be { NULL, NULL }, and that the function should
-   *  return NULL if the service isn't available.
-   *
-   *  This function can be used by modules to implement their
-   *  `get_service' method.
-   */
-  FT_BASE( FT_Pointer )
-  ft_service_list_lookup( FT_ServiceDesc  service_descriptors,
-                          const char*     service_id );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****             S E R V I C E S   C A C H E                       *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   *  This structure is used to store a cache for several frequently used
-   *  services.  It is the type of `face->internal->services'.  You
-   *  should only use FT_FACE_LOOKUP_SERVICE to access it.
-   *
-   *  All fields should have the type FT_Pointer to relax compilation
-   *  dependencies.  We assume the developer isn't completely stupid.
-   *
-   *  Each field must be named `service_XXXX' where `XXX' corresponds to
-   *  the correct FT_SERVICE_ID_XXXX macro.  See the definition of
-   *  FT_FACE_LOOKUP_SERVICE below how this is implemented.
-   *
-   */
-  typedef struct  FT_ServiceCacheRec_
-  {
-    FT_Pointer  service_POSTSCRIPT_FONT_NAME;
-    FT_Pointer  service_MULTI_MASTERS;
-    FT_Pointer  service_GLYPH_DICT;
-    FT_Pointer  service_PFR_METRICS;
-    FT_Pointer  service_WINFNT;
-
-  } FT_ServiceCacheRec, *FT_ServiceCache;
-
-
-  /*
-   *  A magic number used within the services cache.
-   */
-
-  /* ensure that value `1' has the same width as a pointer */
-#define FT_SERVICE_UNAVAILABLE  ((FT_Pointer)~(FT_PtrDist)1)
-
-
-  /*
-   * @macro:
-   *   FT_FACE_LOOKUP_SERVICE
-   *
-   * @description:
-   *   This macro is used to lookup a service from a face's driver module
-   *   using its cache.
-   *
-   * @input:
-   *   face::
-   *     The source face handle containing the cache.
-   *
-   *   field ::
-   *     The field name in the cache.
-   *
-   *   id ::
-   *     The service ID.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable receiving the service data.  NULL if not available.
-   */
-#ifdef __cplusplus
-
-#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                \
-  FT_BEGIN_STMNT                                               \
-    FT_Pointer   svc;                                          \
-    FT_Pointer*  Pptr = (FT_Pointer*)&(ptr);                   \
-                                                               \
-                                                               \
-    svc = FT_FACE( face )->internal->services. service_ ## id; \
-    if ( svc == FT_SERVICE_UNAVAILABLE )                       \
-      svc = NULL;                                              \
-    else if ( svc == NULL )                                    \
-    {                                                          \
-      FT_FACE_FIND_SERVICE( face, svc, id );                   \
-                                                               \
-      FT_FACE( face )->internal->services. service_ ## id =    \
-        (FT_Pointer)( svc != NULL ? svc                        \
-                                  : FT_SERVICE_UNAVAILABLE );  \
-    }                                                          \
-    *Pptr = svc;                                               \
-  FT_END_STMNT
-
-#else /* !C++ */
-
-#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                \
-  FT_BEGIN_STMNT                                               \
-    FT_Pointer  svc;                                           \
-                                                               \
-                                                               \
-    svc = FT_FACE( face )->internal->services. service_ ## id; \
-    if ( svc == FT_SERVICE_UNAVAILABLE )                       \
-      svc = NULL;                                              \
-    else if ( svc == NULL )                                    \
-    {                                                          \
-      FT_FACE_FIND_SERVICE( face, svc, id );                   \
-                                                               \
-      FT_FACE( face )->internal->services. service_ ## id =    \
-        (FT_Pointer)( svc != NULL ? svc                        \
-                                  : FT_SERVICE_UNAVAILABLE );  \
-    }                                                          \
-    ptr = svc;                                                 \
-  FT_END_STMNT
-
-#endif /* !C++ */
-
-  /*
-   *  A macro used to define new service structure types.
-   */
-
-#define FT_DEFINE_SERVICE( name )            \
-  typedef struct FT_Service_ ## name ## Rec_ \
-    FT_Service_ ## name ## Rec ;             \
-  typedef struct FT_Service_ ## name ## Rec_ \
-    const * FT_Service_ ## name ;            \
-  struct FT_Service_ ## name ## Rec_
-
-  /* */
-
-  /*
-   *  The header files containing the services.
-   */
-
-#define FT_SERVICE_BDF_H                <freetype/internal/services/svbdf.h>
-#define FT_SERVICE_CID_H                <freetype/internal/services/svcid.h>
-#define FT_SERVICE_GLYPH_DICT_H         <freetype/internal/services/svgldict.h>
-#define FT_SERVICE_GX_VALIDATE_H        <freetype/internal/services/svgxval.h>
-#define FT_SERVICE_KERNING_H            <freetype/internal/services/svkern.h>
-#define FT_SERVICE_MULTIPLE_MASTERS_H   <freetype/internal/services/svmm.h>
-#define FT_SERVICE_OPENTYPE_VALIDATE_H  <freetype/internal/services/svotval.h>
-#define FT_SERVICE_PFR_H                <freetype/internal/services/svpfr.h>
-#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <freetype/internal/services/svpscmap.h>
-#define FT_SERVICE_POSTSCRIPT_INFO_H    <freetype/internal/services/svpsinfo.h>
-#define FT_SERVICE_POSTSCRIPT_NAME_H    <freetype/internal/services/svpostnm.h>
-#define FT_SERVICE_PROPERTIES_H         <freetype/internal/services/svprop.h>
-#define FT_SERVICE_SFNT_H               <freetype/internal/services/svsfnt.h>
-#define FT_SERVICE_TRUETYPE_ENGINE_H    <freetype/internal/services/svtteng.h>
-#define FT_SERVICE_TT_CMAP_H            <freetype/internal/services/svttcmap.h>
-#define FT_SERVICE_WINFNT_H             <freetype/internal/services/svwinfnt.h>
-#define FT_SERVICE_XFREE86_NAME_H       <freetype/internal/services/svxf86nm.h>
-#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype/internal/services/svttglyf.h>
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTSERV_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/sfnt.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/sfnt.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/sfnt.h	(copie de travail)
@@ -1,707 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  sfnt.h                                                                 */
-/*                                                                         */
-/*    High-level `sfnt' driver interface (specification).                  */
-/*                                                                         */
-/*  Copyright 1996-2006, 2009, 2012-2013 by                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SFNT_H__
-#define __SFNT_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_TRUETYPE_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Init_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    First part of the SFNT face object initialization.  This finds     */
-  /*    the face in a SFNT file or collection, and load its format tag in  */
-  /*    face->format_tag.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection.                                          */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    params     :: Optional additional parameters.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  /*    This function recognizes fonts embedded in a `TrueType             */
-  /*    collection'.                                                       */
-  /*                                                                       */
-  /*    Once the format tag has been validated by the font driver, it      */
-  /*    should then call the TT_Load_Face_Func() callback to read the rest */
-  /*    of the SFNT tables in the object.                                  */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Init_Face_Func)( FT_Stream      stream,
-                        TT_Face        face,
-                        FT_Int         face_index,
-                        FT_Int         num_params,
-                        FT_Parameter*  params );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Second part of the SFNT face object initialization.  This loads    */
-  /*    the common SFNT tables (head, OS/2, maxp, metrics, etc.) in the    */
-  /*    face object.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection.                                          */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    params     :: Optional additional parameters.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function must be called after TT_Init_Face_Func().            */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Face_Func)( FT_Stream      stream,
-                        TT_Face        face,
-                        FT_Int         face_index,
-                        FT_Int         num_params,
-                        FT_Parameter*  params );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Done_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A callback used to delete the common SFNT data from a face.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the target face object.                        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does NOT destroy the face object.                    */
-  /*                                                                       */
-  typedef void
-  (*TT_Done_Face_Func)( TT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Any_Func                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load any font table into client memory.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: The face object to look for.                             */
-  /*                                                                       */
-  /*    tag    :: The tag of table to load.  Use the value 0 if you want   */
-  /*              to access the whole font file, else set this parameter   */
-  /*              to a valid TrueType table tag that you can forge with    */
-  /*              the MAKE_TT_TAG macro.                                   */
-  /*                                                                       */
-  /*    offset :: The starting offset in the table (or the file if         */
-  /*              tag == 0).                                               */
-  /*                                                                       */
-  /*    length :: The address of the decision variable:                    */
-  /*                                                                       */
-  /*                If length == NULL:                                     */
-  /*                  Loads the whole table.  Returns an error if          */
-  /*                  `offset' == 0!                                       */
-  /*                                                                       */
-  /*                If *length == 0:                                       */
-  /*                  Exits immediately; returning the length of the given */
-  /*                  table or of the font file, depending on the value of */
-  /*                  `tag'.                                               */
-  /*                                                                       */
-  /*                If *length != 0:                                       */
-  /*                  Loads the next `length' bytes of table or font,      */
-  /*                  starting at offset `offset' (in table or font too).  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    buffer :: The address of target buffer.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    TrueType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Any_Func)( TT_Face    face,
-                       FT_ULong   tag,
-                       FT_Long    offset,
-                       FT_Byte   *buffer,
-                       FT_ULong*  length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Find_SBit_Image_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check whether an embedded bitmap (an `sbit') exists for a given    */
-  /*    glyph, at a given strike.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    glyph_index   :: The glyph index.                                  */
-  /*                                                                       */
-  /*    strike_index  :: The current strike index.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    arange        :: The SBit range containing the glyph index.        */
-  /*                                                                       */
-  /*    astrike       :: The SBit strike containing the glyph index.       */
-  /*                                                                       */
-  /*    aglyph_offset :: The offset of the glyph data in `EBDT' table.     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns                    */
-  /*    SFNT_Err_Invalid_Argument if no sbit exists for the requested      */
-  /*    glyph.                                                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Find_SBit_Image_Func)( TT_Face          face,
-                              FT_UInt          glyph_index,
-                              FT_ULong         strike_index,
-                              TT_SBit_Range   *arange,
-                              TT_SBit_Strike  *astrike,
-                              FT_ULong        *aglyph_offset );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_SBit_Metrics_Func                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the big metrics for a given embedded bitmap.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream      :: The input stream.                                   */
-  /*                                                                       */
-  /*    range       :: The SBit range containing the glyph.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    big_metrics :: A big SBit metrics structure for the glyph.         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be positioned at the glyph's offset within  */
-  /*    the `EBDT' table before the call.                                  */
-  /*                                                                       */
-  /*    If the image format uses variable metrics, the stream cursor is    */
-  /*    positioned just after the metrics header in the `EBDT' table on    */
-  /*    function exit.                                                     */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_SBit_Metrics_Func)( FT_Stream        stream,
-                                TT_SBit_Range    range,
-                                TT_SBit_Metrics  metrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_SBit_Image_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load a given glyph sbit image from the font resource.  This also   */
-  /*    returns its metrics.                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      The target face object.                                          */
-  /*                                                                       */
-  /*    strike_index ::                                                    */
-  /*      The strike index.                                                */
-  /*                                                                       */
-  /*    glyph_index ::                                                     */
-  /*      The current glyph index.                                         */
-  /*                                                                       */
-  /*    load_flags ::                                                      */
-  /*      The current load flags.                                          */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      The input stream.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amap ::                                                            */
-  /*      The target pixmap.                                               */
-  /*                                                                       */
-  /*    ametrics ::                                                        */
-  /*      A big sbit metrics structure for the glyph image.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    glyph sbit exists for the index.                                   */
-  /*                                                                       */
-  /*  <Note>                                                               */
-  /*    The `map.buffer' field is always freed before the glyph is loaded. */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_SBit_Image_Func)( TT_Face              face,
-                              FT_ULong             strike_index,
-                              FT_UInt              glyph_index,
-                              FT_UInt              load_flags,
-                              FT_Stream            stream,
-                              FT_Bitmap           *amap,
-                              TT_SBit_MetricsRec  *ametrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Set_SBit_Strike_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select an sbit strike for a given size request.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    req           :: The size request.                                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    astrike_index :: The index of the sbit strike.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    sbit strike exists for the selected ppem values.                   */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Set_SBit_Strike_Func)( TT_Face          face,
-                              FT_Size_Request  req,
-                              FT_ULong*        astrike_index );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Strike_Metrics_Func                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load the metrics of a given strike.                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    strike_index  :: The strike index.                                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    metrics       :: the metrics of the strike.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    such sbit strike exists.                                           */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Strike_Metrics_Func)( TT_Face           face,
-                                  FT_ULong          strike_index,
-                                  FT_Size_Metrics*  metrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Get_PS_Name_Func                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the PostScript glyph name of a glyph.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    idx  :: The glyph index.                                           */
-  /*                                                                       */
-  /*    PSname :: The address of a string pointer.  Will be NULL in case   */
-  /*              of error, otherwise it is a pointer to the glyph name.   */
-  /*                                                                       */
-  /*              You must not modify the returned string!                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Get_PS_Name_Func)( TT_Face      face,
-                          FT_UInt      idx,
-                          FT_String**  PSname );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Metrics_Func                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load a metrics table, which is a table with a horizontal and a     */
-  /*    vertical version.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the target face object.                    */
-  /*                                                                       */
-  /*    stream   :: The input stream.                                      */
-  /*                                                                       */
-  /*    vertical :: A boolean flag.  If set, load the vertical one.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Metrics_Func)( TT_Face    face,
-                           FT_Stream  stream,
-                           FT_Bool    vertical );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Get_Metrics_Func                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load the horizontal or vertical header in a face object.           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the target face object.                    */
-  /*                                                                       */
-  /*    stream   :: The input stream.                                      */
-  /*                                                                       */
-  /*    vertical :: A boolean flag.  If set, load vertical metrics.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Get_Metrics_Func)( TT_Face     face,
-                          FT_Bool     vertical,
-                          FT_UInt     gindex,
-                          FT_Short*   abearing,
-                          FT_UShort*  aadvance );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Table_Func                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load a given TrueType table.                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the target face object.                      */
-  /*                                                                       */
-  /*    stream :: The input stream.                                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The function uses `face->goto_table' to seek the stream to the     */
-  /*    start of the table, except while loading the font directory.       */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Table_Func)( TT_Face    face,
-                         FT_Stream  stream );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Free_Table_Func                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Free a given TrueType table.                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the target face object.                        */
-  /*                                                                       */
-  typedef void
-  (*TT_Free_Table_Func)( TT_Face  face );
-
-
-  /*
-   * @functype:
-   *    TT_Face_GetKerningFunc
-   *
-   * @description:
-   *    Return the horizontal kerning value between two glyphs.
-   *
-   * @input:
-   *    face        :: A handle to the source face object.
-   *    left_glyph  :: The left glyph index.
-   *    right_glyph :: The right glyph index.
-   *
-   * @return:
-   *    The kerning value in font units.
-   */
-  typedef FT_Int
-  (*TT_Face_GetKerningFunc)( TT_Face  face,
-                             FT_UInt  left_glyph,
-                             FT_UInt  right_glyph );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    SFNT_Interface                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure holds pointers to the functions used to load and    */
-  /*    free the basic tables that are required in a `sfnt' font file.     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Check the various xxx_Func() descriptions for details.             */
-  /*                                                                       */
-  typedef struct  SFNT_Interface_
-  {
-    TT_Loader_GotoTableFunc      goto_table;
-
-    TT_Init_Face_Func            init_face;
-    TT_Load_Face_Func            load_face;
-    TT_Done_Face_Func            done_face;
-    FT_Module_Requester          get_interface;
-
-    TT_Load_Any_Func             load_any;
-
-    /* these functions are called by `load_face' but they can also  */
-    /* be called from external modules, if there is a need to do so */
-    TT_Load_Table_Func           load_head;
-    TT_Load_Metrics_Func         load_hhea;
-    TT_Load_Table_Func           load_cmap;
-    TT_Load_Table_Func           load_maxp;
-    TT_Load_Table_Func           load_os2;
-    TT_Load_Table_Func           load_post;
-
-    TT_Load_Table_Func           load_name;
-    TT_Free_Table_Func           free_name;
-
-    /* this field was called `load_kerning' up to version 2.1.10 */
-    TT_Load_Table_Func           load_kern;
-
-    TT_Load_Table_Func           load_gasp;
-    TT_Load_Table_Func           load_pclt;
-
-    /* see `ttload.h'; this field was called `load_bitmap_header' up to */
-    /* version 2.1.10                                                   */
-    TT_Load_Table_Func           load_bhed;
-
-    TT_Load_SBit_Image_Func      load_sbit_image;
-
-    /* see `ttpost.h' */
-    TT_Get_PS_Name_Func          get_psname;
-    TT_Free_Table_Func           free_psnames;
-
-    /* starting here, the structure differs from version 2.1.7 */
-
-    /* this field was introduced in version 2.1.8, named `get_psname' */
-    TT_Face_GetKerningFunc       get_kerning;
-
-    /* new elements introduced after version 2.1.10 */
-
-    /* load the font directory, i.e., the offset table and */
-    /* the table directory                                 */
-    TT_Load_Table_Func           load_font_dir;
-    TT_Load_Metrics_Func         load_hmtx;
-
-    TT_Load_Table_Func           load_eblc;
-    TT_Free_Table_Func           free_eblc;
-
-    TT_Set_SBit_Strike_Func      set_sbit_strike;
-    TT_Load_Strike_Metrics_Func  load_strike_metrics;
-
-    TT_Get_Metrics_Func          get_metrics;
-
-  } SFNT_Interface;
-
-
-  /* transitional */
-  typedef SFNT_Interface*   SFNT_Service;
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SFNT_INTERFACE(        \
-          class_,                        \
-          goto_table_,                   \
-          init_face_,                    \
-          load_face_,                    \
-          done_face_,                    \
-          get_interface_,                \
-          load_any_,                     \
-          load_head_,                    \
-          load_hhea_,                    \
-          load_cmap_,                    \
-          load_maxp_,                    \
-          load_os2_,                     \
-          load_post_,                    \
-          load_name_,                    \
-          free_name_,                    \
-          load_kern_,                    \
-          load_gasp_,                    \
-          load_pclt_,                    \
-          load_bhed_,                    \
-          load_sbit_image_,              \
-          get_psname_,                   \
-          free_psnames_,                 \
-          get_kerning_,                  \
-          load_font_dir_,                \
-          load_hmtx_,                    \
-          load_eblc_,                    \
-          free_eblc_,                    \
-          set_sbit_strike_,              \
-          load_strike_metrics_,          \
-          get_metrics_ )                 \
-  static const SFNT_Interface  class_ =  \
-  {                                      \
-    goto_table_,                         \
-    init_face_,                          \
-    load_face_,                          \
-    done_face_,                          \
-    get_interface_,                      \
-    load_any_,                           \
-    load_head_,                          \
-    load_hhea_,                          \
-    load_cmap_,                          \
-    load_maxp_,                          \
-    load_os2_,                           \
-    load_post_,                          \
-    load_name_,                          \
-    free_name_,                          \
-    load_kern_,                          \
-    load_gasp_,                          \
-    load_pclt_,                          \
-    load_bhed_,                          \
-    load_sbit_image_,                    \
-    get_psname_,                         \
-    free_psnames_,                       \
-    get_kerning_,                        \
-    load_font_dir_,                      \
-    load_hmtx_,                          \
-    load_eblc_,                          \
-    free_eblc_,                          \
-    set_sbit_strike_,                    \
-    load_strike_metrics_,                \
-    get_metrics_,                        \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_INTERNAL( a, a_ )  \
-          clazz->a = a_;
-
-#define FT_DEFINE_SFNT_INTERFACE(                       \
-          class_,                                       \
-          goto_table_,                                  \
-          init_face_,                                   \
-          load_face_,                                   \
-          done_face_,                                   \
-          get_interface_,                               \
-          load_any_,                                    \
-          load_head_,                                   \
-          load_hhea_,                                   \
-          load_cmap_,                                   \
-          load_maxp_,                                   \
-          load_os2_,                                    \
-          load_post_,                                   \
-          load_name_,                                   \
-          free_name_,                                   \
-          load_kern_,                                   \
-          load_gasp_,                                   \
-          load_pclt_,                                   \
-          load_bhed_,                                   \
-          load_sbit_image_,                             \
-          get_psname_,                                  \
-          free_psnames_,                                \
-          get_kerning_,                                 \
-          load_font_dir_,                               \
-          load_hmtx_,                                   \
-          load_eblc_,                                   \
-          free_eblc_,                                   \
-          set_sbit_strike_,                             \
-          load_strike_metrics_,                         \
-          get_metrics_ )                                \
-  void                                                  \
-  FT_Init_Class_ ## class_( FT_Library       library,   \
-                            SFNT_Interface*  clazz )    \
-  {                                                     \
-    FT_UNUSED( library );                               \
-                                                        \
-    clazz->goto_table          = goto_table_;           \
-    clazz->init_face           = init_face_;            \
-    clazz->load_face           = load_face_;            \
-    clazz->done_face           = done_face_;            \
-    clazz->get_interface       = get_interface_;        \
-    clazz->load_any            = load_any_;             \
-    clazz->load_head           = load_head_;            \
-    clazz->load_hhea           = load_hhea_;            \
-    clazz->load_cmap           = load_cmap_;            \
-    clazz->load_maxp           = load_maxp_;            \
-    clazz->load_os2            = load_os2_;             \
-    clazz->load_post           = load_post_;            \
-    clazz->load_name           = load_name_;            \
-    clazz->free_name           = free_name_;            \
-    clazz->load_kern           = load_kern_;            \
-    clazz->load_gasp           = load_gasp_;            \
-    clazz->load_pclt           = load_pclt_;            \
-    clazz->load_bhed           = load_bhed_;            \
-    clazz->load_sbit_image     = load_sbit_image_;      \
-    clazz->get_psname          = get_psname_;           \
-    clazz->free_psnames        = free_psnames_;         \
-    clazz->get_kerning         = get_kerning_;          \
-    clazz->load_font_dir       = load_font_dir_;        \
-    clazz->load_hmtx           = load_hmtx_;            \
-    clazz->load_eblc           = load_eblc_;            \
-    clazz->free_eblc           = free_eblc_;            \
-    clazz->set_sbit_strike     = set_sbit_strike_;      \
-    clazz->load_strike_metrics = load_strike_metrics_;  \
-    clazz->get_metrics         = get_metrics_;          \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* __SFNT_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/internal.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/internal.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/internal.h	(copie de travail)
@@ -1,63 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  internal.h                                                             */
-/*                                                                         */
-/*    Internal header files (specification only).                          */
-/*                                                                         */
-/*  Copyright 1996-2004, 2013 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is automatically included by `ft2build.h'.                  */
-  /* Do not include it manually!                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define FT_INTERNAL_OBJECTS_H             <freetype/internal/ftobjs.h>
-#define FT_INTERNAL_PIC_H                 <freetype/internal/ftpic.h>
-#define FT_INTERNAL_STREAM_H              <freetype/internal/ftstream.h>
-#define FT_INTERNAL_MEMORY_H              <freetype/internal/ftmemory.h>
-#define FT_INTERNAL_DEBUG_H               <freetype/internal/ftdebug.h>
-#define FT_INTERNAL_CALC_H                <freetype/internal/ftcalc.h>
-#define FT_INTERNAL_DRIVER_H              <freetype/internal/ftdriver.h>
-#define FT_INTERNAL_TRACE_H               <freetype/internal/fttrace.h>
-#define FT_INTERNAL_GLYPH_LOADER_H        <freetype/internal/ftgloadr.h>
-#define FT_INTERNAL_SFNT_H                <freetype/internal/sfnt.h>
-#define FT_INTERNAL_SERVICE_H             <freetype/internal/ftserv.h>
-#define FT_INTERNAL_RFORK_H               <freetype/internal/ftrfork.h>
-#define FT_INTERNAL_VALIDATE_H            <freetype/internal/ftvalid.h>
-
-#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype/internal/tttypes.h>
-#define FT_INTERNAL_TYPE1_TYPES_H         <freetype/internal/t1types.h>
-
-#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype/internal/psaux.h>
-#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype/internal/pshints.h>
-#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <freetype/internal/psglobal.h>
-
-#define FT_INTERNAL_AUTOHINT_H            <freetype/internal/autohint.h>
-
-
-#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
-
-  /* We disable the warning `conditional expression is constant' here */
-  /* in order to compile cleanly with the maximum level of warnings.  */
-  /* In particular, the warning complains about stuff like `while(0)' */
-  /* which is very useful in macro definitions.  There is no benefit  */
-  /* in having it enabled.                                            */
-#pragma warning( disable : 4127 )
-
-#endif /* _MSC_VER */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/tttypes.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/tttypes.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/tttypes.h	(copie de travail)
@@ -1,1440 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttypes.h                                                              */
-/*                                                                         */
-/*    Basic SFNT/TrueType type definitions and interface (specification    */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2002, 2004-2008, 2012-2013 by                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTTYPES_H__
-#define __TTTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_TRUETYPE_TABLES_H
-#include FT_INTERNAL_OBJECTS_H
-
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-#include FT_MULTIPLE_MASTERS_H
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***             REQUIRED TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TTC_HeaderRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    TrueType collection header.  This table contains the offsets of    */
-  /*    the font headers of each distinct TrueType face in the file.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tag     :: Must be `ttc ' to indicate a TrueType collection.       */
-  /*                                                                       */
-  /*    version :: The version number.                                     */
-  /*                                                                       */
-  /*    count   :: The number of faces in the collection.  The             */
-  /*               specification says this should be an unsigned long, but */
-  /*               we use a signed long since we need the value -1 for     */
-  /*               specific purposes.                                      */
-  /*                                                                       */
-  /*    offsets :: The offsets of the font headers, one per face.          */
-  /*                                                                       */
-  typedef struct  TTC_HeaderRec_
-  {
-    FT_ULong   tag;
-    FT_Fixed   version;
-    FT_Long    count;
-    FT_ULong*  offsets;
-
-  } TTC_HeaderRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    SFNT_HeaderRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    SFNT file format header.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    format_tag     :: The font format tag.                             */
-  /*                                                                       */
-  /*    num_tables     :: The number of tables in file.                    */
-  /*                                                                       */
-  /*    search_range   :: Must be `16 * (max power of 2 <= num_tables)'.   */
-  /*                                                                       */
-  /*    entry_selector :: Must be log2 of `search_range / 16'.             */
-  /*                                                                       */
-  /*    range_shift    :: Must be `num_tables * 16 - search_range'.        */
-  /*                                                                       */
-  typedef struct  SFNT_HeaderRec_
-  {
-    FT_ULong   format_tag;
-    FT_UShort  num_tables;
-    FT_UShort  search_range;
-    FT_UShort  entry_selector;
-    FT_UShort  range_shift;
-
-    FT_ULong   offset;  /* not in file */
-
-  } SFNT_HeaderRec, *SFNT_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_TableRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure describes a given table of a TrueType font.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Tag      :: A four-bytes tag describing the table.                 */
-  /*                                                                       */
-  /*    CheckSum :: The table checksum.  This value can be ignored.        */
-  /*                                                                       */
-  /*    Offset   :: The offset of the table from the start of the TrueType */
-  /*                font in its resource.                                  */
-  /*                                                                       */
-  /*    Length   :: The table length (in bytes).                           */
-  /*                                                                       */
-  typedef struct  TT_TableRec_
-  {
-    FT_ULong  Tag;        /*        table type */
-    FT_ULong  CheckSum;   /*    table checksum */
-    FT_ULong  Offset;     /* table file offset */
-    FT_ULong  Length;     /*      table length */
-
-  } TT_TableRec, *TT_Table;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_LongMetricsRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the long metrics of the `hmtx' and `vmtx'     */
-  /*    TrueType tables.  The values are expressed in font units.          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    advance :: The advance width or height for the glyph.              */
-  /*                                                                       */
-  /*    bearing :: The left-side or top-side bearing for the glyph.        */
-  /*                                                                       */
-  typedef struct  TT_LongMetricsRec_
-  {
-    FT_UShort  advance;
-    FT_Short   bearing;
-
-  } TT_LongMetricsRec, *TT_LongMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_ShortMetrics                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple type to model the short metrics of the `hmtx' and `vmtx'  */
-  /*    tables.                                                            */
-  /*                                                                       */
-  typedef FT_Short  TT_ShortMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_NameEntryRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling TrueType name records.  Name records are used */
-  /*    to store important strings like family name, style name,           */
-  /*    copyright, etc. in _localized_ versions (i.e., language, encoding, */
-  /*    etc).                                                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platformID   :: The ID of the name's encoding platform.            */
-  /*                                                                       */
-  /*    encodingID   :: The platform-specific ID for the name's encoding.  */
-  /*                                                                       */
-  /*    languageID   :: The platform-specific ID for the name's language.  */
-  /*                                                                       */
-  /*    nameID       :: The ID specifying what kind of name this is.       */
-  /*                                                                       */
-  /*    stringLength :: The length of the string in bytes.                 */
-  /*                                                                       */
-  /*    stringOffset :: The offset to the string in the `name' table.      */
-  /*                                                                       */
-  /*    string       :: A pointer to the string's bytes.  Note that these  */
-  /*                    are usually UTF-16 encoded characters.             */
-  /*                                                                       */
-  typedef struct  TT_NameEntryRec_
-  {
-    FT_UShort  platformID;
-    FT_UShort  encodingID;
-    FT_UShort  languageID;
-    FT_UShort  nameID;
-    FT_UShort  stringLength;
-    FT_ULong   stringOffset;
-
-    /* this last field is not defined in the spec */
-    /* but used by the FreeType engine            */
-
-    FT_Byte*   string;
-
-  } TT_NameEntryRec, *TT_NameEntry;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_NameTableRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the TrueType name table.                      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    format         :: The format of the name table.                    */
-  /*                                                                       */
-  /*    numNameRecords :: The number of names in table.                    */
-  /*                                                                       */
-  /*    storageOffset  :: The offset of the name table in the `name'       */
-  /*                      TrueType table.                                  */
-  /*                                                                       */
-  /*    names          :: An array of name records.                        */
-  /*                                                                       */
-  /*    stream         :: the file's input stream.                         */
-  /*                                                                       */
-  typedef struct  TT_NameTableRec_
-  {
-    FT_UShort         format;
-    FT_UInt           numNameRecords;
-    FT_UInt           storageOffset;
-    TT_NameEntryRec*  names;
-    FT_Stream         stream;
-
-  } TT_NameTableRec, *TT_NameTable;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***             OPTIONAL TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_GaspRangeRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A tiny structure used to model a gasp range according to the       */
-  /*    TrueType specification.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    maxPPEM  :: The maximum ppem value to which `gaspFlag' applies.    */
-  /*                                                                       */
-  /*    gaspFlag :: A flag describing the grid-fitting and anti-aliasing   */
-  /*                modes to be used.                                      */
-  /*                                                                       */
-  typedef struct  TT_GaspRangeRec_
-  {
-    FT_UShort  maxPPEM;
-    FT_UShort  gaspFlag;
-
-  } TT_GaspRangeRec, *TT_GaspRange;
-
-
-#define TT_GASP_GRIDFIT  0x01
-#define TT_GASP_DOGRAY   0x02
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_GaspRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the TrueType `gasp' table used to specify     */
-  /*    grid-fitting and anti-aliasing behaviour.                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version    :: The version number.                                  */
-  /*                                                                       */
-  /*    numRanges  :: The number of gasp ranges in table.                  */
-  /*                                                                       */
-  /*    gaspRanges :: An array of gasp ranges.                             */
-  /*                                                                       */
-  typedef struct  TT_Gasp_
-  {
-    FT_UShort     version;
-    FT_UShort     numRanges;
-    TT_GaspRange  gaspRanges;
-
-  } TT_GaspRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                    EMBEDDED BITMAPS SUPPORT                       ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_MetricsRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold the big metrics of a given glyph bitmap   */
-  /*    in a TrueType or OpenType font.  These are usually found in the    */
-  /*    `EBDT' (Microsoft) or `bloc' (Apple) table.                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height       :: The glyph height in pixels.                        */
-  /*                                                                       */
-  /*    width        :: The glyph width in pixels.                         */
-  /*                                                                       */
-  /*    horiBearingX :: The horizontal left bearing.                       */
-  /*                                                                       */
-  /*    horiBearingY :: The horizontal top bearing.                        */
-  /*                                                                       */
-  /*    horiAdvance  :: The horizontal advance.                            */
-  /*                                                                       */
-  /*    vertBearingX :: The vertical left bearing.                         */
-  /*                                                                       */
-  /*    vertBearingY :: The vertical top bearing.                          */
-  /*                                                                       */
-  /*    vertAdvance  :: The vertical advance.                              */
-  /*                                                                       */
-  typedef struct  TT_SBit_MetricsRec_
-  {
-    FT_Byte  height;
-    FT_Byte  width;
-
-    FT_Char  horiBearingX;
-    FT_Char  horiBearingY;
-    FT_Byte  horiAdvance;
-
-    FT_Char  vertBearingX;
-    FT_Char  vertBearingY;
-    FT_Byte  vertAdvance;
-
-  } TT_SBit_MetricsRec, *TT_SBit_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_SmallMetricsRec                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold the small metrics of a given glyph bitmap */
-  /*    in a TrueType or OpenType font.  These are usually found in the    */
-  /*    `EBDT' (Microsoft) or the `bdat' (Apple) table.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height   :: The glyph height in pixels.                            */
-  /*                                                                       */
-  /*    width    :: The glyph width in pixels.                             */
-  /*                                                                       */
-  /*    bearingX :: The left-side bearing.                                 */
-  /*                                                                       */
-  /*    bearingY :: The top-side bearing.                                  */
-  /*                                                                       */
-  /*    advance  :: The advance width or height.                           */
-  /*                                                                       */
-  typedef struct  TT_SBit_Small_Metrics_
-  {
-    FT_Byte  height;
-    FT_Byte  width;
-
-    FT_Char  bearingX;
-    FT_Char  bearingY;
-    FT_Byte  advance;
-
-  } TT_SBit_SmallMetricsRec, *TT_SBit_SmallMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_LineMetricsRec                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe the text line metrics of a given      */
-  /*    bitmap strike, for either a horizontal or vertical layout.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    ascender                :: The ascender in pixels.                 */
-  /*                                                                       */
-  /*    descender               :: The descender in pixels.                */
-  /*                                                                       */
-  /*    max_width               :: The maximum glyph width in pixels.      */
-  /*                                                                       */
-  /*    caret_slope_enumerator  :: Rise of the caret slope, typically set  */
-  /*                               to 1 for non-italic fonts.              */
-  /*                                                                       */
-  /*    caret_slope_denominator :: Rise of the caret slope, typically set  */
-  /*                               to 0 for non-italic fonts.              */
-  /*                                                                       */
-  /*    caret_offset            :: Offset in pixels to move the caret for  */
-  /*                               proper positioning.                     */
-  /*                                                                       */
-  /*    min_origin_SB           :: Minimum of horiBearingX (resp.          */
-  /*                               vertBearingY).                          */
-  /*    min_advance_SB          :: Minimum of                              */
-  /*                                                                       */
-  /*                                 horizontal advance -                  */
-  /*                                   ( horiBearingX + width )            */
-  /*                                                                       */
-  /*                               resp.                                   */
-  /*                                                                       */
-  /*                                 vertical advance -                    */
-  /*                                   ( vertBearingY + height )           */
-  /*                                                                       */
-  /*    max_before_BL           :: Maximum of horiBearingY (resp.          */
-  /*                               vertBearingY).                          */
-  /*                                                                       */
-  /*    min_after_BL            :: Minimum of                              */
-  /*                                                                       */
-  /*                                 horiBearingY - height                 */
-  /*                                                                       */
-  /*                               resp.                                   */
-  /*                                                                       */
-  /*                                 vertBearingX - width                  */
-  /*                                                                       */
-  /*    pads                    :: Unused (to make the size of the record  */
-  /*                               a multiple of 32 bits.                  */
-  /*                                                                       */
-  typedef struct  TT_SBit_LineMetricsRec_
-  {
-    FT_Char  ascender;
-    FT_Char  descender;
-    FT_Byte  max_width;
-    FT_Char  caret_slope_numerator;
-    FT_Char  caret_slope_denominator;
-    FT_Char  caret_offset;
-    FT_Char  min_origin_SB;
-    FT_Char  min_advance_SB;
-    FT_Char  max_before_BL;
-    FT_Char  min_after_BL;
-    FT_Char  pads[2];
-
-  } TT_SBit_LineMetricsRec, *TT_SBit_LineMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_RangeRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A TrueType/OpenType subIndexTable as defined in the `EBLC'         */
-  /*    (Microsoft) or `bloc' (Apple) tables.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    first_glyph   :: The first glyph index in the range.               */
-  /*                                                                       */
-  /*    last_glyph    :: The last glyph index in the range.                */
-  /*                                                                       */
-  /*    index_format  :: The format of index table.  Valid values are 1    */
-  /*                     to 5.                                             */
-  /*                                                                       */
-  /*    image_format  :: The format of `EBDT' image data.                  */
-  /*                                                                       */
-  /*    image_offset  :: The offset to image data in `EBDT'.               */
-  /*                                                                       */
-  /*    image_size    :: For index formats 2 and 5.  This is the size in   */
-  /*                     bytes of each glyph bitmap.                       */
-  /*                                                                       */
-  /*    big_metrics   :: For index formats 2 and 5.  This is the big       */
-  /*                     metrics for each glyph bitmap.                    */
-  /*                                                                       */
-  /*    num_glyphs    :: For index formats 4 and 5.  This is the number of */
-  /*                     glyphs in the code array.                         */
-  /*                                                                       */
-  /*    glyph_offsets :: For index formats 1 and 3.                        */
-  /*                                                                       */
-  /*    glyph_codes   :: For index formats 4 and 5.                        */
-  /*                                                                       */
-  /*    table_offset  :: The offset of the index table in the `EBLC'       */
-  /*                     table.  Only used during strike loading.          */
-  /*                                                                       */
-  typedef struct  TT_SBit_RangeRec_
-  {
-    FT_UShort           first_glyph;
-    FT_UShort           last_glyph;
-
-    FT_UShort           index_format;
-    FT_UShort           image_format;
-    FT_ULong            image_offset;
-
-    FT_ULong            image_size;
-    TT_SBit_MetricsRec  metrics;
-    FT_ULong            num_glyphs;
-
-    FT_ULong*           glyph_offsets;
-    FT_UShort*          glyph_codes;
-
-    FT_ULong            table_offset;
-
-  } TT_SBit_RangeRec, *TT_SBit_Range;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_StrikeRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used describe a given bitmap strike in the `EBLC'      */
-  /*    (Microsoft) or `bloc' (Apple) tables.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*   num_index_ranges :: The number of index ranges.                     */
-  /*                                                                       */
-  /*   index_ranges     :: An array of glyph index ranges.                 */
-  /*                                                                       */
-  /*   color_ref        :: Unused.  `color_ref' is put in for future       */
-  /*                       enhancements, but these fields are already      */
-  /*                       in use by other platforms (e.g. Newton).        */
-  /*                       For details, please see                         */
-  /*                                                                       */
-  /*                         http://fonts.apple.com/                       */
-  /*                                TTRefMan/RM06/Chap6bloc.html           */
-  /*                                                                       */
-  /*   hori             :: The line metrics for horizontal layouts.        */
-  /*                                                                       */
-  /*   vert             :: The line metrics for vertical layouts.          */
-  /*                                                                       */
-  /*   start_glyph      :: The lowest glyph index for this strike.         */
-  /*                                                                       */
-  /*   end_glyph        :: The highest glyph index for this strike.        */
-  /*                                                                       */
-  /*   x_ppem           :: The number of horizontal pixels per EM.         */
-  /*                                                                       */
-  /*   y_ppem           :: The number of vertical pixels per EM.           */
-  /*                                                                       */
-  /*   bit_depth        :: The bit depth.  Valid values are 1, 2, 4,       */
-  /*                       and 8.                                          */
-  /*                                                                       */
-  /*   flags            :: Is this a vertical or horizontal strike?  For   */
-  /*                       details, please see                             */
-  /*                                                                       */
-  /*                         http://fonts.apple.com/                       */
-  /*                                TTRefMan/RM06/Chap6bloc.html           */
-  /*                                                                       */
-  typedef struct  TT_SBit_StrikeRec_
-  {
-    FT_Int                  num_ranges;
-    TT_SBit_Range           sbit_ranges;
-    FT_ULong                ranges_offset;
-
-    FT_ULong                color_ref;
-
-    TT_SBit_LineMetricsRec  hori;
-    TT_SBit_LineMetricsRec  vert;
-
-    FT_UShort               start_glyph;
-    FT_UShort               end_glyph;
-
-    FT_Byte                 x_ppem;
-    FT_Byte                 y_ppem;
-
-    FT_Byte                 bit_depth;
-    FT_Char                 flags;
-
-  } TT_SBit_StrikeRec, *TT_SBit_Strike;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_ComponentRec                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure to describe a compound sbit element.            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    glyph_code :: The element's glyph index.                           */
-  /*                                                                       */
-  /*    x_offset   :: The element's left bearing.                          */
-  /*                                                                       */
-  /*    y_offset   :: The element's top bearing.                           */
-  /*                                                                       */
-  typedef struct  TT_SBit_ComponentRec_
-  {
-    FT_UShort  glyph_code;
-    FT_Char    x_offset;
-    FT_Char    y_offset;
-
-  } TT_SBit_ComponentRec, *TT_SBit_Component;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_ScaleRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used describe a given bitmap scaling table, as defined */
-  /*    in the `EBSC' table.                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    hori              :: The horizontal line metrics.                  */
-  /*                                                                       */
-  /*    vert              :: The vertical line metrics.                    */
-  /*                                                                       */
-  /*    x_ppem            :: The number of horizontal pixels per EM.       */
-  /*                                                                       */
-  /*    y_ppem            :: The number of vertical pixels per EM.         */
-  /*                                                                       */
-  /*    x_ppem_substitute :: Substitution x_ppem value.                    */
-  /*                                                                       */
-  /*    y_ppem_substitute :: Substitution y_ppem value.                    */
-  /*                                                                       */
-  typedef struct  TT_SBit_ScaleRec_
-  {
-    TT_SBit_LineMetricsRec  hori;
-    TT_SBit_LineMetricsRec  vert;
-
-    FT_Byte                 x_ppem;
-    FT_Byte                 y_ppem;
-
-    FT_Byte                 x_ppem_substitute;
-    FT_Byte                 y_ppem_substitute;
-
-  } TT_SBit_ScaleRec, *TT_SBit_Scale;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  POSTSCRIPT GLYPH NAMES SUPPORT                   ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_20Rec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names sub-table, format 2.0.  Stores the PS name of     */
-  /*    each glyph in the font face.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_glyphs    :: The number of named glyphs in the table.          */
-  /*                                                                       */
-  /*    num_names     :: The number of PS names stored in the table.       */
-  /*                                                                       */
-  /*    glyph_indices :: The indices of the glyphs in the names arrays.    */
-  /*                                                                       */
-  /*    glyph_names   :: The PS names not in Mac Encoding.                 */
-  /*                                                                       */
-  typedef struct  TT_Post_20Rec_
-  {
-    FT_UShort   num_glyphs;
-    FT_UShort   num_names;
-    FT_UShort*  glyph_indices;
-    FT_Char**   glyph_names;
-
-  } TT_Post_20Rec, *TT_Post_20;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_25Rec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names sub-table, format 2.5.  Stores the PS name of     */
-  /*    each glyph in the font face.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_glyphs :: The number of glyphs in the table.                   */
-  /*                                                                       */
-  /*    offsets    :: An array of signed offsets in a normal Mac           */
-  /*                  Postscript name encoding.                            */
-  /*                                                                       */
-  typedef struct  TT_Post_25_
-  {
-    FT_UShort  num_glyphs;
-    FT_Char*   offsets;
-
-  } TT_Post_25Rec, *TT_Post_25;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_NamesRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names table, either format 2.0 or 2.5.                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    loaded    :: A flag to indicate whether the PS names are loaded.   */
-  /*                                                                       */
-  /*    format_20 :: The sub-table used for format 2.0.                    */
-  /*                                                                       */
-  /*    format_25 :: The sub-table used for format 2.5.                    */
-  /*                                                                       */
-  typedef struct  TT_Post_NamesRec_
-  {
-    FT_Bool  loaded;
-
-    union
-    {
-      TT_Post_20Rec  format_20;
-      TT_Post_25Rec  format_25;
-
-    } names;
-
-  } TT_Post_NamesRec, *TT_Post_Names;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                    GX VARIATION TABLE SUPPORT                     ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-  typedef struct GX_BlendRec_  *GX_Blend;
-#endif
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***              EMBEDDED BDF PROPERTIES TABLE SUPPORT                ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   * These types are used to support a `BDF ' table that isn't part of the
-   * official TrueType specification.  It is mainly used in SFNT-based
-   * bitmap fonts that were generated from a set of BDF fonts.
-   *
-   * The format of the table is as follows.
-   *
-   *   USHORT   version      `BDF ' table version number, should be 0x0001.
-   *   USHORT   strikeCount  Number of strikes (bitmap sizes) in this table.
-   *   ULONG    stringTable  Offset (from start of BDF table) to string
-   *                         table.
-   *
-   * This is followed by an array of `strikeCount' descriptors, having the
-   * following format.
-   *
-   *   USHORT   ppem         Vertical pixels per EM for this strike.
-   *   USHORT   numItems     Number of items for this strike (properties and
-   *                         atoms).  Maximum is 255.
-   *
-   * This array in turn is followed by `strikeCount' value sets.  Each
-   * `value set' is an array of `numItems' items with the following format.
-   *
-   *   ULONG    item_name    Offset in string table to item name.
-   *   USHORT   item_type    The item type.  Possible values are
-   *                            0 => string (e.g., COMMENT)
-   *                            1 => atom   (e.g., FONT or even SIZE)
-   *                            2 => int32
-   *                            3 => uint32
-   *                         0x10 => A flag to indicate a properties.  This
-   *                                 is ORed with the above values.
-   *   ULONG    item_value   For strings  => Offset into string table without
-   *                                         the corresponding double quotes.
-   *                         For atoms    => Offset into string table.
-   *                         For integers => Direct value.
-   *
-   * All strings in the string table consist of bytes and are
-   * zero-terminated.
-   *
-   */
-
-#ifdef TT_CONFIG_OPTION_BDF
-
-  typedef struct  TT_BDFRec_
-  {
-    FT_Byte*   table;
-    FT_Byte*   table_end;
-    FT_Byte*   strings;
-    FT_ULong   strings_size;
-    FT_UInt    num_strikes;
-    FT_Bool    loaded;
-
-  } TT_BDFRec, *TT_BDF;
-
-#endif /* TT_CONFIG_OPTION_BDF */
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  ORIGINAL TT_FACE CLASS DEFINITION                ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This structure/class is defined here because it is common to the      */
-  /* following formats: TTF, OpenType-TT, and OpenType-CFF.                */
-  /*                                                                       */
-  /* Note, however, that the classes TT_Size and TT_GlyphSlot are not      */
-  /* shared between font drivers, and are thus defined in `ttobjs.h'.      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a TrueType face/font object.  A TT_Face encapsulates   */
-  /*    the resolution and scaling independent parts of a TrueType font    */
-  /*    resource.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The TT_Face structure is also used as a `parent class' for the     */
-  /*    OpenType-CFF class (T2_Face).                                      */
-  /*                                                                       */
-  typedef struct TT_FaceRec_*  TT_Face;
-
-
-  /* a function type used for the truetype bytecode interpreter hooks */
-  typedef FT_Error
-  (*TT_Interpreter)( void*  exec_context );
-
-  /* forward declaration */
-  typedef struct TT_LoaderRec_*  TT_Loader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_GotoTableFunc                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Seeks a stream to the start of a given TrueType table.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the target face object.                      */
-  /*                                                                       */
-  /*    tag    :: A 4-byte tag used to name the table.                     */
-  /*                                                                       */
-  /*    stream :: The input stream.                                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    length :: The length of the table in bytes.  Set to 0 if not       */
-  /*              needed.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_GotoTableFunc)( TT_Face    face,
-                              FT_ULong   tag,
-                              FT_Stream  stream,
-                              FT_ULong*  length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_StartGlyphFunc                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Seeks a stream to the start of a given glyph element, and opens a  */
-  /*    frame for it.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader      :: The current TrueType glyph loader object.           */
-  /*                                                                       */
-  /*    glyph index :: The index of the glyph to access.                   */
-  /*                                                                       */
-  /*    offset      :: The offset of the glyph according to the            */
-  /*                   `locations' table.                                  */
-  /*                                                                       */
-  /*    byte_count  :: The size of the frame in bytes.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is normally equivalent to FT_STREAM_SEEK(offset)     */
-  /*    followed by FT_FRAME_ENTER(byte_count) with the loader's stream,   */
-  /*    but alternative formats (e.g. compressed ones) might use something */
-  /*    different.                                                         */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_StartGlyphFunc)( TT_Loader  loader,
-                               FT_UInt    glyph_index,
-                               FT_ULong   offset,
-                               FT_UInt    byte_count );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_ReadGlyphFunc                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reads one glyph element (its header, a simple glyph, or a          */
-  /*    composite) from the loader's current stream frame.                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader :: The current TrueType glyph loader object.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_ReadGlyphFunc)( TT_Loader  loader );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_EndGlyphFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Closes the current loader stream frame for the glyph.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader :: The current TrueType glyph loader object.                */
-  /*                                                                       */
-  typedef void
-  (*TT_Loader_EndGlyphFunc)( TT_Loader  loader );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                         TrueType Face Type                            */
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType face class.  These objects model the resolution and   */
-  /*    point-size independent data found in a TrueType font file.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root                 :: The base FT_Face structure, managed by the */
-  /*                            base layer.                                */
-  /*                                                                       */
-  /*    ttc_header           :: The TrueType collection header, used when  */
-  /*                            the file is a `ttc' rather than a `ttf'.   */
-  /*                            For ordinary font files, the field         */
-  /*                            `ttc_header.count' is set to 0.            */
-  /*                                                                       */
-  /*    format_tag           :: The font format tag.                       */
-  /*                                                                       */
-  /*    num_tables           :: The number of TrueType tables in this font */
-  /*                            file.                                      */
-  /*                                                                       */
-  /*    dir_tables           :: The directory of TrueType tables for this  */
-  /*                            font file.                                 */
-  /*                                                                       */
-  /*    header               :: The font's font header (`head' table).     */
-  /*                            Read on font opening.                      */
-  /*                                                                       */
-  /*    horizontal           :: The font's horizontal header (`hhea'       */
-  /*                            table).  This field also contains the      */
-  /*                            associated horizontal metrics table        */
-  /*                            (`hmtx').                                  */
-  /*                                                                       */
-  /*    max_profile          :: The font's maximum profile table.  Read on */
-  /*                            font opening.  Note that some maximum      */
-  /*                            values cannot be taken directly from this  */
-  /*                            table.  We thus define additional fields   */
-  /*                            below to hold the computed maxima.         */
-  /*                                                                       */
-  /*    vertical_info        :: A boolean which is set when the font file  */
-  /*                            contains vertical metrics.  If not, the    */
-  /*                            value of the `vertical' field is           */
-  /*                            undefined.                                 */
-  /*                                                                       */
-  /*    vertical             :: The font's vertical header (`vhea' table). */
-  /*                            This field also contains the associated    */
-  /*                            vertical metrics table (`vmtx'), if found. */
-  /*                            IMPORTANT: The contents of this field is   */
-  /*                            undefined if the `verticalInfo' field is   */
-  /*                            unset.                                     */
-  /*                                                                       */
-  /*    num_names            :: The number of name records within this     */
-  /*                            TrueType font.                             */
-  /*                                                                       */
-  /*    name_table           :: The table of name records (`name').        */
-  /*                                                                       */
-  /*    os2                  :: The font's OS/2 table (`OS/2').            */
-  /*                                                                       */
-  /*    postscript           :: The font's PostScript table (`post'        */
-  /*                            table).  The PostScript glyph names are    */
-  /*                            not loaded by the driver on face opening.  */
-  /*                            See the `ttpost' module for more details.  */
-  /*                                                                       */
-  /*    cmap_table           :: Address of the face's `cmap' SFNT table    */
-  /*                            in memory (it's an extracted frame).       */
-  /*                                                                       */
-  /*    cmap_size            :: The size in bytes of the `cmap_table'      */
-  /*                            described above.                           */
-  /*                                                                       */
-  /*    goto_table           :: A function called by each TrueType table   */
-  /*                            loader to position a stream's cursor to    */
-  /*                            the start of a given table according to    */
-  /*                            its tag.  It defaults to TT_Goto_Face but  */
-  /*                            can be different for strange formats (e.g. */
-  /*                            Type 42).                                  */
-  /*                                                                       */
-  /*    access_glyph_frame   :: A function used to access the frame of a   */
-  /*                            given glyph within the face's font file.   */
-  /*                                                                       */
-  /*    forget_glyph_frame   :: A function used to forget the frame of a   */
-  /*                            given glyph when all data has been loaded. */
-  /*                                                                       */
-  /*    read_glyph_header    :: A function used to read a glyph header.    */
-  /*                            It must be called between an `access' and  */
-  /*                            `forget'.                                  */
-  /*                                                                       */
-  /*    read_simple_glyph    :: A function used to read a simple glyph.    */
-  /*                            It must be called after the header was     */
-  /*                            read, and before the `forget'.             */
-  /*                                                                       */
-  /*    read_composite_glyph :: A function used to read a composite glyph. */
-  /*                            It must be called after the header was     */
-  /*                            read, and before the `forget'.             */
-  /*                                                                       */
-  /*    sfnt                 :: A pointer to the SFNT service.             */
-  /*                                                                       */
-  /*    psnames              :: A pointer to the PostScript names service. */
-  /*                                                                       */
-  /*    hdmx                 :: The face's horizontal device metrics       */
-  /*                            (`hdmx' table).  This table is optional in */
-  /*                            TrueType/OpenType fonts.                   */
-  /*                                                                       */
-  /*    gasp                 :: The grid-fitting and scaling properties    */
-  /*                            table (`gasp').  This table is optional in */
-  /*                            TrueType/OpenType fonts.                   */
-  /*                                                                       */
-  /*    pclt                 :: The `pclt' SFNT table.                     */
-  /*                                                                       */
-  /*    num_sbit_strikes     :: The number of sbit strikes, i.e., bitmap   */
-  /*                            sizes, embedded in this font.              */
-  /*                                                                       */
-  /*    sbit_strikes         :: An array of sbit strikes embedded in this  */
-  /*                            font.  This table is optional in a         */
-  /*                            TrueType/OpenType font.                    */
-  /*                                                                       */
-  /*    num_sbit_scales      :: The number of sbit scales for this font.   */
-  /*                                                                       */
-  /*    sbit_scales          :: Array of sbit scales embedded in this      */
-  /*                            font.  This table is optional in a         */
-  /*                            TrueType/OpenType font.                    */
-  /*                                                                       */
-  /*    postscript_names     :: A table used to store the Postscript names */
-  /*                            of  the glyphs for this font.  See the     */
-  /*                            file  `ttconfig.h' for comments on the     */
-  /*                            TT_CONFIG_OPTION_POSTSCRIPT_NAMES option.  */
-  /*                                                                       */
-  /*    num_locations        :: The number of glyph locations in this      */
-  /*                            TrueType file.  This should be             */
-  /*                            identical to the number of glyphs.         */
-  /*                            Ignored for Type 2 fonts.                  */
-  /*                                                                       */
-  /*    glyph_locations      :: An array of longs.  These are offsets to   */
-  /*                            glyph data within the `glyf' table.        */
-  /*                            Ignored for Type 2 font faces.             */
-  /*                                                                       */
-  /*    glyf_len             :: The length of the `glyf' table.  Needed    */
-  /*                            for malformed `loca' tables.               */
-  /*                                                                       */
-  /*    font_program_size    :: Size in bytecodes of the face's font       */
-  /*                            program.  0 if none defined.  Ignored for  */
-  /*                            Type 2 fonts.                              */
-  /*                                                                       */
-  /*    font_program         :: The face's font program (bytecode stream)  */
-  /*                            executed at load time, also used during    */
-  /*                            glyph rendering.  Comes from the `fpgm'    */
-  /*                            table.  Ignored for Type 2 font fonts.     */
-  /*                                                                       */
-  /*    cvt_program_size     :: The size in bytecodes of the face's cvt    */
-  /*                            program.  Ignored for Type 2 fonts.        */
-  /*                                                                       */
-  /*    cvt_program          :: The face's cvt program (bytecode stream)   */
-  /*                            executed each time an instance/size is     */
-  /*                            changed/reset.  Comes from the `prep'      */
-  /*                            table.  Ignored for Type 2 fonts.          */
-  /*                                                                       */
-  /*    cvt_size             :: Size of the control value table (in        */
-  /*                            entries).   Ignored for Type 2 fonts.      */
-  /*                                                                       */
-  /*    cvt                  :: The face's original control value table.   */
-  /*                            Coordinates are expressed in unscaled font */
-  /*                            units.  Comes from the `cvt ' table.       */
-  /*                            Ignored for Type 2 fonts.                  */
-  /*                                                                       */
-  /*    num_kern_pairs       :: The number of kerning pairs present in the */
-  /*                            font file.  The engine only loads the      */
-  /*                            first horizontal format 0 kern table it    */
-  /*                            finds in the font file.  Ignored for       */
-  /*                            Type 2 fonts.                              */
-  /*                                                                       */
-  /*    kern_table_index     :: The index of the kerning table in the font */
-  /*                            kerning directory.  Ignored for Type 2     */
-  /*                            fonts.                                     */
-  /*                                                                       */
-  /*    interpreter          :: A pointer to the TrueType bytecode         */
-  /*                            interpreters field is also used to hook    */
-  /*                            the debugger in `ttdebug'.                 */
-  /*                                                                       */
-  /*    unpatented_hinting   :: If true, use only unpatented methods in    */
-  /*                            the bytecode interpreter.                  */
-  /*                                                                       */
-  /*    doblend              :: A boolean which is set if the font should  */
-  /*                            be blended (this is for GX var).           */
-  /*                                                                       */
-  /*    blend                :: Contains the data needed to control GX     */
-  /*                            variation tables (rather like Multiple     */
-  /*                            Master data).                              */
-  /*                                                                       */
-  /*    extra                :: Reserved for third-party font drivers.     */
-  /*                                                                       */
-  /*    postscript_name      :: The PS name of the font.  Used by the      */
-  /*                            postscript name service.                   */
-  /*                                                                       */
-  typedef struct  TT_FaceRec_
-  {
-    FT_FaceRec            root;
-
-    TTC_HeaderRec         ttc_header;
-
-    FT_ULong              format_tag;
-    FT_UShort             num_tables;
-    TT_Table              dir_tables;
-
-    TT_Header             header;       /* TrueType header table          */
-    TT_HoriHeader         horizontal;   /* TrueType horizontal header     */
-
-    TT_MaxProfile         max_profile;
-
-    FT_Bool               vertical_info;
-    TT_VertHeader         vertical;     /* TT Vertical header, if present */
-
-    FT_UShort             num_names;    /* number of name records  */
-    TT_NameTableRec       name_table;   /* name table              */
-
-    TT_OS2                os2;          /* TrueType OS/2 table            */
-    TT_Postscript         postscript;   /* TrueType Postscript table      */
-
-    FT_Byte*              cmap_table;   /* extracted `cmap' table */
-    FT_ULong              cmap_size;
-
-    TT_Loader_GotoTableFunc   goto_table;
-
-    TT_Loader_StartGlyphFunc  access_glyph_frame;
-    TT_Loader_EndGlyphFunc    forget_glyph_frame;
-    TT_Loader_ReadGlyphFunc   read_glyph_header;
-    TT_Loader_ReadGlyphFunc   read_simple_glyph;
-    TT_Loader_ReadGlyphFunc   read_composite_glyph;
-
-    /* a typeless pointer to the SFNT_Interface table used to load */
-    /* the basic TrueType tables in the face object                */
-    void*                 sfnt;
-
-    /* a typeless pointer to the FT_Service_PsCMapsRec table used to */
-    /* handle glyph names <-> unicode & Mac values                   */
-    void*                 psnames;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* Optional TrueType/OpenType tables                                   */
-    /*                                                                     */
-    /***********************************************************************/
-
-    /* grid-fitting and scaling table */
-    TT_GaspRec            gasp;                 /* the `gasp' table */
-
-    /* PCL 5 table */
-    TT_PCLT               pclt;
-
-    /* embedded bitmaps support */
-    FT_ULong              num_sbit_scales;
-    TT_SBit_Scale         sbit_scales;
-
-    /* postscript names table */
-    TT_Post_NamesRec      postscript_names;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* TrueType-specific fields (ignored by the OTF-Type2 driver)          */
-    /*                                                                     */
-    /***********************************************************************/
-
-    /* the font program, if any */
-    FT_ULong              font_program_size;
-    FT_Byte*              font_program;
-
-    /* the cvt program, if any */
-    FT_ULong              cvt_program_size;
-    FT_Byte*              cvt_program;
-
-    /* the original, unscaled, control value table */
-    FT_ULong              cvt_size;
-    FT_Short*             cvt;
-
-    /* A pointer to the bytecode interpreter to use.  This is also */
-    /* used to hook the debugger for the `ttdebug' utility.        */
-    TT_Interpreter        interpreter;
-
-#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
-    /* Use unpatented hinting only. */
-    FT_Bool               unpatented_hinting;
-#endif
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* Other tables or fields. This is used by derivative formats like     */
-    /* OpenType.                                                           */
-    /*                                                                     */
-    /***********************************************************************/
-
-    FT_Generic            extra;
-
-    const char*           postscript_name;
-
-    FT_ULong              glyf_len;
-
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-    FT_Bool               doblend;
-    GX_Blend              blend;
-#endif
-
-    /* since version 2.2 */
-
-    FT_Byte*              horz_metrics;
-    FT_ULong              horz_metrics_size;
-
-    FT_Byte*              vert_metrics;
-    FT_ULong              vert_metrics_size;
-
-    FT_ULong              num_locations; /* in broken TTF, gid > 0xFFFF */
-    FT_Byte*              glyph_locations;
-
-    FT_Byte*              hdmx_table;
-    FT_ULong              hdmx_table_size;
-    FT_UInt               hdmx_record_count;
-    FT_ULong              hdmx_record_size;
-    FT_Byte*              hdmx_record_sizes;
-
-    FT_Byte*              sbit_table;
-    FT_ULong              sbit_table_size;
-    FT_UInt               sbit_num_strikes;
-
-    FT_Byte*              kern_table;
-    FT_ULong              kern_table_size;
-    FT_UInt               num_kern_tables;
-    FT_UInt32             kern_avail_bits;
-    FT_UInt32             kern_order_bits;
-
-#ifdef TT_CONFIG_OPTION_BDF
-    TT_BDFRec             bdf;
-#endif /* TT_CONFIG_OPTION_BDF */
-
-    /* since 2.3.0 */
-    FT_ULong              horz_metrics_offset;
-    FT_ULong              vert_metrics_offset;
-
-#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-    /* since 2.4.12 */
-    FT_ULong              sph_found_func_flags; /* special functions found */
-                                                /* for this face           */
-    FT_Bool               sph_compatibility_mode;
-#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-  } TT_FaceRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  <Struct>                                                             */
-  /*     TT_GlyphZoneRec                                                   */
-  /*                                                                       */
-  /*  <Description>                                                        */
-  /*     A glyph zone is used to load, scale and hint glyph outline        */
-  /*     coordinates.                                                      */
-  /*                                                                       */
-  /*  <Fields>                                                             */
-  /*     memory       :: A handle to the memory manager.                   */
-  /*                                                                       */
-  /*     max_points   :: The maximum size in points of the zone.           */
-  /*                                                                       */
-  /*     max_contours :: Max size in links contours of the zone.           */
-  /*                                                                       */
-  /*     n_points     :: The current number of points in the zone.         */
-  /*                                                                       */
-  /*     n_contours   :: The current number of contours in the zone.       */
-  /*                                                                       */
-  /*     org          :: The original glyph coordinates (font              */
-  /*                     units/scaled).                                    */
-  /*                                                                       */
-  /*     cur          :: The current glyph coordinates (scaled/hinted).    */
-  /*                                                                       */
-  /*     tags         :: The point control tags.                           */
-  /*                                                                       */
-  /*     contours     :: The contours end points.                          */
-  /*                                                                       */
-  /*     first_point  :: Offset of the current subglyph's first point.     */
-  /*                                                                       */
-  typedef struct  TT_GlyphZoneRec_
-  {
-    FT_Memory   memory;
-    FT_UShort   max_points;
-    FT_UShort   max_contours;
-    FT_UShort   n_points;    /* number of points in zone    */
-    FT_Short    n_contours;  /* number of contours          */
-
-    FT_Vector*  org;         /* original point coordinates  */
-    FT_Vector*  cur;         /* current point coordinates   */
-    FT_Vector*  orus;        /* original (unscaled) point coordinates */
-
-    FT_Byte*    tags;        /* current touch flags         */
-    FT_UShort*  contours;    /* contour end points          */
-
-    FT_UShort   first_point; /* offset of first (#0) point  */
-
-  } TT_GlyphZoneRec, *TT_GlyphZone;
-
-
-  /* handle to execution context */
-  typedef struct TT_ExecContextRec_*  TT_ExecContext;
-
-  /* glyph loader structure */
-  typedef struct  TT_LoaderRec_
-  {
-    FT_Face          face;
-    FT_Size          size;
-    FT_GlyphSlot     glyph;
-    FT_GlyphLoader   gloader;
-
-    FT_ULong         load_flags;
-    FT_UInt          glyph_index;
-
-    FT_Stream        stream;
-    FT_Int           byte_len;
-
-    FT_Short         n_contours;
-    FT_BBox          bbox;
-    FT_Int           left_bearing;
-    FT_Int           advance;
-    FT_Int           linear;
-    FT_Bool          linear_def;
-    FT_Bool          preserve_pps;
-    FT_Vector        pp1;
-    FT_Vector        pp2;
-
-    FT_ULong         glyf_offset;
-
-    /* the zone where we load our glyphs */
-    TT_GlyphZoneRec  base;
-    TT_GlyphZoneRec  zone;
-
-    TT_ExecContext   exec;
-    FT_Byte*         instructions;
-    FT_ULong         ins_pos;
-
-    /* for possible extensibility in other formats */
-    void*            other;
-
-    /* since version 2.1.8 */
-    FT_Int           top_bearing;
-    FT_Int           vadvance;
-    FT_Vector        pp3;
-    FT_Vector        pp4;
-
-    /* since version 2.2.1 */
-    FT_Byte*         cursor;
-    FT_Byte*         limit;
-
-  } TT_LoaderRec;
-
-
-FT_END_HEADER
-
-#endif /* __TTTYPES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftrfork.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftrfork.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftrfork.h	(copie de travail)
@@ -1,258 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftrfork.h                                                              */
-/*                                                                         */
-/*    Embedded resource forks accessor (specification).                    */
-/*                                                                         */
-/*  Copyright 2004, 2006, 2007, 2012 by                                    */
-/*  Masatake YAMATO and Redhat K.K.                                        */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/* Development of the code in this file is support of                      */
-/* Information-technology Promotion Agency, Japan.                         */
-/***************************************************************************/
-
-
-#ifndef __FTRFORK_H__
-#define __FTRFORK_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* Number of guessing rules supported in `FT_Raccess_Guess'.            */
-  /* Don't forget to increment the number if you add a new guessing rule. */
-#define FT_RACCESS_N_RULES  9
-
-
-  /* A structure to describe a reference in a resource by its resource ID */
-  /* and internal offset.  The `POST' resource expects to be concatenated */
-  /* by the order of resource IDs instead of its appearance in the file.  */
-
-  typedef struct  FT_RFork_Ref_
-  {
-    FT_UShort  res_id;
-    FT_ULong   offset;
-
-  } FT_RFork_Ref;
-
-#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
-  typedef FT_Error
-  (*ft_raccess_guess_func)( FT_Library  library,
-                            FT_Stream   stream,
-                            char       *base_file_name,
-                            char      **result_file_name,
-                            FT_Long    *result_offset );
-
-  typedef enum  FT_RFork_Rule_ {
-    FT_RFork_Rule_invalid = -2,
-    FT_RFork_Rule_uknown, /* -1 */
-    FT_RFork_Rule_apple_double,
-    FT_RFork_Rule_apple_single,
-    FT_RFork_Rule_darwin_ufs_export,
-    FT_RFork_Rule_darwin_newvfs,
-    FT_RFork_Rule_darwin_hfsplus,
-    FT_RFork_Rule_vfat,
-    FT_RFork_Rule_linux_cap,
-    FT_RFork_Rule_linux_double,
-    FT_RFork_Rule_linux_netatalk
-  } FT_RFork_Rule;
-
-  /* For fast translation between rule index and rule type,
-   * the macros FT_RFORK_xxx should be kept consistent with
-   * the raccess_guess_funcs table
-   */
-  typedef struct ft_raccess_guess_rec_ {
-    ft_raccess_guess_func  func;
-    FT_RFork_Rule          type;
-  } ft_raccess_guess_rec;
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-  /* this array is a storage in non-PIC mode, so ; is needed in END */
-#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
-          const type name[] = {
-#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix )  \
-          { raccess_guess_ ## func_suffix,                           \
-            FT_RFork_Rule_ ## type_suffix },
-#define CONST_FT_RFORK_RULE_ARRAY_END  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-  /* this array is a function in PIC mode, so no ; is needed in END */
-#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
-          void                                         \
-          FT_Init_ ## name( type*  storage )           \
-          {                                            \
-            type*  local = storage;                    \
-                                                       \
-                                                       \
-            int  i = 0;
-#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix )  \
-          local[i].func = raccess_guess_ ## func_suffix;             \
-          local[i].type = FT_RFork_Rule_ ## type_suffix;             \
-          i++;
-#define CONST_FT_RFORK_RULE_ARRAY_END  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Raccess_Guess                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Guess a file name and offset where the actual resource fork is     */
-  /*    stored.  The macro FT_RACCESS_N_RULES holds the number of          */
-  /*    guessing rules;  the guessed result for the Nth rule is            */
-  /*    represented as a triplet: a new file name (new_names[N]), a file   */
-  /*    offset (offsets[N]), and an error code (errors[N]).                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library ::                                                         */
-  /*      A FreeType library instance.                                     */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      A file stream containing the resource fork.                      */
-  /*                                                                       */
-  /*    base_name ::                                                       */
-  /*      The (base) file name of the resource fork used for some          */
-  /*      guessing rules.                                                  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    new_names ::                                                       */
-  /*      An array of guessed file names in which the resource forks may   */
-  /*      exist.  If `new_names[N]' is NULL, the guessed file name is      */
-  /*      equal to `base_name'.                                            */
-  /*                                                                       */
-  /*    offsets ::                                                         */
-  /*      An array of guessed file offsets.  `offsets[N]' holds the file   */
-  /*      offset of the possible start of the resource fork in file        */
-  /*      `new_names[N]'.                                                  */
-  /*                                                                       */
-  /*    errors ::                                                          */
-  /*      An array of FreeType error codes.  `errors[N]' is the error      */
-  /*      code of Nth guessing rule function.  If `errors[N]' is not       */
-  /*      FT_Err_Ok, `new_names[N]' and `offsets[N]' are meaningless.      */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Raccess_Guess( FT_Library  library,
-                    FT_Stream   stream,
-                    char*       base_name,
-                    char**      new_names,
-                    FT_Long*    offsets,
-                    FT_Error*   errors );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Raccess_Get_HeaderInfo                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the information from the header of resource fork.  The         */
-  /*    information includes the file offset where the resource map        */
-  /*    starts, and the file offset where the resource data starts.        */
-  /*    `FT_Raccess_Get_DataOffsets' requires these two data.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library ::                                                         */
-  /*      A FreeType library instance.                                     */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      A file stream containing the resource fork.                      */
-  /*                                                                       */
-  /*    rfork_offset ::                                                    */
-  /*      The file offset where the resource fork starts.                  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    map_offset ::                                                      */
-  /*      The file offset where the resource map starts.                   */
-  /*                                                                       */
-  /*    rdata_pos ::                                                       */
-  /*      The file offset where the resource data starts.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  FT_Err_Ok means success.                     */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_Raccess_Get_HeaderInfo( FT_Library  library,
-                             FT_Stream   stream,
-                             FT_Long     rfork_offset,
-                             FT_Long    *map_offset,
-                             FT_Long    *rdata_pos );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Raccess_Get_DataOffsets                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the data offsets for a tag in a resource fork.  Offsets are    */
-  /*    stored in an array because, in some cases, resources in a resource */
-  /*    fork have the same tag.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library ::                                                         */
-  /*      A FreeType library instance.                                     */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      A file stream containing the resource fork.                      */
-  /*                                                                       */
-  /*    map_offset ::                                                      */
-  /*      The file offset where the resource map starts.                   */
-  /*                                                                       */
-  /*    rdata_pos ::                                                       */
-  /*      The file offset where the resource data starts.                  */
-  /*                                                                       */
-  /*    tag ::                                                             */
-  /*      The resource tag.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    offsets ::                                                         */
-  /*      The stream offsets for the resource data specified by `tag'.     */
-  /*      This array is allocated by the function, so you have to call     */
-  /*      @ft_mem_free after use.                                          */
-  /*                                                                       */
-  /*    count ::                                                           */
-  /*      The length of offsets array.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  FT_Err_Ok means success.                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Normally you should use `FT_Raccess_Get_HeaderInfo' to get the     */
-  /*    value for `map_offset' and `rdata_pos'.                            */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_Raccess_Get_DataOffsets( FT_Library  library,
-                              FT_Stream   stream,
-                              FT_Long     map_offset,
-                              FT_Long     rdata_pos,
-                              FT_Long     tag,
-                              FT_Long   **offsets,
-                              FT_Long    *count );
-
-
-FT_END_HEADER
-
-#endif /* __FTRFORK_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/internal/ftdebug.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/internal/ftdebug.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/internal/ftdebug.h	(copie de travail)
@@ -1,255 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftdebug.h                                                              */
-/*                                                                         */
-/*    Debugging and logging component (specification).                     */
-/*                                                                         */
-/*  Copyright 1996-2002, 2004, 2006-2009, 2013 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/*                                                                         */
-/*  IMPORTANT: A description of FreeType's debugging support can be        */
-/*             found in `docs/DEBUG.TXT'.  Read it if you need to use or   */
-/*             understand this code.                                       */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTDEBUG_H__
-#define __FTDEBUG_H__
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* force the definition of FT_DEBUG_LEVEL_ERROR if FT_DEBUG_LEVEL_TRACE */
-  /* is already defined; this simplifies the following #ifdefs            */
-  /*                                                                      */
-#ifdef FT_DEBUG_LEVEL_TRACE
-#undef  FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_ERROR
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the trace enums as well as the trace levels array when they    */
-  /* are needed.                                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-#define FT_TRACE_DEF( x )  trace_ ## x ,
-
-  /* defining the enumeration */
-  typedef enum  FT_Trace_
-  {
-#include FT_INTERNAL_TRACE_H
-    trace_count
-
-  } FT_Trace;
-
-
-  /* defining the array of trace levels, provided by `src/base/ftdebug.c' */
-  extern int  ft_trace_levels[trace_count];
-
-#undef FT_TRACE_DEF
-
-#endif /* FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_TRACE macro                                             */
-  /*                                                                       */
-  /* IMPORTANT!                                                            */
-  /*                                                                       */
-  /* Each component must define the macro FT_COMPONENT to a valid FT_Trace */
-  /* value before using any TRACE macro.                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-#define FT_TRACE( level, varformat )                      \
-          do                                              \
-          {                                               \
-            if ( ft_trace_levels[FT_COMPONENT] >= level ) \
-              FT_Message varformat;                       \
-          } while ( 0 )
-
-#else /* !FT_DEBUG_LEVEL_TRACE */
-
-#define FT_TRACE( level, varformat )  do { } while ( 0 )      /* nothing */
-
-#endif /* !FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Trace_Get_Count                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the number of available trace components.                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The number of trace components.  0 if FreeType 2 is not built with */
-  /*    FT_DEBUG_LEVEL_TRACE definition.                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function may be useful if you want to access elements of      */
-  /*    the internal `ft_trace_levels' array by an index.                  */
-  /*                                                                       */
-  FT_BASE( FT_Int )
-  FT_Trace_Get_Count( void );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Trace_Get_Name                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the name of a trace component.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    The index of the trace component.                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The name of the trace component.  This is a statically allocated   */
-  /*    C string, so do not free it after use.  NULL if FreeType 2 is not  */
-  /*    built with FT_DEBUG_LEVEL_TRACE definition.                        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use @FT_Trace_Get_Count to get the number of available trace       */
-  /*    components.                                                        */
-  /*                                                                       */
-  /*    This function may be useful if you want to control FreeType 2's    */
-  /*    debug level in your application.                                   */
-  /*                                                                       */
-  FT_BASE( const char * )
-  FT_Trace_Get_Name( FT_Int  idx );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* You need two opening and closing parentheses!                         */
-  /*                                                                       */
-  /* Example: FT_TRACE0(( "Value is %i", foo ))                            */
-  /*                                                                       */
-  /* Output of the FT_TRACEX macros is sent to stderr.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-#define FT_TRACE0( varformat )  FT_TRACE( 0, varformat )
-#define FT_TRACE1( varformat )  FT_TRACE( 1, varformat )
-#define FT_TRACE2( varformat )  FT_TRACE( 2, varformat )
-#define FT_TRACE3( varformat )  FT_TRACE( 3, varformat )
-#define FT_TRACE4( varformat )  FT_TRACE( 4, varformat )
-#define FT_TRACE5( varformat )  FT_TRACE( 5, varformat )
-#define FT_TRACE6( varformat )  FT_TRACE( 6, varformat )
-#define FT_TRACE7( varformat )  FT_TRACE( 7, varformat )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_ERROR macro.                                            */
-  /*                                                                       */
-  /* Output of this macro is sent to stderr.                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#define FT_ERROR( varformat )  FT_Message  varformat
-
-#else  /* !FT_DEBUG_LEVEL_ERROR */
-
-#define FT_ERROR( varformat )  do { } while ( 0 )      /* nothing */
-
-#endif /* !FT_DEBUG_LEVEL_ERROR */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_ASSERT and FT_THROW macros.  The call to `FT_Throw'     */
-  /* makes it possible to easily set a breakpoint at this function.        */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#define FT_ASSERT( condition )                                      \
-          do                                                        \
-          {                                                         \
-            if ( !( condition ) )                                   \
-              FT_Panic( "assertion failed on line %d of file %s\n", \
-                        __LINE__, __FILE__ );                       \
-          } while ( 0 )
-
-#define FT_THROW( e )                                   \
-          ( FT_Throw( FT_ERR_CAT( FT_ERR_PREFIX, e ),   \
-                      __LINE__,                         \
-                      __FILE__ )                      | \
-            FT_ERR_CAT( FT_ERR_PREFIX, e )            )
-
-#else /* !FT_DEBUG_LEVEL_ERROR */
-
-#define FT_ASSERT( condition )  do { } while ( 0 )
-
-#define FT_THROW( e )  FT_ERR_CAT( FT_ERR_PREFIX, e )
-
-#endif /* !FT_DEBUG_LEVEL_ERROR */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define `FT_Message' and `FT_Panic' when needed.                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#include "stdio.h"  /* for vfprintf() */
-
-  /* print a message */
-  FT_BASE( void )
-  FT_Message( const char*  fmt,
-              ... );
-
-  /* print a message and exit */
-  FT_BASE( void )
-  FT_Panic( const char*  fmt,
-            ... );
-
-  /* report file name and line number of an error */
-  FT_BASE( int )
-  FT_Throw( FT_Error     error,
-            int          line,
-            const char*  file );
-
-#endif /* FT_DEBUG_LEVEL_ERROR */
-
-
-  FT_BASE( void )
-  ft_debug_init( void );
-
-FT_END_HEADER
-
-#endif /* __FTDEBUG_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftsizes.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftsizes.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftsizes.h	(copie de travail)
@@ -1,159 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsizes.h                                                              */
-/*                                                                         */
-/*    FreeType size objects management (specification).                    */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003, 2004, 2006, 2009 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Typical application would normally not need to use these functions.   */
-  /* However, they have been placed in a public API for the rare cases     */
-  /* where they are needed.                                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTSIZES_H__
-#define __FTSIZES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    sizes_management                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Size Management                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Managing multiple sizes per face.                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    When creating a new face object (e.g., with @FT_New_Face), an      */
-  /*    @FT_Size object is automatically created and used to store all     */
-  /*    pixel-size dependent information, available in the `face->size'    */
-  /*    field.                                                             */
-  /*                                                                       */
-  /*    It is however possible to create more sizes for a given face,      */
-  /*    mostly in order to manage several character pixel sizes of the     */
-  /*    same font family and style.  See @FT_New_Size and @FT_Done_Size.   */
-  /*                                                                       */
-  /*    Note that @FT_Set_Pixel_Sizes and @FT_Set_Char_Size only           */
-  /*    modify the contents of the current `active' size; you thus need    */
-  /*    to use @FT_Activate_Size to change it.                             */
-  /*                                                                       */
-  /*    99% of applications won't need the functions provided here,        */
-  /*    especially if they use the caching sub-system, so be cautious      */
-  /*    when using these.                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Size                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new size object from a given face object.                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a parent face object.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    asize :: A handle to a new size object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You need to call @FT_Activate_Size in order to select the new size */
-  /*    for upcoming calls to @FT_Set_Pixel_Sizes, @FT_Set_Char_Size,      */
-  /*    @FT_Load_Glyph, @FT_Load_Char, etc.                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Size( FT_Face   face,
-               FT_Size*  size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Size                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard a given size object.  Note that @FT_Done_Face              */
-  /*    automatically discards all size objects allocated with             */
-  /*    @FT_New_Size.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    size :: A handle to a target size object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Size( FT_Size  size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Activate_Size                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Even though it is possible to create several size objects for a    */
-  /*    given face (see @FT_New_Size for details), functions like          */
-  /*    @FT_Load_Glyph or @FT_Load_Char only use the one which has been    */
-  /*    activated last to determine the `current character pixel size'.    */
-  /*                                                                       */
-  /*    This function can be used to `activate' a previously created size  */
-  /*    object.                                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    size :: A handle to a target size object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If `face' is the size's parent face object, this function changes  */
-  /*    the value of `face->size' to the input size handle.                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Activate_Size( FT_Size  size );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTSIZES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftttdrv.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftttdrv.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftttdrv.h	(copie de travail)
@@ -1,150 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftttdrv.h                                                              */
-/*                                                                         */
-/*    FreeType API for controlling the TrueType driver                     */
-/*    (specification only).                                                */
-/*                                                                         */
-/*  Copyright 2013 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTTTDRV_H__
-#define __FTTTDRV_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   tt_driver
-   *
-   * @title:
-   *   The TrueType driver
-   *
-   * @abstract:
-   *   Controlling the TrueType driver module.
-   *
-   * @description:
-   *   While FreeType's TrueType driver doesn't expose API functions by
-   *   itself, it is possible to control its behaviour with @FT_Property_Set
-   *   and @FT_Property_Get.  The following lists the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   The TrueType driver's module name is `truetype'.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   interpreter-version
-   *
-   * @description:
-   *   Currently, two versions are available which represent the bytecode
-   *   interpreter with and without subpixel hinting support,
-   *   respectively.  The default is subpixel support if
-   *   TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel
-   *   support otherwise (since it isn't available then).
-   *
-   *   If subpixel hinting is on, many TrueType bytecode instructions
-   *   behave differently compared to B/W or grayscale rendering.  The
-   *   main idea is to render at a much increased horizontal resolution,
-   *   then sampling down the created output to subpixel precision.
-   *   However, many older fonts are not suited to this and must be
-   *   specially taken care of by applying (hardcoded) font-specific
-   *   tweaks.
-   *
-   *   Details on subpixel hinting and some of the necessary tweaks can be
-   *   found in Greg Hitchcock's whitepaper at
-   *   `http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx'.
-   *
-   *   The following example code demonstrates how to activate subpixel
-   *   hinting (omitting the error handling).
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Face     face;
-   *     FT_UInt     interpreter_version = TT_INTERPRETER_VERSION_38;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "truetype",
-   *                               "interpreter-version",
-   *                               &interpreter_version );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   TT_INTERPRETER_VERSION_XXX
-   *
-   * @description:
-   *   A list of constants used for the @interpreter-version property to
-   *   select the hinting engine for Truetype fonts.
-   *
-   *   The numeric value in the constant names represents the version
-   *   number as returned by the `GETINFO' bytecode instruction.
-   *
-   * @values:
-   *   TT_INTERPRETER_VERSION_35 ::
-   *     Version~35 corresponds to MS rasterizer v.1.7 as used e.g. in
-   *     Windows~98; only grayscale and B/W rasterizing is supported.
-   *
-   *   TT_INTERPRETER_VERSION_38 ::
-   *     Version~38 corresponds to MS rasterizer v.1.9; it is roughly
-   *     equivalent to the hinting provided by DirectWrite ClearType (as
-   *     can be found, for example, in the Internet Explorer~9 running on
-   *     Windows~7).
-   *
-   * @note:
-   *   This property controls the behaviour of the bytecode interpreter
-   *   and thus how outlines get hinted.  It does *not* control how glyph
-   *   get rasterized!  In particular, it does not control subpixel color
-   *   filtering.
-   *
-   *   If FreeType has not been compiled with configuration option
-   *   FT_CONFIG_OPTION_SUBPIXEL_HINTING, selecting version~38 causes an
-   *   `FT_Err_Unimplemented_Feature' error.
-   *
-   */
-#define TT_INTERPRETER_VERSION_35  35
-#define TT_INTERPRETER_VERSION_38  38
-
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTTTDRV_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/fttypes.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/fttypes.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/fttypes.h	(copie de travail)
@@ -1,598 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttypes.h                                                              */
-/*                                                                         */
-/*    FreeType simple types definitions (specification only).              */
-/*                                                                         */
-/*  Copyright 1996-2002, 2004, 2006-2009, 2012, 2013 by                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTTYPES_H__
-#define __FTTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_SYSTEM_H
-#include FT_IMAGE_H
-
-#include <stddef.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Basic Data Types                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The basic data types defined by the library.                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the basic data types defined by FreeType~2,  */
-  /*    ranging from simple scalar types to bitmap descriptors.  More      */
-  /*    font-specific structures are defined in a different section.       */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Byte                                                            */
-  /*    FT_Bytes                                                           */
-  /*    FT_Char                                                            */
-  /*    FT_Int                                                             */
-  /*    FT_UInt                                                            */
-  /*    FT_Int16                                                           */
-  /*    FT_UInt16                                                          */
-  /*    FT_Int32                                                           */
-  /*    FT_UInt32                                                          */
-  /*    FT_Short                                                           */
-  /*    FT_UShort                                                          */
-  /*    FT_Long                                                            */
-  /*    FT_ULong                                                           */
-  /*    FT_Bool                                                            */
-  /*    FT_Offset                                                          */
-  /*    FT_PtrDist                                                         */
-  /*    FT_String                                                          */
-  /*    FT_Tag                                                             */
-  /*    FT_Error                                                           */
-  /*    FT_Fixed                                                           */
-  /*    FT_Pointer                                                         */
-  /*    FT_Pos                                                             */
-  /*    FT_Vector                                                          */
-  /*    FT_BBox                                                            */
-  /*    FT_Matrix                                                          */
-  /*    FT_FWord                                                           */
-  /*    FT_UFWord                                                          */
-  /*    FT_F2Dot14                                                         */
-  /*    FT_UnitVector                                                      */
-  /*    FT_F26Dot6                                                         */
-  /*                                                                       */
-  /*                                                                       */
-  /*    FT_Generic                                                         */
-  /*    FT_Generic_Finalizer                                               */
-  /*                                                                       */
-  /*    FT_Bitmap                                                          */
-  /*    FT_Pixel_Mode                                                      */
-  /*    FT_Palette_Mode                                                    */
-  /*    FT_Glyph_Format                                                    */
-  /*    FT_IMAGE_TAG                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Bool                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef of unsigned char, used for simple booleans.  As usual,   */
-  /*    values 1 and~0 represent true and false, respectively.             */
-  /*                                                                       */
-  typedef unsigned char  FT_Bool;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_FWord                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 16-bit integer used to store a distance in original font  */
-  /*    units.                                                             */
-  /*                                                                       */
-  typedef signed short  FT_FWord;   /* distance in FUnits */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UFWord                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An unsigned 16-bit integer used to store a distance in original    */
-  /*    font units.                                                        */
-  /*                                                                       */
-  typedef unsigned short  FT_UFWord;  /* unsigned distance */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Char                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the _signed_ char type.                       */
-  /*                                                                       */
-  typedef signed char  FT_Char;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Byte                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the _unsigned_ char type.                     */
-  /*                                                                       */
-  typedef unsigned char  FT_Byte;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Bytes                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for constant memory areas.                               */
-  /*                                                                       */
-  typedef const FT_Byte*  FT_Bytes;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Tag                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for 32-bit tags (as used in the SFNT format).            */
-  /*                                                                       */
-  typedef FT_UInt32  FT_Tag;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_String                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the char type, usually used for strings.      */
-  /*                                                                       */
-  typedef char  FT_String;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Short                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for signed short.                                        */
-  /*                                                                       */
-  typedef signed short  FT_Short;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UShort                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for unsigned short.                                      */
-  /*                                                                       */
-  typedef unsigned short  FT_UShort;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for the int type.                                        */
-  /*                                                                       */
-  typedef signed int  FT_Int;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for the unsigned int type.                               */
-  /*                                                                       */
-  typedef unsigned int  FT_UInt;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Long                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for signed long.                                         */
-  /*                                                                       */
-  typedef signed long  FT_Long;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_ULong                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for unsigned long.                                       */
-  /*                                                                       */
-  typedef unsigned long  FT_ULong;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_F2Dot14                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 2.14 fixed-point type used for unit vectors.              */
-  /*                                                                       */
-  typedef signed short  FT_F2Dot14;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_F26Dot6                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 26.6 fixed-point type used for vectorial pixel            */
-  /*    coordinates.                                                       */
-  /*                                                                       */
-  typedef signed long  FT_F26Dot6;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Fixed                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is used to store 16.16 fixed-point values, like scaling  */
-  /*    values or matrix coefficients.                                     */
-  /*                                                                       */
-  typedef signed long  FT_Fixed;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Error                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The FreeType error code type.  A value of~0 is always interpreted  */
-  /*    as a successful operation.                                         */
-  /*                                                                       */
-  typedef int  FT_Error;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Pointer                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for a typeless pointer.                           */
-  /*                                                                       */
-  typedef void*  FT_Pointer;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Offset                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is equivalent to the ANSI~C `size_t' type, i.e., the largest  */
-  /*    _unsigned_ integer type used to express a file size or position,   */
-  /*    or a memory block size.                                            */
-  /*                                                                       */
-  typedef size_t  FT_Offset;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_PtrDist                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is equivalent to the ANSI~C `ptrdiff_t' type, i.e., the       */
-  /*    largest _signed_ integer type used to express the distance         */
-  /*    between two pointers.                                              */
-  /*                                                                       */
-  typedef ft_ptrdiff_t  FT_PtrDist;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_UnitVector                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2D vector unit vector.  Uses    */
-  /*    FT_F2Dot14 types.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x :: Horizontal coordinate.                                        */
-  /*                                                                       */
-  /*    y :: Vertical coordinate.                                          */
-  /*                                                                       */
-  typedef struct  FT_UnitVector_
-  {
-    FT_F2Dot14  x;
-    FT_F2Dot14  y;
-
-  } FT_UnitVector;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Matrix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2x2 matrix.  Coefficients are   */
-  /*    in 16.16 fixed-point format.  The computation performed is:        */
-  /*                                                                       */
-  /*       {                                                               */
-  /*          x' = x*xx + y*xy                                             */
-  /*          y' = x*yx + y*yy                                             */
-  /*       }                                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    xx :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    xy :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    yx :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    yy :: Matrix coefficient.                                          */
-  /*                                                                       */
-  typedef struct  FT_Matrix_
-  {
-    FT_Fixed  xx, xy;
-    FT_Fixed  yx, yy;
-
-  } FT_Matrix;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Data                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Read-only binary data represented as a pointer and a length.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    pointer :: The data.                                               */
-  /*                                                                       */
-  /*    length  :: The length of the data in bytes.                        */
-  /*                                                                       */
-  typedef struct  FT_Data_
-  {
-    const FT_Byte*  pointer;
-    FT_Int          length;
-
-  } FT_Data;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Generic_Finalizer                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Describe a function used to destroy the `client' data of any       */
-  /*    FreeType object.  See the description of the @FT_Generic type for  */
-  /*    details of usage.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    The address of the FreeType object which is under finalization.    */
-  /*    Its client data is accessed through its `generic' field.           */
-  /*                                                                       */
-  typedef void  (*FT_Generic_Finalizer)(void*  object);
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Generic                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Client applications often need to associate their own data to a    */
-  /*    variety of FreeType core objects.  For example, a text layout API  */
-  /*    might want to associate a glyph cache to a given size object.      */
-  /*                                                                       */
-  /*    Some FreeType object contains a `generic' field, of type           */
-  /*    FT_Generic, which usage is left to client applications and font    */
-  /*    servers.                                                           */
-  /*                                                                       */
-  /*    It can be used to store a pointer to client-specific data, as well */
-  /*    as the address of a `finalizer' function, which will be called by  */
-  /*    FreeType when the object is destroyed (for example, the previous   */
-  /*    client example would put the address of the glyph cache destructor */
-  /*    in the `finalizer' field).                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    data      :: A typeless pointer to any client-specified data. This */
-  /*                 field is completely ignored by the FreeType library.  */
-  /*                                                                       */
-  /*    finalizer :: A pointer to a `generic finalizer' function, which    */
-  /*                 will be called when the object is destroyed.  If this */
-  /*                 field is set to NULL, no code will be called.         */
-  /*                                                                       */
-  typedef struct  FT_Generic_
-  {
-    void*                 data;
-    FT_Generic_Finalizer  finalizer;
-
-  } FT_Generic;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_MAKE_TAG                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four-letter tags which are used to label       */
-  /*    TrueType tables into an unsigned long to be used within FreeType.  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The produced values *must* be 32-bit integers.  Don't redefine     */
-  /*    this macro.                                                        */
-  /*                                                                       */
-#define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
-          (FT_Tag)                        \
-          ( ( (FT_ULong)_x1 << 24 ) |     \
-            ( (FT_ULong)_x2 << 16 ) |     \
-            ( (FT_ULong)_x3 <<  8 ) |     \
-              (FT_ULong)_x4         )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                    L I S T   M A N A G E M E N T                      */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    list_processing                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_ListNode                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*     Many elements and objects in FreeType are listed through an       */
-  /*     @FT_List record (see @FT_ListRec).  As its name suggests, an      */
-  /*     FT_ListNode is a handle to a single list element.                 */
-  /*                                                                       */
-  typedef struct FT_ListNodeRec_*  FT_ListNode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_List                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a list record (see @FT_ListRec).                       */
-  /*                                                                       */
-  typedef struct FT_ListRec_*  FT_List;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ListNodeRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold a single list element.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    prev :: The previous element in the list.  NULL if first.          */
-  /*                                                                       */
-  /*    next :: The next element in the list.  NULL if last.               */
-  /*                                                                       */
-  /*    data :: A typeless pointer to the listed object.                   */
-  /*                                                                       */
-  typedef struct  FT_ListNodeRec_
-  {
-    FT_ListNode  prev;
-    FT_ListNode  next;
-    void*        data;
-
-  } FT_ListNodeRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ListRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold a simple doubly-linked list.  These are   */
-  /*    used in many parts of FreeType.                                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    head :: The head (first element) of doubly-linked list.            */
-  /*                                                                       */
-  /*    tail :: The tail (last element) of doubly-linked list.             */
-  /*                                                                       */
-  typedef struct  FT_ListRec_
-  {
-    FT_ListNode  head;
-    FT_ListNode  tail;
-
-  } FT_ListRec;
-
-
-  /* */
-
-#define FT_IS_EMPTY( list )  ( (list).head == 0 )
-#define FT_BOOL( x )  ( (FT_Bool)( x ) )
-
-  /* concatenate C tokens */
-#define FT_ERR_XCAT( x, y )  x ## y
-#define FT_ERR_CAT( x, y )   FT_ERR_XCAT( x, y )
-
-  /* see `ftmoderr.h' for descriptions of the following macros */
-
-#define FT_ERR( e )  FT_ERR_CAT( FT_ERR_PREFIX, e )
-
-#define FT_ERROR_BASE( x )    ( (x) & 0xFF )
-#define FT_ERROR_MODULE( x )  ( (x) & 0xFF00U )
-
-#define FT_ERR_EQ( x, e )                                        \
-          ( FT_ERROR_BASE( x ) == FT_ERROR_BASE( FT_ERR( e ) ) )
-#define FT_ERR_NEQ( x, e )                                       \
-          ( FT_ERROR_BASE( x ) != FT_ERROR_BASE( FT_ERR( e ) ) )
-
-
-FT_END_HEADER
-
-#endif /* __FTTYPES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftwinfnt.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftwinfnt.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftwinfnt.h	(copie de travail)
@@ -1,274 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftwinfnt.h                                                             */
-/*                                                                         */
-/*    FreeType API for accessing Windows fnt-specific data.                */
-/*                                                                         */
-/*  Copyright 2003, 2004, 2008 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTWINFNT_H__
-#define __FTWINFNT_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    winfnt_fonts                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Window FNT Files                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Windows FNT specific API.                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Windows FNT specific      */
-  /*    functions.                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FT_WinFNT_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `charset' byte in
-   *   @FT_WinFNT_HeaderRec.  Exact mapping tables for the various cpXXXX
-   *   encodings (except for cp1361) can be found at ftp://ftp.unicode.org
-   *   in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory.  cp1361 is
-   *   roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
-   *
-   * @values:
-   *   FT_WinFNT_ID_DEFAULT ::
-   *     This is used for font enumeration and font creation as a
-   *     `don't care' value.  Valid font files don't contain this value.
-   *     When querying for information about the character set of the font
-   *     that is currently selected into a specified device context, this
-   *     return value (of the related Windows API) simply denotes failure.
-   *
-   *   FT_WinFNT_ID_SYMBOL ::
-   *     There is no known mapping table available.
-   *
-   *   FT_WinFNT_ID_MAC ::
-   *     Mac Roman encoding.
-   *
-   *   FT_WinFNT_ID_OEM ::
-   *     From Michael PÃ¶ttgen <michael@poettgen.de>:
-   *
-   *       The `Windows Font Mapping' article says that FT_WinFNT_ID_OEM
-   *       is used for the charset of vector fonts, like `modern.fon',
-   *       `roman.fon', and `script.fon' on Windows.
-   *
-   *       The `CreateFont' documentation says: The FT_WinFNT_ID_OEM value
-   *       specifies a character set that is operating-system dependent.
-   *
-   *       The `IFIMETRICS' documentation from the `Windows Driver
-   *       Development Kit' says: This font supports an OEM-specific
-   *       character set.  The OEM character set is system dependent.
-   *
-   *       In general OEM, as opposed to ANSI (i.e., cp1252), denotes the
-   *       second default codepage that most international versions of
-   *       Windows have.  It is one of the OEM codepages from
-   *
-   *         http://www.microsoft.com/globaldev/reference/cphome.mspx,
-   *
-   *       and is used for the `DOS boxes', to support legacy applications.
-   *       A German Windows version for example usually uses ANSI codepage
-   *       1252 and OEM codepage 850.
-   *
-   *   FT_WinFNT_ID_CP874 ::
-   *     A superset of Thai TIS 620 and ISO 8859-11.
-   *
-   *   FT_WinFNT_ID_CP932 ::
-   *     A superset of Japanese Shift-JIS (with minor deviations).
-   *
-   *   FT_WinFNT_ID_CP936 ::
-   *     A superset of simplified Chinese GB 2312-1980 (with different
-   *     ordering and minor deviations).
-   *
-   *   FT_WinFNT_ID_CP949 ::
-   *     A superset of Korean Hangul KS~C 5601-1987 (with different
-   *     ordering and minor deviations).
-   *
-   *   FT_WinFNT_ID_CP950 ::
-   *     A superset of traditional Chinese Big~5 ETen (with different
-   *     ordering and minor deviations).
-   *
-   *   FT_WinFNT_ID_CP1250 ::
-   *     A superset of East European ISO 8859-2 (with slightly different
-   *     ordering).
-   *
-   *   FT_WinFNT_ID_CP1251 ::
-   *     A superset of Russian ISO 8859-5 (with different ordering).
-   *
-   *   FT_WinFNT_ID_CP1252 ::
-   *     ANSI encoding.  A superset of ISO 8859-1.
-   *
-   *   FT_WinFNT_ID_CP1253 ::
-   *     A superset of Greek ISO 8859-7 (with minor modifications).
-   *
-   *   FT_WinFNT_ID_CP1254 ::
-   *     A superset of Turkish ISO 8859-9.
-   *
-   *   FT_WinFNT_ID_CP1255 ::
-   *     A superset of Hebrew ISO 8859-8 (with some modifications).
-   *
-   *   FT_WinFNT_ID_CP1256 ::
-   *     A superset of Arabic ISO 8859-6 (with different ordering).
-   *
-   *   FT_WinFNT_ID_CP1257 ::
-   *     A superset of Baltic ISO 8859-13 (with some deviations).
-   *
-   *   FT_WinFNT_ID_CP1258 ::
-   *     For Vietnamese.  This encoding doesn't cover all necessary
-   *     characters.
-   *
-   *   FT_WinFNT_ID_CP1361 ::
-   *     Korean (Johab).
-   */
-
-#define FT_WinFNT_ID_CP1252    0
-#define FT_WinFNT_ID_DEFAULT   1
-#define FT_WinFNT_ID_SYMBOL    2
-#define FT_WinFNT_ID_MAC      77
-#define FT_WinFNT_ID_CP932   128
-#define FT_WinFNT_ID_CP949   129
-#define FT_WinFNT_ID_CP1361  130
-#define FT_WinFNT_ID_CP936   134
-#define FT_WinFNT_ID_CP950   136
-#define FT_WinFNT_ID_CP1253  161
-#define FT_WinFNT_ID_CP1254  162
-#define FT_WinFNT_ID_CP1258  163
-#define FT_WinFNT_ID_CP1255  177
-#define FT_WinFNT_ID_CP1256  178
-#define FT_WinFNT_ID_CP1257  186
-#define FT_WinFNT_ID_CP1251  204
-#define FT_WinFNT_ID_CP874   222
-#define FT_WinFNT_ID_CP1250  238
-#define FT_WinFNT_ID_OEM     255
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_WinFNT_HeaderRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Windows FNT Header info.                                           */
-  /*                                                                       */
-  typedef struct  FT_WinFNT_HeaderRec_
-  {
-    FT_UShort  version;
-    FT_ULong   file_size;
-    FT_Byte    copyright[60];
-    FT_UShort  file_type;
-    FT_UShort  nominal_point_size;
-    FT_UShort  vertical_resolution;
-    FT_UShort  horizontal_resolution;
-    FT_UShort  ascent;
-    FT_UShort  internal_leading;
-    FT_UShort  external_leading;
-    FT_Byte    italic;
-    FT_Byte    underline;
-    FT_Byte    strike_out;
-    FT_UShort  weight;
-    FT_Byte    charset;
-    FT_UShort  pixel_width;
-    FT_UShort  pixel_height;
-    FT_Byte    pitch_and_family;
-    FT_UShort  avg_width;
-    FT_UShort  max_width;
-    FT_Byte    first_char;
-    FT_Byte    last_char;
-    FT_Byte    default_char;
-    FT_Byte    break_char;
-    FT_UShort  bytes_per_row;
-    FT_ULong   device_offset;
-    FT_ULong   face_name_offset;
-    FT_ULong   bits_pointer;
-    FT_ULong   bits_offset;
-    FT_Byte    reserved;
-    FT_ULong   flags;
-    FT_UShort  A_space;
-    FT_UShort  B_space;
-    FT_UShort  C_space;
-    FT_UShort  color_table_offset;
-    FT_ULong   reserved1[4];
-
-  } FT_WinFNT_HeaderRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_WinFNT_Header                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an @FT_WinFNT_HeaderRec structure.                     */
-  /*                                                                       */
-  typedef struct FT_WinFNT_HeaderRec_*  FT_WinFNT_Header;
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_WinFNT_Header
-   *
-   * @description:
-   *    Retrieve a Windows FNT font info header.
-   *
-   * @input:
-   *    face    :: A handle to the input face.
-   *
-   * @output:
-   *    aheader :: The WinFNT header.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   This function only works with Windows FNT faces, returning an error
-   *   otherwise.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_WinFNT_Header( FT_Face               face,
-                        FT_WinFNT_HeaderRec  *aheader );
-
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* __FTWINFNT_H__ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
Index: lib/3rdparty/freetype/include/freetype/fterrdef.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/fterrdef.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/fterrdef.h	(copie de travail)
@@ -1,249 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fterrdef.h                                                             */
-/*                                                                         */
-/*    FreeType error codes (specification).                                */
-/*                                                                         */
-/*  Copyright 2002, 2004, 2006, 2007, 2010-2013 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                LIST OF ERROR CODES/MESSAGES             *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-  /* You need to define both FT_ERRORDEF_ and FT_NOERRORDEF_ before */
-  /* including this file.                                           */
-
-
-  /* generic errors */
-
-  FT_NOERRORDEF_( Ok,                                        0x00, \
-                  "no error" )
-
-  FT_ERRORDEF_( Cannot_Open_Resource,                        0x01, \
-                "cannot open resource" )
-  FT_ERRORDEF_( Unknown_File_Format,                         0x02, \
-                "unknown file format" )
-  FT_ERRORDEF_( Invalid_File_Format,                         0x03, \
-                "broken file" )
-  FT_ERRORDEF_( Invalid_Version,                             0x04, \
-                "invalid FreeType version" )
-  FT_ERRORDEF_( Lower_Module_Version,                        0x05, \
-                "module version is too low" )
-  FT_ERRORDEF_( Invalid_Argument,                            0x06, \
-                "invalid argument" )
-  FT_ERRORDEF_( Unimplemented_Feature,                       0x07, \
-                "unimplemented feature" )
-  FT_ERRORDEF_( Invalid_Table,                               0x08, \
-                "broken table" )
-  FT_ERRORDEF_( Invalid_Offset,                              0x09, \
-                "broken offset within table" )
-  FT_ERRORDEF_( Array_Too_Large,                             0x0A, \
-                "array allocation size too large" )
-  FT_ERRORDEF_( Missing_Module,                              0x0B, \
-                "missing module" )
-  FT_ERRORDEF_( Missing_Property,                            0x0C, \
-                "missing property" )
-
-  /* glyph/character errors */
-
-  FT_ERRORDEF_( Invalid_Glyph_Index,                         0x10, \
-                "invalid glyph index" )
-  FT_ERRORDEF_( Invalid_Character_Code,                      0x11, \
-                "invalid character code" )
-  FT_ERRORDEF_( Invalid_Glyph_Format,                        0x12, \
-                "unsupported glyph image format" )
-  FT_ERRORDEF_( Cannot_Render_Glyph,                         0x13, \
-                "cannot render this glyph format" )
-  FT_ERRORDEF_( Invalid_Outline,                             0x14, \
-                "invalid outline" )
-  FT_ERRORDEF_( Invalid_Composite,                           0x15, \
-                "invalid composite glyph" )
-  FT_ERRORDEF_( Too_Many_Hints,                              0x16, \
-                "too many hints" )
-  FT_ERRORDEF_( Invalid_Pixel_Size,                          0x17, \
-                "invalid pixel size" )
-
-  /* handle errors */
-
-  FT_ERRORDEF_( Invalid_Handle,                              0x20, \
-                "invalid object handle" )
-  FT_ERRORDEF_( Invalid_Library_Handle,                      0x21, \
-                "invalid library handle" )
-  FT_ERRORDEF_( Invalid_Driver_Handle,                       0x22, \
-                "invalid module handle" )
-  FT_ERRORDEF_( Invalid_Face_Handle,                         0x23, \
-                "invalid face handle" )
-  FT_ERRORDEF_( Invalid_Size_Handle,                         0x24, \
-                "invalid size handle" )
-  FT_ERRORDEF_( Invalid_Slot_Handle,                         0x25, \
-                "invalid glyph slot handle" )
-  FT_ERRORDEF_( Invalid_CharMap_Handle,                      0x26, \
-                "invalid charmap handle" )
-  FT_ERRORDEF_( Invalid_Cache_Handle,                        0x27, \
-                "invalid cache manager handle" )
-  FT_ERRORDEF_( Invalid_Stream_Handle,                       0x28, \
-                "invalid stream handle" )
-
-  /* driver errors */
-
-  FT_ERRORDEF_( Too_Many_Drivers,                            0x30, \
-                "too many modules" )
-  FT_ERRORDEF_( Too_Many_Extensions,                         0x31, \
-                "too many extensions" )
-
-  /* memory errors */
-
-  FT_ERRORDEF_( Out_Of_Memory,                               0x40, \
-                "out of memory" )
-  FT_ERRORDEF_( Unlisted_Object,                             0x41, \
-                "unlisted object" )
-
-  /* stream errors */
-
-  FT_ERRORDEF_( Cannot_Open_Stream,                          0x51, \
-                "cannot open stream" )
-  FT_ERRORDEF_( Invalid_Stream_Seek,                         0x52, \
-                "invalid stream seek" )
-  FT_ERRORDEF_( Invalid_Stream_Skip,                         0x53, \
-                "invalid stream skip" )
-  FT_ERRORDEF_( Invalid_Stream_Read,                         0x54, \
-                "invalid stream read" )
-  FT_ERRORDEF_( Invalid_Stream_Operation,                    0x55, \
-                "invalid stream operation" )
-  FT_ERRORDEF_( Invalid_Frame_Operation,                     0x56, \
-                "invalid frame operation" )
-  FT_ERRORDEF_( Nested_Frame_Access,                         0x57, \
-                "nested frame access" )
-  FT_ERRORDEF_( Invalid_Frame_Read,                          0x58, \
-                "invalid frame read" )
-
-  /* raster errors */
-
-  FT_ERRORDEF_( Raster_Uninitialized,                        0x60, \
-                "raster uninitialized" )
-  FT_ERRORDEF_( Raster_Corrupted,                            0x61, \
-                "raster corrupted" )
-  FT_ERRORDEF_( Raster_Overflow,                             0x62, \
-                "raster overflow" )
-  FT_ERRORDEF_( Raster_Negative_Height,                      0x63, \
-                "negative height while rastering" )
-
-  /* cache errors */
-
-  FT_ERRORDEF_( Too_Many_Caches,                             0x70, \
-                "too many registered caches" )
-
-  /* TrueType and SFNT errors */
-
-  FT_ERRORDEF_( Invalid_Opcode,                              0x80, \
-                "invalid opcode" )
-  FT_ERRORDEF_( Too_Few_Arguments,                           0x81, \
-                "too few arguments" )
-  FT_ERRORDEF_( Stack_Overflow,                              0x82, \
-                "stack overflow" )
-  FT_ERRORDEF_( Code_Overflow,                               0x83, \
-                "code overflow" )
-  FT_ERRORDEF_( Bad_Argument,                                0x84, \
-                "bad argument" )
-  FT_ERRORDEF_( Divide_By_Zero,                              0x85, \
-                "division by zero" )
-  FT_ERRORDEF_( Invalid_Reference,                           0x86, \
-                "invalid reference" )
-  FT_ERRORDEF_( Debug_OpCode,                                0x87, \
-                "found debug opcode" )
-  FT_ERRORDEF_( ENDF_In_Exec_Stream,                         0x88, \
-                "found ENDF opcode in execution stream" )
-  FT_ERRORDEF_( Nested_DEFS,                                 0x89, \
-                "nested DEFS" )
-  FT_ERRORDEF_( Invalid_CodeRange,                           0x8A, \
-                "invalid code range" )
-  FT_ERRORDEF_( Execution_Too_Long,                          0x8B, \
-                "execution context too long" )
-  FT_ERRORDEF_( Too_Many_Function_Defs,                      0x8C, \
-                "too many function definitions" )
-  FT_ERRORDEF_( Too_Many_Instruction_Defs,                   0x8D, \
-                "too many instruction definitions" )
-  FT_ERRORDEF_( Table_Missing,                               0x8E, \
-                "SFNT font table missing" )
-  FT_ERRORDEF_( Horiz_Header_Missing,                        0x8F, \
-                "horizontal header (hhea) table missing" )
-  FT_ERRORDEF_( Locations_Missing,                           0x90, \
-                "locations (loca) table missing" )
-  FT_ERRORDEF_( Name_Table_Missing,                          0x91, \
-                "name table missing" )
-  FT_ERRORDEF_( CMap_Table_Missing,                          0x92, \
-                "character map (cmap) table missing" )
-  FT_ERRORDEF_( Hmtx_Table_Missing,                          0x93, \
-                "horizontal metrics (hmtx) table missing" )
-  FT_ERRORDEF_( Post_Table_Missing,                          0x94, \
-                "PostScript (post) table missing" )
-  FT_ERRORDEF_( Invalid_Horiz_Metrics,                       0x95, \
-                "invalid horizontal metrics" )
-  FT_ERRORDEF_( Invalid_CharMap_Format,                      0x96, \
-                "invalid character map (cmap) format" )
-  FT_ERRORDEF_( Invalid_PPem,                                0x97, \
-                "invalid ppem value" )
-  FT_ERRORDEF_( Invalid_Vert_Metrics,                        0x98, \
-                "invalid vertical metrics" )
-  FT_ERRORDEF_( Could_Not_Find_Context,                      0x99, \
-                "could not find context" )
-  FT_ERRORDEF_( Invalid_Post_Table_Format,                   0x9A, \
-                "invalid PostScript (post) table format" )
-  FT_ERRORDEF_( Invalid_Post_Table,                          0x9B, \
-                "invalid PostScript (post) table" )
-
-  /* CFF, CID, and Type 1 errors */
-
-  FT_ERRORDEF_( Syntax_Error,                                0xA0, \
-                "opcode syntax error" )
-  FT_ERRORDEF_( Stack_Underflow,                             0xA1, \
-                "argument stack underflow" )
-  FT_ERRORDEF_( Ignore,                                      0xA2, \
-                "ignore" )
-  FT_ERRORDEF_( No_Unicode_Glyph_Name,                       0xA3, \
-                "no Unicode glyph name found" )
-  FT_ERRORDEF_( Glyph_Too_Big,                               0xA4, \
-                "glyph to big for hinting" )
-
-  /* BDF errors */
-
-  FT_ERRORDEF_( Missing_Startfont_Field,                     0xB0, \
-                "`STARTFONT' field missing" )
-  FT_ERRORDEF_( Missing_Font_Field,                          0xB1, \
-                "`FONT' field missing" )
-  FT_ERRORDEF_( Missing_Size_Field,                          0xB2, \
-                "`SIZE' field missing" )
-  FT_ERRORDEF_( Missing_Fontboundingbox_Field,               0xB3, \
-                "`FONTBOUNDINGBOX' field missing" )
-  FT_ERRORDEF_( Missing_Chars_Field,                         0xB4, \
-                "`CHARS' field missing" )
-  FT_ERRORDEF_( Missing_Startchar_Field,                     0xB5, \
-                "`STARTCHAR' field missing" )
-  FT_ERRORDEF_( Missing_Encoding_Field,                      0xB6, \
-                "`ENCODING' field missing" )
-  FT_ERRORDEF_( Missing_Bbx_Field,                           0xB7, \
-                "`BBX' field missing" )
-  FT_ERRORDEF_( Bbx_Too_Big,                                 0xB8, \
-                "`BBX' too big" )
-  FT_ERRORDEF_( Corrupted_Font_Header,                       0xB9, \
-                "Font header corrupted or missing fields" )
-  FT_ERRORDEF_( Corrupted_Font_Glyphs,                       0xBA, \
-                "Font glyphs corrupted or missing fields" )
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftgzip.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftgzip.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftgzip.h	(copie de travail)
@@ -1,102 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgzip.h                                                               */
-/*                                                                         */
-/*    Gzip-compressed stream support.                                      */
-/*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTGZIP_H__
-#define __FTGZIP_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    gzip                                                               */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    GZIP Streams                                                       */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using gzip-compressed font files.                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Gzip-specific functions.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenGzip
-  *
-  * @description:
-  *   Open a new stream to parse gzip-compressed font files.  This is
-  *   mainly used to support the compressed `*.pcf.gz' fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream ::
-  *     The target embedding stream.
-  *
-  *   source ::
-  *     The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function `FT_Stream_Close' on the new stream will
-  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream.
-  *
-  *   In certain builds of the library, gzip compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a gzipped stream from
-  *   it and re-open the face with it.
-  *
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with zlib support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream  stream,
-                      FT_Stream  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGZIP_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftmm.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftmm.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftmm.h	(copie de travail)
@@ -1,378 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmm.h                                                                 */
-/*                                                                         */
-/*    FreeType Multiple Master font interface (specification).             */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003, 2004, 2006, 2009 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMM_H__
-#define __FTMM_H__
-
-
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    multiple_masters                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Multiple Masters                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to manage Multiple Masters fonts.                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following types and functions are used to manage Multiple      */
-  /*    Master fonts, i.e., the selection of specific design instances by  */
-  /*    setting design axis coordinates.                                   */
-  /*                                                                       */
-  /*    George Williams has extended this interface to make it work with   */
-  /*    both Type~1 Multiple Masters fonts and GX distortable (var)        */
-  /*    fonts.  Some of these routines only work with MM fonts, others     */
-  /*    will work with both types.  They are similar enough that a         */
-  /*    consistent interface makes sense.                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_MM_Axis                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a given axis in design space for  */
-  /*    Multiple Masters fonts.                                            */
-  /*                                                                       */
-  /*    This structure can't be used for GX var fonts.                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    name    :: The axis's name.                                        */
-  /*                                                                       */
-  /*    minimum :: The axis's minimum design coordinate.                   */
-  /*                                                                       */
-  /*    maximum :: The axis's maximum design coordinate.                   */
-  /*                                                                       */
-  typedef struct  FT_MM_Axis_
-  {
-    FT_String*  name;
-    FT_Long     minimum;
-    FT_Long     maximum;
-
-  } FT_MM_Axis;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Multi_Master                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the axes and space of a Multiple Masters */
-  /*    font.                                                              */
-  /*                                                                       */
-  /*    This structure can't be used for GX var fonts.                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_axis    :: Number of axes.  Cannot exceed~4.                   */
-  /*                                                                       */
-  /*    num_designs :: Number of designs; should be normally 2^num_axis    */
-  /*                   even though the Type~1 specification strangely      */
-  /*                   allows for intermediate designs to be present. This */
-  /*                   number cannot exceed~16.                            */
-  /*                                                                       */
-  /*    axis        :: A table of axis descriptors.                        */
-  /*                                                                       */
-  typedef struct  FT_Multi_Master_
-  {
-    FT_UInt     num_axis;
-    FT_UInt     num_designs;
-    FT_MM_Axis  axis[T1_MAX_MM_AXIS];
-
-  } FT_Multi_Master;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Var_Axis                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a given axis in design space for  */
-  /*    Multiple Masters and GX var fonts.                                 */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    name    :: The axis's name.                                        */
-  /*               Not always meaningful for GX.                           */
-  /*                                                                       */
-  /*    minimum :: The axis's minimum design coordinate.                   */
-  /*                                                                       */
-  /*    def     :: The axis's default design coordinate.                   */
-  /*               FreeType computes meaningful default values for MM; it  */
-  /*               is then an integer value, not in 16.16 format.          */
-  /*                                                                       */
-  /*    maximum :: The axis's maximum design coordinate.                   */
-  /*                                                                       */
-  /*    tag     :: The axis's tag (the GX equivalent to `name').           */
-  /*               FreeType provides default values for MM if possible.    */
-  /*                                                                       */
-  /*    strid   :: The entry in `name' table (another GX version of        */
-  /*               `name').                                                */
-  /*               Not meaningful for MM.                                  */
-  /*                                                                       */
-  typedef struct  FT_Var_Axis_
-  {
-    FT_String*  name;
-
-    FT_Fixed    minimum;
-    FT_Fixed    def;
-    FT_Fixed    maximum;
-
-    FT_ULong    tag;
-    FT_UInt     strid;
-
-  } FT_Var_Axis;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Var_Named_Style                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a named style in a GX var font.   */
-  /*                                                                       */
-  /*    This structure can't be used for MM fonts.                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    coords :: The design coordinates for this style.                   */
-  /*              This is an array with one entry for each axis.           */
-  /*                                                                       */
-  /*    strid  :: The entry in `name' table identifying this style.        */
-  /*                                                                       */
-  typedef struct  FT_Var_Named_Style_
-  {
-    FT_Fixed*  coords;
-    FT_UInt    strid;
-
-  } FT_Var_Named_Style;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_MM_Var                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the axes and space of a Multiple Masters */
-  /*    or GX var distortable font.                                        */
-  /*                                                                       */
-  /*    Some fields are specific to one format and not to the other.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_axis        :: The number of axes.  The maximum value is~4 for */
-  /*                       MM; no limit in GX.                             */
-  /*                                                                       */
-  /*    num_designs     :: The number of designs; should be normally       */
-  /*                       2^num_axis for MM fonts.  Not meaningful for GX */
-  /*                       (where every glyph could have a different       */
-  /*                       number of designs).                             */
-  /*                                                                       */
-  /*    num_namedstyles :: The number of named styles; only meaningful for */
-  /*                       GX which allows certain design coordinates to   */
-  /*                       have a string ID (in the `name' table)          */
-  /*                       associated with them.  The font can tell the    */
-  /*                       user that, for example, Weight=1.5 is `Bold'.   */
-  /*                                                                       */
-  /*    axis            :: A table of axis descriptors.                    */
-  /*                       GX fonts contain slightly more data than MM.    */
-  /*                                                                       */
-  /*    namedstyles     :: A table of named styles.                        */
-  /*                       Only meaningful with GX.                        */
-  /*                                                                       */
-  typedef struct  FT_MM_Var_
-  {
-    FT_UInt              num_axis;
-    FT_UInt              num_designs;
-    FT_UInt              num_namedstyles;
-    FT_Var_Axis*         axis;
-    FT_Var_Named_Style*  namedstyle;
-
-  } FT_MM_Var;
-
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Multi_Master                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the Multiple Master descriptor of a given font.           */
-  /*                                                                       */
-  /*    This function can't be used with GX fonts.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face.                            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amaster :: The Multiple Masters descriptor.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Multi_Master( FT_Face           face,
-                       FT_Multi_Master  *amaster );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_MM_Var                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the Multiple Master/GX var descriptor of a given font.    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face.                            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amaster :: The Multiple Masters/GX var descriptor.                 */
-  /*               Allocates a data structure, which the user must free    */
-  /*               (a single call to FT_FREE will do it).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_MM_Var( FT_Face      face,
-                 FT_MM_Var*  *amaster );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_MM_Design_Coordinates                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Masters fonts, choose an interpolated font design     */
-  /*    through design coordinates.                                        */
-  /*                                                                       */
-  /*    This function can't be used with GX fonts.                         */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of design coordinates (must be equal to   */
-  /*                  the number of axes in the font).                     */
-  /*                                                                       */
-  /*    coords     :: An array of design coordinates.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Design_Coordinates( FT_Face   face,
-                                FT_UInt   num_coords,
-                                FT_Long*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Var_Design_Coordinates                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Master or GX Var fonts, choose an interpolated font   */
-  /*    design through design coordinates.                                 */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of design coordinates (must be equal to   */
-  /*                  the number of axes in the font).                     */
-  /*                                                                       */
-  /*    coords     :: An array of design coordinates.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Var_Design_Coordinates( FT_Face    face,
-                                 FT_UInt    num_coords,
-                                 FT_Fixed*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_MM_Blend_Coordinates                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Masters and GX var fonts, choose an interpolated font */
-  /*    design through normalized blend coordinates.                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of design coordinates (must be equal to   */
-  /*                  the number of axes in the font).                     */
-  /*                                                                       */
-  /*    coords     :: The design coordinates array (each element must be   */
-  /*                  between 0 and 1.0).                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Blend_Coordinates( FT_Face    face,
-                               FT_UInt    num_coords,
-                               FT_Fixed*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Var_Blend_Coordinates                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is another name of @FT_Set_MM_Blend_Coordinates.              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Var_Blend_Coordinates( FT_Face    face,
-                                FT_UInt    num_coords,
-                                FT_Fixed*  coords );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTMM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ttnameid.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ttnameid.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ttnameid.h	(copie de travail)
@@ -1,1237 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ttnameid.h                                                             */
-/*                                                                         */
-/*    TrueType name ID definitions (specification only).                   */
-/*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2012 by                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTNAMEID_H__
-#define __TTNAMEID_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    truetype_tables                                                    */
-  /*                                                                       */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values for the `platform' identifier code in the name        */
-  /* records of the TTF `name' table.                                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_PLATFORM_XXX
-   *
-   * @description:
-   *   A list of valid values for the `platform_id' identifier code in
-   *   @FT_CharMapRec and @FT_SfntName structures.
-   *
-   * @values:
-   *   TT_PLATFORM_APPLE_UNICODE ::
-   *     Used by Apple to indicate a Unicode character map and/or name entry.
-   *     See @TT_APPLE_ID_XXX for corresponding `encoding_id' values.  Note
-   *     that name entries in this format are coded as big-endian UCS-2
-   *     character codes _only_.
-   *
-   *   TT_PLATFORM_MACINTOSH ::
-   *     Used by Apple to indicate a MacOS-specific charmap and/or name entry.
-   *     See @TT_MAC_ID_XXX for corresponding `encoding_id' values.  Note that
-   *     most TrueType fonts contain an Apple roman charmap to be usable on
-   *     MacOS systems (even if they contain a Microsoft charmap as well).
-   *
-   *   TT_PLATFORM_ISO ::
-   *     This value was used to specify ISO/IEC 10646 charmaps.  It is however
-   *     now deprecated.  See @TT_ISO_ID_XXX for a list of corresponding
-   *     `encoding_id' values.
-   *
-   *   TT_PLATFORM_MICROSOFT ::
-   *     Used by Microsoft to indicate Windows-specific charmaps.  See
-   *     @TT_MS_ID_XXX for a list of corresponding `encoding_id' values.
-   *     Note that most fonts contain a Unicode charmap using
-   *     (TT_PLATFORM_MICROSOFT, @TT_MS_ID_UNICODE_CS).
-   *
-   *   TT_PLATFORM_CUSTOM ::
-   *     Used to indicate application-specific charmaps.
-   *
-   *   TT_PLATFORM_ADOBE ::
-   *     This value isn't part of any font format specification, but is used
-   *     by FreeType to report Adobe-specific charmaps in an @FT_CharMapRec
-   *     structure.  See @TT_ADOBE_ID_XXX.
-   */
-
-#define TT_PLATFORM_APPLE_UNICODE  0
-#define TT_PLATFORM_MACINTOSH      1
-#define TT_PLATFORM_ISO            2 /* deprecated */
-#define TT_PLATFORM_MICROSOFT      3
-#define TT_PLATFORM_CUSTOM         4
-#define TT_PLATFORM_ADOBE          7 /* artificial */
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_APPLE_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_APPLE_UNICODE charmaps and name entries.
-   *
-   * @values:
-   *   TT_APPLE_ID_DEFAULT ::
-   *     Unicode version 1.0.
-   *
-   *   TT_APPLE_ID_UNICODE_1_1 ::
-   *     Unicode 1.1; specifies Hangul characters starting at U+34xx.
-   *
-   *   TT_APPLE_ID_ISO_10646 ::
-   *     Deprecated (identical to preceding).
-   *
-   *   TT_APPLE_ID_UNICODE_2_0 ::
-   *     Unicode 2.0 and beyond (UTF-16 BMP only).
-   *
-   *   TT_APPLE_ID_UNICODE_32 ::
-   *     Unicode 3.1 and beyond, using UTF-32.
-   *
-   *   TT_APPLE_ID_VARIANT_SELECTOR ::
-   *     From Adobe, not Apple.  Not a normal cmap.  Specifies variations
-   *     on a real cmap.
-   */
-
-#define TT_APPLE_ID_DEFAULT           0 /* Unicode 1.0 */
-#define TT_APPLE_ID_UNICODE_1_1       1 /* specify Hangul at U+34xx */
-#define TT_APPLE_ID_ISO_10646         2 /* deprecated */
-#define TT_APPLE_ID_UNICODE_2_0       3 /* or later */
-#define TT_APPLE_ID_UNICODE_32        4 /* 2.0 or later, full repertoire */
-#define TT_APPLE_ID_VARIANT_SELECTOR  5 /* variation selector data */
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_MAC_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_MACINTOSH charmaps and name entries.
-   *
-   * @values:
-   *   TT_MAC_ID_ROMAN ::
-   *   TT_MAC_ID_JAPANESE ::
-   *   TT_MAC_ID_TRADITIONAL_CHINESE ::
-   *   TT_MAC_ID_KOREAN ::
-   *   TT_MAC_ID_ARABIC ::
-   *   TT_MAC_ID_HEBREW ::
-   *   TT_MAC_ID_GREEK ::
-   *   TT_MAC_ID_RUSSIAN ::
-   *   TT_MAC_ID_RSYMBOL ::
-   *   TT_MAC_ID_DEVANAGARI ::
-   *   TT_MAC_ID_GURMUKHI ::
-   *   TT_MAC_ID_GUJARATI ::
-   *   TT_MAC_ID_ORIYA ::
-   *   TT_MAC_ID_BENGALI ::
-   *   TT_MAC_ID_TAMIL ::
-   *   TT_MAC_ID_TELUGU ::
-   *   TT_MAC_ID_KANNADA ::
-   *   TT_MAC_ID_MALAYALAM ::
-   *   TT_MAC_ID_SINHALESE ::
-   *   TT_MAC_ID_BURMESE ::
-   *   TT_MAC_ID_KHMER ::
-   *   TT_MAC_ID_THAI ::
-   *   TT_MAC_ID_LAOTIAN ::
-   *   TT_MAC_ID_GEORGIAN ::
-   *   TT_MAC_ID_ARMENIAN ::
-   *   TT_MAC_ID_MALDIVIAN ::
-   *   TT_MAC_ID_SIMPLIFIED_CHINESE ::
-   *   TT_MAC_ID_TIBETAN ::
-   *   TT_MAC_ID_MONGOLIAN ::
-   *   TT_MAC_ID_GEEZ ::
-   *   TT_MAC_ID_SLAVIC ::
-   *   TT_MAC_ID_VIETNAMESE ::
-   *   TT_MAC_ID_SINDHI ::
-   *   TT_MAC_ID_UNINTERP ::
-   */
-
-#define TT_MAC_ID_ROMAN                 0
-#define TT_MAC_ID_JAPANESE              1
-#define TT_MAC_ID_TRADITIONAL_CHINESE   2
-#define TT_MAC_ID_KOREAN                3
-#define TT_MAC_ID_ARABIC                4
-#define TT_MAC_ID_HEBREW                5
-#define TT_MAC_ID_GREEK                 6
-#define TT_MAC_ID_RUSSIAN               7
-#define TT_MAC_ID_RSYMBOL               8
-#define TT_MAC_ID_DEVANAGARI            9
-#define TT_MAC_ID_GURMUKHI             10
-#define TT_MAC_ID_GUJARATI             11
-#define TT_MAC_ID_ORIYA                12
-#define TT_MAC_ID_BENGALI              13
-#define TT_MAC_ID_TAMIL                14
-#define TT_MAC_ID_TELUGU               15
-#define TT_MAC_ID_KANNADA              16
-#define TT_MAC_ID_MALAYALAM            17
-#define TT_MAC_ID_SINHALESE            18
-#define TT_MAC_ID_BURMESE              19
-#define TT_MAC_ID_KHMER                20
-#define TT_MAC_ID_THAI                 21
-#define TT_MAC_ID_LAOTIAN              22
-#define TT_MAC_ID_GEORGIAN             23
-#define TT_MAC_ID_ARMENIAN             24
-#define TT_MAC_ID_MALDIVIAN            25
-#define TT_MAC_ID_SIMPLIFIED_CHINESE   25
-#define TT_MAC_ID_TIBETAN              26
-#define TT_MAC_ID_MONGOLIAN            27
-#define TT_MAC_ID_GEEZ                 28
-#define TT_MAC_ID_SLAVIC               29
-#define TT_MAC_ID_VIETNAMESE           30
-#define TT_MAC_ID_SINDHI               31
-#define TT_MAC_ID_UNINTERP             32
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_ISO_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_ISO charmaps and name entries.
-   *
-   *   Their use is now deprecated.
-   *
-   * @values:
-   *   TT_ISO_ID_7BIT_ASCII ::
-   *     ASCII.
-   *   TT_ISO_ID_10646 ::
-   *     ISO/10646.
-   *   TT_ISO_ID_8859_1 ::
-   *     Also known as Latin-1.
-   */
-
-#define TT_ISO_ID_7BIT_ASCII  0
-#define TT_ISO_ID_10646       1
-#define TT_ISO_ID_8859_1      2
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_MS_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_MICROSOFT charmaps and name entries.
-   *
-   * @values:
-   *   TT_MS_ID_SYMBOL_CS ::
-   *     Corresponds to Microsoft symbol encoding. See
-   *     @FT_ENCODING_MS_SYMBOL.
-   *
-   *   TT_MS_ID_UNICODE_CS ::
-   *     Corresponds to a Microsoft WGL4 charmap, matching Unicode.  See
-   *     @FT_ENCODING_UNICODE.
-   *
-   *   TT_MS_ID_SJIS ::
-   *     Corresponds to SJIS Japanese encoding.  See @FT_ENCODING_SJIS.
-   *
-   *   TT_MS_ID_GB2312 ::
-   *     Corresponds to Simplified Chinese as used in Mainland China.  See
-   *     @FT_ENCODING_GB2312.
-   *
-   *   TT_MS_ID_BIG_5 ::
-   *     Corresponds to Traditional Chinese as used in Taiwan and Hong Kong.
-   *     See @FT_ENCODING_BIG5.
-   *
-   *   TT_MS_ID_WANSUNG ::
-   *     Corresponds to Korean Wansung encoding.  See @FT_ENCODING_WANSUNG.
-   *
-   *   TT_MS_ID_JOHAB ::
-   *     Corresponds to Johab encoding.  See @FT_ENCODING_JOHAB.
-   *
-   *   TT_MS_ID_UCS_4 ::
-   *     Corresponds to UCS-4 or UTF-32 charmaps.  This has been added to
-   *     the OpenType specification version 1.4 (mid-2001.)
-   */
-
-#define TT_MS_ID_SYMBOL_CS    0
-#define TT_MS_ID_UNICODE_CS   1
-#define TT_MS_ID_SJIS         2
-#define TT_MS_ID_GB2312       3
-#define TT_MS_ID_BIG_5        4
-#define TT_MS_ID_WANSUNG      5
-#define TT_MS_ID_JOHAB        6
-#define TT_MS_ID_UCS_4       10
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_ADOBE_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_ADOBE charmaps.  This is a FreeType-specific extension!
-   *
-   * @values:
-   *   TT_ADOBE_ID_STANDARD ::
-   *     Adobe standard encoding.
-   *   TT_ADOBE_ID_EXPERT ::
-   *     Adobe expert encoding.
-   *   TT_ADOBE_ID_CUSTOM ::
-   *     Adobe custom encoding.
-   *   TT_ADOBE_ID_LATIN_1 ::
-   *     Adobe Latin~1 encoding.
-   */
-
-#define TT_ADOBE_ID_STANDARD  0
-#define TT_ADOBE_ID_EXPERT    1
-#define TT_ADOBE_ID_CUSTOM    2
-#define TT_ADOBE_ID_LATIN_1   3
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the language identifier field in the name records  */
-  /* of the TTF `name' table if the `platform' identifier code is          */
-  /* TT_PLATFORM_MACINTOSH.  These values are also used as return values   */
-  /* for function @FT_Get_CMap_Language_ID.                                */
-  /*                                                                       */
-  /* The canonical source for the Apple assigned Language ID's is at       */
-  /*                                                                       */
-  /*   https://developer.apple.com/fonts/TTRefMan/RM06/Chap6name.html      */
-  /*                                                                       */
-#define TT_MAC_LANGID_ENGLISH                       0
-#define TT_MAC_LANGID_FRENCH                        1
-#define TT_MAC_LANGID_GERMAN                        2
-#define TT_MAC_LANGID_ITALIAN                       3
-#define TT_MAC_LANGID_DUTCH                         4
-#define TT_MAC_LANGID_SWEDISH                       5
-#define TT_MAC_LANGID_SPANISH                       6
-#define TT_MAC_LANGID_DANISH                        7
-#define TT_MAC_LANGID_PORTUGUESE                    8
-#define TT_MAC_LANGID_NORWEGIAN                     9
-#define TT_MAC_LANGID_HEBREW                       10
-#define TT_MAC_LANGID_JAPANESE                     11
-#define TT_MAC_LANGID_ARABIC                       12
-#define TT_MAC_LANGID_FINNISH                      13
-#define TT_MAC_LANGID_GREEK                        14
-#define TT_MAC_LANGID_ICELANDIC                    15
-#define TT_MAC_LANGID_MALTESE                      16
-#define TT_MAC_LANGID_TURKISH                      17
-#define TT_MAC_LANGID_CROATIAN                     18
-#define TT_MAC_LANGID_CHINESE_TRADITIONAL          19
-#define TT_MAC_LANGID_URDU                         20
-#define TT_MAC_LANGID_HINDI                        21
-#define TT_MAC_LANGID_THAI                         22
-#define TT_MAC_LANGID_KOREAN                       23
-#define TT_MAC_LANGID_LITHUANIAN                   24
-#define TT_MAC_LANGID_POLISH                       25
-#define TT_MAC_LANGID_HUNGARIAN                    26
-#define TT_MAC_LANGID_ESTONIAN                     27
-#define TT_MAC_LANGID_LETTISH                      28
-#define TT_MAC_LANGID_SAAMISK                      29
-#define TT_MAC_LANGID_FAEROESE                     30
-#define TT_MAC_LANGID_FARSI                        31
-#define TT_MAC_LANGID_RUSSIAN                      32
-#define TT_MAC_LANGID_CHINESE_SIMPLIFIED           33
-#define TT_MAC_LANGID_FLEMISH                      34
-#define TT_MAC_LANGID_IRISH                        35
-#define TT_MAC_LANGID_ALBANIAN                     36
-#define TT_MAC_LANGID_ROMANIAN                     37
-#define TT_MAC_LANGID_CZECH                        38
-#define TT_MAC_LANGID_SLOVAK                       39
-#define TT_MAC_LANGID_SLOVENIAN                    40
-#define TT_MAC_LANGID_YIDDISH                      41
-#define TT_MAC_LANGID_SERBIAN                      42
-#define TT_MAC_LANGID_MACEDONIAN                   43
-#define TT_MAC_LANGID_BULGARIAN                    44
-#define TT_MAC_LANGID_UKRAINIAN                    45
-#define TT_MAC_LANGID_BYELORUSSIAN                 46
-#define TT_MAC_LANGID_UZBEK                        47
-#define TT_MAC_LANGID_KAZAKH                       48
-#define TT_MAC_LANGID_AZERBAIJANI                  49
-#define TT_MAC_LANGID_AZERBAIJANI_CYRILLIC_SCRIPT  49
-#define TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT    50
-#define TT_MAC_LANGID_ARMENIAN                     51
-#define TT_MAC_LANGID_GEORGIAN                     52
-#define TT_MAC_LANGID_MOLDAVIAN                    53
-#define TT_MAC_LANGID_KIRGHIZ                      54
-#define TT_MAC_LANGID_TAJIKI                       55
-#define TT_MAC_LANGID_TURKMEN                      56
-#define TT_MAC_LANGID_MONGOLIAN                    57
-#define TT_MAC_LANGID_MONGOLIAN_MONGOLIAN_SCRIPT   57
-#define TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT    58
-#define TT_MAC_LANGID_PASHTO                       59
-#define TT_MAC_LANGID_KURDISH                      60
-#define TT_MAC_LANGID_KASHMIRI                     61
-#define TT_MAC_LANGID_SINDHI                       62
-#define TT_MAC_LANGID_TIBETAN                      63
-#define TT_MAC_LANGID_NEPALI                       64
-#define TT_MAC_LANGID_SANSKRIT                     65
-#define TT_MAC_LANGID_MARATHI                      66
-#define TT_MAC_LANGID_BENGALI                      67
-#define TT_MAC_LANGID_ASSAMESE                     68
-#define TT_MAC_LANGID_GUJARATI                     69
-#define TT_MAC_LANGID_PUNJABI                      70
-#define TT_MAC_LANGID_ORIYA                        71
-#define TT_MAC_LANGID_MALAYALAM                    72
-#define TT_MAC_LANGID_KANNADA                      73
-#define TT_MAC_LANGID_TAMIL                        74
-#define TT_MAC_LANGID_TELUGU                       75
-#define TT_MAC_LANGID_SINHALESE                    76
-#define TT_MAC_LANGID_BURMESE                      77
-#define TT_MAC_LANGID_KHMER                        78
-#define TT_MAC_LANGID_LAO                          79
-#define TT_MAC_LANGID_VIETNAMESE                   80
-#define TT_MAC_LANGID_INDONESIAN                   81
-#define TT_MAC_LANGID_TAGALOG                      82
-#define TT_MAC_LANGID_MALAY_ROMAN_SCRIPT           83
-#define TT_MAC_LANGID_MALAY_ARABIC_SCRIPT          84
-#define TT_MAC_LANGID_AMHARIC                      85
-#define TT_MAC_LANGID_TIGRINYA                     86
-#define TT_MAC_LANGID_GALLA                        87
-#define TT_MAC_LANGID_SOMALI                       88
-#define TT_MAC_LANGID_SWAHILI                      89
-#define TT_MAC_LANGID_RUANDA                       90
-#define TT_MAC_LANGID_RUNDI                        91
-#define TT_MAC_LANGID_CHEWA                        92
-#define TT_MAC_LANGID_MALAGASY                     93
-#define TT_MAC_LANGID_ESPERANTO                    94
-#define TT_MAC_LANGID_WELSH                       128
-#define TT_MAC_LANGID_BASQUE                      129
-#define TT_MAC_LANGID_CATALAN                     130
-#define TT_MAC_LANGID_LATIN                       131
-#define TT_MAC_LANGID_QUECHUA                     132
-#define TT_MAC_LANGID_GUARANI                     133
-#define TT_MAC_LANGID_AYMARA                      134
-#define TT_MAC_LANGID_TATAR                       135
-#define TT_MAC_LANGID_UIGHUR                      136
-#define TT_MAC_LANGID_DZONGKHA                    137
-#define TT_MAC_LANGID_JAVANESE                    138
-#define TT_MAC_LANGID_SUNDANESE                   139
-
-
-#if 0  /* these seem to be errors that have been dropped */
-
-#define TT_MAC_LANGID_SCOTTISH_GAELIC             140
-#define TT_MAC_LANGID_IRISH_GAELIC                141
-
-#endif
-
-
-  /* The following codes are new as of 2000-03-10 */
-#define TT_MAC_LANGID_GALICIAN                    140
-#define TT_MAC_LANGID_AFRIKAANS                   141
-#define TT_MAC_LANGID_BRETON                      142
-#define TT_MAC_LANGID_INUKTITUT                   143
-#define TT_MAC_LANGID_SCOTTISH_GAELIC             144
-#define TT_MAC_LANGID_MANX_GAELIC                 145
-#define TT_MAC_LANGID_IRISH_GAELIC                146
-#define TT_MAC_LANGID_TONGAN                      147
-#define TT_MAC_LANGID_GREEK_POLYTONIC             148
-#define TT_MAC_LANGID_GREELANDIC                  149
-#define TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT    150
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the language identifier field in the name records  */
-  /* of the TTF `name' table if the `platform' identifier code is          */
-  /* TT_PLATFORM_MICROSOFT.                                                */
-  /*                                                                       */
-  /* The canonical source for the MS assigned LCIDs is                     */
-  /*                                                                       */
-  /*   http://www.microsoft.com/globaldev/reference/lcid-all.mspx          */
-  /*                                                                       */
-
-#define TT_MS_LANGID_ARABIC_GENERAL                    0x0001
-#define TT_MS_LANGID_ARABIC_SAUDI_ARABIA               0x0401
-#define TT_MS_LANGID_ARABIC_IRAQ                       0x0801
-#define TT_MS_LANGID_ARABIC_EGYPT                      0x0c01
-#define TT_MS_LANGID_ARABIC_LIBYA                      0x1001
-#define TT_MS_LANGID_ARABIC_ALGERIA                    0x1401
-#define TT_MS_LANGID_ARABIC_MOROCCO                    0x1801
-#define TT_MS_LANGID_ARABIC_TUNISIA                    0x1c01
-#define TT_MS_LANGID_ARABIC_OMAN                       0x2001
-#define TT_MS_LANGID_ARABIC_YEMEN                      0x2401
-#define TT_MS_LANGID_ARABIC_SYRIA                      0x2801
-#define TT_MS_LANGID_ARABIC_JORDAN                     0x2c01
-#define TT_MS_LANGID_ARABIC_LEBANON                    0x3001
-#define TT_MS_LANGID_ARABIC_KUWAIT                     0x3401
-#define TT_MS_LANGID_ARABIC_UAE                        0x3801
-#define TT_MS_LANGID_ARABIC_BAHRAIN                    0x3c01
-#define TT_MS_LANGID_ARABIC_QATAR                      0x4001
-#define TT_MS_LANGID_BULGARIAN_BULGARIA                0x0402
-#define TT_MS_LANGID_CATALAN_SPAIN                     0x0403
-#define TT_MS_LANGID_CHINESE_GENERAL                   0x0004
-#define TT_MS_LANGID_CHINESE_TAIWAN                    0x0404
-#define TT_MS_LANGID_CHINESE_PRC                       0x0804
-#define TT_MS_LANGID_CHINESE_HONG_KONG                 0x0c04
-#define TT_MS_LANGID_CHINESE_SINGAPORE                 0x1004
-
-#if 1  /* this looks like the correct value */
-#define TT_MS_LANGID_CHINESE_MACAU                     0x1404
-#else  /* but beware, Microsoft may change its mind...
-          the most recent Word reference has the following: */
-#define TT_MS_LANGID_CHINESE_MACAU  TT_MS_LANGID_CHINESE_HONG_KONG
-#endif
-
-#if 0  /* used only with .NET `cultures'; commented out */
-#define TT_MS_LANGID_CHINESE_TRADITIONAL               0x7C04
-#endif
-
-#define TT_MS_LANGID_CZECH_CZECH_REPUBLIC              0x0405
-#define TT_MS_LANGID_DANISH_DENMARK                    0x0406
-#define TT_MS_LANGID_GERMAN_GERMANY                    0x0407
-#define TT_MS_LANGID_GERMAN_SWITZERLAND                0x0807
-#define TT_MS_LANGID_GERMAN_AUSTRIA                    0x0c07
-#define TT_MS_LANGID_GERMAN_LUXEMBOURG                 0x1007
-#define TT_MS_LANGID_GERMAN_LIECHTENSTEI               0x1407
-#define TT_MS_LANGID_GREEK_GREECE                      0x0408
-
-  /* don't ask what this one means... It is commented out currently. */
-#if 0
-#define TT_MS_LANGID_GREEK_GREECE2                     0x2008
-#endif
-
-#define TT_MS_LANGID_ENGLISH_GENERAL                   0x0009
-#define TT_MS_LANGID_ENGLISH_UNITED_STATES             0x0409
-#define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM            0x0809
-#define TT_MS_LANGID_ENGLISH_AUSTRALIA                 0x0c09
-#define TT_MS_LANGID_ENGLISH_CANADA                    0x1009
-#define TT_MS_LANGID_ENGLISH_NEW_ZEALAND               0x1409
-#define TT_MS_LANGID_ENGLISH_IRELAND                   0x1809
-#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA              0x1c09
-#define TT_MS_LANGID_ENGLISH_JAMAICA                   0x2009
-#define TT_MS_LANGID_ENGLISH_CARIBBEAN                 0x2409
-#define TT_MS_LANGID_ENGLISH_BELIZE                    0x2809
-#define TT_MS_LANGID_ENGLISH_TRINIDAD                  0x2c09
-#define TT_MS_LANGID_ENGLISH_ZIMBABWE                  0x3009
-#define TT_MS_LANGID_ENGLISH_PHILIPPINES               0x3409
-#define TT_MS_LANGID_ENGLISH_INDONESIA                 0x3809
-#define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3c09
-#define TT_MS_LANGID_ENGLISH_INDIA                     0x4009
-#define TT_MS_LANGID_ENGLISH_MALAYSIA                  0x4409
-#define TT_MS_LANGID_ENGLISH_SINGAPORE                 0x4809
-#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT    0x040a
-#define TT_MS_LANGID_SPANISH_MEXICO                    0x080a
-#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT  0x0c0a
-#define TT_MS_LANGID_SPANISH_GUATEMALA                 0x100a
-#define TT_MS_LANGID_SPANISH_COSTA_RICA                0x140a
-#define TT_MS_LANGID_SPANISH_PANAMA                    0x180a
-#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC        0x1c0a
-#define TT_MS_LANGID_SPANISH_VENEZUELA                 0x200a
-#define TT_MS_LANGID_SPANISH_COLOMBIA                  0x240a
-#define TT_MS_LANGID_SPANISH_PERU                      0x280a
-#define TT_MS_LANGID_SPANISH_ARGENTINA                 0x2c0a
-#define TT_MS_LANGID_SPANISH_ECUADOR                   0x300a
-#define TT_MS_LANGID_SPANISH_CHILE                     0x340a
-#define TT_MS_LANGID_SPANISH_URUGUAY                   0x380a
-#define TT_MS_LANGID_SPANISH_PARAGUAY                  0x3c0a
-#define TT_MS_LANGID_SPANISH_BOLIVIA                   0x400a
-#define TT_MS_LANGID_SPANISH_EL_SALVADOR               0x440a
-#define TT_MS_LANGID_SPANISH_HONDURAS                  0x480a
-#define TT_MS_LANGID_SPANISH_NICARAGUA                 0x4c0a
-#define TT_MS_LANGID_SPANISH_PUERTO_RICO               0x500a
-#define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540a
-  /* The following ID blatantly violate MS specs by using a */
-  /* sublanguage > 0x1F.                                    */
-#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40aU
-#define TT_MS_LANGID_FINNISH_FINLAND                   0x040b
-#define TT_MS_LANGID_FRENCH_FRANCE                     0x040c
-#define TT_MS_LANGID_FRENCH_BELGIUM                    0x080c
-#define TT_MS_LANGID_FRENCH_CANADA                     0x0c0c
-#define TT_MS_LANGID_FRENCH_SWITZERLAND                0x100c
-#define TT_MS_LANGID_FRENCH_LUXEMBOURG                 0x140c
-#define TT_MS_LANGID_FRENCH_MONACO                     0x180c
-#define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1c0c
-#define TT_MS_LANGID_FRENCH_REUNION                    0x200c
-#define TT_MS_LANGID_FRENCH_CONGO                      0x240c
-  /* which was formerly: */
-#define TT_MS_LANGID_FRENCH_ZAIRE  TT_MS_LANGID_FRENCH_CONGO
-#define TT_MS_LANGID_FRENCH_SENEGAL                    0x280c
-#define TT_MS_LANGID_FRENCH_CAMEROON                   0x2c0c
-#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE              0x300c
-#define TT_MS_LANGID_FRENCH_MALI                       0x340c
-#define TT_MS_LANGID_FRENCH_MOROCCO                    0x380c
-#define TT_MS_LANGID_FRENCH_HAITI                      0x3c0c
-  /* and another violation of the spec (see 0xE40aU) */
-#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40cU
-#define TT_MS_LANGID_HEBREW_ISRAEL                     0x040d
-#define TT_MS_LANGID_HUNGARIAN_HUNGARY                 0x040e
-#define TT_MS_LANGID_ICELANDIC_ICELAND                 0x040f
-#define TT_MS_LANGID_ITALIAN_ITALY                     0x0410
-#define TT_MS_LANGID_ITALIAN_SWITZERLAND               0x0810
-#define TT_MS_LANGID_JAPANESE_JAPAN                    0x0411
-#define TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA     0x0412
-#define TT_MS_LANGID_KOREAN_JOHAB_KOREA                0x0812
-#define TT_MS_LANGID_DUTCH_NETHERLANDS                 0x0413
-#define TT_MS_LANGID_DUTCH_BELGIUM                     0x0813
-#define TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL           0x0414
-#define TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK          0x0814
-#define TT_MS_LANGID_POLISH_POLAND                     0x0415
-#define TT_MS_LANGID_PORTUGUESE_BRAZIL                 0x0416
-#define TT_MS_LANGID_PORTUGUESE_PORTUGAL               0x0816
-#define TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND        0x0417
-#define TT_MS_LANGID_ROMANIAN_ROMANIA                  0x0418
-#define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA                0x0818
-#define TT_MS_LANGID_RUSSIAN_RUSSIA                    0x0419
-#define TT_MS_LANGID_RUSSIAN_MOLDAVIA                  0x0819
-#define TT_MS_LANGID_CROATIAN_CROATIA                  0x041a
-#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN              0x081a
-#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC           0x0c1a
-
-#if 0  /* this used to be this value, but it looks like we were wrong */
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x101a
-#else  /* current sources say */
-#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA       0x101a
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x141a
-       /* and XPsp2 Platform SDK added (2004-07-26) */
-       /* Names are shortened to be significant within 40 chars. */
-#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN         0x181a
-#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC      0x181a
-#endif
-
-#define TT_MS_LANGID_SLOVAK_SLOVAKIA                   0x041b
-#define TT_MS_LANGID_ALBANIAN_ALBANIA                  0x041c
-#define TT_MS_LANGID_SWEDISH_SWEDEN                    0x041d
-#define TT_MS_LANGID_SWEDISH_FINLAND                   0x081d
-#define TT_MS_LANGID_THAI_THAILAND                     0x041e
-#define TT_MS_LANGID_TURKISH_TURKEY                    0x041f
-#define TT_MS_LANGID_URDU_PAKISTAN                     0x0420
-#define TT_MS_LANGID_URDU_INDIA                        0x0820
-#define TT_MS_LANGID_INDONESIAN_INDONESIA              0x0421
-#define TT_MS_LANGID_UKRAINIAN_UKRAINE                 0x0422
-#define TT_MS_LANGID_BELARUSIAN_BELARUS                0x0423
-#define TT_MS_LANGID_SLOVENE_SLOVENIA                  0x0424
-#define TT_MS_LANGID_ESTONIAN_ESTONIA                  0x0425
-#define TT_MS_LANGID_LATVIAN_LATVIA                    0x0426
-#define TT_MS_LANGID_LITHUANIAN_LITHUANIA              0x0427
-#define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA      0x0827
-#define TT_MS_LANGID_TAJIK_TAJIKISTAN                  0x0428
-#define TT_MS_LANGID_FARSI_IRAN                        0x0429
-#define TT_MS_LANGID_VIETNAMESE_VIET_NAM               0x042a
-#define TT_MS_LANGID_ARMENIAN_ARMENIA                  0x042b
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN            0x042c
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC         0x082c
-#define TT_MS_LANGID_BASQUE_SPAIN                      0x042d
-#define TT_MS_LANGID_SORBIAN_GERMANY                   0x042e
-#define TT_MS_LANGID_MACEDONIAN_MACEDONIA              0x042f
-#define TT_MS_LANGID_SUTU_SOUTH_AFRICA                 0x0430
-#define TT_MS_LANGID_TSONGA_SOUTH_AFRICA               0x0431
-#define TT_MS_LANGID_TSWANA_SOUTH_AFRICA               0x0432
-#define TT_MS_LANGID_VENDA_SOUTH_AFRICA                0x0433
-#define TT_MS_LANGID_XHOSA_SOUTH_AFRICA                0x0434
-#define TT_MS_LANGID_ZULU_SOUTH_AFRICA                 0x0435
-#define TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA            0x0436
-#define TT_MS_LANGID_GEORGIAN_GEORGIA                  0x0437
-#define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS           0x0438
-#define TT_MS_LANGID_HINDI_INDIA                       0x0439
-#define TT_MS_LANGID_MALTESE_MALTA                     0x043a
-  /* Added by XPsp2 Platform SDK (2004-07-26) */
-#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY              0x043b
-#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN              0x083b
-#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND             0x0C3b
-#define TT_MS_LANGID_SAMI_LULE_NORWAY                  0x103b
-#define TT_MS_LANGID_SAMI_LULE_SWEDEN                  0x143b
-#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY              0x183b
-#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN              0x1C3b
-#define TT_MS_LANGID_SAMI_SKOLT_FINLAND                0x203b
-#define TT_MS_LANGID_SAMI_INARI_FINLAND                0x243b
-  /* ... and we also keep our old identifier... */
-#define TT_MS_LANGID_SAAMI_LAPONIA                     0x043b
-
-#if 0 /* this seems to be a previous inversion */
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
-#else
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
-#endif
-
-#define TT_MS_LANGID_YIDDISH_GERMANY                   0x043d
-#define TT_MS_LANGID_MALAY_MALAYSIA                    0x043e
-#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM           0x083e
-#define TT_MS_LANGID_KAZAK_KAZAKSTAN                   0x043f
-#define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN /* Cyrillic*/ 0x0440
-  /* alias declared in Windows 2000 */
-#define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \
-          TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN
-
-#define TT_MS_LANGID_SWAHILI_KENYA                     0x0441
-#define TT_MS_LANGID_TURKMEN_TURKMENISTAN              0x0442
-#define TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN            0x0443
-#define TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC         0x0843
-#define TT_MS_LANGID_TATAR_TATARSTAN                   0x0444
-#define TT_MS_LANGID_BENGALI_INDIA                     0x0445
-#define TT_MS_LANGID_BENGALI_BANGLADESH                0x0845
-#define TT_MS_LANGID_PUNJABI_INDIA                     0x0446
-#define TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN           0x0846
-#define TT_MS_LANGID_GUJARATI_INDIA                    0x0447
-#define TT_MS_LANGID_ORIYA_INDIA                       0x0448
-#define TT_MS_LANGID_TAMIL_INDIA                       0x0449
-#define TT_MS_LANGID_TELUGU_INDIA                      0x044a
-#define TT_MS_LANGID_KANNADA_INDIA                     0x044b
-#define TT_MS_LANGID_MALAYALAM_INDIA                   0x044c
-#define TT_MS_LANGID_ASSAMESE_INDIA                    0x044d
-#define TT_MS_LANGID_MARATHI_INDIA                     0x044e
-#define TT_MS_LANGID_SANSKRIT_INDIA                    0x044f
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN      0x0850
-#define TT_MS_LANGID_TIBETAN_CHINA                     0x0451
-  /* Don't use the next constant!  It has            */
-  /*   (1) the wrong spelling (Dzonghka)             */
-  /*   (2) Microsoft doesn't officially define it -- */
-  /*       at least it is not in the List of Local   */
-  /*       ID Values.                                */
-  /*   (3) Dzongkha is not the same language as      */
-  /*       Tibetan, so merging it is wrong anyway.   */
-  /*                                                 */
-  /* TT_MS_LANGID_TIBETAN_BHUTAN is correct, BTW.    */
-#define TT_MS_LANGID_DZONGHKA_BHUTAN                   0x0851
-
-#if 0
-  /* the following used to be defined */
-#define TT_MS_LANGID_TIBETAN_BHUTAN                    0x0451
-  /* ... but it was changed; */
-#else
-  /* So we will continue to #define it, but with the correct value */
-#define TT_MS_LANGID_TIBETAN_BHUTAN   TT_MS_LANGID_DZONGHKA_BHUTAN
-#endif
-
-#define TT_MS_LANGID_WELSH_WALES                       0x0452
-#define TT_MS_LANGID_KHMER_CAMBODIA                    0x0453
-#define TT_MS_LANGID_LAO_LAOS                          0x0454
-#define TT_MS_LANGID_BURMESE_MYANMAR                   0x0455
-#define TT_MS_LANGID_GALICIAN_SPAIN                    0x0456
-#define TT_MS_LANGID_KONKANI_INDIA                     0x0457
-#define TT_MS_LANGID_MANIPURI_INDIA  /* Bengali */     0x0458
-#define TT_MS_LANGID_SINDHI_INDIA /* Arabic */         0x0459
-#define TT_MS_LANGID_SINDHI_PAKISTAN                   0x0859
-  /* Missing a LCID for Sindhi in Devanagari script */
-#define TT_MS_LANGID_SYRIAC_SYRIA                      0x045a
-#define TT_MS_LANGID_SINHALESE_SRI_LANKA               0x045b
-#define TT_MS_LANGID_CHEROKEE_UNITED_STATES            0x045c
-#define TT_MS_LANGID_INUKTITUT_CANADA                  0x045d
-#define TT_MS_LANGID_AMHARIC_ETHIOPIA                  0x045e
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */    0x045f
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN           0x085f
-  /* Missing a LCID for Tifinagh script */
-#define TT_MS_LANGID_KASHMIRI_PAKISTAN /* Arabic */    0x0460
-  /* Spelled this way by XPsp2 Platform SDK (2004-07-26) */
-  /* script is yet unclear... might be Arabic, Nagari or Sharada */
-#define TT_MS_LANGID_KASHMIRI_SASIA                    0x0860
-  /* ... and aliased (by MS) for compatibility reasons. */
-#define TT_MS_LANGID_KASHMIRI_INDIA TT_MS_LANGID_KASHMIRI_SASIA
-#define TT_MS_LANGID_NEPALI_NEPAL                      0x0461
-#define TT_MS_LANGID_NEPALI_INDIA                      0x0861
-#define TT_MS_LANGID_FRISIAN_NETHERLANDS               0x0462
-#define TT_MS_LANGID_PASHTO_AFGHANISTAN                0x0463
-#define TT_MS_LANGID_FILIPINO_PHILIPPINES              0x0464
-#define TT_MS_LANGID_DHIVEHI_MALDIVES                  0x0465
-  /* alias declared in Windows 2000 */
-#define TT_MS_LANGID_DIVEHI_MALDIVES  TT_MS_LANGID_DHIVEHI_MALDIVES
-#define TT_MS_LANGID_EDO_NIGERIA                       0x0466
-#define TT_MS_LANGID_FULFULDE_NIGERIA                  0x0467
-#define TT_MS_LANGID_HAUSA_NIGERIA                     0x0468
-#define TT_MS_LANGID_IBIBIO_NIGERIA                    0x0469
-#define TT_MS_LANGID_YORUBA_NIGERIA                    0x046a
-#define TT_MS_LANGID_QUECHUA_BOLIVIA                   0x046b
-#define TT_MS_LANGID_QUECHUA_ECUADOR                   0x086b
-#define TT_MS_LANGID_QUECHUA_PERU                      0x0c6b
-#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA               0x046c
-  /* Also spelled by XPsp2 Platform SDK (2004-07-26) */
-#define TT_MS_LANGID_SOTHO_SOUTHERN_SOUTH_AFRICA \
-          TT_MS_LANGID_SEPEDI_SOUTH_AFRICA
-  /* language codes 0x046d, 0x046e and 0x046f are (still) unknown. */
-#define TT_MS_LANGID_IGBO_NIGERIA                      0x0470
-#define TT_MS_LANGID_KANURI_NIGERIA                    0x0471
-#define TT_MS_LANGID_OROMO_ETHIOPIA                    0x0472
-#define TT_MS_LANGID_TIGRIGNA_ETHIOPIA                 0x0473
-#define TT_MS_LANGID_TIGRIGNA_ERYTHREA                 0x0873
-  /* also spelled in the `Passport SDK' list as: */
-#define TT_MS_LANGID_TIGRIGNA_ERYTREA  TT_MS_LANGID_TIGRIGNA_ERYTHREA
-#define TT_MS_LANGID_GUARANI_PARAGUAY                  0x0474
-#define TT_MS_LANGID_HAWAIIAN_UNITED_STATES            0x0475
-#define TT_MS_LANGID_LATIN                             0x0476
-#define TT_MS_LANGID_SOMALI_SOMALIA                    0x0477
-  /* Note: Yi does not have a (proper) ISO 639-2 code, since it is mostly */
-  /*       not written (but OTOH the peculiar writing system is worth     */
-  /*       studying).                                                     */
-#define TT_MS_LANGID_YI_CHINA                          0x0478
-#define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES   0x0479
-  /* language codes from 0x047a to 0x047f are (still) unknown. */
-#define TT_MS_LANGID_UIGHUR_CHINA                      0x0480
-#define TT_MS_LANGID_MAORI_NEW_ZEALAND                 0x0481
-
-#if 0  /* not deemed useful for fonts */
-#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE            0x04ff
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the `name' identifier field in the name records of */
-  /* the TTF `name' table.  These values are platform independent.         */
-  /*                                                                       */
-#define TT_NAME_ID_COPYRIGHT            0
-#define TT_NAME_ID_FONT_FAMILY          1
-#define TT_NAME_ID_FONT_SUBFAMILY       2
-#define TT_NAME_ID_UNIQUE_ID            3
-#define TT_NAME_ID_FULL_NAME            4
-#define TT_NAME_ID_VERSION_STRING       5
-#define TT_NAME_ID_PS_NAME              6
-#define TT_NAME_ID_TRADEMARK            7
-
-  /* the following values are from the OpenType spec */
-#define TT_NAME_ID_MANUFACTURER         8
-#define TT_NAME_ID_DESIGNER             9
-#define TT_NAME_ID_DESCRIPTION          10
-#define TT_NAME_ID_VENDOR_URL           11
-#define TT_NAME_ID_DESIGNER_URL         12
-#define TT_NAME_ID_LICENSE              13
-#define TT_NAME_ID_LICENSE_URL          14
-  /* number 15 is reserved */
-#define TT_NAME_ID_PREFERRED_FAMILY     16
-#define TT_NAME_ID_PREFERRED_SUBFAMILY  17
-#define TT_NAME_ID_MAC_FULL_NAME        18
-
-  /* The following code is new as of 2000-01-21 */
-#define TT_NAME_ID_SAMPLE_TEXT          19
-
-  /* This is new in OpenType 1.3 */
-#define TT_NAME_ID_CID_FINDFONT_NAME    20
-
-  /* This is new in OpenType 1.5 */
-#define TT_NAME_ID_WWS_FAMILY           21
-#define TT_NAME_ID_WWS_SUBFAMILY        22
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Bit mask values for the Unicode Ranges from the TTF `OS2 ' table.     */
-  /*                                                                       */
-  /* Updated 08-Nov-2008.                                                  */
-  /*                                                                       */
-
-  /* Bit  0   Basic Latin */
-#define TT_UCR_BASIC_LATIN                     (1L <<  0) /* U+0020-U+007E */
-  /* Bit  1   C1 Controls and Latin-1 Supplement */
-#define TT_UCR_LATIN1_SUPPLEMENT               (1L <<  1) /* U+0080-U+00FF */
-  /* Bit  2   Latin Extended-A */
-#define TT_UCR_LATIN_EXTENDED_A                (1L <<  2) /* U+0100-U+017F */
-  /* Bit  3   Latin Extended-B */
-#define TT_UCR_LATIN_EXTENDED_B                (1L <<  3) /* U+0180-U+024F */
-  /* Bit  4   IPA Extensions                 */
-  /*          Phonetic Extensions            */
-  /*          Phonetic Extensions Supplement */
-#define TT_UCR_IPA_EXTENSIONS                  (1L <<  4) /* U+0250-U+02AF */
-                                                          /* U+1D00-U+1D7F */
-                                                          /* U+1D80-U+1DBF */
-  /* Bit  5   Spacing Modifier Letters */
-  /*          Modifier Tone Letters    */
-#define TT_UCR_SPACING_MODIFIER                (1L <<  5) /* U+02B0-U+02FF */
-                                                          /* U+A700-U+A71F */
-  /* Bit  6   Combining Diacritical Marks            */
-  /*          Combining Diacritical Marks Supplement */
-#define TT_UCR_COMBINING_DIACRITICS            (1L <<  6) /* U+0300-U+036F */
-                                                          /* U+1DC0-U+1DFF */
-  /* Bit  7   Greek and Coptic */
-#define TT_UCR_GREEK                           (1L <<  7) /* U+0370-U+03FF */
-  /* Bit  8   Coptic */
-#define TT_UCR_COPTIC                          (1L <<  8) /* U+2C80-U+2CFF */
-  /* Bit  9   Cyrillic            */
-  /*          Cyrillic Supplement */
-  /*          Cyrillic Extended-A */
-  /*          Cyrillic Extended-B */
-#define TT_UCR_CYRILLIC                        (1L <<  9) /* U+0400-U+04FF */
-                                                          /* U+0500-U+052F */
-                                                          /* U+2DE0-U+2DFF */
-                                                          /* U+A640-U+A69F */
-  /* Bit 10   Armenian */
-#define TT_UCR_ARMENIAN                        (1L << 10) /* U+0530-U+058F */
-  /* Bit 11   Hebrew */
-#define TT_UCR_HEBREW                          (1L << 11) /* U+0590-U+05FF */
-  /* Bit 12   Vai */
-#define TT_UCR_VAI                             (1L << 12) /* U+A500-U+A63F */
-  /* Bit 13   Arabic            */
-  /*          Arabic Supplement */
-#define TT_UCR_ARABIC                          (1L << 13) /* U+0600-U+06FF */
-                                                          /* U+0750-U+077F */
-  /* Bit 14   NKo */
-#define TT_UCR_NKO                             (1L << 14) /* U+07C0-U+07FF */
-  /* Bit 15   Devanagari */
-#define TT_UCR_DEVANAGARI                      (1L << 15) /* U+0900-U+097F */
-  /* Bit 16   Bengali */
-#define TT_UCR_BENGALI                         (1L << 16) /* U+0980-U+09FF */
-  /* Bit 17   Gurmukhi */
-#define TT_UCR_GURMUKHI                        (1L << 17) /* U+0A00-U+0A7F */
-  /* Bit 18   Gujarati */
-#define TT_UCR_GUJARATI                        (1L << 18) /* U+0A80-U+0AFF */
-  /* Bit 19   Oriya */
-#define TT_UCR_ORIYA                           (1L << 19) /* U+0B00-U+0B7F */
-  /* Bit 20   Tamil */
-#define TT_UCR_TAMIL                           (1L << 20) /* U+0B80-U+0BFF */
-  /* Bit 21   Telugu */
-#define TT_UCR_TELUGU                          (1L << 21) /* U+0C00-U+0C7F */
-  /* Bit 22   Kannada */
-#define TT_UCR_KANNADA                         (1L << 22) /* U+0C80-U+0CFF */
-  /* Bit 23   Malayalam */
-#define TT_UCR_MALAYALAM                       (1L << 23) /* U+0D00-U+0D7F */
-  /* Bit 24   Thai */
-#define TT_UCR_THAI                            (1L << 24) /* U+0E00-U+0E7F */
-  /* Bit 25   Lao */
-#define TT_UCR_LAO                             (1L << 25) /* U+0E80-U+0EFF */
-  /* Bit 26   Georgian            */
-  /*          Georgian Supplement */
-#define TT_UCR_GEORGIAN                        (1L << 26) /* U+10A0-U+10FF */
-                                                          /* U+2D00-U+2D2F */
-  /* Bit 27   Balinese */
-#define TT_UCR_BALINESE                        (1L << 27) /* U+1B00-U+1B7F */
-  /* Bit 28   Hangul Jamo */
-#define TT_UCR_HANGUL_JAMO                     (1L << 28) /* U+1100-U+11FF */
-  /* Bit 29   Latin Extended Additional */
-  /*          Latin Extended-C          */
-  /*          Latin Extended-D          */
-#define TT_UCR_LATIN_EXTENDED_ADDITIONAL       (1L << 29) /* U+1E00-U+1EFF */
-                                                          /* U+2C60-U+2C7F */
-                                                          /* U+A720-U+A7FF */
-  /* Bit 30   Greek Extended */
-#define TT_UCR_GREEK_EXTENDED                  (1L << 30) /* U+1F00-U+1FFF */
-  /* Bit 31   General Punctuation      */
-  /*          Supplemental Punctuation */
-#define TT_UCR_GENERAL_PUNCTUATION             (1L << 31) /* U+2000-U+206F */
-                                                          /* U+2E00-U+2E7F */
-  /* Bit 32   Superscripts And Subscripts */
-#define TT_UCR_SUPERSCRIPTS_SUBSCRIPTS         (1L <<  0) /* U+2070-U+209F */
-  /* Bit 33   Currency Symbols */
-#define TT_UCR_CURRENCY_SYMBOLS                (1L <<  1) /* U+20A0-U+20CF */
-  /* Bit 34   Combining Diacritical Marks For Symbols */
-#define TT_UCR_COMBINING_DIACRITICS_SYMB       (1L <<  2) /* U+20D0-U+20FF */
-  /* Bit 35   Letterlike Symbols */
-#define TT_UCR_LETTERLIKE_SYMBOLS              (1L <<  3) /* U+2100-U+214F */
-  /* Bit 36   Number Forms */
-#define TT_UCR_NUMBER_FORMS                    (1L <<  4) /* U+2150-U+218F */
-  /* Bit 37   Arrows                           */
-  /*          Supplemental Arrows-A            */
-  /*          Supplemental Arrows-B            */
-  /*          Miscellaneous Symbols and Arrows */
-#define TT_UCR_ARROWS                          (1L <<  5) /* U+2190-U+21FF */
-                                                          /* U+27F0-U+27FF */
-                                                          /* U+2900-U+297F */
-                                                          /* U+2B00-U+2BFF */
-  /* Bit 38   Mathematical Operators               */
-  /*          Supplemental Mathematical Operators  */
-  /*          Miscellaneous Mathematical Symbols-A */
-  /*          Miscellaneous Mathematical Symbols-B */
-#define TT_UCR_MATHEMATICAL_OPERATORS          (1L <<  6) /* U+2200-U+22FF */
-                                                          /* U+2A00-U+2AFF */
-                                                          /* U+27C0-U+27EF */
-                                                          /* U+2980-U+29FF */
-  /* Bit 39 Miscellaneous Technical */
-#define TT_UCR_MISCELLANEOUS_TECHNICAL         (1L <<  7) /* U+2300-U+23FF */
-  /* Bit 40   Control Pictures */
-#define TT_UCR_CONTROL_PICTURES                (1L <<  8) /* U+2400-U+243F */
-  /* Bit 41   Optical Character Recognition */
-#define TT_UCR_OCR                             (1L <<  9) /* U+2440-U+245F */
-  /* Bit 42   Enclosed Alphanumerics */
-#define TT_UCR_ENCLOSED_ALPHANUMERICS          (1L << 10) /* U+2460-U+24FF */
-  /* Bit 43   Box Drawing */
-#define TT_UCR_BOX_DRAWING                     (1L << 11) /* U+2500-U+257F */
-  /* Bit 44   Block Elements */
-#define TT_UCR_BLOCK_ELEMENTS                  (1L << 12) /* U+2580-U+259F */
-  /* Bit 45   Geometric Shapes */
-#define TT_UCR_GEOMETRIC_SHAPES                (1L << 13) /* U+25A0-U+25FF */
-  /* Bit 46   Miscellaneous Symbols */
-#define TT_UCR_MISCELLANEOUS_SYMBOLS           (1L << 14) /* U+2600-U+26FF */
-  /* Bit 47   Dingbats */
-#define TT_UCR_DINGBATS                        (1L << 15) /* U+2700-U+27BF */
-  /* Bit 48   CJK Symbols and Punctuation */
-#define TT_UCR_CJK_SYMBOLS                     (1L << 16) /* U+3000-U+303F */
-  /* Bit 49   Hiragana */
-#define TT_UCR_HIRAGANA                        (1L << 17) /* U+3040-U+309F */
-  /* Bit 50   Katakana                     */
-  /*          Katakana Phonetic Extensions */
-#define TT_UCR_KATAKANA                        (1L << 18) /* U+30A0-U+30FF */
-                                                          /* U+31F0-U+31FF */
-  /* Bit 51   Bopomofo          */
-  /*          Bopomofo Extended */
-#define TT_UCR_BOPOMOFO                        (1L << 19) /* U+3100-U+312F */
-                                                          /* U+31A0-U+31BF */
-  /* Bit 52   Hangul Compatibility Jamo */
-#define TT_UCR_HANGUL_COMPATIBILITY_JAMO       (1L << 20) /* U+3130-U+318F */
-  /* Bit 53   Phags-Pa */
-#define TT_UCR_CJK_MISC                        (1L << 21) /* U+A840-U+A87F */
-#define TT_UCR_KANBUN  TT_UCR_CJK_MISC /* deprecated */
-#define TT_UCR_PHAGSPA
-  /* Bit 54   Enclosed CJK Letters and Months */
-#define TT_UCR_ENCLOSED_CJK_LETTERS_MONTHS     (1L << 22) /* U+3200-U+32FF */
-  /* Bit 55   CJK Compatibility */
-#define TT_UCR_CJK_COMPATIBILITY               (1L << 23) /* U+3300-U+33FF */
-  /* Bit 56   Hangul Syllables */
-#define TT_UCR_HANGUL                          (1L << 24) /* U+AC00-U+D7A3 */
-  /* Bit 57   High Surrogates              */
-  /*          High Private Use Surrogates  */
-  /*          Low Surrogates               */
-  /*                                       */
-  /* According to OpenType specs v.1.3+,   */
-  /* setting bit 57 implies that there is  */
-  /* at least one codepoint beyond the     */
-  /* Basic Multilingual Plane that is      */
-  /* supported by this font.  So it really */
-  /* means >= U+10000                      */
-#define TT_UCR_SURROGATES                      (1L << 25) /* U+D800-U+DB7F */
-                                                          /* U+DB80-U+DBFF */
-                                                          /* U+DC00-U+DFFF */
-#define TT_UCR_NON_PLANE_0  TT_UCR_SURROGATES
-  /* Bit 58  Phoenician */
-#define TT_UCR_PHOENICIAN                      (1L << 26) /*U+10900-U+1091F*/
-  /* Bit 59   CJK Unified Ideographs             */
-  /*          CJK Radicals Supplement            */
-  /*          Kangxi Radicals                    */
-  /*          Ideographic Description Characters */
-  /*          CJK Unified Ideographs Extension A */
-  /*          CJK Unified Ideographs Extension B */
-  /*          Kanbun                             */
-#define TT_UCR_CJK_UNIFIED_IDEOGRAPHS          (1L << 27) /* U+4E00-U+9FFF */
-                                                          /* U+2E80-U+2EFF */
-                                                          /* U+2F00-U+2FDF */
-                                                          /* U+2FF0-U+2FFF */
-                                                          /* U+3400-U+4DB5 */
-                                                          /*U+20000-U+2A6DF*/
-                                                          /* U+3190-U+319F */
-  /* Bit 60   Private Use */
-#define TT_UCR_PRIVATE_USE                     (1L << 28) /* U+E000-U+F8FF */
-  /* Bit 61   CJK Strokes                             */
-  /*          CJK Compatibility Ideographs            */
-  /*          CJK Compatibility Ideographs Supplement */
-#define TT_UCR_CJK_COMPATIBILITY_IDEOGRAPHS    (1L << 29) /* U+31C0-U+31EF */
-                                                          /* U+F900-U+FAFF */
-                                                          /*U+2F800-U+2FA1F*/
-  /* Bit 62   Alphabetic Presentation Forms */
-#define TT_UCR_ALPHABETIC_PRESENTATION_FORMS   (1L << 30) /* U+FB00-U+FB4F */
-  /* Bit 63   Arabic Presentation Forms-A */
-#define TT_UCR_ARABIC_PRESENTATIONS_A          (1L << 31) /* U+FB50-U+FDFF */
-  /* Bit 64   Combining Half Marks */
-#define TT_UCR_COMBINING_HALF_MARKS            (1L <<  0) /* U+FE20-U+FE2F */
-  /* Bit 65   Vertical forms          */
-  /*          CJK Compatibility Forms */
-#define TT_UCR_CJK_COMPATIBILITY_FORMS         (1L <<  1) /* U+FE10-U+FE1F */
-                                                          /* U+FE30-U+FE4F */
-  /* Bit 66   Small Form Variants */
-#define TT_UCR_SMALL_FORM_VARIANTS             (1L <<  2) /* U+FE50-U+FE6F */
-  /* Bit 67   Arabic Presentation Forms-B */
-#define TT_UCR_ARABIC_PRESENTATIONS_B          (1L <<  3) /* U+FE70-U+FEFE */
-  /* Bit 68   Halfwidth and Fullwidth Forms */
-#define TT_UCR_HALFWIDTH_FULLWIDTH_FORMS       (1L <<  4) /* U+FF00-U+FFEF */
-  /* Bit 69   Specials */
-#define TT_UCR_SPECIALS                        (1L <<  5) /* U+FFF0-U+FFFD */
-  /* Bit 70   Tibetan */
-#define TT_UCR_TIBETAN                         (1L <<  6) /* U+0F00-U+0FFF */
-  /* Bit 71   Syriac */
-#define TT_UCR_SYRIAC                          (1L <<  7) /* U+0700-U+074F */
-  /* Bit 72   Thaana */
-#define TT_UCR_THAANA                          (1L <<  8) /* U+0780-U+07BF */
-  /* Bit 73   Sinhala */
-#define TT_UCR_SINHALA                         (1L <<  9) /* U+0D80-U+0DFF */
-  /* Bit 74   Myanmar */
-#define TT_UCR_MYANMAR                         (1L << 10) /* U+1000-U+109F */
-  /* Bit 75   Ethiopic            */
-  /*          Ethiopic Supplement */
-  /*          Ethiopic Extended   */
-#define TT_UCR_ETHIOPIC                        (1L << 11) /* U+1200-U+137F */
-                                                          /* U+1380-U+139F */
-                                                          /* U+2D80-U+2DDF */
-  /* Bit 76   Cherokee */
-#define TT_UCR_CHEROKEE                        (1L << 12) /* U+13A0-U+13FF */
-  /* Bit 77   Unified Canadian Aboriginal Syllabics */
-#define TT_UCR_CANADIAN_ABORIGINAL_SYLLABICS   (1L << 13) /* U+1400-U+167F */
-  /* Bit 78   Ogham */
-#define TT_UCR_OGHAM                           (1L << 14) /* U+1680-U+169F */
-  /* Bit 79   Runic */
-#define TT_UCR_RUNIC                           (1L << 15) /* U+16A0-U+16FF */
-  /* Bit 80   Khmer         */
-  /*          Khmer Symbols */
-#define TT_UCR_KHMER                           (1L << 16) /* U+1780-U+17FF */
-                                                          /* U+19E0-U+19FF */
-  /* Bit 81   Mongolian */
-#define TT_UCR_MONGOLIAN                       (1L << 17) /* U+1800-U+18AF */
-  /* Bit 82   Braille Patterns */
-#define TT_UCR_BRAILLE                         (1L << 18) /* U+2800-U+28FF */
-  /* Bit 83   Yi Syllables */
-  /*          Yi Radicals  */
-#define TT_UCR_YI                              (1L << 19) /* U+A000-U+A48F */
-                                                          /* U+A490-U+A4CF */
-  /* Bit 84   Tagalog  */
-  /*          Hanunoo  */
-  /*          Buhid    */
-  /*          Tagbanwa */
-#define TT_UCR_PHILIPPINE                      (1L << 20) /* U+1700-U+171F */
-                                                          /* U+1720-U+173F */
-                                                          /* U+1740-U+175F */
-                                                          /* U+1760-U+177F */
-  /* Bit 85   Old Italic */
-#define TT_UCR_OLD_ITALIC                      (1L << 21) /*U+10300-U+1032F*/
-  /* Bit 86   Gothic */
-#define TT_UCR_GOTHIC                          (1L << 22) /*U+10330-U+1034F*/
-  /* Bit 87   Deseret */
-#define TT_UCR_DESERET                         (1L << 23) /*U+10400-U+1044F*/
-  /* Bit 88   Byzantine Musical Symbols      */
-  /*          Musical Symbols                */
-  /*          Ancient Greek Musical Notation */
-#define TT_UCR_MUSICAL_SYMBOLS                 (1L << 24) /*U+1D000-U+1D0FF*/
-                                                          /*U+1D100-U+1D1FF*/
-                                                          /*U+1D200-U+1D24F*/
-  /* Bit 89   Mathematical Alphanumeric Symbols */
-#define TT_UCR_MATH_ALPHANUMERIC_SYMBOLS       (1L << 25) /*U+1D400-U+1D7FF*/
-  /* Bit 90   Private Use (plane 15) */
-  /*          Private Use (plane 16) */
-#define TT_UCR_PRIVATE_USE_SUPPLEMENTARY       (1L << 26) /*U+F0000-U+FFFFD*/
-                                                        /*U+100000-U+10FFFD*/
-  /* Bit 91   Variation Selectors            */
-  /*          Variation Selectors Supplement */
-#define TT_UCR_VARIATION_SELECTORS             (1L << 27) /* U+FE00-U+FE0F */
-                                                          /*U+E0100-U+E01EF*/
-  /* Bit 92   Tags */
-#define TT_UCR_TAGS                            (1L << 28) /*U+E0000-U+E007F*/
-  /* Bit 93   Limbu */
-#define TT_UCR_LIMBU                           (1L << 29) /* U+1900-U+194F */
-  /* Bit 94   Tai Le */
-#define TT_UCR_TAI_LE                          (1L << 30) /* U+1950-U+197F */
-  /* Bit 95   New Tai Lue */
-#define TT_UCR_NEW_TAI_LUE                     (1L << 31) /* U+1980-U+19DF */
-  /* Bit 96   Buginese */
-#define TT_UCR_BUGINESE                        (1L <<  0) /* U+1A00-U+1A1F */
-  /* Bit 97   Glagolitic */
-#define TT_UCR_GLAGOLITIC                      (1L <<  1) /* U+2C00-U+2C5F */
-  /* Bit 98   Tifinagh */
-#define TT_UCR_TIFINAGH                        (1L <<  2) /* U+2D30-U+2D7F */
-  /* Bit 99   Yijing Hexagram Symbols */
-#define TT_UCR_YIJING                          (1L <<  3) /* U+4DC0-U+4DFF */
-  /* Bit 100  Syloti Nagri */
-#define TT_UCR_SYLOTI_NAGRI                    (1L <<  4) /* U+A800-U+A82F */
-  /* Bit 101  Linear B Syllabary */
-  /*          Linear B Ideograms */
-  /*          Aegean Numbers     */
-#define TT_UCR_LINEAR_B                        (1L <<  5) /*U+10000-U+1007F*/
-                                                          /*U+10080-U+100FF*/
-                                                          /*U+10100-U+1013F*/
-  /* Bit 102  Ancient Greek Numbers */
-#define TT_UCR_ANCIENT_GREEK_NUMBERS           (1L <<  6) /*U+10140-U+1018F*/
-  /* Bit 103  Ugaritic */
-#define TT_UCR_UGARITIC                        (1L <<  7) /*U+10380-U+1039F*/
-  /* Bit 104  Old Persian */
-#define TT_UCR_OLD_PERSIAN                     (1L <<  8) /*U+103A0-U+103DF*/
-  /* Bit 105  Shavian */
-#define TT_UCR_SHAVIAN                         (1L <<  9) /*U+10450-U+1047F*/
-  /* Bit 106  Osmanya */
-#define TT_UCR_OSMANYA                         (1L << 10) /*U+10480-U+104AF*/
-  /* Bit 107  Cypriot Syllabary */
-#define TT_UCR_CYPRIOT_SYLLABARY               (1L << 11) /*U+10800-U+1083F*/
-  /* Bit 108  Kharoshthi */
-#define TT_UCR_KHAROSHTHI                      (1L << 12) /*U+10A00-U+10A5F*/
-  /* Bit 109  Tai Xuan Jing Symbols */
-#define TT_UCR_TAI_XUAN_JING                   (1L << 13) /*U+1D300-U+1D35F*/
-  /* Bit 110  Cuneiform                         */
-  /*          Cuneiform Numbers and Punctuation */
-#define TT_UCR_CUNEIFORM                       (1L << 14) /*U+12000-U+123FF*/
-                                                          /*U+12400-U+1247F*/
-  /* Bit 111  Counting Rod Numerals */
-#define TT_UCR_COUNTING_ROD_NUMERALS           (1L << 15) /*U+1D360-U+1D37F*/
-  /* Bit 112  Sundanese */
-#define TT_UCR_SUNDANESE                       (1L << 16) /* U+1B80-U+1BBF */
-  /* Bit 113  Lepcha */
-#define TT_UCR_LEPCHA                          (1L << 17) /* U+1C00-U+1C4F */
-  /* Bit 114  Ol Chiki */
-#define TT_UCR_OL_CHIKI                        (1L << 18) /* U+1C50-U+1C7F */
-  /* Bit 115  Saurashtra */
-#define TT_UCR_SAURASHTRA                      (1L << 19) /* U+A880-U+A8DF */
-  /* Bit 116  Kayah Li */
-#define TT_UCR_KAYAH_LI                        (1L << 20) /* U+A900-U+A92F */
-  /* Bit 117  Rejang */
-#define TT_UCR_REJANG                          (1L << 21) /* U+A930-U+A95F */
-  /* Bit 118  Cham */
-#define TT_UCR_CHAM                            (1L << 22) /* U+AA00-U+AA5F */
-  /* Bit 119  Ancient Symbols */
-#define TT_UCR_ANCIENT_SYMBOLS                 (1L << 23) /*U+10190-U+101CF*/
-  /* Bit 120  Phaistos Disc */
-#define TT_UCR_PHAISTOS_DISC                   (1L << 24) /*U+101D0-U+101FF*/
-  /* Bit 121  Carian */
-  /*          Lycian */
-  /*          Lydian */
-#define TT_UCR_OLD_ANATOLIAN                   (1L << 25) /*U+102A0-U+102DF*/
-                                                          /*U+10280-U+1029F*/
-                                                          /*U+10920-U+1093F*/
-  /* Bit 122  Domino Tiles  */
-  /*          Mahjong Tiles */
-#define TT_UCR_GAME_TILES                      (1L << 26) /*U+1F030-U+1F09F*/
-                                                          /*U+1F000-U+1F02F*/
-  /* Bit 123-127 Reserved for process-internal usage */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Some compilers have a very limited length of identifiers.             */
-  /*                                                                       */
-#if defined( __TURBOC__ ) && __TURBOC__ < 0x0410 || defined( __PACIFIC__ )
-#define HAVE_LIMIT_ON_IDENTS
-#endif
-
-
-#ifndef HAVE_LIMIT_ON_IDENTS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Here some alias #defines in order to be clearer.                      */
-  /*                                                                       */
-  /* These are not always #defined to stay within the 31~character limit   */
-  /* which some compilers have.                                            */
-  /*                                                                       */
-  /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern  */
-  /* Borland compilers (read: from BC++ 3.1 on) can increase this limit.   */
-  /* If you get a warning with such a compiler, use the -i40 switch.       */
-  /*                                                                       */
-#define TT_UCR_ARABIC_PRESENTATION_FORMS_A      \
-         TT_UCR_ARABIC_PRESENTATIONS_A
-#define TT_UCR_ARABIC_PRESENTATION_FORMS_B      \
-         TT_UCR_ARABIC_PRESENTATIONS_B
-
-#define TT_UCR_COMBINING_DIACRITICAL_MARKS      \
-         TT_UCR_COMBINING_DIACRITICS
-#define TT_UCR_COMBINING_DIACRITICAL_MARKS_SYMB \
-         TT_UCR_COMBINING_DIACRITICS_SYMB
-
-
-#endif /* !HAVE_LIMIT_ON_IDENTS */
-
-
-FT_END_HEADER
-
-#endif /* __TTNAMEID_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/fterrors.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/fterrors.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/fterrors.h	(copie de travail)
@@ -1,198 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fterrors.h                                                             */
-/*                                                                         */
-/*    FreeType error code handling (specification).                        */
-/*                                                                         */
-/*  Copyright 1996-2002, 2004, 2007, 2013 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This special header file is used to define the handling of FT2        */
-  /* enumeration constants.  It can also be used to generate error message */
-  /* strings with a small macro trick explained below.                     */
-  /*                                                                       */
-  /* I - Error Formats                                                     */
-  /* -----------------                                                     */
-  /*                                                                       */
-  /*   The configuration macro FT_CONFIG_OPTION_USE_MODULE_ERRORS can be   */
-  /*   defined in ftoption.h in order to make the higher byte indicate     */
-  /*   the module where the error has happened (this is not compatible     */
-  /*   with standard builds of FreeType 2).  See the file `ftmoderr.h' for */
-  /*   more details.                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /* II - Error Message strings                                            */
-  /* --------------------------                                            */
-  /*                                                                       */
-  /*   The error definitions below are made through special macros that    */
-  /*   allow client applications to build a table of error message strings */
-  /*   if they need it.  The strings are not included in a normal build of */
-  /*   FreeType 2 to save space (most client applications do not use       */
-  /*   them).                                                              */
-  /*                                                                       */
-  /*   To do so, you have to define the following macros before including  */
-  /*   this file:                                                          */
-  /*                                                                       */
-  /*   FT_ERROR_START_LIST ::                                              */
-  /*     This macro is called before anything else to define the start of  */
-  /*     the error list.  It is followed by several FT_ERROR_DEF calls     */
-  /*     (see below).                                                      */
-  /*                                                                       */
-  /*   FT_ERROR_DEF( e, v, s ) ::                                          */
-  /*     This macro is called to define one single error.                  */
-  /*     `e' is the error code identifier (e.g. FT_Err_Invalid_Argument).  */
-  /*     `v' is the error numerical value.                                 */
-  /*     `s' is the corresponding error string.                            */
-  /*                                                                       */
-  /*   FT_ERROR_END_LIST ::                                                */
-  /*     This macro ends the list.                                         */
-  /*                                                                       */
-  /*   Additionally, you have to undefine __FTERRORS_H__ before #including */
-  /*   this file.                                                          */
-  /*                                                                       */
-  /*   Here is a simple example:                                           */
-  /*                                                                       */
-  /*     {                                                                 */
-  /*       #undef __FTERRORS_H__                                           */
-  /*       #define FT_ERRORDEF( e, v, s )  { e, s },                       */
-  /*       #define FT_ERROR_START_LIST     {                               */
-  /*       #define FT_ERROR_END_LIST       { 0, 0 } };                     */
-  /*                                                                       */
-  /*       const struct                                                    */
-  /*       {                                                               */
-  /*         int          err_code;                                        */
-  /*         const char*  err_msg;                                         */
-  /*       } ft_errors[] =                                                 */
-  /*                                                                       */
-  /*       #include FT_ERRORS_H                                            */
-  /*     }                                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTERRORS_H__
-#define __FTERRORS_H__
-
-
-  /* include module base error codes */
-#include FT_MODULE_ERRORS_H
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                       SETUP MACROS                      *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#undef  FT_NEED_EXTERN_C
-
-
-  /* FT_ERR_PREFIX is used as a prefix for error identifiers. */
-  /* By default, we use `FT_Err_'.                            */
-  /*                                                          */
-#ifndef FT_ERR_PREFIX
-#define FT_ERR_PREFIX  FT_Err_
-#endif
-
-
-  /* FT_ERR_BASE is used as the base for module-specific errors. */
-  /*                                                             */
-#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-
-#ifndef FT_ERR_BASE
-#define FT_ERR_BASE  FT_Mod_Err_Base
-#endif
-
-#else
-
-#undef FT_ERR_BASE
-#define FT_ERR_BASE  0
-
-#endif /* FT_CONFIG_OPTION_USE_MODULE_ERRORS */
-
-
-  /* If FT_ERRORDEF is not defined, we need to define a simple */
-  /* enumeration type.                                         */
-  /*                                                           */
-#ifndef FT_ERRORDEF
-
-#define FT_ERRORDEF( e, v, s )  e = v,
-#define FT_ERROR_START_LIST     enum {
-#define FT_ERROR_END_LIST       FT_ERR_CAT( FT_ERR_PREFIX, Max ) };
-
-#ifdef __cplusplus
-#define FT_NEED_EXTERN_C
-  extern "C" {
-#endif
-
-#endif /* !FT_ERRORDEF */
-
-
-  /* this macro is used to define an error */
-#define FT_ERRORDEF_( e, v, s )                                             \
-          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s )
-
-  /* this is only used for <module>_Err_Ok, which must be 0! */
-#define FT_NOERRORDEF_( e, v, s )                             \
-          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s )
-
-
-#ifdef FT_ERROR_START_LIST
-  FT_ERROR_START_LIST
-#endif
-
-
-  /* now include the error codes */
-#include FT_ERROR_DEFINITIONS_H
-
-
-#ifdef FT_ERROR_END_LIST
-  FT_ERROR_END_LIST
-#endif
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                      SIMPLE CLEANUP                     *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-#ifdef FT_NEED_EXTERN_C
-  }
-#endif
-
-#undef FT_ERROR_START_LIST
-#undef FT_ERROR_END_LIST
-
-#undef FT_ERRORDEF
-#undef FT_ERRORDEF_
-#undef FT_NOERRORDEF_
-
-#undef FT_NEED_EXTERN_C
-#undef FT_ERR_BASE
-
-  /* FT_ERR_PREFIX is needed internally */
-#ifndef FT2_BUILD_LIBRARY
-#undef FT_ERR_PREFIX
-#endif
-
-#endif /* __FTERRORS_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftgxval.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftgxval.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftgxval.h	(copie de travail)
@@ -1,358 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgxval.h                                                              */
-/*                                                                         */
-/*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
-/*                                                                         */
-/*  Copyright 2004, 2005, 2006 by                                          */
-/*  Masatake YAMATO, Redhat K.K,                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/*                                                                         */
-/* gxvalid is derived from both gxlayout module and otvalid module.        */
-/* Development of gxlayout is supported by the Information-technology      */
-/* Promotion Agency(IPA), Japan.                                           */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTGXVAL_H__
-#define __FTGXVAL_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    gx_validation                                                      */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    TrueTypeGX/AAT Validation                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    An API to validate TrueTypeGX/AAT tables.                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of functions to validate     */
-  /*    some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd,  */
-  /*    trak, prop, lcar).                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                                                                       */
-  /* Warning: Use FT_VALIDATE_XXX to validate a table.                     */
-  /*          Following definitions are for gxvalid developers.            */
-  /*                                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-#define FT_VALIDATE_feat_INDEX     0
-#define FT_VALIDATE_mort_INDEX     1
-#define FT_VALIDATE_morx_INDEX     2
-#define FT_VALIDATE_bsln_INDEX     3
-#define FT_VALIDATE_just_INDEX     4
-#define FT_VALIDATE_kern_INDEX     5
-#define FT_VALIDATE_opbd_INDEX     6
-#define FT_VALIDATE_trak_INDEX     7
-#define FT_VALIDATE_prop_INDEX     8
-#define FT_VALIDATE_lcar_INDEX     9
-#define FT_VALIDATE_GX_LAST_INDEX  FT_VALIDATE_lcar_INDEX
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_VALIDATE_GX_LENGTH
-   *
-   * @description:
-   *   The number of tables checked in this module.  Use it as a parameter
-   *   for the `table-length' argument of function @FT_TrueTypeGX_Validate.
-   */
-#define FT_VALIDATE_GX_LENGTH     (FT_VALIDATE_GX_LAST_INDEX + 1)
-
-  /* */
-
-  /* Up to 0x1000 is used by otvalid.
-     Ox2xxx is reserved for feature OT extension. */
-#define FT_VALIDATE_GX_START 0x4000
-#define FT_VALIDATE_GX_BITFIELD( tag )                  \
-  ( FT_VALIDATE_GX_START << FT_VALIDATE_##tag##_INDEX )
-
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_VALIDATE_GXXXX
-  *
-  * @description:
-  *    A list of bit-field constants used with @FT_TrueTypeGX_Validate to
-  *    indicate which TrueTypeGX/AAT Type tables should be validated.
-  *
-  * @values:
-  *    FT_VALIDATE_feat ::
-  *      Validate `feat' table.
-  *
-  *    FT_VALIDATE_mort ::
-  *      Validate `mort' table.
-  *
-  *    FT_VALIDATE_morx ::
-  *      Validate `morx' table.
-  *
-  *    FT_VALIDATE_bsln ::
-  *      Validate `bsln' table.
-  *
-  *    FT_VALIDATE_just ::
-  *      Validate `just' table.
-  *
-  *    FT_VALIDATE_kern ::
-  *      Validate `kern' table.
-  *
-  *    FT_VALIDATE_opbd ::
-  *      Validate `opbd' table.
-  *
-  *    FT_VALIDATE_trak ::
-  *      Validate `trak' table.
-  *
-  *    FT_VALIDATE_prop ::
-  *      Validate `prop' table.
-  *
-  *    FT_VALIDATE_lcar ::
-  *      Validate `lcar' table.
-  *
-  *    FT_VALIDATE_GX ::
-  *      Validate all TrueTypeGX tables (feat, mort, morx, bsln, just, kern,
-  *      opbd, trak, prop and lcar).
-  *
-  */
-
-#define FT_VALIDATE_feat  FT_VALIDATE_GX_BITFIELD( feat )
-#define FT_VALIDATE_mort  FT_VALIDATE_GX_BITFIELD( mort )
-#define FT_VALIDATE_morx  FT_VALIDATE_GX_BITFIELD( morx )
-#define FT_VALIDATE_bsln  FT_VALIDATE_GX_BITFIELD( bsln )
-#define FT_VALIDATE_just  FT_VALIDATE_GX_BITFIELD( just )
-#define FT_VALIDATE_kern  FT_VALIDATE_GX_BITFIELD( kern )
-#define FT_VALIDATE_opbd  FT_VALIDATE_GX_BITFIELD( opbd )
-#define FT_VALIDATE_trak  FT_VALIDATE_GX_BITFIELD( trak )
-#define FT_VALIDATE_prop  FT_VALIDATE_GX_BITFIELD( prop )
-#define FT_VALIDATE_lcar  FT_VALIDATE_GX_BITFIELD( lcar )
-
-#define FT_VALIDATE_GX  ( FT_VALIDATE_feat | \
-                          FT_VALIDATE_mort | \
-                          FT_VALIDATE_morx | \
-                          FT_VALIDATE_bsln | \
-                          FT_VALIDATE_just | \
-                          FT_VALIDATE_kern | \
-                          FT_VALIDATE_opbd | \
-                          FT_VALIDATE_trak | \
-                          FT_VALIDATE_prop | \
-                          FT_VALIDATE_lcar )
-
-
-  /* */
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_TrueTypeGX_Validate
-  *
-  * @description:
-  *    Validate various TrueTypeGX tables to assure that all offsets and
-  *    indices are valid.  The idea is that a higher-level library which
-  *    actually does the text layout can access those tables without
-  *    error checking (which can be quite time consuming).
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    validation_flags ::
-  *       A bit field which specifies the tables to be validated.  See
-  *       @FT_VALIDATE_GXXXX for possible values.
-  *
-  *    table_length ::
-  *       The size of the `tables' array.  Normally, @FT_VALIDATE_GX_LENGTH
-  *       should be passed.
-  *
-  * @output:
-  *    tables ::
-  *       The array where all validated sfnt tables are stored.
-  *       The array itself must be allocated by a client.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function only works with TrueTypeGX fonts, returning an error
-  *   otherwise.
-  *
-  *   After use, the application should deallocate the buffers pointed to by
-  *   each `tables' element, by calling @FT_TrueTypeGX_Free.  A NULL value
-  *   indicates that the table either doesn't exist in the font, the
-  *   application hasn't asked for validation, or the validator doesn't have
-  *   the ability to validate the sfnt table.
-  */
-  FT_EXPORT( FT_Error )
-  FT_TrueTypeGX_Validate( FT_Face   face,
-                          FT_UInt   validation_flags,
-                          FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
-                          FT_UInt   table_length );
-
-
-  /* */
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_TrueTypeGX_Free
-  *
-  * @description:
-  *    Free the buffer allocated by TrueTypeGX validator.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    table ::
-  *       The pointer to the buffer allocated by
-  *       @FT_TrueTypeGX_Validate.
-  *
-  * @note:
-  *   This function must be used to free the buffer allocated by
-  *   @FT_TrueTypeGX_Validate only.
-  */
-  FT_EXPORT( void )
-  FT_TrueTypeGX_Free( FT_Face   face,
-                      FT_Bytes  table );
-
-
-  /* */
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_VALIDATE_CKERNXXX
-  *
-  * @description:
-  *    A list of bit-field constants used with @FT_ClassicKern_Validate
-  *    to indicate the classic kern dialect or dialects.  If the selected
-  *    type doesn't fit, @FT_ClassicKern_Validate regards the table as
-  *    invalid.
-  *
-  * @values:
-  *    FT_VALIDATE_MS ::
-  *      Handle the `kern' table as a classic Microsoft kern table.
-  *
-  *    FT_VALIDATE_APPLE ::
-  *      Handle the `kern' table as a classic Apple kern table.
-  *
-  *    FT_VALIDATE_CKERN ::
-  *      Handle the `kern' as either classic Apple or Microsoft kern table.
-  */
-#define FT_VALIDATE_MS     ( FT_VALIDATE_GX_START << 0 )
-#define FT_VALIDATE_APPLE  ( FT_VALIDATE_GX_START << 1 )
-
-#define FT_VALIDATE_CKERN  ( FT_VALIDATE_MS | FT_VALIDATE_APPLE )
-
-
-  /* */
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_ClassicKern_Validate
-  *
-  * @description:
-  *    Validate classic (16-bit format) kern table to assure that the offsets
-  *    and indices are valid.  The idea is that a higher-level library which
-  *    actually does the text layout can access those tables without error
-  *    checking (which can be quite time consuming).
-  *
-  *    The `kern' table validator in @FT_TrueTypeGX_Validate deals with both
-  *    the new 32-bit format and the classic 16-bit format, while
-  *    FT_ClassicKern_Validate only supports the classic 16-bit format.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    validation_flags ::
-  *       A bit field which specifies the dialect to be validated.  See
-  *       @FT_VALIDATE_CKERNXXX for possible values.
-  *
-  * @output:
-  *    ckern_table ::
-  *       A pointer to the kern table.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   After use, the application should deallocate the buffers pointed to by
-  *   `ckern_table', by calling @FT_ClassicKern_Free.  A NULL value
-  *   indicates that the table doesn't exist in the font.
-  */
-  FT_EXPORT( FT_Error )
-  FT_ClassicKern_Validate( FT_Face    face,
-                           FT_UInt    validation_flags,
-                           FT_Bytes  *ckern_table );
-
-
-  /* */
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_ClassicKern_Free
-  *
-  * @description:
-  *    Free the buffer allocated by classic Kern validator.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    table ::
-  *       The pointer to the buffer that is allocated by
-  *       @FT_ClassicKern_Validate.
-  *
-  * @note:
-  *   This function must be used to free the buffer allocated by
-  *   @FT_ClassicKern_Validate only.
-  */
-  FT_EXPORT( void )
-  FT_ClassicKern_Free( FT_Face   face,
-                       FT_Bytes  table );
-
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGXVAL_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftimage.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftimage.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftimage.h	(copie de travail)
@@ -1,1322 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftimage.h                                                              */
-/*                                                                         */
-/*    FreeType glyph image formats and default raster interface            */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 1996-2010, 2013 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Note: A `raster' is simply a scan-line converter, used to render      */
-  /*       FT_Outlines into FT_Bitmaps.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTIMAGE_H__
-#define __FTIMAGE_H__
-
-
-  /* _STANDALONE_ is from ftgrays.c */
-#ifndef _STANDALONE_
-#include <ft2build.h>
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Pos                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The type FT_Pos is used to store vectorial coordinates.  Depending */
-  /*    on the context, these can represent distances in integer font      */
-  /*    units, or 16.16, or 26.6 fixed-point pixel coordinates.            */
-  /*                                                                       */
-  typedef signed long  FT_Pos;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Vector                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2D vector; coordinates are of   */
-  /*    the FT_Pos type.                                                   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x :: The horizontal coordinate.                                    */
-  /*    y :: The vertical coordinate.                                      */
-  /*                                                                       */
-  typedef struct  FT_Vector_
-  {
-    FT_Pos  x;
-    FT_Pos  y;
-
-  } FT_Vector;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_BBox                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold an outline's bounding box, i.e., the      */
-  /*    coordinates of its extrema in the horizontal and vertical          */
-  /*    directions.                                                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    xMin :: The horizontal minimum (left-most).                        */
-  /*                                                                       */
-  /*    yMin :: The vertical minimum (bottom-most).                        */
-  /*                                                                       */
-  /*    xMax :: The horizontal maximum (right-most).                       */
-  /*                                                                       */
-  /*    yMax :: The vertical maximum (top-most).                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The bounding box is specified with the coordinates of the lower    */
-  /*    left and the upper right corner.  In PostScript, those values are  */
-  /*    often called (llx,lly) and (urx,ury), respectively.                */
-  /*                                                                       */
-  /*    If `yMin' is negative, this value gives the glyph's descender.     */
-  /*    Otherwise, the glyph doesn't descend below the baseline.           */
-  /*    Similarly, if `ymax' is positive, this value gives the glyph's     */
-  /*    ascender.                                                          */
-  /*                                                                       */
-  /*    `xMin' gives the horizontal distance from the glyph's origin to    */
-  /*    the left edge of the glyph's bounding box.  If `xMin' is negative, */
-  /*    the glyph extends to the left of the origin.                       */
-  /*                                                                       */
-  typedef struct  FT_BBox_
-  {
-    FT_Pos  xMin, yMin;
-    FT_Pos  xMax, yMax;
-
-  } FT_BBox;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Pixel_Mode                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type used to describe the format of pixels in a     */
-  /*    given bitmap.  Note that additional formats may be added in the    */
-  /*    future.                                                            */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_PIXEL_MODE_NONE ::                                              */
-  /*      Value~0 is reserved.                                             */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_MONO ::                                              */
-  /*      A monochrome bitmap, using 1~bit per pixel.  Note that pixels    */
-  /*      are stored in most-significant order (MSB), which means that     */
-  /*      the left-most pixel in a byte has value 128.                     */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY ::                                              */
-  /*      An 8-bit bitmap, generally used to represent anti-aliased glyph  */
-  /*      images.  Each pixel is stored in one byte.  Note that the number */
-  /*      of `gray' levels is stored in the `num_grays' field of the       */
-  /*      @FT_Bitmap structure (it generally is 256).                      */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY2 ::                                             */
-  /*      A 2-bit per pixel bitmap, used to represent embedded             */
-  /*      anti-aliased bitmaps in font files according to the OpenType     */
-  /*      specification.  We haven't found a single font using this        */
-  /*      format, however.                                                 */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY4 ::                                             */
-  /*      A 4-bit per pixel bitmap, representing embedded anti-aliased     */
-  /*      bitmaps in font files according to the OpenType specification.   */
-  /*      We haven't found a single font using this format, however.       */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_LCD ::                                               */
-  /*      An 8-bit bitmap, representing RGB or BGR decimated glyph images  */
-  /*      used for display on LCD displays; the bitmap is three times      */
-  /*      wider than the original glyph image.  See also                   */
-  /*      @FT_RENDER_MODE_LCD.                                             */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_LCD_V ::                                             */
-  /*      An 8-bit bitmap, representing RGB or BGR decimated glyph images  */
-  /*      used for display on rotated LCD displays; the bitmap is three    */
-  /*      times taller than the original glyph image.  See also            */
-  /*      @FT_RENDER_MODE_LCD_V.                                           */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_BGRA ::                                              */
-  /*      An image with four 8-bit channels per pixel, representing a      */
-  /*      color image (such as emoticons) with alpha channel.  For each    */
-  /*      pixel, the format is BGRA, which means, the blue channel comes   */
-  /*      first in memory.  The color channels are pre-multiplied and in   */
-  /*      the sRGB colorspace.  For example, full red at half-translucent  */
-  /*      opacity will be represented as `00,00,80,80', not `00,00,FF,80'. */
-  /*      See also @FT_LOAD_COLOR.                                         */
-  /*                                                                       */
-  typedef enum  FT_Pixel_Mode_
-  {
-    FT_PIXEL_MODE_NONE = 0,
-    FT_PIXEL_MODE_MONO,
-    FT_PIXEL_MODE_GRAY,
-    FT_PIXEL_MODE_GRAY2,
-    FT_PIXEL_MODE_GRAY4,
-    FT_PIXEL_MODE_LCD,
-    FT_PIXEL_MODE_LCD_V,
-    FT_PIXEL_MODE_BGRA,
-
-    FT_PIXEL_MODE_MAX      /* do not remove */
-
-  } FT_Pixel_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_pixel_mode_xxx                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of deprecated constants.  Use the corresponding             */
-  /*    @FT_Pixel_Mode values instead.                                     */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    ft_pixel_mode_none  :: See @FT_PIXEL_MODE_NONE.                    */
-  /*    ft_pixel_mode_mono  :: See @FT_PIXEL_MODE_MONO.                    */
-  /*    ft_pixel_mode_grays :: See @FT_PIXEL_MODE_GRAY.                    */
-  /*    ft_pixel_mode_pal2  :: See @FT_PIXEL_MODE_GRAY2.                   */
-  /*    ft_pixel_mode_pal4  :: See @FT_PIXEL_MODE_GRAY4.                   */
-  /*                                                                       */
-#define ft_pixel_mode_none   FT_PIXEL_MODE_NONE
-#define ft_pixel_mode_mono   FT_PIXEL_MODE_MONO
-#define ft_pixel_mode_grays  FT_PIXEL_MODE_GRAY
-#define ft_pixel_mode_pal2   FT_PIXEL_MODE_GRAY2
-#define ft_pixel_mode_pal4   FT_PIXEL_MODE_GRAY4
-
- /* */
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Palette_Mode                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT!                           */
-  /*                                                                       */
-  /*    An enumeration type to describe the format of a bitmap palette,    */
-  /*    used with ft_pixel_mode_pal4 and ft_pixel_mode_pal8.               */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    ft_palette_mode_rgb  :: The palette is an array of 3-byte RGB      */
-  /*                            records.                                   */
-  /*                                                                       */
-  /*    ft_palette_mode_rgba :: The palette is an array of 4-byte RGBA     */
-  /*                            records.                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    As ft_pixel_mode_pal2, pal4 and pal8 are currently unused by       */
-  /*    FreeType, these types are not handled by the library itself.       */
-  /*                                                                       */
-  typedef enum  FT_Palette_Mode_
-  {
-    ft_palette_mode_rgb = 0,
-    ft_palette_mode_rgba,
-
-    ft_palette_mode_max   /* do not remove */
-
-  } FT_Palette_Mode;
-
-  /* */
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Bitmap                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe a bitmap or pixmap to the raster.     */
-  /*    Note that we now manage pixmaps of various depths through the      */
-  /*    `pixel_mode' field.                                                */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    rows         :: The number of bitmap rows.                         */
-  /*                                                                       */
-  /*    width        :: The number of pixels in bitmap row.                */
-  /*                                                                       */
-  /*    pitch        :: The pitch's absolute value is the number of bytes  */
-  /*                    taken by one bitmap row, including padding.        */
-  /*                    However, the pitch is positive when the bitmap has */
-  /*                    a `down' flow, and negative when it has an `up'    */
-  /*                    flow.  In all cases, the pitch is an offset to add */
-  /*                    to a bitmap pointer in order to go down one row.   */
-  /*                                                                       */
-  /*                    Note that `padding' means the alignment of a       */
-  /*                    bitmap to a byte border, and FreeType functions    */
-  /*                    normally align to the smallest possible integer    */
-  /*                    value.                                             */
-  /*                                                                       */
-  /*                    For the B/W rasterizer, `pitch' is always an even  */
-  /*                    number.                                            */
-  /*                                                                       */
-  /*                    To change the pitch of a bitmap (say, to make it a */
-  /*                    multiple of 4), use @FT_Bitmap_Convert.            */
-  /*                    Alternatively, you might use callback functions to */
-  /*                    directly render to the application's surface; see  */
-  /*                    the file `example2.cpp' in the tutorial for a      */
-  /*                    demonstration.                                     */
-  /*                                                                       */
-  /*    buffer       :: A typeless pointer to the bitmap buffer.  This     */
-  /*                    value should be aligned on 32-bit boundaries in    */
-  /*                    most cases.                                        */
-  /*                                                                       */
-  /*    num_grays    :: This field is only used with                       */
-  /*                    @FT_PIXEL_MODE_GRAY; it gives the number of gray   */
-  /*                    levels used in the bitmap.                         */
-  /*                                                                       */
-  /*    pixel_mode   :: The pixel mode, i.e., how pixel bits are stored.   */
-  /*                    See @FT_Pixel_Mode for possible values.            */
-  /*                                                                       */
-  /*    palette_mode :: This field is intended for paletted pixel modes;   */
-  /*                    it indicates how the palette is stored.  Not       */
-  /*                    used currently.                                    */
-  /*                                                                       */
-  /*    palette      :: A typeless pointer to the bitmap palette; this     */
-  /*                    field is intended for paletted pixel modes.  Not   */
-  /*                    used currently.                                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*   For now, the only pixel modes supported by FreeType are mono and    */
-  /*   grays.  However, drivers might be added in the future to support    */
-  /*   more `colorful' options.                                            */
-  /*                                                                       */
-  typedef struct  FT_Bitmap_
-  {
-    int             rows;
-    int             width;
-    int             pitch;
-    unsigned char*  buffer;
-    short           num_grays;
-    char            pixel_mode;
-    char            palette_mode;
-    void*           palette;
-
-  } FT_Bitmap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Outline                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure is used to describe an outline to the scan-line     */
-  /*    converter.                                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    n_contours :: The number of contours in the outline.               */
-  /*                                                                       */
-  /*    n_points   :: The number of points in the outline.                 */
-  /*                                                                       */
-  /*    points     :: A pointer to an array of `n_points' @FT_Vector       */
-  /*                  elements, giving the outline's point coordinates.    */
-  /*                                                                       */
-  /*    tags       :: A pointer to an array of `n_points' chars, giving    */
-  /*                  each outline point's type.                           */
-  /*                                                                       */
-  /*                  If bit~0 is unset, the point is `off' the curve,     */
-  /*                  i.e., a BÃ©zier control point, while it is `on' if    */
-  /*                  set.                                                 */
-  /*                                                                       */
-  /*                  Bit~1 is meaningful for `off' points only.  If set,  */
-  /*                  it indicates a third-order BÃ©zier arc control point; */
-  /*                  and a second-order control point if unset.           */
-  /*                                                                       */
-  /*                  If bit~2 is set, bits 5-7 contain the drop-out mode  */
-  /*                  (as defined in the OpenType specification; the value */
-  /*                  is the same as the argument to the SCANMODE          */
-  /*                  instruction).                                        */
-  /*                                                                       */
-  /*                  Bits 3 and~4 are reserved for internal purposes.     */
-  /*                                                                       */
-  /*    contours   :: An array of `n_contours' shorts, giving the end      */
-  /*                  point of each contour within the outline.  For       */
-  /*                  example, the first contour is defined by the points  */
-  /*                  `0' to `contours[0]', the second one is defined by   */
-  /*                  the points `contours[0]+1' to `contours[1]', etc.    */
-  /*                                                                       */
-  /*    flags      :: A set of bit flags used to characterize the outline  */
-  /*                  and give hints to the scan-converter and hinter on   */
-  /*                  how to convert/grid-fit it.  See @FT_OUTLINE_FLAGS.  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The B/W rasterizer only checks bit~2 in the `tags' array for the   */
-  /*    first point of each contour.  The drop-out mode as given with      */
-  /*    @FT_OUTLINE_IGNORE_DROPOUTS, @FT_OUTLINE_SMART_DROPOUTS, and       */
-  /*    @FT_OUTLINE_INCLUDE_STUBS in `flags' is then overridden.           */
-  /*                                                                       */
-  typedef struct  FT_Outline_
-  {
-    short       n_contours;      /* number of contours in glyph        */
-    short       n_points;        /* number of points in the glyph      */
-
-    FT_Vector*  points;          /* the outline's points               */
-    char*       tags;            /* the points flags                   */
-    short*      contours;        /* the contour end points             */
-
-    int         flags;           /* outline masks                      */
-
-  } FT_Outline;
-
-  /* Following limits must be consistent with */
-  /* FT_Outline.{n_contours,n_points}         */
-#define FT_OUTLINE_CONTOURS_MAX  SHRT_MAX
-#define FT_OUTLINE_POINTS_MAX    SHRT_MAX
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_OUTLINE_FLAGS                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-field constants use for the flags in an outline's    */
-  /*    `flags' field.                                                     */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_OUTLINE_NONE ::                                                 */
-  /*      Value~0 is reserved.                                             */
-  /*                                                                       */
-  /*    FT_OUTLINE_OWNER ::                                                */
-  /*      If set, this flag indicates that the outline's field arrays      */
-  /*      (i.e., `points', `flags', and `contours') are `owned' by the     */
-  /*      outline object, and should thus be freed when it is destroyed.   */
-  /*                                                                       */
-  /*    FT_OUTLINE_EVEN_ODD_FILL ::                                        */
-  /*      By default, outlines are filled using the non-zero winding rule. */
-  /*      If set to 1, the outline will be filled using the even-odd fill  */
-  /*      rule (only works with the smooth rasterizer).                    */
-  /*                                                                       */
-  /*    FT_OUTLINE_REVERSE_FILL ::                                         */
-  /*      By default, outside contours of an outline are oriented in       */
-  /*      clock-wise direction, as defined in the TrueType specification.  */
-  /*      This flag is set if the outline uses the opposite direction      */
-  /*      (typically for Type~1 fonts).  This flag is ignored by the scan  */
-  /*      converter.                                                       */
-  /*                                                                       */
-  /*    FT_OUTLINE_IGNORE_DROPOUTS ::                                      */
-  /*      By default, the scan converter will try to detect drop-outs in   */
-  /*      an outline and correct the glyph bitmap to ensure consistent     */
-  /*      shape continuity.  If set, this flag hints the scan-line         */
-  /*      converter to ignore such cases.  See below for more information. */
-  /*                                                                       */
-  /*    FT_OUTLINE_SMART_DROPOUTS ::                                       */
-  /*      Select smart dropout control.  If unset, use simple dropout      */
-  /*      control.  Ignored if @FT_OUTLINE_IGNORE_DROPOUTS is set.  See    */
-  /*      below for more information.                                      */
-  /*                                                                       */
-  /*    FT_OUTLINE_INCLUDE_STUBS ::                                        */
-  /*      If set, turn pixels on for `stubs', otherwise exclude them.      */
-  /*      Ignored if @FT_OUTLINE_IGNORE_DROPOUTS is set.  See below for    */
-  /*      more information.                                                */
-  /*                                                                       */
-  /*    FT_OUTLINE_HIGH_PRECISION ::                                       */
-  /*      This flag indicates that the scan-line converter should try to   */
-  /*      convert this outline to bitmaps with the highest possible        */
-  /*      quality.  It is typically set for small character sizes.  Note   */
-  /*      that this is only a hint that might be completely ignored by a   */
-  /*      given scan-converter.                                            */
-  /*                                                                       */
-  /*    FT_OUTLINE_SINGLE_PASS ::                                          */
-  /*      This flag is set to force a given scan-converter to only use a   */
-  /*      single pass over the outline to render a bitmap glyph image.     */
-  /*      Normally, it is set for very large character sizes.  It is only  */
-  /*      a hint that might be completely ignored by a given               */
-  /*      scan-converter.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The flags @FT_OUTLINE_IGNORE_DROPOUTS, @FT_OUTLINE_SMART_DROPOUTS, */
-  /*    and @FT_OUTLINE_INCLUDE_STUBS are ignored by the smooth            */
-  /*    rasterizer.                                                        */
-  /*                                                                       */
-  /*    There exists a second mechanism to pass the drop-out mode to the   */
-  /*    B/W rasterizer; see the `tags' field in @FT_Outline.               */
-  /*                                                                       */
-  /*    Please refer to the description of the `SCANTYPE' instruction in   */
-  /*    the OpenType specification (in file `ttinst1.doc') how simple      */
-  /*    drop-outs, smart drop-outs, and stubs are defined.                 */
-  /*                                                                       */
-#define FT_OUTLINE_NONE             0x0
-#define FT_OUTLINE_OWNER            0x1
-#define FT_OUTLINE_EVEN_ODD_FILL    0x2
-#define FT_OUTLINE_REVERSE_FILL     0x4
-#define FT_OUTLINE_IGNORE_DROPOUTS  0x8
-#define FT_OUTLINE_SMART_DROPOUTS   0x10
-#define FT_OUTLINE_INCLUDE_STUBS    0x20
-
-#define FT_OUTLINE_HIGH_PRECISION   0x100
-#define FT_OUTLINE_SINGLE_PASS      0x200
-
-
- /*************************************************************************
-  *
-  * @enum:
-  *   ft_outline_flags
-  *
-  * @description:
-  *   These constants are deprecated.  Please use the corresponding
-  *   @FT_OUTLINE_FLAGS values.
-  *
-  * @values:
-  *   ft_outline_none            :: See @FT_OUTLINE_NONE.
-  *   ft_outline_owner           :: See @FT_OUTLINE_OWNER.
-  *   ft_outline_even_odd_fill   :: See @FT_OUTLINE_EVEN_ODD_FILL.
-  *   ft_outline_reverse_fill    :: See @FT_OUTLINE_REVERSE_FILL.
-  *   ft_outline_ignore_dropouts :: See @FT_OUTLINE_IGNORE_DROPOUTS.
-  *   ft_outline_high_precision  :: See @FT_OUTLINE_HIGH_PRECISION.
-  *   ft_outline_single_pass     :: See @FT_OUTLINE_SINGLE_PASS.
-  */
-#define ft_outline_none             FT_OUTLINE_NONE
-#define ft_outline_owner            FT_OUTLINE_OWNER
-#define ft_outline_even_odd_fill    FT_OUTLINE_EVEN_ODD_FILL
-#define ft_outline_reverse_fill     FT_OUTLINE_REVERSE_FILL
-#define ft_outline_ignore_dropouts  FT_OUTLINE_IGNORE_DROPOUTS
-#define ft_outline_high_precision   FT_OUTLINE_HIGH_PRECISION
-#define ft_outline_single_pass      FT_OUTLINE_SINGLE_PASS
-
-  /* */
-
-#define FT_CURVE_TAG( flag )  ( flag & 3 )
-
-#define FT_CURVE_TAG_ON            1
-#define FT_CURVE_TAG_CONIC         0
-#define FT_CURVE_TAG_CUBIC         2
-
-#define FT_CURVE_TAG_HAS_SCANMODE  4
-
-#define FT_CURVE_TAG_TOUCH_X       8  /* reserved for the TrueType hinter */
-#define FT_CURVE_TAG_TOUCH_Y      16  /* reserved for the TrueType hinter */
-
-#define FT_CURVE_TAG_TOUCH_BOTH    ( FT_CURVE_TAG_TOUCH_X | \
-                                     FT_CURVE_TAG_TOUCH_Y )
-
-#define FT_Curve_Tag_On       FT_CURVE_TAG_ON
-#define FT_Curve_Tag_Conic    FT_CURVE_TAG_CONIC
-#define FT_Curve_Tag_Cubic    FT_CURVE_TAG_CUBIC
-#define FT_Curve_Tag_Touch_X  FT_CURVE_TAG_TOUCH_X
-#define FT_Curve_Tag_Touch_Y  FT_CURVE_TAG_TOUCH_Y
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_MoveToFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `move  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `move to' is emitted to start a new contour in an outline.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    to   :: A pointer to the target point of the `move to'.            */
-  /*                                                                       */
-  /*    user :: A typeless pointer which is passed from the caller of the  */
-  /*            decomposition function.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_MoveToFunc)( const FT_Vector*  to,
-                            void*             user );
-
-#define FT_Outline_MoveTo_Func  FT_Outline_MoveToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_LineToFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `line  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `line to' is emitted to indicate a segment in the outline.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    to   :: A pointer to the target point of the `line to'.            */
-  /*                                                                       */
-  /*    user :: A typeless pointer which is passed from the caller of the  */
-  /*            decomposition function.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_LineToFunc)( const FT_Vector*  to,
-                            void*             user );
-
-#define FT_Outline_LineTo_Func  FT_Outline_LineToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_ConicToFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `conic */
-  /*    to' function during outline walking or decomposition.              */
-  /*                                                                       */
-  /*    A `conic to' is emitted to indicate a second-order BÃ©zier arc in   */
-  /*    the outline.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    control :: An intermediate control point between the last position */
-  /*               and the new target in `to'.                             */
-  /*                                                                       */
-  /*    to      :: A pointer to the target end point of the conic arc.     */
-  /*                                                                       */
-  /*    user    :: A typeless pointer which is passed from the caller of   */
-  /*               the decomposition function.                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_ConicToFunc)( const FT_Vector*  control,
-                             const FT_Vector*  to,
-                             void*             user );
-
-#define FT_Outline_ConicTo_Func  FT_Outline_ConicToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_CubicToFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `cubic */
-  /*    to' function during outline walking or decomposition.              */
-  /*                                                                       */
-  /*    A `cubic to' is emitted to indicate a third-order BÃ©zier arc.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    control1 :: A pointer to the first BÃ©zier control point.           */
-  /*                                                                       */
-  /*    control2 :: A pointer to the second BÃ©zier control point.          */
-  /*                                                                       */
-  /*    to       :: A pointer to the target end point.                     */
-  /*                                                                       */
-  /*    user     :: A typeless pointer which is passed from the caller of  */
-  /*                the decomposition function.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_CubicToFunc)( const FT_Vector*  control1,
-                             const FT_Vector*  control2,
-                             const FT_Vector*  to,
-                             void*             user );
-
-#define FT_Outline_CubicTo_Func  FT_Outline_CubicToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Outline_Funcs                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure to hold various function pointers used during outline  */
-  /*    decomposition in order to emit segments, conic, and cubic BÃ©ziers. */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    move_to  :: The `move to' emitter.                                 */
-  /*                                                                       */
-  /*    line_to  :: The segment emitter.                                   */
-  /*                                                                       */
-  /*    conic_to :: The second-order BÃ©zier arc emitter.                   */
-  /*                                                                       */
-  /*    cubic_to :: The third-order BÃ©zier arc emitter.                    */
-  /*                                                                       */
-  /*    shift    :: The shift that is applied to coordinates before they   */
-  /*                are sent to the emitter.                               */
-  /*                                                                       */
-  /*    delta    :: The delta that is applied to coordinates before they   */
-  /*                are sent to the emitter, but after the shift.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The point coordinates sent to the emitters are the transformed     */
-  /*    version of the original coordinates (this is important for high    */
-  /*    accuracy during scan-conversion).  The transformation is simple:   */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      x' = (x << shift) - delta                                        */
-  /*      y' = (x << shift) - delta                                        */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Set the values of `shift' and `delta' to~0 to get the original     */
-  /*    point coordinates.                                                 */
-  /*                                                                       */
-  typedef struct  FT_Outline_Funcs_
-  {
-    FT_Outline_MoveToFunc   move_to;
-    FT_Outline_LineToFunc   line_to;
-    FT_Outline_ConicToFunc  conic_to;
-    FT_Outline_CubicToFunc  cubic_to;
-
-    int                     shift;
-    FT_Pos                  delta;
-
-  } FT_Outline_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_IMAGE_TAG                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four-letter tags to an unsigned long type.     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since many 16-bit compilers don't like 32-bit enumerations, you    */
-  /*    should redefine this macro in case of problems to something like   */
-  /*    this:                                                              */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  value         */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    to get a simple enumeration without assigning special numbers.     */
-  /*                                                                       */
-#ifndef FT_IMAGE_TAG
-#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  \
-          value = ( ( (unsigned long)_x1 << 24 ) | \
-                    ( (unsigned long)_x2 << 16 ) | \
-                    ( (unsigned long)_x3 << 8  ) | \
-                      (unsigned long)_x4         )
-#endif /* FT_IMAGE_TAG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Glyph_Format                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type used to describe the format of a given glyph   */
-  /*    image.  Note that this version of FreeType only supports two image */
-  /*    formats, even though future font drivers will be able to register  */
-  /*    their own format.                                                  */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_GLYPH_FORMAT_NONE ::                                            */
-  /*      The value~0 is reserved.                                         */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_COMPOSITE ::                                       */
-  /*      The glyph image is a composite of several other images.  This    */
-  /*      format is _only_ used with @FT_LOAD_NO_RECURSE, and is used to   */
-  /*      report compound glyphs (like accented characters).               */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_BITMAP ::                                          */
-  /*      The glyph image is a bitmap, and can be described as an          */
-  /*      @FT_Bitmap.  You generally need to access the `bitmap' field of  */
-  /*      the @FT_GlyphSlotRec structure to read it.                       */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_OUTLINE ::                                         */
-  /*      The glyph image is a vectorial outline made of line segments     */
-  /*      and BÃ©zier arcs; it can be described as an @FT_Outline; you      */
-  /*      generally want to access the `outline' field of the              */
-  /*      @FT_GlyphSlotRec structure to read it.                           */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_PLOTTER ::                                         */
-  /*      The glyph image is a vectorial path with no inside and outside   */
-  /*      contours.  Some Type~1 fonts, like those in the Hershey family,  */
-  /*      contain glyphs in this format.  These are described as           */
-  /*      @FT_Outline, but FreeType isn't currently capable of rendering   */
-  /*      them correctly.                                                  */
-  /*                                                                       */
-  typedef enum  FT_Glyph_Format_
-  {
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0 ),
-
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't' )
-
-  } FT_Glyph_Format;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_glyph_format_xxx                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of deprecated constants.  Use the corresponding             */
-  /*    @FT_Glyph_Format values instead.                                   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    ft_glyph_format_none      :: See @FT_GLYPH_FORMAT_NONE.            */
-  /*    ft_glyph_format_composite :: See @FT_GLYPH_FORMAT_COMPOSITE.       */
-  /*    ft_glyph_format_bitmap    :: See @FT_GLYPH_FORMAT_BITMAP.          */
-  /*    ft_glyph_format_outline   :: See @FT_GLYPH_FORMAT_OUTLINE.         */
-  /*    ft_glyph_format_plotter   :: See @FT_GLYPH_FORMAT_PLOTTER.         */
-  /*                                                                       */
-#define ft_glyph_format_none       FT_GLYPH_FORMAT_NONE
-#define ft_glyph_format_composite  FT_GLYPH_FORMAT_COMPOSITE
-#define ft_glyph_format_bitmap     FT_GLYPH_FORMAT_BITMAP
-#define ft_glyph_format_outline    FT_GLYPH_FORMAT_OUTLINE
-#define ft_glyph_format_plotter    FT_GLYPH_FORMAT_PLOTTER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****            R A S T E R   D E F I N I T I O N S                *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A raster is a scan converter, in charge of rendering an outline into  */
-  /* a a bitmap.  This section contains the public API for rasters.        */
-  /*                                                                       */
-  /* Note that in FreeType 2, all rasters are now encapsulated within      */
-  /* specific modules called `renderers'.  See `freetype/ftrender.h' for   */
-  /* more details on renderers.                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    raster                                                             */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Scanline Converter                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How vectorial outlines are converted into bitmaps and pixmaps.     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains technical definitions.                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Raster                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle (pointer) to a raster object.  Each object can be used    */
-  /*    independently to convert an outline into a bitmap or pixmap.       */
-  /*                                                                       */
-  typedef struct FT_RasterRec_*  FT_Raster;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Span                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a single span of gray (or black) pixels  */
-  /*    when rendering a monochrome or anti-aliased bitmap.                */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x        :: The span's horizontal start position.                  */
-  /*                                                                       */
-  /*    len      :: The span's length in pixels.                           */
-  /*                                                                       */
-  /*    coverage :: The span color/coverage, ranging from 0 (background)   */
-  /*                to 255 (foreground).  Only used for anti-aliased       */
-  /*                rendering.                                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is used by the span drawing callback type named     */
-  /*    @FT_SpanFunc which takes the y~coordinate of the span as a         */
-  /*    a parameter.                                                       */
-  /*                                                                       */
-  /*    The coverage value is always between 0 and 255.  If you want less  */
-  /*    gray values, the callback function has to reduce them.             */
-  /*                                                                       */
-  typedef struct  FT_Span_
-  {
-    short           x;
-    unsigned short  len;
-    unsigned char   coverage;
-
-  } FT_Span;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_SpanFunc                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used as a call-back by the anti-aliased renderer in     */
-  /*    order to let client applications draw themselves the gray pixel    */
-  /*    spans on each scan line.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The scanline's y~coordinate.                              */
-  /*                                                                       */
-  /*    count :: The number of spans to draw on this scanline.             */
-  /*                                                                       */
-  /*    spans :: A table of `count' spans to draw on the scanline.         */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This callback allows client applications to directly render the    */
-  /*    gray spans of the anti-aliased bitmap to any kind of surfaces.     */
-  /*                                                                       */
-  /*    This can be used to write anti-aliased outlines directly to a      */
-  /*    given background bitmap, and even perform translucency.            */
-  /*                                                                       */
-  /*    Note that the `count' field cannot be greater than a fixed value   */
-  /*    defined by the `FT_MAX_GRAY_SPANS' configuration macro in          */
-  /*    `ftoption.h'.  By default, this value is set to~32, which means    */
-  /*    that if there are more than 32~spans on a given scanline, the      */
-  /*    callback is called several times with the same `y' parameter in    */
-  /*    order to draw all callbacks.                                       */
-  /*                                                                       */
-  /*    Otherwise, the callback is only called once per scan-line, and     */
-  /*    only for those scanlines that do have `gray' pixels on them.       */
-  /*                                                                       */
-  typedef void
-  (*FT_SpanFunc)( int             y,
-                  int             count,
-                  const FT_Span*  spans,
-                  void*           user );
-
-#define FT_Raster_Span_Func  FT_SpanFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_BitTest_Func                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT.                           */
-  /*                                                                       */
-  /*    A function used as a call-back by the monochrome scan-converter    */
-  /*    to test whether a given target pixel is already set to the drawing */
-  /*    `color'.  These tests are crucial to implement drop-out control    */
-  /*    per-se the TrueType spec.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The pixel's y~coordinate.                                 */
-  /*                                                                       */
-  /*    x     :: The pixel's x~coordinate.                                 */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*   1~if the pixel is `set', 0~otherwise.                               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_BitTest_Func)( int    y,
-                             int    x,
-                             void*  user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_BitSet_Func                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT.                           */
-  /*                                                                       */
-  /*    A function used as a call-back by the monochrome scan-converter    */
-  /*    to set an individual target pixel.  This is crucial to implement   */
-  /*    drop-out control according to the TrueType specification.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The pixel's y~coordinate.                                 */
-  /*                                                                       */
-  /*    x     :: The pixel's x~coordinate.                                 */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    1~if the pixel is `set', 0~otherwise.                              */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_BitSet_Func)( int    y,
-                            int    x,
-                            void*  user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_RASTER_FLAG_XXX                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flag constants as used in the `flags' field of a     */
-  /*    @FT_Raster_Params structure.                                       */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_RASTER_FLAG_DEFAULT :: This value is 0.                         */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_AA      :: This flag is set to indicate that an     */
-  /*                              anti-aliased glyph image should be       */
-  /*                              generated.  Otherwise, it will be        */
-  /*                              monochrome (1-bit).                      */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_DIRECT  :: This flag is set to indicate direct      */
-  /*                              rendering.  In this mode, client         */
-  /*                              applications must provide their own span */
-  /*                              callback.  This lets them directly       */
-  /*                              draw or compose over an existing bitmap. */
-  /*                              If this bit is not set, the target       */
-  /*                              pixmap's buffer _must_ be zeroed before  */
-  /*                              rendering.                               */
-  /*                                                                       */
-  /*                              Note that for now, direct rendering is   */
-  /*                              only possible with anti-aliased glyphs.  */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_CLIP    :: This flag is only used in direct         */
-  /*                              rendering mode.  If set, the output will */
-  /*                              be clipped to a box specified in the     */
-  /*                              `clip_box' field of the                  */
-  /*                              @FT_Raster_Params structure.             */
-  /*                                                                       */
-  /*                              Note that by default, the glyph bitmap   */
-  /*                              is clipped to the target pixmap, except  */
-  /*                              in direct rendering mode where all spans */
-  /*                              are generated if no clipping box is set. */
-  /*                                                                       */
-#define FT_RASTER_FLAG_DEFAULT  0x0
-#define FT_RASTER_FLAG_AA       0x1
-#define FT_RASTER_FLAG_DIRECT   0x2
-#define FT_RASTER_FLAG_CLIP     0x4
-
-  /* deprecated */
-#define ft_raster_flag_default  FT_RASTER_FLAG_DEFAULT
-#define ft_raster_flag_aa       FT_RASTER_FLAG_AA
-#define ft_raster_flag_direct   FT_RASTER_FLAG_DIRECT
-#define ft_raster_flag_clip     FT_RASTER_FLAG_CLIP
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Raster_Params                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure to hold the arguments used by a raster's render        */
-  /*    function.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    target      :: The target bitmap.                                  */
-  /*                                                                       */
-  /*    source      :: A pointer to the source glyph image (e.g., an       */
-  /*                   @FT_Outline).                                       */
-  /*                                                                       */
-  /*    flags       :: The rendering flags.                                */
-  /*                                                                       */
-  /*    gray_spans  :: The gray span drawing callback.                     */
-  /*                                                                       */
-  /*    black_spans :: The black span drawing callback.  UNIMPLEMENTED!    */
-  /*                                                                       */
-  /*    bit_test    :: The bit test callback.  UNIMPLEMENTED!              */
-  /*                                                                       */
-  /*    bit_set     :: The bit set callback.  UNIMPLEMENTED!               */
-  /*                                                                       */
-  /*    user        :: User-supplied data that is passed to each drawing   */
-  /*                   callback.                                           */
-  /*                                                                       */
-  /*    clip_box    :: An optional clipping box.  It is only used in       */
-  /*                   direct rendering mode.  Note that coordinates here  */
-  /*                   should be expressed in _integer_ pixels (and not in */
-  /*                   26.6 fixed-point units).                            */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An anti-aliased glyph bitmap is drawn if the @FT_RASTER_FLAG_AA    */
-  /*    bit flag is set in the `flags' field, otherwise a monochrome       */
-  /*    bitmap is generated.                                               */
-  /*                                                                       */
-  /*    If the @FT_RASTER_FLAG_DIRECT bit flag is set in `flags', the      */
-  /*    raster will call the `gray_spans' callback to draw gray pixel      */
-  /*    spans, in the case of an aa glyph bitmap, it will call             */
-  /*    `black_spans', and `bit_test' and `bit_set' in the case of a       */
-  /*    monochrome bitmap.  This allows direct composition over a          */
-  /*    pre-existing bitmap through user-provided callbacks to perform the */
-  /*    span drawing/composition.                                          */
-  /*                                                                       */
-  /*    Note that the `bit_test' and `bit_set' callbacks are required when */
-  /*    rendering a monochrome bitmap, as they are crucial to implement    */
-  /*    correct drop-out control as defined in the TrueType specification. */
-  /*                                                                       */
-  typedef struct  FT_Raster_Params_
-  {
-    const FT_Bitmap*        target;
-    const void*             source;
-    int                     flags;
-    FT_SpanFunc             gray_spans;
-    FT_SpanFunc             black_spans;  /* doesn't work! */
-    FT_Raster_BitTest_Func  bit_test;     /* doesn't work! */
-    FT_Raster_BitSet_Func   bit_set;      /* doesn't work! */
-    void*                   user;
-    FT_BBox                 clip_box;
-
-  } FT_Raster_Params;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_NewFunc                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to create a new raster object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory allocator.                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    raster :: A handle to the new raster object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `memory' parameter is a typeless pointer in order to avoid     */
-  /*    un-wanted dependencies on the rest of the FreeType code.  In       */
-  /*    practice, it is an @FT_Memory object, i.e., a handle to the        */
-  /*    standard FreeType memory allocator.  However, this field can be    */
-  /*    completely ignored by a given raster implementation.               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_NewFunc)( void*       memory,
-                        FT_Raster*  raster );
-
-#define FT_Raster_New_Func  FT_Raster_NewFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_DoneFunc                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to destroy a given raster object.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the raster object.                           */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_DoneFunc)( FT_Raster  raster );
-
-#define FT_Raster_Done_Func  FT_Raster_DoneFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_ResetFunc                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType provides an area of memory called the `render pool',      */
-  /*    available to all registered rasters.  This pool can be freely used */
-  /*    during a given scan-conversion but is shared by all rasters.  Its  */
-  /*    content is thus transient.                                         */
-  /*                                                                       */
-  /*    This function is called each time the render pool changes, or just */
-  /*    after a new raster object is created.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster    :: A handle to the new raster object.                    */
-  /*                                                                       */
-  /*    pool_base :: The address in memory of the render pool.             */
-  /*                                                                       */
-  /*    pool_size :: The size in bytes of the render pool.                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Rasters can ignore the render pool and rely on dynamic memory      */
-  /*    allocation if they want to (a handle to the memory allocator is    */
-  /*    passed to the raster constructor).  However, this is not           */
-  /*    recommended for efficiency purposes.                               */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_ResetFunc)( FT_Raster       raster,
-                          unsigned char*  pool_base,
-                          unsigned long   pool_size );
-
-#define FT_Raster_Reset_Func  FT_Raster_ResetFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_SetModeFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is a generic facility to change modes or attributes  */
-  /*    in a given raster.  This can be used for debugging purposes, or    */
-  /*    simply to allow implementation-specific `features' in a given      */
-  /*    raster module.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the new raster object.                       */
-  /*                                                                       */
-  /*    mode   :: A 4-byte tag used to name the mode or property.          */
-  /*                                                                       */
-  /*    args   :: A pointer to the new mode/property to use.               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_SetModeFunc)( FT_Raster      raster,
-                            unsigned long  mode,
-                            void*          args );
-
-#define FT_Raster_Set_Mode_Func  FT_Raster_SetModeFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_RenderFunc                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Invoke a given raster to scan-convert a given glyph image into a   */
-  /*    target bitmap.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the raster object.                           */
-  /*                                                                       */
-  /*    params :: A pointer to an @FT_Raster_Params structure used to      */
-  /*              store the rendering parameters.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The exact format of the source image depends on the raster's glyph */
-  /*    format defined in its @FT_Raster_Funcs structure.  It can be an    */
-  /*    @FT_Outline or anything else in order to support a large array of  */
-  /*    glyph formats.                                                     */
-  /*                                                                       */
-  /*    Note also that the render function can fail and return a           */
-  /*    `FT_Err_Unimplemented_Feature' error code if the raster used does  */
-  /*    not support direct composition.                                    */
-  /*                                                                       */
-  /*    XXX: For now, the standard raster doesn't support direct           */
-  /*         composition but this should change for the final release (see */
-  /*         the files `demos/src/ftgrays.c' and `demos/src/ftgrays2.c'    */
-  /*         for examples of distinct implementations which support direct */
-  /*         composition).                                                 */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_RenderFunc)( FT_Raster                raster,
-                           const FT_Raster_Params*  params );
-
-#define FT_Raster_Render_Func  FT_Raster_RenderFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Raster_Funcs                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   A structure used to describe a given raster class to the library.   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    glyph_format  :: The supported glyph format for this raster.       */
-  /*                                                                       */
-  /*    raster_new    :: The raster constructor.                           */
-  /*                                                                       */
-  /*    raster_reset  :: Used to reset the render pool within the raster.  */
-  /*                                                                       */
-  /*    raster_render :: A function to render a glyph into a given bitmap. */
-  /*                                                                       */
-  /*    raster_done   :: The raster destructor.                            */
-  /*                                                                       */
-  typedef struct  FT_Raster_Funcs_
-  {
-    FT_Glyph_Format        glyph_format;
-    FT_Raster_NewFunc      raster_new;
-    FT_Raster_ResetFunc    raster_reset;
-    FT_Raster_SetModeFunc  raster_set_mode;
-    FT_Raster_RenderFunc   raster_render;
-    FT_Raster_DoneFunc     raster_done;
-
-  } FT_Raster_Funcs;
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTIMAGE_H__ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
Index: lib/3rdparty/freetype/include/freetype/ftsystem.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftsystem.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftsystem.h	(copie de travail)
@@ -1,347 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsystem.h                                                             */
-/*                                                                         */
-/*    FreeType low-level system interface definition (specification).      */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2010 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTSYSTEM_H__
-#define __FTSYSTEM_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   system_interface                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*   System Interface                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*   How FreeType manages memory and i/o.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This section contains various definitions related to memory         */
-  /*   management and i/o access.  You need to understand this             */
-  /*   information if you want to use a custom memory manager or you own   */
-  /*   i/o streams.                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                  M E M O R Y   M A N A G E M E N T                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FT_Memory
-   *
-   * @description:
-   *   A handle to a given memory manager object, defined with an
-   *   @FT_MemoryRec structure.
-   *
-   */
-  typedef struct FT_MemoryRec_*  FT_Memory;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Alloc_Func
-   *
-   * @description:
-   *   A function used to allocate `size' bytes from `memory'.
-   *
-   * @input:
-   *   memory ::
-   *     A handle to the source memory manager.
-   *
-   *   size ::
-   *     The size in bytes to allocate.
-   *
-   * @return:
-   *   Address of new memory block.  0~in case of failure.
-   *
-   */
-  typedef void*
-  (*FT_Alloc_Func)( FT_Memory  memory,
-                    long       size );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Free_Func
-   *
-   * @description:
-   *   A function used to release a given block of memory.
-   *
-   * @input:
-   *   memory ::
-   *     A handle to the source memory manager.
-   *
-   *   block ::
-   *     The address of the target memory block.
-   *
-   */
-  typedef void
-  (*FT_Free_Func)( FT_Memory  memory,
-                   void*      block );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Realloc_Func
-   *
-   * @description:
-   *   A function used to re-allocate a given block of memory.
-   *
-   * @input:
-   *   memory ::
-   *     A handle to the source memory manager.
-   *
-   *   cur_size ::
-   *     The block's current size in bytes.
-   *
-   *   new_size ::
-   *     The block's requested new size.
-   *
-   *   block ::
-   *     The block's current address.
-   *
-   * @return:
-   *   New block address.  0~in case of memory shortage.
-   *
-   * @note:
-   *   In case of error, the old block must still be available.
-   *
-   */
-  typedef void*
-  (*FT_Realloc_Func)( FT_Memory  memory,
-                      long       cur_size,
-                      long       new_size,
-                      void*      block );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FT_MemoryRec
-   *
-   * @description:
-   *   A structure used to describe a given memory manager to FreeType~2.
-   *
-   * @fields:
-   *   user ::
-   *     A generic typeless pointer for user data.
-   *
-   *   alloc ::
-   *     A pointer type to an allocation function.
-   *
-   *   free ::
-   *     A pointer type to an memory freeing function.
-   *
-   *   realloc ::
-   *     A pointer type to a reallocation function.
-   *
-   */
-  struct  FT_MemoryRec_
-  {
-    void*            user;
-    FT_Alloc_Func    alloc;
-    FT_Free_Func     free;
-    FT_Realloc_Func  realloc;
-  };
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                       I / O   M A N A G E M E N T                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FT_Stream
-   *
-   * @description:
-   *   A handle to an input stream.
-   *
-   */
-  typedef struct FT_StreamRec_*  FT_Stream;
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FT_StreamDesc
-   *
-   * @description:
-   *   A union type used to store either a long or a pointer.  This is used
-   *   to store a file descriptor or a `FILE*' in an input stream.
-   *
-   */
-  typedef union  FT_StreamDesc_
-  {
-    long   value;
-    void*  pointer;
-
-  } FT_StreamDesc;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Stream_IoFunc
-   *
-   * @description:
-   *   A function used to seek and read data from a given input stream.
-   *
-   * @input:
-   *   stream ::
-   *     A handle to the source stream.
-   *
-   *   offset ::
-   *     The offset of read in stream (always from start).
-   *
-   *   buffer ::
-   *     The address of the read buffer.
-   *
-   *   count ::
-   *     The number of bytes to read from the stream.
-   *
-   * @return:
-   *   The number of bytes effectively read by the stream.
-   *
-   * @note:
-   *   This function might be called to perform a seek or skip operation
-   *   with a `count' of~0.  A non-zero return value then indicates an
-   *   error.
-   *
-   */
-  typedef unsigned long
-  (*FT_Stream_IoFunc)( FT_Stream       stream,
-                       unsigned long   offset,
-                       unsigned char*  buffer,
-                       unsigned long   count );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Stream_CloseFunc
-   *
-   * @description:
-   *   A function used to close a given input stream.
-   *
-   * @input:
-   *  stream ::
-   *     A handle to the target stream.
-   *
-   */
-  typedef void
-  (*FT_Stream_CloseFunc)( FT_Stream  stream );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FT_StreamRec
-   *
-   * @description:
-   *   A structure used to describe an input stream.
-   *
-   * @input:
-   *   base ::
-   *     For memory-based streams, this is the address of the first stream
-   *     byte in memory.  This field should always be set to NULL for
-   *     disk-based streams.
-   *
-   *   size ::
-   *     The stream size in bytes.
-   *
-   *   pos ::
-   *     The current position within the stream.
-   *
-   *   descriptor ::
-   *     This field is a union that can hold an integer or a pointer.  It is
-   *     used by stream implementations to store file descriptors or `FILE*'
-   *     pointers.
-   *
-   *   pathname ::
-   *     This field is completely ignored by FreeType.  However, it is often
-   *     useful during debugging to use it to store the stream's filename
-   *     (where available).
-   *
-   *   read ::
-   *     The stream's input function.
-   *
-   *   close ::
-   *     The stream's close function.
-   *
-   *   memory ::
-   *     The memory manager to use to preload frames.  This is set
-   *     internally by FreeType and shouldn't be touched by stream
-   *     implementations.
-   *
-   *   cursor ::
-   *     This field is set and used internally by FreeType when parsing
-   *     frames.
-   *
-   *   limit ::
-   *     This field is set and used internally by FreeType when parsing
-   *     frames.
-   *
-   */
-  typedef struct  FT_StreamRec_
-  {
-    unsigned char*       base;
-    unsigned long        size;
-    unsigned long        pos;
-
-    FT_StreamDesc        descriptor;
-    FT_StreamDesc        pathname;
-    FT_Stream_IoFunc     read;
-    FT_Stream_CloseFunc  close;
-
-    FT_Memory            memory;
-    unsigned char*       cursor;
-    unsigned char*       limit;
-
-  } FT_StreamRec;
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTSYSTEM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/config/ftconfig.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/config/ftconfig.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/config/ftconfig.h	(copie de travail)
@@ -1,598 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftconfig.h                                                             */
-/*                                                                         */
-/*    ANSI-specific configuration file (specification only).               */
-/*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2010-2011, 2013 by                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This header file contains a number of macro definitions that are used */
-  /* by the rest of the engine.  Most of the macros here are automatically */
-  /* determined at compile time, and you should not need to change it to   */
-  /* port FreeType, except to compile the library with a non-ANSI          */
-  /* compiler.                                                             */
-  /*                                                                       */
-  /* Note however that if some specific modifications are needed, we       */
-  /* advise you to place a modified copy in your build directory.          */
-  /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
-  /*                                                                       */
-  /* This ANSI version should stay in `include/freetype/config'.           */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
-
-#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
-#include FT_CONFIG_STANDARD_LIBRARY_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* These macros can be toggled to suit a specific system.  The current   */
-  /* ones are defaults used to compile FreeType in an ANSI C environment   */
-  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* There are systems (like the Texas Instruments 'C54x) where a `char' */
-  /* has 16 bits.  ANSI C says that sizeof(char) is always 1.  Since an  */
-  /* `int' has 16 bits also for this system, sizeof(int) gives 1 which   */
-  /* is probably unexpected.                                             */
-  /*                                                                     */
-  /* `CHAR_BIT' (defined in limits.h) gives the number of bits in a      */
-  /* `char' type.                                                        */
-
-#ifndef FT_CHAR_BIT
-#define FT_CHAR_BIT  CHAR_BIT
-#endif
-
-
-  /* The size of an `int' type.  */
-#if                                 FT_UINT_MAX == 0xFFFFUL
-#define FT_SIZEOF_INT  (16 / FT_CHAR_BIT)
-#elif                               FT_UINT_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_INT  (32 / FT_CHAR_BIT)
-#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_INT  (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `int' type!"
-#endif
-
-  /* The size of a `long' type.  A five-byte `long' (as used e.g. on the */
-  /* DM642) is recognized but avoided.                                   */
-#if                                  FT_ULONG_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
-#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_LONG  (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `long' type!"
-#endif
-
-
-  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
-  /* used -- this is only used to get rid of unpleasant compiler warnings */
-#ifndef FT_UNUSED
-#define FT_UNUSED( arg )  ( (arg) = (arg) )
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     AUTOMATIC CONFIGURATION MACROS                    */
-  /*                                                                       */
-  /* These macros are computed from the ones defined above.  Don't touch   */
-  /* their definition, unless you know precisely what you are doing.  No   */
-  /* porter should need to mess with them.                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Mac support                                                           */
-  /*                                                                       */
-  /*   This is the only necessary change, so it is defined here instead    */
-  /*   providing a new configuration file.                                 */
-  /*                                                                       */
-#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
-  /* no Carbon frameworks for 64bit 10.4.x */
-  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
-  /* so guess the system version by maximum errno before inclusion */
-#include <errno.h>
-#ifdef ECANCELED /* defined since 10.2 */
-#include "AvailabilityMacros.h"
-#endif
-#if defined( __LP64__ ) && \
-    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#undef FT_MACINTOSH
-#endif
-
-#elif defined( __SC__ ) || defined( __MRC__ )
-  /* Classic MacOS compilers */
-#include "ConditionalMacros.h"
-#if TARGET_OS_MAC
-#define FT_MACINTOSH 1
-#endif
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int16                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 16bit signed integer type.                         */
-  /*                                                                       */
-  typedef signed short  FT_Int16;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt16                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 16bit unsigned integer type.                       */
-  /*                                                                       */
-  typedef unsigned short  FT_UInt16;
-
-  /* */
-
-
-  /* this #if 0 ... #endif clause is for documentation purposes */
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int32                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 32bit signed integer type.  The size depends on    */
-  /*    the configuration.                                                 */
-  /*                                                                       */
-  typedef signed XXX  FT_Int32;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt32                                                          */
-  /*                                                                       */
-  /*    A typedef for a 32bit unsigned integer type.  The size depends on  */
-  /*    the configuration.                                                 */
-  /*                                                                       */
-  typedef unsigned XXX  FT_UInt32;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int64                                                           */
-  /*                                                                       */
-  /*    A typedef for a 64bit signed integer type.  The size depends on    */
-  /*    the configuration.  Only defined if there is real 64bit support;   */
-  /*    otherwise, it gets emulated with a structure (if necessary).       */
-  /*                                                                       */
-  typedef signed XXX  FT_Int64;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt64                                                          */
-  /*                                                                       */
-  /*    A typedef for a 64bit unsigned integer type.  The size depends on  */
-  /*    the configuration.  Only defined if there is real 64bit support;   */
-  /*    otherwise, it gets emulated with a structure (if necessary).       */
-  /*                                                                       */
-  typedef unsigned XXX  FT_UInt64;
-
-  /* */
-
-#endif
-
-#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
-
-  typedef signed int      FT_Int32;
-  typedef unsigned int    FT_UInt32;
-
-#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
-
-  typedef signed long     FT_Int32;
-  typedef unsigned long   FT_UInt32;
-
-#else
-#error "no 32bit type found -- please check your configuration files"
-#endif
-
-
-  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
-
-  typedef int            FT_Fast;
-  typedef unsigned int   FT_UFast;
-
-#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
-
-  typedef long           FT_Fast;
-  typedef unsigned long  FT_UFast;
-
-#endif
-
-
-  /* determine whether we have a 64-bit int type for platforms without */
-  /* Autoconf                                                          */
-#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
-
-  /* FT_LONG64 must be defined if a 64-bit type is available */
-#define FT_LONG64
-#define FT_INT64   long
-#define FT_UINT64  unsigned long
-
-#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64   __int64
-#define FT_UINT64  unsigned __int64
-
-#elif defined( __BORLANDC__ )  /* Borland C++ */
-
-  /* XXXX: We should probably check the value of __BORLANDC__ in order */
-  /*       to test the compiler version.                               */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64   __int64
-#define FT_UINT64  unsigned __int64
-
-#elif defined( __WATCOMC__ )   /* Watcom C++ */
-
-  /* Watcom doesn't provide 64-bit data types */
-
-#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
-
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#elif defined( __GNUC__ )
-
-  /* GCC provides the `long long' type */
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A 64-bit data type will create compilation problems if you compile    */
-  /* in strict ANSI mode.  To avoid them, we disable its use if __STDC__   */
-  /* is defined.  You can however ignore this rule by defining the         */
-  /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro.                     */
-  /*                                                                       */
-#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
-
-#ifdef __STDC__
-
-  /* undefine the 64-bit macros in strict ANSI compilation mode */
-#undef FT_LONG64
-#undef FT_INT64
-
-#endif /* __STDC__ */
-
-#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
-
-#ifdef FT_LONG64
-  typedef FT_INT64   FT_Int64;
-  typedef FT_UINT64  FT_UInt64;
-#endif
-
-
-#define FT_BEGIN_STMNT  do {
-#define FT_END_STMNT    } while ( 0 )
-#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
-
-
-#ifndef  FT_CONFIG_OPTION_NO_ASSEMBLER
-  /* Provide assembler fragments for performance-critical functions. */
-  /* These must be defined `static __inline__' with GCC.             */
-
-#if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
-
-  /* documentation is in freetype.h */
-
-  static __inline FT_Int32
-  FT_MulFix_arm( FT_Int32  a,
-                 FT_Int32  b )
-  {
-    register FT_Int32  t, t2;
-
-
-    __asm
-    {
-      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
-      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
-      add   a,  a,  #0x8000         /* a  += 0x8000 */
-      adds  t2, t2, a               /* t2 += a */
-      adc   t,  t,  #0              /* t  += carry */
-      mov   a,  t2, lsr #16         /* a   = t2 >> 16 */
-      orr   a,  a,  t,  lsl #16     /* a  |= t << 16 */
-    }
-    return a;
-  }
-
-#endif /* __CC_ARM || __ARMCC__ */
-
-
-#ifdef __GNUC__
-
-#if defined( __arm__ ) && !defined( __thumb__ )    && \
-    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
-
-  /* documentation is in freetype.h */
-
-  static __inline__ FT_Int32
-  FT_MulFix_arm( FT_Int32  a,
-                 FT_Int32  b )
-  {
-    register FT_Int32  t, t2;
-
-
-    __asm__ __volatile__ (
-      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
-      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
-      "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
-      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
-      "adc    %2, %2, #0\n\t"           /* %2 += carry */
-      "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
-      "orr    %0, %0, %2, lsl #16\n\t"  /* %0 |= %2 << 16 */
-      : "=r"(a), "=&r"(t2), "=&r"(t)
-      : "r"(a), "r"(b)
-      : "cc" );
-    return a;
-  }
-
-#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
-
-#if defined( __i386__ )
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
-
-  /* documentation is in freetype.h */
-
-  static __inline__ FT_Int32
-  FT_MulFix_i386( FT_Int32  a,
-                  FT_Int32  b )
-  {
-    register FT_Int32  result;
-
-
-    __asm__ __volatile__ (
-      "imul  %%edx\n"
-      "movl  %%edx, %%ecx\n"
-      "sarl  $31, %%ecx\n"
-      "addl  $0x8000, %%ecx\n"
-      "addl  %%ecx, %%eax\n"
-      "adcl  $0, %%edx\n"
-      "shrl  $16, %%eax\n"
-      "shll  $16, %%edx\n"
-      "addl  %%edx, %%eax\n"
-      : "=a"(result), "=d"(b)
-      : "a"(a), "d"(b)
-      : "%ecx", "cc" );
-    return result;
-  }
-
-#endif /* i386 */
-
-#endif /* __GNUC__ */
-
-
-#ifdef _MSC_VER /* Visual C++ */
-
-#ifdef _M_IX86
-
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
-
-  /* documentation is in freetype.h */
-
-  static __inline FT_Int32
-  FT_MulFix_i386( FT_Int32  a,
-                  FT_Int32  b )
-  {
-    register FT_Int32  result;
-
-    __asm
-    {
-      mov eax, a
-      mov edx, b
-      imul edx
-      mov ecx, edx
-      sar ecx, 31
-      add ecx, 8000h
-      add eax, ecx
-      adc edx, 0
-      shr eax, 16
-      shl edx, 16
-      add eax, edx
-      mov result, eax
-    }
-    return result;
-  }
-
-#endif /* _M_IX86 */
-
-#endif /* _MSC_VER */
-
-#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
-
-
-#ifdef FT_CONFIG_OPTION_INLINE_MULFIX
-#ifdef FT_MULFIX_ASSEMBLER
-#define FT_MULFIX_INLINED  FT_MULFIX_ASSEMBLER
-#endif
-#endif
-
-
-#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
-
-#define FT_LOCAL( x )      static  x
-#define FT_LOCAL_DEF( x )  static  x
-
-#else
-
-#ifdef __cplusplus
-#define FT_LOCAL( x )      extern "C"  x
-#define FT_LOCAL_DEF( x )  extern "C"  x
-#else
-#define FT_LOCAL( x )      extern  x
-#define FT_LOCAL_DEF( x )  x
-#endif
-
-#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
-
-
-#ifndef FT_BASE
-
-#ifdef __cplusplus
-#define FT_BASE( x )  extern "C"  x
-#else
-#define FT_BASE( x )  extern  x
-#endif
-
-#endif /* !FT_BASE */
-
-
-#ifndef FT_BASE_DEF
-
-#ifdef __cplusplus
-#define FT_BASE_DEF( x )  x
-#else
-#define FT_BASE_DEF( x )  x
-#endif
-
-#endif /* !FT_BASE_DEF */
-
-
-#ifndef FT_EXPORT
-
-#ifdef __cplusplus
-#define FT_EXPORT( x )  extern "C"  x
-#else
-#define FT_EXPORT( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT */
-
-
-#ifndef FT_EXPORT_DEF
-
-#ifdef __cplusplus
-#define FT_EXPORT_DEF( x )  extern "C"  x
-#else
-#define FT_EXPORT_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_DEF */
-
-
-#ifndef FT_EXPORT_VAR
-
-#ifdef __cplusplus
-#define FT_EXPORT_VAR( x )  extern "C"  x
-#else
-#define FT_EXPORT_VAR( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_VAR */
-
-  /* The following macros are needed to compile the library with a   */
-  /* C++ compiler and with 16bit compilers.                          */
-  /*                                                                 */
-
-  /* This is special.  Within C++, you must specify `extern "C"' for */
-  /* functions which are used via function pointers, and you also    */
-  /* must do that for structures which contain function pointers to  */
-  /* assure C linkage -- it's not possible to have (local) anonymous */
-  /* functions which are accessed by (global) function pointers.     */
-  /*                                                                 */
-  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
-  /* contains pointers to callback functions.                        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
-  /* that contains pointers to callback functions.                   */
-  /*                                                                 */
-  /*                                                                 */
-  /* Some 16bit compilers have to redefine these macros to insert    */
-  /* the infamous `_cdecl' or `__fastcall' declarations.             */
-  /*                                                                 */
-#ifndef FT_CALLBACK_DEF
-#ifdef __cplusplus
-#define FT_CALLBACK_DEF( x )  extern "C"  x
-#else
-#define FT_CALLBACK_DEF( x )  static  x
-#endif
-#endif /* FT_CALLBACK_DEF */
-
-#ifndef FT_CALLBACK_TABLE
-#ifdef __cplusplus
-#define FT_CALLBACK_TABLE      extern "C"
-#define FT_CALLBACK_TABLE_DEF  extern "C"
-#else
-#define FT_CALLBACK_TABLE      extern
-#define FT_CALLBACK_TABLE_DEF  /* nothing */
-#endif
-#endif /* FT_CALLBACK_TABLE */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTCONFIG_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/config/ftmodule.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/config/ftmodule.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/config/ftmodule.h	(copie de travail)
@@ -1,32 +0,0 @@
-/*
- *  This file registers the FreeType modules compiled into the library.
- *
- *  If you use GNU make, this file IS NOT USED!  Instead, it is created in
- *  the objects directory (normally `<topdir>/objs/') based on information
- *  from `<topdir>/modules.cfg'.
- *
- *  Please read `docs/INSTALL.ANY' and `docs/CUSTOMIZE' how to compile
- *  FreeType without GNU make.
- *
- */
-
-FT_USE_MODULE( FT_Module_Class, autofit_module_class )
-FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
-FT_USE_MODULE( FT_Module_Class, psaux_module_class )
-FT_USE_MODULE( FT_Module_Class, psnames_module_class )
-FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
-FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
-FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
-
-/* EOF */
Index: lib/3rdparty/freetype/include/freetype/config/ftheader.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/config/ftheader.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/config/ftheader.h	(copie de travail)
@@ -1,832 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftheader.h                                                             */
-/*                                                                         */
-/*    Build macros of the FreeType 2 library.                              */
-/*                                                                         */
-/*  Copyright 1996-2008, 2010, 2012, 2013 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-#ifndef __FT_HEADER_H__
-#define __FT_HEADER_H__
-
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_BEGIN_HEADER                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used in association with @FT_END_HEADER in header    */
-  /*    files to ensure that the declarations within are properly          */
-  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
-  /*    C++ compiler.                                                      */
-  /*                                                                       */
-#ifdef __cplusplus
-#define FT_BEGIN_HEADER  extern "C" {
-#else
-#define FT_BEGIN_HEADER  /* nothing */
-#endif
-
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_END_HEADER                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used in association with @FT_BEGIN_HEADER in header  */
-  /*    files to ensure that the declarations within are properly          */
-  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
-  /*    C++ compiler.                                                      */
-  /*                                                                       */
-#ifdef __cplusplus
-#define FT_END_HEADER  }
-#else
-#define FT_END_HEADER  /* nothing */
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Aliases for the FreeType 2 public and configuration files.            */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    header_file_macros                                                 */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Header File Macros                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Macro definitions used to #include specific header files.          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following macros are defined to the name of specific           */
-  /*    FreeType~2 header files.  They can be used directly in #include    */
-  /*    statements as in:                                                  */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #include FT_FREETYPE_H                                           */
-  /*      #include FT_MULTIPLE_MASTERS_H                                   */
-  /*      #include FT_GLYPH_H                                              */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    There are several reasons why we are now using macros to name      */
-  /*    public header files.  The first one is that such macros are not    */
-  /*    limited to the infamous 8.3~naming rule required by DOS (and       */
-  /*    `FT_MULTIPLE_MASTERS_H' is a lot more meaningful than `ftmm.h').   */
-  /*                                                                       */
-  /*    The second reason is that it allows for more flexibility in the    */
-  /*    way FreeType~2 is installed on a given system.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* configuration files */
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_CONFIG_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   FreeType~2 configuration data.
-   *
-   */
-#ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
-#endif
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_STANDARD_LIBRARY_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   FreeType~2 interface to the standard C library functions.
-   *
-   */
-#ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
-#endif
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_OPTIONS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   FreeType~2 project-specific configuration options.
-   *
-   */
-#ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
-#endif
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_MODULES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list of FreeType~2 modules that are statically linked to new library
-   *   instances in @FT_Init_FreeType.
-   *
-   */
-#ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
-#endif
-
-  /* */
-
-  /* public headers */
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_FREETYPE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   base FreeType~2 API.
-   *
-   */
-#define FT_FREETYPE_H  <freetype/freetype.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ERRORS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list of FreeType~2 error codes (and messages).
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_ERRORS_H  <freetype/fterrors.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MODULE_ERRORS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list of FreeType~2 module error offsets (and messages).
-   *
-   */
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SYSTEM_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 interface to low-level operations (i.e., memory management
-   *   and stream i/o).
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IMAGE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing type
-   *   definitions related to glyph images (i.e., bitmaps, outlines,
-   *   scan-converter parameters).
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_IMAGE_H  <freetype/ftimage.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TYPES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   basic data types defined by FreeType~2.
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_TYPES_H  <freetype/fttypes.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_LIST_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list management API of FreeType~2.
-   *
-   *   (Most applications will never need to include this file.)
-   *
-   */
-#define FT_LIST_H  <freetype/ftlist.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_OUTLINE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   scalable outline management API of FreeType~2.
-   *
-   */
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SIZES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API which manages multiple @FT_Size objects per face.
-   *
-   */
-#define FT_SIZES_H  <freetype/ftsizes.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MODULE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   module management API of FreeType~2.
-   *
-   */
-#define FT_MODULE_H  <freetype/ftmodapi.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_RENDER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   renderer module management API of FreeType~2.
-   *
-   */
-#define FT_RENDER_H  <freetype/ftrender.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_AUTOHINTER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   structures and macros related to the auto-hinting module.
-   *
-   */
-#define FT_AUTOHINTER_H  <freetype/ftautoh.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CFF_DRIVER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   structures and macros related to the CFF driver module.
-   *
-   */
-#define FT_CFF_DRIVER_H  <freetype/ftcffdrv.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_DRIVER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   structures and macros related to the TrueType driver module.
-   *
-   */
-#define FT_TRUETYPE_DRIVER_H  <freetype/ftttdrv.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TYPE1_TABLES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   types and API specific to the Type~1 format.
-   *
-   */
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_IDS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   enumeration values which identify name strings, languages, encodings,
-   *   etc.  This file really contains a _large_ set of constant macro
-   *   definitions, taken from the TrueType and OpenType specifications.
-   *
-   */
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_TABLES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   types and API specific to the TrueType (as well as OpenType) format.
-   *
-   */
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_TAGS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of TrueType four-byte `tags' which identify blocks in
-   *   SFNT-based font formats (i.e., TrueType and OpenType).
-   *
-   */
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BDF_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which accesses BDF-specific strings from a
-   *   face.
-   *
-   */
-#define FT_BDF_H  <freetype/ftbdf.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CID_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which access CID font information from a
-   *   face.
-   *
-   */
-#define FT_CID_H  <freetype/ftcid.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GZIP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports gzip-compressed files.
-   *
-   */
-#define FT_GZIP_H  <freetype/ftgzip.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_LZW_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports LZW-compressed files.
-   *
-   */
-#define FT_LZW_H  <freetype/ftlzw.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BZIP2_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports bzip2-compressed files.
-   *
-   */
-#define FT_BZIP2_H  <freetype/ftbzip2.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_WINFONTS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports Windows FNT files.
-   *
-   */
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GLYPH_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional glyph management component.
-   *
-   */
-#define FT_GLYPH_H  <freetype/ftglyph.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BITMAP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional bitmap conversion component.
-   *
-   */
-#define FT_BITMAP_H  <freetype/ftbitmap.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BBOX_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional exact bounding box computation routines.
-   *
-   */
-#define FT_BBOX_H  <freetype/ftbbox.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional FreeType~2 cache sub-system.
-   *
-   */
-#define FT_CACHE_H  <freetype/ftcache.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_IMAGE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   `glyph image' API of the FreeType~2 cache sub-system.
-   *
-   *   It is used to define a cache for @FT_Glyph elements.  You can also
-   *   use the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need to
-   *   store small glyph bitmaps, as it will use less memory.
-   *
-   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
-   *   glyph image-related cache declarations.
-   *
-   */
-#define FT_CACHE_IMAGE_H  FT_CACHE_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_SMALL_BITMAPS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   `small bitmaps' API of the FreeType~2 cache sub-system.
-   *
-   *   It is used to define a cache for small glyph bitmaps in a relatively
-   *   memory-efficient way.  You can also use the API defined in
-   *   @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images,
-   *   including scalable outlines.
-   *
-   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
-   *   small bitmaps-related cache declarations.
-   *
-   */
-#define FT_CACHE_SMALL_BITMAPS_H  FT_CACHE_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_CHARMAP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   `charmap' API of the FreeType~2 cache sub-system.
-   *
-   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
-   *   charmap-based cache declarations.
-   *
-   */
-#define FT_CACHE_CHARMAP_H  FT_CACHE_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MAC_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   Macintosh-specific FreeType~2 API.  The latter is used to access
-   *   fonts embedded in resource forks.
-   *
-   *   This header file must be explicitly included by client applications
-   *   compiled on the Mac (note that the base API still works though).
-   *
-   */
-#define FT_MAC_H  <freetype/ftmac.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MULTIPLE_MASTERS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional multiple-masters management API of FreeType~2.
-   *
-   */
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SFNT_NAMES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional FreeType~2 API which accesses embedded `name' strings in
-   *   SFNT-based font formats (i.e., TrueType and OpenType).
-   *
-   */
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_OPENTYPE_VALIDATE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional FreeType~2 API which validates OpenType tables (BASE, GDEF,
-   *   GPOS, GSUB, JSTF).
-   *
-   */
-#define FT_OPENTYPE_VALIDATE_H  <freetype/ftotval.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GX_VALIDATE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional FreeType~2 API which validates TrueTypeGX/AAT tables (feat,
-   *   mort, morx, bsln, just, kern, opbd, trak, prop).
-   *
-   */
-#define FT_GX_VALIDATE_H  <freetype/ftgxval.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_PFR_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which accesses PFR-specific data.
-   *
-   */
-#define FT_PFR_H  <freetype/ftpfr.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_STROKER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which provides functions to stroke outline paths.
-   */
-#define FT_STROKER_H  <freetype/ftstroke.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SYNTHESIS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs artificial obliquing and emboldening.
-   */
-#define FT_SYNTHESIS_H  <freetype/ftsynth.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_XFREE86_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which provides functions specific to the XFree86 and
-   *   X.Org X11 servers.
-   */
-#define FT_XFREE86_H  <freetype/ftxf86.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRIGONOMETRY_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs trigonometric computations (e.g.,
-   *   cosines and arc tangents).
-   */
-#define FT_TRIGONOMETRY_H  <freetype/fttrigon.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_LCD_FILTER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs color filtering for subpixel rendering.
-   */
-#define FT_LCD_FILTER_H  <freetype/ftlcdfil.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_UNPATENTED_HINTING_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs color filtering for subpixel rendering.
-   */
-#define FT_UNPATENTED_HINTING_H  <freetype/ttunpat.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_INCREMENTAL_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs color filtering for subpixel rendering.
-   */
-#define FT_INCREMENTAL_H  <freetype/ftincrem.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GASP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which returns entries from the TrueType GASP table.
-   */
-#define FT_GASP_H  <freetype/ftgasp.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ADVANCES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which returns individual and ranged glyph advances.
-   */
-#define FT_ADVANCES_H  <freetype/ftadvanc.h>
-
-
-  /* */
-
-#define FT_ERROR_DEFINITIONS_H  <freetype/fterrdef.h>
-
-
-  /* The internals of the cache sub-system are no longer exposed.  We */
-  /* default to FT_CACHE_H at the moment just in case, but we know of */
-  /* no rogue client that uses them.                                  */
-  /*                                                                  */
-#define FT_CACHE_MANAGER_H           <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MRU_H      <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MANAGER_H  <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_CACHE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_GLYPH_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_IMAGE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_SBITS_H    <freetype/ftcache.h>
-
-
-#define FT_INCREMENTAL_H          <freetype/ftincrem.h>
-
-#define FT_TRUETYPE_UNPATENTED_H  <freetype/ttunpat.h>
-
-
-  /*
-   * Include internal headers definitions from <freetype/internal/...>
-   * only when building the library.
-   */
-#ifdef FT2_BUILD_LIBRARY
-#define  FT_INTERNAL_INTERNAL_H  <freetype/internal/internal.h>
-#include FT_INTERNAL_INTERNAL_H
-#endif /* FT2_BUILD_LIBRARY */
-
-
-#endif /* __FT2_BUILD_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/config/ftoption.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/config/ftoption.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/config/ftoption.h	(copie de travail)
@@ -1,833 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftoption.h                                                             */
-/*                                                                         */
-/*    User-selectable configuration macros (specification only).           */
-/*                                                                         */
-/*  Copyright 1996-2013 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTOPTION_H__
-#define __FTOPTION_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                 USER-SELECTABLE CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* This file contains the default configuration macro definitions for    */
-  /* a standard build of the FreeType library.  There are three ways to    */
-  /* use this file to build project-specific versions of the library:      */
-  /*                                                                       */
-  /*  - You can modify this file by hand, but this is not recommended in   */
-  /*    cases where you would like to build several versions of the        */
-  /*    library from a single source directory.                            */
-  /*                                                                       */
-  /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
-  /*                                                                       */
-  /*    The default FreeType Makefiles and Jamfiles use the build          */
-  /*    directory `builds/<system>' by default, but you can easily change  */
-  /*    that for your own projects.                                        */
-  /*                                                                       */
-  /*  - Copy the file <ft2build.h> to `$BUILD/ft2build.h' and modify it    */
-  /*    slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to       */
-  /*    locate this file during the build.  For example,                   */
-  /*                                                                       */
-  /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
-  /*                                                                       */
-  /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
-  /*    definitions.                                                       */
-  /*                                                                       */
-  /*    Note also that you can similarly pre-define the macro              */
-  /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
-  /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
-  /*                                                                       */
-  /*  We highly recommend using the third method whenever possible.        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /**** G E N E R A L   F R E E T Y P E   2   C O N F I G U R A T I O N ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Uncomment the line below if you want to activate sub-pixel rendering  */
-  /* (a.k.a. LCD rendering, or ClearType) in this build of the library.    */
-  /*                                                                       */
-  /* Note that this feature is covered by several Microsoft patents        */
-  /* and should not be activated in any default build of the library.      */
-  /*                                                                       */
-  /* This macro has no impact on the FreeType API, only on its             */
-  /* _implementation_.  For example, using FT_RENDER_MODE_LCD when calling */
-  /* FT_Render_Glyph still generates a bitmap that is 3 times wider than   */
-  /* the original size in case this macro isn't defined; however, each     */
-  /* triplet of subpixels has R=G=B.                                       */
-  /*                                                                       */
-  /* This is done to allow FreeType clients to run unmodified, forcing     */
-  /* them to display normal gray-level anti-aliased glyphs.                */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
-  /* by FreeType to speed up some computations.  However, this will create */
-  /* some problems when compiling the library in strict ANSI mode.         */
-  /*                                                                       */
-  /* For this reason, the use of 64-bit integers is normally disabled when */
-  /* the __STDC__ macro is defined.  You can however disable this by       */
-  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
-  /*                                                                       */
-  /* For most compilers, this will only create compilation warnings when   */
-  /* building the library.                                                 */
-  /*                                                                       */
-  /* ObNote: The compiler-specific 64-bit integers are detected in the     */
-  /*         file `ftconfig.h' either statically or through the            */
-  /*         `configure' script on supported platforms.                    */
-  /*                                                                       */
-#undef FT_CONFIG_OPTION_FORCE_INT64
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* If this macro is defined, do not try to use an assembler version of   */
-  /* performance-critical functions (e.g. FT_MulFix).  You should only do  */
-  /* that to verify that the assembler function works properly, or to      */
-  /* execute benchmark tests of the various implementations.               */
-/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* If this macro is defined, try to use an inlined assembler version of  */
-  /* the `FT_MulFix' function, which is a `hotspot' when loading and       */
-  /* hinting glyphs, and which should be executed as fast as possible.     */
-  /*                                                                       */
-  /* Note that if your compiler or CPU is not supported, this will default */
-  /* to the standard and portable implementation found in `ftcalc.c'.      */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_INLINE_MULFIX
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* LZW-compressed file support.                                          */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   `compress' program.  This is mostly used to parse many of the PCF   */
-  /*   files that come with various X11 distributions.  The implementation */
-  /*   uses NetBSD's `zopen' to partially uncompress the file on the fly   */
-  /*   (see src/lzw/ftgzip.c).                                             */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_USE_LZW
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Gzip-compressed file support.                                         */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   `gzip' program.  This is mostly used to parse many of the PCF files */
-  /*   that come with XFree86.  The implementation uses `zlib' to          */
-  /*   partially uncompress the file on the fly (see src/gzip/ftgzip.c).   */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.  See also   */
-  /*   the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below.                       */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_USE_ZLIB
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* ZLib library selection                                                */
-  /*                                                                       */
-  /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
-  /*   It allows FreeType's `ftgzip' component to link to the system's     */
-  /*   installation of the ZLib library.  This is useful on systems like   */
-  /*   Unix or VMS where it generally is already available.                */
-  /*                                                                       */
-  /*   If you let it undefined, the component will use its own copy        */
-  /*   of the zlib sources instead.  These have been modified to be        */
-  /*   included directly within the component and *not* export external    */
-  /*   function names.  This allows you to link any program with FreeType  */
-  /*   _and_ ZLib without linking conflicts.                               */
-  /*                                                                       */
-  /*   Do not #undef this macro here since the build system might define   */
-  /*   it for certain configurations only.                                 */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Bzip2-compressed file support.                                        */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   `bzip2' program.  This is mostly used to parse many of the PCF      */
-  /*   files that come with XFree86.  The implementation uses `libbz2' to  */
-  /*   partially uncompress the file on the fly (see src/bzip2/ftbzip2.c). */
-  /*   Contrary to gzip, bzip2 currently is not included and need to use   */
-  /*   the system available bzip2 implementation.                          */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_USE_BZIP2 */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define to disable the use of file stream functions and types, FILE,   */
-  /* fopen() etc.  Enables the use of smaller system libraries on embedded */
-  /* systems that have multiple system libraries, some with or without     */
-  /* file stream support, in the cases where file stream support is not    */
-  /* necessary such as memory loading of font files.                       */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  PNG bitmap support.                                                  */
-  /*                                                                       */
-  /*   FreeType now handles loading color bitmap glyphs in the PNG format. */
-  /*   This requires help from the external libpng library.  Uncompressed  */
-  /*   color bitmaps do not need any external libraries and will be        */
-  /*   supported regardless of this configuration.                         */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_USE_PNG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* DLL export compilation                                                */
-  /*                                                                       */
-  /*   When compiling FreeType as a DLL, some systems/compilers need a     */
-  /*   special keyword in front OR after the return type of function       */
-  /*   declarations.                                                       */
-  /*                                                                       */
-  /*   Two macros are used within the FreeType source code to define       */
-  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
-  /*                                                                       */
-  /*     FT_EXPORT( return_type )                                          */
-  /*                                                                       */
-  /*       is used in a function declaration, as in                        */
-  /*                                                                       */
-  /*         FT_EXPORT( FT_Error )                                         */
-  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
-  /*                                                                       */
-  /*                                                                       */
-  /*     FT_EXPORT_DEF( return_type )                                      */
-  /*                                                                       */
-  /*       is used in a function definition, as in                         */
-  /*                                                                       */
-  /*         FT_EXPORT_DEF( FT_Error )                                     */
-  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
-  /*         {                                                             */
-  /*           ... some code ...                                           */
-  /*           return FT_Err_Ok;                                           */
-  /*         }                                                             */
-  /*                                                                       */
-  /*   You can provide your own implementation of FT_EXPORT and            */
-  /*   FT_EXPORT_DEF here if you want.  If you leave them undefined, they  */
-  /*   will be later automatically defined as `extern return_type' to      */
-  /*   allow normal compilation.                                           */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_EXPORT(x)      extern x */
-/* #define FT_EXPORT_DEF(x)  x */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Glyph Postscript Names handling                                       */
-  /*                                                                       */
-  /*   By default, FreeType 2 is compiled with the `psnames' module.  This */
-  /*   module is in charge of converting a glyph name string into a        */
-  /*   Unicode value, or return a Macintosh standard glyph name for the    */
-  /*   use with the TrueType `post' table.                                 */
-  /*                                                                       */
-  /*   Undefine this macro if you do not want `psnames' compiled in your   */
-  /*   build of FreeType.  This has the following effects:                 */
-  /*                                                                       */
-  /*   - The TrueType driver will provide its own set of glyph names,      */
-  /*     if you build it to support postscript names in the TrueType       */
-  /*     `post' table.                                                     */
-  /*                                                                       */
-  /*   - The Type 1 driver will not be able to synthesize a Unicode        */
-  /*     charmap out of the glyphs found in the fonts.                     */
-  /*                                                                       */
-  /*   You would normally undefine this configuration macro when building  */
-  /*   a version of FreeType that doesn't contain a Type 1 or CFF driver.  */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Postscript Names to Unicode Values support                            */
-  /*                                                                       */
-  /*   By default, FreeType 2 is built with the `PSNames' module compiled  */
-  /*   in.  Among other things, the module is used to convert a glyph name */
-  /*   into a Unicode value.  This is especially useful in order to        */
-  /*   synthesize on the fly a Unicode charmap from the CFF/Type 1 driver  */
-  /*   through a big table named the `Adobe Glyph List' (AGL).             */
-  /*                                                                       */
-  /*   Undefine this macro if you do not want the Adobe Glyph List         */
-  /*   compiled in your `PSNames' module.  The Type 1 driver will not be   */
-  /*   able to synthesize a Unicode charmap out of the glyphs found in the */
-  /*   fonts.                                                              */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Support for Mac fonts                                                 */
-  /*                                                                       */
-  /*   Define this macro if you want support for outline fonts in Mac      */
-  /*   format (mac dfont, mac resource, macbinary containing a mac         */
-  /*   resource) on non-Mac platforms.                                     */
-  /*                                                                       */
-  /*   Note that the `FOND' resource isn't checked.                        */
-  /*                                                                       */
-/*#define FT_CONFIG_OPTION_MAC_FONTS */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Guessing methods to access embedded resource forks                    */
-  /*                                                                       */
-  /*   Enable extra Mac fonts support on non-Mac platforms (e.g.           */
-  /*   GNU/Linux).                                                         */
-  /*                                                                       */
-  /*   Resource forks which include fonts data are stored sometimes in     */
-  /*   locations which users or developers don't expected.  In some cases, */
-  /*   resource forks start with some offset from the head of a file.  In  */
-  /*   other cases, the actual resource fork is stored in file different   */
-  /*   from what the user specifies.  If this option is activated,         */
-  /*   FreeType tries to guess whether such offsets or different file      */
-  /*   names must be used.                                                 */
-  /*                                                                       */
-  /*   Note that normal, direct access of resource forks is controlled via */
-  /*   the FT_CONFIG_OPTION_MAC_FONTS option.                              */
-  /*                                                                       */
-#ifdef FT_CONFIG_OPTION_MAC_FONTS
-#define FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Allow the use of FT_Incremental_Interface to load typefaces that      */
-  /* contain no glyph data, but supply it via a callback function.         */
-  /* This is required by clients supporting document formats which         */
-  /* supply font data incrementally as the document is parsed, such        */
-  /* as the Ghostscript interpreter for the PostScript language.           */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_INCREMENTAL
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The size in bytes of the render pool used by the scan-line converter  */
-  /* to do all of its work.                                                */
-  /*                                                                       */
-  /* This must be greater than 4KByte if you use FreeType to rasterize     */
-  /* glyphs; otherwise, you may set it to zero to avoid unnecessary        */
-  /* allocation of the render pool.                                        */
-  /*                                                                       */
-#define FT_RENDER_POOL_SIZE  16384L
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* FT_MAX_MODULES                                                        */
-  /*                                                                       */
-  /*   The maximum number of modules that can be registered in a single    */
-  /*   FreeType library object.  32 is the default.                        */
-  /*                                                                       */
-#define FT_MAX_MODULES  32
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Debug level                                                           */
-  /*                                                                       */
-  /*   FreeType can be compiled in debug or trace mode.  In debug mode,    */
-  /*   errors are reported through the `ftdebug' component.  In trace      */
-  /*   mode, additional messages are sent to the standard output during    */
-  /*   execution.                                                          */
-  /*                                                                       */
-  /*   Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode.     */
-  /*   Define FT_DEBUG_LEVEL_TRACE to build it in trace mode.              */
-  /*                                                                       */
-  /*   Don't define any of these macros to compile in `release' mode!      */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Autofitter debugging                                                  */
-  /*                                                                       */
-  /*   If FT_DEBUG_AUTOFIT is defined, FreeType provides some means to     */
-  /*   control the autofitter behaviour for debugging purposes with global */
-  /*   boolean variables (consequently, you should *never* enable this     */
-  /*   while compiling in `release' mode):                                 */
-  /*                                                                       */
-  /*     _af_debug_disable_horz_hints                                      */
-  /*     _af_debug_disable_vert_hints                                      */
-  /*     _af_debug_disable_blue_hints                                      */
-  /*                                                                       */
-  /*   Additionally, the following functions provide dumps of various      */
-  /*   internal autofit structures to stdout (using `printf'):             */
-  /*                                                                       */
-  /*     af_glyph_hints_dump_points                                        */
-  /*     af_glyph_hints_dump_segments                                      */
-  /*     af_glyph_hints_dump_edges                                         */
-  /*                                                                       */
-  /*   As an argument, they use another global variable:                   */
-  /*                                                                       */
-  /*     _af_debug_hints                                                   */
-  /*                                                                       */
-  /*   Please have a look at the `ftgrid' demo program to see how those    */
-  /*   variables and macros should be used.                                */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_DEBUG_AUTOFIT */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Memory Debugging                                                      */
-  /*                                                                       */
-  /*   FreeType now comes with an integrated memory debugger that is       */
-  /*   capable of detecting simple errors like memory leaks or double      */
-  /*   deletes.  To compile it within your build of the library, you       */
-  /*   should define FT_DEBUG_MEMORY here.                                 */
-  /*                                                                       */
-  /*   Note that the memory debugger is only activated at runtime when     */
-  /*   when the _environment_ variable `FT2_DEBUG_MEMORY' is defined also! */
-  /*                                                                       */
-  /*   Do not #undef this macro here since the build system might define   */
-  /*   it for certain configurations only.                                 */
-  /*                                                                       */
-/* #define FT_DEBUG_MEMORY */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Module errors                                                         */
-  /*                                                                       */
-  /*   If this macro is set (which is _not_ the default), the higher byte  */
-  /*   of an error code gives the module in which the error has occurred,  */
-  /*   while the lower byte is the real error code.                        */
-  /*                                                                       */
-  /*   Setting this macro makes sense for debugging purposes only, since   */
-  /*   it would break source compatibility of certain programs that use    */
-  /*   FreeType 2.                                                         */
-  /*                                                                       */
-  /*   More details can be found in the files ftmoderr.h and fterrors.h.   */
-  /*                                                                       */
-#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Position Independent Code                                             */
-  /*                                                                       */
-  /*   If this macro is set (which is _not_ the default), FreeType2 will   */
-  /*   avoid creating constants that require address fixups.  Instead the  */
-  /*   constants will be moved into a struct and additional intialization  */
-  /*   code will be used.                                                  */
-  /*                                                                       */
-  /*   Setting this macro is needed for systems that prohibit address      */
-  /*   fixups, such as BREW.                                               */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_PIC */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****        S F N T   D R I V E R    C O N F I G U R A T I O N       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support       */
-  /* embedded bitmaps in all formats using the SFNT module (namely         */
-  /* TrueType & OpenType).                                                 */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to    */
-  /* load and enumerate the glyph Postscript names in a TrueType or        */
-  /* OpenType file.                                                        */
-  /*                                                                       */
-  /* Note that when you do not compile the `PSNames' module by undefining  */
-  /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will   */
-  /* contain additional code used to read the PS Names table from a font.  */
-  /*                                                                       */
-  /* (By default, the module uses `PSNames' to extract glyph names.)       */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to       */
-  /* access the internal name table in a SFNT-based format like TrueType   */
-  /* or OpenType.  The name table contains various strings used to         */
-  /* describe the font, like family name, copyright, version, etc.  It     */
-  /* does not contain any glyph name though.                               */
-  /*                                                                       */
-  /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftsnames.h'.                                                */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_SFNT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* TrueType CMap support                                                 */
-  /*                                                                       */
-  /*   Here you can fine-tune which TrueType CMap table format shall be    */
-  /*   supported.                                                          */
-#define TT_CONFIG_CMAP_FORMAT_0
-#define TT_CONFIG_CMAP_FORMAT_2
-#define TT_CONFIG_CMAP_FORMAT_4
-#define TT_CONFIG_CMAP_FORMAT_6
-#define TT_CONFIG_CMAP_FORMAT_8
-#define TT_CONFIG_CMAP_FORMAT_10
-#define TT_CONFIG_CMAP_FORMAT_12
-#define TT_CONFIG_CMAP_FORMAT_13
-#define TT_CONFIG_CMAP_FORMAT_14
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****    T R U E T Y P E   D R I V E R    C O N F I G U R A T I O N   ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile   */
-  /* a bytecode interpreter in the TrueType driver.                        */
-  /*                                                                       */
-  /* By undefining this, you will only compile the code necessary to load  */
-  /* TrueType glyphs without hinting.                                      */
-  /*                                                                       */
-  /*   Do not #undef this macro here, since the build system might         */
-  /*   define it for certain configurations only.                          */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile       */
-  /* EXPERIMENTAL subpixel hinting support into the TrueType driver.  This */
-  /* replaces the native TrueType hinting mechanism when anything but      */
-  /* FT_RENDER_MODE_MONO is requested.                                     */
-  /*                                                                       */
-  /* Enabling this causes the TrueType driver to ignore instructions under */
-  /* certain conditions.  This is done in accordance with the guide here,  */
-  /* with some minor differences:                                          */
-  /*                                                                       */
-  /*  http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
-  /*                                                                       */
-  /* By undefining this, you only compile the code necessary to hint       */
-  /* TrueType glyphs with native TT hinting.                               */
-  /*                                                                       */
-  /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
-  /*   defined.                                                            */
-  /*                                                                       */
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
-  /* of the TrueType bytecode interpreter is used that doesn't implement   */
-  /* any of the patented opcodes and algorithms.  The patents related to   */
-  /* TrueType hinting have expired worldwide since May 2010; this option   */
-  /* is now deprecated.                                                    */
-  /*                                                                       */
-  /* Note that the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored*  */
-  /* if you define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words,  */
-  /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or                */
-  /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time.    */
-  /*                                                                       */
-  /* This macro is only useful for a small number of font files (mostly    */
-  /* for Asian scripts) that require bytecode interpretation to properly   */
-  /* load glyphs.  For all other fonts, this produces unpleasant results,  */
-  /* thus the unpatented interpreter is never used to load glyphs from     */
-  /* TrueType fonts unless one of the following two options is used.       */
-  /*                                                                       */
-  /*   - The unpatented interpreter is explicitly activated by the user    */
-  /*     through the FT_PARAM_TAG_UNPATENTED_HINTING parameter tag         */
-  /*     when opening the FT_Face.                                         */
-  /*                                                                       */
-  /*   - FreeType detects that the FT_Face corresponds to one of the       */
-  /*     `trick' fonts (e.g., `Mingliu') it knows about.  The font engine  */
-  /*     contains a hard-coded list of font names and other matching       */
-  /*     parameters (see function `tt_face_init' in file                   */
-  /*     `src/truetype/ttobjs.c').                                         */
-  /*                                                                       */
-  /* Here a sample code snippet for using FT_PARAM_TAG_UNPATENTED_HINTING. */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     FT_Parameter  parameter;                                          */
-  /*     FT_Open_Args  open_args;                                          */
-  /*                                                                       */
-  /*                                                                       */
-  /*     parameter.tag = FT_PARAM_TAG_UNPATENTED_HINTING;                  */
-  /*                                                                       */
-  /*     open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;         */
-  /*     open_args.pathname   = my_font_pathname;                          */
-  /*     open_args.num_params = 1;                                         */
-  /*     open_args.params     = &parameter;                                */
-  /*                                                                       */
-  /*     error = FT_Open_Face( library, &open_args, index, &face );        */
-  /*     ...                                                               */
-  /*   }                                                                   */
-  /*                                                                       */
-/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType    */
-  /* bytecode interpreter with a huge switch statement, rather than a call */
-  /* table.  This results in smaller and faster code for a number of       */
-  /* architectures.                                                        */
-  /*                                                                       */
-  /* Note however that on some compiler/processor combinations, undefining */
-  /* this macro will generate faster, though larger, code.                 */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the        */
-  /* TrueType glyph loader to use Apple's definition of how to handle      */
-  /* component offsets in composite glyphs.                                */
-  /*                                                                       */
-  /* Apple and MS disagree on the default behavior of component offsets    */
-  /* in composites.  Apple says that they should be scaled by the scaling  */
-  /* factors in the transformation matrix (roughly, it's more complex)     */
-  /* while MS says they should not.  OpenType defines two bits in the      */
-  /* composite flags array which can be used to disambiguate, but old      */
-  /* fonts will not have them.                                             */
-  /*                                                                       */
-  /*   http://www.microsoft.com/typography/otspec/glyf.htm                 */
-  /*   http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html                 */
-  /*                                                                       */
-#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_GX_VAR_SUPPORT if you want to include         */
-  /* support for Apple's distortable font technology (fvar, gvar, cvar,    */
-  /* and avar tables).  This has many similarities to Type 1 Multiple      */
-  /* Masters support.                                                      */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_BDF if you want to include support for        */
-  /* an embedded `BDF ' table within SFNT-based bitmap formats.            */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_BDF
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_DICT_DEPTH is the maximum depth of nest dictionaries and       */
-  /* arrays in the Type 1 stream (see t1load.c).  A minimum of 4 is        */
-  /* required.                                                             */
-  /*                                                                       */
-#define T1_MAX_DICT_DEPTH  5
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
-  /* calls during glyph loading.                                           */
-  /*                                                                       */
-#define T1_MAX_SUBRS_CALLS  16
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
-  /* minimum of 16 is required.                                            */
-  /*                                                                       */
-  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
-  /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  256
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define this configuration macro if you want to prevent the            */
-  /* compilation of `t1afm', which is in charge of reading Type 1 AFM      */
-  /* files into an existing face.  Note that if set, the T1 driver will be */
-  /* unable to produce kerning distances.                                  */
-  /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_AFM
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define this configuration macro if you want to prevent the            */
-  /* compilation of the Multiple Masters font support in the Type 1        */
-  /* driver.                                                               */
-  /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****         C F F   D R I V E R    C O N F I G U R A T I O N        ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF       */
-  /* engine gets compiled into FreeType.  If defined, it is possible to    */
-  /* switch between the two engines using the `hinting-engine' property of */
-  /* the cff driver module.                                                */
-  /*                                                                       */
-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Compile autofit module with CJK (Chinese, Japanese, Korean) script    */
-  /* support.                                                              */
-  /*                                                                       */
-#define AF_CONFIG_OPTION_CJK
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Compile autofit module with Indic script support.                     */
-  /*                                                                       */
-#define AF_CONFIG_OPTION_INDIC
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Compile autofit module with warp hinting.  The idea of the warping    */
-  /* code is to slightly scale and shift a glyph within a single dimension */
-  /* so that as much of its segments are aligned (more or less) on the     */
-  /* grid.  To find out the optimal scaling and shifting value, various    */
-  /* parameter combinations are tried and scored.                          */
-  /*                                                                       */
-  /* This experimental option is only active if the render mode is         */
-  /* FT_RENDER_MODE_LIGHT.                                                 */
-  /*                                                                       */
-/* #define AF_CONFIG_OPTION_USE_WARPER */
-
-  /* */
-
-
-  /*
-   *  This macro is obsolete.  Support has been removed in FreeType
-   *  version 2.5.
-   */
-/* #define FT_CONFIG_OPTION_OLD_INTERNALS */
-
-
-  /*
-   * This macro is defined if either unpatented or native TrueType
-   * hinting is requested by the definitions above.
-   */
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-#define  TT_USE_BYTECODE_INTERPRETER
-#undef   TT_CONFIG_OPTION_UNPATENTED_HINTING
-#elif defined TT_CONFIG_OPTION_UNPATENTED_HINTING
-#define  TT_USE_BYTECODE_INTERPRETER
-#endif
-
-FT_END_HEADER
-
-
-#endif /* __FTOPTION_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/config/ftstdlib.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/config/ftstdlib.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/config/ftstdlib.h	(copie de travail)
@@ -1,174 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstdlib.h                                                             */
-/*                                                                         */
-/*    ANSI-specific library and header configuration file (specification   */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 2002-2007, 2009, 2011-2012 by                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to group all #includes to the ANSI C library that   */
-  /* FreeType normally requires.  It also defines macros to rename the     */
-  /* standard functions within the FreeType source code.                   */
-  /*                                                                       */
-  /* Load a file which defines __FTSTDLIB_H__ before this one to override  */
-  /* it.                                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTSTDLIB_H__
-#define __FTSTDLIB_H__
-
-
-#include <stddef.h>
-
-#define ft_ptrdiff_t  ptrdiff_t
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                           integer limits                           */
-  /*                                                                    */
-  /* UINT_MAX and ULONG_MAX are used to automatically compute the size  */
-  /* of `int' and `long' in bytes at compile-time.  So far, this works  */
-  /* for all platforms the library has been tested on.                  */
-  /*                                                                    */
-  /* Note that on the extremely rare platforms that do not provide      */
-  /* integer types that are _exactly_ 16 and 32 bits wide (e.g. some    */
-  /* old Crays where `int' is 36 bits), we do not make any guarantee    */
-  /* about the correct behaviour of FT2 with all fonts.                 */
-  /*                                                                    */
-  /* In these case, `ftconfig.h' will refuse to compile anyway with a   */
-  /* message like `couldn't find 32-bit type' or something similar.     */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <limits.h>
-
-#define FT_CHAR_BIT    CHAR_BIT
-#define FT_USHORT_MAX  USHRT_MAX
-#define FT_INT_MAX     INT_MAX
-#define FT_INT_MIN     INT_MIN
-#define FT_UINT_MAX    UINT_MAX
-#define FT_ULONG_MAX   ULONG_MAX
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                 character and string processing                    */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <string.h>
-
-#define ft_memchr   memchr
-#define ft_memcmp   memcmp
-#define ft_memcpy   memcpy
-#define ft_memmove  memmove
-#define ft_memset   memset
-#define ft_strcat   strcat
-#define ft_strcmp   strcmp
-#define ft_strcpy   strcpy
-#define ft_strlen   strlen
-#define ft_strncmp  strncmp
-#define ft_strncpy  strncpy
-#define ft_strrchr  strrchr
-#define ft_strstr   strstr
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                           file handling                            */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <stdio.h>
-
-#define FT_FILE     FILE
-#define ft_fclose   fclose
-#define ft_fopen    fopen
-#define ft_fread    fread
-#define ft_fseek    fseek
-#define ft_ftell    ftell
-#define ft_sprintf  sprintf
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                             sorting                                */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <stdlib.h>
-
-#define ft_qsort  qsort
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                        memory allocation                           */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#define ft_scalloc   calloc
-#define ft_sfree     free
-#define ft_smalloc   malloc
-#define ft_srealloc  realloc
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                          miscellaneous                             */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#define ft_atol   atol
-#define ft_labs   labs
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                         execution control                          */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <setjmp.h>
-
-#define ft_jmp_buf     jmp_buf  /* note: this cannot be a typedef since */
-                                /*       jmp_buf is defined as a macro  */
-                                /*       on certain platforms           */
-
-#define ft_longjmp     longjmp
-#define ft_setjmp( b ) setjmp( *(ft_jmp_buf*) &(b) ) /* same thing here */
-
-
-  /* the following is only used for debugging purposes, i.e., if */
-  /* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined    */
-
-#include <stdarg.h>
-
-
-#endif /* __FTSTDLIB_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftotval.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftotval.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftotval.h	(copie de travail)
@@ -1,203 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftotval.h                                                              */
-/*                                                                         */
-/*    FreeType API for validating OpenType tables (specification).         */
-/*                                                                         */
-/*  Copyright 2004, 2005, 2006, 2007 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/*                                                                         */
-/* Warning: This module might be moved to a different library in the       */
-/*          future to avoid a tight dependency between FreeType and the    */
-/*          OpenType specification.                                        */
-/*                                                                         */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTOTVAL_H__
-#define __FTOTVAL_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    ot_validation                                                      */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    OpenType Validation                                                */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    An API to validate OpenType tables.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of functions to validate     */
-  /*    some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_VALIDATE_OTXXX
-  *
-  * @description:
-  *    A list of bit-field constants used with @FT_OpenType_Validate to
-  *    indicate which OpenType tables should be validated.
-  *
-  * @values:
-  *    FT_VALIDATE_BASE ::
-  *      Validate BASE table.
-  *
-  *    FT_VALIDATE_GDEF ::
-  *      Validate GDEF table.
-  *
-  *    FT_VALIDATE_GPOS ::
-  *      Validate GPOS table.
-  *
-  *    FT_VALIDATE_GSUB ::
-  *      Validate GSUB table.
-  *
-  *    FT_VALIDATE_JSTF ::
-  *      Validate JSTF table.
-  *
-  *    FT_VALIDATE_MATH ::
-  *      Validate MATH table.
-  *
-  *    FT_VALIDATE_OT ::
-  *      Validate all OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).
-  *
-  */
-#define FT_VALIDATE_BASE  0x0100
-#define FT_VALIDATE_GDEF  0x0200
-#define FT_VALIDATE_GPOS  0x0400
-#define FT_VALIDATE_GSUB  0x0800
-#define FT_VALIDATE_JSTF  0x1000
-#define FT_VALIDATE_MATH  0x2000
-
-#define FT_VALIDATE_OT  FT_VALIDATE_BASE | \
-                        FT_VALIDATE_GDEF | \
-                        FT_VALIDATE_GPOS | \
-                        FT_VALIDATE_GSUB | \
-                        FT_VALIDATE_JSTF | \
-                        FT_VALIDATE_MATH
-
-  /* */
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_OpenType_Validate
-  *
-  * @description:
-  *    Validate various OpenType tables to assure that all offsets and
-  *    indices are valid.  The idea is that a higher-level library which
-  *    actually does the text layout can access those tables without
-  *    error checking (which can be quite time consuming).
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    validation_flags ::
-  *       A bit field which specifies the tables to be validated.  See
-  *       @FT_VALIDATE_OTXXX for possible values.
-  *
-  * @output:
-  *    BASE_table ::
-  *       A pointer to the BASE table.
-  *
-  *    GDEF_table ::
-  *       A pointer to the GDEF table.
-  *
-  *    GPOS_table ::
-  *       A pointer to the GPOS table.
-  *
-  *    GSUB_table ::
-  *       A pointer to the GSUB table.
-  *
-  *    JSTF_table ::
-  *       A pointer to the JSTF table.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function only works with OpenType fonts, returning an error
-  *   otherwise.
-  *
-  *   After use, the application should deallocate the five tables with
-  *   @FT_OpenType_Free.  A NULL value indicates that the table either
-  *   doesn't exist in the font, or the application hasn't asked for
-  *   validation.
-  */
-  FT_EXPORT( FT_Error )
-  FT_OpenType_Validate( FT_Face    face,
-                        FT_UInt    validation_flags,
-                        FT_Bytes  *BASE_table,
-                        FT_Bytes  *GDEF_table,
-                        FT_Bytes  *GPOS_table,
-                        FT_Bytes  *GSUB_table,
-                        FT_Bytes  *JSTF_table );
-
-  /* */
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_OpenType_Free
-  *
-  * @description:
-  *    Free the buffer allocated by OpenType validator.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    table ::
-  *       The pointer to the buffer that is allocated by
-  *       @FT_OpenType_Validate.
-  *
-  * @note:
-  *   This function must be used to free the buffer allocated by
-  *   @FT_OpenType_Validate only.
-  */
-  FT_EXPORT( void )
-  FT_OpenType_Free( FT_Face   face,
-                    FT_Bytes  table );
-
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTOTVAL_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftpfr.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftpfr.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftpfr.h	(copie de travail)
@@ -1,172 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftpfr.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing PFR-specific data (specification only).   */
-/*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2008, 2009 by                        */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTPFR_H__
-#define __FTPFR_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    pfr_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    PFR Fonts                                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    PFR/TrueDoc specific API.                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of PFR-specific functions.   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Metrics
-  *
-  * @description:
-  *    Return the outline and metrics resolutions of a given PFR face.
-  *
-  * @input:
-  *    face :: Handle to the input face.  It can be a non-PFR face.
-  *
-  * @output:
-  *    aoutline_resolution ::
-  *      Outline resolution.  This is equivalent to `face->units_per_EM'
-  *      for non-PFR fonts.  Optional (parameter can be NULL).
-  *
-  *    ametrics_resolution ::
-  *      Metrics resolution.  This is equivalent to `outline_resolution'
-  *      for non-PFR fonts.  Optional (parameter can be NULL).
-  *
-  *    ametrics_x_scale ::
-  *      A 16.16 fixed-point number used to scale distance expressed
-  *      in metrics units to device sub-pixels.  This is equivalent to
-  *      `face->size->x_scale', but for metrics only.  Optional (parameter
-  *      can be NULL).
-  *
-  *    ametrics_y_scale ::
-  *      Same as `ametrics_x_scale' but for the vertical direction.
-  *      optional (parameter can be NULL).
-  *
-  * @return:
-  *    FreeType error code.  0~means success.
-  *
-  * @note:
-  *   If the input face is not a PFR, this function will return an error.
-  *   However, in all cases, it will return valid values.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Metrics( FT_Face    face,
-                      FT_UInt   *aoutline_resolution,
-                      FT_UInt   *ametrics_resolution,
-                      FT_Fixed  *ametrics_x_scale,
-                      FT_Fixed  *ametrics_y_scale );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Kerning
-  *
-  * @description:
-  *    Return the kerning pair corresponding to two glyphs in a PFR face.
-  *    The distance is expressed in metrics units, unlike the result of
-  *    @FT_Get_Kerning.
-  *
-  * @input:
-  *    face  :: A handle to the input face.
-  *
-  *    left  :: Index of the left glyph.
-  *
-  *    right :: Index of the right glyph.
-  *
-  * @output:
-  *    avector :: A kerning vector.
-  *
-  * @return:
-  *    FreeType error code.  0~means success.
-  *
-  * @note:
-  *    This function always return distances in original PFR metrics
-  *    units.  This is unlike @FT_Get_Kerning with the @FT_KERNING_UNSCALED
-  *    mode, which always returns distances converted to outline units.
-  *
-  *    You can use the value of the `x_scale' and `y_scale' parameters
-  *    returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Kerning( FT_Face     face,
-                      FT_UInt     left,
-                      FT_UInt     right,
-                      FT_Vector  *avector );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Advance
-  *
-  * @description:
-  *    Return a given glyph advance, expressed in original metrics units,
-  *    from a PFR font.
-  *
-  * @input:
-  *    face   :: A handle to the input face.
-  *
-  *    gindex :: The glyph index.
-  *
-  * @output:
-  *    aadvance :: The glyph advance in metrics units.
-  *
-  * @return:
-  *    FreeType error code.  0~means success.
-  *
-  * @note:
-  *    You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics
-  *    to convert the advance to device sub-pixels (i.e., 1/64th of pixels).
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Advance( FT_Face   face,
-                      FT_UInt   gindex,
-                      FT_Pos   *aadvance );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTPFR_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftbbox.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftbbox.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftbbox.h	(copie de travail)
@@ -1,102 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbbox.h                                                               */
-/*                                                                         */
-/*    FreeType exact bbox computation (specification).                     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003, 2007, 2011 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This component has a _single_ role: to compute exact outline bounding */
-  /* boxes.                                                                */
-  /*                                                                       */
-  /* It is separated from the rest of the engine for various technical     */
-  /* reasons.  It may well be integrated in `ftoutln' later.               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTBBOX_H__
-#define __FTBBOX_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_BBox                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Compute the exact bounding box of an outline.  This is slower      */
-  /*    than computing the control box.  However, it uses an advanced      */
-  /*    algorithm which returns _very_ quickly when the two boxes          */
-  /*    coincide.  Otherwise, the outline BÃ©zier arcs are traversed to     */
-  /*    extract their extrema.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A pointer to the source outline.                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    abbox   :: The outline's exact bounding box.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the font is tricky and the glyph has been loaded with           */
-  /*    @FT_LOAD_NO_SCALE, the resulting BBox is meaningless.  To get      */
-  /*    reasonable values for the BBox it is necessary to load the glyph   */
-  /*    at a large ppem value (so that the hinting instructions can        */
-  /*    properly shift and scale the subglyphs), then extracting the BBox  */
-  /*    which can be eventually converted back to font units.              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_BBox( FT_Outline*  outline,
-                       FT_BBox     *abbox );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTBBOX_H__ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
Index: lib/3rdparty/freetype/include/freetype/ftxf86.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftxf86.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftxf86.h	(copie de travail)
@@ -1,83 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftxf86.h                                                               */
-/*                                                                         */
-/*    Support functions for X11.                                           */
-/*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2007 by                              */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTXF86_H__
-#define __FTXF86_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   font_formats                                                        */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*   Font Formats                                                        */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*   Getting the font format.                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   The single function in this section can be used to get the font     */
-  /*   format.  Note that this information is not needed normally;         */
-  /*   however, there are special cases (like in PDF devices) where it is  */
-  /*   important to differentiate, in spite of FreeType's uniform API.     */
-  /*                                                                       */
-  /*   This function is in the X11/xf86 namespace for historical reasons   */
-  /*   and in no way depends on that windowing system.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*   FT_Get_X11_Font_Format                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   Return a string describing the format of a given face, using values */
-  /*   which can be used as an X11 FONT_PROPERTY.  Possible values are     */
-  /*   `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
-  /*   `PFR', and `Windows~FNT'.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*   face ::                                                             */
-  /*     Input face handle.                                                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*   Font format string.  NULL in case of error.                         */
-  /*                                                                       */
-  FT_EXPORT( const char* )
-  FT_Get_X11_Font_Format( FT_Face  face );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTXF86_H__ */
Index: lib/3rdparty/freetype/include/freetype/ftadvanc.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftadvanc.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftadvanc.h	(copie de travail)
@@ -1,182 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftadvanc.h                                                             */
-/*                                                                         */
-/*    Quick computation of advance widths (specification only).            */
-/*                                                                         */
-/*  Copyright 2008, 2013 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTADVANC_H__
-#define __FTADVANC_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   quick_advance
-   *
-   * @title:
-   *   Quick retrieval of advance values
-   *
-   * @abstract:
-   *   Retrieve horizontal and vertical advance values without processing
-   *   glyph outlines, if possible.
-   *
-   * @description:
-   *   This section contains functions to quickly extract advance values
-   *   without handling glyph outlines, if possible.
-   */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    FT_ADVANCE_FLAG_FAST_ONLY                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A bit-flag to be OR-ed with the `flags' parameter of the           */
-  /*    @FT_Get_Advance and @FT_Get_Advances functions.                    */
-  /*                                                                       */
-  /*    If set, it indicates that you want these functions to fail if the  */
-  /*    corresponding hinting mode or font driver doesn't allow for very   */
-  /*    quick advance computation.                                         */
-  /*                                                                       */
-  /*    Typically, glyphs which are either unscaled, unhinted, bitmapped,  */
-  /*    or light-hinted can have their advance width computed very         */
-  /*    quickly.                                                           */
-  /*                                                                       */
-  /*    Normal and bytecode hinted modes, which require loading, scaling,  */
-  /*    and hinting of the glyph outline, are extremely slow by            */
-  /*    comparison.                                                        */
-  /*                                                                       */
-#define FT_ADVANCE_FLAG_FAST_ONLY  0x20000000UL
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Advance                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the advance value of a given glyph outline in an          */
-  /*    @FT_Face.                                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: The source @FT_Face handle.                          */
-  /*                                                                       */
-  /*    gindex     :: The glyph index.                                     */
-  /*                                                                       */
-  /*    load_flags :: A set of bit flags similar to those used when        */
-  /*                  calling @FT_Load_Glyph, used to determine what kind  */
-  /*                  of advances you need.                                */
-  /* <Output>                                                              */
-  /*    padvance :: The advance value.  If scaling is performed (based on  */
-  /*                the value of `load_flags'), the advance value is in    */
-  /*                16.16 format.  Otherwise, it is in font units.         */
-  /*                                                                       */
-  /*                If @FT_LOAD_VERTICAL_LAYOUT is set, this is the        */
-  /*                vertical advance corresponding to a vertical layout.   */
-  /*                Otherwise, it is the horizontal advance in a           */
-  /*                horizontal layout.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function may fail if you use @FT_ADVANCE_FLAG_FAST_ONLY and   */
-  /*    if the corresponding font backend doesn't have a quick way to      */
-  /*    retrieve the advances.                                             */
-  /*                                                                       */
-  /*    A scaled advance is returned in 16.16 format but isn't transformed */
-  /*    by the affine transformation specified by @FT_Set_Transform.       */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Advance( FT_Face    face,
-                  FT_UInt    gindex,
-                  FT_Int32   load_flags,
-                  FT_Fixed  *padvance );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Advances                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the advance values of several glyph outlines in an        */
-  /*    @FT_Face.                                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: The source @FT_Face handle.                         */
-  /*                                                                       */
-  /*    start       :: The first glyph index.                              */
-  /*                                                                       */
-  /*    count       :: The number of advance values you want to retrieve.  */
-  /*                                                                       */
-  /*    load_flags  :: A set of bit flags similar to those used when       */
-  /*                   calling @FT_Load_Glyph.                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    padvance :: The advance values.  This array, to be provided by the */
-  /*                caller, must contain at least `count' elements.        */
-  /*                                                                       */
-  /*                If scaling is performed (based on the value of         */
-  /*                `load_flags'), the advance values are in 16.16 format. */
-  /*                Otherwise, they are in font units.                     */
-  /*                                                                       */
-  /*                If @FT_LOAD_VERTICAL_LAYOUT is set, these are the      */
-  /*                vertical advances corresponding to a vertical layout.  */
-  /*                Otherwise, they are the horizontal advances in a       */
-  /*                horizontal layout.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function may fail if you use @FT_ADVANCE_FLAG_FAST_ONLY and   */
-  /*    if the corresponding font backend doesn't have a quick way to      */
-  /*    retrieve the advances.                                             */
-  /*                                                                       */
-  /*    Scaled advances are returned in 16.16 format but aren't            */
-  /*    transformed by the affine transformation specified by              */
-  /*    @FT_Set_Transform.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Advances( FT_Face    face,
-                   FT_UInt    start,
-                   FT_UInt    count,
-                   FT_Int32   load_flags,
-                   FT_Fixed  *padvances );
-
-/* */
-
-
-FT_END_HEADER
-
-#endif /* __FTADVANC_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftlcdfil.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftlcdfil.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftlcdfil.h	(copie de travail)
@@ -1,251 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlcdfil.h                                                             */
-/*                                                                         */
-/*    FreeType API for color filtering of subpixel bitmap glyphs           */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 2006, 2007, 2008, 2010 by                                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FT_LCD_FILTER_H__
-#define __FT_LCD_FILTER_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /***************************************************************************
-   *
-   * @section:
-   *   lcd_filtering
-   *
-   * @title:
-   *   LCD Filtering
-   *
-   * @abstract:
-   *   Reduce color fringes of LCD-optimized bitmaps.
-   *
-   * @description:
-   *   The @FT_Library_SetLcdFilter API can be used to specify a low-pass
-   *   filter which is then applied to LCD-optimized bitmaps generated
-   *   through @FT_Render_Glyph.  This is useful to reduce color fringes
-   *   which would occur with unfiltered rendering.
-   *
-   *   Note that no filter is active by default, and that this function is
-   *   *not* implemented in default builds of the library.  You need to
-   *   #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your `ftoption.h' file
-   *   in order to activate it.
-   *
-   *   FreeType generates alpha coverage maps, which are linear by nature.
-   *   For instance, the value 0x80 in bitmap representation means that
-   *   (within numerical precision) 0x80/0xff fraction of that pixel is
-   *   covered by the glyph's outline.  The blending function for placing
-   *   text over a background is
-   *
-   *   {
-   *     dst = alpha * src + (1 - alpha) * dst    ,
-   *   }
-   *
-   *   which is known as OVER.  However, when calculating the output of the
-   *   OVER operator, the source colors should first be transformed to a
-   *   linear color space, then alpha blended in that space, and transformed
-   *   back to the output color space.
-   *
-   *   When linear light blending is used, the default FIR5 filtering
-   *   weights (as given by FT_LCD_FILTER_DEFAULT) are no longer optimal, as
-   *   they have been designed for black on white rendering while lacking
-   *   gamma correction.  To preserve color neutrality, weights for a FIR5
-   *   filter should be chosen according to two free parameters `a' and `c',
-   *   and the FIR weights should be
-   *
-   *   {
-   *     [a - c, a + c, 2 * a, a + c, a - c]    .
-   *   }
-   *
-   *   This formula generates equal weights for all the color primaries
-   *   across the filter kernel, which makes it colorless.  One suggested
-   *   set of weights is
-   *
-   *   {
-   *     [0x10, 0x50, 0x60, 0x50, 0x10]    ,
-   *   }
-   *
-   *   where `a' has value 0x30 and `b' value 0x20.  The weights in filter
-   *   may have a sum larger than 0x100, which increases coloration slightly
-   *   but also improves contrast.
-   */
-
-
-  /****************************************************************************
-   *
-   * @enum:
-   *   FT_LcdFilter
-   *
-   * @description:
-   *   A list of values to identify various types of LCD filters.
-   *
-   * @values:
-   *   FT_LCD_FILTER_NONE ::
-   *     Do not perform filtering.  When used with subpixel rendering, this
-   *     results in sometimes severe color fringes.
-   *
-   *   FT_LCD_FILTER_DEFAULT ::
-   *     The default filter reduces color fringes considerably, at the cost
-   *     of a slight blurriness in the output.
-   *
-   *   FT_LCD_FILTER_LIGHT ::
-   *     The light filter is a variant that produces less blurriness at the
-   *     cost of slightly more color fringes than the default one.  It might
-   *     be better, depending on taste, your monitor, or your personal vision.
-   *
-   *   FT_LCD_FILTER_LEGACY ::
-   *     This filter corresponds to the original libXft color filter.  It
-   *     provides high contrast output but can exhibit really bad color
-   *     fringes if glyphs are not extremely well hinted to the pixel grid.
-   *     In other words, it only works well if the TrueType bytecode
-   *     interpreter is enabled *and* high-quality hinted fonts are used.
-   *
-   *     This filter is only provided for comparison purposes, and might be
-   *     disabled or stay unsupported in the future.
-   *
-   * @since:
-   *   2.3.0
-   */
-  typedef enum  FT_LcdFilter_
-  {
-    FT_LCD_FILTER_NONE    = 0,
-    FT_LCD_FILTER_DEFAULT = 1,
-    FT_LCD_FILTER_LIGHT   = 2,
-    FT_LCD_FILTER_LEGACY  = 16,
-
-    FT_LCD_FILTER_MAX   /* do not remove */
-
-  } FT_LcdFilter;
-
-
-  /**************************************************************************
-   *
-   * @func:
-   *   FT_Library_SetLcdFilter
-   *
-   * @description:
-   *   This function is used to apply color filtering to LCD decimated
-   *   bitmaps, like the ones used when calling @FT_Render_Glyph with
-   *   @FT_RENDER_MODE_LCD or @FT_RENDER_MODE_LCD_V.
-   *
-   * @input:
-   *   library ::
-   *     A handle to the target library instance.
-   *
-   *   filter ::
-   *     The filter type.
-   *
-   *     You can use @FT_LCD_FILTER_NONE here to disable this feature, or
-   *     @FT_LCD_FILTER_DEFAULT to use a default filter that should work
-   *     well on most LCD screens.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   This feature is always disabled by default.  Clients must make an
-   *   explicit call to this function with a `filter' value other than
-   *   @FT_LCD_FILTER_NONE in order to enable it.
-   *
-   *   Due to *PATENTS* covering subpixel rendering, this function doesn't
-   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
-   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
-   *   defined in your build of the library, which should correspond to all
-   *   default builds of FreeType.
-   *
-   *   The filter affects glyph bitmaps rendered through @FT_Render_Glyph,
-   *   @FT_Outline_Get_Bitmap, @FT_Load_Glyph, and @FT_Load_Char.
-   *
-   *   It does _not_ affect the output of @FT_Outline_Render and
-   *   @FT_Outline_Get_Bitmap.
-   *
-   *   If this feature is activated, the dimensions of LCD glyph bitmaps are
-   *   either larger or taller than the dimensions of the corresponding
-   *   outline with regards to the pixel grid.  For example, for
-   *   @FT_RENDER_MODE_LCD, the filter adds up to 3~pixels to the left, and
-   *   up to 3~pixels to the right.
-   *
-   *   The bitmap offset values are adjusted correctly, so clients shouldn't
-   *   need to modify their layout and glyph positioning code when enabling
-   *   the filter.
-   *
-   * @since:
-   *   2.3.0
-   */
-  FT_EXPORT( FT_Error )
-  FT_Library_SetLcdFilter( FT_Library    library,
-                           FT_LcdFilter  filter );
-
-
-  /**************************************************************************
-   *
-   * @func:
-   *   FT_Library_SetLcdFilterWeights
-   *
-   * @description:
-   *   Use this function to override the filter weights selected by
-   *   @FT_Library_SetLcdFilter.  By default, FreeType uses the quintuple
-   *   (0x00, 0x55, 0x56, 0x55, 0x00) for FT_LCD_FILTER_LIGHT, and (0x10,
-   *   0x40, 0x70, 0x40, 0x10) for FT_LCD_FILTER_DEFAULT and
-   *   FT_LCD_FILTER_LEGACY.
-   *
-   * @input:
-   *   library ::
-   *     A handle to the target library instance.
-   *
-   *   weights ::
-   *     A pointer to an array; the function copies the first five bytes and
-   *     uses them to specify the filter weights.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   Due to *PATENTS* covering subpixel rendering, this function doesn't
-   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
-   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
-   *   defined in your build of the library, which should correspond to all
-   *   default builds of FreeType.
-   *
-   *   This function must be called after @FT_Library_SetLcdFilter to have
-   *   any effect.
-   *
-   * @since:
-   *   2.4.0
-   */
-  FT_EXPORT( FT_Error )
-  FT_Library_SetLcdFilterWeights( FT_Library      library,
-                                  unsigned char  *weights );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FT_LCD_FILTER_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftcid.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftcid.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftcid.h	(copie de travail)
@@ -1,166 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcid.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing CID font information (specification).     */
-/*                                                                         */
-/*  Copyright 2007, 2009 by Dereg Clegg, Michael Toftdal.                  */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCID_H__
-#define __FTCID_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cid_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    CID Fonts                                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    CID-keyed font specific API.                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of CID-keyed font specific   */
-  /*    functions.                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_CID_Registry_Ordering_Supplement
-   *
-   * @description:
-   *    Retrieve the Registry/Ordering/Supplement triple (also known as the
-   *    "R/O/S") from a CID-keyed font.
-   *
-   * @input:
-   *    face ::
-   *       A handle to the input face.
-   *
-   * @output:
-   *    registry ::
-   *       The registry, as a C~string, owned by the face.
-   *
-   *    ordering ::
-   *       The ordering, as a C~string, owned by the face.
-   *
-   *    supplement ::
-   *       The supplement.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    This function only works with CID faces, returning an error
-   *    otherwise.
-   *
-   * @since:
-   *    2.3.6
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_Registry_Ordering_Supplement( FT_Face       face,
-                                           const char*  *registry,
-                                           const char*  *ordering,
-                                           FT_Int       *supplement);
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_CID_Is_Internally_CID_Keyed
-   *
-   * @description:
-   *    Retrieve the type of the input face, CID keyed or not.  In
-   *    constrast to the @FT_IS_CID_KEYED macro this function returns
-   *    successfully also for CID-keyed fonts in an SNFT wrapper.
-   *
-   * @input:
-   *    face ::
-   *       A handle to the input face.
-   *
-   * @output:
-   *    is_cid ::
-   *       The type of the face as an @FT_Bool.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    This function only works with CID faces and OpenType fonts,
-   *    returning an error otherwise.
-   *
-   * @since:
-   *    2.3.9
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_Is_Internally_CID_Keyed( FT_Face   face,
-                                      FT_Bool  *is_cid );
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_CID_From_Glyph_Index
-   *
-   * @description:
-   *    Retrieve the CID of the input glyph index.
-   *
-   * @input:
-   *    face ::
-   *       A handle to the input face.
-   *
-   *    glyph_index ::
-   *       The input glyph index.
-   *
-   * @output:
-   *    cid ::
-   *       The CID as an @FT_UInt.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    This function only works with CID faces and OpenType fonts,
-   *    returning an error otherwise.
-   *
-   * @since:
-   *    2.3.9
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_From_Glyph_Index( FT_Face   face,
-                               FT_UInt   glyph_index,
-                               FT_UInt  *cid );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTCID_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftmac.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftmac.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftmac.h	(copie de travail)
@@ -1,274 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmac.h                                                                */
-/*                                                                         */
-/*    Additional Mac-specific API.                                         */
-/*                                                                         */
-/*  Copyright 1996-2001, 2004, 2006, 2007 by                               */
-/*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* NOTE: Include this file after <freetype/freetype.h> and after any       */
-/*       Mac-specific headers (because this header uses Mac types such as  */
-/*       Handle, FSSpec, FSRef, etc.)                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMAC_H__
-#define __FTMAC_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-/* gcc-3.4.1 and later can warn about functions tagged as deprecated */
-#ifndef FT_DEPRECATED_ATTRIBUTE
-#if defined(__GNUC__)                                               && \
-    ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
-#define FT_DEPRECATED_ATTRIBUTE  __attribute__((deprecated))
-#else
-#define FT_DEPRECATED_ATTRIBUTE
-#endif
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    mac_specific                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Mac Specific Interface                                             */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Only available on the Macintosh.                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following definitions are only available if FreeType is        */
-  /*    compiled on a Macintosh.                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FOND                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new face object from a FOND resource.                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fond       :: A FOND resource.                                     */
-  /*                                                                       */
-  /*    face_index :: Only supported for the -1 `sanity check' special     */
-  /*                  case.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Notes>                                                               */
-  /*    This function can be used to create @FT_Face objects from fonts    */
-  /*    that are installed in the system as follows.                       */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      fond = GetResource( 'FOND', fontName );                          */
-  /*      error = FT_New_Face_From_FOND( library, fond, 0, &face );        */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FOND( FT_Library  library,
-                         Handle      fond,
-                         FT_Long     face_index,
-                         FT_Face    *aface )
-                       FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFile_From_Mac_Name                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return an FSSpec for the disk file containing the named font.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName   :: Mac OS name of the font (e.g., Times New Roman       */
-  /*                  Bold).                                               */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    pathSpec   :: FSSpec to the file.  For passing to                  */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /*    face_index :: Index of the face.  For passing to                   */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GetFile_From_Mac_Name( const char*  fontName,
-                            FSSpec*      pathSpec,
-                            FT_Long*     face_index )
-                          FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFile_From_Mac_ATS_Name                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return an FSSpec for the disk file containing the named font.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName   :: Mac OS name of the font in ATS framework.            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    pathSpec   :: FSSpec to the file. For passing to                   */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /*    face_index :: Index of the face. For passing to                    */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GetFile_From_Mac_ATS_Name( const char*  fontName,
-                                FSSpec*      pathSpec,
-                                FT_Long*     face_index )
-                              FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFilePath_From_Mac_ATS_Name                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a pathname of the disk file and face index for given font   */
-  /*    name which is handled by ATS framework.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName    :: Mac OS name of the font in ATS framework.           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    path        :: Buffer to store pathname of the file.  For passing  */
-  /*                   to @FT_New_Face.  The client must allocate this     */
-  /*                   buffer before calling this function.                */
-  /*                                                                       */
-  /*    maxPathSize :: Lengths of the buffer `path' that client allocated. */
-  /*                                                                       */
-  /*    face_index  :: Index of the face.  For passing to @FT_New_Face.    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GetFilePath_From_Mac_ATS_Name( const char*  fontName,
-                                    UInt8*       path,
-                                    UInt32       maxPathSize,
-                                    FT_Long*     face_index )
-                                  FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FSSpec                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new face object from a given resource and typeface index  */
-  /*    using an FSSpec to the font file.                                  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    spec       :: FSSpec to the font file.                             */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index~0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    @FT_New_Face_From_FSSpec is identical to @FT_New_Face except       */
-  /*    it accepts an FSSpec instead of a path.                            */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FSSpec( FT_Library     library,
-                           const FSSpec  *spec,
-                           FT_Long        face_index,
-                           FT_Face       *aface )
-                         FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FSRef                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new face object from a given resource and typeface index  */
-  /*    using an FSRef to the font file.                                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    spec       :: FSRef to the font file.                              */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index~0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    @FT_New_Face_From_FSRef is identical to @FT_New_Face except        */
-  /*    it accepts an FSRef instead of a path.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FSRef( FT_Library    library,
-                          const FSRef  *ref,
-                          FT_Long       face_index,
-                          FT_Face      *aface )
-                        FT_DEPRECATED_ATTRIBUTE;
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTMAC_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftoutln.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftoutln.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftoutln.h	(copie de travail)
@@ -1,560 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftoutln.h                                                              */
-/*                                                                         */
-/*    Support for the FT_Outline type used to store glyph shapes of        */
-/*    most scalable font formats (specification).                          */
-/*                                                                         */
-/*  Copyright 1996-2003, 2005-2012 by                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTOUTLN_H__
-#define __FTOUTLN_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Outline Processing                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Functions to create, transform, and render vectorial glyph images. */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains routines used to create and destroy scalable */
-  /*    glyph images known as `outlines'.  These can also be measured,     */
-  /*    transformed, and converted into bitmaps and pixmaps.               */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Outline                                                         */
-  /*    FT_OUTLINE_FLAGS                                                   */
-  /*    FT_Outline_New                                                     */
-  /*    FT_Outline_Done                                                    */
-  /*    FT_Outline_Copy                                                    */
-  /*    FT_Outline_Translate                                               */
-  /*    FT_Outline_Transform                                               */
-  /*    FT_Outline_Embolden                                                */
-  /*    FT_Outline_EmboldenXY                                              */
-  /*    FT_Outline_Reverse                                                 */
-  /*    FT_Outline_Check                                                   */
-  /*                                                                       */
-  /*    FT_Outline_Get_CBox                                                */
-  /*    FT_Outline_Get_BBox                                                */
-  /*                                                                       */
-  /*    FT_Outline_Get_Bitmap                                              */
-  /*    FT_Outline_Render                                                  */
-  /*                                                                       */
-  /*    FT_Outline_Decompose                                               */
-  /*    FT_Outline_Funcs                                                   */
-  /*    FT_Outline_MoveTo_Func                                             */
-  /*    FT_Outline_LineTo_Func                                             */
-  /*    FT_Outline_ConicTo_Func                                            */
-  /*    FT_Outline_CubicTo_Func                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Decompose                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Walk over an outline's structure to decompose it into individual   */
-  /*    segments and BÃ©zier arcs.  This function also emits `move to'      */
-  /*    operations to indicate the start of new contours in the outline.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline        :: A pointer to the source target.                  */
-  /*                                                                       */
-  /*    func_interface :: A table of `emitters', i.e., function pointers   */
-  /*                      called during decomposition to indicate path     */
-  /*                      operations.                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    user           :: A typeless pointer which is passed to each       */
-  /*                      emitter during the decomposition.  It can be     */
-  /*                      used to store the state during the               */
-  /*                      decomposition.                                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Decompose( FT_Outline*              outline,
-                        const FT_Outline_Funcs*  func_interface,
-                        void*                    user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_New                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new outline of a given size.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object from where the       */
-  /*                   outline is allocated.  Note however that the new    */
-  /*                   outline will *not* necessarily be *freed*, when     */
-  /*                   destroying the library, by @FT_Done_FreeType.       */
-  /*                                                                       */
-  /*    numPoints   :: The maximum number of points within the outline.    */
-  /*                   Must be smaller than or equal to 0xFFFF (65535).    */
-  /*                                                                       */
-  /*    numContours :: The maximum number of contours within the outline.  */
-  /*                   This value must be in the range 0 to `numPoints'.   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    anoutline   :: A handle to the new outline.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The reason why this function takes a `library' parameter is simply */
-  /*    to use the library's memory allocator.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_New( FT_Library   library,
-                  FT_UInt      numPoints,
-                  FT_Int       numContours,
-                  FT_Outline  *anoutline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_New_Internal( FT_Memory    memory,
-                           FT_UInt      numPoints,
-                           FT_Int       numContours,
-                           FT_Outline  *anoutline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Done                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy an outline created with @FT_Outline_New.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle of the library object used to allocate the     */
-  /*               outline.                                                */
-  /*                                                                       */
-  /*    outline :: A pointer to the outline object to be discarded.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the outline's `owner' field is not set, only the outline        */
-  /*    descriptor will be released.                                       */
-  /*                                                                       */
-  /*    The reason why this function takes an `library' parameter is       */
-  /*    simply to use ft_mem_free().                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done( FT_Library   library,
-                   FT_Outline*  outline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done_Internal( FT_Memory    memory,
-                            FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Check                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check the contents of an outline descriptor.                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A handle to a source outline.                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Check( FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_CBox                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return an outline's `control box'.  The control box encloses all   */
-  /*    the outline's points, including BÃ©zier control points.  Though it  */
-  /*    coincides with the exact bounding box for most glyphs, it can be   */
-  /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains BÃ©zier outside arcs).                               */
-  /*                                                                       */
-  /*    Computing the control box is very fast, while getting the bounding */
-  /*    box can take much more time as it needs to walk over all segments  */
-  /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component which is dedicated to this single task.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acbox   :: The outline's control box.                              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See @FT_Glyph_Get_CBox for a discussion of tricky fonts.           */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Get_CBox( const FT_Outline*  outline,
-                       FT_BBox           *acbox );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Translate                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Apply a simple translation to the points of an outline.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    xOffset :: The horizontal offset.                                  */
-  /*                                                                       */
-  /*    yOffset :: The vertical offset.                                    */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Translate( const FT_Outline*  outline,
-                        FT_Pos             xOffset,
-                        FT_Pos             yOffset );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Copy                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Copy an outline into another one.  Both objects must have the      */
-  /*    same sizes (number of points & number of contours) when this       */
-  /*    function is called.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    source :: A handle to the source outline.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target :: A handle to the target outline.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Copy( const FT_Outline*  source,
-                   FT_Outline        *target );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Transform                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Apply a simple 2x2 matrix to all of an outline's points.  Useful   */
-  /*    for applying rotations, slanting, flipping, etc.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix  :: A pointer to the transformation matrix.                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can use @FT_Outline_Translate if you need to translate the     */
-  /*    outline's points.                                                  */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Transform( const FT_Outline*  outline,
-                        const FT_Matrix*   matrix );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Embolden                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Embolden an outline.  The new outline will be at most 4~times      */
-  /*    `strength' pixels wider and higher.  You may think of the left and */
-  /*    bottom borders as unchanged.                                       */
-  /*                                                                       */
-  /*    Negative `strength' values to reduce the outline thickness are     */
-  /*    possible also.                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline  :: A handle to the target outline.                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    strength :: How strong the glyph is emboldened.  Expressed in      */
-  /*                26.6 pixel format.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The used algorithm to increase or decrease the thickness of the    */
-  /*    glyph doesn't change the number of points; this means that certain */
-  /*    situations like acute angles or intersections are sometimes        */
-  /*    handled incorrectly.                                               */
-  /*                                                                       */
-  /*    If you need `better' metrics values you should call                */
-  /*    @FT_Outline_Get_CBox or @FT_Outline_Get_BBox.                      */
-  /*                                                                       */
-  /*    Example call:                                                      */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_Load_Glyph( face, index, FT_LOAD_DEFAULT );                   */
-  /*      if ( face->slot->format == FT_GLYPH_FORMAT_OUTLINE )             */
-  /*        FT_Outline_Embolden( &face->slot->outline, strength );         */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Embolden( FT_Outline*  outline,
-                       FT_Pos       strength );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_EmboldenXY                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Embolden an outline.  The new outline will be `xstrength' pixels   */
-  /*    wider and `ystrength' pixels higher.  Otherwise, it is similar to  */
-  /*    @FT_Outline_Embolden, which uses the same strength in both         */
-  /*    directions.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_EmboldenXY( FT_Outline*  outline,
-                         FT_Pos       xstrength,
-                         FT_Pos       ystrength );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Reverse                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reverse the drawing direction of an outline.  This is used to      */
-  /*    ensure consistent fill conventions for mirrored glyphs.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function toggles the bit flag @FT_OUTLINE_REVERSE_FILL in     */
-  /*    the outline's `flags' field.                                       */
-  /*                                                                       */
-  /*    It shouldn't be used by a normal client application, unless it     */
-  /*    knows what it is doing.                                            */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Reverse( FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_Bitmap                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Render an outline within a bitmap.  The outline's image is simply  */
-  /*    OR-ed to the target bitmap.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    abitmap :: A pointer to the target bitmap descriptor.              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does NOT CREATE the bitmap, it only renders an       */
-  /*    outline image within the one you pass to it!  Consequently, the    */
-  /*    various fields in `abitmap' should be set accordingly.             */
-  /*                                                                       */
-  /*    It will use the raster corresponding to the default glyph format.  */
-  /*                                                                       */
-  /*    The value of the `num_grays' field in `abitmap' is ignored.  If    */
-  /*    you select the gray-level rasterizer, and you want less than 256   */
-  /*    gray levels, you have to use @FT_Outline_Render directly.          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_Bitmap( FT_Library        library,
-                         FT_Outline*       outline,
-                         const FT_Bitmap  *abitmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Render                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Render an outline within a bitmap using the current scan-convert.  */
-  /*    This function uses an @FT_Raster_Params structure as an argument,  */
-  /*    allowing advanced features like direct composition, translucency,  */
-  /*    etc.                                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    params  :: A pointer to an @FT_Raster_Params structure used to     */
-  /*               describe the rendering operation.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should know what you are doing and how @FT_Raster_Params works */
-  /*    to use this function.                                              */
-  /*                                                                       */
-  /*    The field `params.source' will be set to `outline' before the scan */
-  /*    converter is called, which means that the value you give to it is  */
-  /*    actually ignored.                                                  */
-  /*                                                                       */
-  /*    The gray-level rasterizer always uses 256 gray levels.  If you     */
-  /*    want less gray levels, you have to provide your own span callback. */
-  /*    See the @FT_RASTER_FLAG_DIRECT value of the `flags' field in the   */
-  /*    @FT_Raster_Params structure for more details.                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Render( FT_Library         library,
-                     FT_Outline*        outline,
-                     FT_Raster_Params*  params );
-
-
- /**************************************************************************
-  *
-  * @enum:
-  *   FT_Orientation
-  *
-  * @description:
-  *   A list of values used to describe an outline's contour orientation.
-  *
-  *   The TrueType and PostScript specifications use different conventions
-  *   to determine whether outline contours should be filled or unfilled.
-  *
-  * @values:
-  *   FT_ORIENTATION_TRUETYPE ::
-  *     According to the TrueType specification, clockwise contours must
-  *     be filled, and counter-clockwise ones must be unfilled.
-  *
-  *   FT_ORIENTATION_POSTSCRIPT ::
-  *     According to the PostScript specification, counter-clockwise contours
-  *     must be filled, and clockwise ones must be unfilled.
-  *
-  *   FT_ORIENTATION_FILL_RIGHT ::
-  *     This is identical to @FT_ORIENTATION_TRUETYPE, but is used to
-  *     remember that in TrueType, everything that is to the right of
-  *     the drawing direction of a contour must be filled.
-  *
-  *   FT_ORIENTATION_FILL_LEFT ::
-  *     This is identical to @FT_ORIENTATION_POSTSCRIPT, but is used to
-  *     remember that in PostScript, everything that is to the left of
-  *     the drawing direction of a contour must be filled.
-  *
-  *   FT_ORIENTATION_NONE ::
-  *     The orientation cannot be determined.  That is, different parts of
-  *     the glyph have different orientation.
-  *
-  */
-  typedef enum  FT_Orientation_
-  {
-    FT_ORIENTATION_TRUETYPE   = 0,
-    FT_ORIENTATION_POSTSCRIPT = 1,
-    FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE,
-    FT_ORIENTATION_FILL_LEFT  = FT_ORIENTATION_POSTSCRIPT,
-    FT_ORIENTATION_NONE
-
-  } FT_Orientation;
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Outline_Get_Orientation
-  *
-  * @description:
-  *   This function analyzes a glyph outline and tries to compute its
-  *   fill orientation (see @FT_Orientation).  This is done by computing
-  *   the direction of each global horizontal and/or vertical extrema
-  *   within the outline.
-  *
-  *   Note that this will return @FT_ORIENTATION_TRUETYPE for empty
-  *   outlines.
-  *
-  * @input:
-  *   outline ::
-  *     A handle to the source outline.
-  *
-  * @return:
-  *   The orientation.
-  *
-  */
-  FT_EXPORT( FT_Orientation )
-  FT_Outline_Get_Orientation( FT_Outline*  outline );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTOUTLN_H__ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
Index: lib/3rdparty/freetype/include/freetype/fttrigon.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/fttrigon.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/fttrigon.h	(copie de travail)
@@ -1,350 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttrigon.h                                                             */
-/*                                                                         */
-/*    FreeType trigonometric functions (specification).                    */
-/*                                                                         */
-/*  Copyright 2001, 2003, 2005, 2007, 2013 by                              */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTTRIGON_H__
-#define __FTTRIGON_H__
-
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   computations                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FT_Angle
-   *
-   * @description:
-   *   This type is used to model angle values in FreeType.  Note that the
-   *   angle is a 16.16 fixed-point value expressed in degrees.
-   *
-   */
-  typedef FT_Fixed  FT_Angle;
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_PI
-   *
-   * @description:
-   *   The angle pi expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_PI  ( 180L << 16 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_2PI
-   *
-   * @description:
-   *   The angle 2*pi expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_2PI  ( FT_ANGLE_PI * 2 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_PI2
-   *
-   * @description:
-   *   The angle pi/2 expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_PI2  ( FT_ANGLE_PI / 2 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_PI4
-   *
-   * @description:
-   *   The angle pi/4 expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_PI4  ( FT_ANGLE_PI / 4 )
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Sin
-   *
-   * @description:
-   *   Return the sinus of a given angle in fixed-point format.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   * @return:
-   *   The sinus value.
-   *
-   * @note:
-   *   If you need both the sinus and cosinus for a given angle, use the
-   *   function @FT_Vector_Unit.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Sin( FT_Angle  angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Cos
-   *
-   * @description:
-   *   Return the cosinus of a given angle in fixed-point format.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   * @return:
-   *   The cosinus value.
-   *
-   * @note:
-   *   If you need both the sinus and cosinus for a given angle, use the
-   *   function @FT_Vector_Unit.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Cos( FT_Angle  angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Tan
-   *
-   * @description:
-   *   Return the tangent of a given angle in fixed-point format.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   * @return:
-   *   The tangent value.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Tan( FT_Angle  angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Atan2
-   *
-   * @description:
-   *   Return the arc-tangent corresponding to a given vector (x,y) in
-   *   the 2d plane.
-   *
-   * @input:
-   *   x ::
-   *     The horizontal vector coordinate.
-   *
-   *   y ::
-   *     The vertical vector coordinate.
-   *
-   * @return:
-   *   The arc-tangent value (i.e. angle).
-   *
-   */
-  FT_EXPORT( FT_Angle )
-  FT_Atan2( FT_Fixed  x,
-            FT_Fixed  y );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Angle_Diff
-   *
-   * @description:
-   *   Return the difference between two angles.  The result is always
-   *   constrained to the ]-PI..PI] interval.
-   *
-   * @input:
-   *   angle1 ::
-   *     First angle.
-   *
-   *   angle2 ::
-   *     Second angle.
-   *
-   * @return:
-   *   Constrained value of `value2-value1'.
-   *
-   */
-  FT_EXPORT( FT_Angle )
-  FT_Angle_Diff( FT_Angle  angle1,
-                 FT_Angle  angle2 );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Unit
-   *
-   * @description:
-   *   Return the unit vector corresponding to a given angle.  After the
-   *   call, the value of `vec.x' will be `sin(angle)', and the value of
-   *   `vec.y' will be `cos(angle)'.
-   *
-   *   This function is useful to retrieve both the sinus and cosinus of a
-   *   given angle quickly.
-   *
-   * @output:
-   *   vec ::
-   *     The address of target vector.
-   *
-   * @input:
-   *   angle ::
-   *     The address of angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_Unit( FT_Vector*  vec,
-                  FT_Angle    angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Rotate
-   *
-   * @description:
-   *   Rotate a vector by a given angle.
-   *
-   * @inout:
-   *   vec ::
-   *     The address of target vector.
-   *
-   * @input:
-   *   angle ::
-   *     The address of angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_Rotate( FT_Vector*  vec,
-                    FT_Angle    angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Length
-   *
-   * @description:
-   *   Return the length of a given vector.
-   *
-   * @input:
-   *   vec ::
-   *     The address of target vector.
-   *
-   * @return:
-   *   The vector length, expressed in the same units that the original
-   *   vector coordinates.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Vector_Length( FT_Vector*  vec );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Polarize
-   *
-   * @description:
-   *   Compute both the length and angle of a given vector.
-   *
-   * @input:
-   *   vec ::
-   *     The address of source vector.
-   *
-   * @output:
-   *   length ::
-   *     The vector length.
-   *
-   *   angle ::
-   *     The vector angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_Polarize( FT_Vector*  vec,
-                      FT_Fixed   *length,
-                      FT_Angle   *angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_From_Polar
-   *
-   * @description:
-   *   Compute vector coordinates from a length and angle.
-   *
-   * @output:
-   *   vec ::
-   *     The address of source vector.
-   *
-   * @input:
-   *   length ::
-   *     The vector length.
-   *
-   *   angle ::
-   *     The vector angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_From_Polar( FT_Vector*  vec,
-                        FT_Fixed    length,
-                        FT_Angle    angle );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTTRIGON_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftcache.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftcache.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftcache.h	(copie de travail)
@@ -1,1057 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcache.h                                                              */
-/*                                                                         */
-/*    FreeType Cache subsystem (specification).                            */
-/*                                                                         */
-/*  Copyright 1996-2008, 2010, 2013 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCACHE_H__
-#define __FTCACHE_H__
-
-
-#include <ft2build.h>
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************
-   *
-   * <Section>
-   *    cache_subsystem
-   *
-   * <Title>
-   *    Cache Sub-System
-   *
-   * <Abstract>
-   *    How to cache face, size, and glyph data with FreeType~2.
-   *
-   * <Description>
-   *   This section describes the FreeType~2 cache sub-system, which is used
-   *   to limit the number of concurrently opened @FT_Face and @FT_Size
-   *   objects, as well as caching information like character maps and glyph
-   *   images while limiting their maximum memory usage.
-   *
-   *   Note that all types and functions begin with the `FTC_' prefix.
-   *
-   *   The cache is highly portable and thus doesn't know anything about the
-   *   fonts installed on your system, or how to access them.  This implies
-   *   the following scheme:
-   *
-   *   First, available or installed font faces are uniquely identified by
-   *   @FTC_FaceID values, provided to the cache by the client.  Note that
-   *   the cache only stores and compares these values, and doesn't try to
-   *   interpret them in any way.
-   *
-   *   Second, the cache calls, only when needed, a client-provided function
-   *   to convert an @FTC_FaceID into a new @FT_Face object.  The latter is
-   *   then completely managed by the cache, including its termination
-   *   through @FT_Done_Face.  To monitor termination of face objects, the
-   *   finalizer callback in the `generic' field of the @FT_Face object can
-   *   be used, which might also be used to store the @FTC_FaceID of the
-   *   face.
-   *
-   *   Clients are free to map face IDs to anything else.  The most simple
-   *   usage is to associate them to a (pathname,face_index) pair that is
-   *   used to call @FT_New_Face.  However, more complex schemes are also
-   *   possible.
-   *
-   *   Note that for the cache to work correctly, the face ID values must be
-   *   *persistent*, which means that the contents they point to should not
-   *   change at runtime, or that their value should not become invalid.
-   *
-   *   If this is unavoidable (e.g., when a font is uninstalled at runtime),
-   *   you should call @FTC_Manager_RemoveFaceID as soon as possible, to let
-   *   the cache get rid of any references to the old @FTC_FaceID it may
-   *   keep internally.  Failure to do so will lead to incorrect behaviour
-   *   or even crashes.
-   *
-   *   To use the cache, start with calling @FTC_Manager_New to create a new
-   *   @FTC_Manager object, which models a single cache instance.  You can
-   *   then look up @FT_Face and @FT_Size objects with
-   *   @FTC_Manager_LookupFace and @FTC_Manager_LookupSize, respectively.
-   *
-   *   If you want to use the charmap caching, call @FTC_CMapCache_New, then
-   *   later use @FTC_CMapCache_Lookup to perform the equivalent of
-   *   @FT_Get_Char_Index, only much faster.
-   *
-   *   If you want to use the @FT_Glyph caching, call @FTC_ImageCache, then
-   *   later use @FTC_ImageCache_Lookup to retrieve the corresponding
-   *   @FT_Glyph objects from the cache.
-   *
-   *   If you need lots of small bitmaps, it is much more memory efficient
-   *   to call @FTC_SBitCache_New followed by @FTC_SBitCache_Lookup.  This
-   *   returns @FTC_SBitRec structures, which are used to store small
-   *   bitmaps directly.  (A small bitmap is one whose metrics and
-   *   dimensions all fit into 8-bit integers).
-   *
-   *   We hope to also provide a kerning cache in the near future.
-   *
-   *
-   * <Order>
-   *   FTC_Manager
-   *   FTC_FaceID
-   *   FTC_Face_Requester
-   *
-   *   FTC_Manager_New
-   *   FTC_Manager_Reset
-   *   FTC_Manager_Done
-   *   FTC_Manager_LookupFace
-   *   FTC_Manager_LookupSize
-   *   FTC_Manager_RemoveFaceID
-   *
-   *   FTC_Node
-   *   FTC_Node_Unref
-   *
-   *   FTC_ImageCache
-   *   FTC_ImageCache_New
-   *   FTC_ImageCache_Lookup
-   *
-   *   FTC_SBit
-   *   FTC_SBitCache
-   *   FTC_SBitCache_New
-   *   FTC_SBitCache_Lookup
-   *
-   *   FTC_CMapCache
-   *   FTC_CMapCache_New
-   *   FTC_CMapCache_Lookup
-   *
-   *************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                    BASIC TYPE DEFINITIONS                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type: FTC_FaceID
-   *
-   * @description:
-   *   An opaque pointer type that is used to identity face objects.  The
-   *   contents of such objects is application-dependent.
-   *
-   *   These pointers are typically used to point to a user-defined
-   *   structure containing a font file path, and face index.
-   *
-   * @note:
-   *   Never use NULL as a valid @FTC_FaceID.
-   *
-   *   Face IDs are passed by the client to the cache manager, which calls,
-   *   when needed, the @FTC_Face_Requester to translate them into new
-   *   @FT_Face objects.
-   *
-   *   If the content of a given face ID changes at runtime, or if the value
-   *   becomes invalid (e.g., when uninstalling a font), you should
-   *   immediately call @FTC_Manager_RemoveFaceID before any other cache
-   *   function.
-   *
-   *   Failure to do so will result in incorrect behaviour or even
-   *   memory leaks and crashes.
-   */
-  typedef FT_Pointer  FTC_FaceID;
-
-
-  /************************************************************************
-   *
-   * @functype:
-   *   FTC_Face_Requester
-   *
-   * @description:
-   *   A callback function provided by client applications.  It is used by
-   *   the cache manager to translate a given @FTC_FaceID into a new valid
-   *   @FT_Face object, on demand.
-   *
-   * <Input>
-   *   face_id ::
-   *     The face ID to resolve.
-   *
-   *   library ::
-   *     A handle to a FreeType library object.
-   *
-   *   req_data ::
-   *     Application-provided request data (see note below).
-   *
-   * <Output>
-   *   aface ::
-   *     A new @FT_Face handle.
-   *
-   * <Return>
-   *   FreeType error code.  0~means success.
-   *
-   * <Note>
-   *   The third parameter `req_data' is the same as the one passed by the
-   *   client when @FTC_Manager_New is called.
-   *
-   *   The face requester should not perform funny things on the returned
-   *   face object, like creating a new @FT_Size for it, or setting a
-   *   transformation through @FT_Set_Transform!
-   */
-  typedef FT_Error
-  (*FTC_Face_Requester)( FTC_FaceID  face_id,
-                         FT_Library  library,
-                         FT_Pointer  request_data,
-                         FT_Face*    aface );
-
- /* */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                      CACHE MANAGER OBJECT                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Manager                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This object corresponds to one instance of the cache-subsystem.    */
-  /*    It is used to cache one or more @FT_Face objects, along with       */
-  /*    corresponding @FT_Size objects.                                    */
-  /*                                                                       */
-  /*    The manager intentionally limits the total number of opened        */
-  /*    @FT_Face and @FT_Size objects to control memory usage.  See the    */
-  /*    `max_faces' and `max_sizes' parameters of @FTC_Manager_New.        */
-  /*                                                                       */
-  /*    The manager is also used to cache `nodes' of various types while   */
-  /*    limiting their total memory usage.                                 */
-  /*                                                                       */
-  /*    All limitations are enforced by keeping lists of managed objects   */
-  /*    in most-recently-used order, and flushing old nodes to make room   */
-  /*    for new ones.                                                      */
-  /*                                                                       */
-  typedef struct FTC_ManagerRec_*  FTC_Manager;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Node                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to a cache node object.  Each cache node is       */
-  /*    reference-counted.  A node with a count of~0 might be flushed      */
-  /*    out of a full cache whenever a lookup request is performed.        */
-  /*                                                                       */
-  /*    If you look up nodes, you have the ability to `acquire' them,      */
-  /*    i.e., to increment their reference count.  This will prevent the   */
-  /*    node from being flushed out of the cache until you explicitly      */
-  /*    `release' it (see @FTC_Node_Unref).                                */
-  /*                                                                       */
-  /*    See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup.         */
-  /*                                                                       */
-  typedef struct FTC_NodeRec_*  FTC_Node;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_New                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new cache manager.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: The parent FreeType library handle to use.            */
-  /*                                                                       */
-  /*    max_faces :: Maximum number of opened @FT_Face objects managed by  */
-  /*                 this cache instance.  Use~0 for defaults.             */
-  /*                                                                       */
-  /*    max_sizes :: Maximum number of opened @FT_Size objects managed by  */
-  /*                 this cache instance.  Use~0 for defaults.             */
-  /*                                                                       */
-  /*    max_bytes :: Maximum number of bytes to use for cached data nodes. */
-  /*                 Use~0 for defaults.  Note that this value does not    */
-  /*                 account for managed @FT_Face and @FT_Size objects.    */
-  /*                                                                       */
-  /*    requester :: An application-provided callback used to translate    */
-  /*                 face IDs into real @FT_Face objects.                  */
-  /*                                                                       */
-  /*    req_data  :: A generic pointer that is passed to the requester     */
-  /*                 each time it is called (see @FTC_Face_Requester).     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amanager  :: A handle to a new manager object.  0~in case of       */
-  /*                 failure.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_New( FT_Library          library,
-                   FT_UInt             max_faces,
-                   FT_UInt             max_sizes,
-                   FT_ULong            max_bytes,
-                   FTC_Face_Requester  requester,
-                   FT_Pointer          req_data,
-                   FTC_Manager        *amanager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Reset                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Empty a given cache manager.  This simply gets rid of all the      */
-  /*    currently cached @FT_Face and @FT_Size objects within the manager. */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    manager :: A handle to the manager.                                */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Reset( FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Done                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a given manager after emptying it.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the target cache manager object.            */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Done( FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_LookupFace                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the @FT_Face object that corresponds to a given face ID   */
-  /*    through a cache manager.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /*    face_id :: The ID of the face object.                              */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface   :: A handle to the face object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned @FT_Face object is always owned by the manager.  You  */
-  /*    should never try to discard it yourself.                           */
-  /*                                                                       */
-  /*    The @FT_Face object doesn't necessarily have a current size object */
-  /*    (i.e., face->size can be~0).  If you need a specific `font size',  */
-  /*    use @FTC_Manager_LookupSize instead.                               */
-  /*                                                                       */
-  /*    Never change the face's transformation matrix (i.e., never call    */
-  /*    the @FT_Set_Transform function) on a returned face!  If you need   */
-  /*    to transform glyphs, do it yourself after glyph loading.           */
-  /*                                                                       */
-  /*    When you perform a lookup, out-of-memory errors are detected       */
-  /*    _within_ the lookup and force incremental flushes of the cache     */
-  /*    until enough memory is released for the lookup to succeed.         */
-  /*                                                                       */
-  /*    If a lookup fails with `FT_Err_Out_Of_Memory' the cache has        */
-  /*    already been completely flushed, and still no memory was available */
-  /*    for the operation.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_LookupFace( FTC_Manager  manager,
-                          FTC_FaceID   face_id,
-                          FT_Face     *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_ScalerRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe a given character size in either      */
-  /*    pixels or points to the cache manager.  See                        */
-  /*    @FTC_Manager_LookupSize.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face_id :: The source face ID.                                     */
-  /*                                                                       */
-  /*    width   :: The character width.                                    */
-  /*                                                                       */
-  /*    height  :: The character height.                                   */
-  /*                                                                       */
-  /*    pixel   :: A Boolean.  If 1, the `width' and `height' fields are   */
-  /*               interpreted as integer pixel character sizes.           */
-  /*               Otherwise, they are expressed as 1/64th of points.      */
-  /*                                                                       */
-  /*    x_res   :: Only used when `pixel' is value~0 to indicate the       */
-  /*               horizontal resolution in dpi.                           */
-  /*                                                                       */
-  /*    y_res   :: Only used when `pixel' is value~0 to indicate the       */
-  /*               vertical resolution in dpi.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This type is mainly used to retrieve @FT_Size objects through the  */
-  /*    cache manager.                                                     */
-  /*                                                                       */
-  typedef struct  FTC_ScalerRec_
-  {
-    FTC_FaceID  face_id;
-    FT_UInt     width;
-    FT_UInt     height;
-    FT_Int      pixel;
-    FT_UInt     x_res;
-    FT_UInt     y_res;
-
-  } FTC_ScalerRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_Scaler                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an @FTC_ScalerRec structure.                           */
-  /*                                                                       */
-  typedef struct FTC_ScalerRec_*  FTC_Scaler;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_LookupSize                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the @FT_Size object that corresponds to a given           */
-  /*    @FTC_ScalerRec pointer through a cache manager.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /*    scaler  :: A scaler handle.                                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    asize   :: A handle to the size object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned @FT_Size object is always owned by the manager.  You  */
-  /*    should never try to discard it by yourself.                        */
-  /*                                                                       */
-  /*    You can access the parent @FT_Face object simply as `size->face'   */
-  /*    if you need it.  Note that this object is also owned by the        */
-  /*    manager.                                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    When you perform a lookup, out-of-memory errors are detected       */
-  /*    _within_ the lookup and force incremental flushes of the cache     */
-  /*    until enough memory is released for the lookup to succeed.         */
-  /*                                                                       */
-  /*    If a lookup fails with `FT_Err_Out_Of_Memory' the cache has        */
-  /*    already been completely flushed, and still no memory is available  */
-  /*    for the operation.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_LookupSize( FTC_Manager  manager,
-                          FTC_Scaler   scaler,
-                          FT_Size     *asize );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Node_Unref                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Decrement a cache node's internal reference count.  When the count */
-  /*    reaches 0, it is not destroyed but becomes eligible for subsequent */
-  /*    cache flushes.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node    :: The cache node handle.                                  */
-  /*                                                                       */
-  /*    manager :: The cache manager handle.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Node_Unref( FTC_Node     node,
-                  FTC_Manager  manager );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FTC_Manager_RemoveFaceID
-   *
-   * @description:
-   *   A special function used to indicate to the cache manager that
-   *   a given @FTC_FaceID is no longer valid, either because its
-   *   content changed, or because it was deallocated or uninstalled.
-   *
-   * @input:
-   *   manager ::
-   *     The cache manager handle.
-   *
-   *   face_id ::
-   *     The @FTC_FaceID to be removed.
-   *
-   * @note:
-   *   This function flushes all nodes from the cache corresponding to this
-   *   `face_id', with the exception of nodes with a non-null reference
-   *   count.
-   *
-   *   Such nodes are however modified internally so as to never appear
-   *   in later lookups with the same `face_id' value, and to be immediately
-   *   destroyed when released by all their users.
-   *
-   */
-  FT_EXPORT( void )
-  FTC_Manager_RemoveFaceID( FTC_Manager  manager,
-                            FTC_FaceID   face_id );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FTC_CMapCache
-   *
-   * @description:
-   *   An opaque handle used to model a charmap cache.  This cache is to
-   *   hold character codes -> glyph indices mappings.
-   *
-   */
-  typedef struct FTC_CMapCacheRec_*  FTC_CMapCache;
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FTC_CMapCache_New
-   *
-   * @description:
-   *   Create a new charmap cache.
-   *
-   * @input:
-   *   manager ::
-   *     A handle to the cache manager.
-   *
-   * @output:
-   *   acache ::
-   *     A new cache handle.  NULL in case of error.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   Like all other caches, this one will be destroyed with the cache
-   *   manager.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FTC_CMapCache_New( FTC_Manager     manager,
-                     FTC_CMapCache  *acache );
-
-
-  /************************************************************************
-   *
-   * @function:
-   *   FTC_CMapCache_Lookup
-   *
-   * @description:
-   *   Translate a character code into a glyph index, using the charmap
-   *   cache.
-   *
-   * @input:
-   *   cache ::
-   *     A charmap cache handle.
-   *
-   *   face_id ::
-   *     The source face ID.
-   *
-   *   cmap_index ::
-   *     The index of the charmap in the source face.  Any negative value
-   *     means to use the cache @FT_Face's default charmap.
-   *
-   *   char_code ::
-   *     The character code (in the corresponding charmap).
-   *
-   * @return:
-   *    Glyph index.  0~means `no glyph'.
-   *
-   */
-  FT_EXPORT( FT_UInt )
-  FTC_CMapCache_Lookup( FTC_CMapCache  cache,
-                        FTC_FaceID     face_id,
-                        FT_Int         cmap_index,
-                        FT_UInt32      char_code );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       IMAGE CACHE OBJECT                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FTC_ImageTypeRec
-   *
-   * @description:
-   *   A structure used to model the type of images in a glyph cache.
-   *
-   * @fields:
-   *   face_id ::
-   *     The face ID.
-   *
-   *   width ::
-   *     The width in pixels.
-   *
-   *   height ::
-   *     The height in pixels.
-   *
-   *   flags ::
-   *     The load flags, as in @FT_Load_Glyph.
-   *
-   */
-  typedef struct  FTC_ImageTypeRec_
-  {
-    FTC_FaceID  face_id;
-    FT_Int      width;
-    FT_Int      height;
-    FT_Int32    flags;
-
-  } FTC_ImageTypeRec;
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FTC_ImageType
-   *
-   * @description:
-   *   A handle to an @FTC_ImageTypeRec structure.
-   *
-   */
-  typedef struct FTC_ImageTypeRec_*  FTC_ImageType;
-
-
-  /* */
-
-
-#define FTC_IMAGE_TYPE_COMPARE( d1, d2 )      \
-          ( (d1)->face_id == (d2)->face_id && \
-            (d1)->width   == (d2)->width   && \
-            (d1)->flags   == (d2)->flags   )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_ImageCache                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a glyph image cache object.  They are designed to      */
-  /*    hold many distinct glyph images while not exceeding a certain      */
-  /*    memory threshold.                                                  */
-  /*                                                                       */
-  typedef struct FTC_ImageCacheRec_*  FTC_ImageCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_New                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new glyph image cache.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: The parent manager for the image cache.                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new glyph image cache object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_New( FTC_Manager      manager,
-                      FTC_ImageCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_Lookup                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve a given glyph image from a glyph image cache.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source glyph image cache.                */
-  /*                                                                       */
-  /*    type   :: A pointer to a glyph image type descriptor.              */
-  /*                                                                       */
-  /*    gindex :: The glyph index to retrieve.                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: The corresponding @FT_Glyph object.  0~in case of        */
-  /*              failure.                                                 */
-  /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
-  /*              node after incrementing its reference count (see note    */
-  /*              below).                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned glyph is owned and managed by the glyph image cache.  */
-  /*    Never try to transform or discard it manually!  You can however    */
-  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the glyph image, after increasing its reference    */
-  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
-  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
-  /*    `release' it.                                                      */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_Lookup( FTC_ImageCache  cache,
-                         FTC_ImageType   type,
-                         FT_UInt         gindex,
-                         FT_Glyph       *aglyph,
-                         FTC_Node       *anode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_LookupScaler                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A variant of @FTC_ImageCache_Lookup that uses an @FTC_ScalerRec    */
-  /*    to specify the face ID and its size.                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache      :: A handle to the source glyph image cache.            */
-  /*                                                                       */
-  /*    scaler     :: A pointer to a scaler descriptor.                    */
-  /*                                                                       */
-  /*    load_flags :: The corresponding load flags.                        */
-  /*                                                                       */
-  /*    gindex     :: The glyph index to retrieve.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph     :: The corresponding @FT_Glyph object.  0~in case of    */
-  /*                  failure.                                             */
-  /*                                                                       */
-  /*    anode      :: Used to return the address of of the corresponding   */
-  /*                  cache node after incrementing its reference count    */
-  /*                  (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned glyph is owned and managed by the glyph image cache.  */
-  /*    Never try to transform or discard it manually!  You can however    */
-  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the glyph image, after increasing its reference    */
-  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
-  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
-  /*    `release' it.                                                      */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  /*    Calls to @FT_Set_Char_Size and friends have no effect on cached    */
-  /*    glyphs; you should always use the FreeType cache API instead.      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_LookupScaler( FTC_ImageCache  cache,
-                               FTC_Scaler      scaler,
-                               FT_ULong        load_flags,
-                               FT_UInt         gindex,
-                               FT_Glyph       *aglyph,
-                               FTC_Node       *anode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBit                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a small bitmap descriptor.  See the @FTC_SBitRec       */
-  /*    structure for details.                                             */
-  /*                                                                       */
-  typedef struct FTC_SBitRec_*  FTC_SBit;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_SBitRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very compact structure used to describe a small glyph bitmap.    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    width     :: The bitmap width in pixels.                           */
-  /*                                                                       */
-  /*    height    :: The bitmap height in pixels.                          */
-  /*                                                                       */
-  /*    left      :: The horizontal distance from the pen position to the  */
-  /*                 left bitmap border (a.k.a. `left side bearing', or    */
-  /*                 `lsb').                                               */
-  /*                                                                       */
-  /*    top       :: The vertical distance from the pen position (on the   */
-  /*                 baseline) to the upper bitmap border (a.k.a. `top     */
-  /*                 side bearing').  The distance is positive for upwards */
-  /*                 y~coordinates.                                        */
-  /*                                                                       */
-  /*    format    :: The format of the glyph bitmap (monochrome or gray).  */
-  /*                                                                       */
-  /*    max_grays :: Maximum gray level value (in the range 1 to~255).     */
-  /*                                                                       */
-  /*    pitch     :: The number of bytes per bitmap line.  May be positive */
-  /*                 or negative.                                          */
-  /*                                                                       */
-  /*    xadvance  :: The horizontal advance width in pixels.               */
-  /*                                                                       */
-  /*    yadvance  :: The vertical advance height in pixels.                */
-  /*                                                                       */
-  /*    buffer    :: A pointer to the bitmap pixels.                       */
-  /*                                                                       */
-  typedef struct  FTC_SBitRec_
-  {
-    FT_Byte   width;
-    FT_Byte   height;
-    FT_Char   left;
-    FT_Char   top;
-
-    FT_Byte   format;
-    FT_Byte   max_grays;
-    FT_Short  pitch;
-    FT_Char   xadvance;
-    FT_Char   yadvance;
-
-    FT_Byte*  buffer;
-
-  } FTC_SBitRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBitCache                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a small bitmap cache.  These are special cache objects */
-  /*    used to store small glyph bitmaps (and anti-aliased pixmaps) in a  */
-  /*    much more efficient way than the traditional glyph image cache     */
-  /*    implemented by @FTC_ImageCache.                                    */
-  /*                                                                       */
-  typedef struct FTC_SBitCacheRec_*  FTC_SBitCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_New                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new cache to store small glyph bitmaps.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the source cache manager.                   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new sbit cache.  NULL in case of error. */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_New( FTC_Manager     manager,
-                     FTC_SBitCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_Lookup                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Look up a given small glyph bitmap in a given sbit cache and       */
-  /*    `lock' it to prevent its flushing from the cache until needed.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source sbit cache.                       */
-  /*                                                                       */
-  /*    type   :: A pointer to the glyph image type descriptor.            */
-  /*                                                                       */
-  /*    gindex :: The glyph index.                                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sbit   :: A handle to a small bitmap descriptor.                   */
-  /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
-  /*              node after incrementing its reference count (see note    */
-  /*              below).                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The small bitmap descriptor and its bit buffer are owned by the    */
-  /*    cache and should never be freed by the application.  They might    */
-  /*    as well disappear from memory on the next cache lookup, so don't   */
-  /*    treat them as persistent data.                                     */
-  /*                                                                       */
-  /*    The descriptor's `buffer' field is set to~0 to indicate a missing  */
-  /*    glyph bitmap.                                                      */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the bitmap, after increasing its reference count.  */
-  /*    This ensures that the node (as well as the image) will always be   */
-  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the bitmap could be flushed out of the cache on the next      */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_Lookup( FTC_SBitCache    cache,
-                        FTC_ImageType    type,
-                        FT_UInt          gindex,
-                        FTC_SBit        *sbit,
-                        FTC_Node        *anode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_LookupScaler                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A variant of @FTC_SBitCache_Lookup that uses an @FTC_ScalerRec     */
-  /*    to specify the face ID and its size.                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache      :: A handle to the source sbit cache.                   */
-  /*                                                                       */
-  /*    scaler     :: A pointer to the scaler descriptor.                  */
-  /*                                                                       */
-  /*    load_flags :: The corresponding load flags.                        */
-  /*                                                                       */
-  /*    gindex     :: The glyph index.                                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sbit       :: A handle to a small bitmap descriptor.               */
-  /*                                                                       */
-  /*    anode      :: Used to return the address of of the corresponding   */
-  /*                  cache node after incrementing its reference count    */
-  /*                  (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The small bitmap descriptor and its bit buffer are owned by the    */
-  /*    cache and should never be freed by the application.  They might    */
-  /*    as well disappear from memory on the next cache lookup, so don't   */
-  /*    treat them as persistent data.                                     */
-  /*                                                                       */
-  /*    The descriptor's `buffer' field is set to~0 to indicate a missing  */
-  /*    glyph bitmap.                                                      */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the bitmap, after increasing its reference count.  */
-  /*    This ensures that the node (as well as the image) will always be   */
-  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the bitmap could be flushed out of the cache on the next      */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_LookupScaler( FTC_SBitCache  cache,
-                              FTC_Scaler     scaler,
-                              FT_ULong       load_flags,
-                              FT_UInt        gindex,
-                              FTC_SBit      *sbit,
-                              FTC_Node      *anode );
-
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTCACHE_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ttunpat.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ttunpat.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ttunpat.h	(copie de travail)
@@ -1,59 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ttunpat.h                                                              */
-/*                                                                         */
-/*    Definitions for the unpatented TrueType hinting system               */
-/*                                                                         */
-/*  Copyright 2003, 2006 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  Written by Graham Asher <graham.asher@btinternet.com>                  */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTUNPAT_H__
-#define __TTUNPAT_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
- /***************************************************************************
-  *
-  * @constant:
-  *   FT_PARAM_TAG_UNPATENTED_HINTING
-  *
-  * @description:
-  *   A constant used as the tag of an @FT_Parameter structure to indicate
-  *   that unpatented methods only should be used by the TrueType bytecode
-  *   interpreter for a typeface opened by @FT_Open_Face.
-  *
-  */
-#define FT_PARAM_TAG_UNPATENTED_HINTING  FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __TTUNPAT_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftsynth.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftsynth.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftsynth.h	(copie de travail)
@@ -1,81 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsynth.h                                                              */
-/*                                                                         */
-/*    FreeType synthesizing code for emboldening and slanting              */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 2000-2001, 2003, 2006, 2008, 2012 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********        WARNING, THIS IS ALPHA CODE!  THIS API         *********/
-  /*********    IS DUE TO CHANGE UNTIL STRICTLY NOTIFIED BY THE    *********/
-  /*********            FREETYPE DEVELOPMENT TEAM                  *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* Main reason for not lifting the functions in this module to a  */
-  /* `standard' API is that the used parameters for emboldening and */
-  /* slanting are not configurable.  Consider the functions as a    */
-  /* code resource which should be copied into the application and  */
-  /* adapted to the particular needs.                               */
-
-
-#ifndef __FTSYNTH_H__
-#define __FTSYNTH_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /* Embolden a glyph by a `reasonable' value (which is highly a matter of */
-  /* taste).  This function is actually a convenience function, providing  */
-  /* a wrapper for @FT_Outline_Embolden and @FT_Bitmap_Embolden.           */
-  /*                                                                       */
-  /* For emboldened outlines the height, width, and advance metrics are    */
-  /* increased by the strength of the emboldening.  You can also call      */
-  /* @FT_Outline_Get_CBox to get precise values.                           */
-  FT_EXPORT( void )
-  FT_GlyphSlot_Embolden( FT_GlyphSlot  slot );
-
-  /* Slant an outline glyph to the right by about 12 degrees. */
-  FT_EXPORT( void )
-  FT_GlyphSlot_Oblique( FT_GlyphSlot  slot );
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* __FTSYNTH_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftstroke.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftstroke.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftstroke.h	(copie de travail)
@@ -1,751 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstroke.h                                                             */
-/*                                                                         */
-/*    FreeType path stroker (specification).                               */
-/*                                                                         */
-/*  Copyright 2002-2006, 2008, 2009, 2011-2012 by                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FT_STROKE_H__
-#define __FT_STROKE_H__
-
-#include <ft2build.h>
-#include FT_OUTLINE_H
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
- /************************************************************************
-  *
-  * @section:
-  *    glyph_stroker
-  *
-  * @title:
-  *    Glyph Stroker
-  *
-  * @abstract:
-  *    Generating bordered and stroked glyphs.
-  *
-  * @description:
-  *    This component generates stroked outlines of a given vectorial
-  *    glyph.  It also allows you to retrieve the `outside' and/or the
-  *    `inside' borders of the stroke.
-  *
-  *    This can be useful to generate `bordered' glyph, i.e., glyphs
-  *    displayed with a coloured (and anti-aliased) border around their
-  *    shape.
-  */
-
-
- /**************************************************************
-  *
-  * @type:
-  *   FT_Stroker
-  *
-  * @description:
-  *   Opaque handler to a path stroker object.
-  */
-  typedef struct FT_StrokerRec_*  FT_Stroker;
-
-
-  /**************************************************************
-   *
-   * @enum:
-   *   FT_Stroker_LineJoin
-   *
-   * @description:
-   *   These values determine how two joining lines are rendered
-   *   in a stroker.
-   *
-   * @values:
-   *   FT_STROKER_LINEJOIN_ROUND ::
-   *     Used to render rounded line joins.  Circular arcs are used
-   *     to join two lines smoothly.
-   *
-   *   FT_STROKER_LINEJOIN_BEVEL ::
-   *     Used to render beveled line joins.  The outer corner of
-   *     the joined lines is filled by enclosing the triangular
-   *     region of the corner with a straight line between the
-   *     outer corners of each stroke.
-   *
-   *   FT_STROKER_LINEJOIN_MITER_FIXED ::
-   *     Used to render mitered line joins, with fixed bevels if the
-   *     miter limit is exceeded.  The outer edges of the strokes
-   *     for the two segments are extended until they meet at an
-   *     angle.  If the segments meet at too sharp an angle (such
-   *     that the miter would extend from the intersection of the
-   *     segments a distance greater than the product of the miter
-   *     limit value and the border radius), then a bevel join (see
-   *     above) is used instead.  This prevents long spikes being
-   *     created.  FT_STROKER_LINEJOIN_MITER_FIXED generates a miter
-   *     line join as used in PostScript and PDF.
-   *
-   *   FT_STROKER_LINEJOIN_MITER_VARIABLE ::
-   *   FT_STROKER_LINEJOIN_MITER ::
-   *     Used to render mitered line joins, with variable bevels if
-   *     the miter limit is exceeded.  The intersection of the
-   *     strokes is clipped at a line perpendicular to the bisector
-   *     of the angle between the strokes, at the distance from the
-   *     intersection of the segments equal to the product of the
-   *     miter limit value and the border radius.  This prevents
-   *     long spikes being created.
-   *     FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line
-   *     join as used in XPS.  FT_STROKER_LINEJOIN_MITER is an alias
-   *     for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for
-   *     backwards compatibility.
-   */
-  typedef enum  FT_Stroker_LineJoin_
-  {
-    FT_STROKER_LINEJOIN_ROUND          = 0,
-    FT_STROKER_LINEJOIN_BEVEL          = 1,
-    FT_STROKER_LINEJOIN_MITER_VARIABLE = 2,
-    FT_STROKER_LINEJOIN_MITER          = FT_STROKER_LINEJOIN_MITER_VARIABLE,
-    FT_STROKER_LINEJOIN_MITER_FIXED    = 3
-
-  } FT_Stroker_LineJoin;
-
-
-  /**************************************************************
-   *
-   * @enum:
-   *   FT_Stroker_LineCap
-   *
-   * @description:
-   *   These values determine how the end of opened sub-paths are
-   *   rendered in a stroke.
-   *
-   * @values:
-   *   FT_STROKER_LINECAP_BUTT ::
-   *     The end of lines is rendered as a full stop on the last
-   *     point itself.
-   *
-   *   FT_STROKER_LINECAP_ROUND ::
-   *     The end of lines is rendered as a half-circle around the
-   *     last point.
-   *
-   *   FT_STROKER_LINECAP_SQUARE ::
-   *     The end of lines is rendered as a square around the
-   *     last point.
-   */
-  typedef enum  FT_Stroker_LineCap_
-  {
-    FT_STROKER_LINECAP_BUTT = 0,
-    FT_STROKER_LINECAP_ROUND,
-    FT_STROKER_LINECAP_SQUARE
-
-  } FT_Stroker_LineCap;
-
-
-  /**************************************************************
-   *
-   * @enum:
-   *   FT_StrokerBorder
-   *
-   * @description:
-   *   These values are used to select a given stroke border
-   *   in @FT_Stroker_GetBorderCounts and @FT_Stroker_ExportBorder.
-   *
-   * @values:
-   *   FT_STROKER_BORDER_LEFT ::
-   *     Select the left border, relative to the drawing direction.
-   *
-   *   FT_STROKER_BORDER_RIGHT ::
-   *     Select the right border, relative to the drawing direction.
-   *
-   * @note:
-   *   Applications are generally interested in the `inside' and `outside'
-   *   borders.  However, there is no direct mapping between these and the
-   *   `left' and `right' ones, since this really depends on the glyph's
-   *   drawing orientation, which varies between font formats.
-   *
-   *   You can however use @FT_Outline_GetInsideBorder and
-   *   @FT_Outline_GetOutsideBorder to get these.
-   */
-  typedef enum  FT_StrokerBorder_
-  {
-    FT_STROKER_BORDER_LEFT = 0,
-    FT_STROKER_BORDER_RIGHT
-
-  } FT_StrokerBorder;
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Outline_GetInsideBorder
-   *
-   * @description:
-   *   Retrieve the @FT_StrokerBorder value corresponding to the
-   *   `inside' borders of a given outline.
-   *
-   * @input:
-   *   outline ::
-   *     The source outline handle.
-   *
-   * @return:
-   *   The border index.  @FT_STROKER_BORDER_RIGHT for empty or invalid
-   *   outlines.
-   */
-  FT_EXPORT( FT_StrokerBorder )
-  FT_Outline_GetInsideBorder( FT_Outline*  outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Outline_GetOutsideBorder
-   *
-   * @description:
-   *   Retrieve the @FT_StrokerBorder value corresponding to the
-   *   `outside' borders of a given outline.
-   *
-   * @input:
-   *   outline ::
-   *     The source outline handle.
-   *
-   * @return:
-   *   The border index.  @FT_STROKER_BORDER_LEFT for empty or invalid
-   *   outlines.
-   */
-  FT_EXPORT( FT_StrokerBorder )
-  FT_Outline_GetOutsideBorder( FT_Outline*  outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_New
-   *
-   * @description:
-   *   Create a new stroker object.
-   *
-   * @input:
-   *   library ::
-   *     FreeType library handle.
-   *
-   * @output:
-   *   astroker ::
-   *     A new stroker object handle.  NULL in case of error.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_New( FT_Library   library,
-                  FT_Stroker  *astroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Set
-   *
-   * @description:
-   *   Reset a stroker object's attributes.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   radius ::
-   *     The border radius.
-   *
-   *   line_cap ::
-   *     The line cap style.
-   *
-   *   line_join ::
-   *     The line join style.
-   *
-   *   miter_limit ::
-   *     The miter limit for the FT_STROKER_LINEJOIN_MITER_FIXED and
-   *     FT_STROKER_LINEJOIN_MITER_VARIABLE line join styles,
-   *     expressed as 16.16 fixed-point value.
-   *
-   * @note:
-   *   The radius is expressed in the same units as the outline
-   *   coordinates.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Set( FT_Stroker           stroker,
-                  FT_Fixed             radius,
-                  FT_Stroker_LineCap   line_cap,
-                  FT_Stroker_LineJoin  line_join,
-                  FT_Fixed             miter_limit );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Rewind
-   *
-   * @description:
-   *   Reset a stroker object without changing its attributes.
-   *   You should call this function before beginning a new
-   *   series of calls to @FT_Stroker_BeginSubPath or
-   *   @FT_Stroker_EndSubPath.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Rewind( FT_Stroker  stroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_ParseOutline
-   *
-   * @description:
-   *   A convenience function used to parse a whole outline with
-   *   the stroker.  The resulting outline(s) can be retrieved
-   *   later by functions like @FT_Stroker_GetCounts and @FT_Stroker_Export.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   outline ::
-   *     The source outline.
-   *
-   *   opened ::
-   *     A boolean.  If~1, the outline is treated as an open path instead
-   *     of a closed one.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   If `opened' is~0 (the default), the outline is treated as a closed
-   *   path, and the stroker generates two distinct `border' outlines.
-   *
-   *   If `opened' is~1, the outline is processed as an open path, and the
-   *   stroker generates a single `stroke' outline.
-   *
-   *   This function calls @FT_Stroker_Rewind automatically.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ParseOutline( FT_Stroker   stroker,
-                           FT_Outline*  outline,
-                           FT_Bool      opened );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_BeginSubPath
-   *
-   * @description:
-   *   Start a new sub-path in the stroker.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   to ::
-   *     A pointer to the start vector.
-   *
-   *   open ::
-   *     A boolean.  If~1, the sub-path is treated as an open one.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   This function is useful when you need to stroke a path that is
-   *   not stored as an @FT_Outline object.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_BeginSubPath( FT_Stroker  stroker,
-                           FT_Vector*  to,
-                           FT_Bool     open );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_EndSubPath
-   *
-   * @description:
-   *   Close the current sub-path in the stroker.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function after @FT_Stroker_BeginSubPath.
-   *   If the subpath was not `opened', this function `draws' a
-   *   single line segment to the start position when needed.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_EndSubPath( FT_Stroker  stroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_LineTo
-   *
-   * @description:
-   *   `Draw' a single line segment in the stroker's current sub-path,
-   *   from the last position.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   to ::
-   *     A pointer to the destination point.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function between @FT_Stroker_BeginSubPath and
-   *   @FT_Stroker_EndSubPath.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_LineTo( FT_Stroker  stroker,
-                     FT_Vector*  to );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_ConicTo
-   *
-   * @description:
-   *   `Draw' a single quadratic BÃ©zier in the stroker's current sub-path,
-   *   from the last position.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   control ::
-   *     A pointer to a BÃ©zier control point.
-   *
-   *   to ::
-   *     A pointer to the destination point.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function between @FT_Stroker_BeginSubPath and
-   *   @FT_Stroker_EndSubPath.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ConicTo( FT_Stroker  stroker,
-                      FT_Vector*  control,
-                      FT_Vector*  to );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_CubicTo
-   *
-   * @description:
-   *   `Draw' a single cubic BÃ©zier in the stroker's current sub-path,
-   *   from the last position.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   control1 ::
-   *     A pointer to the first BÃ©zier control point.
-   *
-   *   control2 ::
-   *     A pointer to second BÃ©zier control point.
-   *
-   *   to ::
-   *     A pointer to the destination point.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function between @FT_Stroker_BeginSubPath and
-   *   @FT_Stroker_EndSubPath.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_CubicTo( FT_Stroker  stroker,
-                      FT_Vector*  control1,
-                      FT_Vector*  control2,
-                      FT_Vector*  to );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_GetBorderCounts
-   *
-   * @description:
-   *   Call this function once you have finished parsing your paths
-   *   with the stroker.  It returns the number of points and
-   *   contours necessary to export one of the `border' or `stroke'
-   *   outlines generated by the stroker.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   border ::
-   *     The border index.
-   *
-   * @output:
-   *   anum_points ::
-   *     The number of points.
-   *
-   *   anum_contours ::
-   *     The number of contours.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   When an outline, or a sub-path, is `closed', the stroker generates
-   *   two independent `border' outlines, named `left' and `right'.
-   *
-   *   When the outline, or a sub-path, is `opened', the stroker merges
-   *   the `border' outlines with caps.  The `left' border receives all
-   *   points, while the `right' border becomes empty.
-   *
-   *   Use the function @FT_Stroker_GetCounts instead if you want to
-   *   retrieve the counts associated to both borders.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetBorderCounts( FT_Stroker        stroker,
-                              FT_StrokerBorder  border,
-                              FT_UInt          *anum_points,
-                              FT_UInt          *anum_contours );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_ExportBorder
-   *
-   * @description:
-   *   Call this function after @FT_Stroker_GetBorderCounts to
-   *   export the corresponding border to your own @FT_Outline
-   *   structure.
-   *
-   *   Note that this function appends the border points and
-   *   contours to your outline, but does not try to resize its
-   *   arrays.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   border ::
-   *     The border index.
-   *
-   *   outline ::
-   *     The target outline handle.
-   *
-   * @note:
-   *   Always call this function after @FT_Stroker_GetBorderCounts to
-   *   get sure that there is enough room in your @FT_Outline object to
-   *   receive all new data.
-   *
-   *   When an outline, or a sub-path, is `closed', the stroker generates
-   *   two independent `border' outlines, named `left' and `right'
-   *
-   *   When the outline, or a sub-path, is `opened', the stroker merges
-   *   the `border' outlines with caps. The `left' border receives all
-   *   points, while the `right' border becomes empty.
-   *
-   *   Use the function @FT_Stroker_Export instead if you want to
-   *   retrieve all borders at once.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_ExportBorder( FT_Stroker        stroker,
-                           FT_StrokerBorder  border,
-                           FT_Outline*       outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_GetCounts
-   *
-   * @description:
-   *   Call this function once you have finished parsing your paths
-   *   with the stroker.  It returns the number of points and
-   *   contours necessary to export all points/borders from the stroked
-   *   outline/path.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   * @output:
-   *   anum_points ::
-   *     The number of points.
-   *
-   *   anum_contours ::
-   *     The number of contours.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetCounts( FT_Stroker  stroker,
-                        FT_UInt    *anum_points,
-                        FT_UInt    *anum_contours );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Export
-   *
-   * @description:
-   *   Call this function after @FT_Stroker_GetBorderCounts to
-   *   export all borders to your own @FT_Outline structure.
-   *
-   *   Note that this function appends the border points and
-   *   contours to your outline, but does not try to resize its
-   *   arrays.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   outline ::
-   *     The target outline handle.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Export( FT_Stroker   stroker,
-                     FT_Outline*  outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Done
-   *
-   * @description:
-   *   Destroy a stroker object.
-   *
-   * @input:
-   *   stroker ::
-   *     A stroker handle.  Can be NULL.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Done( FT_Stroker  stroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Glyph_Stroke
-   *
-   * @description:
-   *   Stroke a given outline glyph object with a given stroker.
-   *
-   * @inout:
-   *   pglyph ::
-   *     Source glyph handle on input, new glyph handle on output.
-   *
-   * @input:
-   *   stroker ::
-   *     A stroker handle.
-   *
-   *   destroy ::
-   *     A Boolean.  If~1, the source glyph object is destroyed
-   *     on success.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *   The source glyph is untouched in case of error.
-   *
-   *   Adding stroke may yield a significantly wider and taller glyph
-   *   depending on how large of a radius was used to stroke the glyph.  You
-   *   may need to manually adjust horizontal and vertical advance amounts
-   *   to account for this added size.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Stroke( FT_Glyph    *pglyph,
-                   FT_Stroker   stroker,
-                   FT_Bool      destroy );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Glyph_StrokeBorder
-   *
-   * @description:
-   *   Stroke a given outline glyph object with a given stroker, but
-   *   only return either its inside or outside border.
-   *
-   * @inout:
-   *   pglyph ::
-   *     Source glyph handle on input, new glyph handle on output.
-   *
-   * @input:
-   *   stroker ::
-   *     A stroker handle.
-   *
-   *   inside ::
-   *     A Boolean.  If~1, return the inside border, otherwise
-   *     the outside border.
-   *
-   *   destroy ::
-   *     A Boolean.  If~1, the source glyph object is destroyed
-   *     on success.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *   The source glyph is untouched in case of error.
-   *
-   *   Adding stroke may yield a significantly wider and taller glyph
-   *   depending on how large of a radius was used to stroke the glyph.  You
-   *   may need to manually adjust horizontal and vertical advance amounts
-   *   to account for this added size.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_StrokeBorder( FT_Glyph    *pglyph,
-                         FT_Stroker   stroker,
-                         FT_Bool      inside,
-                         FT_Bool      destroy );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FT_STROKE_H__ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
Index: lib/3rdparty/freetype/include/freetype/ftmodapi.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftmodapi.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftmodapi.h	(copie de travail)
@@ -1,641 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmodapi.h                                                             */
-/*                                                                         */
-/*    FreeType modules public interface (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2003, 2006, 2008-2010, 2012, 2013 by                    */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMODAPI_H__
-#define __FTMODAPI_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Module Management                                                  */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to add, upgrade, remove, and control modules from FreeType.    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The definitions below are used to manage modules within FreeType.  */
-  /*    Modules can be added, upgraded, and removed at runtime.            */
-  /*    Additionally, some module properties can be controlled also.       */
-  /*                                                                       */
-  /*    Here is a list of possible values of the `module_name' field in    */
-  /*    the @FT_Module_Class structure.                                    */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      autofitter                                                       */
-  /*      bdf                                                              */
-  /*      cff                                                              */
-  /*      gxvalid                                                          */
-  /*      otvalid                                                          */
-  /*      pcf                                                              */
-  /*      pfr                                                              */
-  /*      psaux                                                            */
-  /*      pshinter                                                         */
-  /*      psnames                                                          */
-  /*      raster1, raster5                                                 */
-  /*      sfnt                                                             */
-  /*      smooth, smooth-lcd, smooth-lcdv                                  */
-  /*      truetype                                                         */
-  /*      type1                                                            */
-  /*      type42                                                           */
-  /*      t1cid                                                            */
-  /*      winfonts                                                         */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Note that the FreeType Cache sub-system is not a FreeType module.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* module bit flags */
-#define FT_MODULE_FONT_DRIVER         1  /* this module is a font driver  */
-#define FT_MODULE_RENDERER            2  /* this module is a renderer     */
-#define FT_MODULE_HINTER              4  /* this module is a glyph hinter */
-#define FT_MODULE_STYLER              8  /* this module is a styler       */
-
-#define FT_MODULE_DRIVER_SCALABLE     0x100   /* the driver supports      */
-                                              /* scalable fonts           */
-#define FT_MODULE_DRIVER_NO_OUTLINES  0x200   /* the driver does not      */
-                                              /* support vector outlines  */
-#define FT_MODULE_DRIVER_HAS_HINTER   0x400   /* the driver provides its  */
-                                              /* own hinter               */
-
-
-  /* deprecated values */
-#define ft_module_font_driver         FT_MODULE_FONT_DRIVER
-#define ft_module_renderer            FT_MODULE_RENDERER
-#define ft_module_hinter              FT_MODULE_HINTER
-#define ft_module_styler              FT_MODULE_STYLER
-
-#define ft_module_driver_scalable     FT_MODULE_DRIVER_SCALABLE
-#define ft_module_driver_no_outlines  FT_MODULE_DRIVER_NO_OUTLINES
-#define ft_module_driver_has_hinter   FT_MODULE_DRIVER_HAS_HINTER
-
-
-  typedef FT_Pointer  FT_Module_Interface;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Constructor                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to initialize (not create) a new module object.    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module :: The module to initialize.                                */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_Module_Constructor)( FT_Module  module );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Destructor                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to finalize (not destroy) a given module object.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module :: The module to finalize.                                  */
-  /*                                                                       */
-  typedef void
-  (*FT_Module_Destructor)( FT_Module  module );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Requester                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to query a given module for a specific interface.  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module :: The module to be searched.                               */
-  /*                                                                       */
-  /*    name ::   The name of the interface in the module.                 */
-  /*                                                                       */
-  typedef FT_Module_Interface
-  (*FT_Module_Requester)( FT_Module    module,
-                          const char*  name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Module_Class                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The module class descriptor.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    module_flags    :: Bit flags describing the module.                */
-  /*                                                                       */
-  /*    module_size     :: The size of one module object/instance in       */
-  /*                       bytes.                                          */
-  /*                                                                       */
-  /*    module_name     :: The name of the module.                         */
-  /*                                                                       */
-  /*    module_version  :: The version, as a 16.16 fixed number            */
-  /*                       (major.minor).                                  */
-  /*                                                                       */
-  /*    module_requires :: The version of FreeType this module requires,   */
-  /*                       as a 16.16 fixed number (major.minor).  Starts  */
-  /*                       at version 2.0, i.e., 0x20000.                  */
-  /*                                                                       */
-  /*    module_init     :: The initializing function.                      */
-  /*                                                                       */
-  /*    module_done     :: The finalizing function.                        */
-  /*                                                                       */
-  /*    get_interface   :: The interface requesting function.              */
-  /*                                                                       */
-  typedef struct  FT_Module_Class_
-  {
-    FT_ULong               module_flags;
-    FT_Long                module_size;
-    const FT_String*       module_name;
-    FT_Fixed               module_version;
-    FT_Fixed               module_requires;
-
-    const void*            module_interface;
-
-    FT_Module_Constructor  module_init;
-    FT_Module_Destructor   module_done;
-    FT_Module_Requester    get_interface;
-
-  } FT_Module_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Add_Module                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Add a new module to a given library instance.                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to the library object.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    clazz   :: A pointer to class descriptor for the module.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error will be returned if a module already exists by that name, */
-  /*    or if the module requires a version of FreeType that is too great. */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Add_Module( FT_Library              library,
-                 const FT_Module_Class*  clazz );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Module                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Find a module by its name.                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object.                     */
-  /*                                                                       */
-  /*    module_name :: The module's name (as an ASCII string).             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A module handle.  0~if none was found.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    FreeType's internal modules aren't documented very well, and you   */
-  /*    should look up the source code for details.                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Module )
-  FT_Get_Module( FT_Library   library,
-                 const char*  module_name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Remove_Module                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Remove a given module from a library instance.                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module  :: A handle to a module object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The module object is destroyed by the function in case of success. */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Remove_Module( FT_Library  library,
-                    FT_Module   module );
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Property_Set
-   *
-   * @description:
-   *    Set a property for a given module.
-   *
-   * @input:
-   *    library ::
-   *       A handle to the library the module is part of.
-   *
-   *    module_name ::
-   *       The module name.
-   *
-   *    property_name ::
-   *       The property name.  Properties are described in the `Synopsis'
-   *       subsection of the module's documentation.
-   *
-   *       Note that only a few modules have properties.
-   *
-   *    value ::
-   *       A generic pointer to a variable or structure which gives the new
-   *       value of the property.  The exact definition of `value' is
-   *       dependent on the property; see the `Synopsis' subsection of the
-   *       module's documentation.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *    If `module_name' isn't a valid module name, or `property_name'
-   *    doesn't specify a valid property, or if `value' doesn't represent a
-   *    valid value for the given property, an error is returned.
-   *
-   *    The following example sets property `bar' (a simple integer) in
-   *    module `foo' to value~1.
-   *
-   *    {
-   *      FT_UInt  bar;
-   *
-   *
-   *      bar = 1;
-   *      FT_Property_Set( library, "foo", "bar", &bar );
-   *    }
-   *
-   *    Note that the FreeType Cache sub-system doesn't recognize module
-   *    property changes.  To avoid glyph lookup confusion within the cache
-   *    you should call @FTC_Manager_Reset to completely flush the cache if
-   *    a module property gets changed after @FTC_Manager_New has been
-   *    called.
-   *
-   *    It is not possible to set properties of the FreeType Cache
-   *    sub-system itself with FT_Property_Set; use @FTC_Property_Set
-   *    instead.
-   *
-   *  @since:
-   *    2.4.11
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Property_Set( FT_Library        library,
-                   const FT_String*  module_name,
-                   const FT_String*  property_name,
-                   const void*       value );
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Property_Get
-   *
-   * @description:
-   *    Get a module's property value.
-   *
-   * @input:
-   *    library ::
-   *       A handle to the library the module is part of.
-   *
-   *    module_name ::
-   *       The module name.
-   *
-   *    property_name ::
-   *       The property name.  Properties are described in the `Synopsis'
-   *       subsection of the module's documentation.
-   *
-   * @inout:
-   *    value ::
-   *       A generic pointer to a variable or structure which gives the
-   *       value of the property.  The exact definition of `value' is
-   *       dependent on the property; see the `Synopsis' subsection of the
-   *       module's documentation.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *    If `module_name' isn't a valid module name, or `property_name'
-   *    doesn't specify a valid property, or if `value' doesn't represent a
-   *    valid value for the given property, an error is returned.
-   *
-   *    The following example gets property `baz' (a range) in module `foo'.
-   *
-   *    {
-   *      typedef  range_
-   *      {
-   *        FT_Int32  min;
-   *        FT_Int32  max;
-   *
-   *      } range;
-   *
-   *      range  baz;
-   *
-   *
-   *      FT_Property_Get( library, "foo", "baz", &baz );
-   *    }
-   *
-   *    It is not possible to retrieve properties of the FreeType Cache
-   *    sub-system with FT_Property_Get; use @FTC_Property_Get instead.
-   *
-   *  @since:
-   *    2.4.11
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Property_Get( FT_Library        library,
-                   const FT_String*  module_name,
-                   const FT_String*  property_name,
-                   void*             value );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Reference_Library                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A counter gets initialized to~1 at the time an @FT_Library         */
-  /*    structure is created.  This function increments the counter.       */
-  /*    @FT_Done_Library then only destroys a library if the counter is~1, */
-  /*    otherwise it simply decrements the counter.                        */
-  /*                                                                       */
-  /*    This function helps in managing life-cycles of structures which    */
-  /*    reference @FT_Library objects.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a target library object.                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.4.2                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Reference_Library( FT_Library  library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Library                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to create a new FreeType library instance    */
-  /*    from a given memory object.  It is thus possible to use libraries  */
-  /*    with distinct memory allocators within the same program.           */
-  /*                                                                       */
-  /*    Normally, you would call this function (followed by a call to      */
-  /*    @FT_Add_Default_Modules or a series of calls to @FT_Add_Module)    */
-  /*    instead of @FT_Init_FreeType to initialize the FreeType library.   */
-  /*                                                                       */
-  /*    Don't use @FT_Done_FreeType but @FT_Done_Library to destroy a      */
-  /*    library instance.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory   :: A handle to the original memory object.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    alibrary :: A pointer to handle of a new library object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Library.                                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Library( FT_Memory    memory,
-                  FT_Library  *alibrary );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Library                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard a given library object.  This closes all drivers and       */
-  /*    discards all resource objects.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the target library.                         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Library.                                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Library( FT_Library  library );
-
-/* */
-
-  typedef void
-  (*FT_DebugHook_Func)( void*  arg );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Debug_Hook                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Set a debug hook function for debugging the interpreter of a font  */
-  /*    format.                                                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hook_index :: The index of the debug hook.  You should use the     */
-  /*                  values defined in `ftobjs.h', e.g.,                  */
-  /*                  `FT_DEBUG_HOOK_TRUETYPE'.                            */
-  /*                                                                       */
-  /*    debug_hook :: The function used to debug the interpreter.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Currently, four debug hook slots are available, but only two (for  */
-  /*    the TrueType and the Type~1 interpreter) are defined.              */
-  /*                                                                       */
-  /*    Since the internal headers of FreeType are no longer installed,    */
-  /*    the symbol `FT_DEBUG_HOOK_TRUETYPE' isn't available publicly.      */
-  /*    This is a bug and will be fixed in a forthcoming release.          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Set_Debug_Hook( FT_Library         library,
-                     FT_UInt            hook_index,
-                     FT_DebugHook_Func  debug_hook );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Add_Default_Modules                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Add the set of default drivers to a given library object.          */
-  /*    This is only useful when you create a library object with          */
-  /*    @FT_New_Library (usually to plug a custom memory manager).         */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to a new library object.                       */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Add_Default_Modules( FT_Library  library );
-
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   truetype_engine
-   *
-   * @title:
-   *   The TrueType Engine
-   *
-   * @abstract:
-   *   TrueType bytecode support.
-   *
-   * @description:
-   *   This section contains a function used to query the level of TrueType
-   *   bytecode support compiled in this version of the library.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   *  @enum:
-   *     FT_TrueTypeEngineType
-   *
-   *  @description:
-   *     A list of values describing which kind of TrueType bytecode
-   *     engine is implemented in a given FT_Library instance.  It is used
-   *     by the @FT_Get_TrueType_Engine_Type function.
-   *
-   *  @values:
-   *     FT_TRUETYPE_ENGINE_TYPE_NONE ::
-   *       The library doesn't implement any kind of bytecode interpreter.
-   *
-   *     FT_TRUETYPE_ENGINE_TYPE_UNPATENTED ::
-   *       The library implements a bytecode interpreter that doesn't
-   *       support the patented operations of the TrueType virtual machine.
-   *
-   *       Its main use is to load certain Asian fonts which position and
-   *       scale glyph components with bytecode instructions.  It produces
-   *       bad output for most other fonts.
-   *
-   *     FT_TRUETYPE_ENGINE_TYPE_PATENTED ::
-   *       The library implements a bytecode interpreter that covers
-   *       the full instruction set of the TrueType virtual machine (this
-   *       was governed by patents until May 2010, hence the name).
-   *
-   *  @since:
-   *     2.2
-   *
-   */
-  typedef enum  FT_TrueTypeEngineType_
-  {
-    FT_TRUETYPE_ENGINE_TYPE_NONE = 0,
-    FT_TRUETYPE_ENGINE_TYPE_UNPATENTED,
-    FT_TRUETYPE_ENGINE_TYPE_PATENTED
-
-  } FT_TrueTypeEngineType;
-
-
-  /**************************************************************************
-   *
-   *  @func:
-   *     FT_Get_TrueType_Engine_Type
-   *
-   *  @description:
-   *     Return an @FT_TrueTypeEngineType value to indicate which level of
-   *     the TrueType virtual machine a given library instance supports.
-   *
-   *  @input:
-   *     library ::
-   *       A library instance.
-   *
-   *  @return:
-   *     A value indicating which level is supported.
-   *
-   *  @since:
-   *     2.2
-   *
-   */
-  FT_EXPORT( FT_TrueTypeEngineType )
-  FT_Get_TrueType_Engine_Type( FT_Library  library );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTMODAPI_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftchapters.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftchapters.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftchapters.h	(copie de travail)
@@ -1,120 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/* This file defines the structure of the FreeType reference.              */
-/* It is used by the python script which generates the HTML files.         */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    general_remarks                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    General Remarks                                                      */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    user_allocation                                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    core_api                                                             */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Core API                                                             */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    version                                                              */
-/*    basic_types                                                          */
-/*    base_interface                                                       */
-/*    glyph_variants                                                       */
-/*    glyph_management                                                     */
-/*    mac_specific                                                         */
-/*    sizes_management                                                     */
-/*    header_file_macros                                                   */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    format_specific                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Format-Specific API                                                  */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    multiple_masters                                                     */
-/*    truetype_tables                                                      */
-/*    type1_tables                                                         */
-/*    sfnt_names                                                           */
-/*    bdf_fonts                                                            */
-/*    cid_fonts                                                            */
-/*    pfr_fonts                                                            */
-/*    winfnt_fonts                                                         */
-/*    font_formats                                                         */
-/*    gasp_table                                                           */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    module_specific                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Controlling FreeType Modules                                         */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    auto_hinter                                                          */
-/*    cff_driver                                                           */
-/*    tt_driver                                                            */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    cache_subsystem                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Cache Sub-System                                                     */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    cache_subsystem                                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    support_api                                                          */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Support API                                                          */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    computations                                                         */
-/*    list_processing                                                      */
-/*    outline_processing                                                   */
-/*    quick_advance                                                        */
-/*    bitmap_handling                                                      */
-/*    raster                                                               */
-/*    glyph_stroker                                                        */
-/*    system_interface                                                     */
-/*    module_management                                                    */
-/*    gzip                                                                 */
-/*    lzw                                                                  */
-/*    bzip2                                                                */
-/*    lcd_filtering                                                        */
-/*                                                                         */
-/***************************************************************************/
Index: lib/3rdparty/freetype/include/freetype/ftcffdrv.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftcffdrv.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftcffdrv.h	(copie de travail)
@@ -1,151 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcffdrv.h                                                             */
-/*                                                                         */
-/*    FreeType API for controlling the CFF driver (specification only).    */
-/*                                                                         */
-/*  Copyright 2013 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCFFDRV_H__
-#define __FTCFFDRV_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   cff_driver
-   *
-   * @title:
-   *   The CFF driver
-   *
-   * @abstract:
-   *   Controlling the CFF driver module.
-   *
-   * @description:
-   *   While FreeType's CFF driver doesn't expose API functions by itself,
-   *   it is possible to control its behaviour with @FT_Property_Set and
-   *   @FT_Property_Get.  The following lists the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   The CFF driver's module name is `cff'.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   hinting-engine
-   *
-   * @description:
-   *   Thanks to Adobe, which contributed a new hinting (and parsing)
-   *   engine, an application can select between `freetype' and `adobe' if
-   *   compiled with CFF_CONFIG_OPTION_OLD_ENGINE.  If this configuration
-   *   macro isn't defined, `hinting-engine' does nothing.
-   *
-   *   The default engine is `freetype' if CFF_CONFIG_OPTION_OLD_ENGINE is
-   *   defined, and `adobe' otherwise.
-   *
-   *   The following example code demonstrates how to select Adobe's hinting
-   *   engine (omitting the error handling).
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Face     face;
-   *     FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "hinting-engine", &hinting_engine );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_CFF_HINTING_XXX
-   *
-   * @description:
-   *   A list of constants used for the @hinting-engine property to select
-   *   the hinting engine for CFF fonts.
-   *
-   * @values:
-   *   FT_CFF_HINTING_FREETYPE ::
-   *     Use the old FreeType hinting engine.
-   *
-   *   FT_CFF_HINTING_ADOBE ::
-   *     Use the hinting engine contributed by Adobe.
-   *
-   */
-#define FT_CFF_HINTING_FREETYPE  0
-#define FT_CFF_HINTING_ADOBE     1
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   no-stem-darkening
-   *
-   * @description:
-   *   By default, the Adobe CFF engine darkens stems at smaller sizes,
-   *   regardless of hinting, to enhance contrast.  Setting this property,
-   *   stem darkening gets switched off.
-   *
-   *   Note that stem darkening is never applied if @FT_LOAD_NO_SCALE is set.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Face     face;
-   *     FT_Bool     no_stem_darkening = TRUE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "no-stem-darkening", &no_stem_darkening );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTCFFDRV_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftlist.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftlist.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftlist.h	(copie de travail)
@@ -1,277 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlist.h                                                               */
-/*                                                                         */
-/*    Generic list support for FreeType (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003, 2007, 2010 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file implements functions relative to list processing.  Its     */
-  /*  data structures are defined in `freetype.h'.                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTLIST_H__
-#define __FTLIST_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    list_processing                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    List Processing                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Simple management of lists.                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various definitions related to list          */
-  /*    processing using doubly-linked nodes.                              */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_List                                                            */
-  /*    FT_ListNode                                                        */
-  /*    FT_ListRec                                                         */
-  /*    FT_ListNodeRec                                                     */
-  /*                                                                       */
-  /*    FT_List_Add                                                        */
-  /*    FT_List_Insert                                                     */
-  /*    FT_List_Find                                                       */
-  /*    FT_List_Remove                                                     */
-  /*    FT_List_Up                                                         */
-  /*    FT_List_Iterate                                                    */
-  /*    FT_List_Iterator                                                   */
-  /*    FT_List_Finalize                                                   */
-  /*    FT_List_Destructor                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Find                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Find the list node for a given listed object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    data :: The address of the listed object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    List node.  NULL if it wasn't found.                               */
-  /*                                                                       */
-  FT_EXPORT( FT_ListNode )
-  FT_List_Find( FT_List  list,
-                void*    data );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Add                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Append an element to the end of a list.                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    node :: The node to append.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Add( FT_List      list,
-               FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Insert                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Insert an element at the head of a list.                           */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to parent list.                                  */
-  /*    node :: The node to insert.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Insert( FT_List      list,
-                  FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Remove                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Remove a node from a list.  This function doesn't check whether    */
-  /*    the node is in the list!                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node :: The node to remove.                                        */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Remove( FT_List      list,
-                  FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Up                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Move a node to the head/top of a list.  Used to maintain LRU       */
-  /*    lists.                                                             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    node :: The node to move.                                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Up( FT_List      list,
-              FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_List_Iterator                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An FT_List iterator function which is called during a list parse   */
-  /*    by @FT_List_Iterate.                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node :: The current iteration list node.                           */
-  /*                                                                       */
-  /*    user :: A typeless pointer passed to @FT_List_Iterate.             */
-  /*            Can be used to point to the iteration's state.             */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_List_Iterator)( FT_ListNode  node,
-                       void*        user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Iterate                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Parse a list and calls a given iterator function on each element.  */
-  /*    Note that parsing is stopped as soon as one of the iterator calls  */
-  /*    returns a non-zero value.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list     :: A handle to the list.                                  */
-  /*    iterator :: An iterator function, called on each node of the list. */
-  /*    user     :: A user-supplied field which is passed as the second    */
-  /*                argument to the iterator.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result (a FreeType error code) of the last iterator call.      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_List_Iterate( FT_List           list,
-                   FT_List_Iterator  iterator,
-                   void*             user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_List_Destructor                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An @FT_List iterator function which is called during a list        */
-  /*    finalization by @FT_List_Finalize to destroy all elements in a     */
-  /*    given list.                                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    system :: The current system object.                               */
-  /*                                                                       */
-  /*    data   :: The current object to destroy.                           */
-  /*                                                                       */
-  /*    user   :: A typeless pointer passed to @FT_List_Iterate.  It can   */
-  /*              be used to point to the iteration's state.               */
-  /*                                                                       */
-  typedef void
-  (*FT_List_Destructor)( FT_Memory  memory,
-                         void*      data,
-                         void*      user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Finalize                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy all elements in the list as well as the list itself.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list    :: A handle to the list.                                   */
-  /*                                                                       */
-  /*    destroy :: A list destructor that will be applied to each element  */
-  /*               of the list.                                            */
-  /*                                                                       */
-  /*    memory  :: The current memory object which handles deallocation.   */
-  /*                                                                       */
-  /*    user    :: A user-supplied field which is passed as the last       */
-  /*               argument to the destructor.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function expects that all nodes added by @FT_List_Add or      */
-  /*    @FT_List_Insert have been dynamically allocated.                   */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Finalize( FT_List             list,
-                    FT_List_Destructor  destroy,
-                    FT_Memory           memory,
-                    void*               user );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTLIST_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftlzw.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftlzw.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftlzw.h	(copie de travail)
@@ -1,99 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlzw.h                                                                */
-/*                                                                         */
-/*    LZW-compressed stream support.                                       */
-/*                                                                         */
-/*  Copyright 2004, 2006 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTLZW_H__
-#define __FTLZW_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    lzw                                                                */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    LZW Streams                                                        */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using LZW-compressed font files.                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of LZW-specific functions.   */
-  /*                                                                       */
-  /*************************************************************************/
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenLZW
-  *
-  * @description:
-  *   Open a new stream to parse LZW-compressed font files.  This is
-  *   mainly used to support the compressed `*.pcf.Z' fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream :: The target embedding stream.
-  *
-  *   source :: The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function `FT_Stream_Close' on the new stream will
-  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream
-  *
-  *   In certain builds of the library, LZW compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a LZW stream from it
-  *   and re-open the face with it.
-  *
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with LZW support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenLZW( FT_Stream  stream,
-                     FT_Stream  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTLZW_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftbitmap.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftbitmap.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftbitmap.h	(copie de travail)
@@ -1,227 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbitmap.h                                                             */
-/*                                                                         */
-/*    FreeType utility functions for bitmaps (specification).              */
-/*                                                                         */
-/*  Copyright 2004-2006, 2008, 2013 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTBITMAP_H__
-#define __FTBITMAP_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bitmap_handling                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Bitmap Handling                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Handling FT_Bitmap objects.                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains functions for converting FT_Bitmap objects.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_New                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Initialize a pointer to an @FT_Bitmap structure.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    abitmap :: A pointer to the bitmap structure.                      */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Bitmap_New( FT_Bitmap  *abitmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Copy                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Copy a bitmap into another one.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /*    source  :: A handle to the source bitmap.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target  :: A handle to the target bitmap.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Copy( FT_Library        library,
-                  const FT_Bitmap  *source,
-                  FT_Bitmap        *target);
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Embolden                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Embolden a bitmap.  The new bitmap will be about `xStrength'       */
-  /*    pixels wider and `yStrength' pixels higher.  The left and bottom   */
-  /*    borders are kept unchanged.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: A handle to a library object.                         */
-  /*                                                                       */
-  /*    xStrength :: How strong the glyph is emboldened horizontally.      */
-  /*                 Expressed in 26.6 pixel format.                       */
-  /*                                                                       */
-  /*    yStrength :: How strong the glyph is emboldened vertically.        */
-  /*                 Expressed in 26.6 pixel format.                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    bitmap    :: A handle to the target bitmap.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The current implementation restricts `xStrength' to be less than   */
-  /*    or equal to~8 if bitmap is of pixel_mode @FT_PIXEL_MODE_MONO.      */
-  /*                                                                       */
-  /*    If you want to embolden the bitmap owned by a @FT_GlyphSlotRec,    */
-  /*    you should call @FT_GlyphSlot_Own_Bitmap on the slot first.        */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Embolden( FT_Library  library,
-                      FT_Bitmap*  bitmap,
-                      FT_Pos      xStrength,
-                      FT_Pos      yStrength );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Convert                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, 8bpp or 32bpp */
-  /*    to a bitmap object with depth 8bpp, making the number of used      */
-  /*    bytes line (a.k.a. the `pitch') a multiple of `alignment'.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: A handle to a library object.                         */
-  /*                                                                       */
-  /*    source    :: The source bitmap.                                    */
-  /*                                                                       */
-  /*    alignment :: The pitch of the bitmap is a multiple of this         */
-  /*                 parameter.  Common values are 1, 2, or 4.             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target    :: The target bitmap.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    It is possible to call @FT_Bitmap_Convert multiple times without   */
-  /*    calling @FT_Bitmap_Done (the memory is simply reallocated).        */
-  /*                                                                       */
-  /*    Use @FT_Bitmap_Done to finally remove the bitmap object.           */
-  /*                                                                       */
-  /*    The `library' argument is taken to have access to FreeType's       */
-  /*    memory handling functions.                                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Convert( FT_Library        library,
-                     const FT_Bitmap  *source,
-                     FT_Bitmap        *target,
-                     FT_Int            alignment );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GlyphSlot_Own_Bitmap                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Make sure that a glyph slot owns `slot->bitmap'.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot :: The glyph slot.                                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is to be used in combination with                    */
-  /*    @FT_Bitmap_Embolden.                                               */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GlyphSlot_Own_Bitmap( FT_GlyphSlot  slot );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Done                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a bitmap object created with @FT_Bitmap_New.               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /*    bitmap  :: The bitmap object to be freed.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `library' argument is taken to have access to FreeType's       */
-  /*    memory handling functions.                                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Done( FT_Library  library,
-                  FT_Bitmap  *bitmap );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTBITMAP_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/tttags.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/tttags.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/tttags.h	(copie de travail)
@@ -1,109 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttags.h                                                               */
-/*                                                                         */
-/*    Tags for TrueType and OpenType tables (specification only).          */
-/*                                                                         */
-/*  Copyright 1996-2001, 2004, 2005, 2007, 2008, 2013 by                   */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTAGS_H__
-#define __TTAGS_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-#define TTAG_avar  FT_MAKE_TAG( 'a', 'v', 'a', 'r' )
-#define TTAG_BASE  FT_MAKE_TAG( 'B', 'A', 'S', 'E' )
-#define TTAG_bdat  FT_MAKE_TAG( 'b', 'd', 'a', 't' )
-#define TTAG_BDF   FT_MAKE_TAG( 'B', 'D', 'F', ' ' )
-#define TTAG_bhed  FT_MAKE_TAG( 'b', 'h', 'e', 'd' )
-#define TTAG_bloc  FT_MAKE_TAG( 'b', 'l', 'o', 'c' )
-#define TTAG_bsln  FT_MAKE_TAG( 'b', 's', 'l', 'n' )
-#define TTAG_CBDT  FT_MAKE_TAG( 'C', 'B', 'D', 'T' )
-#define TTAG_CBLC  FT_MAKE_TAG( 'C', 'B', 'L', 'C' )
-#define TTAG_CFF   FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
-#define TTAG_CID   FT_MAKE_TAG( 'C', 'I', 'D', ' ' )
-#define TTAG_cmap  FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
-#define TTAG_cvar  FT_MAKE_TAG( 'c', 'v', 'a', 'r' )
-#define TTAG_cvt   FT_MAKE_TAG( 'c', 'v', 't', ' ' )
-#define TTAG_DSIG  FT_MAKE_TAG( 'D', 'S', 'I', 'G' )
-#define TTAG_EBDT  FT_MAKE_TAG( 'E', 'B', 'D', 'T' )
-#define TTAG_EBLC  FT_MAKE_TAG( 'E', 'B', 'L', 'C' )
-#define TTAG_EBSC  FT_MAKE_TAG( 'E', 'B', 'S', 'C' )
-#define TTAG_feat  FT_MAKE_TAG( 'f', 'e', 'a', 't' )
-#define TTAG_FOND  FT_MAKE_TAG( 'F', 'O', 'N', 'D' )
-#define TTAG_fpgm  FT_MAKE_TAG( 'f', 'p', 'g', 'm' )
-#define TTAG_fvar  FT_MAKE_TAG( 'f', 'v', 'a', 'r' )
-#define TTAG_gasp  FT_MAKE_TAG( 'g', 'a', 's', 'p' )
-#define TTAG_GDEF  FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
-#define TTAG_glyf  FT_MAKE_TAG( 'g', 'l', 'y', 'f' )
-#define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
-#define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
-#define TTAG_gvar  FT_MAKE_TAG( 'g', 'v', 'a', 'r' )
-#define TTAG_hdmx  FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
-#define TTAG_head  FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
-#define TTAG_hhea  FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
-#define TTAG_hmtx  FT_MAKE_TAG( 'h', 'm', 't', 'x' )
-#define TTAG_JSTF  FT_MAKE_TAG( 'J', 'S', 'T', 'F' )
-#define TTAG_just  FT_MAKE_TAG( 'j', 'u', 's', 't' )
-#define TTAG_kern  FT_MAKE_TAG( 'k', 'e', 'r', 'n' )
-#define TTAG_lcar  FT_MAKE_TAG( 'l', 'c', 'a', 'r' )
-#define TTAG_loca  FT_MAKE_TAG( 'l', 'o', 'c', 'a' )
-#define TTAG_LTSH  FT_MAKE_TAG( 'L', 'T', 'S', 'H' )
-#define TTAG_LWFN  FT_MAKE_TAG( 'L', 'W', 'F', 'N' )
-#define TTAG_MATH  FT_MAKE_TAG( 'M', 'A', 'T', 'H' )
-#define TTAG_maxp  FT_MAKE_TAG( 'm', 'a', 'x', 'p' )
-#define TTAG_META  FT_MAKE_TAG( 'M', 'E', 'T', 'A' )
-#define TTAG_MMFX  FT_MAKE_TAG( 'M', 'M', 'F', 'X' )
-#define TTAG_MMSD  FT_MAKE_TAG( 'M', 'M', 'S', 'D' )
-#define TTAG_mort  FT_MAKE_TAG( 'm', 'o', 'r', 't' )
-#define TTAG_morx  FT_MAKE_TAG( 'm', 'o', 'r', 'x' )
-#define TTAG_name  FT_MAKE_TAG( 'n', 'a', 'm', 'e' )
-#define TTAG_opbd  FT_MAKE_TAG( 'o', 'p', 'b', 'd' )
-#define TTAG_OS2   FT_MAKE_TAG( 'O', 'S', '/', '2' )
-#define TTAG_OTTO  FT_MAKE_TAG( 'O', 'T', 'T', 'O' )
-#define TTAG_PCLT  FT_MAKE_TAG( 'P', 'C', 'L', 'T' )
-#define TTAG_POST  FT_MAKE_TAG( 'P', 'O', 'S', 'T' )
-#define TTAG_post  FT_MAKE_TAG( 'p', 'o', 's', 't' )
-#define TTAG_prep  FT_MAKE_TAG( 'p', 'r', 'e', 'p' )
-#define TTAG_prop  FT_MAKE_TAG( 'p', 'r', 'o', 'p' )
-#define TTAG_sfnt  FT_MAKE_TAG( 's', 'f', 'n', 't' )
-#define TTAG_SING  FT_MAKE_TAG( 'S', 'I', 'N', 'G' )
-#define TTAG_trak  FT_MAKE_TAG( 't', 'r', 'a', 'k' )
-#define TTAG_true  FT_MAKE_TAG( 't', 'r', 'u', 'e' )
-#define TTAG_ttc   FT_MAKE_TAG( 't', 't', 'c', ' ' )
-#define TTAG_ttcf  FT_MAKE_TAG( 't', 't', 'c', 'f' )
-#define TTAG_TYP1  FT_MAKE_TAG( 'T', 'Y', 'P', '1' )
-#define TTAG_typ1  FT_MAKE_TAG( 't', 'y', 'p', '1' )
-#define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
-#define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
-#define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
-
-
-FT_END_HEADER
-
-#endif /* __TTAGS_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftincrem.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftincrem.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftincrem.h	(copie de travail)
@@ -1,353 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftincrem.h                                                             */
-/*                                                                         */
-/*    FreeType incremental loading (specification).                        */
-/*                                                                         */
-/*  Copyright 2002, 2003, 2006, 2007, 2008, 2010 by                        */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTINCREM_H__
-#define __FTINCREM_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /***************************************************************************
-   *
-   * @section:
-   *    incremental
-   *
-   * @title:
-   *    Incremental Loading
-   *
-   * @abstract:
-   *    Custom Glyph Loading.
-   *
-   * @description:
-   *   This section contains various functions used to perform so-called
-   *   `incremental' glyph loading.  This is a mode where all glyphs loaded
-   *   from a given @FT_Face are provided by the client application,
-   *
-   *   Apart from that, all other tables are loaded normally from the font
-   *   file.  This mode is useful when FreeType is used within another
-   *   engine, e.g., a PostScript Imaging Processor.
-   *
-   *   To enable this mode, you must use @FT_Open_Face, passing an
-   *   @FT_Parameter with the @FT_PARAM_TAG_INCREMENTAL tag and an
-   *   @FT_Incremental_Interface value.  See the comments for
-   *   @FT_Incremental_InterfaceRec for an example.
-   *
-   */
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental
-   *
-   * @description:
-   *   An opaque type describing a user-provided object used to implement
-   *   `incremental' glyph loading within FreeType.  This is used to support
-   *   embedded fonts in certain environments (e.g., PostScript interpreters),
-   *   where the glyph data isn't in the font file, or must be overridden by
-   *   different values.
-   *
-   * @note:
-   *   It is up to client applications to create and implement @FT_Incremental
-   *   objects, as long as they provide implementations for the methods
-   *   @FT_Incremental_GetGlyphDataFunc, @FT_Incremental_FreeGlyphDataFunc
-   *   and @FT_Incremental_GetGlyphMetricsFunc.
-   *
-   *   See the description of @FT_Incremental_InterfaceRec to understand how
-   *   to use incremental objects with FreeType.
-   *
-   */
-  typedef struct FT_IncrementalRec_*  FT_Incremental;
-
-
-  /***************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_MetricsRec
-   *
-   * @description:
-   *   A small structure used to contain the basic glyph metrics returned
-   *   by the @FT_Incremental_GetGlyphMetricsFunc method.
-   *
-   * @fields:
-   *   bearing_x ::
-   *     Left bearing, in font units.
-   *
-   *   bearing_y ::
-   *     Top bearing, in font units.
-   *
-   *   advance ::
-   *     Horizontal component of glyph advance, in font units.
-   *
-   *   advance_v ::
-   *     Vertical component of glyph advance, in font units.
-   *
-   * @note:
-   *   These correspond to horizontal or vertical metrics depending on the
-   *   value of the `vertical' argument to the function
-   *   @FT_Incremental_GetGlyphMetricsFunc.
-   *
-   */
-  typedef struct  FT_Incremental_MetricsRec_
-  {
-    FT_Long  bearing_x;
-    FT_Long  bearing_y;
-    FT_Long  advance;
-    FT_Long  advance_v;     /* since 2.3.12 */
-
-  } FT_Incremental_MetricsRec;
-
-
-  /***************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_Metrics
-   *
-   * @description:
-   *   A handle to an @FT_Incremental_MetricsRec structure.
-   *
-   */
-   typedef struct FT_Incremental_MetricsRec_*  FT_Incremental_Metrics;
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_GetGlyphDataFunc
-   *
-   * @description:
-   *   A function called by FreeType to access a given glyph's data bytes
-   *   during @FT_Load_Glyph or @FT_Load_Char if incremental loading is
-   *   enabled.
-   *
-   *   Note that the format of the glyph's data bytes depends on the font
-   *   file format.  For TrueType, it must correspond to the raw bytes within
-   *   the `glyf' table.  For PostScript formats, it must correspond to the
-   *   *unencrypted* charstring bytes, without any `lenIV' header.  It is
-   *   undefined for any other format.
-   *
-   * @input:
-   *   incremental ::
-   *     Handle to an opaque @FT_Incremental handle provided by the client
-   *     application.
-   *
-   *   glyph_index ::
-   *     Index of relevant glyph.
-   *
-   * @output:
-   *   adata ::
-   *     A structure describing the returned glyph data bytes (which will be
-   *     accessed as a read-only byte block).
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   If this function returns successfully the method
-   *   @FT_Incremental_FreeGlyphDataFunc will be called later to release
-   *   the data bytes.
-   *
-   *   Nested calls to @FT_Incremental_GetGlyphDataFunc can happen for
-   *   compound glyphs.
-   *
-   */
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphDataFunc)( FT_Incremental  incremental,
-                                      FT_UInt         glyph_index,
-                                      FT_Data*        adata );
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_FreeGlyphDataFunc
-   *
-   * @description:
-   *   A function used to release the glyph data bytes returned by a
-   *   successful call to @FT_Incremental_GetGlyphDataFunc.
-   *
-   * @input:
-   *   incremental ::
-   *     A handle to an opaque @FT_Incremental handle provided by the client
-   *     application.
-   *
-   *   data ::
-   *     A structure describing the glyph data bytes (which will be accessed
-   *     as a read-only byte block).
-   *
-   */
-  typedef void
-  (*FT_Incremental_FreeGlyphDataFunc)( FT_Incremental  incremental,
-                                       FT_Data*        data );
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_GetGlyphMetricsFunc
-   *
-   * @description:
-   *   A function used to retrieve the basic metrics of a given glyph index
-   *   before accessing its data.  This is necessary because, in certain
-   *   formats like TrueType, the metrics are stored in a different place from
-   *   the glyph images proper.
-   *
-   * @input:
-   *   incremental ::
-   *     A handle to an opaque @FT_Incremental handle provided by the client
-   *     application.
-   *
-   *   glyph_index ::
-   *     Index of relevant glyph.
-   *
-   *   vertical ::
-   *     If true, return vertical metrics.
-   *
-   *   ametrics ::
-   *     This parameter is used for both input and output.
-   *     The original glyph metrics, if any, in font units.  If metrics are
-   *     not available all the values must be set to zero.
-   *
-   * @output:
-   *   ametrics ::
-   *     The replacement glyph metrics in font units.
-   *
-   */
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphMetricsFunc)
-                      ( FT_Incremental              incremental,
-                        FT_UInt                     glyph_index,
-                        FT_Bool                     vertical,
-                        FT_Incremental_MetricsRec  *ametrics );
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_FuncsRec
-   *
-   * @description:
-   *   A table of functions for accessing fonts that load data
-   *   incrementally.  Used in @FT_Incremental_InterfaceRec.
-   *
-   * @fields:
-   *   get_glyph_data ::
-   *     The function to get glyph data.  Must not be null.
-   *
-   *   free_glyph_data ::
-   *     The function to release glyph data.  Must not be null.
-   *
-   *   get_glyph_metrics ::
-   *     The function to get glyph metrics.  May be null if the font does
-   *     not provide overriding glyph metrics.
-   *
-   */
-  typedef struct  FT_Incremental_FuncsRec_
-  {
-    FT_Incremental_GetGlyphDataFunc     get_glyph_data;
-    FT_Incremental_FreeGlyphDataFunc    free_glyph_data;
-    FT_Incremental_GetGlyphMetricsFunc  get_glyph_metrics;
-
-  } FT_Incremental_FuncsRec;
-
-
-  /***************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_InterfaceRec
-   *
-   * @description:
-   *   A structure to be used with @FT_Open_Face to indicate that the user
-   *   wants to support incremental glyph loading.  You should use it with
-   *   @FT_PARAM_TAG_INCREMENTAL as in the following example:
-   *
-   *     {
-   *       FT_Incremental_InterfaceRec  inc_int;
-   *       FT_Parameter                 parameter;
-   *       FT_Open_Args                 open_args;
-   *
-   *
-   *       // set up incremental descriptor
-   *       inc_int.funcs  = my_funcs;
-   *       inc_int.object = my_object;
-   *
-   *       // set up optional parameter
-   *       parameter.tag  = FT_PARAM_TAG_INCREMENTAL;
-   *       parameter.data = &inc_int;
-   *
-   *       // set up FT_Open_Args structure
-   *       open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;
-   *       open_args.pathname   = my_font_pathname;
-   *       open_args.num_params = 1;
-   *       open_args.params     = &parameter; // we use one optional argument
-   *
-   *       // open the font
-   *       error = FT_Open_Face( library, &open_args, index, &face );
-   *       ...
-   *     }
-   *
-   */
-  typedef struct  FT_Incremental_InterfaceRec_
-  {
-    const FT_Incremental_FuncsRec*  funcs;
-    FT_Incremental                  object;
-
-  } FT_Incremental_InterfaceRec;
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_Interface
-   *
-   * @description:
-   *   A pointer to an @FT_Incremental_InterfaceRec structure.
-   *
-   */
-  typedef FT_Incremental_InterfaceRec*   FT_Incremental_Interface;
-
-
-  /***************************************************************************
-   *
-   * @constant:
-   *   FT_PARAM_TAG_INCREMENTAL
-   *
-   * @description:
-   *   A constant used as the tag of @FT_Parameter structures to indicate
-   *   an incremental loading object to be used by FreeType.
-   *
-   */
-#define FT_PARAM_TAG_INCREMENTAL  FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* __FTINCREM_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftrender.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftrender.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftrender.h	(copie de travail)
@@ -1,238 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftrender.h                                                             */
-/*                                                                         */
-/*    FreeType renderer modules public interface (specification).          */
-/*                                                                         */
-/*  Copyright 1996-2001, 2005, 2006, 2010 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTRENDER_H__
-#define __FTRENDER_H__
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* create a new glyph object */
-  typedef FT_Error
-  (*FT_Glyph_InitFunc)( FT_Glyph      glyph,
-                        FT_GlyphSlot  slot );
-
-  /* destroys a given glyph object */
-  typedef void
-  (*FT_Glyph_DoneFunc)( FT_Glyph  glyph );
-
-  typedef void
-  (*FT_Glyph_TransformFunc)( FT_Glyph          glyph,
-                             const FT_Matrix*  matrix,
-                             const FT_Vector*  delta );
-
-  typedef void
-  (*FT_Glyph_GetBBoxFunc)( FT_Glyph  glyph,
-                           FT_BBox*  abbox );
-
-  typedef FT_Error
-  (*FT_Glyph_CopyFunc)( FT_Glyph   source,
-                        FT_Glyph   target );
-
-  typedef FT_Error
-  (*FT_Glyph_PrepareFunc)( FT_Glyph      glyph,
-                           FT_GlyphSlot  slot );
-
-/* deprecated */
-#define FT_Glyph_Init_Func       FT_Glyph_InitFunc
-#define FT_Glyph_Done_Func       FT_Glyph_DoneFunc
-#define FT_Glyph_Transform_Func  FT_Glyph_TransformFunc
-#define FT_Glyph_BBox_Func       FT_Glyph_GetBBoxFunc
-#define FT_Glyph_Copy_Func       FT_Glyph_CopyFunc
-#define FT_Glyph_Prepare_Func    FT_Glyph_PrepareFunc
-
-
-  struct  FT_Glyph_Class_
-  {
-    FT_Long                 glyph_size;
-    FT_Glyph_Format         glyph_format;
-    FT_Glyph_InitFunc       glyph_init;
-    FT_Glyph_DoneFunc       glyph_done;
-    FT_Glyph_CopyFunc       glyph_copy;
-    FT_Glyph_TransformFunc  glyph_transform;
-    FT_Glyph_GetBBoxFunc    glyph_bbox;
-    FT_Glyph_PrepareFunc    glyph_prepare;
-  };
-
-
-  typedef FT_Error
-  (*FT_Renderer_RenderFunc)( FT_Renderer       renderer,
-                             FT_GlyphSlot      slot,
-                             FT_UInt           mode,
-                             const FT_Vector*  origin );
-
-  typedef FT_Error
-  (*FT_Renderer_TransformFunc)( FT_Renderer       renderer,
-                                FT_GlyphSlot      slot,
-                                const FT_Matrix*  matrix,
-                                const FT_Vector*  delta );
-
-
-  typedef void
-  (*FT_Renderer_GetCBoxFunc)( FT_Renderer   renderer,
-                              FT_GlyphSlot  slot,
-                              FT_BBox*      cbox );
-
-
-  typedef FT_Error
-  (*FT_Renderer_SetModeFunc)( FT_Renderer  renderer,
-                              FT_ULong     mode_tag,
-                              FT_Pointer   mode_ptr );
-
-/* deprecated identifiers */
-#define FTRenderer_render  FT_Renderer_RenderFunc
-#define FTRenderer_transform  FT_Renderer_TransformFunc
-#define FTRenderer_getCBox  FT_Renderer_GetCBoxFunc
-#define FTRenderer_setMode  FT_Renderer_SetModeFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Renderer_Class                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The renderer module class descriptor.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root            :: The root @FT_Module_Class fields.               */
-  /*                                                                       */
-  /*    glyph_format    :: The glyph image format this renderer handles.   */
-  /*                                                                       */
-  /*    render_glyph    :: A method used to render the image that is in a  */
-  /*                       given glyph slot into a bitmap.                 */
-  /*                                                                       */
-  /*    transform_glyph :: A method used to transform the image that is in */
-  /*                       a given glyph slot.                             */
-  /*                                                                       */
-  /*    get_glyph_cbox  :: A method used to access the glyph's cbox.       */
-  /*                                                                       */
-  /*    set_mode        :: A method used to pass additional parameters.    */
-  /*                                                                       */
-  /*    raster_class    :: For @FT_GLYPH_FORMAT_OUTLINE renderers only.    */
-  /*                       This is a pointer to its raster's class.        */
-  /*                                                                       */
-  typedef struct  FT_Renderer_Class_
-  {
-    FT_Module_Class            root;
-
-    FT_Glyph_Format            glyph_format;
-
-    FT_Renderer_RenderFunc     render_glyph;
-    FT_Renderer_TransformFunc  transform_glyph;
-    FT_Renderer_GetCBoxFunc    get_glyph_cbox;
-    FT_Renderer_SetModeFunc    set_mode;
-
-    FT_Raster_Funcs*           raster_class;
-
-  } FT_Renderer_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Renderer                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the current renderer for a given glyph format.            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the library object.                         */
-  /*                                                                       */
-  /*    format  :: The glyph format.                                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A renderer handle.  0~if none found.                               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error will be returned if a module already exists by that name, */
-  /*    or if the module requires a version of FreeType that is too great. */
-  /*                                                                       */
-  /*    To add a new renderer, simply use @FT_Add_Module.  To retrieve a   */
-  /*    renderer by its name, use @FT_Get_Module.                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Renderer )
-  FT_Get_Renderer( FT_Library       library,
-                   FT_Glyph_Format  format );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Renderer                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Set the current renderer to use, and set additional mode.          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    renderer   :: A handle to the renderer object.                     */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    parameters :: Additional parameters.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    In case of success, the renderer will be used to convert glyph     */
-  /*    images in the renderer's known format into bitmaps.                */
-  /*                                                                       */
-  /*    This doesn't change the current renderer for other formats.        */
-  /*                                                                       */
-  /*    Currently, only the B/W renderer, if compiled with                 */
-  /*    FT_RASTER_OPTION_ANTI_ALIASING (providing a 5-levels               */
-  /*    anti-aliasing mode; this option must be set directly in            */
-  /*    `ftraster.c' and is undefined by default) accepts a single tag     */
-  /*    `pal5' to set its gray palette as a character string with          */
-  /*    5~elements.  Consequently, the third and fourth argument are zero  */
-  /*    normally.                                                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Renderer( FT_Library     library,
-                   FT_Renderer    renderer,
-                   FT_UInt        num_params,
-                   FT_Parameter*  parameters );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTRENDER_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftautoh.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftautoh.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftautoh.h	(copie de travail)
@@ -1,357 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftautoh.h                                                              */
-/*                                                                         */
-/*    FreeType API for controlling the auto-hinter (specification only).   */
-/*                                                                         */
-/*  Copyright 2012, 2013 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTAUTOH_H__
-#define __FTAUTOH_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   auto_hinter
-   *
-   * @title:
-   *   The auto-hinter
-   *
-   * @abstract:
-   *   Controlling the auto-hinting module.
-   *
-   * @description:
-   *   While FreeType's auto-hinter doesn't expose API functions by itself,
-   *   it is possible to control its behaviour with @FT_Property_Set and
-   *   @FT_Property_Get.  The following lists the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   Note that the auto-hinter's module name is `autofitter' for
-   *   historical reasons.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   glyph-to-script-map
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   The auto-hinter provides various script modules to hint glyphs.
-   *   Examples of supported scripts are Latin or CJK.  Before a glyph is
-   *   auto-hinted, the Unicode character map of the font gets examined, and
-   *   the script is then determined based on Unicode character ranges, see
-   *   below.
-   *
-   *   OpenType fonts, however, often provide much more glyphs than
-   *   character codes (small caps, superscripts, ligatures, swashes, etc.),
-   *   to be controlled by so-called `features'.  Handling OpenType features
-   *   can be quite complicated and thus needs a separate library on top of
-   *   FreeType.
-   *
-   *   The mapping between glyph indices and scripts (in the auto-hinter
-   *   sense, see the @FT_AUTOHINTER_SCRIPT_XXX values) is stored as an
-   *   array with `num_glyphs' elements, as found in the font's @FT_Face
-   *   structure.  The `glyph-to-script-map' property returns a pointer to
-   *   this array which can be modified as needed.  Note that the
-   *   modification should happen before the first glyph gets processed by
-   *   the auto-hinter so that the global analysis of the font shapes
-   *   actually uses the modified mapping.
-   *
-   *   The following example code demonstrates how to access it (omitting
-   *   the error handling).
-   *
-   *   {
-   *     FT_Library                library;
-   *     FT_Face                   face;
-   *     FT_Prop_GlyphToScriptMap  prop;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *     FT_New_Face( library, "foo.ttf", 0, &face );
-   *
-   *     prop.face = face;
-   *
-   *     FT_Property_Get( library, "autofitter",
-   *                               "glyph-to-script-map", &prop );
-   *
-   *     // adjust `prop.map' as needed right here
-   *
-   *     FT_Load_Glyph( face, ..., FT_LOAD_FORCE_AUTOHINT );
-   *   }
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_AUTOHINTER_SCRIPT_XXX
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   A list of constants used for the @glyph-to-script-map property to
-   *   specify the script submodule the auto-hinter should use for hinting a
-   *   particular glyph.
-   *
-   * @values:
-   *   FT_AUTOHINTER_SCRIPT_NONE ::
-   *     Don't auto-hint this glyph.
-   *
-   *   FT_AUTOHINTER_SCRIPT_LATIN ::
-   *     Apply the latin auto-hinter.  For the auto-hinter, `latin' is a
-   *     very broad term, including Cyrillic and Greek also since characters
-   *     from those scripts share the same design constraints.
-   *
-   *     By default, characters from the following Unicode ranges are
-   *     assigned to this submodule.
-   *
-   *     {
-   *       U+0020 - U+007F  // Basic Latin (no control characters)
-   *       U+00A0 - U+00FF  // Latin-1 Supplement (no control characters)
-   *       U+0100 - U+017F  // Latin Extended-A
-   *       U+0180 - U+024F  // Latin Extended-B
-   *       U+0250 - U+02AF  // IPA Extensions
-   *       U+02B0 - U+02FF  // Spacing Modifier Letters
-   *       U+0300 - U+036F  // Combining Diacritical Marks
-   *       U+0370 - U+03FF  // Greek and Coptic
-   *       U+0400 - U+04FF  // Cyrillic
-   *       U+0500 - U+052F  // Cyrillic Supplement
-   *       U+1D00 - U+1D7F  // Phonetic Extensions
-   *       U+1D80 - U+1DBF  // Phonetic Extensions Supplement
-   *       U+1DC0 - U+1DFF  // Combining Diacritical Marks Supplement
-   *       U+1E00 - U+1EFF  // Latin Extended Additional
-   *       U+1F00 - U+1FFF  // Greek Extended
-   *       U+2000 - U+206F  // General Punctuation
-   *       U+2070 - U+209F  // Superscripts and Subscripts
-   *       U+20A0 - U+20CF  // Currency Symbols
-   *       U+2150 - U+218F  // Number Forms
-   *       U+2460 - U+24FF  // Enclosed Alphanumerics
-   *       U+2C60 - U+2C7F  // Latin Extended-C
-   *       U+2DE0 - U+2DFF  // Cyrillic Extended-A
-   *       U+2E00 - U+2E7F  // Supplemental Punctuation
-   *       U+A640 - U+A69F  // Cyrillic Extended-B
-   *       U+A720 - U+A7FF  // Latin Extended-D
-   *       U+FB00 - U+FB06  // Alphab. Present. Forms (Latin Ligatures)
-   *      U+1D400 - U+1D7FF // Mathematical Alphanumeric Symbols
-   *      U+1F100 - U+1F1FF // Enclosed Alphanumeric Supplement
-   *     }
-   *
-   *   FT_AUTOHINTER_SCRIPT_CJK ::
-   *     Apply the CJK auto-hinter, covering Chinese, Japanese, Korean, old
-   *     Vietnamese, and some other scripts.
-   *
-   *     By default, characters from the following Unicode ranges are
-   *     assigned to this submodule.
-   *
-   *     {
-   *       U+1100 - U+11FF  // Hangul Jamo
-   *       U+2E80 - U+2EFF  // CJK Radicals Supplement
-   *       U+2F00 - U+2FDF  // Kangxi Radicals
-   *       U+2FF0 - U+2FFF  // Ideographic Description Characters
-   *       U+3000 - U+303F  // CJK Symbols and Punctuation
-   *       U+3040 - U+309F  // Hiragana
-   *       U+30A0 - U+30FF  // Katakana
-   *       U+3100 - U+312F  // Bopomofo
-   *       U+3130 - U+318F  // Hangul Compatibility Jamo
-   *       U+3190 - U+319F  // Kanbun
-   *       U+31A0 - U+31BF  // Bopomofo Extended
-   *       U+31C0 - U+31EF  // CJK Strokes
-   *       U+31F0 - U+31FF  // Katakana Phonetic Extensions
-   *       U+3200 - U+32FF  // Enclosed CJK Letters and Months
-   *       U+3300 - U+33FF  // CJK Compatibility
-   *       U+3400 - U+4DBF  // CJK Unified Ideographs Extension A
-   *       U+4DC0 - U+4DFF  // Yijing Hexagram Symbols
-   *       U+4E00 - U+9FFF  // CJK Unified Ideographs
-   *       U+A960 - U+A97F  // Hangul Jamo Extended-A
-   *       U+AC00 - U+D7AF  // Hangul Syllables
-   *       U+D7B0 - U+D7FF  // Hangul Jamo Extended-B
-   *       U+F900 - U+FAFF  // CJK Compatibility Ideographs
-   *       U+FE10 - U+FE1F  // Vertical forms
-   *       U+FE30 - U+FE4F  // CJK Compatibility Forms
-   *       U+FF00 - U+FFEF  // Halfwidth and Fullwidth Forms
-   *      U+1B000 - U+1B0FF // Kana Supplement
-   *      U+1D300 - U+1D35F // Tai Xuan Hing Symbols
-   *      U+1F200 - U+1F2FF // Enclosed Ideographic Supplement
-   *      U+20000 - U+2A6DF // CJK Unified Ideographs Extension B
-   *      U+2A700 - U+2B73F // CJK Unified Ideographs Extension C
-   *      U+2B740 - U+2B81F // CJK Unified Ideographs Extension D
-   *      U+2F800 - U+2FA1F // CJK Compatibility Ideographs Supplement
-   *     }
-   *
-   *   FT_AUTOHINTER_SCRIPT_INDIC ::
-   *     Apply the indic auto-hinter, covering all major scripts from the
-   *     Indian sub-continent and some other related scripts like Thai, Lao,
-   *     or Tibetan.
-   *
-   *     By default, characters from the following Unicode ranges are
-   *     assigned to this submodule.
-   *
-   *     {
-   *       U+0900 - U+0DFF  // Indic Range
-   *       U+0F00 - U+0FFF  // Tibetan
-   *       U+1900 - U+194F  // Limbu
-   *       U+1B80 - U+1BBF  // Sundanese
-   *       U+1C80 - U+1CDF  // Meetei Mayak
-   *       U+A800 - U+A82F  // Syloti Nagri
-   *      U+11800 - U+118DF // Sharada
-   *     }
-   *
-   *     Note that currently Indic support is rudimentary only, missing blue
-   *     zone support.
-   *
-   */
-#define FT_AUTOHINTER_SCRIPT_NONE   0
-#define FT_AUTOHINTER_SCRIPT_LATIN  1
-#define FT_AUTOHINTER_SCRIPT_CJK    2
-#define FT_AUTOHINTER_SCRIPT_INDIC  3
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Prop_GlyphToScriptMap
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   The data exchange structure for the @glyph-to-script-map property.
-   *
-   */
-   typedef struct  FT_Prop_GlyphToScriptMap_
-   {
-     FT_Face   face;
-     FT_Byte*  map;
-
-   } FT_Prop_GlyphToScriptMap;
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   fallback-script
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   If no auto-hinter script module can be assigned to a glyph, a
-   *   fallback script gets assigned to it (see also the
-   *   @glyph-to-script-map property).  By default, this is
-   *   @FT_AUTOHINTER_SCRIPT_CJK.  Using the `fallback-script' property,
-   *   this fallback value can be changed.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_UInt     fallback_script = FT_AUTOHINTER_SCRIPT_NONE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "autofitter",
-   *                               "fallback-script", &fallback_script );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   *   It's important to use the right timing for changing this value: The
-   *   creation of the glyph-to-script map which eventually uses the
-   *   fallback script value gets triggered either by setting or reading a
-   *   face-specific property like @glyph-to-script-map, or by auto-hinting
-   *   any glyph from that face.  In particular, if you have already created
-   *   an @FT_Face structure but not loaded any glyph (using the
-   *   auto-hinter), a change of the fallback glyph will affect this face.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   increase-x-height
-   *
-   * @description:
-   *   For ppem values in the range 6~<= ppem <= `increase-x-height', round
-   *   up the font's x~height much more often than normally.  If the value
-   *   is set to~0, which is the default, this feature is switched off.  Use
-   *   this property to improve the legibility of small font sizes if
-   *   necessary.
-   *
-   *   {
-   *     FT_Library               library;
-   *     FT_Face                  face;
-   *     FT_Prop_IncreaseXHeight  prop;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *     FT_New_Face( library, "foo.ttf", 0, &face );
-   *     FT_Set_Char_Size( face, 10 * 64, 0, 72, 0 );
-   *
-   *     prop.face  = face;
-   *     prop.limit = 14;
-   *
-   *     FT_Property_Set( library, "autofitter",
-   *                               "increase-x-height", &prop );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   *   Set this value right after calling @FT_Set_Char_Size, but before
-   *   loading any glyph (using the auto-hinter).
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Prop_IncreaseXHeight
-   *
-   * @description:
-   *   The data exchange structure for the @increase-x-height property.
-   *
-   */
-   typedef struct  FT_Prop_IncreaseXHeight_
-   {
-     FT_Face  face;
-     FT_UInt  limit;
-
-   } FT_Prop_IncreaseXHeight;
-
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTAUTOH_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftglyph.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftglyph.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftglyph.h	(copie de travail)
@@ -1,620 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftglyph.h                                                              */
-/*                                                                         */
-/*    FreeType convenience functions to handle glyphs (specification).     */
-/*                                                                         */
-/*  Copyright 1996-2003, 2006, 2008, 2009, 2011 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file contains the definition of several convenience functions    */
-  /* that can be used by client applications to easily retrieve glyph      */
-  /* bitmaps and outlines from a given face.                               */
-  /*                                                                       */
-  /* These functions should be optional if you are writing a font server   */
-  /* or text layout engine on top of FreeType.  However, they are pretty   */
-  /* handy for many other simple uses of the library.                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTGLYPH_H__
-#define __FTGLYPH_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    glyph_management                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Glyph Management                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Generic interface to manage individual glyph data.                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains definitions used to manage glyph data        */
-  /*    through generic FT_Glyph objects.  Each of them can contain a      */
-  /*    bitmap, a vector outline, or even images in other formats.         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* forward declaration to a private type */
-  typedef struct FT_Glyph_Class_  FT_Glyph_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Glyph                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Handle to an object used to model generic glyph images.  It is a   */
-  /*    pointer to the @FT_GlyphRec structure and can contain a glyph      */
-  /*    bitmap or pointer.                                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Glyph objects are not owned by the library.  You must thus release */
-  /*    them manually (through @FT_Done_Glyph) _before_ calling            */
-  /*    @FT_Done_FreeType.                                                 */
-  /*                                                                       */
-  typedef struct FT_GlyphRec_*  FT_Glyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The root glyph structure contains a given glyph image plus its     */
-  /*    advance width in 16.16 fixed-point format.                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library :: A handle to the FreeType library object.                */
-  /*                                                                       */
-  /*    clazz   :: A pointer to the glyph's class.  Private.               */
-  /*                                                                       */
-  /*    format  :: The format of the glyph's image.                        */
-  /*                                                                       */
-  /*    advance :: A 16.16 vector that gives the glyph's advance width.    */
-  /*                                                                       */
-  typedef struct  FT_GlyphRec_
-  {
-    FT_Library             library;
-    const FT_Glyph_Class*  clazz;
-    FT_Glyph_Format        format;
-    FT_Vector              advance;
-
-  } FT_GlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_BitmapGlyph                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model a bitmap glyph image.  This is */
-  /*    a sub-class of @FT_Glyph, and a pointer to @FT_BitmapGlyphRec.     */
-  /*                                                                       */
-  typedef struct FT_BitmapGlyphRec_*  FT_BitmapGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_BitmapGlyphRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used for bitmap glyph images.  This really is a        */
-  /*    `sub-class' of @FT_GlyphRec.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root   :: The root @FT_Glyph fields.                               */
-  /*                                                                       */
-  /*    left   :: The left-side bearing, i.e., the horizontal distance     */
-  /*              from the current pen position to the left border of the  */
-  /*              glyph bitmap.                                            */
-  /*                                                                       */
-  /*    top    :: The top-side bearing, i.e., the vertical distance from   */
-  /*              the current pen position to the top border of the glyph  */
-  /*              bitmap.  This distance is positive for upwards~y!        */
-  /*                                                                       */
-  /*    bitmap :: A descriptor for the bitmap.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can typecast an @FT_Glyph to @FT_BitmapGlyph if you have       */
-  /*    `glyph->format == FT_GLYPH_FORMAT_BITMAP'.  This lets you access   */
-  /*    the bitmap's contents easily.                                      */
-  /*                                                                       */
-  /*    The corresponding pixel buffer is always owned by @FT_BitmapGlyph  */
-  /*    and is thus created and destroyed with it.                         */
-  /*                                                                       */
-  typedef struct  FT_BitmapGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Int       left;
-    FT_Int       top;
-    FT_Bitmap    bitmap;
-
-  } FT_BitmapGlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_OutlineGlyph                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model an outline glyph image.  This  */
-  /*    is a sub-class of @FT_Glyph, and a pointer to @FT_OutlineGlyphRec. */
-  /*                                                                       */
-  typedef struct FT_OutlineGlyphRec_*  FT_OutlineGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_OutlineGlyphRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used for outline (vectorial) glyph images.  This       */
-  /*    really is a `sub-class' of @FT_GlyphRec.                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root    :: The root @FT_Glyph fields.                              */
-  /*                                                                       */
-  /*    outline :: A descriptor for the outline.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can typecast an @FT_Glyph to @FT_OutlineGlyph if you have      */
-  /*    `glyph->format == FT_GLYPH_FORMAT_OUTLINE'.  This lets you access  */
-  /*    the outline's content easily.                                      */
-  /*                                                                       */
-  /*    As the outline is extracted from a glyph slot, its coordinates are */
-  /*    expressed normally in 26.6 pixels, unless the flag                 */
-  /*    @FT_LOAD_NO_SCALE was used in @FT_Load_Glyph() or @FT_Load_Char(). */
-  /*                                                                       */
-  /*    The outline's tables are always owned by the object and are        */
-  /*    destroyed with it.                                                 */
-  /*                                                                       */
-  typedef struct  FT_OutlineGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Outline   outline;
-
-  } FT_OutlineGlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Glyph                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to extract a glyph image from a slot.  Note that   */
-  /*    the created @FT_Glyph object must be released with @FT_Done_Glyph. */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot   :: A handle to the source glyph slot.                       */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: A handle to the glyph object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph( FT_GlyphSlot  slot,
-                FT_Glyph     *aglyph );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Copy                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to copy a glyph image.  Note that the created      */
-  /*    @FT_Glyph object must be released with @FT_Done_Glyph.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    source :: A handle to the source glyph object.                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target :: A handle to the target glyph object.  0~in case of       */
-  /*              error.                                                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Copy( FT_Glyph   source,
-                 FT_Glyph  *target );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Transform                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Transform a glyph image if its format is scalable.                 */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    glyph  :: A handle to the target glyph object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to a 2x2 matrix to apply.                      */
-  /*                                                                       */
-  /*    delta  :: A pointer to a 2d vector to apply.  Coordinates are      */
-  /*              expressed in 1/64th of a pixel.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code (if not 0, the glyph format is not scalable).  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The 2x2 transformation matrix is also applied to the glyph's       */
-  /*    advance vector.                                                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Transform( FT_Glyph    glyph,
-                      FT_Matrix*  matrix,
-                      FT_Vector*  delta );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Glyph_BBox_Mode                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The mode how the values of @FT_Glyph_Get_CBox are returned.        */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_GLYPH_BBOX_UNSCALED ::                                          */
-  /*      Return unscaled font units.                                      */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_SUBPIXELS ::                                         */
-  /*      Return unfitted 26.6 coordinates.                                */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_GRIDFIT ::                                           */
-  /*      Return grid-fitted 26.6 coordinates.                             */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_TRUNCATE ::                                          */
-  /*      Return coordinates in integer pixels.                            */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_PIXELS ::                                            */
-  /*      Return grid-fitted pixel coordinates.                            */
-  /*                                                                       */
-  typedef enum  FT_Glyph_BBox_Mode_
-  {
-    FT_GLYPH_BBOX_UNSCALED  = 0,
-    FT_GLYPH_BBOX_SUBPIXELS = 0,
-    FT_GLYPH_BBOX_GRIDFIT   = 1,
-    FT_GLYPH_BBOX_TRUNCATE  = 2,
-    FT_GLYPH_BBOX_PIXELS    = 3
-
-  } FT_Glyph_BBox_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_glyph_bbox_xxx                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    These constants are deprecated.  Use the corresponding             */
-  /*    @FT_Glyph_BBox_Mode values instead.                                */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*   ft_glyph_bbox_unscaled  :: See @FT_GLYPH_BBOX_UNSCALED.             */
-  /*   ft_glyph_bbox_subpixels :: See @FT_GLYPH_BBOX_SUBPIXELS.            */
-  /*   ft_glyph_bbox_gridfit   :: See @FT_GLYPH_BBOX_GRIDFIT.              */
-  /*   ft_glyph_bbox_truncate  :: See @FT_GLYPH_BBOX_TRUNCATE.             */
-  /*   ft_glyph_bbox_pixels    :: See @FT_GLYPH_BBOX_PIXELS.               */
-  /*                                                                       */
-#define ft_glyph_bbox_unscaled   FT_GLYPH_BBOX_UNSCALED
-#define ft_glyph_bbox_subpixels  FT_GLYPH_BBOX_SUBPIXELS
-#define ft_glyph_bbox_gridfit    FT_GLYPH_BBOX_GRIDFIT
-#define ft_glyph_bbox_truncate   FT_GLYPH_BBOX_TRUNCATE
-#define ft_glyph_bbox_pixels     FT_GLYPH_BBOX_PIXELS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Get_CBox                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a glyph's `control box'.  The control box encloses all the  */
-  /*    outline's points, including BÃ©zier control points.  Though it      */
-  /*    coincides with the exact bounding box for most glyphs, it can be   */
-  /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains BÃ©zier outside arcs).                               */
-  /*                                                                       */
-  /*    Computing the control box is very fast, while getting the bounding */
-  /*    box can take much more time as it needs to walk over all segments  */
-  /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component which is dedicated to this single task.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph :: A handle to the source glyph object.                      */
-  /*                                                                       */
-  /*    mode  :: The mode which indicates how to interpret the returned    */
-  /*             bounding box values.                                      */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acbox :: The glyph coordinate bounding box.  Coordinates are       */
-  /*             expressed in 1/64th of pixels if it is grid-fitted.       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Coordinates are relative to the glyph origin, using the y~upwards  */
-  /*    convention.                                                        */
-  /*                                                                       */
-  /*    If the glyph has been loaded with @FT_LOAD_NO_SCALE, `bbox_mode'   */
-  /*    must be set to @FT_GLYPH_BBOX_UNSCALED to get unscaled font        */
-  /*    units in 26.6 pixel format.  The value @FT_GLYPH_BBOX_SUBPIXELS    */
-  /*    is another name for this constant.                                 */
-  /*                                                                       */
-  /*    If the font is tricky and the glyph has been loaded with           */
-  /*    @FT_LOAD_NO_SCALE, the resulting CBox is meaningless.  To get      */
-  /*    reasonable values for the CBox it is necessary to load the glyph   */
-  /*    at a large ppem value (so that the hinting instructions can        */
-  /*    properly shift and scale the subglyphs), then extracting the CBox  */
-  /*    which can be eventually converted back to font units.              */
-  /*                                                                       */
-  /*    Note that the maximum coordinates are exclusive, which means that  */
-  /*    one can compute the width and height of the glyph image (be it in  */
-  /*    integer or 26.6 pixels) as:                                        */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      width  = bbox.xMax - bbox.xMin;                                  */
-  /*      height = bbox.yMax - bbox.yMin;                                  */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Note also that for 26.6 coordinates, if `bbox_mode' is set to      */
-  /*    @FT_GLYPH_BBOX_GRIDFIT, the coordinates will also be grid-fitted,  */
-  /*    which corresponds to:                                              */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      bbox.xMin = FLOOR(bbox.xMin);                                    */
-  /*      bbox.yMin = FLOOR(bbox.yMin);                                    */
-  /*      bbox.xMax = CEILING(bbox.xMax);                                  */
-  /*      bbox.yMax = CEILING(bbox.yMax);                                  */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    To get the bbox in pixel coordinates, set `bbox_mode' to           */
-  /*    @FT_GLYPH_BBOX_TRUNCATE.                                           */
-  /*                                                                       */
-  /*    To get the bbox in grid-fitted pixel coordinates, set `bbox_mode'  */
-  /*    to @FT_GLYPH_BBOX_PIXELS.                                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Glyph_Get_CBox( FT_Glyph  glyph,
-                     FT_UInt   bbox_mode,
-                     FT_BBox  *acbox );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_To_Bitmap                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Convert a given glyph object to a bitmap glyph object.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    the_glyph   :: A pointer to a handle to the target glyph.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    render_mode :: An enumeration that describes how the data is       */
-  /*                   rendered.                                           */
-  /*                                                                       */
-  /*    origin      :: A pointer to a vector used to translate the glyph   */
-  /*                   image before rendering.  Can be~0 (if no            */
-  /*                   translation).  The origin is expressed in           */
-  /*                   26.6 pixels.                                        */
-  /*                                                                       */
-  /*    destroy     :: A boolean that indicates that the original glyph    */
-  /*                   image should be destroyed by this function.  It is  */
-  /*                   never destroyed in case of error.                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does nothing if the glyph format isn't scalable.     */
-  /*                                                                       */
-  /*    The glyph image is translated with the `origin' vector before      */
-  /*    rendering.                                                         */
-  /*                                                                       */
-  /*    The first parameter is a pointer to an @FT_Glyph handle, that will */
-  /*    be _replaced_ by this function (with newly allocated data).        */
-  /*    Typically, you would use (omitting error handling):                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      {                                                                */
-  /*        FT_Glyph        glyph;                                         */
-  /*        FT_BitmapGlyph  glyph_bitmap;                                  */
-  /*                                                                       */
-  /*                                                                       */
-  /*        // load glyph                                                  */
-  /*        error = FT_Load_Char( face, glyph_index, FT_LOAD_DEFAUT );     */
-  /*                                                                       */
-  /*        // extract glyph image                                         */
-  /*        error = FT_Get_Glyph( face->glyph, &glyph );                   */
-  /*                                                                       */
-  /*        // convert to a bitmap (default render mode + destroying old)  */
-  /*        if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )                 */
-  /*        {                                                              */
-  /*          error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_NORMAL,   */
-  /*                                      0, 1 );                          */
-  /*          if ( error ) // `glyph' unchanged                            */
-  /*            ...                                                        */
-  /*        }                                                              */
-  /*                                                                       */
-  /*        // access bitmap content by typecasting                        */
-  /*        glyph_bitmap = (FT_BitmapGlyph)glyph;                          */
-  /*                                                                       */
-  /*        // do funny stuff with it, like blitting/drawing               */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        // discard glyph image (bitmap or not)                         */
-  /*        FT_Done_Glyph( glyph );                                        */
-  /*      }                                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*    Here another example, again without error handling:                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      {                                                                */
-  /*        FT_Glyph  glyphs[MAX_GLYPHS]                                   */
-  /*                                                                       */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
-  /*          error = FT_Load_Glyph( face, idx, FT_LOAD_DEFAULT ) ||       */
-  /*                  FT_Get_Glyph ( face->glyph, &glyph[idx] );           */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
-  /*        {                                                              */
-  /*          FT_Glyph  bitmap = glyphs[idx];                              */
-  /*                                                                       */
-  /*                                                                       */
-  /*          ...                                                          */
-  /*                                                                       */
-  /*          // after this call, `bitmap' no longer points into           */
-  /*          // the `glyphs' array (and the old value isn't destroyed)    */
-  /*          FT_Glyph_To_Bitmap( &bitmap, FT_RENDER_MODE_MONO, 0, 0 );    */
-  /*                                                                       */
-  /*          ...                                                          */
-  /*                                                                       */
-  /*          FT_Done_Glyph( bitmap );                                     */
-  /*        }                                                              */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
-  /*          FT_Done_Glyph( glyphs[idx] );                                */
-  /*      }                                                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_To_Bitmap( FT_Glyph*       the_glyph,
-                      FT_Render_Mode  render_mode,
-                      FT_Vector*      origin,
-                      FT_Bool         destroy );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Glyph                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a given glyph.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph :: A handle to the target glyph object.                      */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Done_Glyph( FT_Glyph  glyph );
-
-  /* */
-
-
-  /* other helpful functions */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    computations                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Matrix_Multiply                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Perform the matrix operation `b = a*b'.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: A pointer to matrix `a'.                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    b :: A pointer to matrix `b'.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The result is undefined if either `a' or `b' is zero.              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Matrix_Multiply( const FT_Matrix*  a,
-                      FT_Matrix*        b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Matrix_Invert                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Invert a 2x2 matrix.  Return an error if it can't be inverted.     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    matrix :: A pointer to the target matrix.  Remains untouched in    */
-  /*              case of error.                                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Matrix_Invert( FT_Matrix*  matrix );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGLYPH_H__ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
Index: lib/3rdparty/freetype/include/freetype/t1tables.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/t1tables.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/t1tables.h	(copie de travail)
@@ -1,662 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t1tables.h                                                             */
-/*                                                                         */
-/*    Basic Type 1/Type 2 tables definitions and interface (specification  */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2004, 2006, 2008, 2009, 2011 by                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __T1TABLES_H__
-#define __T1TABLES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    type1_tables                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Type 1 Tables                                                      */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Type~1 (PostScript) specific font tables.                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the definition of Type 1-specific tables,    */
-  /*    including structures related to other PostScript font formats.     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* Note that we separate font data in PS_FontInfoRec and PS_PrivateRec */
-  /* structures in order to support Multiple Master fonts.               */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_FontInfoRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a Type~1 or Type~2 FontInfo dictionary.  */
-  /*    Note that for Multiple Master fonts, each instance has its own     */
-  /*    FontInfo dictionary.                                               */
-  /*                                                                       */
-  typedef struct  PS_FontInfoRec_
-  {
-    FT_String*  version;
-    FT_String*  notice;
-    FT_String*  full_name;
-    FT_String*  family_name;
-    FT_String*  weight;
-    FT_Long     italic_angle;
-    FT_Bool     is_fixed_pitch;
-    FT_Short    underline_position;
-    FT_UShort   underline_thickness;
-
-  } PS_FontInfoRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_FontInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @PS_FontInfoRec structure.                           */
-  /*                                                                       */
-  typedef struct PS_FontInfoRec_*  PS_FontInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_FontInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is equivalent to @PS_FontInfoRec.  It is deprecated but  */
-  /*    kept to maintain source compatibility between various versions of  */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  typedef PS_FontInfoRec  T1_FontInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_PrivateRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a Type~1 or Type~2 private dictionary.   */
-  /*    Note that for Multiple Master fonts, each instance has its own     */
-  /*    Private dictionary.                                                */
-  /*                                                                       */
-  typedef struct  PS_PrivateRec_
-  {
-    FT_Int     unique_id;
-    FT_Int     lenIV;
-
-    FT_Byte    num_blue_values;
-    FT_Byte    num_other_blues;
-    FT_Byte    num_family_blues;
-    FT_Byte    num_family_other_blues;
-
-    FT_Short   blue_values[14];
-    FT_Short   other_blues[10];
-
-    FT_Short   family_blues      [14];
-    FT_Short   family_other_blues[10];
-
-    FT_Fixed   blue_scale;
-    FT_Int     blue_shift;
-    FT_Int     blue_fuzz;
-
-    FT_UShort  standard_width[1];
-    FT_UShort  standard_height[1];
-
-    FT_Byte    num_snap_widths;
-    FT_Byte    num_snap_heights;
-    FT_Bool    force_bold;
-    FT_Bool    round_stem_up;
-
-    FT_Short   snap_widths [13];  /* including std width  */
-    FT_Short   snap_heights[13];  /* including std height */
-
-    FT_Fixed   expansion_factor;
-
-    FT_Long    language_group;
-    FT_Long    password;
-
-    FT_Short   min_feature[2];
-
-  } PS_PrivateRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_Private                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @PS_PrivateRec structure.                            */
-  /*                                                                       */
-  typedef struct PS_PrivateRec_*  PS_Private;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_Private                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This type is equivalent to @PS_PrivateRec.  It is deprecated but    */
-  /*   kept to maintain source compatibility between various versions of   */
-  /*   FreeType.                                                           */
-  /*                                                                       */
-  typedef PS_PrivateRec  T1_Private;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    T1_Blend_Flags                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A set of flags used to indicate which fields are present in a      */
-  /*    given blend dictionary (font info or private).  Used to support    */
-  /*    Multiple Masters fonts.                                            */
-  /*                                                                       */
-  typedef enum  T1_Blend_Flags_
-  {
-    /*# required fields in a FontInfo blend dictionary */
-    T1_BLEND_UNDERLINE_POSITION = 0,
-    T1_BLEND_UNDERLINE_THICKNESS,
-    T1_BLEND_ITALIC_ANGLE,
-
-    /*# required fields in a Private blend dictionary */
-    T1_BLEND_BLUE_VALUES,
-    T1_BLEND_OTHER_BLUES,
-    T1_BLEND_STANDARD_WIDTH,
-    T1_BLEND_STANDARD_HEIGHT,
-    T1_BLEND_STEM_SNAP_WIDTHS,
-    T1_BLEND_STEM_SNAP_HEIGHTS,
-    T1_BLEND_BLUE_SCALE,
-    T1_BLEND_BLUE_SHIFT,
-    T1_BLEND_FAMILY_BLUES,
-    T1_BLEND_FAMILY_OTHER_BLUES,
-    T1_BLEND_FORCE_BOLD,
-
-    /*# never remove */
-    T1_BLEND_MAX
-
-  } T1_Blend_Flags;
-
-  /* */
-
-
-  /*# backwards compatible definitions */
-#define t1_blend_underline_position   T1_BLEND_UNDERLINE_POSITION
-#define t1_blend_underline_thickness  T1_BLEND_UNDERLINE_THICKNESS
-#define t1_blend_italic_angle         T1_BLEND_ITALIC_ANGLE
-#define t1_blend_blue_values          T1_BLEND_BLUE_VALUES
-#define t1_blend_other_blues          T1_BLEND_OTHER_BLUES
-#define t1_blend_standard_widths      T1_BLEND_STANDARD_WIDTH
-#define t1_blend_standard_height      T1_BLEND_STANDARD_HEIGHT
-#define t1_blend_stem_snap_widths     T1_BLEND_STEM_SNAP_WIDTHS
-#define t1_blend_stem_snap_heights    T1_BLEND_STEM_SNAP_HEIGHTS
-#define t1_blend_blue_scale           T1_BLEND_BLUE_SCALE
-#define t1_blend_blue_shift           T1_BLEND_BLUE_SHIFT
-#define t1_blend_family_blues         T1_BLEND_FAMILY_BLUES
-#define t1_blend_family_other_blues   T1_BLEND_FAMILY_OTHER_BLUES
-#define t1_blend_force_bold           T1_BLEND_FORCE_BOLD
-#define t1_blend_max                  T1_BLEND_MAX
-
-
-  /* maximum number of Multiple Masters designs, as defined in the spec */
-#define T1_MAX_MM_DESIGNS     16
-
-  /* maximum number of Multiple Masters axes, as defined in the spec */
-#define T1_MAX_MM_AXIS        4
-
-  /* maximum number of elements in a design map */
-#define T1_MAX_MM_MAP_POINTS  20
-
-
-  /* this structure is used to store the BlendDesignMap entry for an axis */
-  typedef struct  PS_DesignMap_
-  {
-    FT_Byte    num_points;
-    FT_Long*   design_points;
-    FT_Fixed*  blend_points;
-
-  } PS_DesignMapRec, *PS_DesignMap;
-
-  /* backwards-compatible definition */
-  typedef PS_DesignMapRec  T1_DesignMap;
-
-
-  typedef struct  PS_BlendRec_
-  {
-    FT_UInt          num_designs;
-    FT_UInt          num_axis;
-
-    FT_String*       axis_names[T1_MAX_MM_AXIS];
-    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
-    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
-
-    FT_Fixed*        weight_vector;
-    FT_Fixed*        default_weight_vector;
-
-    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
-    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
-
-    FT_ULong         blend_bitflags;
-
-    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
-
-    /* since 2.3.0 */
-
-    /* undocumented, optional: the default design instance;   */
-    /* corresponds to default_weight_vector --                */
-    /* num_default_design_vector == 0 means it is not present */
-    /* in the font and associated metrics files               */
-    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
-    FT_UInt          num_default_design_vector;
-
-  } PS_BlendRec, *PS_Blend;
-
-
-  /* backwards-compatible definition */
-  typedef PS_BlendRec  T1_Blend;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceDictRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to represent data in a CID top-level dictionary.  */
-  /*                                                                       */
-  typedef struct  CID_FaceDictRec_
-  {
-    PS_PrivateRec  private_dict;
-
-    FT_UInt        len_buildchar;
-    FT_Fixed       forcebold_threshold;
-    FT_Pos         stroke_width;
-    FT_Fixed       expansion_factor;
-
-    FT_Byte        paint_type;
-    FT_Byte        font_type;
-    FT_Matrix      font_matrix;
-    FT_Vector      font_offset;
-
-    FT_UInt        num_subrs;
-    FT_ULong       subrmap_offset;
-    FT_Int         sd_bytes;
-
-  } CID_FaceDictRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceDict                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @CID_FaceDictRec structure.                          */
-  /*                                                                       */
-  typedef struct CID_FaceDictRec_*  CID_FaceDict;
-
-  /* */
-
-
-  /* backwards-compatible definition */
-  typedef CID_FaceDictRec  CID_FontDict;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceInfoRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to represent CID Face information.                */
-  /*                                                                       */
-  typedef struct  CID_FaceInfoRec_
-  {
-    FT_String*      cid_font_name;
-    FT_Fixed        cid_version;
-    FT_Int          cid_font_type;
-
-    FT_String*      registry;
-    FT_String*      ordering;
-    FT_Int          supplement;
-
-    PS_FontInfoRec  font_info;
-    FT_BBox         font_bbox;
-    FT_ULong        uid_base;
-
-    FT_Int          num_xuid;
-    FT_ULong        xuid[16];
-
-    FT_ULong        cidmap_offset;
-    FT_Int          fd_bytes;
-    FT_Int          gd_bytes;
-    FT_ULong        cid_count;
-
-    FT_Int          num_dicts;
-    CID_FaceDict    font_dicts;
-
-    FT_ULong        data_offset;
-
-  } CID_FaceInfoRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceInfo                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @CID_FaceInfoRec structure.                          */
-  /*                                                                       */
-  typedef struct CID_FaceInfoRec_*  CID_FaceInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_Info                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This type is equivalent to @CID_FaceInfoRec.  It is deprecated but  */
-  /*   kept to maintain source compatibility between various versions of   */
-  /*   FreeType.                                                           */
-  /*                                                                       */
-  typedef CID_FaceInfoRec  CID_Info;
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Has_PS_Glyph_Names
-   *
-   * @description:
-   *    Return true if a given face provides reliable PostScript glyph
-   *    names.  This is similar to using the @FT_HAS_GLYPH_NAMES macro,
-   *    except that certain fonts (mostly TrueType) contain incorrect
-   *    glyph name tables.
-   *
-   *    When this function returns true, the caller is sure that the glyph
-   *    names returned by @FT_Get_Glyph_Name are reliable.
-   *
-   * @input:
-   *    face ::
-   *       face handle
-   *
-   * @return:
-   *    Boolean.  True if glyph names are reliable.
-   *
-   */
-  FT_EXPORT( FT_Int )
-  FT_Has_PS_Glyph_Names( FT_Face  face );
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Get_PS_Font_Info
-   *
-   * @description:
-   *    Retrieve the @PS_FontInfoRec structure corresponding to a given
-   *    PostScript font.
-   *
-   * @input:
-   *    face ::
-   *       PostScript face handle.
-   *
-   * @output:
-   *    afont_info ::
-   *       Output font info structure pointer.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    The string pointers within the font info structure are owned by
-   *    the face and don't need to be freed by the caller.
-   *
-   *    If the font's format is not PostScript-based, this function will
-   *    return the `FT_Err_Invalid_Argument' error code.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Info( FT_Face      face,
-                       PS_FontInfo  afont_info );
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Get_PS_Font_Private
-   *
-   * @description:
-   *    Retrieve the @PS_PrivateRec structure corresponding to a given
-   *    PostScript font.
-   *
-   * @input:
-   *    face ::
-   *       PostScript face handle.
-   *
-   * @output:
-   *    afont_private ::
-   *       Output private dictionary structure pointer.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    The string pointers within the @PS_PrivateRec structure are owned by
-   *    the face and don't need to be freed by the caller.
-   *
-   *    If the font's format is not PostScript-based, this function returns
-   *    the `FT_Err_Invalid_Argument' error code.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Private( FT_Face     face,
-                          PS_Private  afont_private );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    T1_EncodingType                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration describing the `Encoding' entry in a Type 1         */
-  /*    dictionary.                                                        */
-  /*                                                                       */
-  typedef enum  T1_EncodingType_
-  {
-    T1_ENCODING_TYPE_NONE = 0,
-    T1_ENCODING_TYPE_ARRAY,
-    T1_ENCODING_TYPE_STANDARD,
-    T1_ENCODING_TYPE_ISOLATIN1,
-    T1_ENCODING_TYPE_EXPERT
-
-  } T1_EncodingType;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    PS_Dict_Keys                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used in calls to @FT_Get_PS_Font_Value to identify  */
-  /*    the Type~1 dictionary entry to retrieve.                           */
-  /*                                                                       */
-  typedef enum  PS_Dict_Keys_
-  {
-    /* conventionally in the font dictionary */
-    PS_DICT_FONT_TYPE,              /* FT_Byte         */
-    PS_DICT_FONT_MATRIX,            /* FT_Fixed        */
-    PS_DICT_FONT_BBOX,              /* FT_Fixed        */
-    PS_DICT_PAINT_TYPE,             /* FT_Byte         */
-    PS_DICT_FONT_NAME,              /* FT_String*      */
-    PS_DICT_UNIQUE_ID,              /* FT_Int          */
-    PS_DICT_NUM_CHAR_STRINGS,       /* FT_Int          */
-    PS_DICT_CHAR_STRING_KEY,        /* FT_String*      */
-    PS_DICT_CHAR_STRING,            /* FT_String*      */
-    PS_DICT_ENCODING_TYPE,          /* T1_EncodingType */
-    PS_DICT_ENCODING_ENTRY,         /* FT_String*      */
-
-    /* conventionally in the font Private dictionary */
-    PS_DICT_NUM_SUBRS,              /* FT_Int     */
-    PS_DICT_SUBR,                   /* FT_String* */
-    PS_DICT_STD_HW,                 /* FT_UShort  */
-    PS_DICT_STD_VW,                 /* FT_UShort  */
-    PS_DICT_NUM_BLUE_VALUES,        /* FT_Byte    */
-    PS_DICT_BLUE_VALUE,             /* FT_Short   */
-    PS_DICT_BLUE_FUZZ,              /* FT_Int     */
-    PS_DICT_NUM_OTHER_BLUES,        /* FT_Byte    */
-    PS_DICT_OTHER_BLUE,             /* FT_Short   */
-    PS_DICT_NUM_FAMILY_BLUES,       /* FT_Byte    */
-    PS_DICT_FAMILY_BLUE,            /* FT_Short   */
-    PS_DICT_NUM_FAMILY_OTHER_BLUES, /* FT_Byte    */
-    PS_DICT_FAMILY_OTHER_BLUE,      /* FT_Short   */
-    PS_DICT_BLUE_SCALE,             /* FT_Fixed   */
-    PS_DICT_BLUE_SHIFT,             /* FT_Int     */
-    PS_DICT_NUM_STEM_SNAP_H,        /* FT_Byte    */
-    PS_DICT_STEM_SNAP_H,            /* FT_Short   */
-    PS_DICT_NUM_STEM_SNAP_V,        /* FT_Byte    */
-    PS_DICT_STEM_SNAP_V,            /* FT_Short   */
-    PS_DICT_FORCE_BOLD,             /* FT_Bool    */
-    PS_DICT_RND_STEM_UP,            /* FT_Bool    */
-    PS_DICT_MIN_FEATURE,            /* FT_Short   */
-    PS_DICT_LEN_IV,                 /* FT_Int     */
-    PS_DICT_PASSWORD,               /* FT_Long    */
-    PS_DICT_LANGUAGE_GROUP,         /* FT_Long    */
-
-    /* conventionally in the font FontInfo dictionary */
-    PS_DICT_VERSION,                /* FT_String* */
-    PS_DICT_NOTICE,                 /* FT_String* */
-    PS_DICT_FULL_NAME,              /* FT_String* */
-    PS_DICT_FAMILY_NAME,            /* FT_String* */
-    PS_DICT_WEIGHT,                 /* FT_String* */
-    PS_DICT_IS_FIXED_PITCH,         /* FT_Bool    */
-    PS_DICT_UNDERLINE_POSITION,     /* FT_Short   */
-    PS_DICT_UNDERLINE_THICKNESS,    /* FT_UShort  */
-    PS_DICT_FS_TYPE,                /* FT_UShort  */
-    PS_DICT_ITALIC_ANGLE,           /* FT_Long    */
-
-    PS_DICT_MAX = PS_DICT_ITALIC_ANGLE
-
-  } PS_Dict_Keys;
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Get_PS_Font_Value
-   *
-   * @description:
-   *    Retrieve the value for the supplied key from a PostScript font.
-   *
-   * @input:
-   *    face ::
-   *       PostScript face handle.
-   *
-   *    key ::
-   *       An enumeration value representing the dictionary key to retrieve.
-   *
-   *    idx ::
-   *       For array values, this specifies the index to be returned.
-   *
-   *    value ::
-   *       A pointer to memory into which to write the value.
-   *
-   *    valen_len ::
-   *       The size, in bytes, of the memory supplied for the value.
-   *
-   * @output:
-   *    value ::
-   *       The value matching the above key, if it exists.
-   *
-   * @return:
-   *    The amount of memory (in bytes) required to hold the requested
-   *    value (if it exists, -1 otherwise).
-   *
-   * @note:
-   *    The values returned are not pointers into the internal structures of
-   *    the face, but are `fresh' copies, so that the memory containing them
-   *    belongs to the calling application.  This also enforces the
-   *    `read-only' nature of these values, i.e., this function cannot be
-   *    used to manipulate the face.
-   *
-   *    `value' is a void pointer because the values returned can be of
-   *    various types.
-   *
-   *    If either `value' is NULL or `value_len' is too small, just the
-   *    required memory size for the requested entry is returned.
-   *
-   *    The `idx' parameter is used, not only to retrieve elements of, for
-   *    example, the FontMatrix or FontBBox, but also to retrieve name keys
-   *    from the CharStrings dictionary, and the charstrings themselves.  It
-   *    is ignored for atomic values.
-   *
-   *    PS_DICT_BLUE_SCALE returns a value that is scaled up by 1000.  To
-   *    get the value as in the font stream, you need to divide by
-   *    65536000.0 (to remove the FT_Fixed scale, and the x1000 scale).
-   *
-   *    IMPORTANT: Only key/value pairs read by the FreeType interpreter can
-   *    be retrieved.  So, for example, PostScript procedures such as NP,
-   *    ND, and RD are not available.  Arbitrary keys are, obviously, not be
-   *    available either.
-   *
-   *    If the font's format is not PostScript-based, this function returns
-   *    the `FT_Err_Invalid_Argument' error code.
-   *
-   */
-  FT_EXPORT( FT_Long )
-  FT_Get_PS_Font_Value( FT_Face       face,
-                        PS_Dict_Keys  key,
-                        FT_UInt       idx,
-                        void         *value,
-                        FT_Long       value_len );
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* __T1TABLES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftbzip2.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftbzip2.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftbzip2.h	(copie de travail)
@@ -1,102 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbzip2.h                                                              */
-/*                                                                         */
-/*    Bzip2-compressed stream support.                                     */
-/*                                                                         */
-/*  Copyright 2010 by                                                      */
-/*  Joel Klinghed.                                                         */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTBZIP2_H__
-#define __FTBZIP2_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bzip2                                                              */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    BZIP2 Streams                                                      */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using bzip2-compressed font files.                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Bzip2-specific functions. */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenBzip2
-  *
-  * @description:
-  *   Open a new stream to parse bzip2-compressed font files.  This is
-  *   mainly used to support the compressed `*.pcf.bz2' fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream ::
-  *     The target embedding stream.
-  *
-  *   source ::
-  *     The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function `FT_Stream_Close' on the new stream will
-  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream.
-  *
-  *   In certain builds of the library, bzip2 compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a bzip2 compressed stream
-  *   from it and re-open the face with it.
-  *
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with bzip2 support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenBzip2( FT_Stream  stream,
-                       FT_Stream  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTBZIP2_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/freetype/ftsnames.h
===================================================================
--- lib/3rdparty/freetype/include/freetype/ftsnames.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/freetype/ftsnames.h	(copie de travail)
@@ -1,200 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsnames.h                                                             */
-/*                                                                         */
-/*    Simple interface to access SFNT name tables (which are used          */
-/*    to hold font names, copyright info, notices, etc.) (specification).  */
-/*                                                                         */
-/*    This is _not_ used to retrieve glyph names!                          */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2006, 2009, 2010 by                   */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FT_SFNT_NAMES_H__
-#define __FT_SFNT_NAMES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    sfnt_names                                                         */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    SFNT Names                                                         */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Access the names embedded in TrueType and OpenType files.          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType and OpenType specifications allow the inclusion of    */
-  /*    a special `names table' in font files.  This table contains        */
-  /*    textual (and internationalized) information regarding the font,    */
-  /*    like family name, copyright, version, etc.                         */
-  /*                                                                       */
-  /*    The definitions below are used to access them if available.        */
-  /*                                                                       */
-  /*    Note that this has nothing to do with glyph names!                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SfntName                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model an SFNT `name' table entry.              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platform_id :: The platform ID for `string'.                       */
-  /*                                                                       */
-  /*    encoding_id :: The encoding ID for `string'.                       */
-  /*                                                                       */
-  /*    language_id :: The language ID for `string'.                       */
-  /*                                                                       */
-  /*    name_id     :: An identifier for `string'.                         */
-  /*                                                                       */
-  /*    string      :: The `name' string.  Note that its format differs    */
-  /*                   depending on the (platform,encoding) pair.  It can  */
-  /*                   be a Pascal String, a UTF-16 one, etc.              */
-  /*                                                                       */
-  /*                   Generally speaking, the string is not               */
-  /*                   zero-terminated.  Please refer to the TrueType      */
-  /*                   specification for details.                          */
-  /*                                                                       */
-  /*    string_len  :: The length of `string' in bytes.                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Possible values for `platform_id', `encoding_id', `language_id',   */
-  /*    and `name_id' are given in the file `ttnameid.h'.  For details     */
-  /*    please refer to the TrueType or OpenType specification.            */
-  /*                                                                       */
-  /*    See also @TT_PLATFORM_XXX, @TT_APPLE_ID_XXX, @TT_MAC_ID_XXX,       */
-  /*    @TT_ISO_ID_XXX, and @TT_MS_ID_XXX.                                 */
-  /*                                                                       */
-  typedef struct  FT_SfntName_
-  {
-    FT_UShort  platform_id;
-    FT_UShort  encoding_id;
-    FT_UShort  language_id;
-    FT_UShort  name_id;
-
-    FT_Byte*   string;      /* this string is *not* null-terminated! */
-    FT_UInt    string_len;  /* in bytes */
-
-  } FT_SfntName;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Name_Count                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the number of name strings in the SFNT `name' table.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The number of strings in the `name' table.                         */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Sfnt_Name_Count( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Name                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve a string of the SFNT `name' table for a given index.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A handle to the source face.                              */
-  /*                                                                       */
-  /*    idx   :: The index of the `name' string.                           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aname :: The indexed @FT_SfntName structure.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `string' array returned in the `aname' structure is not        */
-  /*    null-terminated.  The application should deallocate it if it is no */
-  /*    longer in use.                                                     */
-  /*                                                                       */
-  /*    Use @FT_Get_Sfnt_Name_Count to get the total number of available   */
-  /*    `name' table entries, then do a loop until you get the right       */
-  /*    platform, encoding, and name ID.                                   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Sfnt_Name( FT_Face       face,
-                    FT_UInt       idx,
-                    FT_SfntName  *aname );
-
-
-  /***************************************************************************
-   *
-   * @constant:
-   *   FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY
-   *
-   * @description:
-   *   A constant used as the tag of @FT_Parameter structures to make
-   *   FT_Open_Face() ignore preferred family subfamily names in `name'
-   *   table since OpenType version 1.4.  For backwards compatibility with
-   *   legacy systems which has 4-face-per-family restriction.
-   *
-   */
-#define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
-
-
-  /***************************************************************************
-   *
-   * @constant:
-   *   FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY
-   *
-   * @description:
-   *   A constant used as the tag of @FT_Parameter structures to make
-   *   FT_Open_Face() ignore preferred subfamily names in `name' table since
-   *   OpenType version 1.4.  For backwards compatibility with legacy
-   *   systems which has 4-face-per-family restriction.
-   *
-   */
-#define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 's' )
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FT_SFNT_NAMES_H__ */
-
-
-/* END */
Index: lib/3rdparty/freetype/include/ft2build.h
===================================================================
--- lib/3rdparty/freetype/include/ft2build.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/include/ft2build.h	(copie de travail)
@@ -3,9 +3,8 @@
 /*  ft2build.h                                                             */
 /*                                                                         */
 /*    FreeType 2 build and setup macros.                                   */
-/*    (Generic version)                                                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2006 by                                           */
+/*  Copyright 1996-2001, 2006, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -19,21 +18,25 @@
 
   /*************************************************************************/
   /*                                                                       */
-  /* This file corresponds to the default `ft2build.h' file for            */
-  /* FreeType 2.  It uses the `freetype' include root.                     */
+  /* This is the `entry point' for FreeType header file inclusions.  It is */
+  /* the only header file which should be included directly; all other     */
+  /* FreeType header files should be accessed with macro names (after      */
+  /* including `ft2build.h').                                              */
   /*                                                                       */
-  /* Note that specific platforms might use a different configuration.     */
-  /* See builds/unix/ft2unix.h for an example.                             */
+  /* A typical example is                                                  */
   /*                                                                       */
+  /*   #include <ft2build.h>                                               */
+  /*   #include FT_FREETYPE_H                                              */
+  /*                                                                       */
   /*************************************************************************/
 
 
-#ifndef __FT2_BUILD_GENERIC_H__
-#define __FT2_BUILD_GENERIC_H__
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__
 
-#include <freetype/config/ftheader.h>
+#include <config/ftheader.h>
 
-#endif /* __FT2_BUILD_GENERIC_H__ */
+#endif /* __FT2BUILD_H__ */
 
 
 /* END */
Index: lib/3rdparty/freetype/include/config/ftconfig.h
===================================================================
--- lib/3rdparty/freetype/include/config/ftconfig.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/config/ftconfig.h	(rÃ©vision 62573)
@@ -0,0 +1,672 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftconfig.h                                                             */
+/*                                                                         */
+/*    ANSI-specific configuration file (specification only).               */
+/*                                                                         */
+/*  Copyright 1996-2004, 2006-2008, 2010-2011, 2013 by                     */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This header file contains a number of macro definitions that are used */
+  /* by the rest of the engine.  Most of the macros here are automatically */
+  /* determined at compile time, and you should not need to change it to   */
+  /* port FreeType, except to compile the library with a non-ANSI          */
+  /* compiler.                                                             */
+  /*                                                                       */
+  /* Note however that if some specific modifications are needed, we       */
+  /* advise you to place a modified copy in your build directory.          */
+  /*                                                                       */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
+  /*                                                                       */
+  /* This ANSI version should stay in `include/config/'.                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifndef __FTCONFIG_H__
+#define __FTCONFIG_H__
+
+#include <ft2build.h>
+#include FT_CONFIG_OPTIONS_H
+#include FT_CONFIG_STANDARD_LIBRARY_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
+  /*                                                                       */
+  /* These macros can be toggled to suit a specific system.  The current   */
+  /* ones are defaults used to compile FreeType in an ANSI C environment   */
+  /* (16bit compilers are also supported).  Copy this file to your own     */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /* There are systems (like the Texas Instruments 'C54x) where a `char' */
+  /* has 16 bits.  ANSI C says that sizeof(char) is always 1.  Since an  */
+  /* `int' has 16 bits also for this system, sizeof(int) gives 1 which   */
+  /* is probably unexpected.                                             */
+  /*                                                                     */
+  /* `CHAR_BIT' (defined in limits.h) gives the number of bits in a      */
+  /* `char' type.                                                        */
+
+#ifndef FT_CHAR_BIT
+#define FT_CHAR_BIT  CHAR_BIT
+#endif
+
+
+  /* The size of an `int' type.  */
+#if                                 FT_UINT_MAX == 0xFFFFUL
+#define FT_SIZEOF_INT  (16 / FT_CHAR_BIT)
+#elif                               FT_UINT_MAX == 0xFFFFFFFFUL
+#define FT_SIZEOF_INT  (32 / FT_CHAR_BIT)
+#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
+#define FT_SIZEOF_INT  (64 / FT_CHAR_BIT)
+#else
+#error "Unsupported size of `int' type!"
+#endif
+
+  /* The size of a `long' type.  A five-byte `long' (as used e.g. on the */
+  /* DM642) is recognized but avoided.                                   */
+#if                                  FT_ULONG_MAX == 0xFFFFFFFFUL
+#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
+#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
+#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
+#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
+#define FT_SIZEOF_LONG  (64 / FT_CHAR_BIT)
+#else
+#error "Unsupported size of `long' type!"
+#endif
+
+
+  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
+  /* used -- this is only used to get rid of unpleasant compiler warnings */
+#ifndef FT_UNUSED
+#define FT_UNUSED( arg )  ( (arg) = (arg) )
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                     AUTOMATIC CONFIGURATION MACROS                    */
+  /*                                                                       */
+  /* These macros are computed from the ones defined above.  Don't touch   */
+  /* their definition, unless you know precisely what you are doing.  No   */
+  /* porter should need to mess with them.                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Mac support                                                           */
+  /*                                                                       */
+  /*   This is the only necessary change, so it is defined here instead    */
+  /*   providing a new configuration file.                                 */
+  /*                                                                       */
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
+  /* no Carbon frameworks for 64bit 10.4.x */
+  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
+  /* so guess the system version by maximum errno before inclusion */
+#include <errno.h>
+#ifdef ECANCELED /* defined since 10.2 */
+#include "AvailabilityMacros.h"
+#endif
+#if defined( __LP64__ ) && \
+    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
+#undef FT_MACINTOSH
+#endif
+
+#elif defined( __SC__ ) || defined( __MRC__ )
+  /* Classic MacOS compilers */
+#include "ConditionalMacros.h"
+#if TARGET_OS_MAC
+#define FT_MACINTOSH 1
+#endif
+
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    basic_types                                                        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int16                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 16bit signed integer type.                         */
+  /*                                                                       */
+  typedef signed short  FT_Int16;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt16                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 16bit unsigned integer type.                       */
+  /*                                                                       */
+  typedef unsigned short  FT_UInt16;
+
+  /* */
+
+
+  /* this #if 0 ... #endif clause is for documentation purposes */
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int32                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 32bit signed integer type.  The size depends on    */
+  /*    the configuration.                                                 */
+  /*                                                                       */
+  typedef signed XXX  FT_Int32;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt32                                                          */
+  /*                                                                       */
+  /*    A typedef for a 32bit unsigned integer type.  The size depends on  */
+  /*    the configuration.                                                 */
+  /*                                                                       */
+  typedef unsigned XXX  FT_UInt32;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int64                                                           */
+  /*                                                                       */
+  /*    A typedef for a 64bit signed integer type.  The size depends on    */
+  /*    the configuration.  Only defined if there is real 64bit support;   */
+  /*    otherwise, it gets emulated with a structure (if necessary).       */
+  /*                                                                       */
+  typedef signed XXX  FT_Int64;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt64                                                          */
+  /*                                                                       */
+  /*    A typedef for a 64bit unsigned integer type.  The size depends on  */
+  /*    the configuration.  Only defined if there is real 64bit support;   */
+  /*    otherwise, it gets emulated with a structure (if necessary).       */
+  /*                                                                       */
+  typedef unsigned XXX  FT_UInt64;
+
+  /* */
+
+#endif
+
+#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
+
+  typedef signed int      FT_Int32;
+  typedef unsigned int    FT_UInt32;
+
+#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
+
+  typedef signed long     FT_Int32;
+  typedef unsigned long   FT_UInt32;
+
+#else
+#error "no 32bit type found -- please check your configuration files"
+#endif
+
+
+  /* look up an integer type that is at least 32 bits */
+#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
+
+  typedef int            FT_Fast;
+  typedef unsigned int   FT_UFast;
+
+#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
+
+  typedef long           FT_Fast;
+  typedef unsigned long  FT_UFast;
+
+#endif
+
+
+  /* determine whether we have a 64-bit int type for platforms without */
+  /* Autoconf                                                          */
+#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
+
+  /* FT_LONG64 must be defined if a 64-bit type is available */
+#define FT_LONG64
+#define FT_INT64   long
+#define FT_UINT64  unsigned long
+
+#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
+
+  /* this compiler provides the __int64 type */
+#define FT_LONG64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64
+
+#elif defined( __BORLANDC__ )  /* Borland C++ */
+
+  /* XXXX: We should probably check the value of __BORLANDC__ in order */
+  /*       to test the compiler version.                               */
+
+  /* this compiler provides the __int64 type */
+#define FT_LONG64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64
+
+#elif defined( __WATCOMC__ )   /* Watcom C++ */
+
+  /* Watcom doesn't provide 64-bit data types */
+
+#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
+
+#define FT_LONG64
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
+
+#elif defined( __GNUC__ )
+
+  /* GCC provides the `long long' type */
+#define FT_LONG64
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
+
+#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* A 64-bit data type will create compilation problems if you compile    */
+  /* in strict ANSI mode.  To avoid them, we disable its use if __STDC__   */
+  /* is defined.  You can however ignore this rule by defining the         */
+  /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro.                     */
+  /*                                                                       */
+#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
+
+#ifdef __STDC__
+
+  /* undefine the 64-bit macros in strict ANSI compilation mode */
+#undef FT_LONG64
+#undef FT_INT64
+
+#endif /* __STDC__ */
+
+#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
+
+#ifdef FT_LONG64
+  typedef FT_INT64   FT_Int64;
+  typedef FT_UINT64  FT_UInt64;
+#endif
+
+
+#define FT_BEGIN_STMNT  do {
+#define FT_END_STMNT    } while ( 0 )
+#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
+
+
+#ifndef  FT_CONFIG_OPTION_NO_ASSEMBLER
+  /* Provide assembler fragments for performance-critical functions. */
+  /* These must be defined `static __inline__' with GCC.             */
+
+#if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm
+    {
+      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
+      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
+      add   a,  a,  #0x8000         /* a  += 0x8000 */
+      adds  t2, t2, a               /* t2 += a */
+      adc   t,  t,  #0              /* t  += carry */
+      mov   a,  t2, lsr #16         /* a   = t2 >> 16 */
+      orr   a,  a,  t,  lsl #16     /* a  |= t << 16 */
+    }
+    return a;
+  }
+
+#endif /* __CC_ARM || __ARMCC__ */
+
+
+#ifdef __GNUC__
+
+#if defined( __arm__ )                                 && \
+    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
+    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline__ FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm__ __volatile__ (
+      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
+      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+#ifdef __clang__
+      "add.w  %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#else
+      "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#endif
+      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
+      "adc    %2, %2, #0\n\t"           /* %2 += carry */
+      "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
+      "orr    %0, %0, %2, lsl #16\n\t"  /* %0 |= %2 << 16 */
+      : "=r"(a), "=&r"(t2), "=&r"(t)
+      : "r"(a), "r"(b)
+      : "cc" );
+    return a;
+  }
+
+#endif /* __arm__                      && */
+       /* ( __thumb2__ || !__thumb__ ) && */
+       /* !( __CC_ARM || __ARMCC__ )      */
+
+
+#if defined( __i386__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline__ FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+
+    __asm__ __volatile__ (
+      "imul  %%edx\n"
+      "movl  %%edx, %%ecx\n"
+      "sarl  $31, %%ecx\n"
+      "addl  $0x8000, %%ecx\n"
+      "addl  %%ecx, %%eax\n"
+      "adcl  $0, %%edx\n"
+      "shrl  $16, %%eax\n"
+      "shll  $16, %%edx\n"
+      "addl  %%edx, %%eax\n"
+      : "=a"(result), "=d"(b)
+      : "a"(a), "d"(b)
+      : "%ecx", "cc" );
+    return result;
+  }
+
+#endif /* i386 */
+
+#endif /* __GNUC__ */
+
+
+#ifdef _MSC_VER /* Visual C++ */
+
+#ifdef _M_IX86
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+    __asm
+    {
+      mov eax, a
+      mov edx, b
+      imul edx
+      mov ecx, edx
+      sar ecx, 31
+      add ecx, 8000h
+      add eax, ecx
+      adc edx, 0
+      shr eax, 16
+      shl edx, 16
+      add eax, edx
+      mov result, eax
+    }
+    return result;
+  }
+
+#endif /* _M_IX86 */
+
+#endif /* _MSC_VER */
+
+
+#if defined( __GNUC__ ) && defined( __x86_64__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
+
+  static __inline__ FT_Int32
+  FT_MulFix_x86_64( FT_Int32  a,
+                    FT_Int32  b )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
+#if 1
+    /* Technically not an assembly fragment, but GCC does a really good */
+    /* job at inlining it and generating good machine code for it.      */
+    long long  ret, tmp;
+
+
+    ret  = (long long)a * b;
+    tmp  = ret >> 63;
+    ret += 0x8000 + tmp;
+
+    return (FT_Int32)( ret >> 16 );
+#else
+
+    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
+    /* code from the lines below.  The main issue is that `wide_a' is not  */
+    /* properly initialized by sign-extending `a'.  Instead, the generated */
+    /* machine code assumes that the register that contains `a' on input   */
+    /* can be used directly as a 64-bit value, which is wrong most of the  */
+    /* time.                                                               */
+    long long  wide_a = (long long)a;
+    long long  wide_b = (long long)b;
+    long long  result;
+
+
+    __asm__ __volatile__ (
+      "imul %2, %1\n"
+      "mov %1, %0\n"
+      "sar $63, %0\n"
+      "lea 0x8000(%1, %0), %0\n"
+      "sar $16, %0\n"
+      : "=&r"(result), "=&r"(wide_a)
+      : "r"(wide_b)
+      : "cc" );
+
+    return (FT_Int32)result;
+#endif
+
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic pop
+#endif
+  }
+
+#endif /* __GNUC__ && __x86_64__ */
+
+#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+#ifdef FT_CONFIG_OPTION_INLINE_MULFIX
+#ifdef FT_MULFIX_ASSEMBLER
+#define FT_MULFIX_INLINED  FT_MULFIX_ASSEMBLER
+#endif
+#endif
+
+
+#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
+
+#define FT_LOCAL( x )      static  x
+#define FT_LOCAL_DEF( x )  static  x
+
+#else
+
+#ifdef __cplusplus
+#define FT_LOCAL( x )      extern "C"  x
+#define FT_LOCAL_DEF( x )  extern "C"  x
+#else
+#define FT_LOCAL( x )      extern  x
+#define FT_LOCAL_DEF( x )  x
+#endif
+
+#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
+
+#define FT_LOCAL_ARRAY( x )      extern const  x
+#define FT_LOCAL_ARRAY_DEF( x )  const  x
+
+
+#ifndef FT_BASE
+
+#ifdef __cplusplus
+#define FT_BASE( x )  extern "C"  x
+#else
+#define FT_BASE( x )  extern  x
+#endif
+
+#endif /* !FT_BASE */
+
+
+#ifndef FT_BASE_DEF
+
+#ifdef __cplusplus
+#define FT_BASE_DEF( x )  x
+#else
+#define FT_BASE_DEF( x )  x
+#endif
+
+#endif /* !FT_BASE_DEF */
+
+
+#ifndef FT_EXPORT
+
+#ifdef __cplusplus
+#define FT_EXPORT( x )  extern "C"  x
+#else
+#define FT_EXPORT( x )  extern  x
+#endif
+
+#endif /* !FT_EXPORT */
+
+
+#ifndef FT_EXPORT_DEF
+
+#ifdef __cplusplus
+#define FT_EXPORT_DEF( x )  extern "C"  x
+#else
+#define FT_EXPORT_DEF( x )  extern  x
+#endif
+
+#endif /* !FT_EXPORT_DEF */
+
+
+#ifndef FT_EXPORT_VAR
+
+#ifdef __cplusplus
+#define FT_EXPORT_VAR( x )  extern "C"  x
+#else
+#define FT_EXPORT_VAR( x )  extern  x
+#endif
+
+#endif /* !FT_EXPORT_VAR */
+
+  /* The following macros are needed to compile the library with a   */
+  /* C++ compiler and with 16bit compilers.                          */
+  /*                                                                 */
+
+  /* This is special.  Within C++, you must specify `extern "C"' for */
+  /* functions which are used via function pointers, and you also    */
+  /* must do that for structures which contain function pointers to  */
+  /* assure C linkage -- it's not possible to have (local) anonymous */
+  /* functions which are accessed by (global) function pointers.     */
+  /*                                                                 */
+  /*                                                                 */
+  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
+  /*                                                                 */
+  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
+  /* contains pointers to callback functions.                        */
+  /*                                                                 */
+  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
+  /* that contains pointers to callback functions.                   */
+  /*                                                                 */
+  /*                                                                 */
+  /* Some 16bit compilers have to redefine these macros to insert    */
+  /* the infamous `_cdecl' or `__fastcall' declarations.             */
+  /*                                                                 */
+#ifndef FT_CALLBACK_DEF
+#ifdef __cplusplus
+#define FT_CALLBACK_DEF( x )  extern "C"  x
+#else
+#define FT_CALLBACK_DEF( x )  static  x
+#endif
+#endif /* FT_CALLBACK_DEF */
+
+#ifndef FT_CALLBACK_TABLE
+#ifdef __cplusplus
+#define FT_CALLBACK_TABLE      extern "C"
+#define FT_CALLBACK_TABLE_DEF  extern "C"
+#else
+#define FT_CALLBACK_TABLE      extern
+#define FT_CALLBACK_TABLE_DEF  /* nothing */
+#endif
+#endif /* FT_CALLBACK_TABLE */
+
+
+FT_END_HEADER
+
+
+#endif /* __FTCONFIG_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/config/ftconfig.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/config/ftheader.h
===================================================================
--- lib/3rdparty/freetype/include/config/ftheader.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/config/ftheader.h	(rÃ©vision 62573)
@@ -0,0 +1,832 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftheader.h                                                             */
+/*                                                                         */
+/*    Build macros of the FreeType 2 library.                              */
+/*                                                                         */
+/*  Copyright 1996-2008, 2010, 2012, 2013 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+#ifndef __FT_HEADER_H__
+#define __FT_HEADER_H__
+
+
+  /*@***********************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_BEGIN_HEADER                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This macro is used in association with @FT_END_HEADER in header    */
+  /*    files to ensure that the declarations within are properly          */
+  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
+  /*    C++ compiler.                                                      */
+  /*                                                                       */
+#ifdef __cplusplus
+#define FT_BEGIN_HEADER  extern "C" {
+#else
+#define FT_BEGIN_HEADER  /* nothing */
+#endif
+
+
+  /*@***********************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_END_HEADER                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This macro is used in association with @FT_BEGIN_HEADER in header  */
+  /*    files to ensure that the declarations within are properly          */
+  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
+  /*    C++ compiler.                                                      */
+  /*                                                                       */
+#ifdef __cplusplus
+#define FT_END_HEADER  }
+#else
+#define FT_END_HEADER  /* nothing */
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Aliases for the FreeType 2 public and configuration files.            */
+  /*                                                                       */
+  /*************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    header_file_macros                                                 */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Header File Macros                                                 */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Macro definitions used to #include specific header files.          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The following macros are defined to the name of specific           */
+  /*    FreeType~2 header files.  They can be used directly in #include    */
+  /*    statements as in:                                                  */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      #include FT_FREETYPE_H                                           */
+  /*      #include FT_MULTIPLE_MASTERS_H                                   */
+  /*      #include FT_GLYPH_H                                              */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    There are several reasons why we are now using macros to name      */
+  /*    public header files.  The first one is that such macros are not    */
+  /*    limited to the infamous 8.3~naming rule required by DOS (and       */
+  /*    `FT_MULTIPLE_MASTERS_H' is a lot more meaningful than `ftmm.h').   */
+  /*                                                                       */
+  /*    The second reason is that it allows for more flexibility in the    */
+  /*    way FreeType~2 is installed on a given system.                     */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /* configuration files */
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CONFIG_CONFIG_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing
+   *   FreeType~2 configuration data.
+   *
+   */
+#ifndef FT_CONFIG_CONFIG_H
+#define FT_CONFIG_CONFIG_H  <config/ftconfig.h>
+#endif
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CONFIG_STANDARD_LIBRARY_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing
+   *   FreeType~2 interface to the standard C library functions.
+   *
+   */
+#ifndef FT_CONFIG_STANDARD_LIBRARY_H
+#define FT_CONFIG_STANDARD_LIBRARY_H  <config/ftstdlib.h>
+#endif
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CONFIG_OPTIONS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing
+   *   FreeType~2 project-specific configuration options.
+   *
+   */
+#ifndef FT_CONFIG_OPTIONS_H
+#define FT_CONFIG_OPTIONS_H  <config/ftoption.h>
+#endif
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CONFIG_MODULES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   list of FreeType~2 modules that are statically linked to new library
+   *   instances in @FT_Init_FreeType.
+   *
+   */
+#ifndef FT_CONFIG_MODULES_H
+#define FT_CONFIG_MODULES_H  <config/ftmodule.h>
+#endif
+
+  /* */
+
+  /* public headers */
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_FREETYPE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   base FreeType~2 API.
+   *
+   */
+#define FT_FREETYPE_H  <freetype.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_ERRORS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   list of FreeType~2 error codes (and messages).
+   *
+   *   It is included by @FT_FREETYPE_H.
+   *
+   */
+#define FT_ERRORS_H  <fterrors.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_MODULE_ERRORS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   list of FreeType~2 module error offsets (and messages).
+   *
+   */
+#define FT_MODULE_ERRORS_H  <ftmoderr.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_SYSTEM_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 interface to low-level operations (i.e., memory management
+   *   and stream i/o).
+   *
+   *   It is included by @FT_FREETYPE_H.
+   *
+   */
+#define FT_SYSTEM_H  <ftsystem.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_IMAGE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing type
+   *   definitions related to glyph images (i.e., bitmaps, outlines,
+   *   scan-converter parameters).
+   *
+   *   It is included by @FT_FREETYPE_H.
+   *
+   */
+#define FT_IMAGE_H  <ftimage.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TYPES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   basic data types defined by FreeType~2.
+   *
+   *   It is included by @FT_FREETYPE_H.
+   *
+   */
+#define FT_TYPES_H  <fttypes.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_LIST_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   list management API of FreeType~2.
+   *
+   *   (Most applications will never need to include this file.)
+   *
+   */
+#define FT_LIST_H  <ftlist.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_OUTLINE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   scalable outline management API of FreeType~2.
+   *
+   */
+#define FT_OUTLINE_H  <ftoutln.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_SIZES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   API which manages multiple @FT_Size objects per face.
+   *
+   */
+#define FT_SIZES_H  <ftsizes.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_MODULE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   module management API of FreeType~2.
+   *
+   */
+#define FT_MODULE_H  <ftmodapi.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_RENDER_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   renderer module management API of FreeType~2.
+   *
+   */
+#define FT_RENDER_H  <ftrender.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_AUTOHINTER_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing
+   *   structures and macros related to the auto-hinting module.
+   *
+   */
+#define FT_AUTOHINTER_H  <ftautoh.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CFF_DRIVER_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing
+   *   structures and macros related to the CFF driver module.
+   *
+   */
+#define FT_CFF_DRIVER_H  <ftcffdrv.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TRUETYPE_DRIVER_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing
+   *   structures and macros related to the TrueType driver module.
+   *
+   */
+#define FT_TRUETYPE_DRIVER_H  <ftttdrv.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TYPE1_TABLES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   types and API specific to the Type~1 format.
+   *
+   */
+#define FT_TYPE1_TABLES_H  <t1tables.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TRUETYPE_IDS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   enumeration values which identify name strings, languages, encodings,
+   *   etc.  This file really contains a _large_ set of constant macro
+   *   definitions, taken from the TrueType and OpenType specifications.
+   *
+   */
+#define FT_TRUETYPE_IDS_H  <ttnameid.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TRUETYPE_TABLES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   types and API specific to the TrueType (as well as OpenType) format.
+   *
+   */
+#define FT_TRUETYPE_TABLES_H  <tttables.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TRUETYPE_TAGS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of TrueType four-byte `tags' which identify blocks in
+   *   SFNT-based font formats (i.e., TrueType and OpenType).
+   *
+   */
+#define FT_TRUETYPE_TAGS_H  <tttags.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_BDF_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of an API which accesses BDF-specific strings from a
+   *   face.
+   *
+   */
+#define FT_BDF_H  <ftbdf.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CID_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of an API which access CID font information from a
+   *   face.
+   *
+   */
+#define FT_CID_H  <ftcid.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_GZIP_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of an API which supports gzip-compressed files.
+   *
+   */
+#define FT_GZIP_H  <ftgzip.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_LZW_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of an API which supports LZW-compressed files.
+   *
+   */
+#define FT_LZW_H  <ftlzw.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_BZIP2_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of an API which supports bzip2-compressed files.
+   *
+   */
+#define FT_BZIP2_H  <ftbzip2.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_WINFONTS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   definitions of an API which supports Windows FNT files.
+   *
+   */
+#define FT_WINFONTS_H   <ftwinfnt.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_GLYPH_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   API of the optional glyph management component.
+   *
+   */
+#define FT_GLYPH_H  <ftglyph.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_BITMAP_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   API of the optional bitmap conversion component.
+   *
+   */
+#define FT_BITMAP_H  <ftbitmap.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_BBOX_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   API of the optional exact bounding box computation routines.
+   *
+   */
+#define FT_BBOX_H  <ftbbox.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CACHE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   API of the optional FreeType~2 cache sub-system.
+   *
+   */
+#define FT_CACHE_H  <ftcache.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CACHE_IMAGE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   `glyph image' API of the FreeType~2 cache sub-system.
+   *
+   *   It is used to define a cache for @FT_Glyph elements.  You can also
+   *   use the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need to
+   *   store small glyph bitmaps, as it will use less memory.
+   *
+   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
+   *   glyph image-related cache declarations.
+   *
+   */
+#define FT_CACHE_IMAGE_H  FT_CACHE_H
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CACHE_SMALL_BITMAPS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   `small bitmaps' API of the FreeType~2 cache sub-system.
+   *
+   *   It is used to define a cache for small glyph bitmaps in a relatively
+   *   memory-efficient way.  You can also use the API defined in
+   *   @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images,
+   *   including scalable outlines.
+   *
+   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
+   *   small bitmaps-related cache declarations.
+   *
+   */
+#define FT_CACHE_SMALL_BITMAPS_H  FT_CACHE_H
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_CACHE_CHARMAP_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   `charmap' API of the FreeType~2 cache sub-system.
+   *
+   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
+   *   charmap-based cache declarations.
+   *
+   */
+#define FT_CACHE_CHARMAP_H  FT_CACHE_H
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_MAC_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   Macintosh-specific FreeType~2 API.  The latter is used to access
+   *   fonts embedded in resource forks.
+   *
+   *   This header file must be explicitly included by client applications
+   *   compiled on the Mac (note that the base API still works though).
+   *
+   */
+#define FT_MAC_H  <ftmac.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_MULTIPLE_MASTERS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   optional multiple-masters management API of FreeType~2.
+   *
+   */
+#define FT_MULTIPLE_MASTERS_H  <ftmm.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_SFNT_NAMES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   optional FreeType~2 API which accesses embedded `name' strings in
+   *   SFNT-based font formats (i.e., TrueType and OpenType).
+   *
+   */
+#define FT_SFNT_NAMES_H  <ftsnames.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_OPENTYPE_VALIDATE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   optional FreeType~2 API which validates OpenType tables (BASE, GDEF,
+   *   GPOS, GSUB, JSTF).
+   *
+   */
+#define FT_OPENTYPE_VALIDATE_H  <ftotval.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_GX_VALIDATE_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   optional FreeType~2 API which validates TrueTypeGX/AAT tables (feat,
+   *   mort, morx, bsln, just, kern, opbd, trak, prop).
+   *
+   */
+#define FT_GX_VALIDATE_H  <ftgxval.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_PFR_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which accesses PFR-specific data.
+   *
+   */
+#define FT_PFR_H  <ftpfr.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_STROKER_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which provides functions to stroke outline paths.
+   */
+#define FT_STROKER_H  <ftstroke.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_SYNTHESIS_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which performs artificial obliquing and emboldening.
+   */
+#define FT_SYNTHESIS_H  <ftsynth.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_XFREE86_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which provides functions specific to the XFree86 and
+   *   X.Org X11 servers.
+   */
+#define FT_XFREE86_H  <ftxf86.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_TRIGONOMETRY_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which performs trigonometric computations (e.g.,
+   *   cosines and arc tangents).
+   */
+#define FT_TRIGONOMETRY_H  <fttrigon.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_LCD_FILTER_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which performs color filtering for subpixel rendering.
+   */
+#define FT_LCD_FILTER_H  <ftlcdfil.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_UNPATENTED_HINTING_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which performs color filtering for subpixel rendering.
+   */
+#define FT_UNPATENTED_HINTING_H  <ttunpat.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_INCREMENTAL_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which performs color filtering for subpixel rendering.
+   */
+#define FT_INCREMENTAL_H  <ftincrem.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_GASP_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which returns entries from the TrueType GASP table.
+   */
+#define FT_GASP_H  <ftgasp.h>
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_ADVANCES_H
+   *
+   * @description:
+   *   A macro used in #include statements to name the file containing the
+   *   FreeType~2 API which returns individual and ranged glyph advances.
+   */
+#define FT_ADVANCES_H  <ftadvanc.h>
+
+
+  /* */
+
+#define FT_ERROR_DEFINITIONS_H  <fterrdef.h>
+
+
+  /* The internals of the cache sub-system are no longer exposed.  We */
+  /* default to FT_CACHE_H at the moment just in case, but we know of */
+  /* no rogue client that uses them.                                  */
+  /*                                                                  */
+#define FT_CACHE_MANAGER_H           <ftcache.h>
+#define FT_CACHE_INTERNAL_MRU_H      <ftcache.h>
+#define FT_CACHE_INTERNAL_MANAGER_H  <ftcache.h>
+#define FT_CACHE_INTERNAL_CACHE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_GLYPH_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_IMAGE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_SBITS_H    <ftcache.h>
+
+
+#define FT_INCREMENTAL_H          <ftincrem.h>
+
+#define FT_TRUETYPE_UNPATENTED_H  <ttunpat.h>
+
+
+  /*
+   * Include internal headers definitions from <internal/...>
+   * only when building the library.
+   */
+#ifdef FT2_BUILD_LIBRARY
+#define  FT_INTERNAL_INTERNAL_H  <internal/internal.h>
+#include FT_INTERNAL_INTERNAL_H
+#endif /* FT2_BUILD_LIBRARY */
+
+
+#endif /* __FT2_BUILD_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/config/ftheader.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/config/ftmodule.h
===================================================================
--- lib/3rdparty/freetype/include/config/ftmodule.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/config/ftmodule.h	(rÃ©vision 62573)
@@ -0,0 +1,32 @@
+/*
+ *  This file registers the FreeType modules compiled into the library.
+ *
+ *  If you use GNU make, this file IS NOT USED!  Instead, it is created in
+ *  the objects directory (normally `<topdir>/objs/') based on information
+ *  from `<topdir>/modules.cfg'.
+ *
+ *  Please read `docs/INSTALL.ANY' and `docs/CUSTOMIZE' how to compile
+ *  FreeType without GNU make.
+ *
+ */
+
+FT_USE_MODULE( FT_Module_Class, autofit_module_class )
+FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
+FT_USE_MODULE( FT_Module_Class, psaux_module_class )
+FT_USE_MODULE( FT_Module_Class, psnames_module_class )
+FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
+FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
+FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
+
+/* EOF */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/config/ftmodule.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/config/ftoption.h
===================================================================
--- lib/3rdparty/freetype/include/config/ftoption.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/config/ftoption.h	(rÃ©vision 62573)
@@ -0,0 +1,833 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftoption.h                                                             */
+/*                                                                         */
+/*    User-selectable configuration macros (specification only).           */
+/*                                                                         */
+/*  Copyright 1996-2013 by                                                 */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTOPTION_H__
+#define __FTOPTION_H__
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                 USER-SELECTABLE CONFIGURATION MACROS                  */
+  /*                                                                       */
+  /* This file contains the default configuration macro definitions for    */
+  /* a standard build of the FreeType library.  There are three ways to    */
+  /* use this file to build project-specific versions of the library:      */
+  /*                                                                       */
+  /*  - You can modify this file by hand, but this is not recommended in   */
+  /*    cases where you would like to build several versions of the        */
+  /*    library from a single source directory.                            */
+  /*                                                                       */
+  /*  - You can put a copy of this file in your build directory, more      */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
+  /*                                                                       */
+  /*    The default FreeType Makefiles and Jamfiles use the build          */
+  /*    directory `builds/<system>' by default, but you can easily change  */
+  /*    that for your own projects.                                        */
+  /*                                                                       */
+  /*  - Copy the file <ft2build.h> to `$BUILD/ft2build.h' and modify it    */
+  /*    slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to       */
+  /*    locate this file during the build.  For example,                   */
+  /*                                                                       */
+  /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
+  /*      #include <config/ftheader.h>                                     */
+  /*                                                                       */
+  /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
+  /*    definitions.                                                       */
+  /*                                                                       */
+  /*    Note also that you can similarly pre-define the macro              */
+  /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
+  /*    that are statically linked to the library at compile time.  By     */
+  /*    default, this file is <config/ftmodule.h>.                         */
+  /*                                                                       */
+  /*  We highly recommend using the third method whenever possible.        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /**** G E N E R A L   F R E E T Y P E   2   C O N F I G U R A T I O N ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Uncomment the line below if you want to activate sub-pixel rendering  */
+  /* (a.k.a. LCD rendering, or ClearType) in this build of the library.    */
+  /*                                                                       */
+  /* Note that this feature is covered by several Microsoft patents        */
+  /* and should not be activated in any default build of the library.      */
+  /*                                                                       */
+  /* This macro has no impact on the FreeType API, only on its             */
+  /* _implementation_.  For example, using FT_RENDER_MODE_LCD when calling */
+  /* FT_Render_Glyph still generates a bitmap that is 3 times wider than   */
+  /* the original size in case this macro isn't defined; however, each     */
+  /* triplet of subpixels has R=G=B.                                       */
+  /*                                                                       */
+  /* This is done to allow FreeType clients to run unmodified, forcing     */
+  /* them to display normal gray-level anti-aliased glyphs.                */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
+  /* by FreeType to speed up some computations.  However, this will create */
+  /* some problems when compiling the library in strict ANSI mode.         */
+  /*                                                                       */
+  /* For this reason, the use of 64-bit integers is normally disabled when */
+  /* the __STDC__ macro is defined.  You can however disable this by       */
+  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
+  /*                                                                       */
+  /* For most compilers, this will only create compilation warnings when   */
+  /* building the library.                                                 */
+  /*                                                                       */
+  /* ObNote: The compiler-specific 64-bit integers are detected in the     */
+  /*         file `ftconfig.h' either statically or through the            */
+  /*         `configure' script on supported platforms.                    */
+  /*                                                                       */
+#undef FT_CONFIG_OPTION_FORCE_INT64
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* If this macro is defined, do not try to use an assembler version of   */
+  /* performance-critical functions (e.g. FT_MulFix).  You should only do  */
+  /* that to verify that the assembler function works properly, or to      */
+  /* execute benchmark tests of the various implementations.               */
+/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* If this macro is defined, try to use an inlined assembler version of  */
+  /* the `FT_MulFix' function, which is a `hotspot' when loading and       */
+  /* hinting glyphs, and which should be executed as fast as possible.     */
+  /*                                                                       */
+  /* Note that if your compiler or CPU is not supported, this will default */
+  /* to the standard and portable implementation found in `ftcalc.c'.      */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_INLINE_MULFIX
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* LZW-compressed file support.                                          */
+  /*                                                                       */
+  /*   FreeType now handles font files that have been compressed with the  */
+  /*   `compress' program.  This is mostly used to parse many of the PCF   */
+  /*   files that come with various X11 distributions.  The implementation */
+  /*   uses NetBSD's `zopen' to partially uncompress the file on the fly   */
+  /*   (see src/lzw/ftgzip.c).                                             */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.             */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_USE_LZW
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Gzip-compressed file support.                                         */
+  /*                                                                       */
+  /*   FreeType now handles font files that have been compressed with the  */
+  /*   `gzip' program.  This is mostly used to parse many of the PCF files */
+  /*   that come with XFree86.  The implementation uses `zlib' to          */
+  /*   partially uncompress the file on the fly (see src/gzip/ftgzip.c).   */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.  See also   */
+  /*   the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below.                       */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_USE_ZLIB
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* ZLib library selection                                                */
+  /*                                                                       */
+  /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
+  /*   It allows FreeType's `ftgzip' component to link to the system's     */
+  /*   installation of the ZLib library.  This is useful on systems like   */
+  /*   Unix or VMS where it generally is already available.                */
+  /*                                                                       */
+  /*   If you let it undefined, the component will use its own copy        */
+  /*   of the zlib sources instead.  These have been modified to be        */
+  /*   included directly within the component and *not* export external    */
+  /*   function names.  This allows you to link any program with FreeType  */
+  /*   _and_ ZLib without linking conflicts.                               */
+  /*                                                                       */
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Bzip2-compressed file support.                                        */
+  /*                                                                       */
+  /*   FreeType now handles font files that have been compressed with the  */
+  /*   `bzip2' program.  This is mostly used to parse many of the PCF      */
+  /*   files that come with XFree86.  The implementation uses `libbz2' to  */
+  /*   partially uncompress the file on the fly (see src/bzip2/ftbzip2.c). */
+  /*   Contrary to gzip, bzip2 currently is not included and need to use   */
+  /*   the system available bzip2 implementation.                          */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.             */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_USE_BZIP2 */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define to disable the use of file stream functions and types, FILE,   */
+  /* fopen() etc.  Enables the use of smaller system libraries on embedded */
+  /* systems that have multiple system libraries, some with or without     */
+  /* file stream support, in the cases where file stream support is not    */
+  /* necessary such as memory loading of font files.                       */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  PNG bitmap support.                                                  */
+  /*                                                                       */
+  /*   FreeType now handles loading color bitmap glyphs in the PNG format. */
+  /*   This requires help from the external libpng library.  Uncompressed  */
+  /*   color bitmaps do not need any external libraries and will be        */
+  /*   supported regardless of this configuration.                         */
+  /*                                                                       */
+  /*   Define this macro if you want to enable this `feature'.             */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_USE_PNG */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* DLL export compilation                                                */
+  /*                                                                       */
+  /*   When compiling FreeType as a DLL, some systems/compilers need a     */
+  /*   special keyword in front OR after the return type of function       */
+  /*   declarations.                                                       */
+  /*                                                                       */
+  /*   Two macros are used within the FreeType source code to define       */
+  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
+  /*                                                                       */
+  /*     FT_EXPORT( return_type )                                          */
+  /*                                                                       */
+  /*       is used in a function declaration, as in                        */
+  /*                                                                       */
+  /*         FT_EXPORT( FT_Error )                                         */
+  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
+  /*                                                                       */
+  /*                                                                       */
+  /*     FT_EXPORT_DEF( return_type )                                      */
+  /*                                                                       */
+  /*       is used in a function definition, as in                         */
+  /*                                                                       */
+  /*         FT_EXPORT_DEF( FT_Error )                                     */
+  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
+  /*         {                                                             */
+  /*           ... some code ...                                           */
+  /*           return FT_Err_Ok;                                           */
+  /*         }                                                             */
+  /*                                                                       */
+  /*   You can provide your own implementation of FT_EXPORT and            */
+  /*   FT_EXPORT_DEF here if you want.  If you leave them undefined, they  */
+  /*   will be later automatically defined as `extern return_type' to      */
+  /*   allow normal compilation.                                           */
+  /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+/* #define FT_EXPORT(x)      extern x */
+/* #define FT_EXPORT_DEF(x)  x */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Glyph Postscript Names handling                                       */
+  /*                                                                       */
+  /*   By default, FreeType 2 is compiled with the `psnames' module.  This */
+  /*   module is in charge of converting a glyph name string into a        */
+  /*   Unicode value, or return a Macintosh standard glyph name for the    */
+  /*   use with the TrueType `post' table.                                 */
+  /*                                                                       */
+  /*   Undefine this macro if you do not want `psnames' compiled in your   */
+  /*   build of FreeType.  This has the following effects:                 */
+  /*                                                                       */
+  /*   - The TrueType driver will provide its own set of glyph names,      */
+  /*     if you build it to support postscript names in the TrueType       */
+  /*     `post' table.                                                     */
+  /*                                                                       */
+  /*   - The Type 1 driver will not be able to synthesize a Unicode        */
+  /*     charmap out of the glyphs found in the fonts.                     */
+  /*                                                                       */
+  /*   You would normally undefine this configuration macro when building  */
+  /*   a version of FreeType that doesn't contain a Type 1 or CFF driver.  */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Postscript Names to Unicode Values support                            */
+  /*                                                                       */
+  /*   By default, FreeType 2 is built with the `PSNames' module compiled  */
+  /*   in.  Among other things, the module is used to convert a glyph name */
+  /*   into a Unicode value.  This is especially useful in order to        */
+  /*   synthesize on the fly a Unicode charmap from the CFF/Type 1 driver  */
+  /*   through a big table named the `Adobe Glyph List' (AGL).             */
+  /*                                                                       */
+  /*   Undefine this macro if you do not want the Adobe Glyph List         */
+  /*   compiled in your `PSNames' module.  The Type 1 driver will not be   */
+  /*   able to synthesize a Unicode charmap out of the glyphs found in the */
+  /*   fonts.                                                              */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Support for Mac fonts                                                 */
+  /*                                                                       */
+  /*   Define this macro if you want support for outline fonts in Mac      */
+  /*   format (mac dfont, mac resource, macbinary containing a mac         */
+  /*   resource) on non-Mac platforms.                                     */
+  /*                                                                       */
+  /*   Note that the `FOND' resource isn't checked.                        */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_MAC_FONTS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Guessing methods to access embedded resource forks                    */
+  /*                                                                       */
+  /*   Enable extra Mac fonts support on non-Mac platforms (e.g.           */
+  /*   GNU/Linux).                                                         */
+  /*                                                                       */
+  /*   Resource forks which include fonts data are stored sometimes in     */
+  /*   locations which users or developers don't expected.  In some cases, */
+  /*   resource forks start with some offset from the head of a file.  In  */
+  /*   other cases, the actual resource fork is stored in file different   */
+  /*   from what the user specifies.  If this option is activated,         */
+  /*   FreeType tries to guess whether such offsets or different file      */
+  /*   names must be used.                                                 */
+  /*                                                                       */
+  /*   Note that normal, direct access of resource forks is controlled via */
+  /*   the FT_CONFIG_OPTION_MAC_FONTS option.                              */
+  /*                                                                       */
+#ifdef FT_CONFIG_OPTION_MAC_FONTS
+#define FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Allow the use of FT_Incremental_Interface to load typefaces that      */
+  /* contain no glyph data, but supply it via a callback function.         */
+  /* This is required by clients supporting document formats which         */
+  /* supply font data incrementally as the document is parsed, such        */
+  /* as the Ghostscript interpreter for the PostScript language.           */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_INCREMENTAL
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* The size in bytes of the render pool used by the scan-line converter  */
+  /* to do all of its work.                                                */
+  /*                                                                       */
+  /* This must be greater than 4KByte if you use FreeType to rasterize     */
+  /* glyphs; otherwise, you may set it to zero to avoid unnecessary        */
+  /* allocation of the render pool.                                        */
+  /*                                                                       */
+#define FT_RENDER_POOL_SIZE  16384L
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* FT_MAX_MODULES                                                        */
+  /*                                                                       */
+  /*   The maximum number of modules that can be registered in a single    */
+  /*   FreeType library object.  32 is the default.                        */
+  /*                                                                       */
+#define FT_MAX_MODULES  32
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Debug level                                                           */
+  /*                                                                       */
+  /*   FreeType can be compiled in debug or trace mode.  In debug mode,    */
+  /*   errors are reported through the `ftdebug' component.  In trace      */
+  /*   mode, additional messages are sent to the standard output during    */
+  /*   execution.                                                          */
+  /*                                                                       */
+  /*   Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode.     */
+  /*   Define FT_DEBUG_LEVEL_TRACE to build it in trace mode.              */
+  /*                                                                       */
+  /*   Don't define any of these macros to compile in `release' mode!      */
+  /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+/* #define FT_DEBUG_LEVEL_ERROR */
+/* #define FT_DEBUG_LEVEL_TRACE */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Autofitter debugging                                                  */
+  /*                                                                       */
+  /*   If FT_DEBUG_AUTOFIT is defined, FreeType provides some means to     */
+  /*   control the autofitter behaviour for debugging purposes with global */
+  /*   boolean variables (consequently, you should *never* enable this     */
+  /*   while compiling in `release' mode):                                 */
+  /*                                                                       */
+  /*     _af_debug_disable_horz_hints                                      */
+  /*     _af_debug_disable_vert_hints                                      */
+  /*     _af_debug_disable_blue_hints                                      */
+  /*                                                                       */
+  /*   Additionally, the following functions provide dumps of various      */
+  /*   internal autofit structures to stdout (using `printf'):             */
+  /*                                                                       */
+  /*     af_glyph_hints_dump_points                                        */
+  /*     af_glyph_hints_dump_segments                                      */
+  /*     af_glyph_hints_dump_edges                                         */
+  /*                                                                       */
+  /*   As an argument, they use another global variable:                   */
+  /*                                                                       */
+  /*     _af_debug_hints                                                   */
+  /*                                                                       */
+  /*   Please have a look at the `ftgrid' demo program to see how those    */
+  /*   variables and macros should be used.                                */
+  /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+/* #define FT_DEBUG_AUTOFIT */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Memory Debugging                                                      */
+  /*                                                                       */
+  /*   FreeType now comes with an integrated memory debugger that is       */
+  /*   capable of detecting simple errors like memory leaks or double      */
+  /*   deletes.  To compile it within your build of the library, you       */
+  /*   should define FT_DEBUG_MEMORY here.                                 */
+  /*                                                                       */
+  /*   Note that the memory debugger is only activated at runtime when     */
+  /*   when the _environment_ variable `FT2_DEBUG_MEMORY' is defined also! */
+  /*                                                                       */
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
+  /*                                                                       */
+/* #define FT_DEBUG_MEMORY */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Module errors                                                         */
+  /*                                                                       */
+  /*   If this macro is set (which is _not_ the default), the higher byte  */
+  /*   of an error code gives the module in which the error has occurred,  */
+  /*   while the lower byte is the real error code.                        */
+  /*                                                                       */
+  /*   Setting this macro makes sense for debugging purposes only, since   */
+  /*   it would break source compatibility of certain programs that use    */
+  /*   FreeType 2.                                                         */
+  /*                                                                       */
+  /*   More details can be found in the files ftmoderr.h and fterrors.h.   */
+  /*                                                                       */
+#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Position Independent Code                                             */
+  /*                                                                       */
+  /*   If this macro is set (which is _not_ the default), FreeType2 will   */
+  /*   avoid creating constants that require address fixups.  Instead the  */
+  /*   constants will be moved into a struct and additional intialization  */
+  /*   code will be used.                                                  */
+  /*                                                                       */
+  /*   Setting this macro is needed for systems that prohibit address      */
+  /*   fixups, such as BREW.                                               */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_PIC */
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****        S F N T   D R I V E R    C O N F I G U R A T I O N       ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support       */
+  /* embedded bitmaps in all formats using the SFNT module (namely         */
+  /* TrueType & OpenType).                                                 */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to    */
+  /* load and enumerate the glyph Postscript names in a TrueType or        */
+  /* OpenType file.                                                        */
+  /*                                                                       */
+  /* Note that when you do not compile the `PSNames' module by undefining  */
+  /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will   */
+  /* contain additional code used to read the PS Names table from a font.  */
+  /*                                                                       */
+  /* (By default, the module uses `PSNames' to extract glyph names.)       */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to       */
+  /* access the internal name table in a SFNT-based format like TrueType   */
+  /* or OpenType.  The name table contains various strings used to         */
+  /* describe the font, like family name, copyright, version, etc.  It     */
+  /* does not contain any glyph name though.                               */
+  /*                                                                       */
+  /* Accessing SFNT names is done through the functions declared in        */
+  /* `ftsnames.h'.                                                         */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_SFNT_NAMES
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* TrueType CMap support                                                 */
+  /*                                                                       */
+  /*   Here you can fine-tune which TrueType CMap table format shall be    */
+  /*   supported.                                                          */
+#define TT_CONFIG_CMAP_FORMAT_0
+#define TT_CONFIG_CMAP_FORMAT_2
+#define TT_CONFIG_CMAP_FORMAT_4
+#define TT_CONFIG_CMAP_FORMAT_6
+#define TT_CONFIG_CMAP_FORMAT_8
+#define TT_CONFIG_CMAP_FORMAT_10
+#define TT_CONFIG_CMAP_FORMAT_12
+#define TT_CONFIG_CMAP_FORMAT_13
+#define TT_CONFIG_CMAP_FORMAT_14
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****    T R U E T Y P E   D R I V E R    C O N F I G U R A T I O N   ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile   */
+  /* a bytecode interpreter in the TrueType driver.                        */
+  /*                                                                       */
+  /* By undefining this, you will only compile the code necessary to load  */
+  /* TrueType glyphs without hinting.                                      */
+  /*                                                                       */
+  /*   Do not #undef this macro here, since the build system might         */
+  /*   define it for certain configurations only.                          */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile       */
+  /* EXPERIMENTAL subpixel hinting support into the TrueType driver.  This */
+  /* replaces the native TrueType hinting mechanism when anything but      */
+  /* FT_RENDER_MODE_MONO is requested.                                     */
+  /*                                                                       */
+  /* Enabling this causes the TrueType driver to ignore instructions under */
+  /* certain conditions.  This is done in accordance with the guide here,  */
+  /* with some minor differences:                                          */
+  /*                                                                       */
+  /*  http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+  /*                                                                       */
+  /* By undefining this, you only compile the code necessary to hint       */
+  /* TrueType glyphs with native TT hinting.                               */
+  /*                                                                       */
+  /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
+  /*   defined.                                                            */
+  /*                                                                       */
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
+  /* of the TrueType bytecode interpreter is used that doesn't implement   */
+  /* any of the patented opcodes and algorithms.  The patents related to   */
+  /* TrueType hinting have expired worldwide since May 2010; this option   */
+  /* is now deprecated.                                                    */
+  /*                                                                       */
+  /* Note that the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored*  */
+  /* if you define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words,  */
+  /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or                */
+  /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time.    */
+  /*                                                                       */
+  /* This macro is only useful for a small number of font files (mostly    */
+  /* for Asian scripts) that require bytecode interpretation to properly   */
+  /* load glyphs.  For all other fonts, this produces unpleasant results,  */
+  /* thus the unpatented interpreter is never used to load glyphs from     */
+  /* TrueType fonts unless one of the following two options is used.       */
+  /*                                                                       */
+  /*   - The unpatented interpreter is explicitly activated by the user    */
+  /*     through the FT_PARAM_TAG_UNPATENTED_HINTING parameter tag         */
+  /*     when opening the FT_Face.                                         */
+  /*                                                                       */
+  /*   - FreeType detects that the FT_Face corresponds to one of the       */
+  /*     `trick' fonts (e.g., `Mingliu') it knows about.  The font engine  */
+  /*     contains a hard-coded list of font names and other matching       */
+  /*     parameters (see function `tt_face_init' in file                   */
+  /*     `src/truetype/ttobjs.c').                                         */
+  /*                                                                       */
+  /* Here a sample code snippet for using FT_PARAM_TAG_UNPATENTED_HINTING. */
+  /*                                                                       */
+  /*   {                                                                   */
+  /*     FT_Parameter  parameter;                                          */
+  /*     FT_Open_Args  open_args;                                          */
+  /*                                                                       */
+  /*                                                                       */
+  /*     parameter.tag = FT_PARAM_TAG_UNPATENTED_HINTING;                  */
+  /*                                                                       */
+  /*     open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;         */
+  /*     open_args.pathname   = my_font_pathname;                          */
+  /*     open_args.num_params = 1;                                         */
+  /*     open_args.params     = &parameter;                                */
+  /*                                                                       */
+  /*     error = FT_Open_Face( library, &open_args, index, &face );        */
+  /*     ...                                                               */
+  /*   }                                                                   */
+  /*                                                                       */
+/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType    */
+  /* bytecode interpreter with a huge switch statement, rather than a call */
+  /* table.  This results in smaller and faster code for a number of       */
+  /* architectures.                                                        */
+  /*                                                                       */
+  /* Note however that on some compiler/processor combinations, undefining */
+  /* this macro will generate faster, though larger, code.                 */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the        */
+  /* TrueType glyph loader to use Apple's definition of how to handle      */
+  /* component offsets in composite glyphs.                                */
+  /*                                                                       */
+  /* Apple and MS disagree on the default behavior of component offsets    */
+  /* in composites.  Apple says that they should be scaled by the scaling  */
+  /* factors in the transformation matrix (roughly, it's more complex)     */
+  /* while MS says they should not.  OpenType defines two bits in the      */
+  /* composite flags array which can be used to disambiguate, but old      */
+  /* fonts will not have them.                                             */
+  /*                                                                       */
+  /*   http://www.microsoft.com/typography/otspec/glyf.htm                 */
+  /*   http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html                 */
+  /*                                                                       */
+#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_GX_VAR_SUPPORT if you want to include         */
+  /* support for Apple's distortable font technology (fvar, gvar, cvar,    */
+  /* and avar tables).  This has many similarities to Type 1 Multiple      */
+  /* Masters support.                                                      */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_BDF if you want to include support for        */
+  /* an embedded `BDF ' table within SFNT-based bitmap formats.            */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_BDF
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_DICT_DEPTH is the maximum depth of nest dictionaries and       */
+  /* arrays in the Type 1 stream (see t1load.c).  A minimum of 4 is        */
+  /* required.                                                             */
+  /*                                                                       */
+#define T1_MAX_DICT_DEPTH  5
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
+  /* calls during glyph loading.                                           */
+  /*                                                                       */
+#define T1_MAX_SUBRS_CALLS  16
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
+  /* minimum of 16 is required.                                            */
+  /*                                                                       */
+  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+  /*                                                                       */
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define this configuration macro if you want to prevent the            */
+  /* compilation of `t1afm', which is in charge of reading Type 1 AFM      */
+  /* files into an existing face.  Note that if set, the T1 driver will be */
+  /* unable to produce kerning distances.                                  */
+  /*                                                                       */
+#undef T1_CONFIG_OPTION_NO_AFM
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define this configuration macro if you want to prevent the            */
+  /* compilation of the Multiple Masters font support in the Type 1        */
+  /* driver.                                                               */
+  /*                                                                       */
+#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****         C F F   D R I V E R    C O N F I G U R A T I O N        ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF       */
+  /* engine gets compiled into FreeType.  If defined, it is possible to    */
+  /* switch between the two engines using the `hinting-engine' property of */
+  /* the cff driver module.                                                */
+  /*                                                                       */
+/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with CJK (Chinese, Japanese, Korean) script    */
+  /* support.                                                              */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_CJK
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with Indic script support.                     */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_INDIC
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with warp hinting.  The idea of the warping    */
+  /* code is to slightly scale and shift a glyph within a single dimension */
+  /* so that as much of its segments are aligned (more or less) on the     */
+  /* grid.  To find out the optimal scaling and shifting value, various    */
+  /* parameter combinations are tried and scored.                          */
+  /*                                                                       */
+  /* This experimental option is only active if the render mode is         */
+  /* FT_RENDER_MODE_LIGHT.                                                 */
+  /*                                                                       */
+/* #define AF_CONFIG_OPTION_USE_WARPER */
+
+  /* */
+
+
+  /*
+   *  This macro is obsolete.  Support has been removed in FreeType
+   *  version 2.5.
+   */
+/* #define FT_CONFIG_OPTION_OLD_INTERNALS */
+
+
+  /*
+   * This macro is defined if either unpatented or native TrueType
+   * hinting is requested by the definitions above.
+   */
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define  TT_USE_BYTECODE_INTERPRETER
+#undef   TT_CONFIG_OPTION_UNPATENTED_HINTING
+#elif defined TT_CONFIG_OPTION_UNPATENTED_HINTING
+#define  TT_USE_BYTECODE_INTERPRETER
+#endif
+
+FT_END_HEADER
+
+
+#endif /* __FTOPTION_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/config/ftoption.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/config/ftstdlib.h
===================================================================
--- lib/3rdparty/freetype/include/config/ftstdlib.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/config/ftstdlib.h	(rÃ©vision 62573)
@@ -0,0 +1,174 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftstdlib.h                                                             */
+/*                                                                         */
+/*    ANSI-specific library and header configuration file (specification   */
+/*    only).                                                               */
+/*                                                                         */
+/*  Copyright 2002-2007, 2009, 2011-2012 by                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This file is used to group all #includes to the ANSI C library that   */
+  /* FreeType normally requires.  It also defines macros to rename the     */
+  /* standard functions within the FreeType source code.                   */
+  /*                                                                       */
+  /* Load a file which defines __FTSTDLIB_H__ before this one to override  */
+  /* it.                                                                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTSTDLIB_H__
+#define __FTSTDLIB_H__
+
+
+#include <stddef.h>
+
+#define ft_ptrdiff_t  ptrdiff_t
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                           integer limits                           */
+  /*                                                                    */
+  /* UINT_MAX and ULONG_MAX are used to automatically compute the size  */
+  /* of `int' and `long' in bytes at compile-time.  So far, this works  */
+  /* for all platforms the library has been tested on.                  */
+  /*                                                                    */
+  /* Note that on the extremely rare platforms that do not provide      */
+  /* integer types that are _exactly_ 16 and 32 bits wide (e.g. some    */
+  /* old Crays where `int' is 36 bits), we do not make any guarantee    */
+  /* about the correct behaviour of FT2 with all fonts.                 */
+  /*                                                                    */
+  /* In these case, `ftconfig.h' will refuse to compile anyway with a   */
+  /* message like `couldn't find 32-bit type' or something similar.     */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#include <limits.h>
+
+#define FT_CHAR_BIT    CHAR_BIT
+#define FT_USHORT_MAX  USHRT_MAX
+#define FT_INT_MAX     INT_MAX
+#define FT_INT_MIN     INT_MIN
+#define FT_UINT_MAX    UINT_MAX
+#define FT_ULONG_MAX   ULONG_MAX
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                 character and string processing                    */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#include <string.h>
+
+#define ft_memchr   memchr
+#define ft_memcmp   memcmp
+#define ft_memcpy   memcpy
+#define ft_memmove  memmove
+#define ft_memset   memset
+#define ft_strcat   strcat
+#define ft_strcmp   strcmp
+#define ft_strcpy   strcpy
+#define ft_strlen   strlen
+#define ft_strncmp  strncmp
+#define ft_strncpy  strncpy
+#define ft_strrchr  strrchr
+#define ft_strstr   strstr
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                           file handling                            */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#include <stdio.h>
+
+#define FT_FILE     FILE
+#define ft_fclose   fclose
+#define ft_fopen    fopen
+#define ft_fread    fread
+#define ft_fseek    fseek
+#define ft_ftell    ftell
+#define ft_sprintf  sprintf
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                             sorting                                */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#include <stdlib.h>
+
+#define ft_qsort  qsort
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                        memory allocation                           */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#define ft_scalloc   calloc
+#define ft_sfree     free
+#define ft_smalloc   malloc
+#define ft_srealloc  realloc
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                          miscellaneous                             */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#define ft_atol   atol
+#define ft_labs   labs
+
+
+  /**********************************************************************/
+  /*                                                                    */
+  /*                         execution control                          */
+  /*                                                                    */
+  /**********************************************************************/
+
+
+#include <setjmp.h>
+
+#define ft_jmp_buf     jmp_buf  /* note: this cannot be a typedef since */
+                                /*       jmp_buf is defined as a macro  */
+                                /*       on certain platforms           */
+
+#define ft_longjmp     longjmp
+#define ft_setjmp( b ) setjmp( *(ft_jmp_buf*) &(b) ) /* same thing here */
+
+
+  /* the following is only used for debugging purposes, i.e., if */
+  /* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined    */
+
+#include <stdarg.h>
+
+
+#endif /* __FTSTDLIB_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/config/ftstdlib.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/config
===================================================================
--- lib/3rdparty/freetype/include/config	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/config	(copie de travail)

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/config
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,7 ##
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln
Index: lib/3rdparty/freetype/include/freetype.h
===================================================================
--- lib/3rdparty/freetype/include/freetype.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/freetype.h	(rÃ©vision 62573)
@@ -0,0 +1,4036 @@
+/***************************************************************************/
+/*                                                                         */
+/*  freetype.h                                                             */
+/*                                                                         */
+/*    FreeType high-level API and common types (specification only).       */
+/*                                                                         */
+/*  Copyright 1996-2013 by                                                 */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FREETYPE_H__
+#define __FREETYPE_H__
+
+
+#ifndef FT_FREETYPE_H
+#error "`ft2build.h' hasn't been included yet!"
+#error "Please always use macros to include FreeType header files."
+#error "Example:"
+#error "  #include <ft2build.h>"
+#error "  #include FT_FREETYPE_H"
+#endif
+
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_TYPES_H
+#include FT_ERRORS_H
+
+
+FT_BEGIN_HEADER
+
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    user_allocation                                                    */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    User allocation                                                    */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    How client applications should allocate FreeType data structures.  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    FreeType assumes that structures allocated by the user and passed  */
+  /*    as arguments are zeroed out except for the actual data.  In other  */
+  /*    words, it is recommended to use `calloc' (or variants of it)       */
+  /*    instead of `malloc' for allocation.                                */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*                                                                       */
+  /*                        B A S I C   T Y P E S                          */
+  /*                                                                       */
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    base_interface                                                     */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Base Interface                                                     */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    The FreeType~2 base font interface.                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section describes the public high-level API of FreeType~2.    */
+  /*                                                                       */
+  /* <Order>                                                               */
+  /*    FT_Library                                                         */
+  /*    FT_Face                                                            */
+  /*    FT_Size                                                            */
+  /*    FT_GlyphSlot                                                       */
+  /*    FT_CharMap                                                         */
+  /*    FT_Encoding                                                        */
+  /*                                                                       */
+  /*    FT_FaceRec                                                         */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_SCALABLE                                              */
+  /*    FT_FACE_FLAG_FIXED_SIZES                                           */
+  /*    FT_FACE_FLAG_FIXED_WIDTH                                           */
+  /*    FT_FACE_FLAG_HORIZONTAL                                            */
+  /*    FT_FACE_FLAG_VERTICAL                                              */
+  /*    FT_FACE_FLAG_COLOR                                                 */
+  /*    FT_FACE_FLAG_SFNT                                                  */
+  /*    FT_FACE_FLAG_CID_KEYED                                             */
+  /*    FT_FACE_FLAG_TRICKY                                                */
+  /*    FT_FACE_FLAG_KERNING                                               */
+  /*    FT_FACE_FLAG_MULTIPLE_MASTERS                                      */
+  /*    FT_FACE_FLAG_GLYPH_NAMES                                           */
+  /*    FT_FACE_FLAG_EXTERNAL_STREAM                                       */
+  /*    FT_FACE_FLAG_FAST_GLYPHS                                           */
+  /*    FT_FACE_FLAG_HINTER                                                */
+  /*                                                                       */
+  /*    FT_STYLE_FLAG_BOLD                                                 */
+  /*    FT_STYLE_FLAG_ITALIC                                               */
+  /*                                                                       */
+  /*    FT_SizeRec                                                         */
+  /*    FT_Size_Metrics                                                    */
+  /*                                                                       */
+  /*    FT_GlyphSlotRec                                                    */
+  /*    FT_Glyph_Metrics                                                   */
+  /*    FT_SubGlyph                                                        */
+  /*                                                                       */
+  /*    FT_Bitmap_Size                                                     */
+  /*                                                                       */
+  /*    FT_Init_FreeType                                                   */
+  /*    FT_Done_FreeType                                                   */
+  /*                                                                       */
+  /*    FT_New_Face                                                        */
+  /*    FT_Done_Face                                                       */
+  /*    FT_New_Memory_Face                                                 */
+  /*    FT_Open_Face                                                       */
+  /*    FT_Open_Args                                                       */
+  /*    FT_Parameter                                                       */
+  /*    FT_Attach_File                                                     */
+  /*    FT_Attach_Stream                                                   */
+  /*                                                                       */
+  /*    FT_Set_Char_Size                                                   */
+  /*    FT_Set_Pixel_Sizes                                                 */
+  /*    FT_Request_Size                                                    */
+  /*    FT_Select_Size                                                     */
+  /*    FT_Size_Request_Type                                               */
+  /*    FT_Size_Request                                                    */
+  /*    FT_Set_Transform                                                   */
+  /*    FT_Load_Glyph                                                      */
+  /*    FT_Get_Char_Index                                                  */
+  /*    FT_Get_Name_Index                                                  */
+  /*    FT_Load_Char                                                       */
+  /*                                                                       */
+  /*    FT_OPEN_MEMORY                                                     */
+  /*    FT_OPEN_STREAM                                                     */
+  /*    FT_OPEN_PATHNAME                                                   */
+  /*    FT_OPEN_DRIVER                                                     */
+  /*    FT_OPEN_PARAMS                                                     */
+  /*                                                                       */
+  /*    FT_LOAD_DEFAULT                                                    */
+  /*    FT_LOAD_RENDER                                                     */
+  /*    FT_LOAD_MONOCHROME                                                 */
+  /*    FT_LOAD_LINEAR_DESIGN                                              */
+  /*    FT_LOAD_NO_SCALE                                                   */
+  /*    FT_LOAD_NO_HINTING                                                 */
+  /*    FT_LOAD_NO_BITMAP                                                  */
+  /*    FT_LOAD_CROP_BITMAP                                                */
+  /*                                                                       */
+  /*    FT_LOAD_VERTICAL_LAYOUT                                            */
+  /*    FT_LOAD_IGNORE_TRANSFORM                                           */
+  /*    FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH                                */
+  /*    FT_LOAD_FORCE_AUTOHINT                                             */
+  /*    FT_LOAD_NO_RECURSE                                                 */
+  /*    FT_LOAD_PEDANTIC                                                   */
+  /*                                                                       */
+  /*    FT_LOAD_TARGET_NORMAL                                              */
+  /*    FT_LOAD_TARGET_LIGHT                                               */
+  /*    FT_LOAD_TARGET_MONO                                                */
+  /*    FT_LOAD_TARGET_LCD                                                 */
+  /*    FT_LOAD_TARGET_LCD_V                                               */
+  /*                                                                       */
+  /*    FT_Render_Glyph                                                    */
+  /*    FT_Render_Mode                                                     */
+  /*    FT_Get_Kerning                                                     */
+  /*    FT_Kerning_Mode                                                    */
+  /*    FT_Get_Track_Kerning                                               */
+  /*    FT_Get_Glyph_Name                                                  */
+  /*    FT_Get_Postscript_Name                                             */
+  /*                                                                       */
+  /*    FT_CharMapRec                                                      */
+  /*    FT_Select_Charmap                                                  */
+  /*    FT_Set_Charmap                                                     */
+  /*    FT_Get_Charmap_Index                                               */
+  /*                                                                       */
+  /*    FT_FSTYPE_INSTALLABLE_EMBEDDING                                    */
+  /*    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING                             */
+  /*    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING                              */
+  /*    FT_FSTYPE_EDITABLE_EMBEDDING                                       */
+  /*    FT_FSTYPE_NO_SUBSETTING                                            */
+  /*    FT_FSTYPE_BITMAP_EMBEDDING_ONLY                                    */
+  /*                                                                       */
+  /*    FT_Get_FSType_Flags                                                */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Glyph_Metrics                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model the metrics of a single glyph.  The      */
+  /*    values are expressed in 26.6 fractional pixel format; if the flag  */
+  /*    @FT_LOAD_NO_SCALE has been used while loading the glyph, values    */
+  /*    are expressed in font units instead.                               */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    width ::                                                           */
+  /*      The glyph's width.                                               */
+  /*                                                                       */
+  /*    height ::                                                          */
+  /*      The glyph's height.                                              */
+  /*                                                                       */
+  /*    horiBearingX ::                                                    */
+  /*      Left side bearing for horizontal layout.                         */
+  /*                                                                       */
+  /*    horiBearingY ::                                                    */
+  /*      Top side bearing for horizontal layout.                          */
+  /*                                                                       */
+  /*    horiAdvance ::                                                     */
+  /*      Advance width for horizontal layout.                             */
+  /*                                                                       */
+  /*    vertBearingX ::                                                    */
+  /*      Left side bearing for vertical layout.                           */
+  /*                                                                       */
+  /*    vertBearingY ::                                                    */
+  /*      Top side bearing for vertical layout.  Larger positive values    */
+  /*      mean further below the vertical glyph origin.                    */
+  /*                                                                       */
+  /*    vertAdvance ::                                                     */
+  /*      Advance height for vertical layout.  Positive values mean the    */
+  /*      glyph has a positive advance downward.                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If not disabled with @FT_LOAD_NO_HINTING, the values represent     */
+  /*    dimensions of the hinted glyph (in case hinting is applicable).    */
+  /*                                                                       */
+  /*    Stroking a glyph with an outside border does not increase          */
+  /*    `horiAdvance' or `vertAdvance'; you have to manually adjust these  */
+  /*    values to account for the added width and height.                  */
+  /*                                                                       */
+  typedef struct  FT_Glyph_Metrics_
+  {
+    FT_Pos  width;
+    FT_Pos  height;
+
+    FT_Pos  horiBearingX;
+    FT_Pos  horiBearingY;
+    FT_Pos  horiAdvance;
+
+    FT_Pos  vertBearingX;
+    FT_Pos  vertBearingY;
+    FT_Pos  vertAdvance;
+
+  } FT_Glyph_Metrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Bitmap_Size                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure models the metrics of a bitmap strike (i.e., a set  */
+  /*    of glyphs for a given point size and resolution) in a bitmap font. */
+  /*    It is used for the `available_sizes' field of @FT_Face.            */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    height :: The vertical distance, in pixels, between two            */
+  /*              consecutive baselines.  It is always positive.           */
+  /*                                                                       */
+  /*    width  :: The average width, in pixels, of all glyphs in the       */
+  /*              strike.                                                  */
+  /*                                                                       */
+  /*    size   :: The nominal size of the strike in 26.6 fractional        */
+  /*              points.  This field is not very useful.                  */
+  /*                                                                       */
+  /*    x_ppem :: The horizontal ppem (nominal width) in 26.6 fractional   */
+  /*              pixels.                                                  */
+  /*                                                                       */
+  /*    y_ppem :: The vertical ppem (nominal height) in 26.6 fractional    */
+  /*              pixels.                                                  */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Windows FNT:                                                       */
+  /*      The nominal size given in a FNT font is not reliable.  Thus when */
+  /*      the driver finds it incorrect, it sets `size' to some calculated */
+  /*      values and sets `x_ppem' and `y_ppem' to the pixel width and     */
+  /*      height given in the font, respectively.                          */
+  /*                                                                       */
+  /*    TrueType embedded bitmaps:                                         */
+  /*      `size', `width', and `height' values are not contained in the    */
+  /*      bitmap strike itself.  They are computed from the global font    */
+  /*      parameters.                                                      */
+  /*                                                                       */
+  typedef struct  FT_Bitmap_Size_
+  {
+    FT_Short  height;
+    FT_Short  width;
+
+    FT_Pos    size;
+
+    FT_Pos    x_ppem;
+    FT_Pos    y_ppem;
+
+  } FT_Bitmap_Size;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*                                                                       */
+  /*                     O B J E C T   C L A S S E S                       */
+  /*                                                                       */
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Library                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a FreeType library instance.  Each `library' is        */
+  /*    completely independent from the others; it is the `root' of a set  */
+  /*    of objects like fonts, faces, sizes, etc.                          */
+  /*                                                                       */
+  /*    It also embeds a memory manager (see @FT_Memory), as well as a     */
+  /*    scan-line converter object (see @FT_Raster).                       */
+  /*                                                                       */
+  /*    In multi-threaded applications, make sure that the same FT_Library */
+  /*    object or any of its children doesn't get accessed in parallel.    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Library objects are normally created by @FT_Init_FreeType, and     */
+  /*    destroyed with @FT_Done_FreeType.  If you need reference-counting  */
+  /*    (cf. @FT_Reference_Library), use @FT_New_Library and               */
+  /*    @FT_Done_Library.                                                  */
+  /*                                                                       */
+  typedef struct FT_LibraryRec_  *FT_Library;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Module                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a given FreeType module object.  Each module can be a  */
+  /*    font driver, a renderer, or anything else that provides services   */
+  /*    to the formers.                                                    */
+  /*                                                                       */
+  typedef struct FT_ModuleRec_*  FT_Module;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Driver                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a given FreeType font driver object.  Each font driver */
+  /*    is a special module capable of creating faces from font files.     */
+  /*                                                                       */
+  typedef struct FT_DriverRec_*  FT_Driver;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Renderer                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a given FreeType renderer.  A renderer is a special    */
+  /*    module in charge of converting a glyph image to a bitmap, when     */
+  /*    necessary.  Each renderer supports a given glyph image format, and */
+  /*    one or more target surface depths.                                 */
+  /*                                                                       */
+  typedef struct FT_RendererRec_*  FT_Renderer;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Face                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a given typographic face object.  A face object models */
+  /*    a given typeface, in a given style.                                */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Each face object also owns a single @FT_GlyphSlot object, as well  */
+  /*    as one or more @FT_Size objects.                                   */
+  /*                                                                       */
+  /*    Use @FT_New_Face or @FT_Open_Face to create a new face object from */
+  /*    a given filepathname or a custom input stream.                     */
+  /*                                                                       */
+  /*    Use @FT_Done_Face to destroy it (along with its slot and sizes).   */
+  /*                                                                       */
+  /* <Also>                                                                */
+  /*    See @FT_FaceRec for the publicly accessible fields of a given face */
+  /*    object.                                                            */
+  /*                                                                       */
+  typedef struct FT_FaceRec_*  FT_Face;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Size                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to an object used to model a face scaled to a given       */
+  /*    character size.                                                    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Each @FT_Face has an _active_ @FT_Size object that is used by      */
+  /*    functions like @FT_Load_Glyph to determine the scaling             */
+  /*    transformation that in turn is used to load and hint glyphs and    */
+  /*    metrics.                                                           */
+  /*                                                                       */
+  /*    You can use @FT_Set_Char_Size, @FT_Set_Pixel_Sizes,                */
+  /*    @FT_Request_Size or even @FT_Select_Size to change the content     */
+  /*    (i.e., the scaling values) of the active @FT_Size.                 */
+  /*                                                                       */
+  /*    You can use @FT_New_Size to create additional size objects for a   */
+  /*    given @FT_Face, but they won't be used by other functions until    */
+  /*    you activate it through @FT_Activate_Size.  Only one size can be   */
+  /*    activated at any given time per face.                              */
+  /*                                                                       */
+  /* <Also>                                                                */
+  /*    See @FT_SizeRec for the publicly accessible fields of a given size */
+  /*    object.                                                            */
+  /*                                                                       */
+  typedef struct FT_SizeRec_*  FT_Size;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_GlyphSlot                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a given `glyph slot'.  A slot is a container where it  */
+  /*    is possible to load any of the glyphs contained in its parent      */
+  /*    face.                                                              */
+  /*                                                                       */
+  /*    In other words, each time you call @FT_Load_Glyph or               */
+  /*    @FT_Load_Char, the slot's content is erased by the new glyph data, */
+  /*    i.e., the glyph's metrics, its image (bitmap or outline), and      */
+  /*    other control information.                                         */
+  /*                                                                       */
+  /* <Also>                                                                */
+  /*    See @FT_GlyphSlotRec for the publicly accessible glyph fields.     */
+  /*                                                                       */
+  typedef struct FT_GlyphSlotRec_*  FT_GlyphSlot;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_CharMap                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a given character map.  A charmap is used to translate */
+  /*    character codes in a given encoding into glyph indexes for its     */
+  /*    parent's face.  Some font formats may provide several charmaps per */
+  /*    font.                                                              */
+  /*                                                                       */
+  /*    Each face object owns zero or more charmaps, but only one of them  */
+  /*    can be `active' and used by @FT_Get_Char_Index or @FT_Load_Char.   */
+  /*                                                                       */
+  /*    The list of available charmaps in a face is available through the  */
+  /*    `face->num_charmaps' and `face->charmaps' fields of @FT_FaceRec.   */
+  /*                                                                       */
+  /*    The currently active charmap is available as `face->charmap'.      */
+  /*    You should call @FT_Set_Charmap to change it.                      */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    When a new face is created (either through @FT_New_Face or         */
+  /*    @FT_Open_Face), the library looks for a Unicode charmap within     */
+  /*    the list and automatically activates it.                           */
+  /*                                                                       */
+  /* <Also>                                                                */
+  /*    See @FT_CharMapRec for the publicly accessible fields of a given   */
+  /*    character map.                                                     */
+  /*                                                                       */
+  typedef struct FT_CharMapRec_*  FT_CharMap;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_ENC_TAG                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This macro converts four-letter tags into an unsigned long.  It is */
+  /*    used to define `encoding' identifiers (see @FT_Encoding).          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Since many 16-bit compilers don't like 32-bit enumerations, you    */
+  /*    should redefine this macro in case of problems to something like   */
+  /*    this:                                                              */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      #define FT_ENC_TAG( value, a, b, c, d )  value                   */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    to get a simple enumeration without assigning special numbers.     */
+  /*                                                                       */
+
+#ifndef FT_ENC_TAG
+#define FT_ENC_TAG( value, a, b, c, d )         \
+          value = ( ( (FT_UInt32)(a) << 24 ) |  \
+                    ( (FT_UInt32)(b) << 16 ) |  \
+                    ( (FT_UInt32)(c) <<  8 ) |  \
+                      (FT_UInt32)(d)         )
+
+#endif /* FT_ENC_TAG */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Encoding                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration used to specify character sets supported by         */
+  /*    charmaps.  Used in the @FT_Select_Charmap API function.            */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Despite the name, this enumeration lists specific character        */
+  /*    repertories (i.e., charsets), and not text encoding methods (e.g., */
+  /*    UTF-8, UTF-16, etc.).                                              */
+  /*                                                                       */
+  /*    Other encodings might be defined in the future.                    */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_ENCODING_NONE ::                                                */
+  /*      The encoding value~0 is reserved.                                */
+  /*                                                                       */
+  /*    FT_ENCODING_UNICODE ::                                             */
+  /*      Corresponds to the Unicode character set.  This value covers     */
+  /*      all versions of the Unicode repertoire, including ASCII and      */
+  /*      Latin-1.  Most fonts include a Unicode charmap, but not all      */
+  /*      of them.                                                         */
+  /*                                                                       */
+  /*      For example, if you want to access Unicode value U+1F028 (and    */
+  /*      the font contains it), use value 0x1F028 as the input value for  */
+  /*      @FT_Get_Char_Index.                                              */
+  /*                                                                       */
+  /*    FT_ENCODING_MS_SYMBOL ::                                           */
+  /*      Corresponds to the Microsoft Symbol encoding, used to encode     */
+  /*      mathematical symbols in the 32..255 character code range.  For   */
+  /*      more information, see                                            */
+  /*      `http://www.kostis.net/charsets/symbol.htm'.                     */
+  /*                                                                       */
+  /*    FT_ENCODING_SJIS ::                                                */
+  /*      Corresponds to Japanese SJIS encoding.  More info at             */
+  /*      at `http://en.wikipedia.org/wiki/Shift_JIS'.                     */
+  /*      See note on multi-byte encodings below.                          */
+  /*                                                                       */
+  /*    FT_ENCODING_GB2312 ::                                              */
+  /*      Corresponds to an encoding system for Simplified Chinese as used */
+  /*      used in mainland China.                                          */
+  /*                                                                       */
+  /*    FT_ENCODING_BIG5 ::                                                */
+  /*      Corresponds to an encoding system for Traditional Chinese as     */
+  /*      used in Taiwan and Hong Kong.                                    */
+  /*                                                                       */
+  /*    FT_ENCODING_WANSUNG ::                                             */
+  /*      Corresponds to the Korean encoding system known as Wansung.      */
+  /*      For more information see                                         */
+  /*      `http://msdn.microsoft.com/en-US/goglobal/cc305154'.             */
+  /*                                                                       */
+  /*    FT_ENCODING_JOHAB ::                                               */
+  /*      The Korean standard character set (KS~C 5601-1992), which        */
+  /*      corresponds to MS Windows code page 1361.  This character set    */
+  /*      includes all possible Hangeul character combinations.            */
+  /*                                                                       */
+  /*    FT_ENCODING_ADOBE_LATIN_1 ::                                       */
+  /*      Corresponds to a Latin-1 encoding as defined in a Type~1         */
+  /*      PostScript font.  It is limited to 256 character codes.          */
+  /*                                                                       */
+  /*    FT_ENCODING_ADOBE_STANDARD ::                                      */
+  /*      Corresponds to the Adobe Standard encoding, as found in Type~1,  */
+  /*      CFF, and OpenType/CFF fonts.  It is limited to 256 character     */
+  /*      codes.                                                           */
+  /*                                                                       */
+  /*    FT_ENCODING_ADOBE_EXPERT ::                                        */
+  /*      Corresponds to the Adobe Expert encoding, as found in Type~1,    */
+  /*      CFF, and OpenType/CFF fonts.  It is limited to 256 character     */
+  /*      codes.                                                           */
+  /*                                                                       */
+  /*    FT_ENCODING_ADOBE_CUSTOM ::                                        */
+  /*      Corresponds to a custom encoding, as found in Type~1, CFF, and   */
+  /*      OpenType/CFF fonts.  It is limited to 256 character codes.       */
+  /*                                                                       */
+  /*    FT_ENCODING_APPLE_ROMAN ::                                         */
+  /*      Corresponds to the 8-bit Apple roman encoding.  Many TrueType    */
+  /*      and OpenType fonts contain a charmap for this encoding, since    */
+  /*      older versions of Mac OS are able to use it.                     */
+  /*                                                                       */
+  /*    FT_ENCODING_OLD_LATIN_2 ::                                         */
+  /*      This value is deprecated and was never used nor reported by      */
+  /*      FreeType.  Don't use or test for it.                             */
+  /*                                                                       */
+  /*    FT_ENCODING_MS_SJIS ::                                             */
+  /*      Same as FT_ENCODING_SJIS.  Deprecated.                           */
+  /*                                                                       */
+  /*    FT_ENCODING_MS_GB2312 ::                                           */
+  /*      Same as FT_ENCODING_GB2312.  Deprecated.                         */
+  /*                                                                       */
+  /*    FT_ENCODING_MS_BIG5 ::                                             */
+  /*      Same as FT_ENCODING_BIG5.  Deprecated.                           */
+  /*                                                                       */
+  /*    FT_ENCODING_MS_WANSUNG ::                                          */
+  /*      Same as FT_ENCODING_WANSUNG.  Deprecated.                        */
+  /*                                                                       */
+  /*    FT_ENCODING_MS_JOHAB ::                                            */
+  /*      Same as FT_ENCODING_JOHAB.  Deprecated.                          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    By default, FreeType automatically synthesizes a Unicode charmap   */
+  /*    for PostScript fonts, using their glyph names dictionaries.        */
+  /*    However, it also reports the encodings defined explicitly in the   */
+  /*    font file, for the cases when they are needed, with the Adobe      */
+  /*    values as well.                                                    */
+  /*                                                                       */
+  /*    FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap  */
+  /*    is neither Unicode nor ISO-8859-1 (otherwise it is set to          */
+  /*    FT_ENCODING_UNICODE).  Use @FT_Get_BDF_Charset_ID to find out      */
+  /*    which encoding is really present.  If, for example, the            */
+  /*    `cs_registry' field is `KOI8' and the `cs_encoding' field is `R',  */
+  /*    the font is encoded in KOI8-R.                                     */
+  /*                                                                       */
+  /*    FT_ENCODING_NONE is always set (with a single exception) by the    */
+  /*    winfonts driver.  Use @FT_Get_WinFNT_Header and examine the        */
+  /*    `charset' field of the @FT_WinFNT_HeaderRec structure to find out  */
+  /*    which encoding is really present.  For example,                    */
+  /*    @FT_WinFNT_ID_CP1251 (204) means Windows code page 1251 (for       */
+  /*    Russian).                                                          */
+  /*                                                                       */
+  /*    FT_ENCODING_NONE is set if `platform_id' is @TT_PLATFORM_MACINTOSH */
+  /*    and `encoding_id' is not @TT_MAC_ID_ROMAN (otherwise it is set to  */
+  /*    FT_ENCODING_APPLE_ROMAN).                                          */
+  /*                                                                       */
+  /*    If `platform_id' is @TT_PLATFORM_MACINTOSH, use the function       */
+  /*    @FT_Get_CMap_Language_ID to query the Mac language ID that may     */
+  /*    be needed to be able to distinguish Apple encoding variants.  See  */
+  /*                                                                       */
+  /*      http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/Readme.txt  */
+  /*                                                                       */
+  /*    to get an idea how to do that.  Basically, if the language ID      */
+  /*    is~0, don't use it, otherwise subtract 1 from the language ID.     */
+  /*    Then examine `encoding_id'.  If, for example, `encoding_id' is     */
+  /*    @TT_MAC_ID_ROMAN and the language ID (minus~1) is                  */
+  /*    `TT_MAC_LANGID_GREEK', it is the Greek encoding, not Roman.        */
+  /*    @TT_MAC_ID_ARABIC with `TT_MAC_LANGID_FARSI' means the Farsi       */
+  /*    variant the Arabic encoding.                                       */
+  /*                                                                       */
+  typedef enum  FT_Encoding_
+  {
+    FT_ENC_TAG( FT_ENCODING_NONE, 0, 0, 0, 0 ),
+
+    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL, 's', 'y', 'm', 'b' ),
+    FT_ENC_TAG( FT_ENCODING_UNICODE,   'u', 'n', 'i', 'c' ),
+
+    FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
+    FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
+    FT_ENC_TAG( FT_ENCODING_BIG5,    'b', 'i', 'g', '5' ),
+    FT_ENC_TAG( FT_ENCODING_WANSUNG, 'w', 'a', 'n', 's' ),
+    FT_ENC_TAG( FT_ENCODING_JOHAB,   'j', 'o', 'h', 'a' ),
+
+    /* for backwards compatibility */
+    FT_ENCODING_MS_SJIS    = FT_ENCODING_SJIS,
+    FT_ENCODING_MS_GB2312  = FT_ENCODING_GB2312,
+    FT_ENCODING_MS_BIG5    = FT_ENCODING_BIG5,
+    FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG,
+    FT_ENCODING_MS_JOHAB   = FT_ENCODING_JOHAB,
+
+    FT_ENC_TAG( FT_ENCODING_ADOBE_STANDARD, 'A', 'D', 'O', 'B' ),
+    FT_ENC_TAG( FT_ENCODING_ADOBE_EXPERT,   'A', 'D', 'B', 'E' ),
+    FT_ENC_TAG( FT_ENCODING_ADOBE_CUSTOM,   'A', 'D', 'B', 'C' ),
+    FT_ENC_TAG( FT_ENCODING_ADOBE_LATIN_1,  'l', 'a', 't', '1' ),
+
+    FT_ENC_TAG( FT_ENCODING_OLD_LATIN_2, 'l', 'a', 't', '2' ),
+
+    FT_ENC_TAG( FT_ENCODING_APPLE_ROMAN, 'a', 'r', 'm', 'n' )
+
+  } FT_Encoding;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    ft_encoding_xxx                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    These constants are deprecated; use the corresponding @FT_Encoding */
+  /*    values instead.                                                    */
+  /*                                                                       */
+#define ft_encoding_none            FT_ENCODING_NONE
+#define ft_encoding_unicode         FT_ENCODING_UNICODE
+#define ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
+#define ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
+#define ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
+#define ft_encoding_sjis            FT_ENCODING_SJIS
+#define ft_encoding_gb2312          FT_ENCODING_GB2312
+#define ft_encoding_big5            FT_ENCODING_BIG5
+#define ft_encoding_wansung         FT_ENCODING_WANSUNG
+#define ft_encoding_johab           FT_ENCODING_JOHAB
+
+#define ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
+#define ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
+#define ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
+#define ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_CharMapRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The base charmap structure.                                        */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    face        :: A handle to the parent face object.                 */
+  /*                                                                       */
+  /*    encoding    :: An @FT_Encoding tag identifying the charmap.  Use   */
+  /*                   this with @FT_Select_Charmap.                       */
+  /*                                                                       */
+  /*    platform_id :: An ID number describing the platform for the        */
+  /*                   following encoding ID.  This comes directly from    */
+  /*                   the TrueType specification and should be emulated   */
+  /*                   for other formats.                                  */
+  /*                                                                       */
+  /*    encoding_id :: A platform specific encoding number.  This also     */
+  /*                   comes from the TrueType specification and should be */
+  /*                   emulated similarly.                                 */
+  /*                                                                       */
+  typedef struct  FT_CharMapRec_
+  {
+    FT_Face      face;
+    FT_Encoding  encoding;
+    FT_UShort    platform_id;
+    FT_UShort    encoding_id;
+
+  } FT_CharMapRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*                                                                       */
+  /*                 B A S E   O B J E C T   C L A S S E S                 */
+  /*                                                                       */
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Face_Internal                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An opaque handle to an `FT_Face_InternalRec' structure, used to    */
+  /*    model private data of a given @FT_Face object.                     */
+  /*                                                                       */
+  /*    This structure might change between releases of FreeType~2 and is  */
+  /*    not generally available to client applications.                    */
+  /*                                                                       */
+  typedef struct FT_Face_InternalRec_*  FT_Face_Internal;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_FaceRec                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    FreeType root face class structure.  A face object models a        */
+  /*    typeface in a font file.                                           */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    num_faces           :: The number of faces in the font file.  Some */
+  /*                           font formats can have multiple faces in     */
+  /*                           a font file.                                */
+  /*                                                                       */
+  /*    face_index          :: The index of the face in the font file.  It */
+  /*                           is set to~0 if there is only one face in    */
+  /*                           the font file.                              */
+  /*                                                                       */
+  /*    face_flags          :: A set of bit flags that give important      */
+  /*                           information about the face; see             */
+  /*                           @FT_FACE_FLAG_XXX for the details.          */
+  /*                                                                       */
+  /*    style_flags         :: A set of bit flags indicating the style of  */
+  /*                           the face; see @FT_STYLE_FLAG_XXX for the    */
+  /*                           details.                                    */
+  /*                                                                       */
+  /*    num_glyphs          :: The number of glyphs in the face.  If the   */
+  /*                           face is scalable and has sbits (see         */
+  /*                           `num_fixed_sizes'), it is set to the number */
+  /*                           of outline glyphs.                          */
+  /*                                                                       */
+  /*                           For CID-keyed fonts, this value gives the   */
+  /*                           highest CID used in the font.               */
+  /*                                                                       */
+  /*    family_name         :: The face's family name.  This is an ASCII   */
+  /*                           string, usually in English, that describes  */
+  /*                           the typeface's family (like `Times New      */
+  /*                           Roman', `Bodoni', `Garamond', etc).  This   */
+  /*                           is a least common denominator used to list  */
+  /*                           fonts.  Some formats (TrueType & OpenType)  */
+  /*                           provide localized and Unicode versions of   */
+  /*                           this string.  Applications should use the   */
+  /*                           format specific interface to access them.   */
+  /*                           Can be NULL (e.g., in fonts embedded in a   */
+  /*                           PDF file).                                  */
+  /*                                                                       */
+  /*    style_name          :: The face's style name.  This is an ASCII    */
+  /*                           string, usually in English, that describes  */
+  /*                           the typeface's style (like `Italic',        */
+  /*                           `Bold', `Condensed', etc).  Not all font    */
+  /*                           formats provide a style name, so this field */
+  /*                           is optional, and can be set to NULL.  As    */
+  /*                           for `family_name', some formats provide     */
+  /*                           localized and Unicode versions of this      */
+  /*                           string.  Applications should use the format */
+  /*                           specific interface to access them.          */
+  /*                                                                       */
+  /*    num_fixed_sizes     :: The number of bitmap strikes in the face.   */
+  /*                           Even if the face is scalable, there might   */
+  /*                           still be bitmap strikes, which are called   */
+  /*                           `sbits' in that case.                       */
+  /*                                                                       */
+  /*    available_sizes     :: An array of @FT_Bitmap_Size for all bitmap  */
+  /*                           strikes in the face.  It is set to NULL if  */
+  /*                           there is no bitmap strike.                  */
+  /*                                                                       */
+  /*    num_charmaps        :: The number of charmaps in the face.         */
+  /*                                                                       */
+  /*    charmaps            :: An array of the charmaps of the face.       */
+  /*                                                                       */
+  /*    generic             :: A field reserved for client uses.  See the  */
+  /*                           @FT_Generic type description.               */
+  /*                                                                       */
+  /*    bbox                :: The font bounding box.  Coordinates are     */
+  /*                           expressed in font units (see                */
+  /*                           `units_per_EM').  The box is large enough   */
+  /*                           to contain any glyph from the font.  Thus,  */
+  /*                           `bbox.yMax' can be seen as the `maximum     */
+  /*                           ascender', and `bbox.yMin' as the `minimum  */
+  /*                           descender'.  Only relevant for scalable     */
+  /*                           formats.                                    */
+  /*                                                                       */
+  /*                           Note that the bounding box might be off by  */
+  /*                           (at least) one pixel for hinted fonts.  See */
+  /*                           @FT_Size_Metrics for further discussion.    */
+  /*                                                                       */
+  /*    units_per_EM        :: The number of font units per EM square for  */
+  /*                           this face.  This is typically 2048 for      */
+  /*                           TrueType fonts, and 1000 for Type~1 fonts.  */
+  /*                           Only relevant for scalable formats.         */
+  /*                                                                       */
+  /*    ascender            :: The typographic ascender of the face,       */
+  /*                           expressed in font units.  For font formats  */
+  /*                           not having this information, it is set to   */
+  /*                           `bbox.yMax'.  Only relevant for scalable    */
+  /*                           formats.                                    */
+  /*                                                                       */
+  /*    descender           :: The typographic descender of the face,      */
+  /*                           expressed in font units.  For font formats  */
+  /*                           not having this information, it is set to   */
+  /*                           `bbox.yMin'.  Note that this field is       */
+  /*                           usually negative.  Only relevant for        */
+  /*                           scalable formats.                           */
+  /*                                                                       */
+  /*    height              :: This value is the vertical distance         */
+  /*                           between two consecutive baselines,          */
+  /*                           expressed in font units.  It is always      */
+  /*                           positive.  Only relevant for scalable       */
+  /*                           formats.                                    */
+  /*                                                                       */
+  /*                           If you want the global glyph height, use    */
+  /*                           `ascender - descender'.                     */
+  /*                                                                       */
+  /*    max_advance_width   :: The maximum advance width, in font units,   */
+  /*                           for all glyphs in this face.  This can be   */
+  /*                           used to make word wrapping computations     */
+  /*                           faster.  Only relevant for scalable         */
+  /*                           formats.                                    */
+  /*                                                                       */
+  /*    max_advance_height  :: The maximum advance height, in font units,  */
+  /*                           for all glyphs in this face.  This is only  */
+  /*                           relevant for vertical layouts, and is set   */
+  /*                           to `height' for fonts that do not provide   */
+  /*                           vertical metrics.  Only relevant for        */
+  /*                           scalable formats.                           */
+  /*                                                                       */
+  /*    underline_position  :: The position, in font units, of the         */
+  /*                           underline line for this face.  It is the    */
+  /*                           center of the underlining stem.  Only       */
+  /*                           relevant for scalable formats.              */
+  /*                                                                       */
+  /*    underline_thickness :: The thickness, in font units, of the        */
+  /*                           underline for this face.  Only relevant for */
+  /*                           scalable formats.                           */
+  /*                                                                       */
+  /*    glyph               :: The face's associated glyph slot(s).        */
+  /*                                                                       */
+  /*    size                :: The current active size for this face.      */
+  /*                                                                       */
+  /*    charmap             :: The current active charmap for this face.   */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Fields may be changed after a call to @FT_Attach_File or           */
+  /*    @FT_Attach_Stream.                                                 */
+  /*                                                                       */
+  typedef struct  FT_FaceRec_
+  {
+    FT_Long           num_faces;
+    FT_Long           face_index;
+
+    FT_Long           face_flags;
+    FT_Long           style_flags;
+
+    FT_Long           num_glyphs;
+
+    FT_String*        family_name;
+    FT_String*        style_name;
+
+    FT_Int            num_fixed_sizes;
+    FT_Bitmap_Size*   available_sizes;
+
+    FT_Int            num_charmaps;
+    FT_CharMap*       charmaps;
+
+    FT_Generic        generic;
+
+    /*# The following member variables (down to `underline_thickness') */
+    /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
+    /*# for bitmap fonts.                                              */
+    FT_BBox           bbox;
+
+    FT_UShort         units_per_EM;
+    FT_Short          ascender;
+    FT_Short          descender;
+    FT_Short          height;
+
+    FT_Short          max_advance_width;
+    FT_Short          max_advance_height;
+
+    FT_Short          underline_position;
+    FT_Short          underline_thickness;
+
+    FT_GlyphSlot      glyph;
+    FT_Size           size;
+    FT_CharMap        charmap;
+
+    /*@private begin */
+
+    FT_Driver         driver;
+    FT_Memory         memory;
+    FT_Stream         stream;
+
+    FT_ListRec        sizes_list;
+
+    FT_Generic        autohint;   /* face-specific auto-hinter data */
+    void*             extensions; /* unused                         */
+
+    FT_Face_Internal  internal;
+
+    /*@private end */
+
+  } FT_FaceRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_FACE_FLAG_XXX                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of bit flags used in the `face_flags' field of the          */
+  /*    @FT_FaceRec structure.  They inform client applications of         */
+  /*    properties of the corresponding face.                              */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_FACE_FLAG_SCALABLE ::                                           */
+  /*      Indicates that the face contains outline glyphs.  This doesn't   */
+  /*      prevent bitmap strikes, i.e., a face can have both this and      */
+  /*      and @FT_FACE_FLAG_FIXED_SIZES set.                               */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_FIXED_SIZES ::                                        */
+  /*      Indicates that the face contains bitmap strikes.  See also the   */
+  /*      `num_fixed_sizes' and `available_sizes' fields of @FT_FaceRec.   */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_FIXED_WIDTH ::                                        */
+  /*      Indicates that the face contains fixed-width characters (like    */
+  /*      Courier, Lucido, MonoType, etc.).                                */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_SFNT ::                                               */
+  /*      Indicates that the face uses the `sfnt' storage scheme.  For     */
+  /*      now, this means TrueType and OpenType.                           */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_HORIZONTAL ::                                         */
+  /*      Indicates that the face contains horizontal glyph metrics.  This */
+  /*      should be set for all common formats.                            */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_VERTICAL ::                                           */
+  /*      Indicates that the face contains vertical glyph metrics.  This   */
+  /*      is only available in some formats, not all of them.              */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_KERNING ::                                            */
+  /*      Indicates that the face contains kerning information.  If set,   */
+  /*      the kerning distance can be retrieved through the function       */
+  /*      @FT_Get_Kerning.  Otherwise the function always return the       */
+  /*      vector (0,0).  Note that FreeType doesn't handle kerning data    */
+  /*      from the `GPOS' table (as present in some OpenType fonts).       */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_FAST_GLYPHS ::                                        */
+  /*      THIS FLAG IS DEPRECATED.  DO NOT USE OR TEST IT.                 */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_MULTIPLE_MASTERS ::                                   */
+  /*      Indicates that the font contains multiple masters and is capable */
+  /*      of interpolating between them.  See the multiple-masters         */
+  /*      specific API for details.                                        */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_GLYPH_NAMES ::                                        */
+  /*      Indicates that the font contains glyph names that can be         */
+  /*      retrieved through @FT_Get_Glyph_Name.  Note that some TrueType   */
+  /*      fonts contain broken glyph name tables.  Use the function        */
+  /*      @FT_Has_PS_Glyph_Names when needed.                              */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_EXTERNAL_STREAM ::                                    */
+  /*      Used internally by FreeType to indicate that a face's stream was */
+  /*      provided by the client application and should not be destroyed   */
+  /*      when @FT_Done_Face is called.  Don't read or test this flag.     */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_HINTER ::                                             */
+  /*      Set if the font driver has a hinting machine of its own.  For    */
+  /*      example, with TrueType fonts, it makes sense to use data from    */
+  /*      the SFNT `gasp' table only if the native TrueType hinting engine */
+  /*      (with the bytecode interpreter) is available and active.         */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_CID_KEYED ::                                          */
+  /*      Set if the font is CID-keyed.  In that case, the font is not     */
+  /*      accessed by glyph indices but by CID values.  For subsetted      */
+  /*      CID-keyed fonts this has the consequence that not all index      */
+  /*      values are a valid argument to FT_Load_Glyph.  Only the CID      */
+  /*      values for which corresponding glyphs in the subsetted font      */
+  /*      exist make FT_Load_Glyph return successfully; in all other cases */
+  /*      you get an `FT_Err_Invalid_Argument' error.                      */
+  /*                                                                       */
+  /*      Note that CID-keyed fonts that are in an SFNT wrapper don't      */
+  /*      have this flag set since the glyphs are accessed in the normal   */
+  /*      way (using contiguous indices); the `CID-ness' isn't visible to  */
+  /*      the application.                                                 */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_TRICKY ::                                             */
+  /*      Set if the font is `tricky', this is, it always needs the        */
+  /*      font format's native hinting engine to get a reasonable result.  */
+  /*      A typical example is the Chinese font `mingli.ttf' that uses     */
+  /*      TrueType bytecode instructions to move and scale all of its      */
+  /*      subglyphs.                                                       */
+  /*                                                                       */
+  /*      It is not possible to autohint such fonts using                  */
+  /*      @FT_LOAD_FORCE_AUTOHINT; it will also ignore                     */
+  /*      @FT_LOAD_NO_HINTING.  You have to set both @FT_LOAD_NO_HINTING   */
+  /*      and @FT_LOAD_NO_AUTOHINT to really disable hinting; however, you */
+  /*      probably never want this except for demonstration purposes.      */
+  /*                                                                       */
+  /*      Currently, there are about a dozen TrueType fonts in the list of */
+  /*      tricky fonts; they are hard-coded in file `ttobjs.c'.            */
+  /*                                                                       */
+  /*    FT_FACE_FLAG_COLOR ::                                              */
+  /*      Set if the font has color glyph tables.  To access color glyphs  */
+  /*      use @FT_LOAD_COLOR.                                              */
+  /*                                                                       */
+#define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
+#define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
+#define FT_FACE_FLAG_FIXED_WIDTH       ( 1L <<  2 )
+#define FT_FACE_FLAG_SFNT              ( 1L <<  3 )
+#define FT_FACE_FLAG_HORIZONTAL        ( 1L <<  4 )
+#define FT_FACE_FLAG_VERTICAL          ( 1L <<  5 )
+#define FT_FACE_FLAG_KERNING           ( 1L <<  6 )
+#define FT_FACE_FLAG_FAST_GLYPHS       ( 1L <<  7 )
+#define FT_FACE_FLAG_MULTIPLE_MASTERS  ( 1L <<  8 )
+#define FT_FACE_FLAG_GLYPH_NAMES       ( 1L <<  9 )
+#define FT_FACE_FLAG_EXTERNAL_STREAM   ( 1L << 10 )
+#define FT_FACE_FLAG_HINTER            ( 1L << 11 )
+#define FT_FACE_FLAG_CID_KEYED         ( 1L << 12 )
+#define FT_FACE_FLAG_TRICKY            ( 1L << 13 )
+#define FT_FACE_FLAG_COLOR             ( 1L << 14 )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_HORIZONTAL( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains
+   *   horizontal metrics (this is true for all font formats though).
+   *
+   * @also:
+   *   @FT_HAS_VERTICAL can be used to check for vertical metrics.
+   *
+   */
+#define FT_HAS_HORIZONTAL( face ) \
+          ( face->face_flags & FT_FACE_FLAG_HORIZONTAL )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_VERTICAL( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains real
+   *   vertical metrics (and not only synthesized ones).
+   *
+   */
+#define FT_HAS_VERTICAL( face ) \
+          ( face->face_flags & FT_FACE_FLAG_VERTICAL )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_KERNING( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains kerning
+   *   data that can be accessed with @FT_Get_Kerning.
+   *
+   */
+#define FT_HAS_KERNING( face ) \
+          ( face->face_flags & FT_FACE_FLAG_KERNING )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_IS_SCALABLE( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains a scalable
+   *   font face (true for TrueType, Type~1, Type~42, CID, OpenType/CFF,
+   *   and PFR font formats.
+   *
+   */
+#define FT_IS_SCALABLE( face ) \
+          ( face->face_flags & FT_FACE_FLAG_SCALABLE )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_IS_SFNT( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains a font
+   *   whose format is based on the SFNT storage scheme.  This usually
+   *   means: TrueType fonts, OpenType fonts, as well as SFNT-based embedded
+   *   bitmap fonts.
+   *
+   *   If this macro is true, all functions defined in @FT_SFNT_NAMES_H and
+   *   @FT_TRUETYPE_TABLES_H are available.
+   *
+   */
+#define FT_IS_SFNT( face ) \
+          ( face->face_flags & FT_FACE_FLAG_SFNT )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_IS_FIXED_WIDTH( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains a font face
+   *   that contains fixed-width (or `monospace', `fixed-pitch', etc.)
+   *   glyphs.
+   *
+   */
+#define FT_IS_FIXED_WIDTH( face ) \
+          ( face->face_flags & FT_FACE_FLAG_FIXED_WIDTH )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_FIXED_SIZES( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains some
+   *   embedded bitmaps.  See the `available_sizes' field of the
+   *   @FT_FaceRec structure.
+   *
+   */
+#define FT_HAS_FIXED_SIZES( face ) \
+          ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_FAST_GLYPHS( face )
+   *
+   * @description:
+   *   Deprecated.
+   *
+   */
+#define FT_HAS_FAST_GLYPHS( face )  0
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_GLYPH_NAMES( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains some glyph
+   *   names that can be accessed through @FT_Get_Glyph_Name.
+   *
+   */
+#define FT_HAS_GLYPH_NAMES( face ) \
+          ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_MULTIPLE_MASTERS( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains some
+   *   multiple masters.  The functions provided by @FT_MULTIPLE_MASTERS_H
+   *   are then available to choose the exact design you want.
+   *
+   */
+#define FT_HAS_MULTIPLE_MASTERS( face ) \
+          ( face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_IS_CID_KEYED( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains a CID-keyed
+   *   font.  See the discussion of @FT_FACE_FLAG_CID_KEYED for more
+   *   details.
+   *
+   *   If this macro is true, all functions defined in @FT_CID_H are
+   *   available.
+   *
+   */
+#define FT_IS_CID_KEYED( face ) \
+          ( face->face_flags & FT_FACE_FLAG_CID_KEYED )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_IS_TRICKY( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face represents a `tricky' font.
+   *   See the discussion of @FT_FACE_FLAG_TRICKY for more details.
+   *
+   */
+#define FT_IS_TRICKY( face ) \
+          ( face->face_flags & FT_FACE_FLAG_TRICKY )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_COLOR( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains
+   *   tables for color glyphs.
+   *
+   */
+#define FT_HAS_COLOR( face ) \
+          ( face->face_flags & FT_FACE_FLAG_COLOR )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Const>                                                               */
+  /*    FT_STYLE_FLAG_XXX                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of bit-flags used to indicate the style of a given face.    */
+  /*    These are used in the `style_flags' field of @FT_FaceRec.          */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_STYLE_FLAG_ITALIC ::                                            */
+  /*      Indicates that a given face style is italic or oblique.          */
+  /*                                                                       */
+  /*    FT_STYLE_FLAG_BOLD ::                                              */
+  /*      Indicates that a given face is bold.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The style information as provided by FreeType is very basic.  More */
+  /*    details are beyond the scope and should be done on a higher level  */
+  /*    (for example, by analyzing various fields of the `OS/2' table in   */
+  /*    SFNT based fonts).                                                 */
+  /*                                                                       */
+#define FT_STYLE_FLAG_ITALIC  ( 1 << 0 )
+#define FT_STYLE_FLAG_BOLD    ( 1 << 1 )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Size_Internal                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An opaque handle to an `FT_Size_InternalRec' structure, used to    */
+  /*    model private data of a given @FT_Size object.                     */
+  /*                                                                       */
+  typedef struct FT_Size_InternalRec_*  FT_Size_Internal;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Size_Metrics                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The size metrics structure gives the metrics of a size object.     */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    x_ppem       :: The width of the scaled EM square in pixels, hence */
+  /*                    the term `ppem' (pixels per EM).  It is also       */
+  /*                    referred to as `nominal width'.                    */
+  /*                                                                       */
+  /*    y_ppem       :: The height of the scaled EM square in pixels,      */
+  /*                    hence the term `ppem' (pixels per EM).  It is also */
+  /*                    referred to as `nominal height'.                   */
+  /*                                                                       */
+  /*    x_scale      :: A 16.16 fractional scaling value used to convert   */
+  /*                    horizontal metrics from font units to 26.6         */
+  /*                    fractional pixels.  Only relevant for scalable     */
+  /*                    font formats.                                      */
+  /*                                                                       */
+  /*    y_scale      :: A 16.16 fractional scaling value used to convert   */
+  /*                    vertical metrics from font units to 26.6           */
+  /*                    fractional pixels.  Only relevant for scalable     */
+  /*                    font formats.                                      */
+  /*                                                                       */
+  /*    ascender     :: The ascender in 26.6 fractional pixels.  See       */
+  /*                    @FT_FaceRec for the details.                       */
+  /*                                                                       */
+  /*    descender    :: The descender in 26.6 fractional pixels.  See      */
+  /*                    @FT_FaceRec for the details.                       */
+  /*                                                                       */
+  /*    height       :: The height in 26.6 fractional pixels.  See         */
+  /*                    @FT_FaceRec for the details.                       */
+  /*                                                                       */
+  /*    max_advance  :: The maximum advance width in 26.6 fractional       */
+  /*                    pixels.  See @FT_FaceRec for the details.          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The scaling values, if relevant, are determined first during a     */
+  /*    size changing operation.  The remaining fields are then set by the */
+  /*    driver.  For scalable formats, they are usually set to scaled      */
+  /*    values of the corresponding fields in @FT_FaceRec.                 */
+  /*                                                                       */
+  /*    Note that due to glyph hinting, these values might not be exact    */
+  /*    for certain fonts.  Thus they must be treated as unreliable        */
+  /*    with an error margin of at least one pixel!                        */
+  /*                                                                       */
+  /*    Indeed, the only way to get the exact metrics is to render _all_   */
+  /*    glyphs.  As this would be a definite performance hit, it is up to  */
+  /*    client applications to perform such computations.                  */
+  /*                                                                       */
+  /*    The FT_Size_Metrics structure is valid for bitmap fonts also.      */
+  /*                                                                       */
+  typedef struct  FT_Size_Metrics_
+  {
+    FT_UShort  x_ppem;      /* horizontal pixels per EM               */
+    FT_UShort  y_ppem;      /* vertical pixels per EM                 */
+
+    FT_Fixed   x_scale;     /* scaling values used to convert font    */
+    FT_Fixed   y_scale;     /* units to 26.6 fractional pixels        */
+
+    FT_Pos     ascender;    /* ascender in 26.6 frac. pixels          */
+    FT_Pos     descender;   /* descender in 26.6 frac. pixels         */
+    FT_Pos     height;      /* text height in 26.6 frac. pixels       */
+    FT_Pos     max_advance; /* max horizontal advance, in 26.6 pixels */
+
+  } FT_Size_Metrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_SizeRec                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    FreeType root size class structure.  A size object models a face   */
+  /*    object at a given size.                                            */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    face    :: Handle to the parent face object.                       */
+  /*                                                                       */
+  /*    generic :: A typeless pointer, unused by the FreeType library or   */
+  /*               any of its drivers.  It can be used by client           */
+  /*               applications to link their own data to each size        */
+  /*               object.                                                 */
+  /*                                                                       */
+  /*    metrics :: Metrics for this size object.  This field is read-only. */
+  /*                                                                       */
+  typedef struct  FT_SizeRec_
+  {
+    FT_Face           face;      /* parent face object              */
+    FT_Generic        generic;   /* generic pointer for client uses */
+    FT_Size_Metrics   metrics;   /* size metrics                    */
+    FT_Size_Internal  internal;
+
+  } FT_SizeRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_SubGlyph                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The subglyph structure is an internal object used to describe      */
+  /*    subglyphs (for example, in the case of composites).                */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The subglyph implementation is not part of the high-level API,     */
+  /*    hence the forward structure declaration.                           */
+  /*                                                                       */
+  /*    You can however retrieve subglyph information with                 */
+  /*    @FT_Get_SubGlyph_Info.                                             */
+  /*                                                                       */
+  typedef struct FT_SubGlyphRec_*  FT_SubGlyph;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Slot_Internal                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An opaque handle to an `FT_Slot_InternalRec' structure, used to    */
+  /*    model private data of a given @FT_GlyphSlot object.                */
+  /*                                                                       */
+  typedef struct FT_Slot_InternalRec_*  FT_Slot_Internal;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_GlyphSlotRec                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    FreeType root glyph slot class structure.  A glyph slot is a       */
+  /*    container where individual glyphs can be loaded, be they in        */
+  /*    outline or bitmap format.                                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    library           :: A handle to the FreeType library instance     */
+  /*                         this slot belongs to.                         */
+  /*                                                                       */
+  /*    face              :: A handle to the parent face object.           */
+  /*                                                                       */
+  /*    next              :: In some cases (like some font tools), several */
+  /*                         glyph slots per face object can be a good     */
+  /*                         thing.  As this is rare, the glyph slots are  */
+  /*                         listed through a direct, single-linked list   */
+  /*                         using its `next' field.                       */
+  /*                                                                       */
+  /*    generic           :: A typeless pointer unused by the FreeType     */
+  /*                         library or any of its drivers.  It can be     */
+  /*                         used by client applications to link their own */
+  /*                         data to each glyph slot object.               */
+  /*                                                                       */
+  /*    metrics           :: The metrics of the last loaded glyph in the   */
+  /*                         slot.  The returned values depend on the last */
+  /*                         load flags (see the @FT_Load_Glyph API        */
+  /*                         function) and can be expressed either in 26.6 */
+  /*                         fractional pixels or font units.              */
+  /*                                                                       */
+  /*                         Note that even when the glyph image is        */
+  /*                         transformed, the metrics are not.             */
+  /*                                                                       */
+  /*    linearHoriAdvance :: The advance width of the unhinted glyph.      */
+  /*                         Its value is expressed in 16.16 fractional    */
+  /*                         pixels, unless @FT_LOAD_LINEAR_DESIGN is set  */
+  /*                         when loading the glyph.  This field can be    */
+  /*                         important to perform correct WYSIWYG layout.  */
+  /*                         Only relevant for outline glyphs.             */
+  /*                                                                       */
+  /*    linearVertAdvance :: The advance height of the unhinted glyph.     */
+  /*                         Its value is expressed in 16.16 fractional    */
+  /*                         pixels, unless @FT_LOAD_LINEAR_DESIGN is set  */
+  /*                         when loading the glyph.  This field can be    */
+  /*                         important to perform correct WYSIWYG layout.  */
+  /*                         Only relevant for outline glyphs.             */
+  /*                                                                       */
+  /*    advance           :: This shorthand is, depending on               */
+  /*                         @FT_LOAD_IGNORE_TRANSFORM, the transformed    */
+  /*                         (hinted) advance width for the glyph, in 26.6 */
+  /*                         fractional pixel format.  As specified with   */
+  /*                         @FT_LOAD_VERTICAL_LAYOUT, it uses either the  */
+  /*                         `horiAdvance' or the `vertAdvance' value of   */
+  /*                         `metrics' field.                              */
+  /*                                                                       */
+  /*    format            :: This field indicates the format of the image  */
+  /*                         contained in the glyph slot.  Typically       */
+  /*                         @FT_GLYPH_FORMAT_BITMAP,                      */
+  /*                         @FT_GLYPH_FORMAT_OUTLINE, or                  */
+  /*                         @FT_GLYPH_FORMAT_COMPOSITE, but others are    */
+  /*                         possible.                                     */
+  /*                                                                       */
+  /*    bitmap            :: This field is used as a bitmap descriptor     */
+  /*                         when the slot format is                       */
+  /*                         @FT_GLYPH_FORMAT_BITMAP.  Note that the       */
+  /*                         address and content of the bitmap buffer can  */
+  /*                         change between calls of @FT_Load_Glyph and a  */
+  /*                         few other functions.                          */
+  /*                                                                       */
+  /*    bitmap_left       :: This is the bitmap's left bearing expressed   */
+  /*                         in integer pixels.  Of course, this is only   */
+  /*                         valid if the format is                        */
+  /*                         @FT_GLYPH_FORMAT_BITMAP.                      */
+  /*                                                                       */
+  /*    bitmap_top        :: This is the bitmap's top bearing expressed in */
+  /*                         integer pixels.  Remember that this is the    */
+  /*                         distance from the baseline to the top-most    */
+  /*                         glyph scanline, upwards y~coordinates being   */
+  /*                         *positive*.                                   */
+  /*                                                                       */
+  /*    outline           :: The outline descriptor for the current glyph  */
+  /*                         image if its format is                        */
+  /*                         @FT_GLYPH_FORMAT_OUTLINE.  Once a glyph is    */
+  /*                         loaded, `outline' can be transformed,         */
+  /*                         distorted, embolded, etc.  However, it must   */
+  /*                         not be freed.                                 */
+  /*                                                                       */
+  /*    num_subglyphs     :: The number of subglyphs in a composite glyph. */
+  /*                         This field is only valid for the composite    */
+  /*                         glyph format that should normally only be     */
+  /*                         loaded with the @FT_LOAD_NO_RECURSE flag.     */
+  /*                         For now this is internal to FreeType.         */
+  /*                                                                       */
+  /*    subglyphs         :: An array of subglyph descriptors for          */
+  /*                         composite glyphs.  There are `num_subglyphs'  */
+  /*                         elements in there.  Currently internal to     */
+  /*                         FreeType.                                     */
+  /*                                                                       */
+  /*    control_data      :: Certain font drivers can also return the      */
+  /*                         control data for a given glyph image (e.g.    */
+  /*                         TrueType bytecode, Type~1 charstrings, etc.). */
+  /*                         This field is a pointer to such data.         */
+  /*                                                                       */
+  /*    control_len       :: This is the length in bytes of the control    */
+  /*                         data.                                         */
+  /*                                                                       */
+  /*    other             :: Really wicked formats can use this pointer to */
+  /*                         present their own glyph image to client       */
+  /*                         applications.  Note that the application      */
+  /*                         needs to know about the image format.         */
+  /*                                                                       */
+  /*    lsb_delta         :: The difference between hinted and unhinted    */
+  /*                         left side bearing while autohinting is        */
+  /*                         active.  Zero otherwise.                      */
+  /*                                                                       */
+  /*    rsb_delta         :: The difference between hinted and unhinted    */
+  /*                         right side bearing while autohinting is       */
+  /*                         active.  Zero otherwise.                      */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If @FT_Load_Glyph is called with default flags (see                */
+  /*    @FT_LOAD_DEFAULT) the glyph image is loaded in the glyph slot in   */
+  /*    its native format (e.g., an outline glyph for TrueType and Type~1  */
+  /*    formats).                                                          */
+  /*                                                                       */
+  /*    This image can later be converted into a bitmap by calling         */
+  /*    @FT_Render_Glyph.  This function finds the current renderer for    */
+  /*    the native image's format, then invokes it.                        */
+  /*                                                                       */
+  /*    The renderer is in charge of transforming the native image through */
+  /*    the slot's face transformation fields, then converting it into a   */
+  /*    bitmap that is returned in `slot->bitmap'.                         */
+  /*                                                                       */
+  /*    Note that `slot->bitmap_left' and `slot->bitmap_top' are also used */
+  /*    to specify the position of the bitmap relative to the current pen  */
+  /*    position (e.g., coordinates (0,0) on the baseline).  Of course,    */
+  /*    `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP.         */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Here a small pseudo code fragment that shows how to use            */
+  /*    `lsb_delta' and `rsb_delta':                                       */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      FT_Pos  origin_x       = 0;                                      */
+  /*      FT_Pos  prev_rsb_delta = 0;                                      */
+  /*                                                                       */
+  /*                                                                       */
+  /*      for all glyphs do                                                */
+  /*        <compute kern between current and previous glyph and add it to */
+  /*         `origin_x'>                                                   */
+  /*                                                                       */
+  /*        <load glyph with `FT_Load_Glyph'>                              */
+  /*                                                                       */
+  /*        if ( prev_rsb_delta - face->glyph->lsb_delta >= 32 )           */
+  /*          origin_x -= 64;                                              */
+  /*        else if ( prev_rsb_delta - face->glyph->lsb_delta < -32 )      */
+  /*          origin_x += 64;                                              */
+  /*                                                                       */
+  /*        prev_rsb_delta = face->glyph->rsb_delta;                       */
+  /*                                                                       */
+  /*        <save glyph image, or render glyph, or ...>                    */
+  /*                                                                       */
+  /*        origin_x += face->glyph->advance.x;                            */
+  /*      endfor                                                           */
+  /*    }                                                                  */
+  /*                                                                       */
+  typedef struct  FT_GlyphSlotRec_
+  {
+    FT_Library        library;
+    FT_Face           face;
+    FT_GlyphSlot      next;
+    FT_UInt           reserved;       /* retained for binary compatibility */
+    FT_Generic        generic;
+
+    FT_Glyph_Metrics  metrics;
+    FT_Fixed          linearHoriAdvance;
+    FT_Fixed          linearVertAdvance;
+    FT_Vector         advance;
+
+    FT_Glyph_Format   format;
+
+    FT_Bitmap         bitmap;
+    FT_Int            bitmap_left;
+    FT_Int            bitmap_top;
+
+    FT_Outline        outline;
+
+    FT_UInt           num_subglyphs;
+    FT_SubGlyph       subglyphs;
+
+    void*             control_data;
+    long              control_len;
+
+    FT_Pos            lsb_delta;
+    FT_Pos            rsb_delta;
+
+    void*             other;
+
+    FT_Slot_Internal  internal;
+
+  } FT_GlyphSlotRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*                                                                       */
+  /*                         F U N C T I O N S                             */
+  /*                                                                       */
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Init_FreeType                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Initialize a new FreeType library object.  The set of modules      */
+  /*    that are registered by this function is determined at build time.  */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    alibrary :: A handle to a new library object.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    In case you want to provide your own memory allocating routines,   */
+  /*    use @FT_New_Library instead, followed by a call to                 */
+  /*    @FT_Add_Default_Modules (or a series of calls to @FT_Add_Module).  */
+  /*                                                                       */
+  /*    For multi-threading applications each thread should have its own   */
+  /*    FT_Library object.                                                 */
+  /*                                                                       */
+  /*    If you need reference-counting (cf. @FT_Reference_Library), use    */
+  /*    @FT_New_Library and @FT_Done_Library.                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Init_FreeType( FT_Library  *alibrary );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_FreeType                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroy a given FreeType library object and all of its children,   */
+  /*    including resources, drivers, faces, sizes, etc.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to the target library object.                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Done_FreeType( FT_Library  library );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_OPEN_XXX                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of bit-field constants used within the `flags' field of the */
+  /*    @FT_Open_Args structure.                                           */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_OPEN_MEMORY   :: This is a memory-based stream.                 */
+  /*                                                                       */
+  /*    FT_OPEN_STREAM   :: Copy the stream from the `stream' field.       */
+  /*                                                                       */
+  /*    FT_OPEN_PATHNAME :: Create a new input stream from a C~path        */
+  /*                        name.                                          */
+  /*                                                                       */
+  /*    FT_OPEN_DRIVER   :: Use the `driver' field.                        */
+  /*                                                                       */
+  /*    FT_OPEN_PARAMS   :: Use the `num_params' and `params' fields.      */
+  /*                                                                       */
+  /*    ft_open_memory   :: Deprecated; use @FT_OPEN_MEMORY instead.       */
+  /*                                                                       */
+  /*    ft_open_stream   :: Deprecated; use @FT_OPEN_STREAM instead.       */
+  /*                                                                       */
+  /*    ft_open_pathname :: Deprecated; use @FT_OPEN_PATHNAME instead.     */
+  /*                                                                       */
+  /*    ft_open_driver   :: Deprecated; use @FT_OPEN_DRIVER instead.       */
+  /*                                                                       */
+  /*    ft_open_params   :: Deprecated; use @FT_OPEN_PARAMS instead.       */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME'     */
+  /*    flags are mutually exclusive.                                      */
+  /*                                                                       */
+#define FT_OPEN_MEMORY    0x1
+#define FT_OPEN_STREAM    0x2
+#define FT_OPEN_PATHNAME  0x4
+#define FT_OPEN_DRIVER    0x8
+#define FT_OPEN_PARAMS    0x10
+
+#define ft_open_memory    FT_OPEN_MEMORY     /* deprecated */
+#define ft_open_stream    FT_OPEN_STREAM     /* deprecated */
+#define ft_open_pathname  FT_OPEN_PATHNAME   /* deprecated */
+#define ft_open_driver    FT_OPEN_DRIVER     /* deprecated */
+#define ft_open_params    FT_OPEN_PARAMS     /* deprecated */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Parameter                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to pass more or less generic parameters to */
+  /*    @FT_Open_Face.                                                     */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    tag  :: A four-byte identification tag.                            */
+  /*                                                                       */
+  /*    data :: A pointer to the parameter data.                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The ID and function of parameters are driver-specific.  See the    */
+  /*    various FT_PARAM_TAG_XXX flags for more information.               */
+  /*                                                                       */
+  typedef struct  FT_Parameter_
+  {
+    FT_ULong    tag;
+    FT_Pointer  data;
+
+  } FT_Parameter;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Open_Args                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to indicate how to open a new font file or        */
+  /*    stream.  A pointer to such a structure can be used as a parameter  */
+  /*    for the functions @FT_Open_Face and @FT_Attach_Stream.             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    flags       :: A set of bit flags indicating how to use the        */
+  /*                   structure.                                          */
+  /*                                                                       */
+  /*    memory_base :: The first byte of the file in memory.               */
+  /*                                                                       */
+  /*    memory_size :: The size in bytes of the file in memory.            */
+  /*                                                                       */
+  /*    pathname    :: A pointer to an 8-bit file pathname.                */
+  /*                                                                       */
+  /*    stream      :: A handle to a source stream object.                 */
+  /*                                                                       */
+  /*    driver      :: This field is exclusively used by @FT_Open_Face;    */
+  /*                   it simply specifies the font driver to use to open  */
+  /*                   the face.  If set to~0, FreeType tries to load the  */
+  /*                   face with each one of the drivers in its list.      */
+  /*                                                                       */
+  /*    num_params  :: The number of extra parameters.                     */
+  /*                                                                       */
+  /*    params      :: Extra parameters passed to the font driver when     */
+  /*                   opening a new face.                                 */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The stream type is determined by the contents of `flags' that      */
+  /*    are tested in the following order by @FT_Open_Face:                */
+  /*                                                                       */
+  /*    If the `FT_OPEN_MEMORY' bit is set, assume that this is a          */
+  /*    memory file of `memory_size' bytes, located at `memory_address'.   */
+  /*    The data are are not copied, and the client is responsible for     */
+  /*    releasing and destroying them _after_ the corresponding call to    */
+  /*    @FT_Done_Face.                                                     */
+  /*                                                                       */
+  /*    Otherwise, if the `FT_OPEN_STREAM' bit is set, assume that a       */
+  /*    custom input stream `stream' is used.                              */
+  /*                                                                       */
+  /*    Otherwise, if the `FT_OPEN_PATHNAME' bit is set, assume that this  */
+  /*    is a normal file and use `pathname' to open it.                    */
+  /*                                                                       */
+  /*    If the `FT_OPEN_DRIVER' bit is set, @FT_Open_Face only tries to    */
+  /*    open the file with the driver whose handler is in `driver'.        */
+  /*                                                                       */
+  /*    If the `FT_OPEN_PARAMS' bit is set, the parameters given by        */
+  /*    `num_params' and `params' is used.  They are ignored otherwise.    */
+  /*                                                                       */
+  /*    Ideally, both the `pathname' and `params' fields should be tagged  */
+  /*    as `const'; this is missing for API backwards compatibility.  In   */
+  /*    other words, applications should treat them as read-only.          */
+  /*                                                                       */
+  typedef struct  FT_Open_Args_
+  {
+    FT_UInt         flags;
+    const FT_Byte*  memory_base;
+    FT_Long         memory_size;
+    FT_String*      pathname;
+    FT_Stream       stream;
+    FT_Module       driver;
+    FT_Int          num_params;
+    FT_Parameter*   params;
+
+  } FT_Open_Args;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Face                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function calls @FT_Open_Face to open a font by its pathname.  */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library resource.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    pathname   :: A path to the font file.                             */
+  /*                                                                       */
+  /*    face_index :: The index of the face within the font.  The first    */
+  /*                  face has index~0.                                    */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aface      :: A handle to a new face object.  If `face_index' is   */
+  /*                  greater than or equal to zero, it must be non-NULL.  */
+  /*                  See @FT_Open_Face for more details.                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Use @FT_Done_Face to destroy the created @FT_Face object (along    */
+  /*    with its slot and sizes).                                          */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Face( FT_Library   library,
+               const char*  filepathname,
+               FT_Long      face_index,
+               FT_Face     *aface );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Memory_Face                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function calls @FT_Open_Face to open a font that has been     */
+  /*    loaded into memory.                                                */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library resource.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    file_base  :: A pointer to the beginning of the font data.         */
+  /*                                                                       */
+  /*    file_size  :: The size of the memory chunk used by the font data.  */
+  /*                                                                       */
+  /*    face_index :: The index of the face within the font.  The first    */
+  /*                  face has index~0.                                    */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aface      :: A handle to a new face object.  If `face_index' is   */
+  /*                  greater than or equal to zero, it must be non-NULL.  */
+  /*                  See @FT_Open_Face for more details.                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You must not deallocate the memory before calling @FT_Done_Face.   */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Memory_Face( FT_Library      library,
+                      const FT_Byte*  file_base,
+                      FT_Long         file_size,
+                      FT_Long         face_index,
+                      FT_Face        *aface );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Open_Face                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a face object from a given resource described by            */
+  /*    @FT_Open_Args.                                                     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library resource.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    args       :: A pointer to an `FT_Open_Args' structure that must   */
+  /*                  be filled by the caller.                             */
+  /*                                                                       */
+  /*    face_index :: The index of the face within the font.  The first    */
+  /*                  face has index~0.                                    */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aface      :: A handle to a new face object.  If `face_index' is   */
+  /*                  greater than or equal to zero, it must be non-NULL.  */
+  /*                  See note below.                                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
+  /*    slot for the face object that can be accessed directly through     */
+  /*    `face->glyph'.                                                     */
+  /*                                                                       */
+  /*    FT_Open_Face can be used to quickly check whether the font         */
+  /*    format of a given font resource is supported by FreeType.  If the  */
+  /*    `face_index' field is negative, the function's return value is~0   */
+  /*    if the font format is recognized, or non-zero otherwise;           */
+  /*    the function returns a more or less empty face handle in `*aface'  */
+  /*    (if `aface' isn't NULL).  The only useful field in this special    */
+  /*    case is `face->num_faces' that gives the number of faces within    */
+  /*    the font file.  After examination, the returned @FT_Face structure */
+  /*    should be deallocated with a call to @FT_Done_Face.                */
+  /*                                                                       */
+  /*    Each new face object created with this function also owns a        */
+  /*    default @FT_Size object, accessible as `face->size'.               */
+  /*                                                                       */
+  /*    One @FT_Library instance can have multiple face objects, this is,  */
+  /*    @FT_Open_Face and its siblings can be called multiple times using  */
+  /*    the same `library' argument.                                       */
+  /*                                                                       */
+  /*    See the discussion of reference counters in the description of     */
+  /*    @FT_Reference_Face.                                                */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Open_Face( FT_Library           library,
+                const FT_Open_Args*  args,
+                FT_Long              face_index,
+                FT_Face             *aface );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Attach_File                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function calls @FT_Attach_Stream to attach a file.            */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face         :: The target face object.                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    filepathname :: The pathname.                                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Attach_File( FT_Face      face,
+                  const char*  filepathname );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Attach_Stream                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    `Attach' data to a face object.  Normally, this is used to read    */
+  /*    additional information for the face object.  For example, you can  */
+  /*    attach an AFM file that comes with a Type~1 font to get the        */
+  /*    kerning values and other metrics.                                  */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face       :: The target face object.                              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    parameters :: A pointer to @FT_Open_Args that must be filled by    */
+  /*                  the caller.                                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The meaning of the `attach' (i.e., what really happens when the    */
+  /*    new file is read) is not fixed by FreeType itself.  It really      */
+  /*    depends on the font format (and thus the font driver).             */
+  /*                                                                       */
+  /*    Client applications are expected to know what they are doing       */
+  /*    when invoking this function.  Most drivers simply do not implement */
+  /*    file attachments.                                                  */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Attach_Stream( FT_Face        face,
+                    FT_Open_Args*  parameters );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Reference_Face                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A counter gets initialized to~1 at the time an @FT_Face structure  */
+  /*    is created.  This function increments the counter.  @FT_Done_Face  */
+  /*    then only destroys a face if the counter is~1, otherwise it simply */
+  /*    decrements the counter.                                            */
+  /*                                                                       */
+  /*    This function helps in managing life-cycles of structures that     */
+  /*    reference @FT_Face objects.                                        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to a target face object.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.4.2                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Reference_Face( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_Face                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Discard a given face object, as well as all of its child slots and */
+  /*    sizes.                                                             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to a target face object.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    See the discussion of reference counters in the description of     */
+  /*    @FT_Reference_Face.                                                */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Done_Face( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Select_Size                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Select a bitmap strike.                                            */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face         :: A handle to a target face object.                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    strike_index :: The index of the bitmap strike in the              */
+  /*                    `available_sizes' field of @FT_FaceRec structure.  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Select_Size( FT_Face  face,
+                  FT_Int   strike_index );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Size_Request_Type                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration type that lists the supported size request types.   */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_SIZE_REQUEST_TYPE_NOMINAL ::                                    */
+  /*      The nominal size.  The `units_per_EM' field of @FT_FaceRec is    */
+  /*      used to determine both scaling values.                           */
+  /*                                                                       */
+  /*    FT_SIZE_REQUEST_TYPE_REAL_DIM ::                                   */
+  /*      The real dimension.  The sum of the the `ascender' and (minus    */
+  /*      of) the `descender' fields of @FT_FaceRec are used to determine  */
+  /*      both scaling values.                                             */
+  /*                                                                       */
+  /*    FT_SIZE_REQUEST_TYPE_BBOX ::                                       */
+  /*      The font bounding box.  The width and height of the `bbox' field */
+  /*      of @FT_FaceRec are used to determine the horizontal and vertical */
+  /*      scaling value, respectively.                                     */
+  /*                                                                       */
+  /*    FT_SIZE_REQUEST_TYPE_CELL ::                                       */
+  /*      The `max_advance_width' field of @FT_FaceRec is used to          */
+  /*      determine the horizontal scaling value; the vertical scaling     */
+  /*      value is determined the same way as                              */
+  /*      @FT_SIZE_REQUEST_TYPE_REAL_DIM does.  Finally, both scaling      */
+  /*      values are set to the smaller one.  This type is useful if you   */
+  /*      want to specify the font size for, say, a window of a given      */
+  /*      dimension and 80x24 cells.                                       */
+  /*                                                                       */
+  /*    FT_SIZE_REQUEST_TYPE_SCALES ::                                     */
+  /*      Specify the scaling values directly.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The above descriptions only apply to scalable formats.  For bitmap */
+  /*    formats, the behaviour is up to the driver.                        */
+  /*                                                                       */
+  /*    See the note section of @FT_Size_Metrics if you wonder how size    */
+  /*    requesting relates to scaling values.                              */
+  /*                                                                       */
+  typedef enum  FT_Size_Request_Type_
+  {
+    FT_SIZE_REQUEST_TYPE_NOMINAL,
+    FT_SIZE_REQUEST_TYPE_REAL_DIM,
+    FT_SIZE_REQUEST_TYPE_BBOX,
+    FT_SIZE_REQUEST_TYPE_CELL,
+    FT_SIZE_REQUEST_TYPE_SCALES,
+
+    FT_SIZE_REQUEST_TYPE_MAX
+
+  } FT_Size_Request_Type;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Size_RequestRec                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a size request.                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    type           :: See @FT_Size_Request_Type.                       */
+  /*                                                                       */
+  /*    width          :: The desired width.                               */
+  /*                                                                       */
+  /*    height         :: The desired height.                              */
+  /*                                                                       */
+  /*    horiResolution :: The horizontal resolution.  If set to zero,      */
+  /*                      `width' is treated as a 26.6 fractional pixel    */
+  /*                      value.                                           */
+  /*                                                                       */
+  /*    vertResolution :: The vertical resolution.  If set to zero,        */
+  /*                      `height' is treated as a 26.6 fractional pixel   */
+  /*                      value.                                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If `width' is zero, then the horizontal scaling value is set equal */
+  /*    to the vertical scaling value, and vice versa.                     */
+  /*                                                                       */
+  typedef struct  FT_Size_RequestRec_
+  {
+    FT_Size_Request_Type  type;
+    FT_Long               width;
+    FT_Long               height;
+    FT_UInt               horiResolution;
+    FT_UInt               vertResolution;
+
+  } FT_Size_RequestRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Size_Request                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a size request structure.                              */
+  /*                                                                       */
+  typedef struct FT_Size_RequestRec_  *FT_Size_Request;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Request_Size                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Resize the scale of the active @FT_Size object in a face.          */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face :: A handle to a target face object.                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    req  :: A pointer to a @FT_Size_RequestRec.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Although drivers may select the bitmap strike matching the         */
+  /*    request, you should not rely on this if you intend to select a     */
+  /*    particular bitmap strike.  Use @FT_Select_Size instead in that     */
+  /*    case.                                                              */
+  /*                                                                       */
+  /*    The relation between the requested size and the resulting glyph    */
+  /*    size is dependent entirely on how the size is defined in the       */
+  /*    source face.  The font designer chooses the final size of each     */
+  /*    glyph relative to this size.  For more information refer to        */
+  /*    `http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html'      */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Request_Size( FT_Face          face,
+                   FT_Size_Request  req );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Char_Size                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function calls @FT_Request_Size to request the nominal size   */
+  /*    (in points).                                                       */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face            :: A handle to a target face object.               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    char_width      :: The nominal width, in 26.6 fractional points.   */
+  /*                                                                       */
+  /*    char_height     :: The nominal height, in 26.6 fractional points.  */
+  /*                                                                       */
+  /*    horz_resolution :: The horizontal resolution in dpi.               */
+  /*                                                                       */
+  /*    vert_resolution :: The vertical resolution in dpi.                 */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If either the character width or height is zero, it is set equal   */
+  /*    to the other value.                                                */
+  /*                                                                       */
+  /*    If either the horizontal or vertical resolution is zero, it is set */
+  /*    equal to the other value.                                          */
+  /*                                                                       */
+  /*    A character width or height smaller than 1pt is set to 1pt; if     */
+  /*    both resolution values are zero, they are set to 72dpi.            */
+  /*                                                                       */
+  /*    Don't use this function if you are using the FreeType cache API.   */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_Char_Size( FT_Face     face,
+                    FT_F26Dot6  char_width,
+                    FT_F26Dot6  char_height,
+                    FT_UInt     horz_resolution,
+                    FT_UInt     vert_resolution );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Pixel_Sizes                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function calls @FT_Request_Size to request the nominal size   */
+  /*    (in pixels).                                                       */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face         :: A handle to the target face object.                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    pixel_width  :: The nominal width, in pixels.                      */
+  /*                                                                       */
+  /*    pixel_height :: The nominal height, in pixels.                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You should not rely on the resulting glyphs matching, or being     */
+  /*    constrained, to this pixel size.  Refer to @FT_Request_Size to     */
+  /*    understand how requested sizes relate to actual sizes.             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_Pixel_Sizes( FT_Face  face,
+                      FT_UInt  pixel_width,
+                      FT_UInt  pixel_height );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Load_Glyph                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to load a single glyph into the glyph slot of a    */
+  /*    face object.                                                       */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face        :: A handle to the target face object where the glyph  */
+  /*                   is loaded.                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    glyph_index :: The index of the glyph in the font file.  For       */
+  /*                   CID-keyed fonts (either in PS or in CFF format)     */
+  /*                   this argument specifies the CID value.              */
+  /*                                                                       */
+  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
+  /*                   @FT_LOAD_XXX constants can be used to control the   */
+  /*                   glyph loading process (e.g., whether the outline    */
+  /*                   should be scaled, whether to load bitmaps or not,   */
+  /*                   whether to hint the outline, etc).                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The loaded glyph may be transformed.  See @FT_Set_Transform for    */
+  /*    the details.                                                       */
+  /*                                                                       */
+  /*    For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument' is        */
+  /*    returned for invalid CID values (this is, for CID values that      */
+  /*    don't have a corresponding glyph in the font).  See the discussion */
+  /*    of the @FT_FACE_FLAG_CID_KEYED flag for more details.              */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Load_Glyph( FT_Face   face,
+                 FT_UInt   glyph_index,
+                 FT_Int32  load_flags );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Load_Char                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to load a single glyph into the glyph slot of a    */
+  /*    face object, according to its character code.                      */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face        :: A handle to a target face object where the glyph    */
+  /*                   is loaded.                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    char_code   :: The glyph's character code, according to the        */
+  /*                   current charmap used in the face.                   */
+  /*                                                                       */
+  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
+  /*                   @FT_LOAD_XXX constants can be used to control the   */
+  /*                   glyph loading process (e.g., whether the outline    */
+  /*                   should be scaled, whether to load bitmaps or not,   */
+  /*                   whether to hint the outline, etc).                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function simply calls @FT_Get_Char_Index and @FT_Load_Glyph.  */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Load_Char( FT_Face   face,
+                FT_ULong  char_code,
+                FT_Int32  load_flags );
+
+
+  /*************************************************************************
+   *
+   * @enum:
+   *   FT_LOAD_XXX
+   *
+   * @description:
+   *   A list of bit-field constants used with @FT_Load_Glyph to indicate
+   *   what kind of operations to perform during glyph loading.
+   *
+   * @values:
+   *   FT_LOAD_DEFAULT ::
+   *     Corresponding to~0, this value is used as the default glyph load
+   *     operation.  In this case, the following happens:
+   *
+   *     1. FreeType looks for a bitmap for the glyph corresponding to the
+   *        face's current size.  If one is found, the function returns.
+   *        The bitmap data can be accessed from the glyph slot (see note
+   *        below).
+   *
+   *     2. If no embedded bitmap is searched or found, FreeType looks for a
+   *        scalable outline.  If one is found, it is loaded from the font
+   *        file, scaled to device pixels, then `hinted' to the pixel grid
+   *        in order to optimize it.  The outline data can be accessed from
+   *        the glyph slot (see note below).
+   *
+   *     Note that by default, the glyph loader doesn't render outlines into
+   *     bitmaps.  The following flags are used to modify this default
+   *     behaviour to more specific and useful cases.
+   *
+   *   FT_LOAD_NO_SCALE ::
+   *     Don't scale the loaded outline glyph but keep it in font units.
+   *
+   *     This flag implies @FT_LOAD_NO_HINTING and @FT_LOAD_NO_BITMAP, and
+   *     unsets @FT_LOAD_RENDER.
+   *
+   *     If the font is `tricky' (see @FT_FACE_FLAG_TRICKY for more), using
+   *     FT_LOAD_NO_SCALE usually yields meaningless outlines because the
+   *     subglyphs must be scaled and positioned with hinting instructions.
+   *     This can be solved by loading the font without FT_LOAD_NO_SCALE and
+   *     setting the character size to `font->units_per_EM'.
+   *
+   *   FT_LOAD_NO_HINTING ::
+   *     Disable hinting.  This generally generates `blurrier' bitmap glyphs
+   *     when the glyph are rendered in any of the anti-aliased modes.  See
+   *     also the note below.
+   *
+   *     This flag is implied by @FT_LOAD_NO_SCALE.
+   *
+   *   FT_LOAD_RENDER ::
+   *     Call @FT_Render_Glyph after the glyph is loaded.  By default, the
+   *     glyph is rendered in @FT_RENDER_MODE_NORMAL mode.  This can be
+   *     overridden by @FT_LOAD_TARGET_XXX or @FT_LOAD_MONOCHROME.
+   *
+   *     This flag is unset by @FT_LOAD_NO_SCALE.
+   *
+   *   FT_LOAD_NO_BITMAP ::
+   *     Ignore bitmap strikes when loading.  Bitmap-only fonts ignore this
+   *     flag.
+   *
+   *     @FT_LOAD_NO_SCALE always sets this flag.
+   *
+   *   FT_LOAD_VERTICAL_LAYOUT ::
+   *     Load the glyph for vertical text layout.  In particular, the
+   *     `advance' value in the @FT_GlyphSlotRec structure is set to the
+   *     `vertAdvance' value of the `metrics' field.
+   *
+   *     In case @FT_HAS_VERTICAL doesn't return true, you shouldn't use
+   *     this flag currently.  Reason is that in this case vertical metrics
+   *     get synthesized, and those values are not always consistent across
+   *     various font formats.
+   *
+   *   FT_LOAD_FORCE_AUTOHINT ::
+   *     Indicates that the auto-hinter is preferred over the font's native
+   *     hinter.  See also the note below.
+   *
+   *   FT_LOAD_CROP_BITMAP ::
+   *     Indicates that the font driver should crop the loaded bitmap glyph
+   *     (i.e., remove all space around its black bits).  Not all drivers
+   *     implement this.
+   *
+   *   FT_LOAD_PEDANTIC ::
+   *     Indicates that the font driver should perform pedantic verifications
+   *     during glyph loading.  This is mostly used to detect broken glyphs
+   *     in fonts.  By default, FreeType tries to handle broken fonts also.
+   *
+   *     In particular, errors from the TrueType bytecode engine are not
+   *     passed to the application if this flag is not set; this might
+   *     result in partially hinted or distorted glyphs in case a glyph's
+   *     bytecode is buggy.
+   *
+   *   FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
+   *     Ignored.  Deprecated.
+   *
+   *   FT_LOAD_NO_RECURSE ::
+   *     This flag is only used internally.  It merely indicates that the
+   *     font driver should not load composite glyphs recursively.  Instead,
+   *     it should set the `num_subglyph' and `subglyphs' values of the
+   *     glyph slot accordingly, and set `glyph->format' to
+   *     @FT_GLYPH_FORMAT_COMPOSITE.
+   *
+   *     The description of sub-glyphs is not available to client
+   *     applications for now.
+   *
+   *     This flag implies @FT_LOAD_NO_SCALE and @FT_LOAD_IGNORE_TRANSFORM.
+   *
+   *   FT_LOAD_IGNORE_TRANSFORM ::
+   *     Indicates that the transform matrix set by @FT_Set_Transform should
+   *     be ignored.
+   *
+   *   FT_LOAD_MONOCHROME ::
+   *     This flag is used with @FT_LOAD_RENDER to indicate that you want to
+   *     render an outline glyph to a 1-bit monochrome bitmap glyph, with
+   *     8~pixels packed into each byte of the bitmap data.
+   *
+   *     Note that this has no effect on the hinting algorithm used.  You
+   *     should rather use @FT_LOAD_TARGET_MONO so that the
+   *     monochrome-optimized hinting algorithm is used.
+   *
+   *   FT_LOAD_LINEAR_DESIGN ::
+   *     Indicates that the `linearHoriAdvance' and `linearVertAdvance'
+   *     fields of @FT_GlyphSlotRec should be kept in font units.  See
+   *     @FT_GlyphSlotRec for details.
+   *
+   *   FT_LOAD_NO_AUTOHINT ::
+   *     Disable auto-hinter.  See also the note below.
+   *
+   *   FT_LOAD_COLOR ::
+   *     This flag is used to request loading of color embedded-bitmap
+   *     images.  The resulting color bitmaps, if available, will have the
+   *     @FT_PIXEL_MODE_BGRA format.  When the flag is not used and color
+   *     bitmaps are found, they will be converted to 256-level gray
+   *     bitmaps transparently.  Those bitmaps will be in the
+   *     @FT_PIXEL_MODE_GRAY format.
+   *
+   * @note:
+   *   By default, hinting is enabled and the font's native hinter (see
+   *   @FT_FACE_FLAG_HINTER) is preferred over the auto-hinter.  You can
+   *   disable hinting by setting @FT_LOAD_NO_HINTING or change the
+   *   precedence by setting @FT_LOAD_FORCE_AUTOHINT.  You can also set
+   *   @FT_LOAD_NO_AUTOHINT in case you don't want the auto-hinter to be
+   *   used at all.
+   *
+   *   See the description of @FT_FACE_FLAG_TRICKY for a special exception
+   *   (affecting only a handful of Asian fonts).
+   *
+   *   Besides deciding which hinter to use, you can also decide which
+   *   hinting algorithm to use.  See @FT_LOAD_TARGET_XXX for details.
+   *
+   *   Note that the auto-hinter needs a valid Unicode cmap (either a native
+   *   one or synthesized by FreeType) for producing correct results.  If a
+   *   font provides an incorrect mapping (for example, assigning the
+   *   character code U+005A, LATIN CAPITAL LETTER Z, to a glyph depicting a
+   *   mathematical integral sign), the auto-hinter might produce useless
+   *   results.
+   *
+   */
+#define FT_LOAD_DEFAULT                      0x0
+#define FT_LOAD_NO_SCALE                     ( 1L << 0 )
+#define FT_LOAD_NO_HINTING                   ( 1L << 1 )
+#define FT_LOAD_RENDER                       ( 1L << 2 )
+#define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
+#define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
+#define FT_LOAD_FORCE_AUTOHINT               ( 1L << 5 )
+#define FT_LOAD_CROP_BITMAP                  ( 1L << 6 )
+#define FT_LOAD_PEDANTIC                     ( 1L << 7 )
+#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  ( 1L << 9 )
+#define FT_LOAD_NO_RECURSE                   ( 1L << 10 )
+#define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
+#define FT_LOAD_MONOCHROME                   ( 1L << 12 )
+#define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
+#define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
+  /* Bits 16..19 are used by `FT_LOAD_TARGET_' */
+#define FT_LOAD_COLOR                        ( 1L << 20 )
+
+  /* */
+
+  /* used internally only by certain font drivers! */
+#define FT_LOAD_ADVANCE_ONLY                 ( 1L << 8 )
+#define FT_LOAD_SBITS_ONLY                   ( 1L << 14 )
+
+
+  /**************************************************************************
+   *
+   * @enum:
+   *   FT_LOAD_TARGET_XXX
+   *
+   * @description:
+   *   A list of values that are used to select a specific hinting algorithm
+   *   to use by the hinter.  You should OR one of these values to your
+   *   `load_flags' when calling @FT_Load_Glyph.
+   *
+   *   Note that font's native hinters may ignore the hinting algorithm you
+   *   have specified (e.g., the TrueType bytecode interpreter).  You can set
+   *   @FT_LOAD_FORCE_AUTOHINT to ensure that the auto-hinter is used.
+   *
+   *   Also note that @FT_LOAD_TARGET_LIGHT is an exception, in that it
+   *   always implies @FT_LOAD_FORCE_AUTOHINT.
+   *
+   * @values:
+   *   FT_LOAD_TARGET_NORMAL ::
+   *     This corresponds to the default hinting algorithm, optimized for
+   *     standard gray-level rendering.  For monochrome output, use
+   *     @FT_LOAD_TARGET_MONO instead.
+   *
+   *   FT_LOAD_TARGET_LIGHT ::
+   *     A lighter hinting algorithm for non-monochrome modes.  Many
+   *     generated glyphs are more fuzzy but better resemble its original
+   *     shape.  A bit like rendering on Mac OS~X.
+   *
+   *     As a special exception, this target implies @FT_LOAD_FORCE_AUTOHINT.
+   *
+   *   FT_LOAD_TARGET_MONO ::
+   *     Strong hinting algorithm that should only be used for monochrome
+   *     output.  The result is probably unpleasant if the glyph is rendered
+   *     in non-monochrome modes.
+   *
+   *   FT_LOAD_TARGET_LCD ::
+   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for horizontally
+   *     decimated LCD displays.
+   *
+   *   FT_LOAD_TARGET_LCD_V ::
+   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for vertically
+   *     decimated LCD displays.
+   *
+   * @note:
+   *   You should use only _one_ of the FT_LOAD_TARGET_XXX values in your
+   *   `load_flags'.  They can't be ORed.
+   *
+   *   If @FT_LOAD_RENDER is also set, the glyph is rendered in the
+   *   corresponding mode (i.e., the mode that matches the used algorithm
+   *   best).  An exeption is FT_LOAD_TARGET_MONO since it implies
+   *   @FT_LOAD_MONOCHROME.
+   *
+   *   You can use a hinting algorithm that doesn't correspond to the same
+   *   rendering mode.  As an example, it is possible to use the `light'
+   *   hinting algorithm and have the results rendered in horizontal LCD
+   *   pixel mode, with code like
+   *
+   *     {
+   *       FT_Load_Glyph( face, glyph_index,
+   *                      load_flags | FT_LOAD_TARGET_LIGHT );
+   *
+   *       FT_Render_Glyph( face->glyph, FT_RENDER_MODE_LCD );
+   *     }
+   *
+   */
+#define FT_LOAD_TARGET_( x )   ( (FT_Int32)( (x) & 15 ) << 16 )
+
+#define FT_LOAD_TARGET_NORMAL  FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL )
+#define FT_LOAD_TARGET_LIGHT   FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT  )
+#define FT_LOAD_TARGET_MONO    FT_LOAD_TARGET_( FT_RENDER_MODE_MONO   )
+#define FT_LOAD_TARGET_LCD     FT_LOAD_TARGET_( FT_RENDER_MODE_LCD    )
+#define FT_LOAD_TARGET_LCD_V   FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V  )
+
+
+  /**************************************************************************
+   *
+   * @macro:
+   *   FT_LOAD_TARGET_MODE
+   *
+   * @description:
+   *   Return the @FT_Render_Mode corresponding to a given
+   *   @FT_LOAD_TARGET_XXX value.
+   *
+   */
+#define FT_LOAD_TARGET_MODE( x )  ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Transform                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to set the transformation that is applied to glyph */
+  /*    images when they are loaded into a glyph slot through              */
+  /*    @FT_Load_Glyph.                                                    */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face   :: A handle to the source face object.                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    matrix :: A pointer to the transformation's 2x2 matrix.  Use~0 for */
+  /*              the identity matrix.                                     */
+  /*    delta  :: A pointer to the translation vector.  Use~0 for the null */
+  /*              vector.                                                  */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The transformation is only applied to scalable image formats after */
+  /*    the glyph has been loaded.  It means that hinting is unaltered by  */
+  /*    the transformation and is performed on the character size given in */
+  /*    the last call to @FT_Set_Char_Size or @FT_Set_Pixel_Sizes.         */
+  /*                                                                       */
+  /*    Note that this also transforms the `face.glyph.advance' field, but */
+  /*    *not* the values in `face.glyph.metrics'.                          */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Set_Transform( FT_Face     face,
+                    FT_Matrix*  matrix,
+                    FT_Vector*  delta );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Render_Mode                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration type that lists the render modes supported by       */
+  /*    FreeType~2.  Each mode corresponds to a specific type of scanline  */
+  /*    conversion performed on the outline.                               */
+  /*                                                                       */
+  /*    For bitmap fonts and embedded bitmaps the `bitmap->pixel_mode'     */
+  /*    field in the @FT_GlyphSlotRec structure gives the format of the    */
+  /*    returned bitmap.                                                   */
+  /*                                                                       */
+  /*    All modes except @FT_RENDER_MODE_MONO use 256 levels of opacity.   */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_RENDER_MODE_NORMAL ::                                           */
+  /*      This is the default render mode; it corresponds to 8-bit         */
+  /*      anti-aliased bitmaps.                                            */
+  /*                                                                       */
+  /*    FT_RENDER_MODE_LIGHT ::                                            */
+  /*      This is equivalent to @FT_RENDER_MODE_NORMAL.  It is only        */
+  /*      defined as a separate value because render modes are also used   */
+  /*      indirectly to define hinting algorithm selectors.  See           */
+  /*      @FT_LOAD_TARGET_XXX for details.                                 */
+  /*                                                                       */
+  /*    FT_RENDER_MODE_MONO ::                                             */
+  /*      This mode corresponds to 1-bit bitmaps (with 2~levels of         */
+  /*      opacity).                                                        */
+  /*                                                                       */
+  /*    FT_RENDER_MODE_LCD ::                                              */
+  /*      This mode corresponds to horizontal RGB and BGR sub-pixel        */
+  /*      displays like LCD screens.  It produces 8-bit bitmaps that are   */
+  /*      3~times the width of the original glyph outline in pixels, and   */
+  /*      which use the @FT_PIXEL_MODE_LCD mode.                           */
+  /*                                                                       */
+  /*    FT_RENDER_MODE_LCD_V ::                                            */
+  /*      This mode corresponds to vertical RGB and BGR sub-pixel displays */
+  /*      (like PDA screens, rotated LCD displays, etc.).  It produces     */
+  /*      8-bit bitmaps that are 3~times the height of the original        */
+  /*      glyph outline in pixels and use the @FT_PIXEL_MODE_LCD_V mode.   */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The LCD-optimized glyph bitmaps produced by FT_Render_Glyph can be */
+  /*    filtered to reduce color-fringes by using @FT_Library_SetLcdFilter */
+  /*    (not active in the default builds).  It is up to the caller to     */
+  /*    either call @FT_Library_SetLcdFilter (if available) or do the      */
+  /*    filtering itself.                                                  */
+  /*                                                                       */
+  /*    The selected render mode only affects vector glyphs of a font.     */
+  /*    Embedded bitmaps often have a different pixel mode like            */
+  /*    @FT_PIXEL_MODE_MONO.  You can use @FT_Bitmap_Convert to transform  */
+  /*    them into 8-bit pixmaps.                                           */
+  /*                                                                       */
+  typedef enum  FT_Render_Mode_
+  {
+    FT_RENDER_MODE_NORMAL = 0,
+    FT_RENDER_MODE_LIGHT,
+    FT_RENDER_MODE_MONO,
+    FT_RENDER_MODE_LCD,
+    FT_RENDER_MODE_LCD_V,
+
+    FT_RENDER_MODE_MAX
+
+  } FT_Render_Mode;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    ft_render_mode_xxx                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    These constants are deprecated.  Use the corresponding             */
+  /*    @FT_Render_Mode values instead.                                    */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    ft_render_mode_normal :: see @FT_RENDER_MODE_NORMAL                */
+  /*    ft_render_mode_mono   :: see @FT_RENDER_MODE_MONO                  */
+  /*                                                                       */
+#define ft_render_mode_normal  FT_RENDER_MODE_NORMAL
+#define ft_render_mode_mono    FT_RENDER_MODE_MONO
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Render_Glyph                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Convert a given glyph image to a bitmap.  It does so by inspecting */
+  /*    the glyph image format, finding the relevant renderer, and         */
+  /*    invoking it.                                                       */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    slot        :: A handle to the glyph slot containing the image to  */
+  /*                   convert.                                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    render_mode :: This is the render mode used to render the glyph    */
+  /*                   image into a bitmap.  See @FT_Render_Mode for a     */
+  /*                   list of possible values.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Render_Glyph( FT_GlyphSlot    slot,
+                   FT_Render_Mode  render_mode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Kerning_Mode                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration used to specify which kerning values to return in   */
+  /*    @FT_Get_Kerning.                                                   */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_KERNING_DEFAULT  :: Return scaled and grid-fitted kerning       */
+  /*                           distances (value is~0).                     */
+  /*                                                                       */
+  /*    FT_KERNING_UNFITTED :: Return scaled but un-grid-fitted kerning    */
+  /*                           distances.                                  */
+  /*                                                                       */
+  /*    FT_KERNING_UNSCALED :: Return the kerning vector in original font  */
+  /*                           units.                                      */
+  /*                                                                       */
+  typedef enum  FT_Kerning_Mode_
+  {
+    FT_KERNING_DEFAULT  = 0,
+    FT_KERNING_UNFITTED,
+    FT_KERNING_UNSCALED
+
+  } FT_Kerning_Mode;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Const>                                                               */
+  /*    ft_kerning_default                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This constant is deprecated.  Please use @FT_KERNING_DEFAULT       */
+  /*    instead.                                                           */
+  /*                                                                       */
+#define ft_kerning_default   FT_KERNING_DEFAULT
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Const>                                                               */
+  /*    ft_kerning_unfitted                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This constant is deprecated.  Please use @FT_KERNING_UNFITTED      */
+  /*    instead.                                                           */
+  /*                                                                       */
+#define ft_kerning_unfitted  FT_KERNING_UNFITTED
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Const>                                                               */
+  /*    ft_kerning_unscaled                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This constant is deprecated.  Please use @FT_KERNING_UNSCALED      */
+  /*    instead.                                                           */
+  /*                                                                       */
+#define ft_kerning_unscaled  FT_KERNING_UNSCALED
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Kerning                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the kerning vector between two glyphs of a same face.       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face        :: A handle to a source face object.                   */
+  /*                                                                       */
+  /*    left_glyph  :: The index of the left glyph in the kern pair.       */
+  /*                                                                       */
+  /*    right_glyph :: The index of the right glyph in the kern pair.      */
+  /*                                                                       */
+  /*    kern_mode   :: See @FT_Kerning_Mode for more information.          */
+  /*                   Determines the scale and dimension of the returned  */
+  /*                   kerning vector.                                     */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    akerning    :: The kerning vector.  This is either in font units   */
+  /*                   or in pixels (26.6 format) for scalable formats,    */
+  /*                   and in pixels for fixed-sizes formats.              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Only horizontal layouts (left-to-right & right-to-left) are        */
+  /*    supported by this method.  Other layouts, or more sophisticated    */
+  /*    kernings, are out of the scope of this API function -- they can be */
+  /*    implemented through format-specific interfaces.                    */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Kerning( FT_Face     face,
+                  FT_UInt     left_glyph,
+                  FT_UInt     right_glyph,
+                  FT_UInt     kern_mode,
+                  FT_Vector  *akerning );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Track_Kerning                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the track kerning for a given face object at a given size.  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face       :: A handle to a source face object.                    */
+  /*                                                                       */
+  /*    point_size :: The point size in 16.16 fractional points.           */
+  /*                                                                       */
+  /*    degree     :: The degree of tightness.  Increasingly negative      */
+  /*                  values represent tighter track kerning, while        */
+  /*                  increasingly positive values represent looser track  */
+  /*                  kerning.  Value zero means no track kerning.         */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    akerning   :: The kerning in 16.16 fractional points, to be        */
+  /*                  uniformly applied between all glyphs.                */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Currently, only the Type~1 font driver supports track kerning,     */
+  /*    using data from AFM files (if attached with @FT_Attach_File or     */
+  /*    @FT_Attach_Stream).                                                */
+  /*                                                                       */
+  /*    Only very few AFM files come with track kerning data; please refer */
+  /*    to the Adobe's AFM specification for more details.                 */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Track_Kerning( FT_Face    face,
+                        FT_Fixed   point_size,
+                        FT_Int     degree,
+                        FT_Fixed*  akerning );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Glyph_Name                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the ASCII name of a given glyph in a face.  This only     */
+  /*    works for those faces where @FT_HAS_GLYPH_NAMES(face) returns~1.   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face        :: A handle to a source face object.                   */
+  /*                                                                       */
+  /*    glyph_index :: The glyph index.                                    */
+  /*                                                                       */
+  /*    buffer_max  :: The maximum number of bytes available in the        */
+  /*                   buffer.                                             */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    buffer      :: A pointer to a target buffer where the name is      */
+  /*                   copied to.                                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    An error is returned if the face doesn't provide glyph names or if */
+  /*    the glyph index is invalid.  In all cases of failure, the first    */
+  /*    byte of `buffer' is set to~0 to indicate an empty name.            */
+  /*                                                                       */
+  /*    The glyph name is truncated to fit within the buffer if it is too  */
+  /*    long.  The returned string is always zero-terminated.              */
+  /*                                                                       */
+  /*    Be aware that FreeType reorders glyph indices internally so that   */
+  /*    glyph index~0 always corresponds to the `missing glyph' (called    */
+  /*    `.notdef').                                                        */
+  /*                                                                       */
+  /*    This function is not compiled within the library if the config     */
+  /*    macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in              */
+  /*    `ftoptions.h'.                                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Glyph_Name( FT_Face     face,
+                     FT_UInt     glyph_index,
+                     FT_Pointer  buffer,
+                     FT_UInt     buffer_max );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Postscript_Name                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the ASCII PostScript name of a given face, if available.  */
+  /*    This only works with PostScript and TrueType fonts.                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the source face object.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A pointer to the face's PostScript name.  NULL if unavailable.     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The returned pointer is owned by the face and is destroyed with    */
+  /*    it.                                                                */
+  /*                                                                       */
+  FT_EXPORT( const char* )
+  FT_Get_Postscript_Name( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Select_Charmap                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Select a given charmap by its encoding tag (as listed in           */
+  /*    `freetype.h').                                                     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face     :: A handle to the source face object.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    encoding :: A handle to the selected encoding.                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function returns an error if no charmap in the face           */
+  /*    corresponds to the encoding queried here.                          */
+  /*                                                                       */
+  /*    Because many fonts contain more than a single cmap for Unicode     */
+  /*    encoding, this function has some special code to select the one    */
+  /*    that covers Unicode best (`best' in the sense that a UCS-4 cmap is */
+  /*    preferred to a UCS-2 cmap).  It is thus preferable to              */
+  /*    @FT_Set_Charmap in this case.                                      */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Select_Charmap( FT_Face      face,
+                     FT_Encoding  encoding );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Charmap                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Select a given charmap for character code to glyph index mapping.  */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face    :: A handle to the source face object.                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    charmap :: A handle to the selected charmap.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function returns an error if the charmap is not part of       */
+  /*    the face (i.e., if it is not listed in the `face->charmaps'        */
+  /*    table).                                                            */
+  /*                                                                       */
+  /*    It also fails if a type~14 charmap is selected.                    */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_Charmap( FT_Face     face,
+                  FT_CharMap  charmap );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Get_Charmap_Index
+   *
+   * @description:
+   *   Retrieve index of a given charmap.
+   *
+   * @input:
+   *   charmap ::
+   *     A handle to a charmap.
+   *
+   * @return:
+   *   The index into the array of character maps within the face to which
+   *   `charmap' belongs.  If an error occurs, -1 is returned.
+   *
+   */
+  FT_EXPORT( FT_Int )
+  FT_Get_Charmap_Index( FT_CharMap  charmap );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Char_Index                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the glyph index of a given character code.  This function   */
+  /*    uses a charmap object to do the mapping.                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face     :: A handle to the source face object.                    */
+  /*                                                                       */
+  /*    charcode :: The character code.                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The glyph index.  0~means `undefined character code'.              */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If you use FreeType to manipulate the contents of font files       */
+  /*    directly, be aware that the glyph index returned by this function  */
+  /*    doesn't always correspond to the internal indices used within the  */
+  /*    file.  This is done to ensure that value~0 always corresponds to   */
+  /*    the `missing glyph'.  If the first glyph is not named `.notdef',   */
+  /*    then for Type~1 and Type~42 fonts, `.notdef' will be moved into    */
+  /*    the glyph ID~0 position, and whatever was there will be moved to   */
+  /*    the position `.notdef' had.  For Type~1 fonts, if there is no      */
+  /*    `.notdef' glyph at all, then one will be created at index~0 and    */
+  /*    whatever was there will be moved to the last index -- Type~42      */
+  /*    fonts are considered invalid under this condition.                 */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt )
+  FT_Get_Char_Index( FT_Face   face,
+                     FT_ULong  charcode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_First_Char                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function is used to return the first character code in the    */
+  /*    current charmap of a given face.  It also returns the              */
+  /*    corresponding glyph index.                                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face    :: A handle to the source face object.                     */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    agindex :: Glyph index of first character code.  0~if charmap is   */
+  /*               empty.                                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The charmap's first character code.                                */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You should use this function with @FT_Get_Next_Char to be able to  */
+  /*    parse all character codes available in a given charmap.  The code  */
+  /*    should look like this:                                             */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      FT_ULong  charcode;                                              */
+  /*      FT_UInt   gindex;                                                */
+  /*                                                                       */
+  /*                                                                       */
+  /*      charcode = FT_Get_First_Char( face, &gindex );                   */
+  /*      while ( gindex != 0 )                                            */
+  /*      {                                                                */
+  /*        ... do something with (charcode,gindex) pair ...               */
+  /*                                                                       */
+  /*        charcode = FT_Get_Next_Char( face, charcode, &gindex );        */
+  /*      }                                                                */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    Note that `*agindex' is set to~0 if the charmap is empty.  The     */
+  /*    result itself can be~0 in two cases: if the charmap is empty or    */
+  /*    if the value~0 is the first valid character code.                  */
+  /*                                                                       */
+  FT_EXPORT( FT_ULong )
+  FT_Get_First_Char( FT_Face   face,
+                     FT_UInt  *agindex );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Next_Char                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function is used to return the next character code in the     */
+  /*    current charmap of a given face following the value `char_code',   */
+  /*    as well as the corresponding glyph index.                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face      :: A handle to the source face object.                   */
+  /*    char_code :: The starting character code.                          */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    agindex   :: Glyph index of next character code.  0~if charmap     */
+  /*                 is empty.                                             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The charmap's next character code.                                 */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You should use this function with @FT_Get_First_Char to walk       */
+  /*    over all character codes available in a given charmap.  See the    */
+  /*    note for this function for a simple code example.                  */
+  /*                                                                       */
+  /*    Note that `*agindex' is set to~0 when there are no more codes in   */
+  /*    the charmap.                                                       */
+  /*                                                                       */
+  FT_EXPORT( FT_ULong )
+  FT_Get_Next_Char( FT_Face    face,
+                    FT_ULong   char_code,
+                    FT_UInt   *agindex );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Name_Index                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the glyph index of a given glyph name.  This function uses  */
+  /*    driver specific objects to do the translation.                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face       :: A handle to the source face object.                  */
+  /*                                                                       */
+  /*    glyph_name :: The glyph name.                                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The glyph index.  0~means `undefined character code'.              */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt )
+  FT_Get_Name_Index( FT_Face     face,
+                     FT_String*  glyph_name );
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_SUBGLYPH_FLAG_XXX
+   *
+   * @description:
+   *   A list of constants used to describe subglyphs.  Please refer to the
+   *   TrueType specification for the meaning of the various flags.
+   *
+   * @values:
+   *   FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS ::
+   *   FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES ::
+   *   FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID ::
+   *   FT_SUBGLYPH_FLAG_SCALE ::
+   *   FT_SUBGLYPH_FLAG_XY_SCALE ::
+   *   FT_SUBGLYPH_FLAG_2X2 ::
+   *   FT_SUBGLYPH_FLAG_USE_MY_METRICS ::
+   *
+   */
+#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
+#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
+#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
+#define FT_SUBGLYPH_FLAG_SCALE                   8
+#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
+#define FT_SUBGLYPH_FLAG_2X2                  0x80
+#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
+
+
+  /*************************************************************************
+   *
+   * @func:
+   *   FT_Get_SubGlyph_Info
+   *
+   * @description:
+   *   Retrieve a description of a given subglyph.  Only use it if
+   *   `glyph->format' is @FT_GLYPH_FORMAT_COMPOSITE; an error is
+   *   returned otherwise.
+   *
+   * @input:
+   *   glyph ::
+   *     The source glyph slot.
+   *
+   *   sub_index ::
+   *     The index of the subglyph.  Must be less than
+   *     `glyph->num_subglyphs'.
+   *
+   * @output:
+   *   p_index ::
+   *     The glyph index of the subglyph.
+   *
+   *   p_flags ::
+   *     The subglyph flags, see @FT_SUBGLYPH_FLAG_XXX.
+   *
+   *   p_arg1 ::
+   *     The subglyph's first argument (if any).
+   *
+   *   p_arg2 ::
+   *     The subglyph's second argument (if any).
+   *
+   *   p_transform ::
+   *     The subglyph transformation (if any).
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   The values of `*p_arg1', `*p_arg2', and `*p_transform' must be
+   *   interpreted depending on the flags returned in `*p_flags'.  See the
+   *   TrueType specification for details.
+   *
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_SubGlyph_Info( FT_GlyphSlot  glyph,
+                        FT_UInt       sub_index,
+                        FT_Int       *p_index,
+                        FT_UInt      *p_flags,
+                        FT_Int       *p_arg1,
+                        FT_Int       *p_arg2,
+                        FT_Matrix    *p_transform );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_FSTYPE_XXX                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of bit flags used in the `fsType' field of the OS/2 table   */
+  /*    in a TrueType or OpenType font and the `FSType' entry in a         */
+  /*    PostScript font.  These bit flags are returned by                  */
+  /*    @FT_Get_FSType_Flags; they inform client applications of embedding */
+  /*    and subsetting restrictions associated with a font.                */
+  /*                                                                       */
+  /*    See http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf for  */
+  /*    more details.                                                      */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_FSTYPE_INSTALLABLE_EMBEDDING ::                                 */
+  /*      Fonts with no fsType bit set may be embedded and permanently     */
+  /*      installed on the remote system by an application.                */
+  /*                                                                       */
+  /*    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING ::                          */
+  /*      Fonts that have only this bit set must not be modified, embedded */
+  /*      or exchanged in any manner without first obtaining permission of */
+  /*      the font software copyright owner.                               */
+  /*                                                                       */
+  /*    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING ::                           */
+  /*      If this bit is set, the font may be embedded and temporarily     */
+  /*      loaded on the remote system.  Documents containing Preview &     */
+  /*      Print fonts must be opened `read-only'; no edits can be applied  */
+  /*      to the document.                                                 */
+  /*                                                                       */
+  /*    FT_FSTYPE_EDITABLE_EMBEDDING ::                                    */
+  /*      If this bit is set, the font may be embedded but must only be    */
+  /*      installed temporarily on other systems.  In contrast to Preview  */
+  /*      & Print fonts, documents containing editable fonts may be opened */
+  /*      for reading, editing is permitted, and changes may be saved.     */
+  /*                                                                       */
+  /*    FT_FSTYPE_NO_SUBSETTING ::                                         */
+  /*      If this bit is set, the font may not be subsetted prior to       */
+  /*      embedding.                                                       */
+  /*                                                                       */
+  /*    FT_FSTYPE_BITMAP_EMBEDDING_ONLY ::                                 */
+  /*      If this bit is set, only bitmaps contained in the font may be    */
+  /*      embedded; no outline data may be embedded.  If there are no      */
+  /*      bitmaps available in the font, then the font is unembeddable.    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    While the fsType flags can indicate that a font may be embedded, a */
+  /*    license with the font vendor may be separately required to use the */
+  /*    font in this way.                                                  */
+  /*                                                                       */
+#define FT_FSTYPE_INSTALLABLE_EMBEDDING         0x0000
+#define FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING  0x0002
+#define FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING   0x0004
+#define FT_FSTYPE_EDITABLE_EMBEDDING            0x0008
+#define FT_FSTYPE_NO_SUBSETTING                 0x0100
+#define FT_FSTYPE_BITMAP_EMBEDDING_ONLY         0x0200
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_FSType_Flags                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the fsType flags for a font.                                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the source face object.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The fsType flags, @FT_FSTYPE_XXX.                                  */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Use this function rather than directly reading the `fs_type' field */
+  /*    in the @PS_FontInfoRec structure, which is only guaranteed to      */
+  /*    return the correct results for Type~1 fonts.                       */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.8                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_UShort )
+  FT_Get_FSType_Flags( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    glyph_variants                                                     */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Glyph Variants                                                     */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    The FreeType~2 interface to Unicode Ideographic Variation          */
+  /*    Sequences (IVS), using the SFNT cmap format~14.                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Many CJK characters have variant forms.  They are a sort of grey   */
+  /*    area somewhere between being totally irrelevant and semantically   */
+  /*    distinct; for this reason, the Unicode consortium decided to       */
+  /*    introduce Ideographic Variation Sequences (IVS), consisting of a   */
+  /*    Unicode base character and one of 240 variant selectors            */
+  /*    (U+E0100-U+E01EF), instead of further extending the already huge   */
+  /*    code range for CJK characters.                                     */
+  /*                                                                       */
+  /*    An IVS is registered and unique; for further details please refer  */
+  /*    to Unicode Technical Standard #37, the Ideographic Variation       */
+  /*    Database:                                                          */
+  /*                                                                       */
+  /*      http://www.unicode.org/reports/tr37/                             */
+  /*                                                                       */
+  /*    To date (November 2012), the character with the most variants is   */
+  /*    U+9089, having 31 such IVS.                                        */
+  /*                                                                       */
+  /*    Adobe and MS decided to support IVS with a new cmap subtable       */
+  /*    (format~14).  It is an odd subtable because it is not a mapping of */
+  /*    input code points to glyphs, but contains lists of all variants    */
+  /*    supported by the font.                                             */
+  /*                                                                       */
+  /*    A variant may be either `default' or `non-default'.  A default     */
+  /*    variant is the one you will get for that code point if you look it */
+  /*    up in the standard Unicode cmap.  A non-default variant is a       */
+  /*    different glyph.                                                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_GetCharVariantIndex                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the glyph index of a given character code as modified by    */
+  /*    the variation selector.                                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face ::                                                            */
+  /*      A handle to the source face object.                              */
+  /*                                                                       */
+  /*    charcode ::                                                        */
+  /*      The character code point in Unicode.                             */
+  /*                                                                       */
+  /*    variantSelector ::                                                 */
+  /*      The Unicode code point of the variation selector.                */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The glyph index.  0~means either `undefined character code', or    */
+  /*    `undefined selector code', or `no variation selector cmap          */
+  /*    subtable', or `current CharMap is not Unicode'.                    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If you use FreeType to manipulate the contents of font files       */
+  /*    directly, be aware that the glyph index returned by this function  */
+  /*    doesn't always correspond to the internal indices used within      */
+  /*    the file.  This is done to ensure that value~0 always corresponds  */
+  /*    to the `missing glyph'.                                            */
+  /*                                                                       */
+  /*    This function is only meaningful if                                */
+  /*      a) the font has a variation selector cmap sub table,             */
+  /*    and                                                                */
+  /*      b) the current charmap has a Unicode encoding.                   */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.6                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt )
+  FT_Face_GetCharVariantIndex( FT_Face   face,
+                               FT_ULong  charcode,
+                               FT_ULong  variantSelector );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_GetCharVariantIsDefault                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Check whether this variant of this Unicode character is the one to */
+  /*    be found in the `cmap'.                                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face ::                                                            */
+  /*      A handle to the source face object.                              */
+  /*                                                                       */
+  /*    charcode ::                                                        */
+  /*      The character codepoint in Unicode.                              */
+  /*                                                                       */
+  /*    variantSelector ::                                                 */
+  /*      The Unicode codepoint of the variation selector.                 */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    1~if found in the standard (Unicode) cmap, 0~if found in the       */
+  /*    variation selector cmap, or -1 if it is not a variant.             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function is only meaningful if the font has a variation       */
+  /*    selector cmap subtable.                                            */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.6                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Int )
+  FT_Face_GetCharVariantIsDefault( FT_Face   face,
+                                   FT_ULong  charcode,
+                                   FT_ULong  variantSelector );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_GetVariantSelectors                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return a zero-terminated list of Unicode variant selectors found   */
+  /*    in the font.                                                       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face ::                                                            */
+  /*      A handle to the source face object.                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A pointer to an array of selector code points, or NULL if there is */
+  /*    no valid variant selector cmap subtable.                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The last item in the array is~0; the array is owned by the         */
+  /*    @FT_Face object but can be overwritten or released on the next     */
+  /*    call to a FreeType function.                                       */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.6                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt32* )
+  FT_Face_GetVariantSelectors( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_GetVariantsOfChar                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return a zero-terminated list of Unicode variant selectors found   */
+  /*    for the specified character code.                                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face ::                                                            */
+  /*      A handle to the source face object.                              */
+  /*                                                                       */
+  /*    charcode ::                                                        */
+  /*      The character codepoint in Unicode.                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A pointer to an array of variant selector code points that are     */
+  /*    active for the given character, or NULL if the corresponding list  */
+  /*    is empty.                                                          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The last item in the array is~0; the array is owned by the         */
+  /*    @FT_Face object but can be overwritten or released on the next     */
+  /*    call to a FreeType function.                                       */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.6                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt32* )
+  FT_Face_GetVariantsOfChar( FT_Face   face,
+                             FT_ULong  charcode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_GetCharsOfVariant                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return a zero-terminated list of Unicode character codes found for */
+  /*    the specified variant selector.                                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face ::                                                            */
+  /*      A handle to the source face object.                              */
+  /*                                                                       */
+  /*    variantSelector ::                                                 */
+  /*      The variant selector code point in Unicode.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A list of all the code points that are specified by this selector  */
+  /*    (both default and non-default codes are returned) or NULL if there */
+  /*    is no valid cmap or the variant selector is invalid.               */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The last item in the array is~0; the array is owned by the         */
+  /*    @FT_Face object but can be overwritten or released on the next     */
+  /*    call to a FreeType function.                                       */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.6                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt32* )
+  FT_Face_GetCharsOfVariant( FT_Face   face,
+                             FT_ULong  variantSelector );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    computations                                                       */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Computations                                                       */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Crunching fixed numbers and vectors.                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains various functions used to perform            */
+  /*    computations on 16.16 fixed-float numbers or 2d vectors.           */
+  /*                                                                       */
+  /* <Order>                                                               */
+  /*    FT_MulDiv                                                          */
+  /*    FT_MulFix                                                          */
+  /*    FT_DivFix                                                          */
+  /*    FT_RoundFix                                                        */
+  /*    FT_CeilFix                                                         */
+  /*    FT_FloorFix                                                        */
+  /*    FT_Vector_Transform                                                */
+  /*    FT_Matrix_Multiply                                                 */
+  /*    FT_Matrix_Invert                                                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_MulDiv                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to perform the computation `(a*b)/c'   */
+  /*    with maximum accuracy (it uses a 64-bit intermediate integer       */
+  /*    whenever necessary).                                               */
+  /*                                                                       */
+  /*    This function isn't necessarily as fast as some processor specific */
+  /*    operations, but is at least completely portable.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The first multiplier.                                         */
+  /*    b :: The second multiplier.                                        */
+  /*    c :: The divisor.                                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `(a*b)/c'.  This function never traps when trying to */
+  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
+  /*    on the signs of `a' and `b'.                                       */
+  /*                                                                       */
+  FT_EXPORT( FT_Long )
+  FT_MulDiv( FT_Long  a,
+             FT_Long  b,
+             FT_Long  c );
+
+
+  /* */
+
+  /* The following #if 0 ... #endif is for the documentation formatter, */
+  /* hiding the internal `FT_MULFIX_INLINED' macro.                     */
+
+#if 0
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_MulFix                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to perform the computation             */
+  /*    `(a*b)/0x10000' with maximum accuracy.  Most of the time this is   */
+  /*    used to multiply a given value by a 16.16 fixed-point factor.      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The first multiplier.                                         */
+  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
+  /*         possible (see note below).                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `(a*b)/0x10000'.                                     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function has been optimized for the case where the absolute   */
+  /*    value of `a' is less than 2048, and `b' is a 16.16 scaling factor. */
+  /*    As this happens mainly when scaling from notional units to         */
+  /*    fractional pixels in FreeType, it resulted in noticeable speed     */
+  /*    improvements between versions 2.x and 1.x.                         */
+  /*                                                                       */
+  /*    As a conclusion, always try to place a 16.16 factor as the         */
+  /*    _second_ argument of this function; this can make a great          */
+  /*    difference.                                                        */
+  /*                                                                       */
+  FT_EXPORT( FT_Long )
+  FT_MulFix( FT_Long  a,
+             FT_Long  b );
+
+  /* */
+#endif
+
+#ifdef FT_MULFIX_INLINED
+#define FT_MulFix( a, b )  FT_MULFIX_INLINED( a, b )
+#else
+  FT_EXPORT( FT_Long )
+  FT_MulFix( FT_Long  a,
+             FT_Long  b );
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_DivFix                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to perform the computation             */
+  /*    `(a*0x10000)/b' with maximum accuracy.  Most of the time, this is  */
+  /*    used to divide a given value by a 16.16 fixed-point factor.        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The first multiplier.                                         */
+  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
+  /*         possible (see note below).                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `(a*0x10000)/b'.                                     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The optimization for FT_DivFix() is simple: If (a~<<~16) fits in   */
+  /*    32~bits, then the division is computed directly.  Otherwise, we    */
+  /*    use a specialized version of @FT_MulDiv.                           */
+  /*                                                                       */
+  FT_EXPORT( FT_Long )
+  FT_DivFix( FT_Long  a,
+             FT_Long  b );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_RoundFix                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to round a 16.16 fixed number.         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The number to be rounded.                                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `(a + 0x8000) & -0x10000'.                           */
+  /*                                                                       */
+  FT_EXPORT( FT_Fixed )
+  FT_RoundFix( FT_Fixed  a );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_CeilFix                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to compute the ceiling function of a   */
+  /*    16.16 fixed number.                                                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The number for which the ceiling function is to be computed.  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `(a + 0x10000 - 1) & -0x10000'.                      */
+  /*                                                                       */
+  FT_EXPORT( FT_Fixed )
+  FT_CeilFix( FT_Fixed  a );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_FloorFix                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to compute the floor function of a     */
+  /*    16.16 fixed number.                                                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The number for which the floor function is to be computed.    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `a & -0x10000'.                                      */
+  /*                                                                       */
+  FT_EXPORT( FT_Fixed )
+  FT_FloorFix( FT_Fixed  a );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Vector_Transform                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Transform a single vector through a 2x2 matrix.                    */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    vector :: The target vector to transform.                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    matrix :: A pointer to the source 2x2 matrix.                      */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The result is undefined if either `vector' or `matrix' is invalid. */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Vector_Transform( FT_Vector*        vec,
+                       const FT_Matrix*  matrix );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    version                                                            */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    FreeType Version                                                   */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Functions and macros related to FreeType versions.                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Note that those functions and macros are of limited use because    */
+  /*    even a new release of FreeType with only documentation changes     */
+  /*    increases the version number.                                      */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @enum:
+   *   FREETYPE_XXX
+   *
+   * @description:
+   *   These three macros identify the FreeType source code version.
+   *   Use @FT_Library_Version to access them at runtime.
+   *
+   * @values:
+   *   FREETYPE_MAJOR :: The major version number.
+   *   FREETYPE_MINOR :: The minor version number.
+   *   FREETYPE_PATCH :: The patch level.
+   *
+   * @note:
+   *   The version number of FreeType if built as a dynamic link library
+   *   with the `libtool' package is _not_ controlled by these three
+   *   macros.
+   *
+   */
+#define FREETYPE_MAJOR  2
+#define FREETYPE_MINOR  5
+#define FREETYPE_PATCH  2
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Library_Version                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the version of the FreeType library being used.  This is    */
+  /*    useful when dynamically linking to the library, since one cannot   */
+  /*    use the macros @FREETYPE_MAJOR, @FREETYPE_MINOR, and               */
+  /*    @FREETYPE_PATCH.                                                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A source library handle.                                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    amajor  :: The major version number.                               */
+  /*                                                                       */
+  /*    aminor  :: The minor version number.                               */
+  /*                                                                       */
+  /*    apatch  :: The patch version number.                               */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The reason why this function takes a `library' argument is because */
+  /*    certain programs implement library initialization in a custom way  */
+  /*    that doesn't use @FT_Init_FreeType.                                */
+  /*                                                                       */
+  /*    In such cases, the library version might not be available before   */
+  /*    the library object has been created.                               */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Library_Version( FT_Library   library,
+                      FT_Int      *amajor,
+                      FT_Int      *aminor,
+                      FT_Int      *apatch );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_CheckTrueTypePatents                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Parse all bytecode instructions of a TrueType font file to check   */
+  /*    whether any of the patented opcodes are used.  This is only useful */
+  /*    if you want to be able to use the unpatented hinter with           */
+  /*    fonts that do *not* use these opcodes.                             */
+  /*                                                                       */
+  /*    Note that this function parses *all* glyph instructions in the     */
+  /*    font file, which may be slow.                                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A face handle.                                             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    1~if this is a TrueType font that uses one of the patented         */
+  /*    opcodes, 0~otherwise.                                              */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Since May 2010, TrueType hinting is no longer patented.            */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.5                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Bool )
+  FT_Face_CheckTrueTypePatents( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_SetUnpatentedHinting                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Enable or disable the unpatented hinter for a given face.          */
+  /*    Only enable it if you have determined that the face doesn't        */
+  /*    use any patented opcodes (see @FT_Face_CheckTrueTypePatents).      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face  :: A face handle.                                            */
+  /*                                                                       */
+  /*    value :: New boolean setting.                                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The old setting value.  This will always be false if this is not   */
+  /*    an SFNT font, or if the unpatented hinter is not compiled in this  */
+  /*    instance of the library.                                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Since May 2010, TrueType hinting is no longer patented.            */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.5                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Bool )
+  FT_Face_SetUnpatentedHinting( FT_Face  face,
+                                FT_Bool  value );
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FREETYPE_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/freetype.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftadvanc.h
===================================================================
--- lib/3rdparty/freetype/include/ftadvanc.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftadvanc.h	(rÃ©vision 62573)
@@ -0,0 +1,182 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftadvanc.h                                                             */
+/*                                                                         */
+/*    Quick computation of advance widths (specification only).            */
+/*                                                                         */
+/*  Copyright 2008, 2013 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTADVANC_H__
+#define __FTADVANC_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /**************************************************************************
+   *
+   * @section:
+   *   quick_advance
+   *
+   * @title:
+   *   Quick retrieval of advance values
+   *
+   * @abstract:
+   *   Retrieve horizontal and vertical advance values without processing
+   *   glyph outlines, if possible.
+   *
+   * @description:
+   *   This section contains functions to quickly extract advance values
+   *   without handling glyph outlines, if possible.
+   */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Const>                                                               */
+  /*    FT_ADVANCE_FLAG_FAST_ONLY                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A bit-flag to be OR-ed with the `flags' parameter of the           */
+  /*    @FT_Get_Advance and @FT_Get_Advances functions.                    */
+  /*                                                                       */
+  /*    If set, it indicates that you want these functions to fail if the  */
+  /*    corresponding hinting mode or font driver doesn't allow for very   */
+  /*    quick advance computation.                                         */
+  /*                                                                       */
+  /*    Typically, glyphs that are either unscaled, unhinted, bitmapped,   */
+  /*    or light-hinted can have their advance width computed very         */
+  /*    quickly.                                                           */
+  /*                                                                       */
+  /*    Normal and bytecode hinted modes that require loading, scaling,    */
+  /*    and hinting of the glyph outline, are extremely slow by            */
+  /*    comparison.                                                        */
+  /*                                                                       */
+#define FT_ADVANCE_FLAG_FAST_ONLY  0x20000000UL
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Advance                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the advance value of a given glyph outline in an          */
+  /*    @FT_Face.                                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face       :: The source @FT_Face handle.                          */
+  /*                                                                       */
+  /*    gindex     :: The glyph index.                                     */
+  /*                                                                       */
+  /*    load_flags :: A set of bit flags similar to those used when        */
+  /*                  calling @FT_Load_Glyph, used to determine what kind  */
+  /*                  of advances you need.                                */
+  /* <Output>                                                              */
+  /*    padvance :: The advance value.  If scaling is performed (based on  */
+  /*                the value of `load_flags'), the advance value is in    */
+  /*                16.16 format.  Otherwise, it is in font units.         */
+  /*                                                                       */
+  /*                If @FT_LOAD_VERTICAL_LAYOUT is set, this is the        */
+  /*                vertical advance corresponding to a vertical layout.   */
+  /*                Otherwise, it is the horizontal advance in a           */
+  /*                horizontal layout.                                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function may fail if you use @FT_ADVANCE_FLAG_FAST_ONLY and   */
+  /*    if the corresponding font backend doesn't have a quick way to      */
+  /*    retrieve the advances.                                             */
+  /*                                                                       */
+  /*    A scaled advance is returned in 16.16 format but isn't transformed */
+  /*    by the affine transformation specified by @FT_Set_Transform.       */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Advance( FT_Face    face,
+                  FT_UInt    gindex,
+                  FT_Int32   load_flags,
+                  FT_Fixed  *padvance );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Advances                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the advance values of several glyph outlines in an        */
+  /*    @FT_Face.                                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face        :: The source @FT_Face handle.                         */
+  /*                                                                       */
+  /*    start       :: The first glyph index.                              */
+  /*                                                                       */
+  /*    count       :: The number of advance values you want to retrieve.  */
+  /*                                                                       */
+  /*    load_flags  :: A set of bit flags similar to those used when       */
+  /*                   calling @FT_Load_Glyph.                             */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    padvance :: The advance values.  This array, to be provided by the */
+  /*                caller, must contain at least `count' elements.        */
+  /*                                                                       */
+  /*                If scaling is performed (based on the value of         */
+  /*                `load_flags'), the advance values are in 16.16 format. */
+  /*                Otherwise, they are in font units.                     */
+  /*                                                                       */
+  /*                If @FT_LOAD_VERTICAL_LAYOUT is set, these are the      */
+  /*                vertical advances corresponding to a vertical layout.  */
+  /*                Otherwise, they are the horizontal advances in a       */
+  /*                horizontal layout.                                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function may fail if you use @FT_ADVANCE_FLAG_FAST_ONLY and   */
+  /*    if the corresponding font backend doesn't have a quick way to      */
+  /*    retrieve the advances.                                             */
+  /*                                                                       */
+  /*    Scaled advances are returned in 16.16 format but aren't            */
+  /*    transformed by the affine transformation specified by              */
+  /*    @FT_Set_Transform.                                                 */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Advances( FT_Face    face,
+                   FT_UInt    start,
+                   FT_UInt    count,
+                   FT_Int32   load_flags,
+                   FT_Fixed  *padvances );
+
+/* */
+
+
+FT_END_HEADER
+
+#endif /* __FTADVANC_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftadvanc.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftautoh.h
===================================================================
--- lib/3rdparty/freetype/include/ftautoh.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftautoh.h	(rÃ©vision 62573)
@@ -0,0 +1,357 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftautoh.h                                                              */
+/*                                                                         */
+/*    FreeType API for controlling the auto-hinter (specification only).   */
+/*                                                                         */
+/*  Copyright 2012, 2013 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTAUTOH_H__
+#define __FTAUTOH_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /**************************************************************************
+   *
+   * @section:
+   *   auto_hinter
+   *
+   * @title:
+   *   The auto-hinter
+   *
+   * @abstract:
+   *   Controlling the auto-hinting module.
+   *
+   * @description:
+   *   While FreeType's auto-hinter doesn't expose API functions by itself,
+   *   it is possible to control its behaviour with @FT_Property_Set and
+   *   @FT_Property_Get.  The following lists the available properties
+   *   together with the necessary macros and structures.
+   *
+   *   Note that the auto-hinter's module name is `autofitter' for
+   *   historical reasons.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   glyph-to-script-map
+   *
+   * @description:
+   *   *Experimental* *only*
+   *
+   *   The auto-hinter provides various script modules to hint glyphs.
+   *   Examples of supported scripts are Latin or CJK.  Before a glyph is
+   *   auto-hinted, the Unicode character map of the font gets examined, and
+   *   the script is then determined based on Unicode character ranges, see
+   *   below.
+   *
+   *   OpenType fonts, however, often provide much more glyphs than
+   *   character codes (small caps, superscripts, ligatures, swashes, etc.),
+   *   to be controlled by so-called `features'.  Handling OpenType features
+   *   can be quite complicated and thus needs a separate library on top of
+   *   FreeType.
+   *
+   *   The mapping between glyph indices and scripts (in the auto-hinter
+   *   sense, see the @FT_AUTOHINTER_SCRIPT_XXX values) is stored as an
+   *   array with `num_glyphs' elements, as found in the font's @FT_Face
+   *   structure.  The `glyph-to-script-map' property returns a pointer to
+   *   this array, which can be modified as needed.  Note that the
+   *   modification should happen before the first glyph gets processed by
+   *   the auto-hinter so that the global analysis of the font shapes
+   *   actually uses the modified mapping.
+   *
+   *   The following example code demonstrates how to access it (omitting
+   *   the error handling).
+   *
+   *   {
+   *     FT_Library                library;
+   *     FT_Face                   face;
+   *     FT_Prop_GlyphToScriptMap  prop;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *     FT_New_Face( library, "foo.ttf", 0, &face );
+   *
+   *     prop.face = face;
+   *
+   *     FT_Property_Get( library, "autofitter",
+   *                               "glyph-to-script-map", &prop );
+   *
+   *     // adjust `prop.map' as needed right here
+   *
+   *     FT_Load_Glyph( face, ..., FT_LOAD_FORCE_AUTOHINT );
+   *   }
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @enum:
+   *   FT_AUTOHINTER_SCRIPT_XXX
+   *
+   * @description:
+   *   *Experimental* *only*
+   *
+   *   A list of constants used for the @glyph-to-script-map property to
+   *   specify the script submodule the auto-hinter should use for hinting a
+   *   particular glyph.
+   *
+   * @values:
+   *   FT_AUTOHINTER_SCRIPT_NONE ::
+   *     Don't auto-hint this glyph.
+   *
+   *   FT_AUTOHINTER_SCRIPT_LATIN ::
+   *     Apply the latin auto-hinter.  For the auto-hinter, `latin' is a
+   *     very broad term, including Cyrillic and Greek also since characters
+   *     from those scripts share the same design constraints.
+   *
+   *     By default, characters from the following Unicode ranges are
+   *     assigned to this submodule.
+   *
+   *     {
+   *       U+0020 - U+007F  // Basic Latin (no control characters)
+   *       U+00A0 - U+00FF  // Latin-1 Supplement (no control characters)
+   *       U+0100 - U+017F  // Latin Extended-A
+   *       U+0180 - U+024F  // Latin Extended-B
+   *       U+0250 - U+02AF  // IPA Extensions
+   *       U+02B0 - U+02FF  // Spacing Modifier Letters
+   *       U+0300 - U+036F  // Combining Diacritical Marks
+   *       U+0370 - U+03FF  // Greek and Coptic
+   *       U+0400 - U+04FF  // Cyrillic
+   *       U+0500 - U+052F  // Cyrillic Supplement
+   *       U+1D00 - U+1D7F  // Phonetic Extensions
+   *       U+1D80 - U+1DBF  // Phonetic Extensions Supplement
+   *       U+1DC0 - U+1DFF  // Combining Diacritical Marks Supplement
+   *       U+1E00 - U+1EFF  // Latin Extended Additional
+   *       U+1F00 - U+1FFF  // Greek Extended
+   *       U+2000 - U+206F  // General Punctuation
+   *       U+2070 - U+209F  // Superscripts and Subscripts
+   *       U+20A0 - U+20CF  // Currency Symbols
+   *       U+2150 - U+218F  // Number Forms
+   *       U+2460 - U+24FF  // Enclosed Alphanumerics
+   *       U+2C60 - U+2C7F  // Latin Extended-C
+   *       U+2DE0 - U+2DFF  // Cyrillic Extended-A
+   *       U+2E00 - U+2E7F  // Supplemental Punctuation
+   *       U+A640 - U+A69F  // Cyrillic Extended-B
+   *       U+A720 - U+A7FF  // Latin Extended-D
+   *       U+FB00 - U+FB06  // Alphab. Present. Forms (Latin Ligatures)
+   *      U+1D400 - U+1D7FF // Mathematical Alphanumeric Symbols
+   *      U+1F100 - U+1F1FF // Enclosed Alphanumeric Supplement
+   *     }
+   *
+   *   FT_AUTOHINTER_SCRIPT_CJK ::
+   *     Apply the CJK auto-hinter, covering Chinese, Japanese, Korean, old
+   *     Vietnamese, and some other scripts.
+   *
+   *     By default, characters from the following Unicode ranges are
+   *     assigned to this submodule.
+   *
+   *     {
+   *       U+1100 - U+11FF  // Hangul Jamo
+   *       U+2E80 - U+2EFF  // CJK Radicals Supplement
+   *       U+2F00 - U+2FDF  // Kangxi Radicals
+   *       U+2FF0 - U+2FFF  // Ideographic Description Characters
+   *       U+3000 - U+303F  // CJK Symbols and Punctuation
+   *       U+3040 - U+309F  // Hiragana
+   *       U+30A0 - U+30FF  // Katakana
+   *       U+3100 - U+312F  // Bopomofo
+   *       U+3130 - U+318F  // Hangul Compatibility Jamo
+   *       U+3190 - U+319F  // Kanbun
+   *       U+31A0 - U+31BF  // Bopomofo Extended
+   *       U+31C0 - U+31EF  // CJK Strokes
+   *       U+31F0 - U+31FF  // Katakana Phonetic Extensions
+   *       U+3200 - U+32FF  // Enclosed CJK Letters and Months
+   *       U+3300 - U+33FF  // CJK Compatibility
+   *       U+3400 - U+4DBF  // CJK Unified Ideographs Extension A
+   *       U+4DC0 - U+4DFF  // Yijing Hexagram Symbols
+   *       U+4E00 - U+9FFF  // CJK Unified Ideographs
+   *       U+A960 - U+A97F  // Hangul Jamo Extended-A
+   *       U+AC00 - U+D7AF  // Hangul Syllables
+   *       U+D7B0 - U+D7FF  // Hangul Jamo Extended-B
+   *       U+F900 - U+FAFF  // CJK Compatibility Ideographs
+   *       U+FE10 - U+FE1F  // Vertical forms
+   *       U+FE30 - U+FE4F  // CJK Compatibility Forms
+   *       U+FF00 - U+FFEF  // Halfwidth and Fullwidth Forms
+   *      U+1B000 - U+1B0FF // Kana Supplement
+   *      U+1D300 - U+1D35F // Tai Xuan Hing Symbols
+   *      U+1F200 - U+1F2FF // Enclosed Ideographic Supplement
+   *      U+20000 - U+2A6DF // CJK Unified Ideographs Extension B
+   *      U+2A700 - U+2B73F // CJK Unified Ideographs Extension C
+   *      U+2B740 - U+2B81F // CJK Unified Ideographs Extension D
+   *      U+2F800 - U+2FA1F // CJK Compatibility Ideographs Supplement
+   *     }
+   *
+   *   FT_AUTOHINTER_SCRIPT_INDIC ::
+   *     Apply the indic auto-hinter, covering all major scripts from the
+   *     Indian sub-continent and some other related scripts like Thai, Lao,
+   *     or Tibetan.
+   *
+   *     By default, characters from the following Unicode ranges are
+   *     assigned to this submodule.
+   *
+   *     {
+   *       U+0900 - U+0DFF  // Indic Range
+   *       U+0F00 - U+0FFF  // Tibetan
+   *       U+1900 - U+194F  // Limbu
+   *       U+1B80 - U+1BBF  // Sundanese
+   *       U+1C80 - U+1CDF  // Meetei Mayak
+   *       U+A800 - U+A82F  // Syloti Nagri
+   *      U+11800 - U+118DF // Sharada
+   *     }
+   *
+   *     Note that currently Indic support is rudimentary only, missing blue
+   *     zone support.
+   *
+   */
+#define FT_AUTOHINTER_SCRIPT_NONE   0
+#define FT_AUTOHINTER_SCRIPT_LATIN  1
+#define FT_AUTOHINTER_SCRIPT_CJK    2
+#define FT_AUTOHINTER_SCRIPT_INDIC  3
+
+
+  /**************************************************************************
+   *
+   * @struct:
+   *   FT_Prop_GlyphToScriptMap
+   *
+   * @description:
+   *   *Experimental* *only*
+   *
+   *   The data exchange structure for the @glyph-to-script-map property.
+   *
+   */
+   typedef struct  FT_Prop_GlyphToScriptMap_
+   {
+     FT_Face   face;
+     FT_Byte*  map;
+
+   } FT_Prop_GlyphToScriptMap;
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   fallback-script
+   *
+   * @description:
+   *   *Experimental* *only*
+   *
+   *   If no auto-hinter script module can be assigned to a glyph, a
+   *   fallback script gets assigned to it (see also the
+   *   @glyph-to-script-map property).  By default, this is
+   *   @FT_AUTOHINTER_SCRIPT_CJK.  Using the `fallback-script' property,
+   *   this fallback value can be changed.
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_UInt     fallback_script = FT_AUTOHINTER_SCRIPT_NONE;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "autofitter",
+   *                               "fallback-script", &fallback_script );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   *   It's important to use the right timing for changing this value: The
+   *   creation of the glyph-to-script map that eventually uses the
+   *   fallback script value gets triggered either by setting or reading a
+   *   face-specific property like @glyph-to-script-map, or by auto-hinting
+   *   any glyph from that face.  In particular, if you have already created
+   *   an @FT_Face structure but not loaded any glyph (using the
+   *   auto-hinter), a change of the fallback glyph will affect this face.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   increase-x-height
+   *
+   * @description:
+   *   For ppem values in the range 6~<= ppem <= `increase-x-height', round
+   *   up the font's x~height much more often than normally.  If the value
+   *   is set to~0, which is the default, this feature is switched off.  Use
+   *   this property to improve the legibility of small font sizes if
+   *   necessary.
+   *
+   *   {
+   *     FT_Library               library;
+   *     FT_Face                  face;
+   *     FT_Prop_IncreaseXHeight  prop;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *     FT_New_Face( library, "foo.ttf", 0, &face );
+   *     FT_Set_Char_Size( face, 10 * 64, 0, 72, 0 );
+   *
+   *     prop.face  = face;
+   *     prop.limit = 14;
+   *
+   *     FT_Property_Set( library, "autofitter",
+   *                               "increase-x-height", &prop );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   *   Set this value right after calling @FT_Set_Char_Size, but before
+   *   loading any glyph (using the auto-hinter).
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @struct:
+   *   FT_Prop_IncreaseXHeight
+   *
+   * @description:
+   *   The data exchange structure for the @increase-x-height property.
+   *
+   */
+   typedef struct  FT_Prop_IncreaseXHeight_
+   {
+     FT_Face  face;
+     FT_UInt  limit;
+
+   } FT_Prop_IncreaseXHeight;
+
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTAUTOH_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftautoh.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftbbox.h
===================================================================
--- lib/3rdparty/freetype/include/ftbbox.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftbbox.h	(rÃ©vision 62573)
@@ -0,0 +1,102 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftbbox.h                                                               */
+/*                                                                         */
+/*    FreeType exact bbox computation (specification).                     */
+/*                                                                         */
+/*  Copyright 1996-2001, 2003, 2007, 2011, 2013 by                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This component has a _single_ role: to compute exact outline bounding */
+  /* boxes.                                                                */
+  /*                                                                       */
+  /* It is separated from the rest of the engine for various technical     */
+  /* reasons.  It may well be integrated in `ftoutln' later.               */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTBBOX_H__
+#define __FTBBOX_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    outline_processing                                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Get_BBox                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Compute the exact bounding box of an outline.  This is slower      */
+  /*    than computing the control box.  However, it uses an advanced      */
+  /*    algorithm that returns _very_ quickly when the two boxes           */
+  /*    coincide.  Otherwise, the outline BÃ©zier arcs are traversed to     */
+  /*    extract their extrema.                                             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    outline :: A pointer to the source outline.                        */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    abbox   :: The outline's exact bounding box.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If the font is tricky and the glyph has been loaded with           */
+  /*    @FT_LOAD_NO_SCALE, the resulting BBox is meaningless.  To get      */
+  /*    reasonable values for the BBox it is necessary to load the glyph   */
+  /*    at a large ppem value (so that the hinting instructions can        */
+  /*    properly shift and scale the subglyphs), then extracting the BBox, */
+  /*    which can be eventually converted back to font units.              */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Get_BBox( FT_Outline*  outline,
+                       FT_BBox     *abbox );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTBBOX_H__ */
+
+
+/* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftbbox.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftbdf.h
===================================================================
--- lib/3rdparty/freetype/include/ftbdf.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftbdf.h	(rÃ©vision 62573)
@@ -0,0 +1,209 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftbdf.h                                                                */
+/*                                                                         */
+/*    FreeType API for accessing BDF-specific strings (specification).     */
+/*                                                                         */
+/*  Copyright 2002, 2003, 2004, 2006, 2009 by                              */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTBDF_H__
+#define __FTBDF_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    bdf_fonts                                                          */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    BDF and PCF Files                                                  */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    BDF and PCF specific API.                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of functions specific to BDF */
+  /*    and PCF fonts.                                                     */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /**********************************************************************
+   *
+   * @enum:
+   *    FT_PropertyType
+   *
+   * @description:
+   *    A list of BDF property types.
+   *
+   * @values:
+   *    BDF_PROPERTY_TYPE_NONE ::
+   *      Value~0 is used to indicate a missing property.
+   *
+   *    BDF_PROPERTY_TYPE_ATOM ::
+   *      Property is a string atom.
+   *
+   *    BDF_PROPERTY_TYPE_INTEGER ::
+   *      Property is a 32-bit signed integer.
+   *
+   *    BDF_PROPERTY_TYPE_CARDINAL ::
+   *      Property is a 32-bit unsigned integer.
+   */
+  typedef enum  BDF_PropertyType_
+  {
+    BDF_PROPERTY_TYPE_NONE     = 0,
+    BDF_PROPERTY_TYPE_ATOM     = 1,
+    BDF_PROPERTY_TYPE_INTEGER  = 2,
+    BDF_PROPERTY_TYPE_CARDINAL = 3
+
+  } BDF_PropertyType;
+
+
+  /**********************************************************************
+   *
+   * @type:
+   *    BDF_Property
+   *
+   * @description:
+   *    A handle to a @BDF_PropertyRec structure to model a given
+   *    BDF/PCF property.
+   */
+  typedef struct BDF_PropertyRec_*  BDF_Property;
+
+
+ /**********************************************************************
+  *
+  * @struct:
+  *    BDF_PropertyRec
+  *
+  * @description:
+  *    This structure models a given BDF/PCF property.
+  *
+  * @fields:
+  *    type ::
+  *      The property type.
+  *
+  *    u.atom ::
+  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.
+  *
+  *    u.integer ::
+  *      A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
+  *
+  *    u.cardinal ::
+  *      An unsigned integer, if type is @BDF_PROPERTY_TYPE_CARDINAL.
+  */
+  typedef struct  BDF_PropertyRec_
+  {
+    BDF_PropertyType  type;
+    union {
+      const char*     atom;
+      FT_Int32        integer;
+      FT_UInt32       cardinal;
+
+    } u;
+
+  } BDF_PropertyRec;
+
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_Get_BDF_Charset_ID
+  *
+  * @description:
+  *    Retrieve a BDF font character set identity, according to
+  *    the BDF specification.
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  * @output:
+  *    acharset_encoding ::
+  *       Charset encoding, as a C~string, owned by the face.
+  *
+  *    acharset_registry ::
+  *       Charset registry, as a C~string, owned by the face.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   This function only works with BDF faces, returning an error otherwise.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Get_BDF_Charset_ID( FT_Face       face,
+                         const char*  *acharset_encoding,
+                         const char*  *acharset_registry );
+
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_Get_BDF_Property
+  *
+  * @description:
+  *    Retrieve a BDF property from a BDF or PCF font file.
+  *
+  * @input:
+  *    face :: A handle to the input face.
+  *
+  *    name :: The property name.
+  *
+  * @output:
+  *    aproperty :: The property.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   This function works with BDF _and_ PCF fonts.  It returns an error
+  *   otherwise.  It also returns an error if the property is not in the
+  *   font.
+  *
+  *   A `property' is a either key-value pair within the STARTPROPERTIES
+  *   ... ENDPROPERTIES block of a BDF font or a key-value pair from the
+  *   `info->props' array within a `FontRec' structure of a PCF font.
+  *
+  *   Integer properties are always stored as `signed' within PCF fonts;
+  *   consequently, @BDF_PROPERTY_TYPE_CARDINAL is a possible return value
+  *   for BDF fonts only.
+  *
+  *   In case of error, `aproperty->type' is always set to
+  *   @BDF_PROPERTY_TYPE_NONE.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Get_BDF_Property( FT_Face           face,
+                       const char*       prop_name,
+                       BDF_PropertyRec  *aproperty );
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTBDF_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftbdf.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftbitmap.h
===================================================================
--- lib/3rdparty/freetype/include/ftbitmap.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftbitmap.h	(rÃ©vision 62573)
@@ -0,0 +1,227 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftbitmap.h                                                             */
+/*                                                                         */
+/*    FreeType utility functions for bitmaps (specification).              */
+/*                                                                         */
+/*  Copyright 2004-2006, 2008, 2013 by                                     */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTBITMAP_H__
+#define __FTBITMAP_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    bitmap_handling                                                    */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Bitmap Handling                                                    */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Handling FT_Bitmap objects.                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains functions for converting FT_Bitmap objects.  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Bitmap_New                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Initialize a pointer to an @FT_Bitmap structure.                   */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    abitmap :: A pointer to the bitmap structure.                      */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Bitmap_New( FT_Bitmap  *abitmap );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Bitmap_Copy                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Copy a bitmap into another one.                                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to a library object.                           */
+  /*                                                                       */
+  /*    source  :: A handle to the source bitmap.                          */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    target  :: A handle to the target bitmap.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Bitmap_Copy( FT_Library        library,
+                  const FT_Bitmap  *source,
+                  FT_Bitmap        *target);
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Bitmap_Embolden                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Embolden a bitmap.  The new bitmap will be about `xStrength'       */
+  /*    pixels wider and `yStrength' pixels higher.  The left and bottom   */
+  /*    borders are kept unchanged.                                        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library   :: A handle to a library object.                         */
+  /*                                                                       */
+  /*    xStrength :: How strong the glyph is emboldened horizontally.      */
+  /*                 Expressed in 26.6 pixel format.                       */
+  /*                                                                       */
+  /*    yStrength :: How strong the glyph is emboldened vertically.        */
+  /*                 Expressed in 26.6 pixel format.                       */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    bitmap    :: A handle to the target bitmap.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The current implementation restricts `xStrength' to be less than   */
+  /*    or equal to~8 if bitmap is of pixel_mode @FT_PIXEL_MODE_MONO.      */
+  /*                                                                       */
+  /*    If you want to embolden the bitmap owned by a @FT_GlyphSlotRec,    */
+  /*    you should call @FT_GlyphSlot_Own_Bitmap on the slot first.        */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Bitmap_Embolden( FT_Library  library,
+                      FT_Bitmap*  bitmap,
+                      FT_Pos      xStrength,
+                      FT_Pos      yStrength );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Bitmap_Convert                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, 8bpp or 32bpp */
+  /*    to a bitmap object with depth 8bpp, making the number of used      */
+  /*    bytes line (a.k.a. the `pitch') a multiple of `alignment'.         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library   :: A handle to a library object.                         */
+  /*                                                                       */
+  /*    source    :: The source bitmap.                                    */
+  /*                                                                       */
+  /*    alignment :: The pitch of the bitmap is a multiple of this         */
+  /*                 parameter.  Common values are 1, 2, or 4.             */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    target    :: The target bitmap.                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    It is possible to call @FT_Bitmap_Convert multiple times without   */
+  /*    calling @FT_Bitmap_Done (the memory is simply reallocated).        */
+  /*                                                                       */
+  /*    Use @FT_Bitmap_Done to finally remove the bitmap object.           */
+  /*                                                                       */
+  /*    The `library' argument is taken to have access to FreeType's       */
+  /*    memory handling functions.                                         */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Bitmap_Convert( FT_Library        library,
+                     const FT_Bitmap  *source,
+                     FT_Bitmap        *target,
+                     FT_Int            alignment );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_GlyphSlot_Own_Bitmap                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Make sure that a glyph slot owns `slot->bitmap'.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    slot :: The glyph slot.                                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function is to be used in combination with                    */
+  /*    @FT_Bitmap_Embolden.                                               */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_GlyphSlot_Own_Bitmap( FT_GlyphSlot  slot );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Bitmap_Done                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroy a bitmap object created with @FT_Bitmap_New.               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to a library object.                           */
+  /*                                                                       */
+  /*    bitmap  :: The bitmap object to be freed.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The `library' argument is taken to have access to FreeType's       */
+  /*    memory handling functions.                                         */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Bitmap_Done( FT_Library  library,
+                  FT_Bitmap  *bitmap );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTBITMAP_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftbitmap.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftbzip2.h
===================================================================
--- lib/3rdparty/freetype/include/ftbzip2.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftbzip2.h	(rÃ©vision 62573)
@@ -0,0 +1,102 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftbzip2.h                                                              */
+/*                                                                         */
+/*    Bzip2-compressed stream support.                                     */
+/*                                                                         */
+/*  Copyright 2010 by                                                      */
+/*  Joel Klinghed.                                                         */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTBZIP2_H__
+#define __FTBZIP2_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    bzip2                                                              */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    BZIP2 Streams                                                      */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Using bzip2-compressed font files.                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of Bzip2-specific functions. */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+ /************************************************************************
+  *
+  * @function:
+  *   FT_Stream_OpenBzip2
+  *
+  * @description:
+  *   Open a new stream to parse bzip2-compressed font files.  This is
+  *   mainly used to support the compressed `*.pcf.bz2' fonts that come
+  *   with XFree86.
+  *
+  * @input:
+  *   stream ::
+  *     The target embedding stream.
+  *
+  *   source ::
+  *     The source stream.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   The source stream must be opened _before_ calling this function.
+  *
+  *   Calling the internal function `FT_Stream_Close' on the new stream will
+  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
+  *   objects will be released to the heap.
+  *
+  *   The stream implementation is very basic and resets the decompression
+  *   process each time seeking backwards is needed within the stream.
+  *
+  *   In certain builds of the library, bzip2 compression recognition is
+  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
+  *   This means that if no font driver is capable of handling the raw
+  *   compressed file, the library will try to open a bzip2 compressed stream
+  *   from it and re-open the face with it.
+  *
+  *   This function may return `FT_Err_Unimplemented_Feature' if your build
+  *   of FreeType was not compiled with bzip2 support.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Stream_OpenBzip2( FT_Stream  stream,
+                       FT_Stream  source );
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTBZIP2_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftbzip2.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftcache.h
===================================================================
--- lib/3rdparty/freetype/include/ftcache.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftcache.h	(rÃ©vision 62573)
@@ -0,0 +1,1057 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftcache.h                                                              */
+/*                                                                         */
+/*    FreeType Cache subsystem (specification).                            */
+/*                                                                         */
+/*  Copyright 1996-2008, 2010, 2013 by                                     */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTCACHE_H__
+#define __FTCACHE_H__
+
+
+#include <ft2build.h>
+#include FT_GLYPH_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************
+   *
+   * <Section>
+   *    cache_subsystem
+   *
+   * <Title>
+   *    Cache Sub-System
+   *
+   * <Abstract>
+   *    How to cache face, size, and glyph data with FreeType~2.
+   *
+   * <Description>
+   *   This section describes the FreeType~2 cache sub-system, which is used
+   *   to limit the number of concurrently opened @FT_Face and @FT_Size
+   *   objects, as well as caching information like character maps and glyph
+   *   images while limiting their maximum memory usage.
+   *
+   *   Note that all types and functions begin with the `FTC_' prefix.
+   *
+   *   The cache is highly portable and thus doesn't know anything about the
+   *   fonts installed on your system, or how to access them.  This implies
+   *   the following scheme:
+   *
+   *   First, available or installed font faces are uniquely identified by
+   *   @FTC_FaceID values, provided to the cache by the client.  Note that
+   *   the cache only stores and compares these values, and doesn't try to
+   *   interpret them in any way.
+   *
+   *   Second, the cache calls, only when needed, a client-provided function
+   *   to convert an @FTC_FaceID into a new @FT_Face object.  The latter is
+   *   then completely managed by the cache, including its termination
+   *   through @FT_Done_Face.  To monitor termination of face objects, the
+   *   finalizer callback in the `generic' field of the @FT_Face object can
+   *   be used, which might also be used to store the @FTC_FaceID of the
+   *   face.
+   *
+   *   Clients are free to map face IDs to anything else.  The most simple
+   *   usage is to associate them to a (pathname,face_index) pair that is
+   *   used to call @FT_New_Face.  However, more complex schemes are also
+   *   possible.
+   *
+   *   Note that for the cache to work correctly, the face ID values must be
+   *   *persistent*, which means that the contents they point to should not
+   *   change at runtime, or that their value should not become invalid.
+   *
+   *   If this is unavoidable (e.g., when a font is uninstalled at runtime),
+   *   you should call @FTC_Manager_RemoveFaceID as soon as possible, to let
+   *   the cache get rid of any references to the old @FTC_FaceID it may
+   *   keep internally.  Failure to do so will lead to incorrect behaviour
+   *   or even crashes.
+   *
+   *   To use the cache, start with calling @FTC_Manager_New to create a new
+   *   @FTC_Manager object, which models a single cache instance.  You can
+   *   then look up @FT_Face and @FT_Size objects with
+   *   @FTC_Manager_LookupFace and @FTC_Manager_LookupSize, respectively.
+   *
+   *   If you want to use the charmap caching, call @FTC_CMapCache_New, then
+   *   later use @FTC_CMapCache_Lookup to perform the equivalent of
+   *   @FT_Get_Char_Index, only much faster.
+   *
+   *   If you want to use the @FT_Glyph caching, call @FTC_ImageCache, then
+   *   later use @FTC_ImageCache_Lookup to retrieve the corresponding
+   *   @FT_Glyph objects from the cache.
+   *
+   *   If you need lots of small bitmaps, it is much more memory efficient
+   *   to call @FTC_SBitCache_New followed by @FTC_SBitCache_Lookup.  This
+   *   returns @FTC_SBitRec structures, which are used to store small
+   *   bitmaps directly.  (A small bitmap is one whose metrics and
+   *   dimensions all fit into 8-bit integers).
+   *
+   *   We hope to also provide a kerning cache in the near future.
+   *
+   *
+   * <Order>
+   *   FTC_Manager
+   *   FTC_FaceID
+   *   FTC_Face_Requester
+   *
+   *   FTC_Manager_New
+   *   FTC_Manager_Reset
+   *   FTC_Manager_Done
+   *   FTC_Manager_LookupFace
+   *   FTC_Manager_LookupSize
+   *   FTC_Manager_RemoveFaceID
+   *
+   *   FTC_Node
+   *   FTC_Node_Unref
+   *
+   *   FTC_ImageCache
+   *   FTC_ImageCache_New
+   *   FTC_ImageCache_Lookup
+   *
+   *   FTC_SBit
+   *   FTC_SBitCache
+   *   FTC_SBitCache_New
+   *   FTC_SBitCache_Lookup
+   *
+   *   FTC_CMapCache
+   *   FTC_CMapCache_New
+   *   FTC_CMapCache_Lookup
+   *
+   *************************************************************************/
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                    BASIC TYPE DEFINITIONS                     *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @type: FTC_FaceID
+   *
+   * @description:
+   *   An opaque pointer type that is used to identity face objects.  The
+   *   contents of such objects is application-dependent.
+   *
+   *   These pointers are typically used to point to a user-defined
+   *   structure containing a font file path, and face index.
+   *
+   * @note:
+   *   Never use NULL as a valid @FTC_FaceID.
+   *
+   *   Face IDs are passed by the client to the cache manager that calls,
+   *   when needed, the @FTC_Face_Requester to translate them into new
+   *   @FT_Face objects.
+   *
+   *   If the content of a given face ID changes at runtime, or if the value
+   *   becomes invalid (e.g., when uninstalling a font), you should
+   *   immediately call @FTC_Manager_RemoveFaceID before any other cache
+   *   function.
+   *
+   *   Failure to do so will result in incorrect behaviour or even
+   *   memory leaks and crashes.
+   */
+  typedef FT_Pointer  FTC_FaceID;
+
+
+  /************************************************************************
+   *
+   * @functype:
+   *   FTC_Face_Requester
+   *
+   * @description:
+   *   A callback function provided by client applications.  It is used by
+   *   the cache manager to translate a given @FTC_FaceID into a new valid
+   *   @FT_Face object, on demand.
+   *
+   * <Input>
+   *   face_id ::
+   *     The face ID to resolve.
+   *
+   *   library ::
+   *     A handle to a FreeType library object.
+   *
+   *   req_data ::
+   *     Application-provided request data (see note below).
+   *
+   * <Output>
+   *   aface ::
+   *     A new @FT_Face handle.
+   *
+   * <Return>
+   *   FreeType error code.  0~means success.
+   *
+   * <Note>
+   *   The third parameter `req_data' is the same as the one passed by the
+   *   client when @FTC_Manager_New is called.
+   *
+   *   The face requester should not perform funny things on the returned
+   *   face object, like creating a new @FT_Size for it, or setting a
+   *   transformation through @FT_Set_Transform!
+   */
+  typedef FT_Error
+  (*FTC_Face_Requester)( FTC_FaceID  face_id,
+                         FT_Library  library,
+                         FT_Pointer  request_data,
+                         FT_Face*    aface );
+
+ /* */
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                      CACHE MANAGER OBJECT                     *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FTC_Manager                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This object corresponds to one instance of the cache-subsystem.    */
+  /*    It is used to cache one or more @FT_Face objects, along with       */
+  /*    corresponding @FT_Size objects.                                    */
+  /*                                                                       */
+  /*    The manager intentionally limits the total number of opened        */
+  /*    @FT_Face and @FT_Size objects to control memory usage.  See the    */
+  /*    `max_faces' and `max_sizes' parameters of @FTC_Manager_New.        */
+  /*                                                                       */
+  /*    The manager is also used to cache `nodes' of various types while   */
+  /*    limiting their total memory usage.                                 */
+  /*                                                                       */
+  /*    All limitations are enforced by keeping lists of managed objects   */
+  /*    in most-recently-used order, and flushing old nodes to make room   */
+  /*    for new ones.                                                      */
+  /*                                                                       */
+  typedef struct FTC_ManagerRec_*  FTC_Manager;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FTC_Node                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An opaque handle to a cache node object.  Each cache node is       */
+  /*    reference-counted.  A node with a count of~0 might be flushed      */
+  /*    out of a full cache whenever a lookup request is performed.        */
+  /*                                                                       */
+  /*    If you look up nodes, you have the ability to `acquire' them,      */
+  /*    i.e., to increment their reference count.  This will prevent the   */
+  /*    node from being flushed out of the cache until you explicitly      */
+  /*    `release' it (see @FTC_Node_Unref).                                */
+  /*                                                                       */
+  /*    See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup.         */
+  /*                                                                       */
+  typedef struct FTC_NodeRec_*  FTC_Node;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_Manager_New                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new cache manager.                                        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library   :: The parent FreeType library handle to use.            */
+  /*                                                                       */
+  /*    max_faces :: Maximum number of opened @FT_Face objects managed by  */
+  /*                 this cache instance.  Use~0 for defaults.             */
+  /*                                                                       */
+  /*    max_sizes :: Maximum number of opened @FT_Size objects managed by  */
+  /*                 this cache instance.  Use~0 for defaults.             */
+  /*                                                                       */
+  /*    max_bytes :: Maximum number of bytes to use for cached data nodes. */
+  /*                 Use~0 for defaults.  Note that this value does not    */
+  /*                 account for managed @FT_Face and @FT_Size objects.    */
+  /*                                                                       */
+  /*    requester :: An application-provided callback used to translate    */
+  /*                 face IDs into real @FT_Face objects.                  */
+  /*                                                                       */
+  /*    req_data  :: A generic pointer that is passed to the requester     */
+  /*                 each time it is called (see @FTC_Face_Requester).     */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    amanager  :: A handle to a new manager object.  0~in case of       */
+  /*                 failure.                                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_Manager_New( FT_Library          library,
+                   FT_UInt             max_faces,
+                   FT_UInt             max_sizes,
+                   FT_ULong            max_bytes,
+                   FTC_Face_Requester  requester,
+                   FT_Pointer          req_data,
+                   FTC_Manager        *amanager );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_Manager_Reset                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Empty a given cache manager.  This simply gets rid of all the      */
+  /*    currently cached @FT_Face and @FT_Size objects within the manager. */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    manager :: A handle to the manager.                                */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FTC_Manager_Reset( FTC_Manager  manager );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_Manager_Done                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroy a given manager after emptying it.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    manager :: A handle to the target cache manager object.            */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FTC_Manager_Done( FTC_Manager  manager );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_Manager_LookupFace                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the @FT_Face object that corresponds to a given face ID   */
+  /*    through a cache manager.                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    manager :: A handle to the cache manager.                          */
+  /*                                                                       */
+  /*    face_id :: The ID of the face object.                              */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aface   :: A handle to the face object.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The returned @FT_Face object is always owned by the manager.  You  */
+  /*    should never try to discard it yourself.                           */
+  /*                                                                       */
+  /*    The @FT_Face object doesn't necessarily have a current size object */
+  /*    (i.e., face->size can be~0).  If you need a specific `font size',  */
+  /*    use @FTC_Manager_LookupSize instead.                               */
+  /*                                                                       */
+  /*    Never change the face's transformation matrix (i.e., never call    */
+  /*    the @FT_Set_Transform function) on a returned face!  If you need   */
+  /*    to transform glyphs, do it yourself after glyph loading.           */
+  /*                                                                       */
+  /*    When you perform a lookup, out-of-memory errors are detected       */
+  /*    _within_ the lookup and force incremental flushes of the cache     */
+  /*    until enough memory is released for the lookup to succeed.         */
+  /*                                                                       */
+  /*    If a lookup fails with `FT_Err_Out_Of_Memory' the cache has        */
+  /*    already been completely flushed, and still no memory was available */
+  /*    for the operation.                                                 */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_Manager_LookupFace( FTC_Manager  manager,
+                          FTC_FaceID   face_id,
+                          FT_Face     *aface );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FTC_ScalerRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to describe a given character size in either      */
+  /*    pixels or points to the cache manager.  See                        */
+  /*    @FTC_Manager_LookupSize.                                           */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    face_id :: The source face ID.                                     */
+  /*                                                                       */
+  /*    width   :: The character width.                                    */
+  /*                                                                       */
+  /*    height  :: The character height.                                   */
+  /*                                                                       */
+  /*    pixel   :: A Boolean.  If 1, the `width' and `height' fields are   */
+  /*               interpreted as integer pixel character sizes.           */
+  /*               Otherwise, they are expressed as 1/64th of points.      */
+  /*                                                                       */
+  /*    x_res   :: Only used when `pixel' is value~0 to indicate the       */
+  /*               horizontal resolution in dpi.                           */
+  /*                                                                       */
+  /*    y_res   :: Only used when `pixel' is value~0 to indicate the       */
+  /*               vertical resolution in dpi.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This type is mainly used to retrieve @FT_Size objects through the  */
+  /*    cache manager.                                                     */
+  /*                                                                       */
+  typedef struct  FTC_ScalerRec_
+  {
+    FTC_FaceID  face_id;
+    FT_UInt     width;
+    FT_UInt     height;
+    FT_Int      pixel;
+    FT_UInt     x_res;
+    FT_UInt     y_res;
+
+  } FTC_ScalerRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FTC_Scaler                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to an @FTC_ScalerRec structure.                           */
+  /*                                                                       */
+  typedef struct FTC_ScalerRec_*  FTC_Scaler;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_Manager_LookupSize                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the @FT_Size object that corresponds to a given           */
+  /*    @FTC_ScalerRec pointer through a cache manager.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    manager :: A handle to the cache manager.                          */
+  /*                                                                       */
+  /*    scaler  :: A scaler handle.                                        */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    asize   :: A handle to the size object.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The returned @FT_Size object is always owned by the manager.  You  */
+  /*    should never try to discard it by yourself.                        */
+  /*                                                                       */
+  /*    You can access the parent @FT_Face object simply as `size->face'   */
+  /*    if you need it.  Note that this object is also owned by the        */
+  /*    manager.                                                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    When you perform a lookup, out-of-memory errors are detected       */
+  /*    _within_ the lookup and force incremental flushes of the cache     */
+  /*    until enough memory is released for the lookup to succeed.         */
+  /*                                                                       */
+  /*    If a lookup fails with `FT_Err_Out_Of_Memory' the cache has        */
+  /*    already been completely flushed, and still no memory is available  */
+  /*    for the operation.                                                 */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_Manager_LookupSize( FTC_Manager  manager,
+                          FTC_Scaler   scaler,
+                          FT_Size     *asize );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_Node_Unref                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Decrement a cache node's internal reference count.  When the count */
+  /*    reaches 0, it is not destroyed but becomes eligible for subsequent */
+  /*    cache flushes.                                                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    node    :: The cache node handle.                                  */
+  /*                                                                       */
+  /*    manager :: The cache manager handle.                               */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FTC_Node_Unref( FTC_Node     node,
+                  FTC_Manager  manager );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FTC_Manager_RemoveFaceID
+   *
+   * @description:
+   *   A special function used to indicate to the cache manager that
+   *   a given @FTC_FaceID is no longer valid, either because its
+   *   content changed, or because it was deallocated or uninstalled.
+   *
+   * @input:
+   *   manager ::
+   *     The cache manager handle.
+   *
+   *   face_id ::
+   *     The @FTC_FaceID to be removed.
+   *
+   * @note:
+   *   This function flushes all nodes from the cache corresponding to this
+   *   `face_id', with the exception of nodes with a non-null reference
+   *   count.
+   *
+   *   Such nodes are however modified internally so as to never appear
+   *   in later lookups with the same `face_id' value, and to be immediately
+   *   destroyed when released by all their users.
+   *
+   */
+  FT_EXPORT( void )
+  FTC_Manager_RemoveFaceID( FTC_Manager  manager,
+                            FTC_FaceID   face_id );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    cache_subsystem                                                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+  /*************************************************************************
+   *
+   * @type:
+   *   FTC_CMapCache
+   *
+   * @description:
+   *   An opaque handle used to model a charmap cache.  This cache is to
+   *   hold character codes -> glyph indices mappings.
+   *
+   */
+  typedef struct FTC_CMapCacheRec_*  FTC_CMapCache;
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FTC_CMapCache_New
+   *
+   * @description:
+   *   Create a new charmap cache.
+   *
+   * @input:
+   *   manager ::
+   *     A handle to the cache manager.
+   *
+   * @output:
+   *   acache ::
+   *     A new cache handle.  NULL in case of error.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   Like all other caches, this one will be destroyed with the cache
+   *   manager.
+   *
+   */
+  FT_EXPORT( FT_Error )
+  FTC_CMapCache_New( FTC_Manager     manager,
+                     FTC_CMapCache  *acache );
+
+
+  /************************************************************************
+   *
+   * @function:
+   *   FTC_CMapCache_Lookup
+   *
+   * @description:
+   *   Translate a character code into a glyph index, using the charmap
+   *   cache.
+   *
+   * @input:
+   *   cache ::
+   *     A charmap cache handle.
+   *
+   *   face_id ::
+   *     The source face ID.
+   *
+   *   cmap_index ::
+   *     The index of the charmap in the source face.  Any negative value
+   *     means to use the cache @FT_Face's default charmap.
+   *
+   *   char_code ::
+   *     The character code (in the corresponding charmap).
+   *
+   * @return:
+   *    Glyph index.  0~means `no glyph'.
+   *
+   */
+  FT_EXPORT( FT_UInt )
+  FTC_CMapCache_Lookup( FTC_CMapCache  cache,
+                        FTC_FaceID     face_id,
+                        FT_Int         cmap_index,
+                        FT_UInt32      char_code );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    cache_subsystem                                                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                       IMAGE CACHE OBJECT                      *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @struct:
+   *   FTC_ImageTypeRec
+   *
+   * @description:
+   *   A structure used to model the type of images in a glyph cache.
+   *
+   * @fields:
+   *   face_id ::
+   *     The face ID.
+   *
+   *   width ::
+   *     The width in pixels.
+   *
+   *   height ::
+   *     The height in pixels.
+   *
+   *   flags ::
+   *     The load flags, as in @FT_Load_Glyph.
+   *
+   */
+  typedef struct  FTC_ImageTypeRec_
+  {
+    FTC_FaceID  face_id;
+    FT_Int      width;
+    FT_Int      height;
+    FT_Int32    flags;
+
+  } FTC_ImageTypeRec;
+
+
+  /*************************************************************************
+   *
+   * @type:
+   *   FTC_ImageType
+   *
+   * @description:
+   *   A handle to an @FTC_ImageTypeRec structure.
+   *
+   */
+  typedef struct FTC_ImageTypeRec_*  FTC_ImageType;
+
+
+  /* */
+
+
+#define FTC_IMAGE_TYPE_COMPARE( d1, d2 )      \
+          ( (d1)->face_id == (d2)->face_id && \
+            (d1)->width   == (d2)->width   && \
+            (d1)->flags   == (d2)->flags   )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FTC_ImageCache                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a glyph image cache object.  They are designed to      */
+  /*    hold many distinct glyph images while not exceeding a certain      */
+  /*    memory threshold.                                                  */
+  /*                                                                       */
+  typedef struct FTC_ImageCacheRec_*  FTC_ImageCache;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_ImageCache_New                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new glyph image cache.                                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    manager :: The parent manager for the image cache.                 */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    acache  :: A handle to the new glyph image cache object.           */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_ImageCache_New( FTC_Manager      manager,
+                      FTC_ImageCache  *acache );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_ImageCache_Lookup                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve a given glyph image from a glyph image cache.             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    cache  :: A handle to the source glyph image cache.                */
+  /*                                                                       */
+  /*    type   :: A pointer to a glyph image type descriptor.              */
+  /*                                                                       */
+  /*    gindex :: The glyph index to retrieve.                             */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aglyph :: The corresponding @FT_Glyph object.  0~in case of        */
+  /*              failure.                                                 */
+  /*                                                                       */
+  /*    anode  :: Used to return the address of of the corresponding cache */
+  /*              node after incrementing its reference count (see note    */
+  /*              below).                                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The returned glyph is owned and managed by the glyph image cache.  */
+  /*    Never try to transform or discard it manually!  You can however    */
+  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
+  /*                                                                       */
+  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
+  /*    node containing the glyph image, after increasing its reference    */
+  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
+  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
+  /*    `release' it.                                                      */
+  /*                                                                       */
+  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
+  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
+  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
+  /*    is persistent!                                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_ImageCache_Lookup( FTC_ImageCache  cache,
+                         FTC_ImageType   type,
+                         FT_UInt         gindex,
+                         FT_Glyph       *aglyph,
+                         FTC_Node       *anode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_ImageCache_LookupScaler                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A variant of @FTC_ImageCache_Lookup that uses an @FTC_ScalerRec    */
+  /*    to specify the face ID and its size.                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    cache      :: A handle to the source glyph image cache.            */
+  /*                                                                       */
+  /*    scaler     :: A pointer to a scaler descriptor.                    */
+  /*                                                                       */
+  /*    load_flags :: The corresponding load flags.                        */
+  /*                                                                       */
+  /*    gindex     :: The glyph index to retrieve.                         */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aglyph     :: The corresponding @FT_Glyph object.  0~in case of    */
+  /*                  failure.                                             */
+  /*                                                                       */
+  /*    anode      :: Used to return the address of of the corresponding   */
+  /*                  cache node after incrementing its reference count    */
+  /*                  (see note below).                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The returned glyph is owned and managed by the glyph image cache.  */
+  /*    Never try to transform or discard it manually!  You can however    */
+  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
+  /*                                                                       */
+  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
+  /*    node containing the glyph image, after increasing its reference    */
+  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
+  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
+  /*    `release' it.                                                      */
+  /*                                                                       */
+  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
+  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
+  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
+  /*    is persistent!                                                     */
+  /*                                                                       */
+  /*    Calls to @FT_Set_Char_Size and friends have no effect on cached    */
+  /*    glyphs; you should always use the FreeType cache API instead.      */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_ImageCache_LookupScaler( FTC_ImageCache  cache,
+                               FTC_Scaler      scaler,
+                               FT_ULong        load_flags,
+                               FT_UInt         gindex,
+                               FT_Glyph       *aglyph,
+                               FTC_Node       *anode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FTC_SBit                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a small bitmap descriptor.  See the @FTC_SBitRec       */
+  /*    structure for details.                                             */
+  /*                                                                       */
+  typedef struct FTC_SBitRec_*  FTC_SBit;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FTC_SBitRec                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very compact structure used to describe a small glyph bitmap.    */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    width     :: The bitmap width in pixels.                           */
+  /*                                                                       */
+  /*    height    :: The bitmap height in pixels.                          */
+  /*                                                                       */
+  /*    left      :: The horizontal distance from the pen position to the  */
+  /*                 left bitmap border (a.k.a. `left side bearing', or    */
+  /*                 `lsb').                                               */
+  /*                                                                       */
+  /*    top       :: The vertical distance from the pen position (on the   */
+  /*                 baseline) to the upper bitmap border (a.k.a. `top     */
+  /*                 side bearing').  The distance is positive for upwards */
+  /*                 y~coordinates.                                        */
+  /*                                                                       */
+  /*    format    :: The format of the glyph bitmap (monochrome or gray).  */
+  /*                                                                       */
+  /*    max_grays :: Maximum gray level value (in the range 1 to~255).     */
+  /*                                                                       */
+  /*    pitch     :: The number of bytes per bitmap line.  May be positive */
+  /*                 or negative.                                          */
+  /*                                                                       */
+  /*    xadvance  :: The horizontal advance width in pixels.               */
+  /*                                                                       */
+  /*    yadvance  :: The vertical advance height in pixels.                */
+  /*                                                                       */
+  /*    buffer    :: A pointer to the bitmap pixels.                       */
+  /*                                                                       */
+  typedef struct  FTC_SBitRec_
+  {
+    FT_Byte   width;
+    FT_Byte   height;
+    FT_Char   left;
+    FT_Char   top;
+
+    FT_Byte   format;
+    FT_Byte   max_grays;
+    FT_Short  pitch;
+    FT_Char   xadvance;
+    FT_Char   yadvance;
+
+    FT_Byte*  buffer;
+
+  } FTC_SBitRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FTC_SBitCache                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a small bitmap cache.  These are special cache objects */
+  /*    used to store small glyph bitmaps (and anti-aliased pixmaps) in a  */
+  /*    much more efficient way than the traditional glyph image cache     */
+  /*    implemented by @FTC_ImageCache.                                    */
+  /*                                                                       */
+  typedef struct FTC_SBitCacheRec_*  FTC_SBitCache;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_SBitCache_New                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new cache to store small glyph bitmaps.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    manager :: A handle to the source cache manager.                   */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    acache  :: A handle to the new sbit cache.  NULL in case of error. */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_SBitCache_New( FTC_Manager     manager,
+                     FTC_SBitCache  *acache );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_SBitCache_Lookup                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Look up a given small glyph bitmap in a given sbit cache and       */
+  /*    `lock' it to prevent its flushing from the cache until needed.     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    cache  :: A handle to the source sbit cache.                       */
+  /*                                                                       */
+  /*    type   :: A pointer to the glyph image type descriptor.            */
+  /*                                                                       */
+  /*    gindex :: The glyph index.                                         */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    sbit   :: A handle to a small bitmap descriptor.                   */
+  /*                                                                       */
+  /*    anode  :: Used to return the address of of the corresponding cache */
+  /*              node after incrementing its reference count (see note    */
+  /*              below).                                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The small bitmap descriptor and its bit buffer are owned by the    */
+  /*    cache and should never be freed by the application.  They might    */
+  /*    as well disappear from memory on the next cache lookup, so don't   */
+  /*    treat them as persistent data.                                     */
+  /*                                                                       */
+  /*    The descriptor's `buffer' field is set to~0 to indicate a missing  */
+  /*    glyph bitmap.                                                      */
+  /*                                                                       */
+  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
+  /*    node containing the bitmap, after increasing its reference count.  */
+  /*    This ensures that the node (as well as the image) will always be   */
+  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
+  /*                                                                       */
+  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
+  /*    that the bitmap could be flushed out of the cache on the next      */
+  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
+  /*    is persistent!                                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_SBitCache_Lookup( FTC_SBitCache    cache,
+                        FTC_ImageType    type,
+                        FT_UInt          gindex,
+                        FTC_SBit        *sbit,
+                        FTC_Node        *anode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_SBitCache_LookupScaler                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A variant of @FTC_SBitCache_Lookup that uses an @FTC_ScalerRec     */
+  /*    to specify the face ID and its size.                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    cache      :: A handle to the source sbit cache.                   */
+  /*                                                                       */
+  /*    scaler     :: A pointer to the scaler descriptor.                  */
+  /*                                                                       */
+  /*    load_flags :: The corresponding load flags.                        */
+  /*                                                                       */
+  /*    gindex     :: The glyph index.                                     */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    sbit       :: A handle to a small bitmap descriptor.               */
+  /*                                                                       */
+  /*    anode      :: Used to return the address of of the corresponding   */
+  /*                  cache node after incrementing its reference count    */
+  /*                  (see note below).                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The small bitmap descriptor and its bit buffer are owned by the    */
+  /*    cache and should never be freed by the application.  They might    */
+  /*    as well disappear from memory on the next cache lookup, so don't   */
+  /*    treat them as persistent data.                                     */
+  /*                                                                       */
+  /*    The descriptor's `buffer' field is set to~0 to indicate a missing  */
+  /*    glyph bitmap.                                                      */
+  /*                                                                       */
+  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
+  /*    node containing the bitmap, after increasing its reference count.  */
+  /*    This ensures that the node (as well as the image) will always be   */
+  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
+  /*                                                                       */
+  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
+  /*    that the bitmap could be flushed out of the cache on the next      */
+  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
+  /*    is persistent!                                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_SBitCache_LookupScaler( FTC_SBitCache  cache,
+                              FTC_Scaler     scaler,
+                              FT_ULong       load_flags,
+                              FT_UInt        gindex,
+                              FTC_SBit      *sbit,
+                              FTC_Node      *anode );
+
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTCACHE_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftcache.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftcffdrv.h
===================================================================
--- lib/3rdparty/freetype/include/ftcffdrv.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftcffdrv.h	(rÃ©vision 62573)
@@ -0,0 +1,254 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftcffdrv.h                                                             */
+/*                                                                         */
+/*    FreeType API for controlling the CFF driver (specification only).    */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTCFFDRV_H__
+#define __FTCFFDRV_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /**************************************************************************
+   *
+   * @section:
+   *   cff_driver
+   *
+   * @title:
+   *   The CFF driver
+   *
+   * @abstract:
+   *   Controlling the CFF driver module.
+   *
+   * @description:
+   *   While FreeType's CFF driver doesn't expose API functions by itself,
+   *   it is possible to control its behaviour with @FT_Property_Set and
+   *   @FT_Property_Get.  The list below gives the available properties
+   *   together with the necessary macros and structures.
+   *
+   *   The CFF driver's module name is `cff'.
+   *
+   *   *Hinting* *and* *antialiasing* *principles* *of* *the* *new* *engine*
+   *
+   *   The rasterizer is positioning horizontal features (e.g., ascender
+   *   height & x-height, or crossbars) on the pixel grid and minimizing the
+   *   amount of antialiasing applied to them, while placing vertical
+   *   features (vertical stems) on the pixel grid without hinting, thus
+   *   representing the stem position and weight accurately.  Sometimes the
+   *   vertical stems may be only partially black.  In this context,
+   *   `antialiasing' means that stems are not positioned exactly on pixel
+   *   borders, causing a fuzzy appearance.
+   *
+   *   There are two principles behind this approach.
+   *
+   *   1) No hinting in the horizontal direction: Unlike `superhinted'
+   *   TrueType, which changes glyph widths to accommodate regular
+   *   inter-glyph spacing, Adobe's approach is `faithful to the design' in
+   *   representing both the glyph width and the inter-glyph spacing
+   *   designed for the font.  This makes the screen display as close as it
+   *   can be to the result one would get with infinite resolution, while
+   *   preserving what is considered the key characteristics of each glyph.
+   *   Note that the distances between unhinted and grid-fitted positions at
+   *   small sizes are comparable to kerning values and thus would be
+   *   noticeable (and distracting) while reading if hinting were applied.
+   *
+   *   One of the reasons to not hint horizontally is antialiasing for LCD
+   *   screens: The pixel geometry of modern displays supplies three
+   *   vertical sub-pixels as the eye moves horizontally across each visible
+   *   pixel.  On devices where we can be certain this characteristic is
+   *   present a rasterizer can take advantage of the sub-pixels to add
+   *   increments of weight.  In Western writing systems this turns out to
+   *   be the more critical direction anyway; the weights and spacing of
+   *   vertical stems (see above) are central to Armenian, Cyrillic, Greek,
+   *   and Latin type designs.  Even when the rasterizer uses greyscale
+   *   antialiasing instead of color (a necessary compromise when one
+   *   doesn't know the screen characteristics), the unhinted vertical
+   *   features preserve the design's weight and spacing much better than
+   *   aliased type would.
+   *
+   *   2) Aligment in the vertical direction: Weights and spacing along the
+   *   y~axis are less critical; what is much more important is the visual
+   *   alignment of related features (like cap-height and x-height).  The
+   *   sense of alignment for these is enhanced by the sharpness of grid-fit
+   *   edges, while the cruder vertical resolution (full pixels instead of
+   *   1/3 pixels) is less of a problem.
+   *
+   *   On the technical side, horizontal alignment zones for ascender,
+   *   x-height, and other important height values (traditionally called
+   *   `blue zones') as defined in the font are positioned independently,
+   *   each being rounded to the nearest pixel edge, taking care of
+   *   overshoot suppression at small sizes, stem darkening, and scaling.
+   *
+   *   Hstems (this is, hint values defined in the font to help align
+   *   horizontal features) that fall within a blue zone are said to be
+   *   `captured' and are aligned to that zone.  Uncaptured stems are moved
+   *   in one of four ways, top edge up or down, bottom edge up or down.
+   *   Unless there are conflicting hstems, the smallest movement is taken
+   *   to minimize distortion.
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   hinting-engine
+   *
+   * @description:
+   *   Thanks to Adobe, which contributed a new hinting (and parsing)
+   *   engine, an application can select between `freetype' and `adobe' if
+   *   compiled with CFF_CONFIG_OPTION_OLD_ENGINE.  If this configuration
+   *   macro isn't defined, `hinting-engine' does nothing.
+   *
+   *   The default engine is `freetype' if CFF_CONFIG_OPTION_OLD_ENGINE is
+   *   defined, and `adobe' otherwise.
+   *
+   *   The following example code demonstrates how to select Adobe's hinting
+   *   engine (omitting the error handling).
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "cff",
+   *                               "hinting-engine", &hinting_engine );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @enum:
+   *   FT_CFF_HINTING_XXX
+   *
+   * @description:
+   *   A list of constants used for the @hinting-engine property to select
+   *   the hinting engine for CFF fonts.
+   *
+   * @values:
+   *   FT_CFF_HINTING_FREETYPE ::
+   *     Use the old FreeType hinting engine.
+   *
+   *   FT_CFF_HINTING_ADOBE ::
+   *     Use the hinting engine contributed by Adobe.
+   *
+   */
+#define FT_CFF_HINTING_FREETYPE  0
+#define FT_CFF_HINTING_ADOBE     1
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   no-stem-darkening
+   *
+   * @description:
+   *   By default, the Adobe CFF engine darkens stems at smaller sizes,
+   *   regardless of hinting, to enhance contrast.  This feature requires
+   *   a rendering system with proper gamma correction.  Setting this
+   *   property, stem darkening gets switched off.
+   *
+   *   Note that stem darkening is never applied if @FT_LOAD_NO_SCALE is set.
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_Bool     no_stem_darkening = TRUE;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "cff",
+   *                               "no-stem-darkening", &no_stem_darkening );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   darkening-parameters
+   *
+   * @description:
+   *   By default, the Adobe CFF engine darkens stems as follows (if the
+   *   `no-stem-darkening' property isn't set):
+   *
+   *   {
+   *     stem width <= 0.5px:   darkening amount = 0.4px
+   *     stem width  = 1px:     darkening amount = 0.275px
+   *     stem width  = 1.667px: darkening amount = 0.275px
+   *     stem width >= 2.333px: darkening amount = 0px
+   *   }
+   *
+   *   and piecewise linear in-between.  Using the `darkening-parameters'
+   *   property, these four control points can be changed, as the following
+   *   example demonstrates.
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_Int      darken_params[8] = {  500, 300,   // x1, y1
+   *                                      1000, 200,   // x2, y2
+   *                                      1500, 100,   // x3, y3
+   *                                      2000,   0 }; // x4, y4
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "cff",
+   *                               "darkening-parameters", darken_params );
+   *   }
+   *
+   *   The x~values give the stem width, and the y~values the darkening
+   *   amount.  The unit is 1000th of pixels.  All coordinate values must be
+   *   positive; the x~values must be monotonically increasing; the
+   *   y~values must be monotonically decreasing and smaller than or
+   *   equal to 500 (corresponding to half a pixel); the slope of each
+   *   linear piece must be shallower than -1 (e.g., -.4).
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+ /* */
+
+FT_END_HEADER
+
+
+#endif /* __FTCFFDRV_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftcffdrv.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftchapters.h
===================================================================
--- lib/3rdparty/freetype/include/ftchapters.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftchapters.h	(rÃ©vision 62573)
@@ -0,0 +1,120 @@
+/***************************************************************************/
+/*                                                                         */
+/* This file defines the structure of the FreeType reference.              */
+/* It is used by the python script that generates the HTML files.          */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* <Chapter>                                                               */
+/*    general_remarks                                                      */
+/*                                                                         */
+/* <Title>                                                                 */
+/*    General Remarks                                                      */
+/*                                                                         */
+/* <Sections>                                                              */
+/*    user_allocation                                                      */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* <Chapter>                                                               */
+/*    core_api                                                             */
+/*                                                                         */
+/* <Title>                                                                 */
+/*    Core API                                                             */
+/*                                                                         */
+/* <Sections>                                                              */
+/*    version                                                              */
+/*    basic_types                                                          */
+/*    base_interface                                                       */
+/*    glyph_variants                                                       */
+/*    glyph_management                                                     */
+/*    mac_specific                                                         */
+/*    sizes_management                                                     */
+/*    header_file_macros                                                   */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* <Chapter>                                                               */
+/*    format_specific                                                      */
+/*                                                                         */
+/* <Title>                                                                 */
+/*    Format-Specific API                                                  */
+/*                                                                         */
+/* <Sections>                                                              */
+/*    multiple_masters                                                     */
+/*    truetype_tables                                                      */
+/*    type1_tables                                                         */
+/*    sfnt_names                                                           */
+/*    bdf_fonts                                                            */
+/*    cid_fonts                                                            */
+/*    pfr_fonts                                                            */
+/*    winfnt_fonts                                                         */
+/*    font_formats                                                         */
+/*    gasp_table                                                           */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* <Chapter>                                                               */
+/*    module_specific                                                      */
+/*                                                                         */
+/* <Title>                                                                 */
+/*    Controlling FreeType Modules                                         */
+/*                                                                         */
+/* <Sections>                                                              */
+/*    auto_hinter                                                          */
+/*    cff_driver                                                           */
+/*    tt_driver                                                            */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* <Chapter>                                                               */
+/*    cache_subsystem                                                      */
+/*                                                                         */
+/* <Title>                                                                 */
+/*    Cache Sub-System                                                     */
+/*                                                                         */
+/* <Sections>                                                              */
+/*    cache_subsystem                                                      */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* <Chapter>                                                               */
+/*    support_api                                                          */
+/*                                                                         */
+/* <Title>                                                                 */
+/*    Support API                                                          */
+/*                                                                         */
+/* <Sections>                                                              */
+/*    computations                                                         */
+/*    list_processing                                                      */
+/*    outline_processing                                                   */
+/*    quick_advance                                                        */
+/*    bitmap_handling                                                      */
+/*    raster                                                               */
+/*    glyph_stroker                                                        */
+/*    system_interface                                                     */
+/*    module_management                                                    */
+/*    gzip                                                                 */
+/*    lzw                                                                  */
+/*    bzip2                                                                */
+/*    lcd_filtering                                                        */
+/*                                                                         */
+/***************************************************************************/

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftchapters.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftcid.h
===================================================================
--- lib/3rdparty/freetype/include/ftcid.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftcid.h	(rÃ©vision 62573)
@@ -0,0 +1,166 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftcid.h                                                                */
+/*                                                                         */
+/*    FreeType API for accessing CID font information (specification).     */
+/*                                                                         */
+/*  Copyright 2007, 2009 by Dereg Clegg, Michael Toftdal.                  */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTCID_H__
+#define __FTCID_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    cid_fonts                                                          */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    CID Fonts                                                          */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    CID-keyed font specific API.                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of CID-keyed font specific   */
+  /*    functions.                                                         */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /**********************************************************************
+   *
+   * @function:
+   *    FT_Get_CID_Registry_Ordering_Supplement
+   *
+   * @description:
+   *    Retrieve the Registry/Ordering/Supplement triple (also known as the
+   *    "R/O/S") from a CID-keyed font.
+   *
+   * @input:
+   *    face ::
+   *       A handle to the input face.
+   *
+   * @output:
+   *    registry ::
+   *       The registry, as a C~string, owned by the face.
+   *
+   *    ordering ::
+   *       The ordering, as a C~string, owned by the face.
+   *
+   *    supplement ::
+   *       The supplement.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *    This function only works with CID faces, returning an error
+   *    otherwise.
+   *
+   * @since:
+   *    2.3.6
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_CID_Registry_Ordering_Supplement( FT_Face       face,
+                                           const char*  *registry,
+                                           const char*  *ordering,
+                                           FT_Int       *supplement);
+
+
+  /**********************************************************************
+   *
+   * @function:
+   *    FT_Get_CID_Is_Internally_CID_Keyed
+   *
+   * @description:
+   *    Retrieve the type of the input face, CID keyed or not.  In
+   *    constrast to the @FT_IS_CID_KEYED macro this function returns
+   *    successfully also for CID-keyed fonts in an SNFT wrapper.
+   *
+   * @input:
+   *    face ::
+   *       A handle to the input face.
+   *
+   * @output:
+   *    is_cid ::
+   *       The type of the face as an @FT_Bool.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *    This function only works with CID faces and OpenType fonts,
+   *    returning an error otherwise.
+   *
+   * @since:
+   *    2.3.9
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_CID_Is_Internally_CID_Keyed( FT_Face   face,
+                                      FT_Bool  *is_cid );
+
+
+  /**********************************************************************
+   *
+   * @function:
+   *    FT_Get_CID_From_Glyph_Index
+   *
+   * @description:
+   *    Retrieve the CID of the input glyph index.
+   *
+   * @input:
+   *    face ::
+   *       A handle to the input face.
+   *
+   *    glyph_index ::
+   *       The input glyph index.
+   *
+   * @output:
+   *    cid ::
+   *       The CID as an @FT_UInt.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *    This function only works with CID faces and OpenType fonts,
+   *    returning an error otherwise.
+   *
+   * @since:
+   *    2.3.9
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_CID_From_Glyph_Index( FT_Face   face,
+                               FT_UInt   glyph_index,
+                               FT_UInt  *cid );
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTCID_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftcid.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/fterrdef.h
===================================================================
--- lib/3rdparty/freetype/include/fterrdef.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/fterrdef.h	(rÃ©vision 62573)
@@ -0,0 +1,249 @@
+/***************************************************************************/
+/*                                                                         */
+/*  fterrdef.h                                                             */
+/*                                                                         */
+/*    FreeType error codes (specification).                                */
+/*                                                                         */
+/*  Copyright 2002, 2004, 2006, 2007, 2010-2013 by                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /*****                                                         *****/
+  /*****                LIST OF ERROR CODES/MESSAGES             *****/
+  /*****                                                         *****/
+  /*******************************************************************/
+  /*******************************************************************/
+
+
+  /* You need to define both FT_ERRORDEF_ and FT_NOERRORDEF_ before */
+  /* including this file.                                           */
+
+
+  /* generic errors */
+
+  FT_NOERRORDEF_( Ok,                                        0x00, \
+                  "no error" )
+
+  FT_ERRORDEF_( Cannot_Open_Resource,                        0x01, \
+                "cannot open resource" )
+  FT_ERRORDEF_( Unknown_File_Format,                         0x02, \
+                "unknown file format" )
+  FT_ERRORDEF_( Invalid_File_Format,                         0x03, \
+                "broken file" )
+  FT_ERRORDEF_( Invalid_Version,                             0x04, \
+                "invalid FreeType version" )
+  FT_ERRORDEF_( Lower_Module_Version,                        0x05, \
+                "module version is too low" )
+  FT_ERRORDEF_( Invalid_Argument,                            0x06, \
+                "invalid argument" )
+  FT_ERRORDEF_( Unimplemented_Feature,                       0x07, \
+                "unimplemented feature" )
+  FT_ERRORDEF_( Invalid_Table,                               0x08, \
+                "broken table" )
+  FT_ERRORDEF_( Invalid_Offset,                              0x09, \
+                "broken offset within table" )
+  FT_ERRORDEF_( Array_Too_Large,                             0x0A, \
+                "array allocation size too large" )
+  FT_ERRORDEF_( Missing_Module,                              0x0B, \
+                "missing module" )
+  FT_ERRORDEF_( Missing_Property,                            0x0C, \
+                "missing property" )
+
+  /* glyph/character errors */
+
+  FT_ERRORDEF_( Invalid_Glyph_Index,                         0x10, \
+                "invalid glyph index" )
+  FT_ERRORDEF_( Invalid_Character_Code,                      0x11, \
+                "invalid character code" )
+  FT_ERRORDEF_( Invalid_Glyph_Format,                        0x12, \
+                "unsupported glyph image format" )
+  FT_ERRORDEF_( Cannot_Render_Glyph,                         0x13, \
+                "cannot render this glyph format" )
+  FT_ERRORDEF_( Invalid_Outline,                             0x14, \
+                "invalid outline" )
+  FT_ERRORDEF_( Invalid_Composite,                           0x15, \
+                "invalid composite glyph" )
+  FT_ERRORDEF_( Too_Many_Hints,                              0x16, \
+                "too many hints" )
+  FT_ERRORDEF_( Invalid_Pixel_Size,                          0x17, \
+                "invalid pixel size" )
+
+  /* handle errors */
+
+  FT_ERRORDEF_( Invalid_Handle,                              0x20, \
+                "invalid object handle" )
+  FT_ERRORDEF_( Invalid_Library_Handle,                      0x21, \
+                "invalid library handle" )
+  FT_ERRORDEF_( Invalid_Driver_Handle,                       0x22, \
+                "invalid module handle" )
+  FT_ERRORDEF_( Invalid_Face_Handle,                         0x23, \
+                "invalid face handle" )
+  FT_ERRORDEF_( Invalid_Size_Handle,                         0x24, \
+                "invalid size handle" )
+  FT_ERRORDEF_( Invalid_Slot_Handle,                         0x25, \
+                "invalid glyph slot handle" )
+  FT_ERRORDEF_( Invalid_CharMap_Handle,                      0x26, \
+                "invalid charmap handle" )
+  FT_ERRORDEF_( Invalid_Cache_Handle,                        0x27, \
+                "invalid cache manager handle" )
+  FT_ERRORDEF_( Invalid_Stream_Handle,                       0x28, \
+                "invalid stream handle" )
+
+  /* driver errors */
+
+  FT_ERRORDEF_( Too_Many_Drivers,                            0x30, \
+                "too many modules" )
+  FT_ERRORDEF_( Too_Many_Extensions,                         0x31, \
+                "too many extensions" )
+
+  /* memory errors */
+
+  FT_ERRORDEF_( Out_Of_Memory,                               0x40, \
+                "out of memory" )
+  FT_ERRORDEF_( Unlisted_Object,                             0x41, \
+                "unlisted object" )
+
+  /* stream errors */
+
+  FT_ERRORDEF_( Cannot_Open_Stream,                          0x51, \
+                "cannot open stream" )
+  FT_ERRORDEF_( Invalid_Stream_Seek,                         0x52, \
+                "invalid stream seek" )
+  FT_ERRORDEF_( Invalid_Stream_Skip,                         0x53, \
+                "invalid stream skip" )
+  FT_ERRORDEF_( Invalid_Stream_Read,                         0x54, \
+                "invalid stream read" )
+  FT_ERRORDEF_( Invalid_Stream_Operation,                    0x55, \
+                "invalid stream operation" )
+  FT_ERRORDEF_( Invalid_Frame_Operation,                     0x56, \
+                "invalid frame operation" )
+  FT_ERRORDEF_( Nested_Frame_Access,                         0x57, \
+                "nested frame access" )
+  FT_ERRORDEF_( Invalid_Frame_Read,                          0x58, \
+                "invalid frame read" )
+
+  /* raster errors */
+
+  FT_ERRORDEF_( Raster_Uninitialized,                        0x60, \
+                "raster uninitialized" )
+  FT_ERRORDEF_( Raster_Corrupted,                            0x61, \
+                "raster corrupted" )
+  FT_ERRORDEF_( Raster_Overflow,                             0x62, \
+                "raster overflow" )
+  FT_ERRORDEF_( Raster_Negative_Height,                      0x63, \
+                "negative height while rastering" )
+
+  /* cache errors */
+
+  FT_ERRORDEF_( Too_Many_Caches,                             0x70, \
+                "too many registered caches" )
+
+  /* TrueType and SFNT errors */
+
+  FT_ERRORDEF_( Invalid_Opcode,                              0x80, \
+                "invalid opcode" )
+  FT_ERRORDEF_( Too_Few_Arguments,                           0x81, \
+                "too few arguments" )
+  FT_ERRORDEF_( Stack_Overflow,                              0x82, \
+                "stack overflow" )
+  FT_ERRORDEF_( Code_Overflow,                               0x83, \
+                "code overflow" )
+  FT_ERRORDEF_( Bad_Argument,                                0x84, \
+                "bad argument" )
+  FT_ERRORDEF_( Divide_By_Zero,                              0x85, \
+                "division by zero" )
+  FT_ERRORDEF_( Invalid_Reference,                           0x86, \
+                "invalid reference" )
+  FT_ERRORDEF_( Debug_OpCode,                                0x87, \
+                "found debug opcode" )
+  FT_ERRORDEF_( ENDF_In_Exec_Stream,                         0x88, \
+                "found ENDF opcode in execution stream" )
+  FT_ERRORDEF_( Nested_DEFS,                                 0x89, \
+                "nested DEFS" )
+  FT_ERRORDEF_( Invalid_CodeRange,                           0x8A, \
+                "invalid code range" )
+  FT_ERRORDEF_( Execution_Too_Long,                          0x8B, \
+                "execution context too long" )
+  FT_ERRORDEF_( Too_Many_Function_Defs,                      0x8C, \
+                "too many function definitions" )
+  FT_ERRORDEF_( Too_Many_Instruction_Defs,                   0x8D, \
+                "too many instruction definitions" )
+  FT_ERRORDEF_( Table_Missing,                               0x8E, \
+                "SFNT font table missing" )
+  FT_ERRORDEF_( Horiz_Header_Missing,                        0x8F, \
+                "horizontal header (hhea) table missing" )
+  FT_ERRORDEF_( Locations_Missing,                           0x90, \
+                "locations (loca) table missing" )
+  FT_ERRORDEF_( Name_Table_Missing,                          0x91, \
+                "name table missing" )
+  FT_ERRORDEF_( CMap_Table_Missing,                          0x92, \
+                "character map (cmap) table missing" )
+  FT_ERRORDEF_( Hmtx_Table_Missing,                          0x93, \
+                "horizontal metrics (hmtx) table missing" )
+  FT_ERRORDEF_( Post_Table_Missing,                          0x94, \
+                "PostScript (post) table missing" )
+  FT_ERRORDEF_( Invalid_Horiz_Metrics,                       0x95, \
+                "invalid horizontal metrics" )
+  FT_ERRORDEF_( Invalid_CharMap_Format,                      0x96, \
+                "invalid character map (cmap) format" )
+  FT_ERRORDEF_( Invalid_PPem,                                0x97, \
+                "invalid ppem value" )
+  FT_ERRORDEF_( Invalid_Vert_Metrics,                        0x98, \
+                "invalid vertical metrics" )
+  FT_ERRORDEF_( Could_Not_Find_Context,                      0x99, \
+                "could not find context" )
+  FT_ERRORDEF_( Invalid_Post_Table_Format,                   0x9A, \
+                "invalid PostScript (post) table format" )
+  FT_ERRORDEF_( Invalid_Post_Table,                          0x9B, \
+                "invalid PostScript (post) table" )
+
+  /* CFF, CID, and Type 1 errors */
+
+  FT_ERRORDEF_( Syntax_Error,                                0xA0, \
+                "opcode syntax error" )
+  FT_ERRORDEF_( Stack_Underflow,                             0xA1, \
+                "argument stack underflow" )
+  FT_ERRORDEF_( Ignore,                                      0xA2, \
+                "ignore" )
+  FT_ERRORDEF_( No_Unicode_Glyph_Name,                       0xA3, \
+                "no Unicode glyph name found" )
+  FT_ERRORDEF_( Glyph_Too_Big,                               0xA4, \
+                "glyph to big for hinting" )
+
+  /* BDF errors */
+
+  FT_ERRORDEF_( Missing_Startfont_Field,                     0xB0, \
+                "`STARTFONT' field missing" )
+  FT_ERRORDEF_( Missing_Font_Field,                          0xB1, \
+                "`FONT' field missing" )
+  FT_ERRORDEF_( Missing_Size_Field,                          0xB2, \
+                "`SIZE' field missing" )
+  FT_ERRORDEF_( Missing_Fontboundingbox_Field,               0xB3, \
+                "`FONTBOUNDINGBOX' field missing" )
+  FT_ERRORDEF_( Missing_Chars_Field,                         0xB4, \
+                "`CHARS' field missing" )
+  FT_ERRORDEF_( Missing_Startchar_Field,                     0xB5, \
+                "`STARTCHAR' field missing" )
+  FT_ERRORDEF_( Missing_Encoding_Field,                      0xB6, \
+                "`ENCODING' field missing" )
+  FT_ERRORDEF_( Missing_Bbx_Field,                           0xB7, \
+                "`BBX' field missing" )
+  FT_ERRORDEF_( Bbx_Too_Big,                                 0xB8, \
+                "`BBX' too big" )
+  FT_ERRORDEF_( Corrupted_Font_Header,                       0xB9, \
+                "Font header corrupted or missing fields" )
+  FT_ERRORDEF_( Corrupted_Font_Glyphs,                       0xBA, \
+                "Font glyphs corrupted or missing fields" )
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/fterrdef.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/fterrors.h
===================================================================
--- lib/3rdparty/freetype/include/fterrors.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/fterrors.h	(rÃ©vision 62573)
@@ -0,0 +1,198 @@
+/***************************************************************************/
+/*                                                                         */
+/*  fterrors.h                                                             */
+/*                                                                         */
+/*    FreeType error code handling (specification).                        */
+/*                                                                         */
+/*  Copyright 1996-2002, 2004, 2007, 2013 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This special header file is used to define the handling of FT2        */
+  /* enumeration constants.  It can also be used to generate error message */
+  /* strings with a small macro trick explained below.                     */
+  /*                                                                       */
+  /* I - Error Formats                                                     */
+  /* -----------------                                                     */
+  /*                                                                       */
+  /*   The configuration macro FT_CONFIG_OPTION_USE_MODULE_ERRORS can be   */
+  /*   defined in ftoption.h in order to make the higher byte indicate     */
+  /*   the module where the error has happened (this is not compatible     */
+  /*   with standard builds of FreeType 2).  See the file `ftmoderr.h' for */
+  /*   more details.                                                       */
+  /*                                                                       */
+  /*                                                                       */
+  /* II - Error Message strings                                            */
+  /* --------------------------                                            */
+  /*                                                                       */
+  /*   The error definitions below are made through special macros that    */
+  /*   allow client applications to build a table of error message strings */
+  /*   if they need it.  The strings are not included in a normal build of */
+  /*   FreeType 2 to save space (most client applications do not use       */
+  /*   them).                                                              */
+  /*                                                                       */
+  /*   To do so, you have to define the following macros before including  */
+  /*   this file:                                                          */
+  /*                                                                       */
+  /*   FT_ERROR_START_LIST ::                                              */
+  /*     This macro is called before anything else to define the start of  */
+  /*     the error list.  It is followed by several FT_ERROR_DEF calls     */
+  /*     (see below).                                                      */
+  /*                                                                       */
+  /*   FT_ERROR_DEF( e, v, s ) ::                                          */
+  /*     This macro is called to define one single error.                  */
+  /*     `e' is the error code identifier (e.g. FT_Err_Invalid_Argument).  */
+  /*     `v' is the error numerical value.                                 */
+  /*     `s' is the corresponding error string.                            */
+  /*                                                                       */
+  /*   FT_ERROR_END_LIST ::                                                */
+  /*     This macro ends the list.                                         */
+  /*                                                                       */
+  /*   Additionally, you have to undefine __FTERRORS_H__ before #including */
+  /*   this file.                                                          */
+  /*                                                                       */
+  /*   Here is a simple example:                                           */
+  /*                                                                       */
+  /*     {                                                                 */
+  /*       #undef __FTERRORS_H__                                           */
+  /*       #define FT_ERRORDEF( e, v, s )  { e, s },                       */
+  /*       #define FT_ERROR_START_LIST     {                               */
+  /*       #define FT_ERROR_END_LIST       { 0, 0 } };                     */
+  /*                                                                       */
+  /*       const struct                                                    */
+  /*       {                                                               */
+  /*         int          err_code;                                        */
+  /*         const char*  err_msg;                                         */
+  /*       } ft_errors[] =                                                 */
+  /*                                                                       */
+  /*       #include FT_ERRORS_H                                            */
+  /*     }                                                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTERRORS_H__
+#define __FTERRORS_H__
+
+
+  /* include module base error codes */
+#include FT_MODULE_ERRORS_H
+
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /*****                                                         *****/
+  /*****                       SETUP MACROS                      *****/
+  /*****                                                         *****/
+  /*******************************************************************/
+  /*******************************************************************/
+
+
+#undef  FT_NEED_EXTERN_C
+
+
+  /* FT_ERR_PREFIX is used as a prefix for error identifiers. */
+  /* By default, we use `FT_Err_'.                            */
+  /*                                                          */
+#ifndef FT_ERR_PREFIX
+#define FT_ERR_PREFIX  FT_Err_
+#endif
+
+
+  /* FT_ERR_BASE is used as the base for module-specific errors. */
+  /*                                                             */
+#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
+
+#ifndef FT_ERR_BASE
+#define FT_ERR_BASE  FT_Mod_Err_Base
+#endif
+
+#else
+
+#undef FT_ERR_BASE
+#define FT_ERR_BASE  0
+
+#endif /* FT_CONFIG_OPTION_USE_MODULE_ERRORS */
+
+
+  /* If FT_ERRORDEF is not defined, we need to define a simple */
+  /* enumeration type.                                         */
+  /*                                                           */
+#ifndef FT_ERRORDEF
+
+#define FT_ERRORDEF( e, v, s )  e = v,
+#define FT_ERROR_START_LIST     enum {
+#define FT_ERROR_END_LIST       FT_ERR_CAT( FT_ERR_PREFIX, Max ) };
+
+#ifdef __cplusplus
+#define FT_NEED_EXTERN_C
+  extern "C" {
+#endif
+
+#endif /* !FT_ERRORDEF */
+
+
+  /* this macro is used to define an error */
+#define FT_ERRORDEF_( e, v, s )                                             \
+          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s )
+
+  /* this is only used for <module>_Err_Ok, which must be 0! */
+#define FT_NOERRORDEF_( e, v, s )                             \
+          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s )
+
+
+#ifdef FT_ERROR_START_LIST
+  FT_ERROR_START_LIST
+#endif
+
+
+  /* now include the error codes */
+#include FT_ERROR_DEFINITIONS_H
+
+
+#ifdef FT_ERROR_END_LIST
+  FT_ERROR_END_LIST
+#endif
+
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /*****                                                         *****/
+  /*****                      SIMPLE CLEANUP                     *****/
+  /*****                                                         *****/
+  /*******************************************************************/
+  /*******************************************************************/
+
+#ifdef FT_NEED_EXTERN_C
+  }
+#endif
+
+#undef FT_ERROR_START_LIST
+#undef FT_ERROR_END_LIST
+
+#undef FT_ERRORDEF
+#undef FT_ERRORDEF_
+#undef FT_NOERRORDEF_
+
+#undef FT_NEED_EXTERN_C
+#undef FT_ERR_BASE
+
+  /* FT_ERR_PREFIX is needed internally */
+#ifndef FT2_BUILD_LIBRARY
+#undef FT_ERR_PREFIX
+#endif
+
+#endif /* __FTERRORS_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/fterrors.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftgasp.h
===================================================================
--- lib/3rdparty/freetype/include/ftgasp.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftgasp.h	(rÃ©vision 62573)
@@ -0,0 +1,128 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftgasp.h                                                               */
+/*                                                                         */
+/*    Access of TrueType's `gasp' table (specification).                   */
+/*                                                                         */
+/*  Copyright 2007, 2008, 2011 by                                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef _FT_GASP_H_
+#define _FT_GASP_H_
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+  /***************************************************************************
+   *
+   * @section:
+   *   gasp_table
+   *
+   * @title:
+   *   Gasp Table
+   *
+   * @abstract:
+   *   Retrieving TrueType `gasp' table entries.
+   *
+   * @description:
+   *   The function @FT_Get_Gasp can be used to query a TrueType or OpenType
+   *   font for specific entries in its `gasp' table, if any.  This is
+   *   mainly useful when implementing native TrueType hinting with the
+   *   bytecode interpreter to duplicate the Windows text rendering results.
+   */
+
+  /*************************************************************************
+   *
+   * @enum:
+   *   FT_GASP_XXX
+   *
+   * @description:
+   *   A list of values and/or bit-flags returned by the @FT_Get_Gasp
+   *   function.
+   *
+   * @values:
+   *   FT_GASP_NO_TABLE ::
+   *     This special value means that there is no GASP table in this face.
+   *     It is up to the client to decide what to do.
+   *
+   *   FT_GASP_DO_GRIDFIT ::
+   *     Grid-fitting and hinting should be performed at the specified ppem.
+   *     This *really* means TrueType bytecode interpretation.  If this bit
+   *     is not set, no hinting gets applied.
+   *
+   *   FT_GASP_DO_GRAY ::
+   *     Anti-aliased rendering should be performed at the specified ppem.
+   *     If not set, do monochrome rendering.
+   *
+   *   FT_GASP_SYMMETRIC_SMOOTHING ::
+   *     If set, smoothing along multiple axes must be used with ClearType.
+   *
+   *   FT_GASP_SYMMETRIC_GRIDFIT ::
+   *     Grid-fitting must be used with ClearType's symmetric smoothing.
+   *
+   * @note:
+   *   The bit-flags `FT_GASP_DO_GRIDFIT' and `FT_GASP_DO_GRAY' are to be
+   *   used for standard font rasterization only.  Independently of that,
+   *   `FT_GASP_SYMMETRIC_SMOOTHING' and `FT_GASP_SYMMETRIC_GRIDFIT' are to
+   *   be used if ClearType is enabled (and `FT_GASP_DO_GRIDFIT' and
+   *   `FT_GASP_DO_GRAY' are consequently ignored).
+   *
+   *   `ClearType' is Microsoft's implementation of LCD rendering, partly
+   *   protected by patents.
+   *
+   * @since:
+   *   2.3.0
+   */
+#define FT_GASP_NO_TABLE               -1
+#define FT_GASP_DO_GRIDFIT           0x01
+#define FT_GASP_DO_GRAY              0x02
+#define FT_GASP_SYMMETRIC_SMOOTHING  0x08
+#define FT_GASP_SYMMETRIC_GRIDFIT    0x10
+
+
+  /*************************************************************************
+   *
+   * @func:
+   *   FT_Get_Gasp
+   *
+   * @description:
+   *   Read the `gasp' table from a TrueType or OpenType font file and
+   *   return the entry corresponding to a given character pixel size.
+   *
+   * @input:
+   *   face :: The source face handle.
+   *   ppem :: The vertical character pixel size.
+   *
+   * @return:
+   *   Bit flags (see @FT_GASP_XXX), or @FT_GASP_NO_TABLE if there is no
+   *   `gasp' table in the face.
+   *
+   * @since:
+   *   2.3.0
+   */
+  FT_EXPORT( FT_Int )
+  FT_Get_Gasp( FT_Face  face,
+               FT_UInt  ppem );
+
+/* */
+
+#endif /* _FT_GASP_H_ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftgasp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftglyph.h
===================================================================
--- lib/3rdparty/freetype/include/ftglyph.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftglyph.h	(rÃ©vision 62573)
@@ -0,0 +1,620 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftglyph.h                                                              */
+/*                                                                         */
+/*    FreeType convenience functions to handle glyphs (specification).     */
+/*                                                                         */
+/*  Copyright 1996-2003, 2006, 2008, 2009, 2011, 2013 by                   */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This file contains the definition of several convenience functions    */
+  /* that can be used by client applications to easily retrieve glyph      */
+  /* bitmaps and outlines from a given face.                               */
+  /*                                                                       */
+  /* These functions should be optional if you are writing a font server   */
+  /* or text layout engine on top of FreeType.  However, they are pretty   */
+  /* handy for many other simple uses of the library.                      */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTGLYPH_H__
+#define __FTGLYPH_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    glyph_management                                                   */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Glyph Management                                                   */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Generic interface to manage individual glyph data.                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains definitions used to manage glyph data        */
+  /*    through generic FT_Glyph objects.  Each of them can contain a      */
+  /*    bitmap, a vector outline, or even images in other formats.         */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /* forward declaration to a private type */
+  typedef struct FT_Glyph_Class_  FT_Glyph_Class;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Glyph                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Handle to an object used to model generic glyph images.  It is a   */
+  /*    pointer to the @FT_GlyphRec structure and can contain a glyph      */
+  /*    bitmap or pointer.                                                 */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Glyph objects are not owned by the library.  You must thus release */
+  /*    them manually (through @FT_Done_Glyph) _before_ calling            */
+  /*    @FT_Done_FreeType.                                                 */
+  /*                                                                       */
+  typedef struct FT_GlyphRec_*  FT_Glyph;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_GlyphRec                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The root glyph structure contains a given glyph image plus its     */
+  /*    advance width in 16.16 fixed-point format.                         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    library :: A handle to the FreeType library object.                */
+  /*                                                                       */
+  /*    clazz   :: A pointer to the glyph's class.  Private.               */
+  /*                                                                       */
+  /*    format  :: The format of the glyph's image.                        */
+  /*                                                                       */
+  /*    advance :: A 16.16 vector that gives the glyph's advance width.    */
+  /*                                                                       */
+  typedef struct  FT_GlyphRec_
+  {
+    FT_Library             library;
+    const FT_Glyph_Class*  clazz;
+    FT_Glyph_Format        format;
+    FT_Vector              advance;
+
+  } FT_GlyphRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_BitmapGlyph                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to an object used to model a bitmap glyph image.  This is */
+  /*    a sub-class of @FT_Glyph, and a pointer to @FT_BitmapGlyphRec.     */
+  /*                                                                       */
+  typedef struct FT_BitmapGlyphRec_*  FT_BitmapGlyph;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_BitmapGlyphRec                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used for bitmap glyph images.  This really is a        */
+  /*    `sub-class' of @FT_GlyphRec.                                       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    root   :: The root @FT_Glyph fields.                               */
+  /*                                                                       */
+  /*    left   :: The left-side bearing, i.e., the horizontal distance     */
+  /*              from the current pen position to the left border of the  */
+  /*              glyph bitmap.                                            */
+  /*                                                                       */
+  /*    top    :: The top-side bearing, i.e., the vertical distance from   */
+  /*              the current pen position to the top border of the glyph  */
+  /*              bitmap.  This distance is positive for upwards~y!        */
+  /*                                                                       */
+  /*    bitmap :: A descriptor for the bitmap.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You can typecast an @FT_Glyph to @FT_BitmapGlyph if you have       */
+  /*    `glyph->format == FT_GLYPH_FORMAT_BITMAP'.  This lets you access   */
+  /*    the bitmap's contents easily.                                      */
+  /*                                                                       */
+  /*    The corresponding pixel buffer is always owned by @FT_BitmapGlyph  */
+  /*    and is thus created and destroyed with it.                         */
+  /*                                                                       */
+  typedef struct  FT_BitmapGlyphRec_
+  {
+    FT_GlyphRec  root;
+    FT_Int       left;
+    FT_Int       top;
+    FT_Bitmap    bitmap;
+
+  } FT_BitmapGlyphRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_OutlineGlyph                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to an object used to model an outline glyph image.  This  */
+  /*    is a sub-class of @FT_Glyph, and a pointer to @FT_OutlineGlyphRec. */
+  /*                                                                       */
+  typedef struct FT_OutlineGlyphRec_*  FT_OutlineGlyph;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_OutlineGlyphRec                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used for outline (vectorial) glyph images.  This       */
+  /*    really is a `sub-class' of @FT_GlyphRec.                           */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    root    :: The root @FT_Glyph fields.                              */
+  /*                                                                       */
+  /*    outline :: A descriptor for the outline.                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You can typecast an @FT_Glyph to @FT_OutlineGlyph if you have      */
+  /*    `glyph->format == FT_GLYPH_FORMAT_OUTLINE'.  This lets you access  */
+  /*    the outline's content easily.                                      */
+  /*                                                                       */
+  /*    As the outline is extracted from a glyph slot, its coordinates are */
+  /*    expressed normally in 26.6 pixels, unless the flag                 */
+  /*    @FT_LOAD_NO_SCALE was used in @FT_Load_Glyph() or @FT_Load_Char(). */
+  /*                                                                       */
+  /*    The outline's tables are always owned by the object and are        */
+  /*    destroyed with it.                                                 */
+  /*                                                                       */
+  typedef struct  FT_OutlineGlyphRec_
+  {
+    FT_GlyphRec  root;
+    FT_Outline   outline;
+
+  } FT_OutlineGlyphRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Glyph                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to extract a glyph image from a slot.  Note that   */
+  /*    the created @FT_Glyph object must be released with @FT_Done_Glyph. */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    slot   :: A handle to the source glyph slot.                       */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aglyph :: A handle to the glyph object.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Glyph( FT_GlyphSlot  slot,
+                FT_Glyph     *aglyph );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Glyph_Copy                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to copy a glyph image.  Note that the created      */
+  /*    @FT_Glyph object must be released with @FT_Done_Glyph.             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    source :: A handle to the source glyph object.                     */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    target :: A handle to the target glyph object.  0~in case of       */
+  /*              error.                                                   */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Glyph_Copy( FT_Glyph   source,
+                 FT_Glyph  *target );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Glyph_Transform                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Transform a glyph image if its format is scalable.                 */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    glyph  :: A handle to the target glyph object.                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    matrix :: A pointer to a 2x2 matrix to apply.                      */
+  /*                                                                       */
+  /*    delta  :: A pointer to a 2d vector to apply.  Coordinates are      */
+  /*              expressed in 1/64th of a pixel.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code (if not 0, the glyph format is not scalable).  */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The 2x2 transformation matrix is also applied to the glyph's       */
+  /*    advance vector.                                                    */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Glyph_Transform( FT_Glyph    glyph,
+                      FT_Matrix*  matrix,
+                      FT_Vector*  delta );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Glyph_BBox_Mode                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The mode how the values of @FT_Glyph_Get_CBox are returned.        */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_GLYPH_BBOX_UNSCALED ::                                          */
+  /*      Return unscaled font units.                                      */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_SUBPIXELS ::                                         */
+  /*      Return unfitted 26.6 coordinates.                                */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_GRIDFIT ::                                           */
+  /*      Return grid-fitted 26.6 coordinates.                             */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_TRUNCATE ::                                          */
+  /*      Return coordinates in integer pixels.                            */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_PIXELS ::                                            */
+  /*      Return grid-fitted pixel coordinates.                            */
+  /*                                                                       */
+  typedef enum  FT_Glyph_BBox_Mode_
+  {
+    FT_GLYPH_BBOX_UNSCALED  = 0,
+    FT_GLYPH_BBOX_SUBPIXELS = 0,
+    FT_GLYPH_BBOX_GRIDFIT   = 1,
+    FT_GLYPH_BBOX_TRUNCATE  = 2,
+    FT_GLYPH_BBOX_PIXELS    = 3
+
+  } FT_Glyph_BBox_Mode;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    ft_glyph_bbox_xxx                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    These constants are deprecated.  Use the corresponding             */
+  /*    @FT_Glyph_BBox_Mode values instead.                                */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*   ft_glyph_bbox_unscaled  :: See @FT_GLYPH_BBOX_UNSCALED.             */
+  /*   ft_glyph_bbox_subpixels :: See @FT_GLYPH_BBOX_SUBPIXELS.            */
+  /*   ft_glyph_bbox_gridfit   :: See @FT_GLYPH_BBOX_GRIDFIT.              */
+  /*   ft_glyph_bbox_truncate  :: See @FT_GLYPH_BBOX_TRUNCATE.             */
+  /*   ft_glyph_bbox_pixels    :: See @FT_GLYPH_BBOX_PIXELS.               */
+  /*                                                                       */
+#define ft_glyph_bbox_unscaled   FT_GLYPH_BBOX_UNSCALED
+#define ft_glyph_bbox_subpixels  FT_GLYPH_BBOX_SUBPIXELS
+#define ft_glyph_bbox_gridfit    FT_GLYPH_BBOX_GRIDFIT
+#define ft_glyph_bbox_truncate   FT_GLYPH_BBOX_TRUNCATE
+#define ft_glyph_bbox_pixels     FT_GLYPH_BBOX_PIXELS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Glyph_Get_CBox                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return a glyph's `control box'.  The control box encloses all the  */
+  /*    outline's points, including BÃ©zier control points.  Though it      */
+  /*    coincides with the exact bounding box for most glyphs, it can be   */
+  /*    slightly larger in some situations (like when rotating an outline  */
+  /*    that contains BÃ©zier outside arcs).                                */
+  /*                                                                       */
+  /*    Computing the control box is very fast, while getting the bounding */
+  /*    box can take much more time as it needs to walk over all segments  */
+  /*    and arcs in the outline.  To get the latter, you can use the       */
+  /*    `ftbbox' component, which is dedicated to this single task.        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    glyph :: A handle to the source glyph object.                      */
+  /*                                                                       */
+  /*    mode  :: The mode that indicates how to interpret the returned     */
+  /*             bounding box values.                                      */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    acbox :: The glyph coordinate bounding box.  Coordinates are       */
+  /*             expressed in 1/64th of pixels if it is grid-fitted.       */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Coordinates are relative to the glyph origin, using the y~upwards  */
+  /*    convention.                                                        */
+  /*                                                                       */
+  /*    If the glyph has been loaded with @FT_LOAD_NO_SCALE, `bbox_mode'   */
+  /*    must be set to @FT_GLYPH_BBOX_UNSCALED to get unscaled font        */
+  /*    units in 26.6 pixel format.  The value @FT_GLYPH_BBOX_SUBPIXELS    */
+  /*    is another name for this constant.                                 */
+  /*                                                                       */
+  /*    If the font is tricky and the glyph has been loaded with           */
+  /*    @FT_LOAD_NO_SCALE, the resulting CBox is meaningless.  To get      */
+  /*    reasonable values for the CBox it is necessary to load the glyph   */
+  /*    at a large ppem value (so that the hinting instructions can        */
+  /*    properly shift and scale the subglyphs), then extracting the CBox, */
+  /*    which can be eventually converted back to font units.              */
+  /*                                                                       */
+  /*    Note that the maximum coordinates are exclusive, which means that  */
+  /*    one can compute the width and height of the glyph image (be it in  */
+  /*    integer or 26.6 pixels) as:                                        */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      width  = bbox.xMax - bbox.xMin;                                  */
+  /*      height = bbox.yMax - bbox.yMin;                                  */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    Note also that for 26.6 coordinates, if `bbox_mode' is set to      */
+  /*    @FT_GLYPH_BBOX_GRIDFIT, the coordinates will also be grid-fitted,  */
+  /*    which corresponds to:                                              */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      bbox.xMin = FLOOR(bbox.xMin);                                    */
+  /*      bbox.yMin = FLOOR(bbox.yMin);                                    */
+  /*      bbox.xMax = CEILING(bbox.xMax);                                  */
+  /*      bbox.yMax = CEILING(bbox.yMax);                                  */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    To get the bbox in pixel coordinates, set `bbox_mode' to           */
+  /*    @FT_GLYPH_BBOX_TRUNCATE.                                           */
+  /*                                                                       */
+  /*    To get the bbox in grid-fitted pixel coordinates, set `bbox_mode'  */
+  /*    to @FT_GLYPH_BBOX_PIXELS.                                          */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Glyph_Get_CBox( FT_Glyph  glyph,
+                     FT_UInt   bbox_mode,
+                     FT_BBox  *acbox );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Glyph_To_Bitmap                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Convert a given glyph object to a bitmap glyph object.             */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    the_glyph   :: A pointer to a handle to the target glyph.          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    render_mode :: An enumeration that describes how the data is       */
+  /*                   rendered.                                           */
+  /*                                                                       */
+  /*    origin      :: A pointer to a vector used to translate the glyph   */
+  /*                   image before rendering.  Can be~0 (if no            */
+  /*                   translation).  The origin is expressed in           */
+  /*                   26.6 pixels.                                        */
+  /*                                                                       */
+  /*    destroy     :: A boolean that indicates that the original glyph    */
+  /*                   image should be destroyed by this function.  It is  */
+  /*                   never destroyed in case of error.                   */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function does nothing if the glyph format isn't scalable.     */
+  /*                                                                       */
+  /*    The glyph image is translated with the `origin' vector before      */
+  /*    rendering.                                                         */
+  /*                                                                       */
+  /*    The first parameter is a pointer to an @FT_Glyph handle, that will */
+  /*    be _replaced_ by this function (with newly allocated data).        */
+  /*    Typically, you would use (omitting error handling):                */
+  /*                                                                       */
+  /*                                                                       */
+  /*      {                                                                */
+  /*        FT_Glyph        glyph;                                         */
+  /*        FT_BitmapGlyph  glyph_bitmap;                                  */
+  /*                                                                       */
+  /*                                                                       */
+  /*        // load glyph                                                  */
+  /*        error = FT_Load_Char( face, glyph_index, FT_LOAD_DEFAUT );     */
+  /*                                                                       */
+  /*        // extract glyph image                                         */
+  /*        error = FT_Get_Glyph( face->glyph, &glyph );                   */
+  /*                                                                       */
+  /*        // convert to a bitmap (default render mode + destroying old)  */
+  /*        if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )                 */
+  /*        {                                                              */
+  /*          error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_NORMAL,   */
+  /*                                      0, 1 );                          */
+  /*          if ( error ) // `glyph' unchanged                            */
+  /*            ...                                                        */
+  /*        }                                                              */
+  /*                                                                       */
+  /*        // access bitmap content by typecasting                        */
+  /*        glyph_bitmap = (FT_BitmapGlyph)glyph;                          */
+  /*                                                                       */
+  /*        // do funny stuff with it, like blitting/drawing               */
+  /*        ...                                                            */
+  /*                                                                       */
+  /*        // discard glyph image (bitmap or not)                         */
+  /*        FT_Done_Glyph( glyph );                                        */
+  /*      }                                                                */
+  /*                                                                       */
+  /*                                                                       */
+  /*    Here another example, again without error handling:                */
+  /*                                                                       */
+  /*                                                                       */
+  /*      {                                                                */
+  /*        FT_Glyph  glyphs[MAX_GLYPHS]                                   */
+  /*                                                                       */
+  /*                                                                       */
+  /*        ...                                                            */
+  /*                                                                       */
+  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
+  /*          error = FT_Load_Glyph( face, idx, FT_LOAD_DEFAULT ) ||       */
+  /*                  FT_Get_Glyph ( face->glyph, &glyph[idx] );           */
+  /*                                                                       */
+  /*        ...                                                            */
+  /*                                                                       */
+  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
+  /*        {                                                              */
+  /*          FT_Glyph  bitmap = glyphs[idx];                              */
+  /*                                                                       */
+  /*                                                                       */
+  /*          ...                                                          */
+  /*                                                                       */
+  /*          // after this call, `bitmap' no longer points into           */
+  /*          // the `glyphs' array (and the old value isn't destroyed)    */
+  /*          FT_Glyph_To_Bitmap( &bitmap, FT_RENDER_MODE_MONO, 0, 0 );    */
+  /*                                                                       */
+  /*          ...                                                          */
+  /*                                                                       */
+  /*          FT_Done_Glyph( bitmap );                                     */
+  /*        }                                                              */
+  /*                                                                       */
+  /*        ...                                                            */
+  /*                                                                       */
+  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
+  /*          FT_Done_Glyph( glyphs[idx] );                                */
+  /*      }                                                                */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Glyph_To_Bitmap( FT_Glyph*       the_glyph,
+                      FT_Render_Mode  render_mode,
+                      FT_Vector*      origin,
+                      FT_Bool         destroy );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_Glyph                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroy a given glyph.                                             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    glyph :: A handle to the target glyph object.                      */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Done_Glyph( FT_Glyph  glyph );
+
+  /* */
+
+
+  /* other helpful functions */
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    computations                                                       */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Matrix_Multiply                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Perform the matrix operation `b = a*b'.                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: A pointer to matrix `a'.                                      */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    b :: A pointer to matrix `b'.                                      */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The result is undefined if either `a' or `b' is zero.              */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Matrix_Multiply( const FT_Matrix*  a,
+                      FT_Matrix*        b );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Matrix_Invert                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Invert a 2x2 matrix.  Return an error if it can't be inverted.     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    matrix :: A pointer to the target matrix.  Remains untouched in    */
+  /*              case of error.                                           */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Matrix_Invert( FT_Matrix*  matrix );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTGLYPH_H__ */
+
+
+/* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftglyph.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftgxval.h
===================================================================
--- lib/3rdparty/freetype/include/ftgxval.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftgxval.h	(rÃ©vision 62573)
@@ -0,0 +1,358 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftgxval.h                                                              */
+/*                                                                         */
+/*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
+/*                                                                         */
+/*  Copyright 2004-2006, 2013 by                                           */
+/*  Masatake YAMATO, Redhat K.K,                                           */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/***************************************************************************/
+/*                                                                         */
+/* gxvalid is derived from both gxlayout module and otvalid module.        */
+/* Development of gxlayout is supported by the Information-technology      */
+/* Promotion Agency(IPA), Japan.                                           */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTGXVAL_H__
+#define __FTGXVAL_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    gx_validation                                                      */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    TrueTypeGX/AAT Validation                                          */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    An API to validate TrueTypeGX/AAT tables.                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of functions to validate     */
+  /*    some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd,  */
+  /*    trak, prop, lcar).                                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                                                                       */
+  /* Warning: Use FT_VALIDATE_XXX to validate a table.                     */
+  /*          Following definitions are for gxvalid developers.            */
+  /*                                                                       */
+  /*                                                                       */
+  /*************************************************************************/
+
+#define FT_VALIDATE_feat_INDEX     0
+#define FT_VALIDATE_mort_INDEX     1
+#define FT_VALIDATE_morx_INDEX     2
+#define FT_VALIDATE_bsln_INDEX     3
+#define FT_VALIDATE_just_INDEX     4
+#define FT_VALIDATE_kern_INDEX     5
+#define FT_VALIDATE_opbd_INDEX     6
+#define FT_VALIDATE_trak_INDEX     7
+#define FT_VALIDATE_prop_INDEX     8
+#define FT_VALIDATE_lcar_INDEX     9
+#define FT_VALIDATE_GX_LAST_INDEX  FT_VALIDATE_lcar_INDEX
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_VALIDATE_GX_LENGTH
+   *
+   * @description:
+   *   The number of tables checked in this module.  Use it as a parameter
+   *   for the `table-length' argument of function @FT_TrueTypeGX_Validate.
+   */
+#define FT_VALIDATE_GX_LENGTH     (FT_VALIDATE_GX_LAST_INDEX + 1)
+
+  /* */
+
+  /* Up to 0x1000 is used by otvalid.
+     Ox2xxx is reserved for feature OT extension. */
+#define FT_VALIDATE_GX_START 0x4000
+#define FT_VALIDATE_GX_BITFIELD( tag )                  \
+  ( FT_VALIDATE_GX_START << FT_VALIDATE_##tag##_INDEX )
+
+
+ /**********************************************************************
+  *
+  * @enum:
+  *    FT_VALIDATE_GXXXX
+  *
+  * @description:
+  *    A list of bit-field constants used with @FT_TrueTypeGX_Validate to
+  *    indicate which TrueTypeGX/AAT Type tables should be validated.
+  *
+  * @values:
+  *    FT_VALIDATE_feat ::
+  *      Validate `feat' table.
+  *
+  *    FT_VALIDATE_mort ::
+  *      Validate `mort' table.
+  *
+  *    FT_VALIDATE_morx ::
+  *      Validate `morx' table.
+  *
+  *    FT_VALIDATE_bsln ::
+  *      Validate `bsln' table.
+  *
+  *    FT_VALIDATE_just ::
+  *      Validate `just' table.
+  *
+  *    FT_VALIDATE_kern ::
+  *      Validate `kern' table.
+  *
+  *    FT_VALIDATE_opbd ::
+  *      Validate `opbd' table.
+  *
+  *    FT_VALIDATE_trak ::
+  *      Validate `trak' table.
+  *
+  *    FT_VALIDATE_prop ::
+  *      Validate `prop' table.
+  *
+  *    FT_VALIDATE_lcar ::
+  *      Validate `lcar' table.
+  *
+  *    FT_VALIDATE_GX ::
+  *      Validate all TrueTypeGX tables (feat, mort, morx, bsln, just, kern,
+  *      opbd, trak, prop and lcar).
+  *
+  */
+
+#define FT_VALIDATE_feat  FT_VALIDATE_GX_BITFIELD( feat )
+#define FT_VALIDATE_mort  FT_VALIDATE_GX_BITFIELD( mort )
+#define FT_VALIDATE_morx  FT_VALIDATE_GX_BITFIELD( morx )
+#define FT_VALIDATE_bsln  FT_VALIDATE_GX_BITFIELD( bsln )
+#define FT_VALIDATE_just  FT_VALIDATE_GX_BITFIELD( just )
+#define FT_VALIDATE_kern  FT_VALIDATE_GX_BITFIELD( kern )
+#define FT_VALIDATE_opbd  FT_VALIDATE_GX_BITFIELD( opbd )
+#define FT_VALIDATE_trak  FT_VALIDATE_GX_BITFIELD( trak )
+#define FT_VALIDATE_prop  FT_VALIDATE_GX_BITFIELD( prop )
+#define FT_VALIDATE_lcar  FT_VALIDATE_GX_BITFIELD( lcar )
+
+#define FT_VALIDATE_GX  ( FT_VALIDATE_feat | \
+                          FT_VALIDATE_mort | \
+                          FT_VALIDATE_morx | \
+                          FT_VALIDATE_bsln | \
+                          FT_VALIDATE_just | \
+                          FT_VALIDATE_kern | \
+                          FT_VALIDATE_opbd | \
+                          FT_VALIDATE_trak | \
+                          FT_VALIDATE_prop | \
+                          FT_VALIDATE_lcar )
+
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_TrueTypeGX_Validate
+  *
+  * @description:
+  *    Validate various TrueTypeGX tables to assure that all offsets and
+  *    indices are valid.  The idea is that a higher-level library that
+  *    actually does the text layout can access those tables without
+  *    error checking (which can be quite time consuming).
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  *    validation_flags ::
+  *       A bit field that specifies the tables to be validated.  See
+  *       @FT_VALIDATE_GXXXX for possible values.
+  *
+  *    table_length ::
+  *       The size of the `tables' array.  Normally, @FT_VALIDATE_GX_LENGTH
+  *       should be passed.
+  *
+  * @output:
+  *    tables ::
+  *       The array where all validated sfnt tables are stored.
+  *       The array itself must be allocated by a client.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   This function only works with TrueTypeGX fonts, returning an error
+  *   otherwise.
+  *
+  *   After use, the application should deallocate the buffers pointed to by
+  *   each `tables' element, by calling @FT_TrueTypeGX_Free.  A NULL value
+  *   indicates that the table either doesn't exist in the font, the
+  *   application hasn't asked for validation, or the validator doesn't have
+  *   the ability to validate the sfnt table.
+  */
+  FT_EXPORT( FT_Error )
+  FT_TrueTypeGX_Validate( FT_Face   face,
+                          FT_UInt   validation_flags,
+                          FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
+                          FT_UInt   table_length );
+
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_TrueTypeGX_Free
+  *
+  * @description:
+  *    Free the buffer allocated by TrueTypeGX validator.
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  *    table ::
+  *       The pointer to the buffer allocated by
+  *       @FT_TrueTypeGX_Validate.
+  *
+  * @note:
+  *   This function must be used to free the buffer allocated by
+  *   @FT_TrueTypeGX_Validate only.
+  */
+  FT_EXPORT( void )
+  FT_TrueTypeGX_Free( FT_Face   face,
+                      FT_Bytes  table );
+
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @enum:
+  *    FT_VALIDATE_CKERNXXX
+  *
+  * @description:
+  *    A list of bit-field constants used with @FT_ClassicKern_Validate
+  *    to indicate the classic kern dialect or dialects.  If the selected
+  *    type doesn't fit, @FT_ClassicKern_Validate regards the table as
+  *    invalid.
+  *
+  * @values:
+  *    FT_VALIDATE_MS ::
+  *      Handle the `kern' table as a classic Microsoft kern table.
+  *
+  *    FT_VALIDATE_APPLE ::
+  *      Handle the `kern' table as a classic Apple kern table.
+  *
+  *    FT_VALIDATE_CKERN ::
+  *      Handle the `kern' as either classic Apple or Microsoft kern table.
+  */
+#define FT_VALIDATE_MS     ( FT_VALIDATE_GX_START << 0 )
+#define FT_VALIDATE_APPLE  ( FT_VALIDATE_GX_START << 1 )
+
+#define FT_VALIDATE_CKERN  ( FT_VALIDATE_MS | FT_VALIDATE_APPLE )
+
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_ClassicKern_Validate
+  *
+  * @description:
+  *    Validate classic (16-bit format) kern table to assure that the offsets
+  *    and indices are valid.  The idea is that a higher-level library that
+  *    actually does the text layout can access those tables without error
+  *    checking (which can be quite time consuming).
+  *
+  *    The `kern' table validator in @FT_TrueTypeGX_Validate deals with both
+  *    the new 32-bit format and the classic 16-bit format, while
+  *    FT_ClassicKern_Validate only supports the classic 16-bit format.
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  *    validation_flags ::
+  *       A bit field that specifies the dialect to be validated.  See
+  *       @FT_VALIDATE_CKERNXXX for possible values.
+  *
+  * @output:
+  *    ckern_table ::
+  *       A pointer to the kern table.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   After use, the application should deallocate the buffers pointed to by
+  *   `ckern_table', by calling @FT_ClassicKern_Free.  A NULL value
+  *   indicates that the table doesn't exist in the font.
+  */
+  FT_EXPORT( FT_Error )
+  FT_ClassicKern_Validate( FT_Face    face,
+                           FT_UInt    validation_flags,
+                           FT_Bytes  *ckern_table );
+
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_ClassicKern_Free
+  *
+  * @description:
+  *    Free the buffer allocated by classic Kern validator.
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  *    table ::
+  *       The pointer to the buffer that is allocated by
+  *       @FT_ClassicKern_Validate.
+  *
+  * @note:
+  *   This function must be used to free the buffer allocated by
+  *   @FT_ClassicKern_Validate only.
+  */
+  FT_EXPORT( void )
+  FT_ClassicKern_Free( FT_Face   face,
+                       FT_Bytes  table );
+
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTGXVAL_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftgxval.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftgzip.h
===================================================================
--- lib/3rdparty/freetype/include/ftgzip.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftgzip.h	(rÃ©vision 62573)
@@ -0,0 +1,149 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftgzip.h                                                               */
+/*                                                                         */
+/*    Gzip-compressed stream support.                                      */
+/*                                                                         */
+/*  Copyright 2002-2004, 2006, 2013 by                                     */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTGZIP_H__
+#define __FTGZIP_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    gzip                                                               */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    GZIP Streams                                                       */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Using gzip-compressed font files.                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of Gzip-specific functions.  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+ /************************************************************************
+  *
+  * @function:
+  *   FT_Stream_OpenGzip
+  *
+  * @description:
+  *   Open a new stream to parse gzip-compressed font files.  This is
+  *   mainly used to support the compressed `*.pcf.gz' fonts that come
+  *   with XFree86.
+  *
+  * @input:
+  *   stream ::
+  *     The target embedding stream.
+  *
+  *   source ::
+  *     The source stream.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   The source stream must be opened _before_ calling this function.
+  *
+  *   Calling the internal function `FT_Stream_Close' on the new stream will
+  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
+  *   objects will be released to the heap.
+  *
+  *   The stream implementation is very basic and resets the decompression
+  *   process each time seeking backwards is needed within the stream.
+  *
+  *   In certain builds of the library, gzip compression recognition is
+  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
+  *   This means that if no font driver is capable of handling the raw
+  *   compressed file, the library will try to open a gzipped stream from
+  *   it and re-open the face with it.
+  *
+  *   This function may return `FT_Err_Unimplemented_Feature' if your build
+  *   of FreeType was not compiled with zlib support.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Stream_OpenGzip( FT_Stream  stream,
+                      FT_Stream  source );
+
+
+ /************************************************************************
+  *
+  * @function:
+  *   FT_Gzip_Uncompress
+  *
+  * @description:
+  *   Decompress a zipped input buffer into an output buffer.  This function
+  *   is modeled after zlib's `uncompress' function.
+  *
+  * @input:
+  *   memory ::
+  *     A FreeType memory handle.
+  *
+  *   input ::
+  *     The input buffer.
+  *
+  *   input_len ::
+  *     The length of the input buffer.
+  *
+  * @output:
+  *   output::
+  *     The output buffer.
+  *
+  * @inout:
+  *   output_len ::
+  *     Before calling the function, this is the the total size of the
+  *     output buffer, which must be large enough to hold the entire
+  *     uncompressed data (so the size of the uncompressed data must be
+  *     known in advance).  After calling the function, `output_len' is the
+  *     size of the used data in `output'.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   This function may return `FT_Err_Unimplemented_Feature' if your build
+  *   of FreeType was not compiled with zlib support.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Gzip_Uncompress( FT_Memory       memory,
+                      FT_Byte*        output,
+                      FT_ULong*       output_len,
+                      const FT_Byte*  input,
+                      FT_ULong        input_len );
+
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTGZIP_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftgzip.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftimage.h
===================================================================
--- lib/3rdparty/freetype/include/ftimage.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftimage.h	(rÃ©vision 62573)
@@ -0,0 +1,1322 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftimage.h                                                              */
+/*                                                                         */
+/*    FreeType glyph image formats and default raster interface            */
+/*    (specification).                                                     */
+/*                                                                         */
+/*  Copyright 1996-2010, 2013 by                                           */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Note: A `raster' is simply a scan-line converter, used to render      */
+  /*       FT_Outlines into FT_Bitmaps.                                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTIMAGE_H__
+#define __FTIMAGE_H__
+
+
+  /* _STANDALONE_ is from ftgrays.c */
+#ifndef _STANDALONE_
+#include <ft2build.h>
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    basic_types                                                        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Pos                                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The type FT_Pos is used to store vectorial coordinates.  Depending */
+  /*    on the context, these can represent distances in integer font      */
+  /*    units, or 16.16, or 26.6 fixed-point pixel coordinates.            */
+  /*                                                                       */
+  typedef signed long  FT_Pos;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Vector                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to store a 2D vector; coordinates are of   */
+  /*    the FT_Pos type.                                                   */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    x :: The horizontal coordinate.                                    */
+  /*    y :: The vertical coordinate.                                      */
+  /*                                                                       */
+  typedef struct  FT_Vector_
+  {
+    FT_Pos  x;
+    FT_Pos  y;
+
+  } FT_Vector;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_BBox                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to hold an outline's bounding box, i.e., the      */
+  /*    coordinates of its extrema in the horizontal and vertical          */
+  /*    directions.                                                        */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    xMin :: The horizontal minimum (left-most).                        */
+  /*                                                                       */
+  /*    yMin :: The vertical minimum (bottom-most).                        */
+  /*                                                                       */
+  /*    xMax :: The horizontal maximum (right-most).                       */
+  /*                                                                       */
+  /*    yMax :: The vertical maximum (top-most).                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The bounding box is specified with the coordinates of the lower    */
+  /*    left and the upper right corner.  In PostScript, those values are  */
+  /*    often called (llx,lly) and (urx,ury), respectively.                */
+  /*                                                                       */
+  /*    If `yMin' is negative, this value gives the glyph's descender.     */
+  /*    Otherwise, the glyph doesn't descend below the baseline.           */
+  /*    Similarly, if `ymax' is positive, this value gives the glyph's     */
+  /*    ascender.                                                          */
+  /*                                                                       */
+  /*    `xMin' gives the horizontal distance from the glyph's origin to    */
+  /*    the left edge of the glyph's bounding box.  If `xMin' is negative, */
+  /*    the glyph extends to the left of the origin.                       */
+  /*                                                                       */
+  typedef struct  FT_BBox_
+  {
+    FT_Pos  xMin, yMin;
+    FT_Pos  xMax, yMax;
+
+  } FT_BBox;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Pixel_Mode                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration type used to describe the format of pixels in a     */
+  /*    given bitmap.  Note that additional formats may be added in the    */
+  /*    future.                                                            */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_PIXEL_MODE_NONE ::                                              */
+  /*      Value~0 is reserved.                                             */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_MONO ::                                              */
+  /*      A monochrome bitmap, using 1~bit per pixel.  Note that pixels    */
+  /*      are stored in most-significant order (MSB), which means that     */
+  /*      the left-most pixel in a byte has value 128.                     */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_GRAY ::                                              */
+  /*      An 8-bit bitmap, generally used to represent anti-aliased glyph  */
+  /*      images.  Each pixel is stored in one byte.  Note that the number */
+  /*      of `gray' levels is stored in the `num_grays' field of the       */
+  /*      @FT_Bitmap structure (it generally is 256).                      */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_GRAY2 ::                                             */
+  /*      A 2-bit per pixel bitmap, used to represent embedded             */
+  /*      anti-aliased bitmaps in font files according to the OpenType     */
+  /*      specification.  We haven't found a single font using this        */
+  /*      format, however.                                                 */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_GRAY4 ::                                             */
+  /*      A 4-bit per pixel bitmap, representing embedded anti-aliased     */
+  /*      bitmaps in font files according to the OpenType specification.   */
+  /*      We haven't found a single font using this format, however.       */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_LCD ::                                               */
+  /*      An 8-bit bitmap, representing RGB or BGR decimated glyph images  */
+  /*      used for display on LCD displays; the bitmap is three times      */
+  /*      wider than the original glyph image.  See also                   */
+  /*      @FT_RENDER_MODE_LCD.                                             */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_LCD_V ::                                             */
+  /*      An 8-bit bitmap, representing RGB or BGR decimated glyph images  */
+  /*      used for display on rotated LCD displays; the bitmap is three    */
+  /*      times taller than the original glyph image.  See also            */
+  /*      @FT_RENDER_MODE_LCD_V.                                           */
+  /*                                                                       */
+  /*    FT_PIXEL_MODE_BGRA ::                                              */
+  /*      An image with four 8-bit channels per pixel, representing a      */
+  /*      color image (such as emoticons) with alpha channel.  For each    */
+  /*      pixel, the format is BGRA, which means, the blue channel comes   */
+  /*      first in memory.  The color channels are pre-multiplied and in   */
+  /*      the sRGB colorspace.  For example, full red at half-translucent  */
+  /*      opacity will be represented as `00,00,80,80', not `00,00,FF,80'. */
+  /*      See also @FT_LOAD_COLOR.                                         */
+  /*                                                                       */
+  typedef enum  FT_Pixel_Mode_
+  {
+    FT_PIXEL_MODE_NONE = 0,
+    FT_PIXEL_MODE_MONO,
+    FT_PIXEL_MODE_GRAY,
+    FT_PIXEL_MODE_GRAY2,
+    FT_PIXEL_MODE_GRAY4,
+    FT_PIXEL_MODE_LCD,
+    FT_PIXEL_MODE_LCD_V,
+    FT_PIXEL_MODE_BGRA,
+
+    FT_PIXEL_MODE_MAX      /* do not remove */
+
+  } FT_Pixel_Mode;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    ft_pixel_mode_xxx                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of deprecated constants.  Use the corresponding             */
+  /*    @FT_Pixel_Mode values instead.                                     */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    ft_pixel_mode_none  :: See @FT_PIXEL_MODE_NONE.                    */
+  /*    ft_pixel_mode_mono  :: See @FT_PIXEL_MODE_MONO.                    */
+  /*    ft_pixel_mode_grays :: See @FT_PIXEL_MODE_GRAY.                    */
+  /*    ft_pixel_mode_pal2  :: See @FT_PIXEL_MODE_GRAY2.                   */
+  /*    ft_pixel_mode_pal4  :: See @FT_PIXEL_MODE_GRAY4.                   */
+  /*                                                                       */
+#define ft_pixel_mode_none   FT_PIXEL_MODE_NONE
+#define ft_pixel_mode_mono   FT_PIXEL_MODE_MONO
+#define ft_pixel_mode_grays  FT_PIXEL_MODE_GRAY
+#define ft_pixel_mode_pal2   FT_PIXEL_MODE_GRAY2
+#define ft_pixel_mode_pal4   FT_PIXEL_MODE_GRAY4
+
+ /* */
+
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Palette_Mode                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT!                           */
+  /*                                                                       */
+  /*    An enumeration type to describe the format of a bitmap palette,    */
+  /*    used with ft_pixel_mode_pal4 and ft_pixel_mode_pal8.               */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    ft_palette_mode_rgb  :: The palette is an array of 3-byte RGB      */
+  /*                            records.                                   */
+  /*                                                                       */
+  /*    ft_palette_mode_rgba :: The palette is an array of 4-byte RGBA     */
+  /*                            records.                                   */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    As ft_pixel_mode_pal2, pal4 and pal8 are currently unused by       */
+  /*    FreeType, these types are not handled by the library itself.       */
+  /*                                                                       */
+  typedef enum  FT_Palette_Mode_
+  {
+    ft_palette_mode_rgb = 0,
+    ft_palette_mode_rgba,
+
+    ft_palette_mode_max   /* do not remove */
+
+  } FT_Palette_Mode;
+
+  /* */
+
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Bitmap                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to describe a bitmap or pixmap to the raster.     */
+  /*    Note that we now manage pixmaps of various depths through the      */
+  /*    `pixel_mode' field.                                                */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    rows         :: The number of bitmap rows.                         */
+  /*                                                                       */
+  /*    width        :: The number of pixels in bitmap row.                */
+  /*                                                                       */
+  /*    pitch        :: The pitch's absolute value is the number of bytes  */
+  /*                    taken by one bitmap row, including padding.        */
+  /*                    However, the pitch is positive when the bitmap has */
+  /*                    a `down' flow, and negative when it has an `up'    */
+  /*                    flow.  In all cases, the pitch is an offset to add */
+  /*                    to a bitmap pointer in order to go down one row.   */
+  /*                                                                       */
+  /*                    Note that `padding' means the alignment of a       */
+  /*                    bitmap to a byte border, and FreeType functions    */
+  /*                    normally align to the smallest possible integer    */
+  /*                    value.                                             */
+  /*                                                                       */
+  /*                    For the B/W rasterizer, `pitch' is always an even  */
+  /*                    number.                                            */
+  /*                                                                       */
+  /*                    To change the pitch of a bitmap (say, to make it a */
+  /*                    multiple of 4), use @FT_Bitmap_Convert.            */
+  /*                    Alternatively, you might use callback functions to */
+  /*                    directly render to the application's surface; see  */
+  /*                    the file `example2.cpp' in the tutorial for a      */
+  /*                    demonstration.                                     */
+  /*                                                                       */
+  /*    buffer       :: A typeless pointer to the bitmap buffer.  This     */
+  /*                    value should be aligned on 32-bit boundaries in    */
+  /*                    most cases.                                        */
+  /*                                                                       */
+  /*    num_grays    :: This field is only used with                       */
+  /*                    @FT_PIXEL_MODE_GRAY; it gives the number of gray   */
+  /*                    levels used in the bitmap.                         */
+  /*                                                                       */
+  /*    pixel_mode   :: The pixel mode, i.e., how pixel bits are stored.   */
+  /*                    See @FT_Pixel_Mode for possible values.            */
+  /*                                                                       */
+  /*    palette_mode :: This field is intended for paletted pixel modes;   */
+  /*                    it indicates how the palette is stored.  Not       */
+  /*                    used currently.                                    */
+  /*                                                                       */
+  /*    palette      :: A typeless pointer to the bitmap palette; this     */
+  /*                    field is intended for paletted pixel modes.  Not   */
+  /*                    used currently.                                    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*   For now, the only pixel modes supported by FreeType are mono and    */
+  /*   grays.  However, drivers might be added in the future to support    */
+  /*   more `colorful' options.                                            */
+  /*                                                                       */
+  typedef struct  FT_Bitmap_
+  {
+    int             rows;
+    int             width;
+    int             pitch;
+    unsigned char*  buffer;
+    short           num_grays;
+    char            pixel_mode;
+    char            palette_mode;
+    void*           palette;
+
+  } FT_Bitmap;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    outline_processing                                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Outline                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure is used to describe an outline to the scan-line     */
+  /*    converter.                                                         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    n_contours :: The number of contours in the outline.               */
+  /*                                                                       */
+  /*    n_points   :: The number of points in the outline.                 */
+  /*                                                                       */
+  /*    points     :: A pointer to an array of `n_points' @FT_Vector       */
+  /*                  elements, giving the outline's point coordinates.    */
+  /*                                                                       */
+  /*    tags       :: A pointer to an array of `n_points' chars, giving    */
+  /*                  each outline point's type.                           */
+  /*                                                                       */
+  /*                  If bit~0 is unset, the point is `off' the curve,     */
+  /*                  i.e., a BÃ©zier control point, while it is `on' if    */
+  /*                  set.                                                 */
+  /*                                                                       */
+  /*                  Bit~1 is meaningful for `off' points only.  If set,  */
+  /*                  it indicates a third-order BÃ©zier arc control point; */
+  /*                  and a second-order control point if unset.           */
+  /*                                                                       */
+  /*                  If bit~2 is set, bits 5-7 contain the drop-out mode  */
+  /*                  (as defined in the OpenType specification; the value */
+  /*                  is the same as the argument to the SCANMODE          */
+  /*                  instruction).                                        */
+  /*                                                                       */
+  /*                  Bits 3 and~4 are reserved for internal purposes.     */
+  /*                                                                       */
+  /*    contours   :: An array of `n_contours' shorts, giving the end      */
+  /*                  point of each contour within the outline.  For       */
+  /*                  example, the first contour is defined by the points  */
+  /*                  `0' to `contours[0]', the second one is defined by   */
+  /*                  the points `contours[0]+1' to `contours[1]', etc.    */
+  /*                                                                       */
+  /*    flags      :: A set of bit flags used to characterize the outline  */
+  /*                  and give hints to the scan-converter and hinter on   */
+  /*                  how to convert/grid-fit it.  See @FT_OUTLINE_FLAGS.  */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The B/W rasterizer only checks bit~2 in the `tags' array for the   */
+  /*    first point of each contour.  The drop-out mode as given with      */
+  /*    @FT_OUTLINE_IGNORE_DROPOUTS, @FT_OUTLINE_SMART_DROPOUTS, and       */
+  /*    @FT_OUTLINE_INCLUDE_STUBS in `flags' is then overridden.           */
+  /*                                                                       */
+  typedef struct  FT_Outline_
+  {
+    short       n_contours;      /* number of contours in glyph        */
+    short       n_points;        /* number of points in the glyph      */
+
+    FT_Vector*  points;          /* the outline's points               */
+    char*       tags;            /* the points flags                   */
+    short*      contours;        /* the contour end points             */
+
+    int         flags;           /* outline masks                      */
+
+  } FT_Outline;
+
+  /* Following limits must be consistent with */
+  /* FT_Outline.{n_contours,n_points}         */
+#define FT_OUTLINE_CONTOURS_MAX  SHRT_MAX
+#define FT_OUTLINE_POINTS_MAX    SHRT_MAX
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_OUTLINE_FLAGS                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of bit-field constants use for the flags in an outline's    */
+  /*    `flags' field.                                                     */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_OUTLINE_NONE ::                                                 */
+  /*      Value~0 is reserved.                                             */
+  /*                                                                       */
+  /*    FT_OUTLINE_OWNER ::                                                */
+  /*      If set, this flag indicates that the outline's field arrays      */
+  /*      (i.e., `points', `flags', and `contours') are `owned' by the     */
+  /*      outline object, and should thus be freed when it is destroyed.   */
+  /*                                                                       */
+  /*    FT_OUTLINE_EVEN_ODD_FILL ::                                        */
+  /*      By default, outlines are filled using the non-zero winding rule. */
+  /*      If set to 1, the outline will be filled using the even-odd fill  */
+  /*      rule (only works with the smooth rasterizer).                    */
+  /*                                                                       */
+  /*    FT_OUTLINE_REVERSE_FILL ::                                         */
+  /*      By default, outside contours of an outline are oriented in       */
+  /*      clock-wise direction, as defined in the TrueType specification.  */
+  /*      This flag is set if the outline uses the opposite direction      */
+  /*      (typically for Type~1 fonts).  This flag is ignored by the scan  */
+  /*      converter.                                                       */
+  /*                                                                       */
+  /*    FT_OUTLINE_IGNORE_DROPOUTS ::                                      */
+  /*      By default, the scan converter will try to detect drop-outs in   */
+  /*      an outline and correct the glyph bitmap to ensure consistent     */
+  /*      shape continuity.  If set, this flag hints the scan-line         */
+  /*      converter to ignore such cases.  See below for more information. */
+  /*                                                                       */
+  /*    FT_OUTLINE_SMART_DROPOUTS ::                                       */
+  /*      Select smart dropout control.  If unset, use simple dropout      */
+  /*      control.  Ignored if @FT_OUTLINE_IGNORE_DROPOUTS is set.  See    */
+  /*      below for more information.                                      */
+  /*                                                                       */
+  /*    FT_OUTLINE_INCLUDE_STUBS ::                                        */
+  /*      If set, turn pixels on for `stubs', otherwise exclude them.      */
+  /*      Ignored if @FT_OUTLINE_IGNORE_DROPOUTS is set.  See below for    */
+  /*      more information.                                                */
+  /*                                                                       */
+  /*    FT_OUTLINE_HIGH_PRECISION ::                                       */
+  /*      This flag indicates that the scan-line converter should try to   */
+  /*      convert this outline to bitmaps with the highest possible        */
+  /*      quality.  It is typically set for small character sizes.  Note   */
+  /*      that this is only a hint that might be completely ignored by a   */
+  /*      given scan-converter.                                            */
+  /*                                                                       */
+  /*    FT_OUTLINE_SINGLE_PASS ::                                          */
+  /*      This flag is set to force a given scan-converter to only use a   */
+  /*      single pass over the outline to render a bitmap glyph image.     */
+  /*      Normally, it is set for very large character sizes.  It is only  */
+  /*      a hint that might be completely ignored by a given               */
+  /*      scan-converter.                                                  */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The flags @FT_OUTLINE_IGNORE_DROPOUTS, @FT_OUTLINE_SMART_DROPOUTS, */
+  /*    and @FT_OUTLINE_INCLUDE_STUBS are ignored by the smooth            */
+  /*    rasterizer.                                                        */
+  /*                                                                       */
+  /*    There exists a second mechanism to pass the drop-out mode to the   */
+  /*    B/W rasterizer; see the `tags' field in @FT_Outline.               */
+  /*                                                                       */
+  /*    Please refer to the description of the `SCANTYPE' instruction in   */
+  /*    the OpenType specification (in file `ttinst1.doc') how simple      */
+  /*    drop-outs, smart drop-outs, and stubs are defined.                 */
+  /*                                                                       */
+#define FT_OUTLINE_NONE             0x0
+#define FT_OUTLINE_OWNER            0x1
+#define FT_OUTLINE_EVEN_ODD_FILL    0x2
+#define FT_OUTLINE_REVERSE_FILL     0x4
+#define FT_OUTLINE_IGNORE_DROPOUTS  0x8
+#define FT_OUTLINE_SMART_DROPOUTS   0x10
+#define FT_OUTLINE_INCLUDE_STUBS    0x20
+
+#define FT_OUTLINE_HIGH_PRECISION   0x100
+#define FT_OUTLINE_SINGLE_PASS      0x200
+
+
+ /*************************************************************************
+  *
+  * @enum:
+  *   ft_outline_flags
+  *
+  * @description:
+  *   These constants are deprecated.  Please use the corresponding
+  *   @FT_OUTLINE_FLAGS values.
+  *
+  * @values:
+  *   ft_outline_none            :: See @FT_OUTLINE_NONE.
+  *   ft_outline_owner           :: See @FT_OUTLINE_OWNER.
+  *   ft_outline_even_odd_fill   :: See @FT_OUTLINE_EVEN_ODD_FILL.
+  *   ft_outline_reverse_fill    :: See @FT_OUTLINE_REVERSE_FILL.
+  *   ft_outline_ignore_dropouts :: See @FT_OUTLINE_IGNORE_DROPOUTS.
+  *   ft_outline_high_precision  :: See @FT_OUTLINE_HIGH_PRECISION.
+  *   ft_outline_single_pass     :: See @FT_OUTLINE_SINGLE_PASS.
+  */
+#define ft_outline_none             FT_OUTLINE_NONE
+#define ft_outline_owner            FT_OUTLINE_OWNER
+#define ft_outline_even_odd_fill    FT_OUTLINE_EVEN_ODD_FILL
+#define ft_outline_reverse_fill     FT_OUTLINE_REVERSE_FILL
+#define ft_outline_ignore_dropouts  FT_OUTLINE_IGNORE_DROPOUTS
+#define ft_outline_high_precision   FT_OUTLINE_HIGH_PRECISION
+#define ft_outline_single_pass      FT_OUTLINE_SINGLE_PASS
+
+  /* */
+
+#define FT_CURVE_TAG( flag )  ( flag & 3 )
+
+#define FT_CURVE_TAG_ON            1
+#define FT_CURVE_TAG_CONIC         0
+#define FT_CURVE_TAG_CUBIC         2
+
+#define FT_CURVE_TAG_HAS_SCANMODE  4
+
+#define FT_CURVE_TAG_TOUCH_X       8  /* reserved for the TrueType hinter */
+#define FT_CURVE_TAG_TOUCH_Y      16  /* reserved for the TrueType hinter */
+
+#define FT_CURVE_TAG_TOUCH_BOTH    ( FT_CURVE_TAG_TOUCH_X | \
+                                     FT_CURVE_TAG_TOUCH_Y )
+
+#define FT_Curve_Tag_On       FT_CURVE_TAG_ON
+#define FT_Curve_Tag_Conic    FT_CURVE_TAG_CONIC
+#define FT_Curve_Tag_Cubic    FT_CURVE_TAG_CUBIC
+#define FT_Curve_Tag_Touch_X  FT_CURVE_TAG_TOUCH_X
+#define FT_Curve_Tag_Touch_Y  FT_CURVE_TAG_TOUCH_Y
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Outline_MoveToFunc                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function pointer type used to describe the signature of a `move  */
+  /*    to' function during outline walking/decomposition.                 */
+  /*                                                                       */
+  /*    A `move to' is emitted to start a new contour in an outline.       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    to   :: A pointer to the target point of the `move to'.            */
+  /*                                                                       */
+  /*    user :: A typeless pointer, which is passed from the caller of the */
+  /*            decomposition function.                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    Error code.  0~means success.                                      */
+  /*                                                                       */
+  typedef int
+  (*FT_Outline_MoveToFunc)( const FT_Vector*  to,
+                            void*             user );
+
+#define FT_Outline_MoveTo_Func  FT_Outline_MoveToFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Outline_LineToFunc                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function pointer type used to describe the signature of a `line  */
+  /*    to' function during outline walking/decomposition.                 */
+  /*                                                                       */
+  /*    A `line to' is emitted to indicate a segment in the outline.       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    to   :: A pointer to the target point of the `line to'.            */
+  /*                                                                       */
+  /*    user :: A typeless pointer, which is passed from the caller of the */
+  /*            decomposition function.                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    Error code.  0~means success.                                      */
+  /*                                                                       */
+  typedef int
+  (*FT_Outline_LineToFunc)( const FT_Vector*  to,
+                            void*             user );
+
+#define FT_Outline_LineTo_Func  FT_Outline_LineToFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Outline_ConicToFunc                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function pointer type used to describe the signature of a `conic */
+  /*    to' function during outline walking or decomposition.              */
+  /*                                                                       */
+  /*    A `conic to' is emitted to indicate a second-order BÃ©zier arc in   */
+  /*    the outline.                                                       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    control :: An intermediate control point between the last position */
+  /*               and the new target in `to'.                             */
+  /*                                                                       */
+  /*    to      :: A pointer to the target end point of the conic arc.     */
+  /*                                                                       */
+  /*    user    :: A typeless pointer, which is passed from the caller of  */
+  /*               the decomposition function.                             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    Error code.  0~means success.                                      */
+  /*                                                                       */
+  typedef int
+  (*FT_Outline_ConicToFunc)( const FT_Vector*  control,
+                             const FT_Vector*  to,
+                             void*             user );
+
+#define FT_Outline_ConicTo_Func  FT_Outline_ConicToFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Outline_CubicToFunc                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function pointer type used to describe the signature of a `cubic */
+  /*    to' function during outline walking or decomposition.              */
+  /*                                                                       */
+  /*    A `cubic to' is emitted to indicate a third-order BÃ©zier arc.      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    control1 :: A pointer to the first BÃ©zier control point.           */
+  /*                                                                       */
+  /*    control2 :: A pointer to the second BÃ©zier control point.          */
+  /*                                                                       */
+  /*    to       :: A pointer to the target end point.                     */
+  /*                                                                       */
+  /*    user     :: A typeless pointer, which is passed from the caller of */
+  /*                the decomposition function.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    Error code.  0~means success.                                      */
+  /*                                                                       */
+  typedef int
+  (*FT_Outline_CubicToFunc)( const FT_Vector*  control1,
+                             const FT_Vector*  control2,
+                             const FT_Vector*  to,
+                             void*             user );
+
+#define FT_Outline_CubicTo_Func  FT_Outline_CubicToFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Outline_Funcs                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure to hold various function pointers used during outline  */
+  /*    decomposition in order to emit segments, conic, and cubic BÃ©ziers. */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    move_to  :: The `move to' emitter.                                 */
+  /*                                                                       */
+  /*    line_to  :: The segment emitter.                                   */
+  /*                                                                       */
+  /*    conic_to :: The second-order BÃ©zier arc emitter.                   */
+  /*                                                                       */
+  /*    cubic_to :: The third-order BÃ©zier arc emitter.                    */
+  /*                                                                       */
+  /*    shift    :: The shift that is applied to coordinates before they   */
+  /*                are sent to the emitter.                               */
+  /*                                                                       */
+  /*    delta    :: The delta that is applied to coordinates before they   */
+  /*                are sent to the emitter, but after the shift.          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The point coordinates sent to the emitters are the transformed     */
+  /*    version of the original coordinates (this is important for high    */
+  /*    accuracy during scan-conversion).  The transformation is simple:   */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      x' = (x << shift) - delta                                        */
+  /*      y' = (x << shift) - delta                                        */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    Set the values of `shift' and `delta' to~0 to get the original     */
+  /*    point coordinates.                                                 */
+  /*                                                                       */
+  typedef struct  FT_Outline_Funcs_
+  {
+    FT_Outline_MoveToFunc   move_to;
+    FT_Outline_LineToFunc   line_to;
+    FT_Outline_ConicToFunc  conic_to;
+    FT_Outline_CubicToFunc  cubic_to;
+
+    int                     shift;
+    FT_Pos                  delta;
+
+  } FT_Outline_Funcs;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    basic_types                                                        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_IMAGE_TAG                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This macro converts four-letter tags to an unsigned long type.     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Since many 16-bit compilers don't like 32-bit enumerations, you    */
+  /*    should redefine this macro in case of problems to something like   */
+  /*    this:                                                              */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  value         */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    to get a simple enumeration without assigning special numbers.     */
+  /*                                                                       */
+#ifndef FT_IMAGE_TAG
+#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  \
+          value = ( ( (unsigned long)_x1 << 24 ) | \
+                    ( (unsigned long)_x2 << 16 ) | \
+                    ( (unsigned long)_x3 << 8  ) | \
+                      (unsigned long)_x4         )
+#endif /* FT_IMAGE_TAG */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Glyph_Format                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration type used to describe the format of a given glyph   */
+  /*    image.  Note that this version of FreeType only supports two image */
+  /*    formats, even though future font drivers will be able to register  */
+  /*    their own format.                                                  */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_GLYPH_FORMAT_NONE ::                                            */
+  /*      The value~0 is reserved.                                         */
+  /*                                                                       */
+  /*    FT_GLYPH_FORMAT_COMPOSITE ::                                       */
+  /*      The glyph image is a composite of several other images.  This    */
+  /*      format is _only_ used with @FT_LOAD_NO_RECURSE, and is used to   */
+  /*      report compound glyphs (like accented characters).               */
+  /*                                                                       */
+  /*    FT_GLYPH_FORMAT_BITMAP ::                                          */
+  /*      The glyph image is a bitmap, and can be described as an          */
+  /*      @FT_Bitmap.  You generally need to access the `bitmap' field of  */
+  /*      the @FT_GlyphSlotRec structure to read it.                       */
+  /*                                                                       */
+  /*    FT_GLYPH_FORMAT_OUTLINE ::                                         */
+  /*      The glyph image is a vectorial outline made of line segments     */
+  /*      and BÃ©zier arcs; it can be described as an @FT_Outline; you      */
+  /*      generally want to access the `outline' field of the              */
+  /*      @FT_GlyphSlotRec structure to read it.                           */
+  /*                                                                       */
+  /*    FT_GLYPH_FORMAT_PLOTTER ::                                         */
+  /*      The glyph image is a vectorial path with no inside and outside   */
+  /*      contours.  Some Type~1 fonts, like those in the Hershey family,  */
+  /*      contain glyphs in this format.  These are described as           */
+  /*      @FT_Outline, but FreeType isn't currently capable of rendering   */
+  /*      them correctly.                                                  */
+  /*                                                                       */
+  typedef enum  FT_Glyph_Format_
+  {
+    FT_IMAGE_TAG( FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0 ),
+
+    FT_IMAGE_TAG( FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p' ),
+    FT_IMAGE_TAG( FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's' ),
+    FT_IMAGE_TAG( FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l' ),
+    FT_IMAGE_TAG( FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't' )
+
+  } FT_Glyph_Format;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    ft_glyph_format_xxx                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of deprecated constants.  Use the corresponding             */
+  /*    @FT_Glyph_Format values instead.                                   */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    ft_glyph_format_none      :: See @FT_GLYPH_FORMAT_NONE.            */
+  /*    ft_glyph_format_composite :: See @FT_GLYPH_FORMAT_COMPOSITE.       */
+  /*    ft_glyph_format_bitmap    :: See @FT_GLYPH_FORMAT_BITMAP.          */
+  /*    ft_glyph_format_outline   :: See @FT_GLYPH_FORMAT_OUTLINE.         */
+  /*    ft_glyph_format_plotter   :: See @FT_GLYPH_FORMAT_PLOTTER.         */
+  /*                                                                       */
+#define ft_glyph_format_none       FT_GLYPH_FORMAT_NONE
+#define ft_glyph_format_composite  FT_GLYPH_FORMAT_COMPOSITE
+#define ft_glyph_format_bitmap     FT_GLYPH_FORMAT_BITMAP
+#define ft_glyph_format_outline    FT_GLYPH_FORMAT_OUTLINE
+#define ft_glyph_format_plotter    FT_GLYPH_FORMAT_PLOTTER
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****            R A S T E R   D E F I N I T I O N S                *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* A raster is a scan converter, in charge of rendering an outline into  */
+  /* a a bitmap.  This section contains the public API for rasters.        */
+  /*                                                                       */
+  /* Note that in FreeType 2, all rasters are now encapsulated within      */
+  /* specific modules called `renderers'.  See `ftrender.h' for more       */
+  /* details on renderers.                                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    raster                                                             */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Scanline Converter                                                 */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    How vectorial outlines are converted into bitmaps and pixmaps.     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains technical definitions.                       */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Raster                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle (pointer) to a raster object.  Each object can be used    */
+  /*    independently to convert an outline into a bitmap or pixmap.       */
+  /*                                                                       */
+  typedef struct FT_RasterRec_*  FT_Raster;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Span                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a single span of gray (or black) pixels  */
+  /*    when rendering a monochrome or anti-aliased bitmap.                */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    x        :: The span's horizontal start position.                  */
+  /*                                                                       */
+  /*    len      :: The span's length in pixels.                           */
+  /*                                                                       */
+  /*    coverage :: The span color/coverage, ranging from 0 (background)   */
+  /*                to 255 (foreground).  Only used for anti-aliased       */
+  /*                rendering.                                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This structure is used by the span drawing callback type named     */
+  /*    @FT_SpanFunc that takes the y~coordinate of the span as a          */
+  /*    parameter.                                                         */
+  /*                                                                       */
+  /*    The coverage value is always between 0 and 255.  If you want less  */
+  /*    gray values, the callback function has to reduce them.             */
+  /*                                                                       */
+  typedef struct  FT_Span_
+  {
+    short           x;
+    unsigned short  len;
+    unsigned char   coverage;
+
+  } FT_Span;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_SpanFunc                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used as a call-back by the anti-aliased renderer in     */
+  /*    order to let client applications draw themselves the gray pixel    */
+  /*    spans on each scan line.                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    y     :: The scanline's y~coordinate.                              */
+  /*                                                                       */
+  /*    count :: The number of spans to draw on this scanline.             */
+  /*                                                                       */
+  /*    spans :: A table of `count' spans to draw on the scanline.         */
+  /*                                                                       */
+  /*    user  :: User-supplied data that is passed to the callback.        */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This callback allows client applications to directly render the    */
+  /*    gray spans of the anti-aliased bitmap to any kind of surfaces.     */
+  /*                                                                       */
+  /*    This can be used to write anti-aliased outlines directly to a      */
+  /*    given background bitmap, and even perform translucency.            */
+  /*                                                                       */
+  /*    Note that the `count' field cannot be greater than a fixed value   */
+  /*    defined by the `FT_MAX_GRAY_SPANS' configuration macro in          */
+  /*    `ftoption.h'.  By default, this value is set to~32, which means    */
+  /*    that if there are more than 32~spans on a given scanline, the      */
+  /*    callback is called several times with the same `y' parameter in    */
+  /*    order to draw all callbacks.                                       */
+  /*                                                                       */
+  /*    Otherwise, the callback is only called once per scan-line, and     */
+  /*    only for those scanlines that do have `gray' pixels on them.       */
+  /*                                                                       */
+  typedef void
+  (*FT_SpanFunc)( int             y,
+                  int             count,
+                  const FT_Span*  spans,
+                  void*           user );
+
+#define FT_Raster_Span_Func  FT_SpanFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_BitTest_Func                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT.                           */
+  /*                                                                       */
+  /*    A function used as a call-back by the monochrome scan-converter    */
+  /*    to test whether a given target pixel is already set to the drawing */
+  /*    `color'.  These tests are crucial to implement drop-out control    */
+  /*    per-se the TrueType spec.                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    y     :: The pixel's y~coordinate.                                 */
+  /*                                                                       */
+  /*    x     :: The pixel's x~coordinate.                                 */
+  /*                                                                       */
+  /*    user  :: User-supplied data that is passed to the callback.        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*   1~if the pixel is `set', 0~otherwise.                               */
+  /*                                                                       */
+  typedef int
+  (*FT_Raster_BitTest_Func)( int    y,
+                             int    x,
+                             void*  user );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_BitSet_Func                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT.                           */
+  /*                                                                       */
+  /*    A function used as a call-back by the monochrome scan-converter    */
+  /*    to set an individual target pixel.  This is crucial to implement   */
+  /*    drop-out control according to the TrueType specification.          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    y     :: The pixel's y~coordinate.                                 */
+  /*                                                                       */
+  /*    x     :: The pixel's x~coordinate.                                 */
+  /*                                                                       */
+  /*    user  :: User-supplied data that is passed to the callback.        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    1~if the pixel is `set', 0~otherwise.                              */
+  /*                                                                       */
+  typedef void
+  (*FT_Raster_BitSet_Func)( int    y,
+                            int    x,
+                            void*  user );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_RASTER_FLAG_XXX                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A list of bit flag constants as used in the `flags' field of a     */
+  /*    @FT_Raster_Params structure.                                       */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_RASTER_FLAG_DEFAULT :: This value is 0.                         */
+  /*                                                                       */
+  /*    FT_RASTER_FLAG_AA      :: This flag is set to indicate that an     */
+  /*                              anti-aliased glyph image should be       */
+  /*                              generated.  Otherwise, it will be        */
+  /*                              monochrome (1-bit).                      */
+  /*                                                                       */
+  /*    FT_RASTER_FLAG_DIRECT  :: This flag is set to indicate direct      */
+  /*                              rendering.  In this mode, client         */
+  /*                              applications must provide their own span */
+  /*                              callback.  This lets them directly       */
+  /*                              draw or compose over an existing bitmap. */
+  /*                              If this bit is not set, the target       */
+  /*                              pixmap's buffer _must_ be zeroed before  */
+  /*                              rendering.                               */
+  /*                                                                       */
+  /*                              Note that for now, direct rendering is   */
+  /*                              only possible with anti-aliased glyphs.  */
+  /*                                                                       */
+  /*    FT_RASTER_FLAG_CLIP    :: This flag is only used in direct         */
+  /*                              rendering mode.  If set, the output will */
+  /*                              be clipped to a box specified in the     */
+  /*                              `clip_box' field of the                  */
+  /*                              @FT_Raster_Params structure.             */
+  /*                                                                       */
+  /*                              Note that by default, the glyph bitmap   */
+  /*                              is clipped to the target pixmap, except  */
+  /*                              in direct rendering mode where all spans */
+  /*                              are generated if no clipping box is set. */
+  /*                                                                       */
+#define FT_RASTER_FLAG_DEFAULT  0x0
+#define FT_RASTER_FLAG_AA       0x1
+#define FT_RASTER_FLAG_DIRECT   0x2
+#define FT_RASTER_FLAG_CLIP     0x4
+
+  /* deprecated */
+#define ft_raster_flag_default  FT_RASTER_FLAG_DEFAULT
+#define ft_raster_flag_aa       FT_RASTER_FLAG_AA
+#define ft_raster_flag_direct   FT_RASTER_FLAG_DIRECT
+#define ft_raster_flag_clip     FT_RASTER_FLAG_CLIP
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Raster_Params                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure to hold the arguments used by a raster's render        */
+  /*    function.                                                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    target      :: The target bitmap.                                  */
+  /*                                                                       */
+  /*    source      :: A pointer to the source glyph image (e.g., an       */
+  /*                   @FT_Outline).                                       */
+  /*                                                                       */
+  /*    flags       :: The rendering flags.                                */
+  /*                                                                       */
+  /*    gray_spans  :: The gray span drawing callback.                     */
+  /*                                                                       */
+  /*    black_spans :: The black span drawing callback.  UNIMPLEMENTED!    */
+  /*                                                                       */
+  /*    bit_test    :: The bit test callback.  UNIMPLEMENTED!              */
+  /*                                                                       */
+  /*    bit_set     :: The bit set callback.  UNIMPLEMENTED!               */
+  /*                                                                       */
+  /*    user        :: User-supplied data that is passed to each drawing   */
+  /*                   callback.                                           */
+  /*                                                                       */
+  /*    clip_box    :: An optional clipping box.  It is only used in       */
+  /*                   direct rendering mode.  Note that coordinates here  */
+  /*                   should be expressed in _integer_ pixels (and not in */
+  /*                   26.6 fixed-point units).                            */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    An anti-aliased glyph bitmap is drawn if the @FT_RASTER_FLAG_AA    */
+  /*    bit flag is set in the `flags' field, otherwise a monochrome       */
+  /*    bitmap is generated.                                               */
+  /*                                                                       */
+  /*    If the @FT_RASTER_FLAG_DIRECT bit flag is set in `flags', the      */
+  /*    raster will call the `gray_spans' callback to draw gray pixel      */
+  /*    spans, in the case of an aa glyph bitmap, it will call             */
+  /*    `black_spans', and `bit_test' and `bit_set' in the case of a       */
+  /*    monochrome bitmap.  This allows direct composition over a          */
+  /*    pre-existing bitmap through user-provided callbacks to perform the */
+  /*    span drawing/composition.                                          */
+  /*                                                                       */
+  /*    Note that the `bit_test' and `bit_set' callbacks are required when */
+  /*    rendering a monochrome bitmap, as they are crucial to implement    */
+  /*    correct drop-out control as defined in the TrueType specification. */
+  /*                                                                       */
+  typedef struct  FT_Raster_Params_
+  {
+    const FT_Bitmap*        target;
+    const void*             source;
+    int                     flags;
+    FT_SpanFunc             gray_spans;
+    FT_SpanFunc             black_spans;  /* doesn't work! */
+    FT_Raster_BitTest_Func  bit_test;     /* doesn't work! */
+    FT_Raster_BitSet_Func   bit_set;      /* doesn't work! */
+    void*                   user;
+    FT_BBox                 clip_box;
+
+  } FT_Raster_Params;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_NewFunc                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to create a new raster object.                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    memory :: A handle to the memory allocator.                        */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    raster :: A handle to the new raster object.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    Error code.  0~means success.                                      */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The `memory' parameter is a typeless pointer in order to avoid     */
+  /*    un-wanted dependencies on the rest of the FreeType code.  In       */
+  /*    practice, it is an @FT_Memory object, i.e., a handle to the        */
+  /*    standard FreeType memory allocator.  However, this field can be    */
+  /*    completely ignored by a given raster implementation.               */
+  /*                                                                       */
+  typedef int
+  (*FT_Raster_NewFunc)( void*       memory,
+                        FT_Raster*  raster );
+
+#define FT_Raster_New_Func  FT_Raster_NewFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_DoneFunc                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to destroy a given raster object.                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    raster :: A handle to the raster object.                           */
+  /*                                                                       */
+  typedef void
+  (*FT_Raster_DoneFunc)( FT_Raster  raster );
+
+#define FT_Raster_Done_Func  FT_Raster_DoneFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_ResetFunc                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    FreeType provides an area of memory called the `render pool',      */
+  /*    available to all registered rasters.  This pool can be freely used */
+  /*    during a given scan-conversion but is shared by all rasters.  Its  */
+  /*    content is thus transient.                                         */
+  /*                                                                       */
+  /*    This function is called each time the render pool changes, or just */
+  /*    after a new raster object is created.                              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    raster    :: A handle to the new raster object.                    */
+  /*                                                                       */
+  /*    pool_base :: The address in memory of the render pool.             */
+  /*                                                                       */
+  /*    pool_size :: The size in bytes of the render pool.                 */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Rasters can ignore the render pool and rely on dynamic memory      */
+  /*    allocation if they want to (a handle to the memory allocator is    */
+  /*    passed to the raster constructor).  However, this is not           */
+  /*    recommended for efficiency purposes.                               */
+  /*                                                                       */
+  typedef void
+  (*FT_Raster_ResetFunc)( FT_Raster       raster,
+                          unsigned char*  pool_base,
+                          unsigned long   pool_size );
+
+#define FT_Raster_Reset_Func  FT_Raster_ResetFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_SetModeFunc                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function is a generic facility to change modes or attributes  */
+  /*    in a given raster.  This can be used for debugging purposes, or    */
+  /*    simply to allow implementation-specific `features' in a given      */
+  /*    raster module.                                                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    raster :: A handle to the new raster object.                       */
+  /*                                                                       */
+  /*    mode   :: A 4-byte tag used to name the mode or property.          */
+  /*                                                                       */
+  /*    args   :: A pointer to the new mode/property to use.               */
+  /*                                                                       */
+  typedef int
+  (*FT_Raster_SetModeFunc)( FT_Raster      raster,
+                            unsigned long  mode,
+                            void*          args );
+
+#define FT_Raster_Set_Mode_Func  FT_Raster_SetModeFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Raster_RenderFunc                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Invoke a given raster to scan-convert a given glyph image into a   */
+  /*    target bitmap.                                                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    raster :: A handle to the raster object.                           */
+  /*                                                                       */
+  /*    params :: A pointer to an @FT_Raster_Params structure used to      */
+  /*              store the rendering parameters.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    Error code.  0~means success.                                      */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The exact format of the source image depends on the raster's glyph */
+  /*    format defined in its @FT_Raster_Funcs structure.  It can be an    */
+  /*    @FT_Outline or anything else in order to support a large array of  */
+  /*    glyph formats.                                                     */
+  /*                                                                       */
+  /*    Note also that the render function can fail and return a           */
+  /*    `FT_Err_Unimplemented_Feature' error code if the raster used does  */
+  /*    not support direct composition.                                    */
+  /*                                                                       */
+  /*    XXX: For now, the standard raster doesn't support direct           */
+  /*         composition but this should change for the final release (see */
+  /*         the files `demos/src/ftgrays.c' and `demos/src/ftgrays2.c'    */
+  /*         for examples of distinct implementations that support direct  */
+  /*         composition).                                                 */
+  /*                                                                       */
+  typedef int
+  (*FT_Raster_RenderFunc)( FT_Raster                raster,
+                           const FT_Raster_Params*  params );
+
+#define FT_Raster_Render_Func  FT_Raster_RenderFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Raster_Funcs                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*   A structure used to describe a given raster class to the library.   */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    glyph_format  :: The supported glyph format for this raster.       */
+  /*                                                                       */
+  /*    raster_new    :: The raster constructor.                           */
+  /*                                                                       */
+  /*    raster_reset  :: Used to reset the render pool within the raster.  */
+  /*                                                                       */
+  /*    raster_render :: A function to render a glyph into a given bitmap. */
+  /*                                                                       */
+  /*    raster_done   :: The raster destructor.                            */
+  /*                                                                       */
+  typedef struct  FT_Raster_Funcs_
+  {
+    FT_Glyph_Format        glyph_format;
+    FT_Raster_NewFunc      raster_new;
+    FT_Raster_ResetFunc    raster_reset;
+    FT_Raster_SetModeFunc  raster_set_mode;
+    FT_Raster_RenderFunc   raster_render;
+    FT_Raster_DoneFunc     raster_done;
+
+  } FT_Raster_Funcs;
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTIMAGE_H__ */
+
+
+/* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftimage.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftincrem.h
===================================================================
--- lib/3rdparty/freetype/include/ftincrem.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftincrem.h	(rÃ©vision 62573)
@@ -0,0 +1,353 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftincrem.h                                                             */
+/*                                                                         */
+/*    FreeType incremental loading (specification).                        */
+/*                                                                         */
+/*  Copyright 2002, 2003, 2006, 2007, 2008, 2010 by                        */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTINCREM_H__
+#define __FTINCREM_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /***************************************************************************
+   *
+   * @section:
+   *    incremental
+   *
+   * @title:
+   *    Incremental Loading
+   *
+   * @abstract:
+   *    Custom Glyph Loading.
+   *
+   * @description:
+   *   This section contains various functions used to perform so-called
+   *   `incremental' glyph loading.  This is a mode where all glyphs loaded
+   *   from a given @FT_Face are provided by the client application,
+   *
+   *   Apart from that, all other tables are loaded normally from the font
+   *   file.  This mode is useful when FreeType is used within another
+   *   engine, e.g., a PostScript Imaging Processor.
+   *
+   *   To enable this mode, you must use @FT_Open_Face, passing an
+   *   @FT_Parameter with the @FT_PARAM_TAG_INCREMENTAL tag and an
+   *   @FT_Incremental_Interface value.  See the comments for
+   *   @FT_Incremental_InterfaceRec for an example.
+   *
+   */
+
+
+  /***************************************************************************
+   *
+   * @type:
+   *   FT_Incremental
+   *
+   * @description:
+   *   An opaque type describing a user-provided object used to implement
+   *   `incremental' glyph loading within FreeType.  This is used to support
+   *   embedded fonts in certain environments (e.g., PostScript interpreters),
+   *   where the glyph data isn't in the font file, or must be overridden by
+   *   different values.
+   *
+   * @note:
+   *   It is up to client applications to create and implement @FT_Incremental
+   *   objects, as long as they provide implementations for the methods
+   *   @FT_Incremental_GetGlyphDataFunc, @FT_Incremental_FreeGlyphDataFunc
+   *   and @FT_Incremental_GetGlyphMetricsFunc.
+   *
+   *   See the description of @FT_Incremental_InterfaceRec to understand how
+   *   to use incremental objects with FreeType.
+   *
+   */
+  typedef struct FT_IncrementalRec_*  FT_Incremental;
+
+
+  /***************************************************************************
+   *
+   * @struct:
+   *   FT_Incremental_MetricsRec
+   *
+   * @description:
+   *   A small structure used to contain the basic glyph metrics returned
+   *   by the @FT_Incremental_GetGlyphMetricsFunc method.
+   *
+   * @fields:
+   *   bearing_x ::
+   *     Left bearing, in font units.
+   *
+   *   bearing_y ::
+   *     Top bearing, in font units.
+   *
+   *   advance ::
+   *     Horizontal component of glyph advance, in font units.
+   *
+   *   advance_v ::
+   *     Vertical component of glyph advance, in font units.
+   *
+   * @note:
+   *   These correspond to horizontal or vertical metrics depending on the
+   *   value of the `vertical' argument to the function
+   *   @FT_Incremental_GetGlyphMetricsFunc.
+   *
+   */
+  typedef struct  FT_Incremental_MetricsRec_
+  {
+    FT_Long  bearing_x;
+    FT_Long  bearing_y;
+    FT_Long  advance;
+    FT_Long  advance_v;     /* since 2.3.12 */
+
+  } FT_Incremental_MetricsRec;
+
+
+  /***************************************************************************
+   *
+   * @struct:
+   *   FT_Incremental_Metrics
+   *
+   * @description:
+   *   A handle to an @FT_Incremental_MetricsRec structure.
+   *
+   */
+   typedef struct FT_Incremental_MetricsRec_*  FT_Incremental_Metrics;
+
+
+  /***************************************************************************
+   *
+   * @type:
+   *   FT_Incremental_GetGlyphDataFunc
+   *
+   * @description:
+   *   A function called by FreeType to access a given glyph's data bytes
+   *   during @FT_Load_Glyph or @FT_Load_Char if incremental loading is
+   *   enabled.
+   *
+   *   Note that the format of the glyph's data bytes depends on the font
+   *   file format.  For TrueType, it must correspond to the raw bytes within
+   *   the `glyf' table.  For PostScript formats, it must correspond to the
+   *   *unencrypted* charstring bytes, without any `lenIV' header.  It is
+   *   undefined for any other format.
+   *
+   * @input:
+   *   incremental ::
+   *     Handle to an opaque @FT_Incremental handle provided by the client
+   *     application.
+   *
+   *   glyph_index ::
+   *     Index of relevant glyph.
+   *
+   * @output:
+   *   adata ::
+   *     A structure describing the returned glyph data bytes (which will be
+   *     accessed as a read-only byte block).
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   If this function returns successfully the method
+   *   @FT_Incremental_FreeGlyphDataFunc will be called later to release
+   *   the data bytes.
+   *
+   *   Nested calls to @FT_Incremental_GetGlyphDataFunc can happen for
+   *   compound glyphs.
+   *
+   */
+  typedef FT_Error
+  (*FT_Incremental_GetGlyphDataFunc)( FT_Incremental  incremental,
+                                      FT_UInt         glyph_index,
+                                      FT_Data*        adata );
+
+
+  /***************************************************************************
+   *
+   * @type:
+   *   FT_Incremental_FreeGlyphDataFunc
+   *
+   * @description:
+   *   A function used to release the glyph data bytes returned by a
+   *   successful call to @FT_Incremental_GetGlyphDataFunc.
+   *
+   * @input:
+   *   incremental ::
+   *     A handle to an opaque @FT_Incremental handle provided by the client
+   *     application.
+   *
+   *   data ::
+   *     A structure describing the glyph data bytes (which will be accessed
+   *     as a read-only byte block).
+   *
+   */
+  typedef void
+  (*FT_Incremental_FreeGlyphDataFunc)( FT_Incremental  incremental,
+                                       FT_Data*        data );
+
+
+  /***************************************************************************
+   *
+   * @type:
+   *   FT_Incremental_GetGlyphMetricsFunc
+   *
+   * @description:
+   *   A function used to retrieve the basic metrics of a given glyph index
+   *   before accessing its data.  This is necessary because, in certain
+   *   formats like TrueType, the metrics are stored in a different place from
+   *   the glyph images proper.
+   *
+   * @input:
+   *   incremental ::
+   *     A handle to an opaque @FT_Incremental handle provided by the client
+   *     application.
+   *
+   *   glyph_index ::
+   *     Index of relevant glyph.
+   *
+   *   vertical ::
+   *     If true, return vertical metrics.
+   *
+   *   ametrics ::
+   *     This parameter is used for both input and output.
+   *     The original glyph metrics, if any, in font units.  If metrics are
+   *     not available all the values must be set to zero.
+   *
+   * @output:
+   *   ametrics ::
+   *     The replacement glyph metrics in font units.
+   *
+   */
+  typedef FT_Error
+  (*FT_Incremental_GetGlyphMetricsFunc)
+                      ( FT_Incremental              incremental,
+                        FT_UInt                     glyph_index,
+                        FT_Bool                     vertical,
+                        FT_Incremental_MetricsRec  *ametrics );
+
+
+  /**************************************************************************
+   *
+   * @struct:
+   *   FT_Incremental_FuncsRec
+   *
+   * @description:
+   *   A table of functions for accessing fonts that load data
+   *   incrementally.  Used in @FT_Incremental_InterfaceRec.
+   *
+   * @fields:
+   *   get_glyph_data ::
+   *     The function to get glyph data.  Must not be null.
+   *
+   *   free_glyph_data ::
+   *     The function to release glyph data.  Must not be null.
+   *
+   *   get_glyph_metrics ::
+   *     The function to get glyph metrics.  May be null if the font does
+   *     not provide overriding glyph metrics.
+   *
+   */
+  typedef struct  FT_Incremental_FuncsRec_
+  {
+    FT_Incremental_GetGlyphDataFunc     get_glyph_data;
+    FT_Incremental_FreeGlyphDataFunc    free_glyph_data;
+    FT_Incremental_GetGlyphMetricsFunc  get_glyph_metrics;
+
+  } FT_Incremental_FuncsRec;
+
+
+  /***************************************************************************
+   *
+   * @struct:
+   *   FT_Incremental_InterfaceRec
+   *
+   * @description:
+   *   A structure to be used with @FT_Open_Face to indicate that the user
+   *   wants to support incremental glyph loading.  You should use it with
+   *   @FT_PARAM_TAG_INCREMENTAL as in the following example:
+   *
+   *     {
+   *       FT_Incremental_InterfaceRec  inc_int;
+   *       FT_Parameter                 parameter;
+   *       FT_Open_Args                 open_args;
+   *
+   *
+   *       // set up incremental descriptor
+   *       inc_int.funcs  = my_funcs;
+   *       inc_int.object = my_object;
+   *
+   *       // set up optional parameter
+   *       parameter.tag  = FT_PARAM_TAG_INCREMENTAL;
+   *       parameter.data = &inc_int;
+   *
+   *       // set up FT_Open_Args structure
+   *       open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;
+   *       open_args.pathname   = my_font_pathname;
+   *       open_args.num_params = 1;
+   *       open_args.params     = &parameter; // we use one optional argument
+   *
+   *       // open the font
+   *       error = FT_Open_Face( library, &open_args, index, &face );
+   *       ...
+   *     }
+   *
+   */
+  typedef struct  FT_Incremental_InterfaceRec_
+  {
+    const FT_Incremental_FuncsRec*  funcs;
+    FT_Incremental                  object;
+
+  } FT_Incremental_InterfaceRec;
+
+
+  /***************************************************************************
+   *
+   * @type:
+   *   FT_Incremental_Interface
+   *
+   * @description:
+   *   A pointer to an @FT_Incremental_InterfaceRec structure.
+   *
+   */
+  typedef FT_Incremental_InterfaceRec*   FT_Incremental_Interface;
+
+
+  /***************************************************************************
+   *
+   * @constant:
+   *   FT_PARAM_TAG_INCREMENTAL
+   *
+   * @description:
+   *   A constant used as the tag of @FT_Parameter structures to indicate
+   *   an incremental loading object to be used by FreeType.
+   *
+   */
+#define FT_PARAM_TAG_INCREMENTAL  FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
+
+  /* */
+
+FT_END_HEADER
+
+#endif /* __FTINCREM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftincrem.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftlcdfil.h
===================================================================
--- lib/3rdparty/freetype/include/ftlcdfil.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftlcdfil.h	(rÃ©vision 62573)
@@ -0,0 +1,251 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftlcdfil.h                                                             */
+/*                                                                         */
+/*    FreeType API for color filtering of subpixel bitmap glyphs           */
+/*    (specification).                                                     */
+/*                                                                         */
+/*  Copyright 2006-2008, 2010, 2013 by                                     */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FT_LCD_FILTER_H__
+#define __FT_LCD_FILTER_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /***************************************************************************
+   *
+   * @section:
+   *   lcd_filtering
+   *
+   * @title:
+   *   LCD Filtering
+   *
+   * @abstract:
+   *   Reduce color fringes of LCD-optimized bitmaps.
+   *
+   * @description:
+   *   The @FT_Library_SetLcdFilter API can be used to specify a low-pass
+   *   filter, which is then applied to LCD-optimized bitmaps generated
+   *   through @FT_Render_Glyph.  This is useful to reduce color fringes
+   *   that would occur with unfiltered rendering.
+   *
+   *   Note that no filter is active by default, and that this function is
+   *   *not* implemented in default builds of the library.  You need to
+   *   #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your `ftoption.h' file
+   *   in order to activate it.
+   *
+   *   FreeType generates alpha coverage maps, which are linear by nature.
+   *   For instance, the value 0x80 in bitmap representation means that
+   *   (within numerical precision) 0x80/0xff fraction of that pixel is
+   *   covered by the glyph's outline.  The blending function for placing
+   *   text over a background is
+   *
+   *   {
+   *     dst = alpha * src + (1 - alpha) * dst    ,
+   *   }
+   *
+   *   which is known as OVER.  However, when calculating the output of the
+   *   OVER operator, the source colors should first be transformed to a
+   *   linear color space, then alpha blended in that space, and transformed
+   *   back to the output color space.
+   *
+   *   When linear light blending is used, the default FIR5 filtering
+   *   weights (as given by FT_LCD_FILTER_DEFAULT) are no longer optimal, as
+   *   they have been designed for black on white rendering while lacking
+   *   gamma correction.  To preserve color neutrality, weights for a FIR5
+   *   filter should be chosen according to two free parameters `a' and `c',
+   *   and the FIR weights should be
+   *
+   *   {
+   *     [a - c, a + c, 2 * a, a + c, a - c]    .
+   *   }
+   *
+   *   This formula generates equal weights for all the color primaries
+   *   across the filter kernel, which makes it colorless.  One suggested
+   *   set of weights is
+   *
+   *   {
+   *     [0x10, 0x50, 0x60, 0x50, 0x10]    ,
+   *   }
+   *
+   *   where `a' has value 0x30 and `b' value 0x20.  The weights in filter
+   *   may have a sum larger than 0x100, which increases coloration slightly
+   *   but also improves contrast.
+   */
+
+
+  /****************************************************************************
+   *
+   * @enum:
+   *   FT_LcdFilter
+   *
+   * @description:
+   *   A list of values to identify various types of LCD filters.
+   *
+   * @values:
+   *   FT_LCD_FILTER_NONE ::
+   *     Do not perform filtering.  When used with subpixel rendering, this
+   *     results in sometimes severe color fringes.
+   *
+   *   FT_LCD_FILTER_DEFAULT ::
+   *     The default filter reduces color fringes considerably, at the cost
+   *     of a slight blurriness in the output.
+   *
+   *   FT_LCD_FILTER_LIGHT ::
+   *     The light filter is a variant that produces less blurriness at the
+   *     cost of slightly more color fringes than the default one.  It might
+   *     be better, depending on taste, your monitor, or your personal vision.
+   *
+   *   FT_LCD_FILTER_LEGACY ::
+   *     This filter corresponds to the original libXft color filter.  It
+   *     provides high contrast output but can exhibit really bad color
+   *     fringes if glyphs are not extremely well hinted to the pixel grid.
+   *     In other words, it only works well if the TrueType bytecode
+   *     interpreter is enabled *and* high-quality hinted fonts are used.
+   *
+   *     This filter is only provided for comparison purposes, and might be
+   *     disabled or stay unsupported in the future.
+   *
+   * @since:
+   *   2.3.0
+   */
+  typedef enum  FT_LcdFilter_
+  {
+    FT_LCD_FILTER_NONE    = 0,
+    FT_LCD_FILTER_DEFAULT = 1,
+    FT_LCD_FILTER_LIGHT   = 2,
+    FT_LCD_FILTER_LEGACY  = 16,
+
+    FT_LCD_FILTER_MAX   /* do not remove */
+
+  } FT_LcdFilter;
+
+
+  /**************************************************************************
+   *
+   * @func:
+   *   FT_Library_SetLcdFilter
+   *
+   * @description:
+   *   This function is used to apply color filtering to LCD decimated
+   *   bitmaps, like the ones used when calling @FT_Render_Glyph with
+   *   @FT_RENDER_MODE_LCD or @FT_RENDER_MODE_LCD_V.
+   *
+   * @input:
+   *   library ::
+   *     A handle to the target library instance.
+   *
+   *   filter ::
+   *     The filter type.
+   *
+   *     You can use @FT_LCD_FILTER_NONE here to disable this feature, or
+   *     @FT_LCD_FILTER_DEFAULT to use a default filter that should work
+   *     well on most LCD screens.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   This feature is always disabled by default.  Clients must make an
+   *   explicit call to this function with a `filter' value other than
+   *   @FT_LCD_FILTER_NONE in order to enable it.
+   *
+   *   Due to *PATENTS* covering subpixel rendering, this function doesn't
+   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
+   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
+   *   defined in your build of the library, which should correspond to all
+   *   default builds of FreeType.
+   *
+   *   The filter affects glyph bitmaps rendered through @FT_Render_Glyph,
+   *   @FT_Outline_Get_Bitmap, @FT_Load_Glyph, and @FT_Load_Char.
+   *
+   *   It does _not_ affect the output of @FT_Outline_Render and
+   *   @FT_Outline_Get_Bitmap.
+   *
+   *   If this feature is activated, the dimensions of LCD glyph bitmaps are
+   *   either larger or taller than the dimensions of the corresponding
+   *   outline with regards to the pixel grid.  For example, for
+   *   @FT_RENDER_MODE_LCD, the filter adds up to 3~pixels to the left, and
+   *   up to 3~pixels to the right.
+   *
+   *   The bitmap offset values are adjusted correctly, so clients shouldn't
+   *   need to modify their layout and glyph positioning code when enabling
+   *   the filter.
+   *
+   * @since:
+   *   2.3.0
+   */
+  FT_EXPORT( FT_Error )
+  FT_Library_SetLcdFilter( FT_Library    library,
+                           FT_LcdFilter  filter );
+
+
+  /**************************************************************************
+   *
+   * @func:
+   *   FT_Library_SetLcdFilterWeights
+   *
+   * @description:
+   *   Use this function to override the filter weights selected by
+   *   @FT_Library_SetLcdFilter.  By default, FreeType uses the quintuple
+   *   (0x00, 0x55, 0x56, 0x55, 0x00) for FT_LCD_FILTER_LIGHT, and (0x10,
+   *   0x40, 0x70, 0x40, 0x10) for FT_LCD_FILTER_DEFAULT and
+   *   FT_LCD_FILTER_LEGACY.
+   *
+   * @input:
+   *   library ::
+   *     A handle to the target library instance.
+   *
+   *   weights ::
+   *     A pointer to an array; the function copies the first five bytes and
+   *     uses them to specify the filter weights.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   Due to *PATENTS* covering subpixel rendering, this function doesn't
+   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
+   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
+   *   defined in your build of the library, which should correspond to all
+   *   default builds of FreeType.
+   *
+   *   This function must be called after @FT_Library_SetLcdFilter to have
+   *   any effect.
+   *
+   * @since:
+   *   2.4.0
+   */
+  FT_EXPORT( FT_Error )
+  FT_Library_SetLcdFilterWeights( FT_Library      library,
+                                  unsigned char  *weights );
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FT_LCD_FILTER_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftlcdfil.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftlist.h
===================================================================
--- lib/3rdparty/freetype/include/ftlist.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftlist.h	(rÃ©vision 62573)
@@ -0,0 +1,277 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftlist.h                                                               */
+/*                                                                         */
+/*    Generic list support for FreeType (specification).                   */
+/*                                                                         */
+/*  Copyright 1996-2001, 2003, 2007, 2010, 2013 by                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  This file implements functions relative to list processing.  Its     */
+  /*  data structures are defined in `freetype.h'.                         */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTLIST_H__
+#define __FTLIST_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    list_processing                                                    */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    List Processing                                                    */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Simple management of lists.                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains various definitions related to list          */
+  /*    processing using doubly-linked nodes.                              */
+  /*                                                                       */
+  /* <Order>                                                               */
+  /*    FT_List                                                            */
+  /*    FT_ListNode                                                        */
+  /*    FT_ListRec                                                         */
+  /*    FT_ListNodeRec                                                     */
+  /*                                                                       */
+  /*    FT_List_Add                                                        */
+  /*    FT_List_Insert                                                     */
+  /*    FT_List_Find                                                       */
+  /*    FT_List_Remove                                                     */
+  /*    FT_List_Up                                                         */
+  /*    FT_List_Iterate                                                    */
+  /*    FT_List_Iterator                                                   */
+  /*    FT_List_Finalize                                                   */
+  /*    FT_List_Destructor                                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Find                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Find the list node for a given listed object.                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    list :: A pointer to the parent list.                              */
+  /*    data :: The address of the listed object.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    List node.  NULL if it wasn't found.                               */
+  /*                                                                       */
+  FT_EXPORT( FT_ListNode )
+  FT_List_Find( FT_List  list,
+                void*    data );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Add                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Append an element to the end of a list.                            */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    list :: A pointer to the parent list.                              */
+  /*    node :: The node to append.                                        */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_List_Add( FT_List      list,
+               FT_ListNode  node );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Insert                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Insert an element at the head of a list.                           */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    list :: A pointer to parent list.                                  */
+  /*    node :: The node to insert.                                        */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_List_Insert( FT_List      list,
+                  FT_ListNode  node );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Remove                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Remove a node from a list.  This function doesn't check whether    */
+  /*    the node is in the list!                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    node :: The node to remove.                                        */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    list :: A pointer to the parent list.                              */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_List_Remove( FT_List      list,
+                  FT_ListNode  node );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Up                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Move a node to the head/top of a list.  Used to maintain LRU       */
+  /*    lists.                                                             */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    list :: A pointer to the parent list.                              */
+  /*    node :: The node to move.                                          */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_List_Up( FT_List      list,
+              FT_ListNode  node );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_List_Iterator                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An FT_List iterator function that is called during a list parse    */
+  /*    by @FT_List_Iterate.                                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    node :: The current iteration list node.                           */
+  /*                                                                       */
+  /*    user :: A typeless pointer passed to @FT_List_Iterate.             */
+  /*            Can be used to point to the iteration's state.             */
+  /*                                                                       */
+  typedef FT_Error
+  (*FT_List_Iterator)( FT_ListNode  node,
+                       void*        user );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Iterate                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Parse a list and calls a given iterator function on each element.  */
+  /*    Note that parsing is stopped as soon as one of the iterator calls  */
+  /*    returns a non-zero value.                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    list     :: A handle to the list.                                  */
+  /*    iterator :: An iterator function, called on each node of the list. */
+  /*    user     :: A user-supplied field that is passed as the second     */
+  /*                argument to the iterator.                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result (a FreeType error code) of the last iterator call.      */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_List_Iterate( FT_List           list,
+                   FT_List_Iterator  iterator,
+                   void*             user );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_List_Destructor                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An @FT_List iterator function that is called during a list         */
+  /*    finalization by @FT_List_Finalize to destroy all elements in a     */
+  /*    given list.                                                        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    system :: The current system object.                               */
+  /*                                                                       */
+  /*    data   :: The current object to destroy.                           */
+  /*                                                                       */
+  /*    user   :: A typeless pointer passed to @FT_List_Iterate.  It can   */
+  /*              be used to point to the iteration's state.               */
+  /*                                                                       */
+  typedef void
+  (*FT_List_Destructor)( FT_Memory  memory,
+                         void*      data,
+                         void*      user );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_List_Finalize                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroy all elements in the list as well as the list itself.       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    list    :: A handle to the list.                                   */
+  /*                                                                       */
+  /*    destroy :: A list destructor that will be applied to each element  */
+  /*               of the list.                                            */
+  /*                                                                       */
+  /*    memory  :: The current memory object that handles deallocation.    */
+  /*                                                                       */
+  /*    user    :: A user-supplied field that is passed as the last        */
+  /*               argument to the destructor.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function expects that all nodes added by @FT_List_Add or      */
+  /*    @FT_List_Insert have been dynamically allocated.                   */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_List_Finalize( FT_List             list,
+                    FT_List_Destructor  destroy,
+                    FT_Memory           memory,
+                    void*               user );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTLIST_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftlist.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftlzw.h
===================================================================
--- lib/3rdparty/freetype/include/ftlzw.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftlzw.h	(rÃ©vision 62573)
@@ -0,0 +1,99 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftlzw.h                                                                */
+/*                                                                         */
+/*    LZW-compressed stream support.                                       */
+/*                                                                         */
+/*  Copyright 2004, 2006 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTLZW_H__
+#define __FTLZW_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    lzw                                                                */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    LZW Streams                                                        */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Using LZW-compressed font files.                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of LZW-specific functions.   */
+  /*                                                                       */
+  /*************************************************************************/
+
+ /************************************************************************
+  *
+  * @function:
+  *   FT_Stream_OpenLZW
+  *
+  * @description:
+  *   Open a new stream to parse LZW-compressed font files.  This is
+  *   mainly used to support the compressed `*.pcf.Z' fonts that come
+  *   with XFree86.
+  *
+  * @input:
+  *   stream :: The target embedding stream.
+  *
+  *   source :: The source stream.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   The source stream must be opened _before_ calling this function.
+  *
+  *   Calling the internal function `FT_Stream_Close' on the new stream will
+  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
+  *   objects will be released to the heap.
+  *
+  *   The stream implementation is very basic and resets the decompression
+  *   process each time seeking backwards is needed within the stream
+  *
+  *   In certain builds of the library, LZW compression recognition is
+  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
+  *   This means that if no font driver is capable of handling the raw
+  *   compressed file, the library will try to open a LZW stream from it
+  *   and re-open the face with it.
+  *
+  *   This function may return `FT_Err_Unimplemented_Feature' if your build
+  *   of FreeType was not compiled with LZW support.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Stream_OpenLZW( FT_Stream  stream,
+                     FT_Stream  source );
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTLZW_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftlzw.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftmac.h
===================================================================
--- lib/3rdparty/freetype/include/ftmac.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftmac.h	(rÃ©vision 62573)
@@ -0,0 +1,274 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftmac.h                                                                */
+/*                                                                         */
+/*    Additional Mac-specific API.                                         */
+/*                                                                         */
+/*  Copyright 1996-2001, 2004, 2006, 2007, 2013 by                         */
+/*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/* NOTE: Include this file after FT_FREETYPE_H and after any               */
+/*       Mac-specific headers (because this header uses Mac types such as  */
+/*       Handle, FSSpec, FSRef, etc.)                                      */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTMAC_H__
+#define __FTMAC_H__
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+
+/* gcc-3.4.1 and later can warn about functions tagged as deprecated */
+#ifndef FT_DEPRECATED_ATTRIBUTE
+#if defined(__GNUC__)                                               && \
+    ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#define FT_DEPRECATED_ATTRIBUTE  __attribute__((deprecated))
+#else
+#define FT_DEPRECATED_ATTRIBUTE
+#endif
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    mac_specific                                                       */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Mac Specific Interface                                             */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Only available on the Macintosh.                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The following definitions are only available if FreeType is        */
+  /*    compiled on a Macintosh.                                           */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Face_From_FOND                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new face object from a FOND resource.                     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library resource.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    fond       :: A FOND resource.                                     */
+  /*                                                                       */
+  /*    face_index :: Only supported for the -1 `sanity check' special     */
+  /*                  case.                                                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aface      :: A handle to a new face object.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Notes>                                                               */
+  /*    This function can be used to create @FT_Face objects from fonts    */
+  /*    that are installed in the system as follows.                       */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      fond = GetResource( 'FOND', fontName );                          */
+  /*      error = FT_New_Face_From_FOND( library, fond, 0, &face );        */
+  /*    }                                                                  */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Face_From_FOND( FT_Library  library,
+                         Handle      fond,
+                         FT_Long     face_index,
+                         FT_Face    *aface )
+                       FT_DEPRECATED_ATTRIBUTE;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_GetFile_From_Mac_Name                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return an FSSpec for the disk file containing the named font.      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    fontName   :: Mac OS name of the font (e.g., Times New Roman       */
+  /*                  Bold).                                               */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    pathSpec   :: FSSpec to the file.  For passing to                  */
+  /*                  @FT_New_Face_From_FSSpec.                            */
+  /*                                                                       */
+  /*    face_index :: Index of the face.  For passing to                   */
+  /*                  @FT_New_Face_From_FSSpec.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_GetFile_From_Mac_Name( const char*  fontName,
+                            FSSpec*      pathSpec,
+                            FT_Long*     face_index )
+                          FT_DEPRECATED_ATTRIBUTE;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_GetFile_From_Mac_ATS_Name                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return an FSSpec for the disk file containing the named font.      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    fontName   :: Mac OS name of the font in ATS framework.            */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    pathSpec   :: FSSpec to the file. For passing to                   */
+  /*                  @FT_New_Face_From_FSSpec.                            */
+  /*                                                                       */
+  /*    face_index :: Index of the face. For passing to                    */
+  /*                  @FT_New_Face_From_FSSpec.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_GetFile_From_Mac_ATS_Name( const char*  fontName,
+                                FSSpec*      pathSpec,
+                                FT_Long*     face_index )
+                              FT_DEPRECATED_ATTRIBUTE;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_GetFilePath_From_Mac_ATS_Name                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return a pathname of the disk file and face index for given font   */
+  /*    name that is handled by ATS framework.                             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    fontName    :: Mac OS name of the font in ATS framework.           */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    path        :: Buffer to store pathname of the file.  For passing  */
+  /*                   to @FT_New_Face.  The client must allocate this     */
+  /*                   buffer before calling this function.                */
+  /*                                                                       */
+  /*    maxPathSize :: Lengths of the buffer `path' that client allocated. */
+  /*                                                                       */
+  /*    face_index  :: Index of the face.  For passing to @FT_New_Face.    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_GetFilePath_From_Mac_ATS_Name( const char*  fontName,
+                                    UInt8*       path,
+                                    UInt32       maxPathSize,
+                                    FT_Long*     face_index )
+                                  FT_DEPRECATED_ATTRIBUTE;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Face_From_FSSpec                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new face object from a given resource and typeface index  */
+  /*    using an FSSpec to the font file.                                  */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library resource.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    spec       :: FSSpec to the font file.                             */
+  /*                                                                       */
+  /*    face_index :: The index of the face within the resource.  The      */
+  /*                  first face has index~0.                              */
+  /* <Output>                                                              */
+  /*    aface      :: A handle to a new face object.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    @FT_New_Face_From_FSSpec is identical to @FT_New_Face except       */
+  /*    it accepts an FSSpec instead of a path.                            */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Face_From_FSSpec( FT_Library     library,
+                           const FSSpec  *spec,
+                           FT_Long        face_index,
+                           FT_Face       *aface )
+                         FT_DEPRECATED_ATTRIBUTE;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Face_From_FSRef                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new face object from a given resource and typeface index  */
+  /*    using an FSRef to the font file.                                   */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library resource.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    spec       :: FSRef to the font file.                              */
+  /*                                                                       */
+  /*    face_index :: The index of the face within the resource.  The      */
+  /*                  first face has index~0.                              */
+  /* <Output>                                                              */
+  /*    aface      :: A handle to a new face object.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    @FT_New_Face_From_FSRef is identical to @FT_New_Face except        */
+  /*    it accepts an FSRef instead of a path.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Face_From_FSRef( FT_Library    library,
+                          const FSRef  *ref,
+                          FT_Long       face_index,
+                          FT_Face      *aface )
+                        FT_DEPRECATED_ATTRIBUTE;
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __FTMAC_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftmac.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftmm.h
===================================================================
--- lib/3rdparty/freetype/include/ftmm.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftmm.h	(rÃ©vision 62573)
@@ -0,0 +1,377 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftmm.h                                                                 */
+/*                                                                         */
+/*    FreeType Multiple Master font interface (specification).             */
+/*                                                                         */
+/*  Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 by                   */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTMM_H__
+#define __FTMM_H__
+
+
+#include <ft2build.h>
+#include FT_TYPE1_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    multiple_masters                                                   */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Multiple Masters                                                   */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    How to manage Multiple Masters fonts.                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The following types and functions are used to manage Multiple      */
+  /*    Master fonts, i.e., the selection of specific design instances by  */
+  /*    setting design axis coordinates.                                   */
+  /*                                                                       */
+  /*    George Williams has extended this interface to make it work with   */
+  /*    both Type~1 Multiple Masters fonts and GX distortable (var)        */
+  /*    fonts.  Some of these routines only work with MM fonts, others     */
+  /*    will work with both types.  They are similar enough that a         */
+  /*    consistent interface makes sense.                                  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_MM_Axis                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to model a given axis in design space for  */
+  /*    Multiple Masters fonts.                                            */
+  /*                                                                       */
+  /*    This structure can't be used for GX var fonts.                     */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    name    :: The axis's name.                                        */
+  /*                                                                       */
+  /*    minimum :: The axis's minimum design coordinate.                   */
+  /*                                                                       */
+  /*    maximum :: The axis's maximum design coordinate.                   */
+  /*                                                                       */
+  typedef struct  FT_MM_Axis_
+  {
+    FT_String*  name;
+    FT_Long     minimum;
+    FT_Long     maximum;
+
+  } FT_MM_Axis;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Multi_Master                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model the axes and space of a Multiple Masters */
+  /*    font.                                                              */
+  /*                                                                       */
+  /*    This structure can't be used for GX var fonts.                     */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    num_axis    :: Number of axes.  Cannot exceed~4.                   */
+  /*                                                                       */
+  /*    num_designs :: Number of designs; should be normally 2^num_axis    */
+  /*                   even though the Type~1 specification strangely      */
+  /*                   allows for intermediate designs to be present. This */
+  /*                   number cannot exceed~16.                            */
+  /*                                                                       */
+  /*    axis        :: A table of axis descriptors.                        */
+  /*                                                                       */
+  typedef struct  FT_Multi_Master_
+  {
+    FT_UInt     num_axis;
+    FT_UInt     num_designs;
+    FT_MM_Axis  axis[T1_MAX_MM_AXIS];
+
+  } FT_Multi_Master;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Var_Axis                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to model a given axis in design space for  */
+  /*    Multiple Masters and GX var fonts.                                 */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    name    :: The axis's name.                                        */
+  /*               Not always meaningful for GX.                           */
+  /*                                                                       */
+  /*    minimum :: The axis's minimum design coordinate.                   */
+  /*                                                                       */
+  /*    def     :: The axis's default design coordinate.                   */
+  /*               FreeType computes meaningful default values for MM; it  */
+  /*               is then an integer value, not in 16.16 format.          */
+  /*                                                                       */
+  /*    maximum :: The axis's maximum design coordinate.                   */
+  /*                                                                       */
+  /*    tag     :: The axis's tag (the GX equivalent to `name').           */
+  /*               FreeType provides default values for MM if possible.    */
+  /*                                                                       */
+  /*    strid   :: The entry in `name' table (another GX version of        */
+  /*               `name').                                                */
+  /*               Not meaningful for MM.                                  */
+  /*                                                                       */
+  typedef struct  FT_Var_Axis_
+  {
+    FT_String*  name;
+
+    FT_Fixed    minimum;
+    FT_Fixed    def;
+    FT_Fixed    maximum;
+
+    FT_ULong    tag;
+    FT_UInt     strid;
+
+  } FT_Var_Axis;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Var_Named_Style                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to model a named style in a GX var font.   */
+  /*                                                                       */
+  /*    This structure can't be used for MM fonts.                         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    coords :: The design coordinates for this style.                   */
+  /*              This is an array with one entry for each axis.           */
+  /*                                                                       */
+  /*    strid  :: The entry in `name' table identifying this style.        */
+  /*                                                                       */
+  typedef struct  FT_Var_Named_Style_
+  {
+    FT_Fixed*  coords;
+    FT_UInt    strid;
+
+  } FT_Var_Named_Style;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_MM_Var                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model the axes and space of a Multiple Masters */
+  /*    or GX var distortable font.                                        */
+  /*                                                                       */
+  /*    Some fields are specific to one format and not to the other.       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    num_axis        :: The number of axes.  The maximum value is~4 for */
+  /*                       MM; no limit in GX.                             */
+  /*                                                                       */
+  /*    num_designs     :: The number of designs; should be normally       */
+  /*                       2^num_axis for MM fonts.  Not meaningful for GX */
+  /*                       (where every glyph could have a different       */
+  /*                       number of designs).                             */
+  /*                                                                       */
+  /*    num_namedstyles :: The number of named styles; only meaningful for */
+  /*                       GX that allows certain design coordinates to    */
+  /*                       have a string ID (in the `name' table)          */
+  /*                       associated with them.  The font can tell the    */
+  /*                       user that, for example, Weight=1.5 is `Bold'.   */
+  /*                                                                       */
+  /*    axis            :: A table of axis descriptors.                    */
+  /*                       GX fonts contain slightly more data than MM.    */
+  /*                                                                       */
+  /*    namedstyles     :: A table of named styles.                        */
+  /*                       Only meaningful with GX.                        */
+  /*                                                                       */
+  typedef struct  FT_MM_Var_
+  {
+    FT_UInt              num_axis;
+    FT_UInt              num_designs;
+    FT_UInt              num_namedstyles;
+    FT_Var_Axis*         axis;
+    FT_Var_Named_Style*  namedstyle;
+
+  } FT_MM_Var;
+
+
+  /* */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Multi_Master                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the Multiple Master descriptor of a given font.           */
+  /*                                                                       */
+  /*    This function can't be used with GX fonts.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face    :: A handle to the source face.                            */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    amaster :: The Multiple Masters descriptor.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Multi_Master( FT_Face           face,
+                       FT_Multi_Master  *amaster );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_MM_Var                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the Multiple Master/GX var descriptor of a given font.    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face    :: A handle to the source face.                            */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    amaster :: The Multiple Masters/GX var descriptor.                 */
+  /*               Allocates a data structure, which the user must free.   */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_MM_Var( FT_Face      face,
+                 FT_MM_Var*  *amaster );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_MM_Design_Coordinates                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    For Multiple Masters fonts, choose an interpolated font design     */
+  /*    through design coordinates.                                        */
+  /*                                                                       */
+  /*    This function can't be used with GX fonts.                         */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face       :: A handle to the source face.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    num_coords :: The number of design coordinates (must be equal to   */
+  /*                  the number of axes in the font).                     */
+  /*                                                                       */
+  /*    coords     :: An array of design coordinates.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_MM_Design_Coordinates( FT_Face   face,
+                                FT_UInt   num_coords,
+                                FT_Long*  coords );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Var_Design_Coordinates                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    For Multiple Master or GX Var fonts, choose an interpolated font   */
+  /*    design through design coordinates.                                 */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face       :: A handle to the source face.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    num_coords :: The number of design coordinates (must be equal to   */
+  /*                  the number of axes in the font).                     */
+  /*                                                                       */
+  /*    coords     :: An array of design coordinates.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_Var_Design_Coordinates( FT_Face    face,
+                                 FT_UInt    num_coords,
+                                 FT_Fixed*  coords );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_MM_Blend_Coordinates                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    For Multiple Masters and GX var fonts, choose an interpolated font */
+  /*    design through normalized blend coordinates.                       */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    face       :: A handle to the source face.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    num_coords :: The number of design coordinates (must be equal to   */
+  /*                  the number of axes in the font).                     */
+  /*                                                                       */
+  /*    coords     :: The design coordinates array (each element must be   */
+  /*                  between 0 and 1.0).                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_MM_Blend_Coordinates( FT_Face    face,
+                               FT_UInt    num_coords,
+                               FT_Fixed*  coords );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Var_Blend_Coordinates                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This is another name of @FT_Set_MM_Blend_Coordinates.              */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_Var_Blend_Coordinates( FT_Face    face,
+                                FT_UInt    num_coords,
+                                FT_Fixed*  coords );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTMM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftmm.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftmodapi.h
===================================================================
--- lib/3rdparty/freetype/include/ftmodapi.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftmodapi.h	(rÃ©vision 62573)
@@ -0,0 +1,641 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftmodapi.h                                                             */
+/*                                                                         */
+/*    FreeType modules public interface (specification).                   */
+/*                                                                         */
+/*  Copyright 1996-2003, 2006, 2008-2010, 2012, 2013 by                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTMODAPI_H__
+#define __FTMODAPI_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    module_management                                                  */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Module Management                                                  */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    How to add, upgrade, remove, and control modules from FreeType.    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The definitions below are used to manage modules within FreeType.  */
+  /*    Modules can be added, upgraded, and removed at runtime.            */
+  /*    Additionally, some module properties can be controlled also.       */
+  /*                                                                       */
+  /*    Here is a list of possible values of the `module_name' field in    */
+  /*    the @FT_Module_Class structure.                                    */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      autofitter                                                       */
+  /*      bdf                                                              */
+  /*      cff                                                              */
+  /*      gxvalid                                                          */
+  /*      otvalid                                                          */
+  /*      pcf                                                              */
+  /*      pfr                                                              */
+  /*      psaux                                                            */
+  /*      pshinter                                                         */
+  /*      psnames                                                          */
+  /*      raster1, raster5                                                 */
+  /*      sfnt                                                             */
+  /*      smooth, smooth-lcd, smooth-lcdv                                  */
+  /*      truetype                                                         */
+  /*      type1                                                            */
+  /*      type42                                                           */
+  /*      t1cid                                                            */
+  /*      winfonts                                                         */
+  /*    }                                                                  */
+  /*                                                                       */
+  /*    Note that the FreeType Cache sub-system is not a FreeType module.  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /* module bit flags */
+#define FT_MODULE_FONT_DRIVER         1  /* this module is a font driver  */
+#define FT_MODULE_RENDERER            2  /* this module is a renderer     */
+#define FT_MODULE_HINTER              4  /* this module is a glyph hinter */
+#define FT_MODULE_STYLER              8  /* this module is a styler       */
+
+#define FT_MODULE_DRIVER_SCALABLE     0x100   /* the driver supports      */
+                                              /* scalable fonts           */
+#define FT_MODULE_DRIVER_NO_OUTLINES  0x200   /* the driver does not      */
+                                              /* support vector outlines  */
+#define FT_MODULE_DRIVER_HAS_HINTER   0x400   /* the driver provides its  */
+                                              /* own hinter               */
+
+
+  /* deprecated values */
+#define ft_module_font_driver         FT_MODULE_FONT_DRIVER
+#define ft_module_renderer            FT_MODULE_RENDERER
+#define ft_module_hinter              FT_MODULE_HINTER
+#define ft_module_styler              FT_MODULE_STYLER
+
+#define ft_module_driver_scalable     FT_MODULE_DRIVER_SCALABLE
+#define ft_module_driver_no_outlines  FT_MODULE_DRIVER_NO_OUTLINES
+#define ft_module_driver_has_hinter   FT_MODULE_DRIVER_HAS_HINTER
+
+
+  typedef FT_Pointer  FT_Module_Interface;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Module_Constructor                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to initialize (not create) a new module object.    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    module :: The module to initialize.                                */
+  /*                                                                       */
+  typedef FT_Error
+  (*FT_Module_Constructor)( FT_Module  module );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Module_Destructor                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to finalize (not destroy) a given module object.   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    module :: The module to finalize.                                  */
+  /*                                                                       */
+  typedef void
+  (*FT_Module_Destructor)( FT_Module  module );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Module_Requester                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to query a given module for a specific interface.  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    module :: The module to be searched.                               */
+  /*                                                                       */
+  /*    name ::   The name of the interface in the module.                 */
+  /*                                                                       */
+  typedef FT_Module_Interface
+  (*FT_Module_Requester)( FT_Module    module,
+                          const char*  name );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Module_Class                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The module class descriptor.                                       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    module_flags    :: Bit flags describing the module.                */
+  /*                                                                       */
+  /*    module_size     :: The size of one module object/instance in       */
+  /*                       bytes.                                          */
+  /*                                                                       */
+  /*    module_name     :: The name of the module.                         */
+  /*                                                                       */
+  /*    module_version  :: The version, as a 16.16 fixed number            */
+  /*                       (major.minor).                                  */
+  /*                                                                       */
+  /*    module_requires :: The version of FreeType this module requires,   */
+  /*                       as a 16.16 fixed number (major.minor).  Starts  */
+  /*                       at version 2.0, i.e., 0x20000.                  */
+  /*                                                                       */
+  /*    module_init     :: The initializing function.                      */
+  /*                                                                       */
+  /*    module_done     :: The finalizing function.                        */
+  /*                                                                       */
+  /*    get_interface   :: The interface requesting function.              */
+  /*                                                                       */
+  typedef struct  FT_Module_Class_
+  {
+    FT_ULong               module_flags;
+    FT_Long                module_size;
+    const FT_String*       module_name;
+    FT_Fixed               module_version;
+    FT_Fixed               module_requires;
+
+    const void*            module_interface;
+
+    FT_Module_Constructor  module_init;
+    FT_Module_Destructor   module_done;
+    FT_Module_Requester    get_interface;
+
+  } FT_Module_Class;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Add_Module                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Add a new module to a given library instance.                      */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library :: A handle to the library object.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    clazz   :: A pointer to class descriptor for the module.           */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    An error will be returned if a module already exists by that name, */
+  /*    or if the module requires a version of FreeType that is too great. */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Add_Module( FT_Library              library,
+                 const FT_Module_Class*  clazz );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Module                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Find a module by its name.                                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library     :: A handle to the library object.                     */
+  /*                                                                       */
+  /*    module_name :: The module's name (as an ASCII string).             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A module handle.  0~if none was found.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    FreeType's internal modules aren't documented very well, and you   */
+  /*    should look up the source code for details.                        */
+  /*                                                                       */
+  FT_EXPORT( FT_Module )
+  FT_Get_Module( FT_Library   library,
+                 const char*  module_name );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Remove_Module                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Remove a given module from a library instance.                     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library :: A handle to a library object.                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    module  :: A handle to a module object.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The module object is destroyed by the function in case of success. */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Remove_Module( FT_Library  library,
+                    FT_Module   module );
+
+
+  /**********************************************************************
+   *
+   * @function:
+   *    FT_Property_Set
+   *
+   * @description:
+   *    Set a property for a given module.
+   *
+   * @input:
+   *    library ::
+   *       A handle to the library the module is part of.
+   *
+   *    module_name ::
+   *       The module name.
+   *
+   *    property_name ::
+   *       The property name.  Properties are described in the `Synopsis'
+   *       subsection of the module's documentation.
+   *
+   *       Note that only a few modules have properties.
+   *
+   *    value ::
+   *       A generic pointer to a variable or structure that gives the new
+   *       value of the property.  The exact definition of `value' is
+   *       dependent on the property; see the `Synopsis' subsection of the
+   *       module's documentation.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *    If `module_name' isn't a valid module name, or `property_name'
+   *    doesn't specify a valid property, or if `value' doesn't represent a
+   *    valid value for the given property, an error is returned.
+   *
+   *    The following example sets property `bar' (a simple integer) in
+   *    module `foo' to value~1.
+   *
+   *    {
+   *      FT_UInt  bar;
+   *
+   *
+   *      bar = 1;
+   *      FT_Property_Set( library, "foo", "bar", &bar );
+   *    }
+   *
+   *    Note that the FreeType Cache sub-system doesn't recognize module
+   *    property changes.  To avoid glyph lookup confusion within the cache
+   *    you should call @FTC_Manager_Reset to completely flush the cache if
+   *    a module property gets changed after @FTC_Manager_New has been
+   *    called.
+   *
+   *    It is not possible to set properties of the FreeType Cache
+   *    sub-system itself with FT_Property_Set; use @FTC_Property_Set
+   *    instead.
+   *
+   *  @since:
+   *    2.4.11
+   *
+   */
+  FT_EXPORT( FT_Error )
+  FT_Property_Set( FT_Library        library,
+                   const FT_String*  module_name,
+                   const FT_String*  property_name,
+                   const void*       value );
+
+
+  /**********************************************************************
+   *
+   * @function:
+   *    FT_Property_Get
+   *
+   * @description:
+   *    Get a module's property value.
+   *
+   * @input:
+   *    library ::
+   *       A handle to the library the module is part of.
+   *
+   *    module_name ::
+   *       The module name.
+   *
+   *    property_name ::
+   *       The property name.  Properties are described in the `Synopsis'
+   *       subsection of the module's documentation.
+   *
+   * @inout:
+   *    value ::
+   *       A generic pointer to a variable or structure that gives the
+   *       value of the property.  The exact definition of `value' is
+   *       dependent on the property; see the `Synopsis' subsection of the
+   *       module's documentation.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *    If `module_name' isn't a valid module name, or `property_name'
+   *    doesn't specify a valid property, or if `value' doesn't represent a
+   *    valid value for the given property, an error is returned.
+   *
+   *    The following example gets property `baz' (a range) in module `foo'.
+   *
+   *    {
+   *      typedef  range_
+   *      {
+   *        FT_Int32  min;
+   *        FT_Int32  max;
+   *
+   *      } range;
+   *
+   *      range  baz;
+   *
+   *
+   *      FT_Property_Get( library, "foo", "baz", &baz );
+   *    }
+   *
+   *    It is not possible to retrieve properties of the FreeType Cache
+   *    sub-system with FT_Property_Get; use @FTC_Property_Get instead.
+   *
+   *  @since:
+   *    2.4.11
+   *
+   */
+  FT_EXPORT( FT_Error )
+  FT_Property_Get( FT_Library        library,
+                   const FT_String*  module_name,
+                   const FT_String*  property_name,
+                   void*             value );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Reference_Library                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A counter gets initialized to~1 at the time an @FT_Library         */
+  /*    structure is created.  This function increments the counter.       */
+  /*    @FT_Done_Library then only destroys a library if the counter is~1, */
+  /*    otherwise it simply decrements the counter.                        */
+  /*                                                                       */
+  /*    This function helps in managing life-cycles of structures that     */
+  /*    reference @FT_Library objects.                                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to a target library object.                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.4.2                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Reference_Library( FT_Library  library );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Library                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function is used to create a new FreeType library instance    */
+  /*    from a given memory object.  It is thus possible to use libraries  */
+  /*    with distinct memory allocators within the same program.           */
+  /*                                                                       */
+  /*    Normally, you would call this function (followed by a call to      */
+  /*    @FT_Add_Default_Modules or a series of calls to @FT_Add_Module)    */
+  /*    instead of @FT_Init_FreeType to initialize the FreeType library.   */
+  /*                                                                       */
+  /*    Don't use @FT_Done_FreeType but @FT_Done_Library to destroy a      */
+  /*    library instance.                                                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    memory   :: A handle to the original memory object.                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    alibrary :: A pointer to handle of a new library object.           */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    See the discussion of reference counters in the description of     */
+  /*    @FT_Reference_Library.                                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Library( FT_Memory    memory,
+                  FT_Library  *alibrary );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_Library                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Discard a given library object.  This closes all drivers and       */
+  /*    discards all resource objects.                                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to the target library.                         */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    See the discussion of reference counters in the description of     */
+  /*    @FT_Reference_Library.                                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Done_Library( FT_Library  library );
+
+/* */
+
+  typedef void
+  (*FT_DebugHook_Func)( void*  arg );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Debug_Hook                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Set a debug hook function for debugging the interpreter of a font  */
+  /*    format.                                                            */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library object.                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    hook_index :: The index of the debug hook.  You should use the     */
+  /*                  values defined in `ftobjs.h', e.g.,                  */
+  /*                  `FT_DEBUG_HOOK_TRUETYPE'.                            */
+  /*                                                                       */
+  /*    debug_hook :: The function used to debug the interpreter.          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Currently, four debug hook slots are available, but only two (for  */
+  /*    the TrueType and the Type~1 interpreter) are defined.              */
+  /*                                                                       */
+  /*    Since the internal headers of FreeType are no longer installed,    */
+  /*    the symbol `FT_DEBUG_HOOK_TRUETYPE' isn't available publicly.      */
+  /*    This is a bug and will be fixed in a forthcoming release.          */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Set_Debug_Hook( FT_Library         library,
+                     FT_UInt            hook_index,
+                     FT_DebugHook_Func  debug_hook );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Add_Default_Modules                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Add the set of default drivers to a given library object.          */
+  /*    This is only useful when you create a library object with          */
+  /*    @FT_New_Library (usually to plug a custom memory manager).         */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library :: A handle to a new library object.                       */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Add_Default_Modules( FT_Library  library );
+
+
+
+  /**************************************************************************
+   *
+   * @section:
+   *   truetype_engine
+   *
+   * @title:
+   *   The TrueType Engine
+   *
+   * @abstract:
+   *   TrueType bytecode support.
+   *
+   * @description:
+   *   This section contains a function used to query the level of TrueType
+   *   bytecode support compiled in this version of the library.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   *  @enum:
+   *     FT_TrueTypeEngineType
+   *
+   *  @description:
+   *     A list of values describing which kind of TrueType bytecode
+   *     engine is implemented in a given FT_Library instance.  It is used
+   *     by the @FT_Get_TrueType_Engine_Type function.
+   *
+   *  @values:
+   *     FT_TRUETYPE_ENGINE_TYPE_NONE ::
+   *       The library doesn't implement any kind of bytecode interpreter.
+   *
+   *     FT_TRUETYPE_ENGINE_TYPE_UNPATENTED ::
+   *       The library implements a bytecode interpreter that doesn't
+   *       support the patented operations of the TrueType virtual machine.
+   *
+   *       Its main use is to load certain Asian fonts that position and
+   *       scale glyph components with bytecode instructions.  It produces
+   *       bad output for most other fonts.
+   *
+   *     FT_TRUETYPE_ENGINE_TYPE_PATENTED ::
+   *       The library implements a bytecode interpreter that covers
+   *       the full instruction set of the TrueType virtual machine (this
+   *       was governed by patents until May 2010, hence the name).
+   *
+   *  @since:
+   *     2.2
+   *
+   */
+  typedef enum  FT_TrueTypeEngineType_
+  {
+    FT_TRUETYPE_ENGINE_TYPE_NONE = 0,
+    FT_TRUETYPE_ENGINE_TYPE_UNPATENTED,
+    FT_TRUETYPE_ENGINE_TYPE_PATENTED
+
+  } FT_TrueTypeEngineType;
+
+
+  /**************************************************************************
+   *
+   *  @func:
+   *     FT_Get_TrueType_Engine_Type
+   *
+   *  @description:
+   *     Return an @FT_TrueTypeEngineType value to indicate which level of
+   *     the TrueType virtual machine a given library instance supports.
+   *
+   *  @input:
+   *     library ::
+   *       A library instance.
+   *
+   *  @return:
+   *     A value indicating which level is supported.
+   *
+   *  @since:
+   *     2.2
+   *
+   */
+  FT_EXPORT( FT_TrueTypeEngineType )
+  FT_Get_TrueType_Engine_Type( FT_Library  library );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTMODAPI_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftmodapi.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftmoderr.h
===================================================================
--- lib/3rdparty/freetype/include/ftmoderr.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftmoderr.h	(rÃ©vision 62573)
@@ -0,0 +1,194 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftmoderr.h                                                             */
+/*                                                                         */
+/*    FreeType module error offsets (specification).                       */
+/*                                                                         */
+/*  Copyright 2001-2005, 2010, 2013 by                                     */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This file is used to define the FreeType module error codes.          */
+  /*                                                                       */
+  /* If the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in `ftoption.h' is    */
+  /* set, the lower byte of an error value identifies the error code as    */
+  /* usual.  In addition, the higher byte identifies the module.  For      */
+  /* example, the error `FT_Err_Invalid_File_Format' has value 0x0003, the */
+  /* error `TT_Err_Invalid_File_Format' has value 0x1303, the error        */
+  /* `T1_Err_Invalid_File_Format' has value 0x1403, etc.                   */
+  /*                                                                       */
+  /* Note that `FT_Err_Ok', `TT_Err_Ok', etc. are always equal to zero,    */
+  /* including the high byte.                                              */
+  /*                                                                       */
+  /* If FT_CONFIG_OPTION_USE_MODULE_ERRORS isn't set, the higher byte of   */
+  /* an error value is set to zero.                                        */
+  /*                                                                       */
+  /* To hide the various `XXX_Err_' prefixes in the source code, FreeType  */
+  /* provides some macros in `fttypes.h'.                                  */
+  /*                                                                       */
+  /*   FT_ERR( err )                                                       */
+  /*     Add current error module prefix (as defined with the              */
+  /*     `FT_ERR_PREFIX' macro) to `err'.  For example, in the BDF module  */
+  /*     the line                                                          */
+  /*                                                                       */
+  /*       error = FT_ERR( Invalid_Outline );                              */
+  /*                                                                       */
+  /*     expands to                                                        */
+  /*                                                                       */
+  /*       error = BDF_Err_Invalid_Outline;                                */
+  /*                                                                       */
+  /*     For simplicity, you can always use `FT_Err_Ok' directly instead   */
+  /*     of `FT_ERR( Ok )'.                                                */
+  /*                                                                       */
+  /*   FT_ERR_EQ( errcode, err )                                           */
+  /*   FT_ERR_NEQ( errcode, err )                                          */
+  /*     Compare error code `errcode' with the error `err' for equality    */
+  /*     and inequality, respectively.  Example:                           */
+  /*                                                                       */
+  /*       if ( FT_ERR_EQ( error, Invalid_Outline ) )                      */
+  /*         ...                                                           */
+  /*                                                                       */
+  /*     Using this macro you don't have to think about error prefixes.    */
+  /*     Of course, if module errors are not active, the above example is  */
+  /*     the same as                                                       */
+  /*                                                                       */
+  /*       if ( error == FT_Err_Invalid_Outline )                          */
+  /*         ...                                                           */
+  /*                                                                       */
+  /*   FT_ERROR_BASE( errcode )                                            */
+  /*   FT_ERROR_MODULE( errcode )                                          */
+  /*     Get base error and module error code, respectively.               */
+  /*                                                                       */
+  /*                                                                       */
+  /* It can also be used to create a module error message table easily     */
+  /* with something like                                                   */
+  /*                                                                       */
+  /*   {                                                                   */
+  /*     #undef __FTMODERR_H__                                             */
+  /*     #define FT_MODERRDEF( e, v, s )  { FT_Mod_Err_ ## e, s },         */
+  /*     #define FT_MODERR_START_LIST     {                                */
+  /*     #define FT_MODERR_END_LIST       { 0, 0 } };                      */
+  /*                                                                       */
+  /*     const struct                                                      */
+  /*     {                                                                 */
+  /*       int          mod_err_offset;                                    */
+  /*       const char*  mod_err_msg                                        */
+  /*     } ft_mod_errors[] =                                               */
+  /*                                                                       */
+  /*     #include FT_MODULE_ERRORS_H                                       */
+  /*   }                                                                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTMODERR_H__
+#define __FTMODERR_H__
+
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /*****                                                         *****/
+  /*****                       SETUP MACROS                      *****/
+  /*****                                                         *****/
+  /*******************************************************************/
+  /*******************************************************************/
+
+
+#undef  FT_NEED_EXTERN_C
+
+#ifndef FT_MODERRDEF
+
+#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
+#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = v,
+#else
+#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = 0,
+#endif
+
+#define FT_MODERR_START_LIST  enum {
+#define FT_MODERR_END_LIST    FT_Mod_Err_Max };
+
+#ifdef __cplusplus
+#define FT_NEED_EXTERN_C
+  extern "C" {
+#endif
+
+#endif /* !FT_MODERRDEF */
+
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /*****                                                         *****/
+  /*****               LIST MODULE ERROR BASES                   *****/
+  /*****                                                         *****/
+  /*******************************************************************/
+  /*******************************************************************/
+
+
+#ifdef FT_MODERR_START_LIST
+  FT_MODERR_START_LIST
+#endif
+
+
+  FT_MODERRDEF( Base,      0x000, "base module" )
+  FT_MODERRDEF( Autofit,   0x100, "autofitter module" )
+  FT_MODERRDEF( BDF,       0x200, "BDF module" )
+  FT_MODERRDEF( Bzip2,     0x300, "Bzip2 module" )
+  FT_MODERRDEF( Cache,     0x400, "cache module" )
+  FT_MODERRDEF( CFF,       0x500, "CFF module" )
+  FT_MODERRDEF( CID,       0x600, "CID module" )
+  FT_MODERRDEF( Gzip,      0x700, "Gzip module" )
+  FT_MODERRDEF( LZW,       0x800, "LZW module" )
+  FT_MODERRDEF( OTvalid,   0x900, "OpenType validation module" )
+  FT_MODERRDEF( PCF,       0xA00, "PCF module" )
+  FT_MODERRDEF( PFR,       0xB00, "PFR module" )
+  FT_MODERRDEF( PSaux,     0xC00, "PS auxiliary module" )
+  FT_MODERRDEF( PShinter,  0xD00, "PS hinter module" )
+  FT_MODERRDEF( PSnames,   0xE00, "PS names module" )
+  FT_MODERRDEF( Raster,    0xF00, "raster module" )
+  FT_MODERRDEF( SFNT,     0x1000, "SFNT module" )
+  FT_MODERRDEF( Smooth,   0x1100, "smooth raster module" )
+  FT_MODERRDEF( TrueType, 0x1200, "TrueType module" )
+  FT_MODERRDEF( Type1,    0x1300, "Type 1 module" )
+  FT_MODERRDEF( Type42,   0x1400, "Type 42 module" )
+  FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" )
+  FT_MODERRDEF( GXvalid,  0x1600, "GX validation module" )
+
+
+#ifdef FT_MODERR_END_LIST
+  FT_MODERR_END_LIST
+#endif
+
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /*****                                                         *****/
+  /*****                      CLEANUP                            *****/
+  /*****                                                         *****/
+  /*******************************************************************/
+  /*******************************************************************/
+
+
+#ifdef FT_NEED_EXTERN_C
+  }
+#endif
+
+#undef FT_MODERR_START_LIST
+#undef FT_MODERR_END_LIST
+#undef FT_MODERRDEF
+#undef FT_NEED_EXTERN_C
+
+
+#endif /* __FTMODERR_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftmoderr.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftotval.h
===================================================================
--- lib/3rdparty/freetype/include/ftotval.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftotval.h	(rÃ©vision 62573)
@@ -0,0 +1,203 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftotval.h                                                              */
+/*                                                                         */
+/*    FreeType API for validating OpenType tables (specification).         */
+/*                                                                         */
+/*  Copyright 2004-2007, 2013 by                                           */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/*                                                                         */
+/*                                                                         */
+/* Warning: This module might be moved to a different library in the       */
+/*          future to avoid a tight dependency between FreeType and the    */
+/*          OpenType specification.                                        */
+/*                                                                         */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTOTVAL_H__
+#define __FTOTVAL_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    ot_validation                                                      */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    OpenType Validation                                                */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    An API to validate OpenType tables.                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of functions to validate     */
+  /*    some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).         */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+ /**********************************************************************
+  *
+  * @enum:
+  *    FT_VALIDATE_OTXXX
+  *
+  * @description:
+  *    A list of bit-field constants used with @FT_OpenType_Validate to
+  *    indicate which OpenType tables should be validated.
+  *
+  * @values:
+  *    FT_VALIDATE_BASE ::
+  *      Validate BASE table.
+  *
+  *    FT_VALIDATE_GDEF ::
+  *      Validate GDEF table.
+  *
+  *    FT_VALIDATE_GPOS ::
+  *      Validate GPOS table.
+  *
+  *    FT_VALIDATE_GSUB ::
+  *      Validate GSUB table.
+  *
+  *    FT_VALIDATE_JSTF ::
+  *      Validate JSTF table.
+  *
+  *    FT_VALIDATE_MATH ::
+  *      Validate MATH table.
+  *
+  *    FT_VALIDATE_OT ::
+  *      Validate all OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).
+  *
+  */
+#define FT_VALIDATE_BASE  0x0100
+#define FT_VALIDATE_GDEF  0x0200
+#define FT_VALIDATE_GPOS  0x0400
+#define FT_VALIDATE_GSUB  0x0800
+#define FT_VALIDATE_JSTF  0x1000
+#define FT_VALIDATE_MATH  0x2000
+
+#define FT_VALIDATE_OT  FT_VALIDATE_BASE | \
+                        FT_VALIDATE_GDEF | \
+                        FT_VALIDATE_GPOS | \
+                        FT_VALIDATE_GSUB | \
+                        FT_VALIDATE_JSTF | \
+                        FT_VALIDATE_MATH
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_OpenType_Validate
+  *
+  * @description:
+  *    Validate various OpenType tables to assure that all offsets and
+  *    indices are valid.  The idea is that a higher-level library that
+  *    actually does the text layout can access those tables without
+  *    error checking (which can be quite time consuming).
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  *    validation_flags ::
+  *       A bit field that specifies the tables to be validated.  See
+  *       @FT_VALIDATE_OTXXX for possible values.
+  *
+  * @output:
+  *    BASE_table ::
+  *       A pointer to the BASE table.
+  *
+  *    GDEF_table ::
+  *       A pointer to the GDEF table.
+  *
+  *    GPOS_table ::
+  *       A pointer to the GPOS table.
+  *
+  *    GSUB_table ::
+  *       A pointer to the GSUB table.
+  *
+  *    JSTF_table ::
+  *       A pointer to the JSTF table.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   This function only works with OpenType fonts, returning an error
+  *   otherwise.
+  *
+  *   After use, the application should deallocate the five tables with
+  *   @FT_OpenType_Free.  A NULL value indicates that the table either
+  *   doesn't exist in the font, or the application hasn't asked for
+  *   validation.
+  */
+  FT_EXPORT( FT_Error )
+  FT_OpenType_Validate( FT_Face    face,
+                        FT_UInt    validation_flags,
+                        FT_Bytes  *BASE_table,
+                        FT_Bytes  *GDEF_table,
+                        FT_Bytes  *GPOS_table,
+                        FT_Bytes  *GSUB_table,
+                        FT_Bytes  *JSTF_table );
+
+  /* */
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_OpenType_Free
+  *
+  * @description:
+  *    Free the buffer allocated by OpenType validator.
+  *
+  * @input:
+  *    face ::
+  *       A handle to the input face.
+  *
+  *    table ::
+  *       The pointer to the buffer that is allocated by
+  *       @FT_OpenType_Validate.
+  *
+  * @note:
+  *   This function must be used to free the buffer allocated by
+  *   @FT_OpenType_Validate only.
+  */
+  FT_EXPORT( void )
+  FT_OpenType_Free( FT_Face   face,
+                    FT_Bytes  table );
+
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTOTVAL_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftotval.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftoutln.h
===================================================================
--- lib/3rdparty/freetype/include/ftoutln.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftoutln.h	(rÃ©vision 62573)
@@ -0,0 +1,569 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftoutln.h                                                              */
+/*                                                                         */
+/*    Support for the FT_Outline type used to store glyph shapes of        */
+/*    most scalable font formats (specification).                          */
+/*                                                                         */
+/*  Copyright 1996-2003, 2005-2013 by                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTOUTLN_H__
+#define __FTOUTLN_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    outline_processing                                                 */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Outline Processing                                                 */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Functions to create, transform, and render vectorial glyph images. */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains routines used to create and destroy scalable */
+  /*    glyph images known as `outlines'.  These can also be measured,     */
+  /*    transformed, and converted into bitmaps and pixmaps.               */
+  /*                                                                       */
+  /* <Order>                                                               */
+  /*    FT_Outline                                                         */
+  /*    FT_OUTLINE_FLAGS                                                   */
+  /*    FT_Outline_New                                                     */
+  /*    FT_Outline_Done                                                    */
+  /*    FT_Outline_Copy                                                    */
+  /*    FT_Outline_Translate                                               */
+  /*    FT_Outline_Transform                                               */
+  /*    FT_Outline_Embolden                                                */
+  /*    FT_Outline_EmboldenXY                                              */
+  /*    FT_Outline_Reverse                                                 */
+  /*    FT_Outline_Check                                                   */
+  /*                                                                       */
+  /*    FT_Outline_Get_CBox                                                */
+  /*    FT_Outline_Get_BBox                                                */
+  /*                                                                       */
+  /*    FT_Outline_Get_Bitmap                                              */
+  /*    FT_Outline_Render                                                  */
+  /*                                                                       */
+  /*    FT_Outline_Decompose                                               */
+  /*    FT_Outline_Funcs                                                   */
+  /*    FT_Outline_MoveTo_Func                                             */
+  /*    FT_Outline_LineTo_Func                                             */
+  /*    FT_Outline_ConicTo_Func                                            */
+  /*    FT_Outline_CubicTo_Func                                            */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Decompose                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Walk over an outline's structure to decompose it into individual   */
+  /*    segments and BÃ©zier arcs.  This function also emits `move to'      */
+  /*    operations to indicate the start of new contours in the outline.   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    outline        :: A pointer to the source target.                  */
+  /*                                                                       */
+  /*    func_interface :: A table of `emitters', i.e., function pointers   */
+  /*                      called during decomposition to indicate path     */
+  /*                      operations.                                      */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    user           :: A typeless pointer that is passed to each        */
+  /*                      emitter during the decomposition.  It can be     */
+  /*                      used to store the state during the               */
+  /*                      decomposition.                                   */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    A contour that contains a single point only is represented by a    */
+  /*    `move to' operation followed by `line to' to the same point.  In   */
+  /*    most cases, it is best to filter this out before using the         */
+  /*    outline for stroking purposes (otherwise it would result in a      */
+  /*    visible dot when round caps are used).                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Decompose( FT_Outline*              outline,
+                        const FT_Outline_Funcs*  func_interface,
+                        void*                    user );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_New                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new outline of a given size.                              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library     :: A handle to the library object from where the       */
+  /*                   outline is allocated.  Note however that the new    */
+  /*                   outline will *not* necessarily be *freed*, when     */
+  /*                   destroying the library, by @FT_Done_FreeType.       */
+  /*                                                                       */
+  /*    numPoints   :: The maximum number of points within the outline.    */
+  /*                   Must be smaller than or equal to 0xFFFF (65535).    */
+  /*                                                                       */
+  /*    numContours :: The maximum number of contours within the outline.  */
+  /*                   This value must be in the range 0 to `numPoints'.   */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    anoutline   :: A handle to the new outline.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The reason why this function takes a `library' parameter is simply */
+  /*    to use the library's memory allocator.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_New( FT_Library   library,
+                  FT_UInt      numPoints,
+                  FT_Int       numContours,
+                  FT_Outline  *anoutline );
+
+
+  FT_EXPORT( FT_Error )
+  FT_Outline_New_Internal( FT_Memory    memory,
+                           FT_UInt      numPoints,
+                           FT_Int       numContours,
+                           FT_Outline  *anoutline );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Done                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroy an outline created with @FT_Outline_New.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle of the library object used to allocate the     */
+  /*               outline.                                                */
+  /*                                                                       */
+  /*    outline :: A pointer to the outline object to be discarded.        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If the outline's `owner' field is not set, only the outline        */
+  /*    descriptor will be released.                                       */
+  /*                                                                       */
+  /*    The reason why this function takes an `library' parameter is       */
+  /*    simply to use ft_mem_free().                                       */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Done( FT_Library   library,
+                   FT_Outline*  outline );
+
+
+  FT_EXPORT( FT_Error )
+  FT_Outline_Done_Internal( FT_Memory    memory,
+                            FT_Outline*  outline );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Check                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Check the contents of an outline descriptor.                       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    outline :: A handle to a source outline.                           */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Check( FT_Outline*  outline );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Get_CBox                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return an outline's `control box'.  The control box encloses all   */
+  /*    the outline's points, including BÃ©zier control points.  Though it  */
+  /*    coincides with the exact bounding box for most glyphs, it can be   */
+  /*    slightly larger in some situations (like when rotating an outline  */
+  /*    that contains BÃ©zier outside arcs).                                */
+  /*                                                                       */
+  /*    Computing the control box is very fast, while getting the bounding */
+  /*    box can take much more time as it needs to walk over all segments  */
+  /*    and arcs in the outline.  To get the latter, you can use the       */
+  /*    `ftbbox' component, which is dedicated to this single task.        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    outline :: A pointer to the source outline descriptor.             */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    acbox   :: The outline's control box.                              */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    See @FT_Glyph_Get_CBox for a discussion of tricky fonts.           */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Outline_Get_CBox( const FT_Outline*  outline,
+                       FT_BBox           *acbox );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Translate                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Apply a simple translation to the points of an outline.            */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    outline :: A pointer to the target outline descriptor.             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    xOffset :: The horizontal offset.                                  */
+  /*                                                                       */
+  /*    yOffset :: The vertical offset.                                    */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Outline_Translate( const FT_Outline*  outline,
+                        FT_Pos             xOffset,
+                        FT_Pos             yOffset );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Copy                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Copy an outline into another one.  Both objects must have the      */
+  /*    same sizes (number of points & number of contours) when this       */
+  /*    function is called.                                                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    source :: A handle to the source outline.                          */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    target :: A handle to the target outline.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Copy( const FT_Outline*  source,
+                   FT_Outline        *target );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Transform                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Apply a simple 2x2 matrix to all of an outline's points.  Useful   */
+  /*    for applying rotations, slanting, flipping, etc.                   */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    outline :: A pointer to the target outline descriptor.             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    matrix  :: A pointer to the transformation matrix.                 */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You can use @FT_Outline_Translate if you need to translate the     */
+  /*    outline's points.                                                  */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Outline_Transform( const FT_Outline*  outline,
+                        const FT_Matrix*   matrix );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Embolden                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Embolden an outline.  The new outline will be at most 4~times      */
+  /*    `strength' pixels wider and higher.  You may think of the left and */
+  /*    bottom borders as unchanged.                                       */
+  /*                                                                       */
+  /*    Negative `strength' values to reduce the outline thickness are     */
+  /*    possible also.                                                     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    outline  :: A handle to the target outline.                        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    strength :: How strong the glyph is emboldened.  Expressed in      */
+  /*                26.6 pixel format.                                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The used algorithm to increase or decrease the thickness of the    */
+  /*    glyph doesn't change the number of points; this means that certain */
+  /*    situations like acute angles or intersections are sometimes        */
+  /*    handled incorrectly.                                               */
+  /*                                                                       */
+  /*    If you need `better' metrics values you should call                */
+  /*    @FT_Outline_Get_CBox or @FT_Outline_Get_BBox.                      */
+  /*                                                                       */
+  /*    Example call:                                                      */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      FT_Load_Glyph( face, index, FT_LOAD_DEFAULT );                   */
+  /*      if ( face->slot->format == FT_GLYPH_FORMAT_OUTLINE )             */
+  /*        FT_Outline_Embolden( &face->slot->outline, strength );         */
+  /*    }                                                                  */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Embolden( FT_Outline*  outline,
+                       FT_Pos       strength );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_EmboldenXY                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Embolden an outline.  The new outline will be `xstrength' pixels   */
+  /*    wider and `ystrength' pixels higher.  Otherwise, it is similar to  */
+  /*    @FT_Outline_Embolden, which uses the same strength in both         */
+  /*    directions.                                                        */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_EmboldenXY( FT_Outline*  outline,
+                         FT_Pos       xstrength,
+                         FT_Pos       ystrength );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Reverse                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Reverse the drawing direction of an outline.  This is used to      */
+  /*    ensure consistent fill conventions for mirrored glyphs.            */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    outline :: A pointer to the target outline descriptor.             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function toggles the bit flag @FT_OUTLINE_REVERSE_FILL in     */
+  /*    the outline's `flags' field.                                       */
+  /*                                                                       */
+  /*    It shouldn't be used by a normal client application, unless it     */
+  /*    knows what it is doing.                                            */
+  /*                                                                       */
+  FT_EXPORT( void )
+  FT_Outline_Reverse( FT_Outline*  outline );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Get_Bitmap                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Render an outline within a bitmap.  The outline's image is simply  */
+  /*    OR-ed to the target bitmap.                                        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to a FreeType library object.                  */
+  /*                                                                       */
+  /*    outline :: A pointer to the source outline descriptor.             */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    abitmap :: A pointer to the target bitmap descriptor.              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function does NOT CREATE the bitmap, it only renders an       */
+  /*    outline image within the one you pass to it!  Consequently, the    */
+  /*    various fields in `abitmap' should be set accordingly.             */
+  /*                                                                       */
+  /*    It will use the raster corresponding to the default glyph format.  */
+  /*                                                                       */
+  /*    The value of the `num_grays' field in `abitmap' is ignored.  If    */
+  /*    you select the gray-level rasterizer, and you want less than 256   */
+  /*    gray levels, you have to use @FT_Outline_Render directly.          */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Get_Bitmap( FT_Library        library,
+                         FT_Outline*       outline,
+                         const FT_Bitmap  *abitmap );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Outline_Render                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Render an outline within a bitmap using the current scan-convert.  */
+  /*    This function uses an @FT_Raster_Params structure as an argument,  */
+  /*    allowing advanced features like direct composition, translucency,  */
+  /*    etc.                                                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to a FreeType library object.                  */
+  /*                                                                       */
+  /*    outline :: A pointer to the source outline descriptor.             */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    params  :: A pointer to an @FT_Raster_Params structure used to     */
+  /*               describe the rendering operation.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You should know what you are doing and how @FT_Raster_Params works */
+  /*    to use this function.                                              */
+  /*                                                                       */
+  /*    The field `params.source' will be set to `outline' before the scan */
+  /*    converter is called, which means that the value you give to it is  */
+  /*    actually ignored.                                                  */
+  /*                                                                       */
+  /*    The gray-level rasterizer always uses 256 gray levels.  If you     */
+  /*    want less gray levels, you have to provide your own span callback. */
+  /*    See the @FT_RASTER_FLAG_DIRECT value of the `flags' field in the   */
+  /*    @FT_Raster_Params structure for more details.                      */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Outline_Render( FT_Library         library,
+                     FT_Outline*        outline,
+                     FT_Raster_Params*  params );
+
+
+ /**************************************************************************
+  *
+  * @enum:
+  *   FT_Orientation
+  *
+  * @description:
+  *   A list of values used to describe an outline's contour orientation.
+  *
+  *   The TrueType and PostScript specifications use different conventions
+  *   to determine whether outline contours should be filled or unfilled.
+  *
+  * @values:
+  *   FT_ORIENTATION_TRUETYPE ::
+  *     According to the TrueType specification, clockwise contours must
+  *     be filled, and counter-clockwise ones must be unfilled.
+  *
+  *   FT_ORIENTATION_POSTSCRIPT ::
+  *     According to the PostScript specification, counter-clockwise contours
+  *     must be filled, and clockwise ones must be unfilled.
+  *
+  *   FT_ORIENTATION_FILL_RIGHT ::
+  *     This is identical to @FT_ORIENTATION_TRUETYPE, but is used to
+  *     remember that in TrueType, everything that is to the right of
+  *     the drawing direction of a contour must be filled.
+  *
+  *   FT_ORIENTATION_FILL_LEFT ::
+  *     This is identical to @FT_ORIENTATION_POSTSCRIPT, but is used to
+  *     remember that in PostScript, everything that is to the left of
+  *     the drawing direction of a contour must be filled.
+  *
+  *   FT_ORIENTATION_NONE ::
+  *     The orientation cannot be determined.  That is, different parts of
+  *     the glyph have different orientation.
+  *
+  */
+  typedef enum  FT_Orientation_
+  {
+    FT_ORIENTATION_TRUETYPE   = 0,
+    FT_ORIENTATION_POSTSCRIPT = 1,
+    FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE,
+    FT_ORIENTATION_FILL_LEFT  = FT_ORIENTATION_POSTSCRIPT,
+    FT_ORIENTATION_NONE
+
+  } FT_Orientation;
+
+
+ /**************************************************************************
+  *
+  * @function:
+  *   FT_Outline_Get_Orientation
+  *
+  * @description:
+  *   This function analyzes a glyph outline and tries to compute its
+  *   fill orientation (see @FT_Orientation).  This is done by integrating 
+  *   the total area covered by the outline. The positive integral
+  *   corresponds to the clockwise orientation and @FT_ORIENTATION_POSTSCRIPT
+  *   is returned. The negative integral corresponds to the counter-clockwise
+  *   orientation and @FT_ORIENTATION_TRUETYPE is returned.
+  *
+  *   Note that this will return @FT_ORIENTATION_TRUETYPE for empty
+  *   outlines.
+  *
+  * @input:
+  *   outline ::
+  *     A handle to the source outline.
+  *
+  * @return:
+  *   The orientation.
+  *
+  */
+  FT_EXPORT( FT_Orientation )
+  FT_Outline_Get_Orientation( FT_Outline*  outline );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTOUTLN_H__ */
+
+
+/* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftoutln.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftpfr.h
===================================================================
--- lib/3rdparty/freetype/include/ftpfr.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftpfr.h	(rÃ©vision 62573)
@@ -0,0 +1,172 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftpfr.h                                                                */
+/*                                                                         */
+/*    FreeType API for accessing PFR-specific data (specification only).   */
+/*                                                                         */
+/*  Copyright 2002, 2003, 2004, 2006, 2008, 2009 by                        */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTPFR_H__
+#define __FTPFR_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    pfr_fonts                                                          */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    PFR Fonts                                                          */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    PFR/TrueDoc specific API.                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of PFR-specific functions.   */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_Get_PFR_Metrics
+  *
+  * @description:
+  *    Return the outline and metrics resolutions of a given PFR face.
+  *
+  * @input:
+  *    face :: Handle to the input face.  It can be a non-PFR face.
+  *
+  * @output:
+  *    aoutline_resolution ::
+  *      Outline resolution.  This is equivalent to `face->units_per_EM'
+  *      for non-PFR fonts.  Optional (parameter can be NULL).
+  *
+  *    ametrics_resolution ::
+  *      Metrics resolution.  This is equivalent to `outline_resolution'
+  *      for non-PFR fonts.  Optional (parameter can be NULL).
+  *
+  *    ametrics_x_scale ::
+  *      A 16.16 fixed-point number used to scale distance expressed
+  *      in metrics units to device sub-pixels.  This is equivalent to
+  *      `face->size->x_scale', but for metrics only.  Optional (parameter
+  *      can be NULL).
+  *
+  *    ametrics_y_scale ::
+  *      Same as `ametrics_x_scale' but for the vertical direction.
+  *      optional (parameter can be NULL).
+  *
+  * @return:
+  *    FreeType error code.  0~means success.
+  *
+  * @note:
+  *   If the input face is not a PFR, this function will return an error.
+  *   However, in all cases, it will return valid values.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Get_PFR_Metrics( FT_Face    face,
+                      FT_UInt   *aoutline_resolution,
+                      FT_UInt   *ametrics_resolution,
+                      FT_Fixed  *ametrics_x_scale,
+                      FT_Fixed  *ametrics_y_scale );
+
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_Get_PFR_Kerning
+  *
+  * @description:
+  *    Return the kerning pair corresponding to two glyphs in a PFR face.
+  *    The distance is expressed in metrics units, unlike the result of
+  *    @FT_Get_Kerning.
+  *
+  * @input:
+  *    face  :: A handle to the input face.
+  *
+  *    left  :: Index of the left glyph.
+  *
+  *    right :: Index of the right glyph.
+  *
+  * @output:
+  *    avector :: A kerning vector.
+  *
+  * @return:
+  *    FreeType error code.  0~means success.
+  *
+  * @note:
+  *    This function always return distances in original PFR metrics
+  *    units.  This is unlike @FT_Get_Kerning with the @FT_KERNING_UNSCALED
+  *    mode, which always returns distances converted to outline units.
+  *
+  *    You can use the value of the `x_scale' and `y_scale' parameters
+  *    returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Get_PFR_Kerning( FT_Face     face,
+                      FT_UInt     left,
+                      FT_UInt     right,
+                      FT_Vector  *avector );
+
+
+ /**********************************************************************
+  *
+  * @function:
+  *    FT_Get_PFR_Advance
+  *
+  * @description:
+  *    Return a given glyph advance, expressed in original metrics units,
+  *    from a PFR font.
+  *
+  * @input:
+  *    face   :: A handle to the input face.
+  *
+  *    gindex :: The glyph index.
+  *
+  * @output:
+  *    aadvance :: The glyph advance in metrics units.
+  *
+  * @return:
+  *    FreeType error code.  0~means success.
+  *
+  * @note:
+  *    You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics
+  *    to convert the advance to device sub-pixels (i.e., 1/64th of pixels).
+  */
+  FT_EXPORT( FT_Error )
+  FT_Get_PFR_Advance( FT_Face   face,
+                      FT_UInt   gindex,
+                      FT_Pos   *aadvance );
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTPFR_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftpfr.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftrender.h
===================================================================
--- lib/3rdparty/freetype/include/ftrender.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftrender.h	(rÃ©vision 62573)
@@ -0,0 +1,238 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftrender.h                                                             */
+/*                                                                         */
+/*    FreeType renderer modules public interface (specification).          */
+/*                                                                         */
+/*  Copyright 1996-2001, 2005, 2006, 2010 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTRENDER_H__
+#define __FTRENDER_H__
+
+
+#include <ft2build.h>
+#include FT_MODULE_H
+#include FT_GLYPH_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    module_management                                                  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /* create a new glyph object */
+  typedef FT_Error
+  (*FT_Glyph_InitFunc)( FT_Glyph      glyph,
+                        FT_GlyphSlot  slot );
+
+  /* destroys a given glyph object */
+  typedef void
+  (*FT_Glyph_DoneFunc)( FT_Glyph  glyph );
+
+  typedef void
+  (*FT_Glyph_TransformFunc)( FT_Glyph          glyph,
+                             const FT_Matrix*  matrix,
+                             const FT_Vector*  delta );
+
+  typedef void
+  (*FT_Glyph_GetBBoxFunc)( FT_Glyph  glyph,
+                           FT_BBox*  abbox );
+
+  typedef FT_Error
+  (*FT_Glyph_CopyFunc)( FT_Glyph   source,
+                        FT_Glyph   target );
+
+  typedef FT_Error
+  (*FT_Glyph_PrepareFunc)( FT_Glyph      glyph,
+                           FT_GlyphSlot  slot );
+
+/* deprecated */
+#define FT_Glyph_Init_Func       FT_Glyph_InitFunc
+#define FT_Glyph_Done_Func       FT_Glyph_DoneFunc
+#define FT_Glyph_Transform_Func  FT_Glyph_TransformFunc
+#define FT_Glyph_BBox_Func       FT_Glyph_GetBBoxFunc
+#define FT_Glyph_Copy_Func       FT_Glyph_CopyFunc
+#define FT_Glyph_Prepare_Func    FT_Glyph_PrepareFunc
+
+
+  struct  FT_Glyph_Class_
+  {
+    FT_Long                 glyph_size;
+    FT_Glyph_Format         glyph_format;
+    FT_Glyph_InitFunc       glyph_init;
+    FT_Glyph_DoneFunc       glyph_done;
+    FT_Glyph_CopyFunc       glyph_copy;
+    FT_Glyph_TransformFunc  glyph_transform;
+    FT_Glyph_GetBBoxFunc    glyph_bbox;
+    FT_Glyph_PrepareFunc    glyph_prepare;
+  };
+
+
+  typedef FT_Error
+  (*FT_Renderer_RenderFunc)( FT_Renderer       renderer,
+                             FT_GlyphSlot      slot,
+                             FT_UInt           mode,
+                             const FT_Vector*  origin );
+
+  typedef FT_Error
+  (*FT_Renderer_TransformFunc)( FT_Renderer       renderer,
+                                FT_GlyphSlot      slot,
+                                const FT_Matrix*  matrix,
+                                const FT_Vector*  delta );
+
+
+  typedef void
+  (*FT_Renderer_GetCBoxFunc)( FT_Renderer   renderer,
+                              FT_GlyphSlot  slot,
+                              FT_BBox*      cbox );
+
+
+  typedef FT_Error
+  (*FT_Renderer_SetModeFunc)( FT_Renderer  renderer,
+                              FT_ULong     mode_tag,
+                              FT_Pointer   mode_ptr );
+
+/* deprecated identifiers */
+#define FTRenderer_render  FT_Renderer_RenderFunc
+#define FTRenderer_transform  FT_Renderer_TransformFunc
+#define FTRenderer_getCBox  FT_Renderer_GetCBoxFunc
+#define FTRenderer_setMode  FT_Renderer_SetModeFunc
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Renderer_Class                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The renderer module class descriptor.                              */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    root            :: The root @FT_Module_Class fields.               */
+  /*                                                                       */
+  /*    glyph_format    :: The glyph image format this renderer handles.   */
+  /*                                                                       */
+  /*    render_glyph    :: A method used to render the image that is in a  */
+  /*                       given glyph slot into a bitmap.                 */
+  /*                                                                       */
+  /*    transform_glyph :: A method used to transform the image that is in */
+  /*                       a given glyph slot.                             */
+  /*                                                                       */
+  /*    get_glyph_cbox  :: A method used to access the glyph's cbox.       */
+  /*                                                                       */
+  /*    set_mode        :: A method used to pass additional parameters.    */
+  /*                                                                       */
+  /*    raster_class    :: For @FT_GLYPH_FORMAT_OUTLINE renderers only.    */
+  /*                       This is a pointer to its raster's class.        */
+  /*                                                                       */
+  typedef struct  FT_Renderer_Class_
+  {
+    FT_Module_Class            root;
+
+    FT_Glyph_Format            glyph_format;
+
+    FT_Renderer_RenderFunc     render_glyph;
+    FT_Renderer_TransformFunc  transform_glyph;
+    FT_Renderer_GetCBoxFunc    get_glyph_cbox;
+    FT_Renderer_SetModeFunc    set_mode;
+
+    FT_Raster_Funcs*           raster_class;
+
+  } FT_Renderer_Class;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Renderer                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the current renderer for a given glyph format.            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library :: A handle to the library object.                         */
+  /*                                                                       */
+  /*    format  :: The glyph format.                                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A renderer handle.  0~if none found.                               */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    An error will be returned if a module already exists by that name, */
+  /*    or if the module requires a version of FreeType that is too great. */
+  /*                                                                       */
+  /*    To add a new renderer, simply use @FT_Add_Module.  To retrieve a   */
+  /*    renderer by its name, use @FT_Get_Module.                          */
+  /*                                                                       */
+  FT_EXPORT( FT_Renderer )
+  FT_Get_Renderer( FT_Library       library,
+                   FT_Glyph_Format  format );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Set_Renderer                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Set the current renderer to use, and set additional mode.          */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    library    :: A handle to the library object.                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    renderer   :: A handle to the renderer object.                     */
+  /*                                                                       */
+  /*    num_params :: The number of additional parameters.                 */
+  /*                                                                       */
+  /*    parameters :: Additional parameters.                               */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    In case of success, the renderer will be used to convert glyph     */
+  /*    images in the renderer's known format into bitmaps.                */
+  /*                                                                       */
+  /*    This doesn't change the current renderer for other formats.        */
+  /*                                                                       */
+  /*    Currently, only the B/W renderer, if compiled with                 */
+  /*    FT_RASTER_OPTION_ANTI_ALIASING (providing a 5-levels               */
+  /*    anti-aliasing mode; this option must be set directly in            */
+  /*    `ftraster.c' and is undefined by default) accepts a single tag     */
+  /*    `pal5' to set its gray palette as a character string with          */
+  /*    5~elements.  Consequently, the third and fourth argument are zero  */
+  /*    normally.                                                          */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Set_Renderer( FT_Library     library,
+                   FT_Renderer    renderer,
+                   FT_UInt        num_params,
+                   FT_Parameter*  parameters );
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTRENDER_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftrender.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftsizes.h
===================================================================
--- lib/3rdparty/freetype/include/ftsizes.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftsizes.h	(rÃ©vision 62573)
@@ -0,0 +1,159 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftsizes.h                                                              */
+/*                                                                         */
+/*    FreeType size objects management (specification).                    */
+/*                                                                         */
+/*  Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 by                   */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Typical application would normally not need to use these functions.   */
+  /* However, they have been placed in a public API for the rare cases     */
+  /* where they are needed.                                                */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTSIZES_H__
+#define __FTSIZES_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    sizes_management                                                   */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Size Management                                                    */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Managing multiple sizes per face.                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    When creating a new face object (e.g., with @FT_New_Face), an      */
+  /*    @FT_Size object is automatically created and used to store all     */
+  /*    pixel-size dependent information, available in the `face->size'    */
+  /*    field.                                                             */
+  /*                                                                       */
+  /*    It is however possible to create more sizes for a given face,      */
+  /*    mostly in order to manage several character pixel sizes of the     */
+  /*    same font family and style.  See @FT_New_Size and @FT_Done_Size.   */
+  /*                                                                       */
+  /*    Note that @FT_Set_Pixel_Sizes and @FT_Set_Char_Size only           */
+  /*    modify the contents of the current `active' size; you thus need    */
+  /*    to use @FT_Activate_Size to change it.                             */
+  /*                                                                       */
+  /*    99% of applications won't need the functions provided here,        */
+  /*    especially if they use the caching sub-system, so be cautious      */
+  /*    when using these.                                                  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Size                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Create a new size object from a given face object.                 */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to a parent face object.                          */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    asize :: A handle to a new size object.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You need to call @FT_Activate_Size in order to select the new size */
+  /*    for upcoming calls to @FT_Set_Pixel_Sizes, @FT_Set_Char_Size,      */
+  /*    @FT_Load_Glyph, @FT_Load_Char, etc.                                */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_New_Size( FT_Face   face,
+               FT_Size*  size );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_Size                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Discard a given size object.  Note that @FT_Done_Face              */
+  /*    automatically discards all size objects allocated with             */
+  /*    @FT_New_Size.                                                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    size :: A handle to a target size object.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Done_Size( FT_Size  size );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Activate_Size                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Even though it is possible to create several size objects for a    */
+  /*    given face (see @FT_New_Size for details), functions like          */
+  /*    @FT_Load_Glyph or @FT_Load_Char only use the one that has been     */
+  /*    activated last to determine the `current character pixel size'.    */
+  /*                                                                       */
+  /*    This function can be used to `activate' a previously created size  */
+  /*    object.                                                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    size :: A handle to a target size object.                          */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    If `face' is the size's parent face object, this function changes  */
+  /*    the value of `face->size' to the input size handle.                */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Activate_Size( FT_Size  size );
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTSIZES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftsizes.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftsnames.h
===================================================================
--- lib/3rdparty/freetype/include/ftsnames.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftsnames.h	(rÃ©vision 62573)
@@ -0,0 +1,200 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftsnames.h                                                             */
+/*                                                                         */
+/*    Simple interface to access SFNT name tables (which are used          */
+/*    to hold font names, copyright info, notices, etc.) (specification).  */
+/*                                                                         */
+/*    This is _not_ used to retrieve glyph names!                          */
+/*                                                                         */
+/*  Copyright 1996-2003, 2006, 2009, 2010, 2013 by                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FT_SFNT_NAMES_H__
+#define __FT_SFNT_NAMES_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    sfnt_names                                                         */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    SFNT Names                                                         */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Access the names embedded in TrueType and OpenType files.          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The TrueType and OpenType specifications allow the inclusion of    */
+  /*    a special `names table' in font files.  This table contains        */
+  /*    textual (and internationalized) information regarding the font,    */
+  /*    like family name, copyright, version, etc.                         */
+  /*                                                                       */
+  /*    The definitions below are used to access them if available.        */
+  /*                                                                       */
+  /*    Note that this has nothing to do with glyph names!                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_SfntName                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model an SFNT `name' table entry.              */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    platform_id :: The platform ID for `string'.                       */
+  /*                                                                       */
+  /*    encoding_id :: The encoding ID for `string'.                       */
+  /*                                                                       */
+  /*    language_id :: The language ID for `string'.                       */
+  /*                                                                       */
+  /*    name_id     :: An identifier for `string'.                         */
+  /*                                                                       */
+  /*    string      :: The `name' string.  Note that its format differs    */
+  /*                   depending on the (platform,encoding) pair.  It can  */
+  /*                   be a Pascal String, a UTF-16 one, etc.              */
+  /*                                                                       */
+  /*                   Generally speaking, the string is not               */
+  /*                   zero-terminated.  Please refer to the TrueType      */
+  /*                   specification for details.                          */
+  /*                                                                       */
+  /*    string_len  :: The length of `string' in bytes.                    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Possible values for `platform_id', `encoding_id', `language_id',   */
+  /*    and `name_id' are given in the file `ttnameid.h'.  For details     */
+  /*    please refer to the TrueType or OpenType specification.            */
+  /*                                                                       */
+  /*    See also @TT_PLATFORM_XXX, @TT_APPLE_ID_XXX, @TT_MAC_ID_XXX,       */
+  /*    @TT_ISO_ID_XXX, and @TT_MS_ID_XXX.                                 */
+  /*                                                                       */
+  typedef struct  FT_SfntName_
+  {
+    FT_UShort  platform_id;
+    FT_UShort  encoding_id;
+    FT_UShort  language_id;
+    FT_UShort  name_id;
+
+    FT_Byte*   string;      /* this string is *not* null-terminated! */
+    FT_UInt    string_len;  /* in bytes */
+
+  } FT_SfntName;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Name_Count                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the number of name strings in the SFNT `name' table.      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the source face.                               */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The number of strings in the `name' table.                         */
+  /*                                                                       */
+  FT_EXPORT( FT_UInt )
+  FT_Get_Sfnt_Name_Count( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Name                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve a string of the SFNT `name' table for a given index.      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face  :: A handle to the source face.                              */
+  /*                                                                       */
+  /*    idx   :: The index of the `name' string.                           */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aname :: The indexed @FT_SfntName structure.                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0~means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The `string' array returned in the `aname' structure is not        */
+  /*    null-terminated.  The application should deallocate it if it is no */
+  /*    longer in use.                                                     */
+  /*                                                                       */
+  /*    Use @FT_Get_Sfnt_Name_Count to get the total number of available   */
+  /*    `name' table entries, then do a loop until you get the right       */
+  /*    platform, encoding, and name ID.                                   */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FT_Get_Sfnt_Name( FT_Face       face,
+                    FT_UInt       idx,
+                    FT_SfntName  *aname );
+
+
+  /***************************************************************************
+   *
+   * @constant:
+   *   FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY
+   *
+   * @description:
+   *   A constant used as the tag of @FT_Parameter structures to make
+   *   FT_Open_Face() ignore preferred family subfamily names in `name'
+   *   table since OpenType version 1.4.  For backwards compatibility with
+   *   legacy systems that have a 4-face-per-family restriction.
+   *
+   */
+#define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
+
+
+  /***************************************************************************
+   *
+   * @constant:
+   *   FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY
+   *
+   * @description:
+   *   A constant used as the tag of @FT_Parameter structures to make
+   *   FT_Open_Face() ignore preferred subfamily names in `name' table since
+   *   OpenType version 1.4.  For backwards compatibility with legacy
+   *   systems that have a 4-face-per-family restriction.
+   *
+   */
+#define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 's' )
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FT_SFNT_NAMES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftsnames.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftstroke.h
===================================================================
--- lib/3rdparty/freetype/include/ftstroke.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftstroke.h	(rÃ©vision 62573)
@@ -0,0 +1,751 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftstroke.h                                                             */
+/*                                                                         */
+/*    FreeType path stroker (specification).                               */
+/*                                                                         */
+/*  Copyright 2002-2006, 2008, 2009, 2011-2012 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FT_STROKE_H__
+#define __FT_STROKE_H__
+
+#include <ft2build.h>
+#include FT_OUTLINE_H
+#include FT_GLYPH_H
+
+
+FT_BEGIN_HEADER
+
+
+ /************************************************************************
+  *
+  * @section:
+  *    glyph_stroker
+  *
+  * @title:
+  *    Glyph Stroker
+  *
+  * @abstract:
+  *    Generating bordered and stroked glyphs.
+  *
+  * @description:
+  *    This component generates stroked outlines of a given vectorial
+  *    glyph.  It also allows you to retrieve the `outside' and/or the
+  *    `inside' borders of the stroke.
+  *
+  *    This can be useful to generate `bordered' glyph, i.e., glyphs
+  *    displayed with a coloured (and anti-aliased) border around their
+  *    shape.
+  */
+
+
+ /**************************************************************
+  *
+  * @type:
+  *   FT_Stroker
+  *
+  * @description:
+  *   Opaque handler to a path stroker object.
+  */
+  typedef struct FT_StrokerRec_*  FT_Stroker;
+
+
+  /**************************************************************
+   *
+   * @enum:
+   *   FT_Stroker_LineJoin
+   *
+   * @description:
+   *   These values determine how two joining lines are rendered
+   *   in a stroker.
+   *
+   * @values:
+   *   FT_STROKER_LINEJOIN_ROUND ::
+   *     Used to render rounded line joins.  Circular arcs are used
+   *     to join two lines smoothly.
+   *
+   *   FT_STROKER_LINEJOIN_BEVEL ::
+   *     Used to render beveled line joins.  The outer corner of
+   *     the joined lines is filled by enclosing the triangular
+   *     region of the corner with a straight line between the
+   *     outer corners of each stroke.
+   *
+   *   FT_STROKER_LINEJOIN_MITER_FIXED ::
+   *     Used to render mitered line joins, with fixed bevels if the
+   *     miter limit is exceeded.  The outer edges of the strokes
+   *     for the two segments are extended until they meet at an
+   *     angle.  If the segments meet at too sharp an angle (such
+   *     that the miter would extend from the intersection of the
+   *     segments a distance greater than the product of the miter
+   *     limit value and the border radius), then a bevel join (see
+   *     above) is used instead.  This prevents long spikes being
+   *     created.  FT_STROKER_LINEJOIN_MITER_FIXED generates a miter
+   *     line join as used in PostScript and PDF.
+   *
+   *   FT_STROKER_LINEJOIN_MITER_VARIABLE ::
+   *   FT_STROKER_LINEJOIN_MITER ::
+   *     Used to render mitered line joins, with variable bevels if
+   *     the miter limit is exceeded.  The intersection of the
+   *     strokes is clipped at a line perpendicular to the bisector
+   *     of the angle between the strokes, at the distance from the
+   *     intersection of the segments equal to the product of the
+   *     miter limit value and the border radius.  This prevents
+   *     long spikes being created.
+   *     FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line
+   *     join as used in XPS.  FT_STROKER_LINEJOIN_MITER is an alias
+   *     for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for
+   *     backwards compatibility.
+   */
+  typedef enum  FT_Stroker_LineJoin_
+  {
+    FT_STROKER_LINEJOIN_ROUND          = 0,
+    FT_STROKER_LINEJOIN_BEVEL          = 1,
+    FT_STROKER_LINEJOIN_MITER_VARIABLE = 2,
+    FT_STROKER_LINEJOIN_MITER          = FT_STROKER_LINEJOIN_MITER_VARIABLE,
+    FT_STROKER_LINEJOIN_MITER_FIXED    = 3
+
+  } FT_Stroker_LineJoin;
+
+
+  /**************************************************************
+   *
+   * @enum:
+   *   FT_Stroker_LineCap
+   *
+   * @description:
+   *   These values determine how the end of opened sub-paths are
+   *   rendered in a stroke.
+   *
+   * @values:
+   *   FT_STROKER_LINECAP_BUTT ::
+   *     The end of lines is rendered as a full stop on the last
+   *     point itself.
+   *
+   *   FT_STROKER_LINECAP_ROUND ::
+   *     The end of lines is rendered as a half-circle around the
+   *     last point.
+   *
+   *   FT_STROKER_LINECAP_SQUARE ::
+   *     The end of lines is rendered as a square around the
+   *     last point.
+   */
+  typedef enum  FT_Stroker_LineCap_
+  {
+    FT_STROKER_LINECAP_BUTT = 0,
+    FT_STROKER_LINECAP_ROUND,
+    FT_STROKER_LINECAP_SQUARE
+
+  } FT_Stroker_LineCap;
+
+
+  /**************************************************************
+   *
+   * @enum:
+   *   FT_StrokerBorder
+   *
+   * @description:
+   *   These values are used to select a given stroke border
+   *   in @FT_Stroker_GetBorderCounts and @FT_Stroker_ExportBorder.
+   *
+   * @values:
+   *   FT_STROKER_BORDER_LEFT ::
+   *     Select the left border, relative to the drawing direction.
+   *
+   *   FT_STROKER_BORDER_RIGHT ::
+   *     Select the right border, relative to the drawing direction.
+   *
+   * @note:
+   *   Applications are generally interested in the `inside' and `outside'
+   *   borders.  However, there is no direct mapping between these and the
+   *   `left' and `right' ones, since this really depends on the glyph's
+   *   drawing orientation, which varies between font formats.
+   *
+   *   You can however use @FT_Outline_GetInsideBorder and
+   *   @FT_Outline_GetOutsideBorder to get these.
+   */
+  typedef enum  FT_StrokerBorder_
+  {
+    FT_STROKER_BORDER_LEFT = 0,
+    FT_STROKER_BORDER_RIGHT
+
+  } FT_StrokerBorder;
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Outline_GetInsideBorder
+   *
+   * @description:
+   *   Retrieve the @FT_StrokerBorder value corresponding to the
+   *   `inside' borders of a given outline.
+   *
+   * @input:
+   *   outline ::
+   *     The source outline handle.
+   *
+   * @return:
+   *   The border index.  @FT_STROKER_BORDER_RIGHT for empty or invalid
+   *   outlines.
+   */
+  FT_EXPORT( FT_StrokerBorder )
+  FT_Outline_GetInsideBorder( FT_Outline*  outline );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Outline_GetOutsideBorder
+   *
+   * @description:
+   *   Retrieve the @FT_StrokerBorder value corresponding to the
+   *   `outside' borders of a given outline.
+   *
+   * @input:
+   *   outline ::
+   *     The source outline handle.
+   *
+   * @return:
+   *   The border index.  @FT_STROKER_BORDER_LEFT for empty or invalid
+   *   outlines.
+   */
+  FT_EXPORT( FT_StrokerBorder )
+  FT_Outline_GetOutsideBorder( FT_Outline*  outline );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_New
+   *
+   * @description:
+   *   Create a new stroker object.
+   *
+   * @input:
+   *   library ::
+   *     FreeType library handle.
+   *
+   * @output:
+   *   astroker ::
+   *     A new stroker object handle.  NULL in case of error.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_New( FT_Library   library,
+                  FT_Stroker  *astroker );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_Set
+   *
+   * @description:
+   *   Reset a stroker object's attributes.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   radius ::
+   *     The border radius.
+   *
+   *   line_cap ::
+   *     The line cap style.
+   *
+   *   line_join ::
+   *     The line join style.
+   *
+   *   miter_limit ::
+   *     The miter limit for the FT_STROKER_LINEJOIN_MITER_FIXED and
+   *     FT_STROKER_LINEJOIN_MITER_VARIABLE line join styles,
+   *     expressed as 16.16 fixed-point value.
+   *
+   * @note:
+   *   The radius is expressed in the same units as the outline
+   *   coordinates.
+   */
+  FT_EXPORT( void )
+  FT_Stroker_Set( FT_Stroker           stroker,
+                  FT_Fixed             radius,
+                  FT_Stroker_LineCap   line_cap,
+                  FT_Stroker_LineJoin  line_join,
+                  FT_Fixed             miter_limit );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_Rewind
+   *
+   * @description:
+   *   Reset a stroker object without changing its attributes.
+   *   You should call this function before beginning a new
+   *   series of calls to @FT_Stroker_BeginSubPath or
+   *   @FT_Stroker_EndSubPath.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   */
+  FT_EXPORT( void )
+  FT_Stroker_Rewind( FT_Stroker  stroker );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_ParseOutline
+   *
+   * @description:
+   *   A convenience function used to parse a whole outline with
+   *   the stroker.  The resulting outline(s) can be retrieved
+   *   later by functions like @FT_Stroker_GetCounts and @FT_Stroker_Export.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   outline ::
+   *     The source outline.
+   *
+   *   opened ::
+   *     A boolean.  If~1, the outline is treated as an open path instead
+   *     of a closed one.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   If `opened' is~0 (the default), the outline is treated as a closed
+   *   path, and the stroker generates two distinct `border' outlines.
+   *
+   *   If `opened' is~1, the outline is processed as an open path, and the
+   *   stroker generates a single `stroke' outline.
+   *
+   *   This function calls @FT_Stroker_Rewind automatically.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_ParseOutline( FT_Stroker   stroker,
+                           FT_Outline*  outline,
+                           FT_Bool      opened );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_BeginSubPath
+   *
+   * @description:
+   *   Start a new sub-path in the stroker.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   to ::
+   *     A pointer to the start vector.
+   *
+   *   open ::
+   *     A boolean.  If~1, the sub-path is treated as an open one.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   This function is useful when you need to stroke a path that is
+   *   not stored as an @FT_Outline object.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_BeginSubPath( FT_Stroker  stroker,
+                           FT_Vector*  to,
+                           FT_Bool     open );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_EndSubPath
+   *
+   * @description:
+   *   Close the current sub-path in the stroker.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   You should call this function after @FT_Stroker_BeginSubPath.
+   *   If the subpath was not `opened', this function `draws' a
+   *   single line segment to the start position when needed.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_EndSubPath( FT_Stroker  stroker );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_LineTo
+   *
+   * @description:
+   *   `Draw' a single line segment in the stroker's current sub-path,
+   *   from the last position.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   to ::
+   *     A pointer to the destination point.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   You should call this function between @FT_Stroker_BeginSubPath and
+   *   @FT_Stroker_EndSubPath.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_LineTo( FT_Stroker  stroker,
+                     FT_Vector*  to );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_ConicTo
+   *
+   * @description:
+   *   `Draw' a single quadratic BÃ©zier in the stroker's current sub-path,
+   *   from the last position.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   control ::
+   *     A pointer to a BÃ©zier control point.
+   *
+   *   to ::
+   *     A pointer to the destination point.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   You should call this function between @FT_Stroker_BeginSubPath and
+   *   @FT_Stroker_EndSubPath.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_ConicTo( FT_Stroker  stroker,
+                      FT_Vector*  control,
+                      FT_Vector*  to );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_CubicTo
+   *
+   * @description:
+   *   `Draw' a single cubic BÃ©zier in the stroker's current sub-path,
+   *   from the last position.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   control1 ::
+   *     A pointer to the first BÃ©zier control point.
+   *
+   *   control2 ::
+   *     A pointer to second BÃ©zier control point.
+   *
+   *   to ::
+   *     A pointer to the destination point.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   You should call this function between @FT_Stroker_BeginSubPath and
+   *   @FT_Stroker_EndSubPath.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_CubicTo( FT_Stroker  stroker,
+                      FT_Vector*  control1,
+                      FT_Vector*  control2,
+                      FT_Vector*  to );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_GetBorderCounts
+   *
+   * @description:
+   *   Call this function once you have finished parsing your paths
+   *   with the stroker.  It returns the number of points and
+   *   contours necessary to export one of the `border' or `stroke'
+   *   outlines generated by the stroker.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   border ::
+   *     The border index.
+   *
+   * @output:
+   *   anum_points ::
+   *     The number of points.
+   *
+   *   anum_contours ::
+   *     The number of contours.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   When an outline, or a sub-path, is `closed', the stroker generates
+   *   two independent `border' outlines, named `left' and `right'.
+   *
+   *   When the outline, or a sub-path, is `opened', the stroker merges
+   *   the `border' outlines with caps.  The `left' border receives all
+   *   points, while the `right' border becomes empty.
+   *
+   *   Use the function @FT_Stroker_GetCounts instead if you want to
+   *   retrieve the counts associated to both borders.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_GetBorderCounts( FT_Stroker        stroker,
+                              FT_StrokerBorder  border,
+                              FT_UInt          *anum_points,
+                              FT_UInt          *anum_contours );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_ExportBorder
+   *
+   * @description:
+   *   Call this function after @FT_Stroker_GetBorderCounts to
+   *   export the corresponding border to your own @FT_Outline
+   *   structure.
+   *
+   *   Note that this function appends the border points and
+   *   contours to your outline, but does not try to resize its
+   *   arrays.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   border ::
+   *     The border index.
+   *
+   *   outline ::
+   *     The target outline handle.
+   *
+   * @note:
+   *   Always call this function after @FT_Stroker_GetBorderCounts to
+   *   get sure that there is enough room in your @FT_Outline object to
+   *   receive all new data.
+   *
+   *   When an outline, or a sub-path, is `closed', the stroker generates
+   *   two independent `border' outlines, named `left' and `right'
+   *
+   *   When the outline, or a sub-path, is `opened', the stroker merges
+   *   the `border' outlines with caps. The `left' border receives all
+   *   points, while the `right' border becomes empty.
+   *
+   *   Use the function @FT_Stroker_Export instead if you want to
+   *   retrieve all borders at once.
+   */
+  FT_EXPORT( void )
+  FT_Stroker_ExportBorder( FT_Stroker        stroker,
+                           FT_StrokerBorder  border,
+                           FT_Outline*       outline );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_GetCounts
+   *
+   * @description:
+   *   Call this function once you have finished parsing your paths
+   *   with the stroker.  It returns the number of points and
+   *   contours necessary to export all points/borders from the stroked
+   *   outline/path.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   * @output:
+   *   anum_points ::
+   *     The number of points.
+   *
+   *   anum_contours ::
+   *     The number of contours.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Stroker_GetCounts( FT_Stroker  stroker,
+                        FT_UInt    *anum_points,
+                        FT_UInt    *anum_contours );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_Export
+   *
+   * @description:
+   *   Call this function after @FT_Stroker_GetBorderCounts to
+   *   export all borders to your own @FT_Outline structure.
+   *
+   *   Note that this function appends the border points and
+   *   contours to your outline, but does not try to resize its
+   *   arrays.
+   *
+   * @input:
+   *   stroker ::
+   *     The target stroker handle.
+   *
+   *   outline ::
+   *     The target outline handle.
+   */
+  FT_EXPORT( void )
+  FT_Stroker_Export( FT_Stroker   stroker,
+                     FT_Outline*  outline );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Stroker_Done
+   *
+   * @description:
+   *   Destroy a stroker object.
+   *
+   * @input:
+   *   stroker ::
+   *     A stroker handle.  Can be NULL.
+   */
+  FT_EXPORT( void )
+  FT_Stroker_Done( FT_Stroker  stroker );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Glyph_Stroke
+   *
+   * @description:
+   *   Stroke a given outline glyph object with a given stroker.
+   *
+   * @inout:
+   *   pglyph ::
+   *     Source glyph handle on input, new glyph handle on output.
+   *
+   * @input:
+   *   stroker ::
+   *     A stroker handle.
+   *
+   *   destroy ::
+   *     A Boolean.  If~1, the source glyph object is destroyed
+   *     on success.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *   The source glyph is untouched in case of error.
+   *
+   *   Adding stroke may yield a significantly wider and taller glyph
+   *   depending on how large of a radius was used to stroke the glyph.  You
+   *   may need to manually adjust horizontal and vertical advance amounts
+   *   to account for this added size.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Glyph_Stroke( FT_Glyph    *pglyph,
+                   FT_Stroker   stroker,
+                   FT_Bool      destroy );
+
+
+  /**************************************************************
+   *
+   * @function:
+   *   FT_Glyph_StrokeBorder
+   *
+   * @description:
+   *   Stroke a given outline glyph object with a given stroker, but
+   *   only return either its inside or outside border.
+   *
+   * @inout:
+   *   pglyph ::
+   *     Source glyph handle on input, new glyph handle on output.
+   *
+   * @input:
+   *   stroker ::
+   *     A stroker handle.
+   *
+   *   inside ::
+   *     A Boolean.  If~1, return the inside border, otherwise
+   *     the outside border.
+   *
+   *   destroy ::
+   *     A Boolean.  If~1, the source glyph object is destroyed
+   *     on success.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *   The source glyph is untouched in case of error.
+   *
+   *   Adding stroke may yield a significantly wider and taller glyph
+   *   depending on how large of a radius was used to stroke the glyph.  You
+   *   may need to manually adjust horizontal and vertical advance amounts
+   *   to account for this added size.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Glyph_StrokeBorder( FT_Glyph    *pglyph,
+                         FT_Stroker   stroker,
+                         FT_Bool      inside,
+                         FT_Bool      destroy );
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FT_STROKE_H__ */
+
+
+/* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftstroke.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftsynth.h
===================================================================
--- lib/3rdparty/freetype/include/ftsynth.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftsynth.h	(rÃ©vision 62573)
@@ -0,0 +1,81 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftsynth.h                                                              */
+/*                                                                         */
+/*    FreeType synthesizing code for emboldening and slanting              */
+/*    (specification).                                                     */
+/*                                                                         */
+/*  Copyright 2000-2001, 2003, 2006, 2008, 2012, 2013 by                   */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*********                                                       *********/
+  /*********        WARNING, THIS IS ALPHA CODE!  THIS API         *********/
+  /*********    IS DUE TO CHANGE UNTIL STRICTLY NOTIFIED BY THE    *********/
+  /*********            FREETYPE DEVELOPMENT TEAM                  *********/
+  /*********                                                       *********/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /* Main reason for not lifting the functions in this module to a  */
+  /* `standard' API is that the used parameters for emboldening and */
+  /* slanting are not configurable.  Consider the functions as a    */
+  /* code resource that should be copied into the application and   */
+  /* adapted to the particular needs.                               */
+
+
+#ifndef __FTSYNTH_H__
+#define __FTSYNTH_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /* Embolden a glyph by a `reasonable' value (which is highly a matter of */
+  /* taste).  This function is actually a convenience function, providing  */
+  /* a wrapper for @FT_Outline_Embolden and @FT_Bitmap_Embolden.           */
+  /*                                                                       */
+  /* For emboldened outlines the height, width, and advance metrics are    */
+  /* increased by the strength of the emboldening.  You can also call      */
+  /* @FT_Outline_Get_CBox to get precise values.                           */
+  FT_EXPORT( void )
+  FT_GlyphSlot_Embolden( FT_GlyphSlot  slot );
+
+  /* Slant an outline glyph to the right by about 12 degrees. */
+  FT_EXPORT( void )
+  FT_GlyphSlot_Oblique( FT_GlyphSlot  slot );
+
+  /* */
+
+FT_END_HEADER
+
+#endif /* __FTSYNTH_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftsynth.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftsystem.h
===================================================================
--- lib/3rdparty/freetype/include/ftsystem.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftsystem.h	(rÃ©vision 62573)
@@ -0,0 +1,347 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftsystem.h                                                             */
+/*                                                                         */
+/*    FreeType low-level system interface definition (specification).      */
+/*                                                                         */
+/*  Copyright 1996-2001, 2002, 2005, 2010 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTSYSTEM_H__
+#define __FTSYSTEM_H__
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*   system_interface                                                    */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*   System Interface                                                    */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*   How FreeType manages memory and i/o.                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*   This section contains various definitions related to memory         */
+  /*   management and i/o access.  You need to understand this             */
+  /*   information if you want to use a custom memory manager or you own   */
+  /*   i/o streams.                                                        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                  M E M O R Y   M A N A G E M E N T                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @type:
+   *   FT_Memory
+   *
+   * @description:
+   *   A handle to a given memory manager object, defined with an
+   *   @FT_MemoryRec structure.
+   *
+   */
+  typedef struct FT_MemoryRec_*  FT_Memory;
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   FT_Alloc_Func
+   *
+   * @description:
+   *   A function used to allocate `size' bytes from `memory'.
+   *
+   * @input:
+   *   memory ::
+   *     A handle to the source memory manager.
+   *
+   *   size ::
+   *     The size in bytes to allocate.
+   *
+   * @return:
+   *   Address of new memory block.  0~in case of failure.
+   *
+   */
+  typedef void*
+  (*FT_Alloc_Func)( FT_Memory  memory,
+                    long       size );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   FT_Free_Func
+   *
+   * @description:
+   *   A function used to release a given block of memory.
+   *
+   * @input:
+   *   memory ::
+   *     A handle to the source memory manager.
+   *
+   *   block ::
+   *     The address of the target memory block.
+   *
+   */
+  typedef void
+  (*FT_Free_Func)( FT_Memory  memory,
+                   void*      block );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   FT_Realloc_Func
+   *
+   * @description:
+   *   A function used to re-allocate a given block of memory.
+   *
+   * @input:
+   *   memory ::
+   *     A handle to the source memory manager.
+   *
+   *   cur_size ::
+   *     The block's current size in bytes.
+   *
+   *   new_size ::
+   *     The block's requested new size.
+   *
+   *   block ::
+   *     The block's current address.
+   *
+   * @return:
+   *   New block address.  0~in case of memory shortage.
+   *
+   * @note:
+   *   In case of error, the old block must still be available.
+   *
+   */
+  typedef void*
+  (*FT_Realloc_Func)( FT_Memory  memory,
+                      long       cur_size,
+                      long       new_size,
+                      void*      block );
+
+
+  /*************************************************************************
+   *
+   * @struct:
+   *   FT_MemoryRec
+   *
+   * @description:
+   *   A structure used to describe a given memory manager to FreeType~2.
+   *
+   * @fields:
+   *   user ::
+   *     A generic typeless pointer for user data.
+   *
+   *   alloc ::
+   *     A pointer type to an allocation function.
+   *
+   *   free ::
+   *     A pointer type to an memory freeing function.
+   *
+   *   realloc ::
+   *     A pointer type to a reallocation function.
+   *
+   */
+  struct  FT_MemoryRec_
+  {
+    void*            user;
+    FT_Alloc_Func    alloc;
+    FT_Free_Func     free;
+    FT_Realloc_Func  realloc;
+  };
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                       I / O   M A N A G E M E N T                     */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @type:
+   *   FT_Stream
+   *
+   * @description:
+   *   A handle to an input stream.
+   *
+   */
+  typedef struct FT_StreamRec_*  FT_Stream;
+
+
+  /*************************************************************************
+   *
+   * @struct:
+   *   FT_StreamDesc
+   *
+   * @description:
+   *   A union type used to store either a long or a pointer.  This is used
+   *   to store a file descriptor or a `FILE*' in an input stream.
+   *
+   */
+  typedef union  FT_StreamDesc_
+  {
+    long   value;
+    void*  pointer;
+
+  } FT_StreamDesc;
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   FT_Stream_IoFunc
+   *
+   * @description:
+   *   A function used to seek and read data from a given input stream.
+   *
+   * @input:
+   *   stream ::
+   *     A handle to the source stream.
+   *
+   *   offset ::
+   *     The offset of read in stream (always from start).
+   *
+   *   buffer ::
+   *     The address of the read buffer.
+   *
+   *   count ::
+   *     The number of bytes to read from the stream.
+   *
+   * @return:
+   *   The number of bytes effectively read by the stream.
+   *
+   * @note:
+   *   This function might be called to perform a seek or skip operation
+   *   with a `count' of~0.  A non-zero return value then indicates an
+   *   error.
+   *
+   */
+  typedef unsigned long
+  (*FT_Stream_IoFunc)( FT_Stream       stream,
+                       unsigned long   offset,
+                       unsigned char*  buffer,
+                       unsigned long   count );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   FT_Stream_CloseFunc
+   *
+   * @description:
+   *   A function used to close a given input stream.
+   *
+   * @input:
+   *  stream ::
+   *     A handle to the target stream.
+   *
+   */
+  typedef void
+  (*FT_Stream_CloseFunc)( FT_Stream  stream );
+
+
+  /*************************************************************************
+   *
+   * @struct:
+   *   FT_StreamRec
+   *
+   * @description:
+   *   A structure used to describe an input stream.
+   *
+   * @input:
+   *   base ::
+   *     For memory-based streams, this is the address of the first stream
+   *     byte in memory.  This field should always be set to NULL for
+   *     disk-based streams.
+   *
+   *   size ::
+   *     The stream size in bytes.
+   *
+   *   pos ::
+   *     The current position within the stream.
+   *
+   *   descriptor ::
+   *     This field is a union that can hold an integer or a pointer.  It is
+   *     used by stream implementations to store file descriptors or `FILE*'
+   *     pointers.
+   *
+   *   pathname ::
+   *     This field is completely ignored by FreeType.  However, it is often
+   *     useful during debugging to use it to store the stream's filename
+   *     (where available).
+   *
+   *   read ::
+   *     The stream's input function.
+   *
+   *   close ::
+   *     The stream's close function.
+   *
+   *   memory ::
+   *     The memory manager to use to preload frames.  This is set
+   *     internally by FreeType and shouldn't be touched by stream
+   *     implementations.
+   *
+   *   cursor ::
+   *     This field is set and used internally by FreeType when parsing
+   *     frames.
+   *
+   *   limit ::
+   *     This field is set and used internally by FreeType when parsing
+   *     frames.
+   *
+   */
+  typedef struct  FT_StreamRec_
+  {
+    unsigned char*       base;
+    unsigned long        size;
+    unsigned long        pos;
+
+    FT_StreamDesc        descriptor;
+    FT_StreamDesc        pathname;
+    FT_Stream_IoFunc     read;
+    FT_Stream_CloseFunc  close;
+
+    FT_Memory            memory;
+    unsigned char*       cursor;
+    unsigned char*       limit;
+
+  } FT_StreamRec;
+
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTSYSTEM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftsystem.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/fttrigon.h
===================================================================
--- lib/3rdparty/freetype/include/fttrigon.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/fttrigon.h	(rÃ©vision 62573)
@@ -0,0 +1,350 @@
+/***************************************************************************/
+/*                                                                         */
+/*  fttrigon.h                                                             */
+/*                                                                         */
+/*    FreeType trigonometric functions (specification).                    */
+/*                                                                         */
+/*  Copyright 2001, 2003, 2005, 2007, 2013 by                              */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTTRIGON_H__
+#define __FTTRIGON_H__
+
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*   computations                                                        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @type:
+   *   FT_Angle
+   *
+   * @description:
+   *   This type is used to model angle values in FreeType.  Note that the
+   *   angle is a 16.16 fixed-point value expressed in degrees.
+   *
+   */
+  typedef FT_Fixed  FT_Angle;
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_ANGLE_PI
+   *
+   * @description:
+   *   The angle pi expressed in @FT_Angle units.
+   *
+   */
+#define FT_ANGLE_PI  ( 180L << 16 )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_ANGLE_2PI
+   *
+   * @description:
+   *   The angle 2*pi expressed in @FT_Angle units.
+   *
+   */
+#define FT_ANGLE_2PI  ( FT_ANGLE_PI * 2 )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_ANGLE_PI2
+   *
+   * @description:
+   *   The angle pi/2 expressed in @FT_Angle units.
+   *
+   */
+#define FT_ANGLE_PI2  ( FT_ANGLE_PI / 2 )
+
+
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_ANGLE_PI4
+   *
+   * @description:
+   *   The angle pi/4 expressed in @FT_Angle units.
+   *
+   */
+#define FT_ANGLE_PI4  ( FT_ANGLE_PI / 4 )
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Sin
+   *
+   * @description:
+   *   Return the sinus of a given angle in fixed-point format.
+   *
+   * @input:
+   *   angle ::
+   *     The input angle.
+   *
+   * @return:
+   *   The sinus value.
+   *
+   * @note:
+   *   If you need both the sinus and cosinus for a given angle, use the
+   *   function @FT_Vector_Unit.
+   *
+   */
+  FT_EXPORT( FT_Fixed )
+  FT_Sin( FT_Angle  angle );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Cos
+   *
+   * @description:
+   *   Return the cosinus of a given angle in fixed-point format.
+   *
+   * @input:
+   *   angle ::
+   *     The input angle.
+   *
+   * @return:
+   *   The cosinus value.
+   *
+   * @note:
+   *   If you need both the sinus and cosinus for a given angle, use the
+   *   function @FT_Vector_Unit.
+   *
+   */
+  FT_EXPORT( FT_Fixed )
+  FT_Cos( FT_Angle  angle );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Tan
+   *
+   * @description:
+   *   Return the tangent of a given angle in fixed-point format.
+   *
+   * @input:
+   *   angle ::
+   *     The input angle.
+   *
+   * @return:
+   *   The tangent value.
+   *
+   */
+  FT_EXPORT( FT_Fixed )
+  FT_Tan( FT_Angle  angle );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Atan2
+   *
+   * @description:
+   *   Return the arc-tangent corresponding to a given vector (x,y) in
+   *   the 2d plane.
+   *
+   * @input:
+   *   x ::
+   *     The horizontal vector coordinate.
+   *
+   *   y ::
+   *     The vertical vector coordinate.
+   *
+   * @return:
+   *   The arc-tangent value (i.e. angle).
+   *
+   */
+  FT_EXPORT( FT_Angle )
+  FT_Atan2( FT_Fixed  x,
+            FT_Fixed  y );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Angle_Diff
+   *
+   * @description:
+   *   Return the difference between two angles.  The result is always
+   *   constrained to the ]-PI..PI] interval.
+   *
+   * @input:
+   *   angle1 ::
+   *     First angle.
+   *
+   *   angle2 ::
+   *     Second angle.
+   *
+   * @return:
+   *   Constrained value of `value2-value1'.
+   *
+   */
+  FT_EXPORT( FT_Angle )
+  FT_Angle_Diff( FT_Angle  angle1,
+                 FT_Angle  angle2 );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Vector_Unit
+   *
+   * @description:
+   *   Return the unit vector corresponding to a given angle.  After the
+   *   call, the value of `vec.x' will be `sin(angle)', and the value of
+   *   `vec.y' will be `cos(angle)'.
+   *
+   *   This function is useful to retrieve both the sinus and cosinus of a
+   *   given angle quickly.
+   *
+   * @output:
+   *   vec ::
+   *     The address of target vector.
+   *
+   * @input:
+   *   angle ::
+   *     The address of angle.
+   *
+   */
+  FT_EXPORT( void )
+  FT_Vector_Unit( FT_Vector*  vec,
+                  FT_Angle    angle );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Vector_Rotate
+   *
+   * @description:
+   *   Rotate a vector by a given angle.
+   *
+   * @inout:
+   *   vec ::
+   *     The address of target vector.
+   *
+   * @input:
+   *   angle ::
+   *     The address of angle.
+   *
+   */
+  FT_EXPORT( void )
+  FT_Vector_Rotate( FT_Vector*  vec,
+                    FT_Angle    angle );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Vector_Length
+   *
+   * @description:
+   *   Return the length of a given vector.
+   *
+   * @input:
+   *   vec ::
+   *     The address of target vector.
+   *
+   * @return:
+   *   The vector length, expressed in the same units that the original
+   *   vector coordinates.
+   *
+   */
+  FT_EXPORT( FT_Fixed )
+  FT_Vector_Length( FT_Vector*  vec );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Vector_Polarize
+   *
+   * @description:
+   *   Compute both the length and angle of a given vector.
+   *
+   * @input:
+   *   vec ::
+   *     The address of source vector.
+   *
+   * @output:
+   *   length ::
+   *     The vector length.
+   *
+   *   angle ::
+   *     The vector angle.
+   *
+   */
+  FT_EXPORT( void )
+  FT_Vector_Polarize( FT_Vector*  vec,
+                      FT_Fixed   *length,
+                      FT_Angle   *angle );
+
+
+  /*************************************************************************
+   *
+   * @function:
+   *   FT_Vector_From_Polar
+   *
+   * @description:
+   *   Compute vector coordinates from a length and angle.
+   *
+   * @output:
+   *   vec ::
+   *     The address of source vector.
+   *
+   * @input:
+   *   length ::
+   *     The vector length.
+   *
+   *   angle ::
+   *     The vector angle.
+   *
+   */
+  FT_EXPORT( void )
+  FT_Vector_From_Polar( FT_Vector*  vec,
+                        FT_Fixed    length,
+                        FT_Angle    angle );
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTTRIGON_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/fttrigon.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftttdrv.h
===================================================================
--- lib/3rdparty/freetype/include/ftttdrv.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftttdrv.h	(rÃ©vision 62573)
@@ -0,0 +1,170 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftttdrv.h                                                              */
+/*                                                                         */
+/*    FreeType API for controlling the TrueType driver                     */
+/*    (specification only).                                                */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTTTDRV_H__
+#define __FTTTDRV_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /**************************************************************************
+   *
+   * @section:
+   *   tt_driver
+   *
+   * @title:
+   *   The TrueType driver
+   *
+   * @abstract:
+   *   Controlling the TrueType driver module.
+   *
+   * @description:
+   *   While FreeType's TrueType driver doesn't expose API functions by
+   *   itself, it is possible to control its behaviour with @FT_Property_Set
+   *   and @FT_Property_Get.  The following lists the available properties
+   *   together with the necessary macros and structures.
+   *
+   *   The TrueType driver's module name is `truetype'.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   interpreter-version
+   *
+   * @description:
+   *   Currently, two versions are available, representing the bytecode
+   *   interpreter with and without subpixel hinting support,
+   *   respectively.  The default is subpixel support if
+   *   TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel
+   *   support otherwise (since it isn't available then).
+   *
+   *   If subpixel hinting is on, many TrueType bytecode instructions
+   *   behave differently compared to B/W or grayscale rendering.  The
+   *   main idea is to render at a much increased horizontal resolution,
+   *   then sampling down the created output to subpixel precision.
+   *   However, many older fonts are not suited to this and must be
+   *   specially taken care of by applying (hardcoded) font-specific
+   *   tweaks.
+   *
+   *   Details on subpixel hinting and some of the necessary tweaks can be
+   *   found in Greg Hitchcock's whitepaper at
+   *   `http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx'.
+   *
+   *   The following example code demonstrates how to activate subpixel
+   *   hinting (omitting the error handling).
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_Face     face;
+   *     FT_UInt     interpreter_version = TT_INTERPRETER_VERSION_38;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "truetype",
+   *                               "interpreter-version",
+   *                               &interpreter_version );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @enum:
+   *   TT_INTERPRETER_VERSION_XXX
+   *
+   * @description:
+   *   A list of constants used for the @interpreter-version property to
+   *   select the hinting engine for Truetype fonts.
+   *
+   *   The numeric value in the constant names represents the version
+   *   number as returned by the `GETINFO' bytecode instruction.
+   *
+   * @values:
+   *   TT_INTERPRETER_VERSION_35 ::
+   *     Version~35 corresponds to MS rasterizer v.1.7 as used e.g. in
+   *     Windows~98; only grayscale and B/W rasterizing is supported.
+   *
+   *   TT_INTERPRETER_VERSION_38 ::
+   *     Version~38 corresponds to MS rasterizer v.1.9; it is roughly
+   *     equivalent to the hinting provided by DirectWrite ClearType (as
+   *     can be found, for example, in the Internet Explorer~9 running on
+   *     Windows~7).
+   *
+   * @note:
+   *   This property controls the behaviour of the bytecode interpreter
+   *   and thus how outlines get hinted.  It does *not* control how glyph
+   *   get rasterized!  In particular, it does not control subpixel color
+   *   filtering.
+   *
+   *   If FreeType has not been compiled with configuration option
+   *   FT_CONFIG_OPTION_SUBPIXEL_HINTING, selecting version~38 causes an
+   *   `FT_Err_Unimplemented_Feature' error.
+   *
+   *   Depending on the graphics framework, Microsoft uses different
+   *   bytecode engines.  As a consequence, the version numbers returned by
+   *   a call to the `GETINFO[1]' bytecode instruction are more convoluted
+   *   than desired.
+   *
+   *   {
+   *      framework   Windows version   result of GETINFO[1]
+   *     ----------------------------------------------------
+   *       GDI         before XP         35
+   *       GDI         XP and later      37
+   *       GDI+ old    before Vista      37
+   *       GDI+ old    Vista, 7          38
+   *       GDI+        after 7           40
+   *       DWrite      before 8          39
+   *       DWrite      8 and later       40
+   *   }
+   *
+   *   Since FreeType doesn't provide all capabilities of DWrite ClearType,
+   *   using version~38 seems justified.
+   *
+   */
+#define TT_INTERPRETER_VERSION_35  35
+#define TT_INTERPRETER_VERSION_38  38
+
+
+ /* */
+
+FT_END_HEADER
+
+
+#endif /* __FTTTDRV_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftttdrv.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/fttypes.h
===================================================================
--- lib/3rdparty/freetype/include/fttypes.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/fttypes.h	(rÃ©vision 62573)
@@ -0,0 +1,598 @@
+/***************************************************************************/
+/*                                                                         */
+/*  fttypes.h                                                              */
+/*                                                                         */
+/*    FreeType simple types definitions (specification only).              */
+/*                                                                         */
+/*  Copyright 1996-2002, 2004, 2006-2009, 2012, 2013 by                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTTYPES_H__
+#define __FTTYPES_H__
+
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_SYSTEM_H
+#include FT_IMAGE_H
+
+#include <stddef.h>
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    basic_types                                                        */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Basic Data Types                                                   */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    The basic data types defined by the library.                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the basic data types defined by FreeType~2,  */
+  /*    ranging from simple scalar types to bitmap descriptors.  More      */
+  /*    font-specific structures are defined in a different section.       */
+  /*                                                                       */
+  /* <Order>                                                               */
+  /*    FT_Byte                                                            */
+  /*    FT_Bytes                                                           */
+  /*    FT_Char                                                            */
+  /*    FT_Int                                                             */
+  /*    FT_UInt                                                            */
+  /*    FT_Int16                                                           */
+  /*    FT_UInt16                                                          */
+  /*    FT_Int32                                                           */
+  /*    FT_UInt32                                                          */
+  /*    FT_Short                                                           */
+  /*    FT_UShort                                                          */
+  /*    FT_Long                                                            */
+  /*    FT_ULong                                                           */
+  /*    FT_Bool                                                            */
+  /*    FT_Offset                                                          */
+  /*    FT_PtrDist                                                         */
+  /*    FT_String                                                          */
+  /*    FT_Tag                                                             */
+  /*    FT_Error                                                           */
+  /*    FT_Fixed                                                           */
+  /*    FT_Pointer                                                         */
+  /*    FT_Pos                                                             */
+  /*    FT_Vector                                                          */
+  /*    FT_BBox                                                            */
+  /*    FT_Matrix                                                          */
+  /*    FT_FWord                                                           */
+  /*    FT_UFWord                                                          */
+  /*    FT_F2Dot14                                                         */
+  /*    FT_UnitVector                                                      */
+  /*    FT_F26Dot6                                                         */
+  /*                                                                       */
+  /*                                                                       */
+  /*    FT_Generic                                                         */
+  /*    FT_Generic_Finalizer                                               */
+  /*                                                                       */
+  /*    FT_Bitmap                                                          */
+  /*    FT_Pixel_Mode                                                      */
+  /*    FT_Palette_Mode                                                    */
+  /*    FT_Glyph_Format                                                    */
+  /*    FT_IMAGE_TAG                                                       */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Bool                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef of unsigned char, used for simple booleans.  As usual,   */
+  /*    values 1 and~0 represent true and false, respectively.             */
+  /*                                                                       */
+  typedef unsigned char  FT_Bool;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_FWord                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A signed 16-bit integer used to store a distance in original font  */
+  /*    units.                                                             */
+  /*                                                                       */
+  typedef signed short  FT_FWord;   /* distance in FUnits */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UFWord                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An unsigned 16-bit integer used to store a distance in original    */
+  /*    font units.                                                        */
+  /*                                                                       */
+  typedef unsigned short  FT_UFWord;  /* unsigned distance */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Char                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple typedef for the _signed_ char type.                       */
+  /*                                                                       */
+  typedef signed char  FT_Char;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Byte                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple typedef for the _unsigned_ char type.                     */
+  /*                                                                       */
+  typedef unsigned char  FT_Byte;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Bytes                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for constant memory areas.                               */
+  /*                                                                       */
+  typedef const FT_Byte*  FT_Bytes;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Tag                                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for 32-bit tags (as used in the SFNT format).            */
+  /*                                                                       */
+  typedef FT_UInt32  FT_Tag;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_String                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple typedef for the char type, usually used for strings.      */
+  /*                                                                       */
+  typedef char  FT_String;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Short                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for signed short.                                        */
+  /*                                                                       */
+  typedef signed short  FT_Short;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UShort                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for unsigned short.                                      */
+  /*                                                                       */
+  typedef unsigned short  FT_UShort;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int                                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for the int type.                                        */
+  /*                                                                       */
+  typedef signed int  FT_Int;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for the unsigned int type.                               */
+  /*                                                                       */
+  typedef unsigned int  FT_UInt;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Long                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for signed long.                                         */
+  /*                                                                       */
+  typedef signed long  FT_Long;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_ULong                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for unsigned long.                                       */
+  /*                                                                       */
+  typedef unsigned long  FT_ULong;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_F2Dot14                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A signed 2.14 fixed-point type used for unit vectors.              */
+  /*                                                                       */
+  typedef signed short  FT_F2Dot14;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_F26Dot6                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A signed 26.6 fixed-point type used for vectorial pixel            */
+  /*    coordinates.                                                       */
+  /*                                                                       */
+  typedef signed long  FT_F26Dot6;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Fixed                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This type is used to store 16.16 fixed-point values, like scaling  */
+  /*    values or matrix coefficients.                                     */
+  /*                                                                       */
+  typedef signed long  FT_Fixed;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Error                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The FreeType error code type.  A value of~0 is always interpreted  */
+  /*    as a successful operation.                                         */
+  /*                                                                       */
+  typedef int  FT_Error;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Pointer                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple typedef for a typeless pointer.                           */
+  /*                                                                       */
+  typedef void*  FT_Pointer;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Offset                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This is equivalent to the ANSI~C `size_t' type, i.e., the largest  */
+  /*    _unsigned_ integer type used to express a file size or position,   */
+  /*    or a memory block size.                                            */
+  /*                                                                       */
+  typedef size_t  FT_Offset;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_PtrDist                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This is equivalent to the ANSI~C `ptrdiff_t' type, i.e., the       */
+  /*    largest _signed_ integer type used to express the distance         */
+  /*    between two pointers.                                              */
+  /*                                                                       */
+  typedef ft_ptrdiff_t  FT_PtrDist;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_UnitVector                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to store a 2D vector unit vector.  Uses    */
+  /*    FT_F2Dot14 types.                                                  */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    x :: Horizontal coordinate.                                        */
+  /*                                                                       */
+  /*    y :: Vertical coordinate.                                          */
+  /*                                                                       */
+  typedef struct  FT_UnitVector_
+  {
+    FT_F2Dot14  x;
+    FT_F2Dot14  y;
+
+  } FT_UnitVector;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Matrix                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure used to store a 2x2 matrix.  Coefficients are   */
+  /*    in 16.16 fixed-point format.  The computation performed is:        */
+  /*                                                                       */
+  /*       {                                                               */
+  /*          x' = x*xx + y*xy                                             */
+  /*          y' = x*yx + y*yy                                             */
+  /*       }                                                               */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    xx :: Matrix coefficient.                                          */
+  /*                                                                       */
+  /*    xy :: Matrix coefficient.                                          */
+  /*                                                                       */
+  /*    yx :: Matrix coefficient.                                          */
+  /*                                                                       */
+  /*    yy :: Matrix coefficient.                                          */
+  /*                                                                       */
+  typedef struct  FT_Matrix_
+  {
+    FT_Fixed  xx, xy;
+    FT_Fixed  yx, yy;
+
+  } FT_Matrix;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Data                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Read-only binary data represented as a pointer and a length.       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    pointer :: The data.                                               */
+  /*                                                                       */
+  /*    length  :: The length of the data in bytes.                        */
+  /*                                                                       */
+  typedef struct  FT_Data_
+  {
+    const FT_Byte*  pointer;
+    FT_Int          length;
+
+  } FT_Data;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Generic_Finalizer                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Describe a function used to destroy the `client' data of any       */
+  /*    FreeType object.  See the description of the @FT_Generic type for  */
+  /*    details of usage.                                                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    The address of the FreeType object that is under finalization.     */
+  /*    Its client data is accessed through its `generic' field.           */
+  /*                                                                       */
+  typedef void  (*FT_Generic_Finalizer)(void*  object);
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Generic                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Client applications often need to associate their own data to a    */
+  /*    variety of FreeType core objects.  For example, a text layout API  */
+  /*    might want to associate a glyph cache to a given size object.      */
+  /*                                                                       */
+  /*    Some FreeType object contains a `generic' field, of type           */
+  /*    FT_Generic, which usage is left to client applications and font    */
+  /*    servers.                                                           */
+  /*                                                                       */
+  /*    It can be used to store a pointer to client-specific data, as well */
+  /*    as the address of a `finalizer' function, which will be called by  */
+  /*    FreeType when the object is destroyed (for example, the previous   */
+  /*    client example would put the address of the glyph cache destructor */
+  /*    in the `finalizer' field).                                         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    data      :: A typeless pointer to any client-specified data. This */
+  /*                 field is completely ignored by the FreeType library.  */
+  /*                                                                       */
+  /*    finalizer :: A pointer to a `generic finalizer' function, which    */
+  /*                 will be called when the object is destroyed.  If this */
+  /*                 field is set to NULL, no code will be called.         */
+  /*                                                                       */
+  typedef struct  FT_Generic_
+  {
+    void*                 data;
+    FT_Generic_Finalizer  finalizer;
+
+  } FT_Generic;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_MAKE_TAG                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This macro converts four-letter tags that are used to label        */
+  /*    TrueType tables into an unsigned long, to be used within FreeType. */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The produced values *must* be 32-bit integers.  Don't redefine     */
+  /*    this macro.                                                        */
+  /*                                                                       */
+#define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
+          (FT_Tag)                        \
+          ( ( (FT_ULong)_x1 << 24 ) |     \
+            ( (FT_ULong)_x2 << 16 ) |     \
+            ( (FT_ULong)_x3 <<  8 ) |     \
+              (FT_ULong)_x4         )
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*                                                                       */
+  /*                    L I S T   M A N A G E M E N T                      */
+  /*                                                                       */
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    list_processing                                                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_ListNode                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*     Many elements and objects in FreeType are listed through an       */
+  /*     @FT_List record (see @FT_ListRec).  As its name suggests, an      */
+  /*     FT_ListNode is a handle to a single list element.                 */
+  /*                                                                       */
+  typedef struct FT_ListNodeRec_*  FT_ListNode;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_List                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a list record (see @FT_ListRec).                       */
+  /*                                                                       */
+  typedef struct FT_ListRec_*  FT_List;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_ListNodeRec                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to hold a single list element.                    */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    prev :: The previous element in the list.  NULL if first.          */
+  /*                                                                       */
+  /*    next :: The next element in the list.  NULL if last.               */
+  /*                                                                       */
+  /*    data :: A typeless pointer to the listed object.                   */
+  /*                                                                       */
+  typedef struct  FT_ListNodeRec_
+  {
+    FT_ListNode  prev;
+    FT_ListNode  next;
+    void*        data;
+
+  } FT_ListNodeRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_ListRec                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to hold a simple doubly-linked list.  These are   */
+  /*    used in many parts of FreeType.                                    */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    head :: The head (first element) of doubly-linked list.            */
+  /*                                                                       */
+  /*    tail :: The tail (last element) of doubly-linked list.             */
+  /*                                                                       */
+  typedef struct  FT_ListRec_
+  {
+    FT_ListNode  head;
+    FT_ListNode  tail;
+
+  } FT_ListRec;
+
+
+  /* */
+
+#define FT_IS_EMPTY( list )  ( (list).head == 0 )
+#define FT_BOOL( x )  ( (FT_Bool)( x ) )
+
+  /* concatenate C tokens */
+#define FT_ERR_XCAT( x, y )  x ## y
+#define FT_ERR_CAT( x, y )   FT_ERR_XCAT( x, y )
+
+  /* see `ftmoderr.h' for descriptions of the following macros */
+
+#define FT_ERR( e )  FT_ERR_CAT( FT_ERR_PREFIX, e )
+
+#define FT_ERROR_BASE( x )    ( (x) & 0xFF )
+#define FT_ERROR_MODULE( x )  ( (x) & 0xFF00U )
+
+#define FT_ERR_EQ( x, e )                                        \
+          ( FT_ERROR_BASE( x ) == FT_ERROR_BASE( FT_ERR( e ) ) )
+#define FT_ERR_NEQ( x, e )                                       \
+          ( FT_ERROR_BASE( x ) != FT_ERROR_BASE( FT_ERR( e ) ) )
+
+
+FT_END_HEADER
+
+#endif /* __FTTYPES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/fttypes.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftwinfnt.h
===================================================================
--- lib/3rdparty/freetype/include/ftwinfnt.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftwinfnt.h	(rÃ©vision 62573)
@@ -0,0 +1,275 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftwinfnt.h                                                             */
+/*                                                                         */
+/*    FreeType API for accessing Windows fnt-specific data.                */
+/*                                                                         */
+/*  Copyright 2003, 2004, 2008 by                                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTWINFNT_H__
+#define __FTWINFNT_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    winfnt_fonts                                                       */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Window FNT Files                                                   */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Windows FNT specific API.                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the declaration of Windows FNT specific      */
+  /*    functions.                                                         */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************
+   *
+   * @enum:
+   *   FT_WinFNT_ID_XXX
+   *
+   * @description:
+   *   A list of valid values for the `charset' byte in
+   *   @FT_WinFNT_HeaderRec.  Exact mapping tables for the various cpXXXX
+   *   encodings (except for cp1361) can be found at
+   *   ftp://ftp.unicode.org/public in the MAPPINGS/VENDORS/MICSFT/WINDOWS
+   *   subdirectory.  cp1361 is roughly a superset of
+   *   MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
+   *
+   * @values:
+   *   FT_WinFNT_ID_DEFAULT ::
+   *     This is used for font enumeration and font creation as a
+   *     `don't care' value.  Valid font files don't contain this value.
+   *     When querying for information about the character set of the font
+   *     that is currently selected into a specified device context, this
+   *     return value (of the related Windows API) simply denotes failure.
+   *
+   *   FT_WinFNT_ID_SYMBOL ::
+   *     There is no known mapping table available.
+   *
+   *   FT_WinFNT_ID_MAC ::
+   *     Mac Roman encoding.
+   *
+   *   FT_WinFNT_ID_OEM ::
+   *     From Michael PÃ¶ttgen <michael@poettgen.de>:
+   *
+   *       The `Windows Font Mapping' article says that FT_WinFNT_ID_OEM
+   *       is used for the charset of vector fonts, like `modern.fon',
+   *       `roman.fon', and `script.fon' on Windows.
+   *
+   *       The `CreateFont' documentation says: The FT_WinFNT_ID_OEM value
+   *       specifies a character set that is operating-system dependent.
+   *
+   *       The `IFIMETRICS' documentation from the `Windows Driver
+   *       Development Kit' says: This font supports an OEM-specific
+   *       character set.  The OEM character set is system dependent.
+   *
+   *       In general OEM, as opposed to ANSI (i.e., cp1252), denotes the
+   *       second default codepage that most international versions of
+   *       Windows have.  It is one of the OEM codepages from
+   *
+   *         http://www.microsoft.com/globaldev/reference/cphome.mspx,
+   *
+   *       and is used for the `DOS boxes', to support legacy applications.
+   *       A German Windows version for example usually uses ANSI codepage
+   *       1252 and OEM codepage 850.
+   *
+   *   FT_WinFNT_ID_CP874 ::
+   *     A superset of Thai TIS 620 and ISO 8859-11.
+   *
+   *   FT_WinFNT_ID_CP932 ::
+   *     A superset of Japanese Shift-JIS (with minor deviations).
+   *
+   *   FT_WinFNT_ID_CP936 ::
+   *     A superset of simplified Chinese GB 2312-1980 (with different
+   *     ordering and minor deviations).
+   *
+   *   FT_WinFNT_ID_CP949 ::
+   *     A superset of Korean Hangul KS~C 5601-1987 (with different
+   *     ordering and minor deviations).
+   *
+   *   FT_WinFNT_ID_CP950 ::
+   *     A superset of traditional Chinese Big~5 ETen (with different
+   *     ordering and minor deviations).
+   *
+   *   FT_WinFNT_ID_CP1250 ::
+   *     A superset of East European ISO 8859-2 (with slightly different
+   *     ordering).
+   *
+   *   FT_WinFNT_ID_CP1251 ::
+   *     A superset of Russian ISO 8859-5 (with different ordering).
+   *
+   *   FT_WinFNT_ID_CP1252 ::
+   *     ANSI encoding.  A superset of ISO 8859-1.
+   *
+   *   FT_WinFNT_ID_CP1253 ::
+   *     A superset of Greek ISO 8859-7 (with minor modifications).
+   *
+   *   FT_WinFNT_ID_CP1254 ::
+   *     A superset of Turkish ISO 8859-9.
+   *
+   *   FT_WinFNT_ID_CP1255 ::
+   *     A superset of Hebrew ISO 8859-8 (with some modifications).
+   *
+   *   FT_WinFNT_ID_CP1256 ::
+   *     A superset of Arabic ISO 8859-6 (with different ordering).
+   *
+   *   FT_WinFNT_ID_CP1257 ::
+   *     A superset of Baltic ISO 8859-13 (with some deviations).
+   *
+   *   FT_WinFNT_ID_CP1258 ::
+   *     For Vietnamese.  This encoding doesn't cover all necessary
+   *     characters.
+   *
+   *   FT_WinFNT_ID_CP1361 ::
+   *     Korean (Johab).
+   */
+
+#define FT_WinFNT_ID_CP1252    0
+#define FT_WinFNT_ID_DEFAULT   1
+#define FT_WinFNT_ID_SYMBOL    2
+#define FT_WinFNT_ID_MAC      77
+#define FT_WinFNT_ID_CP932   128
+#define FT_WinFNT_ID_CP949   129
+#define FT_WinFNT_ID_CP1361  130
+#define FT_WinFNT_ID_CP936   134
+#define FT_WinFNT_ID_CP950   136
+#define FT_WinFNT_ID_CP1253  161
+#define FT_WinFNT_ID_CP1254  162
+#define FT_WinFNT_ID_CP1258  163
+#define FT_WinFNT_ID_CP1255  177
+#define FT_WinFNT_ID_CP1256  178
+#define FT_WinFNT_ID_CP1257  186
+#define FT_WinFNT_ID_CP1251  204
+#define FT_WinFNT_ID_CP874   222
+#define FT_WinFNT_ID_CP1250  238
+#define FT_WinFNT_ID_OEM     255
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_WinFNT_HeaderRec                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Windows FNT Header info.                                           */
+  /*                                                                       */
+  typedef struct  FT_WinFNT_HeaderRec_
+  {
+    FT_UShort  version;
+    FT_ULong   file_size;
+    FT_Byte    copyright[60];
+    FT_UShort  file_type;
+    FT_UShort  nominal_point_size;
+    FT_UShort  vertical_resolution;
+    FT_UShort  horizontal_resolution;
+    FT_UShort  ascent;
+    FT_UShort  internal_leading;
+    FT_UShort  external_leading;
+    FT_Byte    italic;
+    FT_Byte    underline;
+    FT_Byte    strike_out;
+    FT_UShort  weight;
+    FT_Byte    charset;
+    FT_UShort  pixel_width;
+    FT_UShort  pixel_height;
+    FT_Byte    pitch_and_family;
+    FT_UShort  avg_width;
+    FT_UShort  max_width;
+    FT_Byte    first_char;
+    FT_Byte    last_char;
+    FT_Byte    default_char;
+    FT_Byte    break_char;
+    FT_UShort  bytes_per_row;
+    FT_ULong   device_offset;
+    FT_ULong   face_name_offset;
+    FT_ULong   bits_pointer;
+    FT_ULong   bits_offset;
+    FT_Byte    reserved;
+    FT_ULong   flags;
+    FT_UShort  A_space;
+    FT_UShort  B_space;
+    FT_UShort  C_space;
+    FT_UShort  color_table_offset;
+    FT_ULong   reserved1[4];
+
+  } FT_WinFNT_HeaderRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_WinFNT_Header                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to an @FT_WinFNT_HeaderRec structure.                     */
+  /*                                                                       */
+  typedef struct FT_WinFNT_HeaderRec_*  FT_WinFNT_Header;
+
+
+  /**********************************************************************
+   *
+   * @function:
+   *    FT_Get_WinFNT_Header
+   *
+   * @description:
+   *    Retrieve a Windows FNT font info header.
+   *
+   * @input:
+   *    face    :: A handle to the input face.
+   *
+   * @output:
+   *    aheader :: The WinFNT header.
+   *
+   * @return:
+   *   FreeType error code.  0~means success.
+   *
+   * @note:
+   *   This function only works with Windows FNT faces, returning an error
+   *   otherwise.
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_WinFNT_Header( FT_Face               face,
+                        FT_WinFNT_HeaderRec  *aheader );
+
+
+  /* */
+
+FT_END_HEADER
+
+#endif /* __FTWINFNT_H__ */
+
+
+/* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftwinfnt.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ftxf86.h
===================================================================
--- lib/3rdparty/freetype/include/ftxf86.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ftxf86.h	(rÃ©vision 62573)
@@ -0,0 +1,83 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftxf86.h                                                               */
+/*                                                                         */
+/*    Support functions for X11.                                           */
+/*                                                                         */
+/*  Copyright 2002-2004, 2006, 2007, 2013 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTXF86_H__
+#define __FTXF86_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*   font_formats                                                        */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*   Font Formats                                                        */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*   Getting the font format.                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*   The single function in this section can be used to get the font     */
+  /*   format.  Note that this information is not needed normally;         */
+  /*   however, there are special cases (like in PDF devices) where it is  */
+  /*   important to differentiate, in spite of FreeType's uniform API.     */
+  /*                                                                       */
+  /*   This function is in the X11/xf86 namespace for historical reasons   */
+  /*   and in no way depends on that windowing system.                     */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*   FT_Get_X11_Font_Format                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*   Return a string describing the format of a given face, using values */
+  /*   that can be used as an X11 FONT_PROPERTY.  Possible values are      */
+  /*   `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
+  /*   `PFR', and `Windows~FNT'.                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*   face ::                                                             */
+  /*     Input face handle.                                                */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*   Font format string.  NULL in case of error.                         */
+  /*                                                                       */
+  FT_EXPORT( const char* )
+  FT_Get_X11_Font_Format( FT_Face  face );
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTXF86_H__ */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ftxf86.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/autohint.h
===================================================================
--- lib/3rdparty/freetype/include/internal/autohint.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/autohint.h	(rÃ©vision 62573)
@@ -0,0 +1,244 @@
+/***************************************************************************/
+/*                                                                         */
+/*  autohint.h                                                             */
+/*                                                                         */
+/*    High-level `autohint' module-specific interface (specification).     */
+/*                                                                         */
+/*  Copyright 1996-2002, 2007, 2009, 2012 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* The auto-hinter is used to load and automatically hint glyphs if a    */
+  /* format-specific hinter isn't available.                               */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __AUTOHINT_H__
+#define __AUTOHINT_H__
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* A small technical note regarding automatic hinting in order to        */
+  /* clarify this module interface.                                        */
+  /*                                                                       */
+  /* An automatic hinter might compute two kinds of data for a given face: */
+  /*                                                                       */
+  /* - global hints: Usually some metrics that describe global properties  */
+  /*                 of the face.  It is computed by scanning more or less */
+  /*                 aggressively the glyphs in the face, and thus can be  */
+  /*                 very slow to compute (even if the size of global      */
+  /*                 hints is really small).                               */
+  /*                                                                       */
+  /* - glyph hints:  These describe some important features of the glyph   */
+  /*                 outline, as well as how to align them.  They are      */
+  /*                 generally much faster to compute than global hints.   */
+  /*                                                                       */
+  /* The current FreeType auto-hinter does a pretty good job while         */
+  /* performing fast computations for both global and glyph hints.         */
+  /* However, we might be interested in introducing more complex and       */
+  /* powerful algorithms in the future, like the one described in the John */
+  /* D. Hobby paper, which unfortunately requires a lot more horsepower.   */
+  /*                                                                       */
+  /* Because a sufficiently sophisticated font management system would     */
+  /* typically implement an LRU cache of opened face objects to reduce     */
+  /* memory usage, it is a good idea to be able to avoid recomputing       */
+  /* global hints every time the same face is re-opened.                   */
+  /*                                                                       */
+  /* We thus provide the ability to cache global hints outside of the face */
+  /* object, in order to speed up font re-opening time.  Of course, this   */
+  /* feature is purely optional, so most client programs won't even notice */
+  /* it.                                                                   */
+  /*                                                                       */
+  /* I initially thought that it would be a good idea to cache the glyph   */
+  /* hints too.  However, my general idea now is that if you really need   */
+  /* to cache these too, you are simply in need of a new font format,      */
+  /* where all this information could be stored within the font file and   */
+  /* decoded on the fly.                                                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+
+FT_BEGIN_HEADER
+
+
+  typedef struct FT_AutoHinterRec_  *FT_AutoHinter;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_AutoHinter_GlobalGetFunc                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieve the global hints computed for a given face object.  The   */
+  /*    resulting data is dissociated from the face and will survive a     */
+  /*    call to FT_Done_Face().  It must be discarded through the API      */
+  /*    FT_AutoHinter_GlobalDoneFunc().                                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    hinter       :: A handle to the source auto-hinter.                */
+  /*                                                                       */
+  /*    face         :: A handle to the source face object.                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    global_hints :: A typeless pointer to the global hints.            */
+  /*                                                                       */
+  /*    global_len   :: The size in bytes of the global hints.             */
+  /*                                                                       */
+  typedef void
+  (*FT_AutoHinter_GlobalGetFunc)( FT_AutoHinter  hinter,
+                                  FT_Face        face,
+                                  void**         global_hints,
+                                  long*          global_len );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_AutoHinter_GlobalDoneFunc                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Discard the global hints retrieved through                         */
+  /*    FT_AutoHinter_GlobalGetFunc().  This is the only way these hints   */
+  /*    are freed from memory.                                             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    hinter :: A handle to the auto-hinter module.                      */
+  /*                                                                       */
+  /*    global :: A pointer to retrieved global hints to discard.          */
+  /*                                                                       */
+  typedef void
+  (*FT_AutoHinter_GlobalDoneFunc)( FT_AutoHinter  hinter,
+                                   void*          global );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_AutoHinter_GlobalResetFunc                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function is used to recompute the global metrics in a given   */
+  /*    font.  This is useful when global font data changes (e.g. Multiple */
+  /*    Masters fonts where blend coordinates change).                     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    hinter :: A handle to the source auto-hinter.                      */
+  /*                                                                       */
+  /*    face   :: A handle to the face.                                    */
+  /*                                                                       */
+  typedef void
+  (*FT_AutoHinter_GlobalResetFunc)( FT_AutoHinter  hinter,
+                                    FT_Face        face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_AutoHinter_GlyphLoadFunc                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This function is used to load, scale, and automatically hint a     */
+  /*    glyph from a given face.                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face        :: A handle to the face.                               */
+  /*                                                                       */
+  /*    glyph_index :: The glyph index.                                    */
+  /*                                                                       */
+  /*    load_flags  :: The load flags.                                     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function is capable of loading composite glyphs by hinting    */
+  /*    each sub-glyph independently (which improves quality).             */
+  /*                                                                       */
+  /*    It will call the font driver with @FT_Load_Glyph, with             */
+  /*    @FT_LOAD_NO_SCALE set.                                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*FT_AutoHinter_GlyphLoadFunc)( FT_AutoHinter  hinter,
+                                  FT_GlyphSlot   slot,
+                                  FT_Size        size,
+                                  FT_UInt        glyph_index,
+                                  FT_Int32       load_flags );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_AutoHinter_InterfaceRec                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The auto-hinter module's interface.                                */
+  /*                                                                       */
+  typedef struct  FT_AutoHinter_InterfaceRec_
+  {
+    FT_AutoHinter_GlobalResetFunc  reset_face;
+    FT_AutoHinter_GlobalGetFunc    get_global_hints;
+    FT_AutoHinter_GlobalDoneFunc   done_global_hints;
+    FT_AutoHinter_GlyphLoadFunc    load_glyph;
+
+  } FT_AutoHinter_InterfaceRec, *FT_AutoHinter_Interface;
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_AUTOHINTER_INTERFACE(       \
+          class_,                             \
+          reset_face_,                        \
+          get_global_hints_,                  \
+          done_global_hints_,                 \
+          load_glyph_ )                       \
+  FT_CALLBACK_TABLE_DEF                       \
+  const FT_AutoHinter_InterfaceRec  class_ =  \
+  {                                           \
+    reset_face_,                              \
+    get_global_hints_,                        \
+    done_global_hints_,                       \
+    load_glyph_                               \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_AUTOHINTER_INTERFACE(                            \
+          class_,                                                  \
+          reset_face_,                                             \
+          get_global_hints_,                                       \
+          done_global_hints_,                                      \
+          load_glyph_ )                                            \
+  void                                                             \
+  FT_Init_Class_ ## class_( FT_Library                   library,  \
+                            FT_AutoHinter_InterfaceRec*  clazz )   \
+  {                                                                \
+    FT_UNUSED( library );                                          \
+                                                                   \
+    clazz->reset_face        = reset_face_;                        \
+    clazz->get_global_hints  = get_global_hints_;                  \
+    clazz->done_global_hints = done_global_hints_;                 \
+    clazz->load_glyph        = load_glyph_;                        \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+FT_END_HEADER
+
+#endif /* __AUTOHINT_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/autohint.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftcalc.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftcalc.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftcalc.h	(rÃ©vision 62573)
@@ -0,0 +1,171 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftcalc.h                                                               */
+/*                                                                         */
+/*    Arithmetic computations (specification).                             */
+/*                                                                         */
+/*  Copyright 1996-2006, 2008, 2009, 2012-2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTCALC_H__
+#define __FTCALC_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+
+FT_BEGIN_HEADER
+
+
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_SqrtFixed                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Computes the square root of a 16.16 fixed-point value.             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    x :: The value to compute the root for.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `sqrt(x)'.                                           */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function is not very fast.                                    */
+  /*                                                                       */
+  FT_BASE( FT_Int32 )
+  FT_SqrtFixed( FT_Int32  x );
+
+#endif /* 0 */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* FT_MulDiv() and FT_MulFix() are declared in freetype.h.               */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_MulDiv_No_Round                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A very simple function used to perform the computation `(a*b)/c'   */
+  /*    (without rounding) with maximum accuracy (it uses a 64-bit         */
+  /*    intermediate integer whenever necessary).                          */
+  /*                                                                       */
+  /*    This function isn't necessarily as fast as some processor specific */
+  /*    operations, but is at least completely portable.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    a :: The first multiplier.                                         */
+  /*    b :: The second multiplier.                                        */
+  /*    c :: The divisor.                                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The result of `(a*b)/c'.  This function never traps when trying to */
+  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
+  /*    on the signs of `a' and `b'.                                       */
+  /*                                                                       */
+  FT_BASE( FT_Long )
+  FT_MulDiv_No_Round( FT_Long  a,
+                      FT_Long  b,
+                      FT_Long  c );
+
+
+  /*
+   *  A variant of FT_Matrix_Multiply which scales its result afterwards.
+   *  The idea is that both `a' and `b' are scaled by factors of 10 so that
+   *  the values are as precise as possible to get a correct result during
+   *  the 64bit multiplication.  Let `sa' and `sb' be the scaling factors of
+   *  `a' and `b', respectively, then the scaling factor of the result is
+   *  `sa*sb'.
+   */
+  FT_BASE( void )
+  FT_Matrix_Multiply_Scaled( const FT_Matrix*  a,
+                             FT_Matrix        *b,
+                             FT_Long           scaling );
+
+
+  /*
+   *  A variant of FT_Vector_Transform.  See comments for
+   *  FT_Matrix_Multiply_Scaled.
+   */
+  FT_BASE( void )
+  FT_Vector_Transform_Scaled( FT_Vector*        vector,
+                              const FT_Matrix*  matrix,
+                              FT_Long           scaling );
+
+
+  /*
+   *  Return -1, 0, or +1, depending on the orientation of a given corner.
+   *  We use the Cartesian coordinate system, with positive vertical values
+   *  going upwards.  The function returns +1 if the corner turns to the
+   *  left, -1 to the right, and 0 for undecidable cases.
+   */
+  FT_BASE( FT_Int )
+  ft_corner_orientation( FT_Pos  in_x,
+                         FT_Pos  in_y,
+                         FT_Pos  out_x,
+                         FT_Pos  out_y );
+
+  /*
+   *  Return TRUE if a corner is flat or nearly flat.  This is equivalent to
+   *  saying that the angle difference between the `in' and `out' vectors is
+   *  very small.
+   */
+  FT_BASE( FT_Int )
+  ft_corner_is_flat( FT_Pos  in_x,
+                     FT_Pos  in_y,
+                     FT_Pos  out_x,
+                     FT_Pos  out_y );
+
+
+  /*
+   *  Return the most significant bit index.
+   */
+  FT_BASE( FT_Int )
+  FT_MSB( FT_UInt32  z );
+
+
+  /*
+   *  Return sqrt(x*x+y*y), which is the same as `FT_Vector_Length' but uses
+   *  two fixed-point arguments instead.
+   */
+  FT_BASE( FT_Fixed )
+  FT_Hypot( FT_Fixed  x,
+            FT_Fixed  y );
+
+
+#define INT_TO_F26DOT6( x )    ( (FT_Long)(x) << 6  )
+#define INT_TO_F2DOT14( x )    ( (FT_Long)(x) << 14 )
+#define INT_TO_FIXED( x )      ( (FT_Long)(x) << 16 )
+#define F2DOT14_TO_FIXED( x )  ( (FT_Long)(x) << 2  )
+#define FLOAT_TO_FIXED( x )    ( (FT_Long)( x * 65536.0 ) )
+#define FIXED_TO_INT( x )      ( FT_RoundFix( x ) >> 16 )
+
+#define ROUND_F26DOT6( x )     ( x >= 0 ? (    ( (x) + 32 ) & -64 )     \
+                                        : ( -( ( 32 - (x) ) & -64 ) ) )
+
+
+FT_END_HEADER
+
+#endif /* __FTCALC_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftcalc.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftdebug.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftdebug.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftdebug.h	(rÃ©vision 62573)
@@ -0,0 +1,255 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftdebug.h                                                              */
+/*                                                                         */
+/*    Debugging and logging component (specification).                     */
+/*                                                                         */
+/*  Copyright 1996-2002, 2004, 2006-2009, 2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/*                                                                         */
+/*  IMPORTANT: A description of FreeType's debugging support can be        */
+/*             found in `docs/DEBUG.TXT'.  Read it if you need to use or   */
+/*             understand this code.                                       */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTDEBUG_H__
+#define __FTDEBUG_H__
+
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_FREETYPE_H
+
+
+FT_BEGIN_HEADER
+
+
+  /* force the definition of FT_DEBUG_LEVEL_ERROR if FT_DEBUG_LEVEL_TRACE */
+  /* is already defined; this simplifies the following #ifdefs            */
+  /*                                                                      */
+#ifdef FT_DEBUG_LEVEL_TRACE
+#undef  FT_DEBUG_LEVEL_ERROR
+#define FT_DEBUG_LEVEL_ERROR
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define the trace enums as well as the trace levels array when they    */
+  /* are needed.                                                           */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+
+#define FT_TRACE_DEF( x )  trace_ ## x ,
+
+  /* defining the enumeration */
+  typedef enum  FT_Trace_
+  {
+#include FT_INTERNAL_TRACE_H
+    trace_count
+
+  } FT_Trace;
+
+
+  /* defining the array of trace levels, provided by `src/base/ftdebug.c' */
+  extern int  ft_trace_levels[trace_count];
+
+#undef FT_TRACE_DEF
+
+#endif /* FT_DEBUG_LEVEL_TRACE */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define the FT_TRACE macro                                             */
+  /*                                                                       */
+  /* IMPORTANT!                                                            */
+  /*                                                                       */
+  /* Each component must define the macro FT_COMPONENT to a valid FT_Trace */
+  /* value before using any TRACE macro.                                   */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+
+#define FT_TRACE( level, varformat )                      \
+          do                                              \
+          {                                               \
+            if ( ft_trace_levels[FT_COMPONENT] >= level ) \
+              FT_Message varformat;                       \
+          } while ( 0 )
+
+#else /* !FT_DEBUG_LEVEL_TRACE */
+
+#define FT_TRACE( level, varformat )  do { } while ( 0 )      /* nothing */
+
+#endif /* !FT_DEBUG_LEVEL_TRACE */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Trace_Get_Count                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the number of available trace components.                   */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The number of trace components.  0 if FreeType 2 is not built with */
+  /*    FT_DEBUG_LEVEL_TRACE definition.                                   */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function may be useful if you want to access elements of      */
+  /*    the internal `ft_trace_levels' array by an index.                  */
+  /*                                                                       */
+  FT_BASE( FT_Int )
+  FT_Trace_Get_Count( void );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Trace_Get_Name                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return the name of a trace component.                              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    The index of the trace component.                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The name of the trace component.  This is a statically allocated   */
+  /*    C string, so do not free it after use.  NULL if FreeType 2 is not  */
+  /*    built with FT_DEBUG_LEVEL_TRACE definition.                        */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Use @FT_Trace_Get_Count to get the number of available trace       */
+  /*    components.                                                        */
+  /*                                                                       */
+  /*    This function may be useful if you want to control FreeType 2's    */
+  /*    debug level in your application.                                   */
+  /*                                                                       */
+  FT_BASE( const char * )
+  FT_Trace_Get_Name( FT_Int  idx );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* You need two opening and closing parentheses!                         */
+  /*                                                                       */
+  /* Example: FT_TRACE0(( "Value is %i", foo ))                            */
+  /*                                                                       */
+  /* Output of the FT_TRACEX macros is sent to stderr.                     */
+  /*                                                                       */
+  /*************************************************************************/
+
+#define FT_TRACE0( varformat )  FT_TRACE( 0, varformat )
+#define FT_TRACE1( varformat )  FT_TRACE( 1, varformat )
+#define FT_TRACE2( varformat )  FT_TRACE( 2, varformat )
+#define FT_TRACE3( varformat )  FT_TRACE( 3, varformat )
+#define FT_TRACE4( varformat )  FT_TRACE( 4, varformat )
+#define FT_TRACE5( varformat )  FT_TRACE( 5, varformat )
+#define FT_TRACE6( varformat )  FT_TRACE( 6, varformat )
+#define FT_TRACE7( varformat )  FT_TRACE( 7, varformat )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define the FT_ERROR macro.                                            */
+  /*                                                                       */
+  /* Output of this macro is sent to stderr.                               */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifdef FT_DEBUG_LEVEL_ERROR
+
+#define FT_ERROR( varformat )  FT_Message  varformat
+
+#else  /* !FT_DEBUG_LEVEL_ERROR */
+
+#define FT_ERROR( varformat )  do { } while ( 0 )      /* nothing */
+
+#endif /* !FT_DEBUG_LEVEL_ERROR */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define the FT_ASSERT and FT_THROW macros.  The call to `FT_Throw'     */
+  /* makes it possible to easily set a breakpoint at this function.        */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifdef FT_DEBUG_LEVEL_ERROR
+
+#define FT_ASSERT( condition )                                      \
+          do                                                        \
+          {                                                         \
+            if ( !( condition ) )                                   \
+              FT_Panic( "assertion failed on line %d of file %s\n", \
+                        __LINE__, __FILE__ );                       \
+          } while ( 0 )
+
+#define FT_THROW( e )                                   \
+          ( FT_Throw( FT_ERR_CAT( FT_ERR_PREFIX, e ),   \
+                      __LINE__,                         \
+                      __FILE__ )                      | \
+            FT_ERR_CAT( FT_ERR_PREFIX, e )            )
+
+#else /* !FT_DEBUG_LEVEL_ERROR */
+
+#define FT_ASSERT( condition )  do { } while ( 0 )
+
+#define FT_THROW( e )  FT_ERR_CAT( FT_ERR_PREFIX, e )
+
+#endif /* !FT_DEBUG_LEVEL_ERROR */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define `FT_Message' and `FT_Panic' when needed.                       */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifdef FT_DEBUG_LEVEL_ERROR
+
+#include "stdio.h"  /* for vfprintf() */
+
+  /* print a message */
+  FT_BASE( void )
+  FT_Message( const char*  fmt,
+              ... );
+
+  /* print a message and exit */
+  FT_BASE( void )
+  FT_Panic( const char*  fmt,
+            ... );
+
+  /* report file name and line number of an error */
+  FT_BASE( int )
+  FT_Throw( FT_Error     error,
+            int          line,
+            const char*  file );
+
+#endif /* FT_DEBUG_LEVEL_ERROR */
+
+
+  FT_BASE( void )
+  ft_debug_init( void );
+
+FT_END_HEADER
+
+#endif /* __FTDEBUG_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftdebug.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftdriver.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftdriver.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftdriver.h	(rÃ©vision 62573)
@@ -0,0 +1,409 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftdriver.h                                                             */
+/*                                                                         */
+/*    FreeType font driver interface (specification).                      */
+/*                                                                         */
+/*  Copyright 1996-2003, 2006, 2008, 2011-2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTDRIVER_H__
+#define __FTDRIVER_H__
+
+
+#include <ft2build.h>
+#include FT_MODULE_H
+
+
+FT_BEGIN_HEADER
+
+
+  typedef FT_Error
+  (*FT_Face_InitFunc)( FT_Stream      stream,
+                       FT_Face        face,
+                       FT_Int         typeface_index,
+                       FT_Int         num_params,
+                       FT_Parameter*  parameters );
+
+  typedef void
+  (*FT_Face_DoneFunc)( FT_Face  face );
+
+
+  typedef FT_Error
+  (*FT_Size_InitFunc)( FT_Size  size );
+
+  typedef void
+  (*FT_Size_DoneFunc)( FT_Size  size );
+
+
+  typedef FT_Error
+  (*FT_Slot_InitFunc)( FT_GlyphSlot  slot );
+
+  typedef void
+  (*FT_Slot_DoneFunc)( FT_GlyphSlot  slot );
+
+
+  typedef FT_Error
+  (*FT_Size_RequestFunc)( FT_Size          size,
+                          FT_Size_Request  req );
+
+  typedef FT_Error
+  (*FT_Size_SelectFunc)( FT_Size   size,
+                         FT_ULong  size_index );
+
+  typedef FT_Error
+  (*FT_Slot_LoadFunc)( FT_GlyphSlot  slot,
+                       FT_Size       size,
+                       FT_UInt       glyph_index,
+                       FT_Int32      load_flags );
+
+
+  typedef FT_UInt
+  (*FT_CharMap_CharIndexFunc)( FT_CharMap  charmap,
+                               FT_Long     charcode );
+
+  typedef FT_Long
+  (*FT_CharMap_CharNextFunc)( FT_CharMap  charmap,
+                              FT_Long     charcode );
+
+
+  typedef FT_Error
+  (*FT_Face_GetKerningFunc)( FT_Face     face,
+                             FT_UInt     left_glyph,
+                             FT_UInt     right_glyph,
+                             FT_Vector*  kerning );
+
+
+  typedef FT_Error
+  (*FT_Face_AttachFunc)( FT_Face    face,
+                         FT_Stream  stream );
+
+
+  typedef FT_Error
+  (*FT_Face_GetAdvancesFunc)( FT_Face    face,
+                              FT_UInt    first,
+                              FT_UInt    count,
+                              FT_Int32   flags,
+                              FT_Fixed*  advances );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Driver_ClassRec                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The font driver class.  This structure mostly contains pointers to */
+  /*    driver methods.                                                    */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    root             :: The parent module.                             */
+  /*                                                                       */
+  /*    face_object_size :: The size of a face object in bytes.            */
+  /*                                                                       */
+  /*    size_object_size :: The size of a size object in bytes.            */
+  /*                                                                       */
+  /*    slot_object_size :: The size of a glyph object in bytes.           */
+  /*                                                                       */
+  /*    init_face        :: The format-specific face constructor.          */
+  /*                                                                       */
+  /*    done_face        :: The format-specific face destructor.           */
+  /*                                                                       */
+  /*    init_size        :: The format-specific size constructor.          */
+  /*                                                                       */
+  /*    done_size        :: The format-specific size destructor.           */
+  /*                                                                       */
+  /*    init_slot        :: The format-specific slot constructor.          */
+  /*                                                                       */
+  /*    done_slot        :: The format-specific slot destructor.           */
+  /*                                                                       */
+  /*                                                                       */
+  /*    load_glyph       :: A function handle to load a glyph to a slot.   */
+  /*                        This field is mandatory!                       */
+  /*                                                                       */
+  /*    get_kerning      :: A function handle to return the unscaled       */
+  /*                        kerning for a given pair of glyphs.  Can be    */
+  /*                        set to 0 if the format doesn't support         */
+  /*                        kerning.                                       */
+  /*                                                                       */
+  /*    attach_file      :: This function handle is used to read           */
+  /*                        additional data for a face from another        */
+  /*                        file/stream.  For example, this can be used to */
+  /*                        add data from AFM or PFM files on a Type 1     */
+  /*                        face, or a CIDMap on a CID-keyed face.         */
+  /*                                                                       */
+  /*    get_advances     :: A function handle used to return advance       */
+  /*                        widths of `count' glyphs (in font units),      */
+  /*                        starting at `first'.  The `vertical' flag must */
+  /*                        be set to get vertical advance heights.  The   */
+  /*                        `advances' buffer is caller-allocated.         */
+  /*                        The idea of this function is to be able to     */
+  /*                        perform device-independent text layout without */
+  /*                        loading a single glyph image.                  */
+  /*                                                                       */
+  /*    request_size     :: A handle to a function used to request the new */
+  /*                        character size.  Can be set to 0 if the        */
+  /*                        scaling done in the base layer suffices.       */
+  /*                                                                       */
+  /*    select_size      :: A handle to a function used to select a new    */
+  /*                        fixed size.  It is used only if                */
+  /*                        @FT_FACE_FLAG_FIXED_SIZES is set.  Can be set  */
+  /*                        to 0 if the scaling done in the base layer     */
+  /*                        suffices.                                      */
+  /* <Note>                                                                */
+  /*    Most function pointers, with the exception of `load_glyph', can be */
+  /*    set to 0 to indicate a default behaviour.                          */
+  /*                                                                       */
+  typedef struct  FT_Driver_ClassRec_
+  {
+    FT_Module_Class          root;
+
+    FT_Long                  face_object_size;
+    FT_Long                  size_object_size;
+    FT_Long                  slot_object_size;
+
+    FT_Face_InitFunc         init_face;
+    FT_Face_DoneFunc         done_face;
+
+    FT_Size_InitFunc         init_size;
+    FT_Size_DoneFunc         done_size;
+
+    FT_Slot_InitFunc         init_slot;
+    FT_Slot_DoneFunc         done_slot;
+
+    FT_Slot_LoadFunc         load_glyph;
+
+    FT_Face_GetKerningFunc   get_kerning;
+    FT_Face_AttachFunc       attach_file;
+    FT_Face_GetAdvancesFunc  get_advances;
+
+    /* since version 2.2 */
+    FT_Size_RequestFunc      request_size;
+    FT_Size_SelectFunc       select_size;
+
+  } FT_Driver_ClassRec, *FT_Driver_Class;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DECLARE_DRIVER                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to create a forward declaration of an FT_Driver_ClassRec      */
+  /*    struct instance.                                                   */
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_DRIVER                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of FT_Driver_ClassRec struct.       */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function has to be */
+  /*    called with a pointer where the allocated structure is returned.   */
+  /*    And when it is no longer needed a `destroy' function needs to be   */
+  /*    called to release that allocation.                                 */
+  /*                                                                       */
+  /*    `fcinit.c' (ft_create_default_module_classes) already contains a   */
+  /*    mechanism to call these functions for the default modules          */
+  /*    described in `ftmodule.h'.                                         */
+  /*                                                                       */
+  /*    Notice that the created `create' and `destroy' functions call      */
+  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
+  /*    initialize any additional global data, like a module specific      */
+  /*    interface, and put them in the global pic container defined in     */
+  /*    `ftpic.h'.  If you don't need them just implement the functions as */
+  /*    empty to resolve the link error.  Also the `pic_init' and          */
+  /*    `pic_free' functions should be declared in `pic.h', to be referred */
+  /*    by driver definition calling `FT_DEFINE_DRIVER' in following.      */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
+  /*    allocated in the global scope (or the scope where the macro is     */
+  /*    used).                                                             */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DECLARE_DRIVER( class_ )  \
+  FT_CALLBACK_TABLE                  \
+  const FT_Driver_ClassRec  class_;
+
+#define FT_DEFINE_DRIVER(                    \
+          class_,                            \
+          flags_,                            \
+          size_,                             \
+          name_,                             \
+          version_,                          \
+          requires_,                         \
+          interface_,                        \
+          init_,                             \
+          done_,                             \
+          get_interface_,                    \
+          face_object_size_,                 \
+          size_object_size_,                 \
+          slot_object_size_,                 \
+          init_face_,                        \
+          done_face_,                        \
+          init_size_,                        \
+          done_size_,                        \
+          init_slot_,                        \
+          done_slot_,                        \
+          load_glyph_,                       \
+          get_kerning_,                      \
+          attach_file_,                      \
+          get_advances_,                     \
+          request_size_,                     \
+          select_size_ )                     \
+  FT_CALLBACK_TABLE_DEF                      \
+  const FT_Driver_ClassRec  class_ =         \
+  {                                          \
+    FT_DEFINE_ROOT_MODULE( flags_,           \
+                           size_,            \
+                           name_,            \
+                           version_,         \
+                           requires_,        \
+                           interface_,       \
+                           init_,            \
+                           done_,            \
+                           get_interface_ )  \
+                                             \
+    face_object_size_,                       \
+    size_object_size_,                       \
+    slot_object_size_,                       \
+                                             \
+    init_face_,                              \
+    done_face_,                              \
+                                             \
+    init_size_,                              \
+    done_size_,                              \
+                                             \
+    init_slot_,                              \
+    done_slot_,                              \
+                                             \
+    load_glyph_,                             \
+                                             \
+    get_kerning_,                            \
+    attach_file_,                            \
+    get_advances_,                           \
+                                             \
+    request_size_,                           \
+    select_size_                             \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DECLARE_DRIVER( class_ )  FT_DECLARE_MODULE( class_ )
+
+#define FT_DEFINE_DRIVER(                                        \
+          class_,                                                \
+          flags_,                                                \
+          size_,                                                 \
+          name_,                                                 \
+          version_,                                              \
+          requires_,                                             \
+          interface_,                                            \
+          init_,                                                 \
+          done_,                                                 \
+          get_interface_,                                        \
+          face_object_size_,                                     \
+          size_object_size_,                                     \
+          slot_object_size_,                                     \
+          init_face_,                                            \
+          done_face_,                                            \
+          init_size_,                                            \
+          done_size_,                                            \
+          init_slot_,                                            \
+          done_slot_,                                            \
+          load_glyph_,                                           \
+          get_kerning_,                                          \
+          attach_file_,                                          \
+          get_advances_,                                         \
+          request_size_,                                         \
+          select_size_ )                                         \
+  void                                                           \
+  FT_Destroy_Class_ ## class_( FT_Library        library,        \
+                               FT_Module_Class*  clazz )         \
+  {                                                              \
+    FT_Memory        memory = library->memory;                   \
+    FT_Driver_Class  dclazz = (FT_Driver_Class)clazz;            \
+                                                                 \
+                                                                 \
+    class_ ## _pic_free( library );                              \
+    if ( dclazz )                                                \
+      FT_FREE( dclazz );                                         \
+  }                                                              \
+                                                                 \
+                                                                 \
+  FT_Error                                                       \
+  FT_Create_Class_ ## class_( FT_Library         library,        \
+                              FT_Module_Class**  output_class )  \
+  {                                                              \
+    FT_Driver_Class  clazz  = NULL;                              \
+    FT_Error         error;                                      \
+    FT_Memory        memory = library->memory;                   \
+                                                                 \
+                                                                 \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
+      return error;                                              \
+                                                                 \
+    error = class_ ## _pic_init( library );                      \
+    if ( error )                                                 \
+    {                                                            \
+      FT_FREE( clazz );                                          \
+      return error;                                              \
+    }                                                            \
+                                                                 \
+    FT_DEFINE_ROOT_MODULE( flags_,                               \
+                           size_,                                \
+                           name_,                                \
+                           version_,                             \
+                           requires_,                            \
+                           interface_,                           \
+                           init_,                                \
+                           done_,                                \
+                           get_interface_ )                      \
+                                                                 \
+    clazz->face_object_size = face_object_size_;                 \
+    clazz->size_object_size = size_object_size_;                 \
+    clazz->slot_object_size = slot_object_size_;                 \
+                                                                 \
+    clazz->init_face        = init_face_;                        \
+    clazz->done_face        = done_face_;                        \
+                                                                 \
+    clazz->init_size        = init_size_;                        \
+    clazz->done_size        = done_size_;                        \
+                                                                 \
+    clazz->init_slot        = init_slot_;                        \
+    clazz->done_slot        = done_slot_;                        \
+                                                                 \
+    clazz->load_glyph       = load_glyph_;                       \
+                                                                 \
+    clazz->get_kerning      = get_kerning_;                      \
+    clazz->attach_file      = attach_file_;                      \
+    clazz->get_advances     = get_advances_;                     \
+                                                                 \
+    clazz->request_size     = request_size_;                     \
+    clazz->select_size      = select_size_;                      \
+                                                                 \
+    *output_class = (FT_Module_Class*)clazz;                     \
+                                                                 \
+    return FT_Err_Ok;                                            \
+  }
+
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+FT_END_HEADER
+
+#endif /* __FTDRIVER_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftdriver.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftgloadr.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftgloadr.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftgloadr.h	(rÃ©vision 62573)
@@ -0,0 +1,168 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftgloadr.h                                                             */
+/*                                                                         */
+/*    The FreeType glyph loader (specification).                           */
+/*                                                                         */
+/*  Copyright 2002, 2003, 2005, 2006 by                                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTGLOADR_H__
+#define __FTGLOADR_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_GlyphLoader                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The glyph loader is an internal object used to load several glyphs */
+  /*    together (for example, in the case of composites).                 */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The glyph loader implementation is not part of the high-level API, */
+  /*    hence the forward structure declaration.                           */
+  /*                                                                       */
+  typedef struct FT_GlyphLoaderRec_*  FT_GlyphLoader ;
+
+
+#if 0  /* moved to freetype.h in version 2.2 */
+#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
+#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
+#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
+#define FT_SUBGLYPH_FLAG_SCALE                   8
+#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
+#define FT_SUBGLYPH_FLAG_2X2                  0x80
+#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
+#endif
+
+
+  typedef struct  FT_SubGlyphRec_
+  {
+    FT_Int     index;
+    FT_UShort  flags;
+    FT_Int     arg1;
+    FT_Int     arg2;
+    FT_Matrix  transform;
+
+  } FT_SubGlyphRec;
+
+
+  typedef struct  FT_GlyphLoadRec_
+  {
+    FT_Outline   outline;       /* outline                   */
+    FT_Vector*   extra_points;  /* extra points table        */
+    FT_Vector*   extra_points2; /* second extra points table */
+    FT_UInt      num_subglyphs; /* number of subglyphs       */
+    FT_SubGlyph  subglyphs;     /* subglyphs                 */
+
+  } FT_GlyphLoadRec, *FT_GlyphLoad;
+
+
+  typedef struct  FT_GlyphLoaderRec_
+  {
+    FT_Memory        memory;
+    FT_UInt          max_points;
+    FT_UInt          max_contours;
+    FT_UInt          max_subglyphs;
+    FT_Bool          use_extra;
+
+    FT_GlyphLoadRec  base;
+    FT_GlyphLoadRec  current;
+
+    void*            other;            /* for possible future extension? */
+
+  } FT_GlyphLoaderRec;
+
+
+  /* create new empty glyph loader */
+  FT_BASE( FT_Error )
+  FT_GlyphLoader_New( FT_Memory        memory,
+                      FT_GlyphLoader  *aloader );
+
+  /* add an extra points table to a glyph loader */
+  FT_BASE( FT_Error )
+  FT_GlyphLoader_CreateExtra( FT_GlyphLoader  loader );
+
+  /* destroy a glyph loader */
+  FT_BASE( void )
+  FT_GlyphLoader_Done( FT_GlyphLoader  loader );
+
+  /* reset a glyph loader (frees everything int it) */
+  FT_BASE( void )
+  FT_GlyphLoader_Reset( FT_GlyphLoader  loader );
+
+  /* rewind a glyph loader */
+  FT_BASE( void )
+  FT_GlyphLoader_Rewind( FT_GlyphLoader  loader );
+
+  /* check that there is enough space to add `n_points' and `n_contours' */
+  /* to the glyph loader                                                 */
+  FT_BASE( FT_Error )
+  FT_GlyphLoader_CheckPoints( FT_GlyphLoader  loader,
+                              FT_UInt         n_points,
+                              FT_UInt         n_contours );
+
+
+#define FT_GLYPHLOADER_CHECK_P( _loader, _count )                         \
+   ( (_count) == 0 || ((_loader)->base.outline.n_points    +              \
+                       (_loader)->current.outline.n_points +              \
+                       (unsigned long)(_count)) <= (_loader)->max_points )
+
+#define FT_GLYPHLOADER_CHECK_C( _loader, _count )                          \
+  ( (_count) == 0 || ((_loader)->base.outline.n_contours    +              \
+                      (_loader)->current.outline.n_contours +              \
+                      (unsigned long)(_count)) <= (_loader)->max_contours )
+
+#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points,_contours )      \
+  ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points )   &&                  \
+      FT_GLYPHLOADER_CHECK_C( _loader, _contours ) )                   \
+    ? 0                                                                \
+    : FT_GlyphLoader_CheckPoints( (_loader), (_points), (_contours) ) )
+
+
+  /* check that there is enough space to add `n_subs' sub-glyphs to */
+  /* a glyph loader                                                 */
+  FT_BASE( FT_Error )
+  FT_GlyphLoader_CheckSubGlyphs( FT_GlyphLoader  loader,
+                                 FT_UInt         n_subs );
+
+  /* prepare a glyph loader, i.e. empty the current glyph */
+  FT_BASE( void )
+  FT_GlyphLoader_Prepare( FT_GlyphLoader  loader );
+
+  /* add the current glyph to the base glyph */
+  FT_BASE( void )
+  FT_GlyphLoader_Add( FT_GlyphLoader  loader );
+
+  /* copy points from one glyph loader to another */
+  FT_BASE( FT_Error )
+  FT_GlyphLoader_CopyPoints( FT_GlyphLoader  target,
+                             FT_GlyphLoader  source );
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTGLOADR_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftgloadr.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftmemory.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftmemory.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftmemory.h	(rÃ©vision 62573)
@@ -0,0 +1,378 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftmemory.h                                                             */
+/*                                                                         */
+/*    The FreeType memory management macros (specification).               */
+/*                                                                         */
+/*  Copyright 1996-2002, 2004-2007, 2010, 2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTMEMORY_H__
+#define __FTMEMORY_H__
+
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_TYPES_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_SET_ERROR                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This macro is used to set an implicit `error' variable to a given  */
+  /*    expression's value (usually a function call), and convert it to a  */
+  /*    boolean which is set whenever the value is != 0.                   */
+  /*                                                                       */
+#undef  FT_SET_ERROR
+#define FT_SET_ERROR( expression ) \
+          ( ( error = (expression) ) != 0 )
+
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                           M E M O R Y                           ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*
+   *  C++ refuses to handle statements like p = (void*)anything, with `p' a
+   *  typed pointer.  Since we don't have a `typeof' operator in standard
+   *  C++, we have to use a template to emulate it.
+   */
+
+#ifdef __cplusplus
+
+  extern "C++"
+  template <typename T> inline T*
+  cplusplus_typeof(        T*,
+                    void  *v )
+  {
+    return static_cast <T*> ( v );
+  }
+
+#define FT_ASSIGNP( p, val )  (p) = cplusplus_typeof( (p), (val) )
+
+#else
+
+#define FT_ASSIGNP( p, val )  (p) = (val)
+
+#endif
+
+
+
+#ifdef FT_DEBUG_MEMORY
+
+  FT_BASE( const char* )  _ft_debug_file;
+  FT_BASE( long )         _ft_debug_lineno;
+
+#define FT_DEBUG_INNER( exp )  ( _ft_debug_file   = __FILE__, \
+                                 _ft_debug_lineno = __LINE__, \
+                                 (exp) )
+
+#define FT_ASSIGNP_INNER( p, exp )  ( _ft_debug_file   = __FILE__, \
+                                      _ft_debug_lineno = __LINE__, \
+                                      FT_ASSIGNP( p, exp ) )
+
+#else /* !FT_DEBUG_MEMORY */
+
+#define FT_DEBUG_INNER( exp )       (exp)
+#define FT_ASSIGNP_INNER( p, exp )  FT_ASSIGNP( p, exp )
+
+#endif /* !FT_DEBUG_MEMORY */
+
+
+  /*
+   *  The allocation functions return a pointer, and the error code
+   *  is written to through the `p_error' parameter.  See below for
+   *  for documentation.
+   */
+
+  FT_BASE( FT_Pointer )
+  ft_mem_alloc( FT_Memory  memory,
+                FT_Long    size,
+                FT_Error  *p_error );
+
+  FT_BASE( FT_Pointer )
+  ft_mem_qalloc( FT_Memory  memory,
+                 FT_Long    size,
+                 FT_Error  *p_error );
+
+  FT_BASE( FT_Pointer )
+  ft_mem_realloc( FT_Memory  memory,
+                  FT_Long    item_size,
+                  FT_Long    cur_count,
+                  FT_Long    new_count,
+                  void*      block,
+                  FT_Error  *p_error );
+
+  FT_BASE( FT_Pointer )
+  ft_mem_qrealloc( FT_Memory  memory,
+                   FT_Long    item_size,
+                   FT_Long    cur_count,
+                   FT_Long    new_count,
+                   void*      block,
+                   FT_Error  *p_error );
+
+  FT_BASE( void )
+  ft_mem_free( FT_Memory    memory,
+               const void*  P );
+
+
+#define FT_MEM_ALLOC( ptr, size )                               \
+          FT_ASSIGNP_INNER( ptr, ft_mem_alloc( memory,          \
+                                               (FT_Long)(size), \
+                                               &error ) )
+
+#define FT_MEM_FREE( ptr )                \
+          FT_BEGIN_STMNT                  \
+            ft_mem_free( memory, (ptr) ); \
+            (ptr) = NULL;                 \
+          FT_END_STMNT
+
+#define FT_MEM_NEW( ptr )                        \
+          FT_MEM_ALLOC( ptr, sizeof ( *(ptr) ) )
+
+#define FT_MEM_REALLOC( ptr, cursz, newsz )                        \
+          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,           \
+                                                 1,                \
+                                                 (FT_Long)(cursz), \
+                                                 (FT_Long)(newsz), \
+                                                 (ptr),            \
+                                                 &error ) )
+
+#define FT_MEM_QALLOC( ptr, size )                               \
+          FT_ASSIGNP_INNER( ptr, ft_mem_qalloc( memory,          \
+                                                (FT_Long)(size), \
+                                                &error ) )
+
+#define FT_MEM_QNEW( ptr )                        \
+          FT_MEM_QALLOC( ptr, sizeof ( *(ptr) ) )
+
+#define FT_MEM_QREALLOC( ptr, cursz, newsz )                        \
+          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,           \
+                                                  1,                \
+                                                  (FT_Long)(cursz), \
+                                                  (FT_Long)(newsz), \
+                                                  (ptr),            \
+                                                  &error ) )
+
+#define FT_MEM_ALLOC_MULT( ptr, count, item_size )                     \
+          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,               \
+                                                 (FT_Long)(item_size), \
+                                                 0,                    \
+                                                 (FT_Long)(count),     \
+                                                 NULL,                 \
+                                                 &error ) )
+
+#define FT_MEM_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz )           \
+          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
+                                                 (FT_Long)(itmsz),  \
+                                                 (FT_Long)(oldcnt), \
+                                                 (FT_Long)(newcnt), \
+                                                 (ptr),             \
+                                                 &error ) )
+
+#define FT_MEM_QALLOC_MULT( ptr, count, item_size )                     \
+          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,               \
+                                                  (FT_Long)(item_size), \
+                                                  0,                    \
+                                                  (FT_Long)(count),     \
+                                                  NULL,                 \
+                                                  &error ) )
+
+#define FT_MEM_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz)            \
+          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
+                                                  (FT_Long)(itmsz),  \
+                                                  (FT_Long)(oldcnt), \
+                                                  (FT_Long)(newcnt), \
+                                                  (ptr),             \
+                                                  &error ) )
+
+
+#define FT_MEM_SET_ERROR( cond )  ( (cond), error != 0 )
+
+
+#define FT_MEM_SET( dest, byte, count )     ft_memset( dest, byte, count )
+
+#define FT_MEM_COPY( dest, source, count )  ft_memcpy( dest, source, count )
+
+#define FT_MEM_MOVE( dest, source, count )  ft_memmove( dest, source, count )
+
+
+#define FT_MEM_ZERO( dest, count )  FT_MEM_SET( dest, 0, count )
+
+#define FT_ZERO( p )                FT_MEM_ZERO( p, sizeof ( *(p) ) )
+
+
+#define FT_ARRAY_ZERO( dest, count )                        \
+          FT_MEM_ZERO( dest, (count) * sizeof ( *(dest) ) )
+
+#define FT_ARRAY_COPY( dest, source, count )                        \
+          FT_MEM_COPY( dest, source, (count) * sizeof ( *(dest) ) )
+
+#define FT_ARRAY_MOVE( dest, source, count )                        \
+          FT_MEM_MOVE( dest, source, (count) * sizeof ( *(dest) ) )
+
+
+  /*
+   *  Return the maximum number of addressable elements in an array.
+   *  We limit ourselves to INT_MAX, rather than UINT_MAX, to avoid
+   *  any problems.
+   */
+#define FT_ARRAY_MAX( ptr )           ( FT_INT_MAX / sizeof ( *(ptr) ) )
+
+#define FT_ARRAY_CHECK( ptr, count )  ( (count) <= FT_ARRAY_MAX( ptr ) )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* The following functions macros expect that their pointer argument is  */
+  /* _typed_ in order to automatically compute array element sizes.        */
+  /*                                                                       */
+
+#define FT_MEM_NEW_ARRAY( ptr, count )                              \
+          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
+                                                 sizeof ( *(ptr) ), \
+                                                 0,                 \
+                                                 (FT_Long)(count),  \
+                                                 NULL,              \
+                                                 &error ) )
+
+#define FT_MEM_RENEW_ARRAY( ptr, cursz, newsz )                     \
+          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
+                                                 sizeof ( *(ptr) ), \
+                                                 (FT_Long)(cursz),  \
+                                                 (FT_Long)(newsz),  \
+                                                 (ptr),             \
+                                                 &error ) )
+
+#define FT_MEM_QNEW_ARRAY( ptr, count )                              \
+          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
+                                                  sizeof ( *(ptr) ), \
+                                                  0,                 \
+                                                  (FT_Long)(count),  \
+                                                  NULL,              \
+                                                  &error ) )
+
+#define FT_MEM_QRENEW_ARRAY( ptr, cursz, newsz )                     \
+          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
+                                                  sizeof ( *(ptr) ), \
+                                                  (FT_Long)(cursz),  \
+                                                  (FT_Long)(newsz),  \
+                                                  (ptr),             \
+                                                  &error ) )
+
+#define FT_ALLOC( ptr, size )                           \
+          FT_MEM_SET_ERROR( FT_MEM_ALLOC( ptr, size ) )
+
+#define FT_REALLOC( ptr, cursz, newsz )                           \
+          FT_MEM_SET_ERROR( FT_MEM_REALLOC( ptr, cursz, newsz ) )
+
+#define FT_ALLOC_MULT( ptr, count, item_size )                           \
+          FT_MEM_SET_ERROR( FT_MEM_ALLOC_MULT( ptr, count, item_size ) )
+
+#define FT_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz )              \
+          FT_MEM_SET_ERROR( FT_MEM_REALLOC_MULT( ptr, oldcnt,      \
+                                                 newcnt, itmsz ) )
+
+#define FT_QALLOC( ptr, size )                           \
+          FT_MEM_SET_ERROR( FT_MEM_QALLOC( ptr, size ) )
+
+#define FT_QREALLOC( ptr, cursz, newsz )                           \
+          FT_MEM_SET_ERROR( FT_MEM_QREALLOC( ptr, cursz, newsz ) )
+
+#define FT_QALLOC_MULT( ptr, count, item_size )                           \
+          FT_MEM_SET_ERROR( FT_MEM_QALLOC_MULT( ptr, count, item_size ) )
+
+#define FT_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz )              \
+          FT_MEM_SET_ERROR( FT_MEM_QREALLOC_MULT( ptr, oldcnt,      \
+                                                  newcnt, itmsz ) )
+
+#define FT_FREE( ptr )  FT_MEM_FREE( ptr )
+
+#define FT_NEW( ptr )  FT_MEM_SET_ERROR( FT_MEM_NEW( ptr ) )
+
+#define FT_NEW_ARRAY( ptr, count )                           \
+          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
+
+#define FT_RENEW_ARRAY( ptr, curcnt, newcnt )                           \
+          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
+
+#define FT_QNEW( ptr )                           \
+          FT_MEM_SET_ERROR( FT_MEM_QNEW( ptr ) )
+
+#define FT_QNEW_ARRAY( ptr, count )                          \
+          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
+
+#define FT_QRENEW_ARRAY( ptr, curcnt, newcnt )                          \
+          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
+
+
+  FT_BASE( FT_Pointer )
+  ft_mem_strdup( FT_Memory    memory,
+                 const char*  str,
+                 FT_Error    *p_error );
+
+  FT_BASE( FT_Pointer )
+  ft_mem_dup( FT_Memory    memory,
+              const void*  address,
+              FT_ULong     size,
+              FT_Error    *p_error );
+
+
+#define FT_MEM_STRDUP( dst, str )                                            \
+          (dst) = (char*)ft_mem_strdup( memory, (const char*)(str), &error )
+
+#define FT_STRDUP( dst, str )                           \
+          FT_MEM_SET_ERROR( FT_MEM_STRDUP( dst, str ) )
+
+#define FT_MEM_DUP( dst, address, size )                                    \
+          (dst) = ft_mem_dup( memory, (address), (FT_ULong)(size), &error )
+
+#define FT_DUP( dst, address, size )                           \
+          FT_MEM_SET_ERROR( FT_MEM_DUP( dst, address, size ) )
+
+
+  /* Return >= 1 if a truncation occurs.            */
+  /* Return 0 if the source string fits the buffer. */
+  /* This is *not* the same as strlcpy().           */
+  FT_BASE( FT_Int )
+  ft_mem_strcpyn( char*        dst,
+                  const char*  src,
+                  FT_ULong     size );
+
+#define FT_STRCPYN( dst, src, size )                                         \
+          ft_mem_strcpyn( (char*)dst, (const char*)(src), (FT_ULong)(size) )
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTMEMORY_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftmemory.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftobjs.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftobjs.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftobjs.h	(rÃ©vision 62573)
@@ -0,0 +1,1569 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftobjs.h                                                               */
+/*                                                                         */
+/*    The FreeType private base classes (specification).                   */
+/*                                                                         */
+/*  Copyright 1996-2006, 2008, 2010, 2012-2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  This file contains the definition of all internal FreeType classes.  */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTOBJS_H__
+#define __FTOBJS_H__
+
+#include <ft2build.h>
+#include FT_RENDER_H
+#include FT_SIZES_H
+#include FT_LCD_FILTER_H
+#include FT_INTERNAL_MEMORY_H
+#include FT_INTERNAL_GLYPH_LOADER_H
+#include FT_INTERNAL_DRIVER_H
+#include FT_INTERNAL_AUTOHINT_H
+#include FT_INTERNAL_SERVICE_H
+#include FT_INTERNAL_PIC_H
+
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+#include FT_INCREMENTAL_H
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Some generic definitions.                                             */
+  /*                                                                       */
+#ifndef TRUE
+#define TRUE  1
+#endif
+
+#ifndef FALSE
+#define FALSE  0
+#endif
+
+#ifndef NULL
+#define NULL  (void*)0
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* The min and max functions missing in C.  As usual, be careful not to  */
+  /* write things like FT_MIN( a++, b++ ) to avoid side effects.           */
+  /*                                                                       */
+#define FT_MIN( a, b )  ( (a) < (b) ? (a) : (b) )
+#define FT_MAX( a, b )  ( (a) > (b) ? (a) : (b) )
+
+#define FT_ABS( a )     ( (a) < 0 ? -(a) : (a) )
+
+
+#define FT_PAD_FLOOR( x, n )  ( (x) & ~((n)-1) )
+#define FT_PAD_ROUND( x, n )  FT_PAD_FLOOR( (x) + ((n)/2), n )
+#define FT_PAD_CEIL( x, n )   FT_PAD_FLOOR( (x) + ((n)-1), n )
+
+#define FT_PIX_FLOOR( x )     ( (x) & ~63 )
+#define FT_PIX_ROUND( x )     FT_PIX_FLOOR( (x) + 32 )
+#define FT_PIX_CEIL( x )      FT_PIX_FLOOR( (x) + 63 )
+
+
+  /*
+   *  Return the highest power of 2 that is <= value; this correspond to
+   *  the highest bit in a given 32-bit value.
+   */
+  FT_BASE( FT_UInt32 )
+  ft_highpow2( FT_UInt32  value );
+
+
+  /*
+   *  character classification functions -- since these are used to parse
+   *  font files, we must not use those in <ctypes.h> which are
+   *  locale-dependent
+   */
+#define  ft_isdigit( x )   ( ( (unsigned)(x) - '0' ) < 10U )
+
+#define  ft_isxdigit( x )  ( ( (unsigned)(x) - '0' ) < 10U || \
+                             ( (unsigned)(x) - 'a' ) < 6U  || \
+                             ( (unsigned)(x) - 'A' ) < 6U  )
+
+  /* the next two macros assume ASCII representation */
+#define  ft_isupper( x )  ( ( (unsigned)(x) - 'A' ) < 26U )
+#define  ft_islower( x )  ( ( (unsigned)(x) - 'a' ) < 26U )
+
+#define  ft_isalpha( x )  ( ft_isupper( x ) || ft_islower( x ) )
+#define  ft_isalnum( x )  ( ft_isdigit( x ) || ft_isalpha( x ) )
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                       C H A R M A P S                           ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* handle to internal charmap object */
+  typedef struct FT_CMapRec_*              FT_CMap;
+
+  /* handle to charmap class structure */
+  typedef const struct FT_CMap_ClassRec_*  FT_CMap_Class;
+
+  /* internal charmap object structure */
+  typedef struct  FT_CMapRec_
+  {
+    FT_CharMapRec  charmap;
+    FT_CMap_Class  clazz;
+
+  } FT_CMapRec;
+
+  /* typecase any pointer to a charmap handle */
+#define FT_CMAP( x )              ((FT_CMap)( x ))
+
+  /* obvious macros */
+#define FT_CMAP_PLATFORM_ID( x )  FT_CMAP( x )->charmap.platform_id
+#define FT_CMAP_ENCODING_ID( x )  FT_CMAP( x )->charmap.encoding_id
+#define FT_CMAP_ENCODING( x )     FT_CMAP( x )->charmap.encoding
+#define FT_CMAP_FACE( x )         FT_CMAP( x )->charmap.face
+
+
+  /* class method definitions */
+  typedef FT_Error
+  (*FT_CMap_InitFunc)( FT_CMap     cmap,
+                       FT_Pointer  init_data );
+
+  typedef void
+  (*FT_CMap_DoneFunc)( FT_CMap  cmap );
+
+  typedef FT_UInt
+  (*FT_CMap_CharIndexFunc)( FT_CMap    cmap,
+                            FT_UInt32  char_code );
+
+  typedef FT_UInt
+  (*FT_CMap_CharNextFunc)( FT_CMap     cmap,
+                           FT_UInt32  *achar_code );
+
+  typedef FT_UInt
+  (*FT_CMap_CharVarIndexFunc)( FT_CMap    cmap,
+                               FT_CMap    unicode_cmap,
+                               FT_UInt32  char_code,
+                               FT_UInt32  variant_selector );
+
+  typedef FT_Bool
+  (*FT_CMap_CharVarIsDefaultFunc)( FT_CMap    cmap,
+                                   FT_UInt32  char_code,
+                                   FT_UInt32  variant_selector );
+
+  typedef FT_UInt32 *
+  (*FT_CMap_VariantListFunc)( FT_CMap    cmap,
+                              FT_Memory  mem );
+
+  typedef FT_UInt32 *
+  (*FT_CMap_CharVariantListFunc)( FT_CMap    cmap,
+                                  FT_Memory  mem,
+                                  FT_UInt32  char_code );
+
+  typedef FT_UInt32 *
+  (*FT_CMap_VariantCharListFunc)( FT_CMap    cmap,
+                                  FT_Memory  mem,
+                                  FT_UInt32  variant_selector );
+
+
+  typedef struct  FT_CMap_ClassRec_
+  {
+    FT_ULong               size;
+    FT_CMap_InitFunc       init;
+    FT_CMap_DoneFunc       done;
+    FT_CMap_CharIndexFunc  char_index;
+    FT_CMap_CharNextFunc   char_next;
+
+    /* Subsequent entries are special ones for format 14 -- the variant */
+    /* selector subtable which behaves like no other                    */
+
+    FT_CMap_CharVarIndexFunc      char_var_index;
+    FT_CMap_CharVarIsDefaultFunc  char_var_default;
+    FT_CMap_VariantListFunc       variant_list;
+    FT_CMap_CharVariantListFunc   charvariant_list;
+    FT_CMap_VariantCharListFunc   variantchar_list;
+
+  } FT_CMap_ClassRec;
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DECLARE_CMAP_CLASS( class_ )              \
+  FT_CALLBACK_TABLE const  FT_CMap_ClassRec class_;
+
+#define FT_DEFINE_CMAP_CLASS(       \
+          class_,                   \
+          size_,                    \
+          init_,                    \
+          done_,                    \
+          char_index_,              \
+          char_next_,               \
+          char_var_index_,          \
+          char_var_default_,        \
+          variant_list_,            \
+          charvariant_list_,        \
+          variantchar_list_ )       \
+  FT_CALLBACK_TABLE_DEF             \
+  const FT_CMap_ClassRec  class_ =  \
+  {                                 \
+    size_,                          \
+    init_,                          \
+    done_,                          \
+    char_index_,                    \
+    char_next_,                     \
+    char_var_index_,                \
+    char_var_default_,              \
+    variant_list_,                  \
+    charvariant_list_,              \
+    variantchar_list_               \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DECLARE_CMAP_CLASS( class_ )                  \
+  void                                                   \
+  FT_Init_Class_ ## class_( FT_Library         library,  \
+                            FT_CMap_ClassRec*  clazz );
+
+#define FT_DEFINE_CMAP_CLASS(                            \
+          class_,                                        \
+          size_,                                         \
+          init_,                                         \
+          done_,                                         \
+          char_index_,                                   \
+          char_next_,                                    \
+          char_var_index_,                               \
+          char_var_default_,                             \
+          variant_list_,                                 \
+          charvariant_list_,                             \
+          variantchar_list_ )                            \
+  void                                                   \
+  FT_Init_Class_ ## class_( FT_Library         library,  \
+                            FT_CMap_ClassRec*  clazz )   \
+  {                                                      \
+    FT_UNUSED( library );                                \
+                                                         \
+    clazz->size             = size_;                     \
+    clazz->init             = init_;                     \
+    clazz->done             = done_;                     \
+    clazz->char_index       = char_index_;               \
+    clazz->char_next        = char_next_;                \
+    clazz->char_var_index   = char_var_index_;           \
+    clazz->char_var_default = char_var_default_;         \
+    clazz->variant_list     = variant_list_;             \
+    clazz->charvariant_list = charvariant_list_;         \
+    clazz->variantchar_list = variantchar_list_;         \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+  /* create a new charmap and add it to charmap->face */
+  FT_BASE( FT_Error )
+  FT_CMap_New( FT_CMap_Class  clazz,
+               FT_Pointer     init_data,
+               FT_CharMap     charmap,
+               FT_CMap       *acmap );
+
+  /* destroy a charmap and remove it from face's list */
+  FT_BASE( void )
+  FT_CMap_Done( FT_CMap  cmap );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Face_InternalRec                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure contains the internal fields of each FT_Face        */
+  /*    object.  These fields may change between different releases of     */
+  /*    FreeType.                                                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    max_points ::                                                      */
+  /*      The maximum number of points used to store the vectorial outline */
+  /*      of any glyph in this face.  If this value cannot be known in     */
+  /*      advance, or if the face isn't scalable, this should be set to 0. */
+  /*      Only relevant for scalable formats.                              */
+  /*                                                                       */
+  /*    max_contours ::                                                    */
+  /*      The maximum number of contours used to store the vectorial       */
+  /*      outline of any glyph in this face.  If this value cannot be      */
+  /*      known in advance, or if the face isn't scalable, this should be  */
+  /*      set to 0.  Only relevant for scalable formats.                   */
+  /*                                                                       */
+  /*    transform_matrix ::                                                */
+  /*      A 2x2 matrix of 16.16 coefficients used to transform glyph       */
+  /*      outlines after they are loaded from the font.  Only used by the  */
+  /*      convenience functions.                                           */
+  /*                                                                       */
+  /*    transform_delta ::                                                 */
+  /*      A translation vector used to transform glyph outlines after they */
+  /*      are loaded from the font.  Only used by the convenience          */
+  /*      functions.                                                       */
+  /*                                                                       */
+  /*    transform_flags ::                                                 */
+  /*      Some flags used to classify the transform.  Only used by the     */
+  /*      convenience functions.                                           */
+  /*                                                                       */
+  /*    services ::                                                        */
+  /*      A cache for frequently used services.  It should be only         */
+  /*      accessed with the macro `FT_FACE_LOOKUP_SERVICE'.                */
+  /*                                                                       */
+  /*    incremental_interface ::                                           */
+  /*      If non-null, the interface through which glyph data and metrics  */
+  /*      are loaded incrementally for faces that do not provide all of    */
+  /*      this data when first opened.  This field exists only if          */
+  /*      @FT_CONFIG_OPTION_INCREMENTAL is defined.                        */
+  /*                                                                       */
+  /*    ignore_unpatented_hinter ::                                        */
+  /*      This boolean flag instructs the glyph loader to ignore the       */
+  /*      native font hinter, if one is found.  This is exclusively used   */
+  /*      in the case when the unpatented hinter is compiled within the    */
+  /*      library.                                                         */
+  /*                                                                       */
+  /*    refcount ::                                                        */
+  /*      A counter initialized to~1 at the time an @FT_Face structure is  */
+  /*      created.  @FT_Reference_Face increments this counter, and        */
+  /*      @FT_Done_Face only destroys a face if the counter is~1,          */
+  /*      otherwise it simply decrements it.                               */
+  /*                                                                       */
+  typedef struct  FT_Face_InternalRec_
+  {
+    FT_Matrix           transform_matrix;
+    FT_Vector           transform_delta;
+    FT_Int              transform_flags;
+
+    FT_ServiceCacheRec  services;
+
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+    FT_Incremental_InterfaceRec*  incremental_interface;
+#endif
+
+    FT_Bool             ignore_unpatented_hinter;
+    FT_Int              refcount;
+
+  } FT_Face_InternalRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Slot_InternalRec                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure contains the internal fields of each FT_GlyphSlot   */
+  /*    object.  These fields may change between different releases of     */
+  /*    FreeType.                                                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    loader            :: The glyph loader object used to load outlines */
+  /*                         into the glyph slot.                          */
+  /*                                                                       */
+  /*    flags             :: Possible values are zero or                   */
+  /*                         FT_GLYPH_OWN_BITMAP.  The latter indicates    */
+  /*                         that the FT_GlyphSlot structure owns the      */
+  /*                         bitmap buffer.                                */
+  /*                                                                       */
+  /*    glyph_transformed :: Boolean.  Set to TRUE when the loaded glyph   */
+  /*                         must be transformed through a specific        */
+  /*                         font transformation.  This is _not_ the same  */
+  /*                         as the face transform set through             */
+  /*                         FT_Set_Transform().                           */
+  /*                                                                       */
+  /*    glyph_matrix      :: The 2x2 matrix corresponding to the glyph     */
+  /*                         transformation, if necessary.                 */
+  /*                                                                       */
+  /*    glyph_delta       :: The 2d translation vector corresponding to    */
+  /*                         the glyph transformation, if necessary.       */
+  /*                                                                       */
+  /*    glyph_hints       :: Format-specific glyph hints management.       */
+  /*                                                                       */
+
+#define FT_GLYPH_OWN_BITMAP  0x1
+
+  typedef struct  FT_Slot_InternalRec_
+  {
+    FT_GlyphLoader  loader;
+    FT_UInt         flags;
+    FT_Bool         glyph_transformed;
+    FT_Matrix       glyph_matrix;
+    FT_Vector       glyph_delta;
+    void*           glyph_hints;
+
+  } FT_GlyphSlot_InternalRec;
+
+
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_Size_InternalRec                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure contains the internal fields of each FT_Size        */
+  /*    object.  Currently, it's empty.                                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+  typedef struct  FT_Size_InternalRec_
+  {
+    /* empty */
+
+  } FT_Size_InternalRec;
+
+#endif
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                         M O D U L E S                           ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_ModuleRec                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A module object instance.                                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    clazz   :: A pointer to the module's class.                        */
+  /*                                                                       */
+  /*    library :: A handle to the parent library object.                  */
+  /*                                                                       */
+  /*    memory  :: A handle to the memory manager.                         */
+  /*                                                                       */
+  typedef struct  FT_ModuleRec_
+  {
+    FT_Module_Class*  clazz;
+    FT_Library        library;
+    FT_Memory         memory;
+
+  } FT_ModuleRec;
+
+
+  /* typecast an object to an FT_Module */
+#define FT_MODULE( x )          ((FT_Module)( x ))
+#define FT_MODULE_CLASS( x )    FT_MODULE( x )->clazz
+#define FT_MODULE_LIBRARY( x )  FT_MODULE( x )->library
+#define FT_MODULE_MEMORY( x )   FT_MODULE( x )->memory
+
+
+#define FT_MODULE_IS_DRIVER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
+                                    FT_MODULE_FONT_DRIVER )
+
+#define FT_MODULE_IS_RENDERER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
+                                      FT_MODULE_RENDERER )
+
+#define FT_MODULE_IS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
+                                    FT_MODULE_HINTER )
+
+#define FT_MODULE_IS_STYLER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
+                                    FT_MODULE_STYLER )
+
+#define FT_DRIVER_IS_SCALABLE( x )  ( FT_MODULE_CLASS( x )->module_flags & \
+                                      FT_MODULE_DRIVER_SCALABLE )
+
+#define FT_DRIVER_USES_OUTLINES( x )  !( FT_MODULE_CLASS( x )->module_flags & \
+                                         FT_MODULE_DRIVER_NO_OUTLINES )
+
+#define FT_DRIVER_HAS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
+                                     FT_MODULE_DRIVER_HAS_HINTER )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Module_Interface                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Finds a module and returns its specific interface as a typeless    */
+  /*    pointer.                                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library     :: A handle to the library object.                     */
+  /*                                                                       */
+  /*    module_name :: The module's name (as an ASCII string).             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A module-specific interface if available, 0 otherwise.             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    You should better be familiar with FreeType internals to know      */
+  /*    which module to look for, and what its interface is :-)            */
+  /*                                                                       */
+  FT_BASE( const void* )
+  FT_Get_Module_Interface( FT_Library   library,
+                           const char*  mod_name );
+
+  FT_BASE( FT_Pointer )
+  ft_module_get_service( FT_Module    module,
+                         const char*  service_id );
+
+  /* */
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****   F A C E,   S I Z E   &   G L Y P H   S L O T   O B J E C T S  ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* a few macros used to perform easy typecasts with minimal brain damage */
+
+#define FT_FACE( x )          ((FT_Face)(x))
+#define FT_SIZE( x )          ((FT_Size)(x))
+#define FT_SLOT( x )          ((FT_GlyphSlot)(x))
+
+#define FT_FACE_DRIVER( x )   FT_FACE( x )->driver
+#define FT_FACE_LIBRARY( x )  FT_FACE_DRIVER( x )->root.library
+#define FT_FACE_MEMORY( x )   FT_FACE( x )->memory
+#define FT_FACE_STREAM( x )   FT_FACE( x )->stream
+
+#define FT_SIZE_FACE( x )     FT_SIZE( x )->face
+#define FT_SLOT_FACE( x )     FT_SLOT( x )->face
+
+#define FT_FACE_SLOT( x )     FT_FACE( x )->glyph
+#define FT_FACE_SIZE( x )     FT_FACE( x )->size
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_GlyphSlot                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    It is sometimes useful to have more than one glyph slot for a      */
+  /*    given face object.  This function is used to create additional     */
+  /*    slots.  All of them are automatically discarded when the face is   */
+  /*    destroyed.                                                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face  :: A handle to a parent face object.                         */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aslot :: A handle to a new glyph slot object.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  FT_BASE( FT_Error )
+  FT_New_GlyphSlot( FT_Face        face,
+                    FT_GlyphSlot  *aslot );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_GlyphSlot                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Destroys a given glyph slot.  Remember however that all slots are  */
+  /*    automatically destroyed with its parent.  Using this function is   */
+  /*    not always mandatory.                                              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    slot :: A handle to a target glyph slot.                           */
+  /*                                                                       */
+  FT_BASE( void )
+  FT_Done_GlyphSlot( FT_GlyphSlot  slot );
+
+ /* */
+
+#define FT_REQUEST_WIDTH( req )                                            \
+          ( (req)->horiResolution                                          \
+              ? (FT_Pos)( (req)->width * (req)->horiResolution + 36 ) / 72 \
+              : (req)->width )
+
+#define FT_REQUEST_HEIGHT( req )                                            \
+          ( (req)->vertResolution                                           \
+              ? (FT_Pos)( (req)->height * (req)->vertResolution + 36 ) / 72 \
+              : (req)->height )
+
+
+  /* Set the metrics according to a bitmap strike. */
+  FT_BASE( void )
+  FT_Select_Metrics( FT_Face   face,
+                     FT_ULong  strike_index );
+
+
+  /* Set the metrics according to a size request. */
+  FT_BASE( void )
+  FT_Request_Metrics( FT_Face          face,
+                      FT_Size_Request  req );
+
+
+  /* Match a size request against `available_sizes'. */
+  FT_BASE( FT_Error )
+  FT_Match_Size( FT_Face          face,
+                 FT_Size_Request  req,
+                 FT_Bool          ignore_width,
+                 FT_ULong*        size_index );
+
+
+  /* Use the horizontal metrics to synthesize the vertical metrics. */
+  /* If `advance' is zero, it is also synthesized.                  */
+  FT_BASE( void )
+  ft_synthesize_vertical_metrics( FT_Glyph_Metrics*  metrics,
+                                  FT_Pos             advance );
+
+
+  /* Free the bitmap of a given glyphslot when needed (i.e., only when it */
+  /* was allocated with ft_glyphslot_alloc_bitmap).                       */
+  FT_BASE( void )
+  ft_glyphslot_free_bitmap( FT_GlyphSlot  slot );
+
+
+  /* Allocate a new bitmap buffer in a glyph slot. */
+  FT_BASE( FT_Error )
+  ft_glyphslot_alloc_bitmap( FT_GlyphSlot  slot,
+                             FT_ULong      size );
+
+
+  /* Set the bitmap buffer in a glyph slot to a given pointer.  The buffer */
+  /* will not be freed by a later call to ft_glyphslot_free_bitmap.        */
+  FT_BASE( void )
+  ft_glyphslot_set_bitmap( FT_GlyphSlot  slot,
+                           FT_Byte*      buffer );
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                        R E N D E R E R S                        ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+#define FT_RENDERER( x )      ((FT_Renderer)( x ))
+#define FT_GLYPH( x )         ((FT_Glyph)( x ))
+#define FT_BITMAP_GLYPH( x )  ((FT_BitmapGlyph)( x ))
+#define FT_OUTLINE_GLYPH( x ) ((FT_OutlineGlyph)( x ))
+
+
+  typedef struct  FT_RendererRec_
+  {
+    FT_ModuleRec            root;
+    FT_Renderer_Class*      clazz;
+    FT_Glyph_Format         glyph_format;
+    FT_Glyph_Class          glyph_class;
+
+    FT_Raster               raster;
+    FT_Raster_Render_Func   raster_render;
+    FT_Renderer_RenderFunc  render;
+
+  } FT_RendererRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                    F O N T   D R I V E R S                      ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /* typecast a module into a driver easily */
+#define FT_DRIVER( x )        ((FT_Driver)(x))
+
+  /* typecast a module as a driver, and get its driver class */
+#define FT_DRIVER_CLASS( x )  FT_DRIVER( x )->clazz
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_DriverRec                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The root font driver class.  A font driver is responsible for      */
+  /*    managing and loading font files of a given format.                 */
+  /*                                                                       */
+  /*  <Fields>                                                             */
+  /*     root         :: Contains the fields of the root module class.     */
+  /*                                                                       */
+  /*     clazz        :: A pointer to the font driver's class.  Note that  */
+  /*                     this is NOT root.clazz.  `class' wasn't used      */
+  /*                     as it is a reserved word in C++.                  */
+  /*                                                                       */
+  /*     faces_list   :: The list of faces currently opened by this        */
+  /*                     driver.                                           */
+  /*                                                                       */
+  /*     glyph_loader :: The glyph loader for all faces managed by this    */
+  /*                     driver.  This object isn't defined for unscalable */
+  /*                     formats.                                          */
+  /*                                                                       */
+  typedef struct  FT_DriverRec_
+  {
+    FT_ModuleRec     root;
+    FT_Driver_Class  clazz;
+    FT_ListRec       faces_list;
+    FT_GlyphLoader   glyph_loader;
+
+  } FT_DriverRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                       L I B R A R I E S                         ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /* This hook is used by the TrueType debugger.  It must be set to an */
+  /* alternate truetype bytecode interpreter function.                 */
+#define FT_DEBUG_HOOK_TRUETYPE            0
+
+
+  /* Set this debug hook to a non-null pointer to force unpatented hinting */
+  /* for all faces when both TT_USE_BYTECODE_INTERPRETER and               */
+  /* TT_CONFIG_OPTION_UNPATENTED_HINTING are defined.  This is only used   */
+  /* during debugging.                                                     */
+#define FT_DEBUG_HOOK_UNPATENTED_HINTING  1
+
+
+  typedef void  (*FT_Bitmap_LcdFilterFunc)( FT_Bitmap*      bitmap,
+                                            FT_Render_Mode  render_mode,
+                                            FT_Library      library );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_LibraryRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The FreeType library class.  This is the root of all FreeType      */
+  /*    data.  Use FT_New_Library() to create a library object, and        */
+  /*    FT_Done_Library() to discard it and all child objects.             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    memory           :: The library's memory object.  Manages memory   */
+  /*                        allocation.                                    */
+  /*                                                                       */
+  /*    version_major    :: The major version number of the library.       */
+  /*                                                                       */
+  /*    version_minor    :: The minor version number of the library.       */
+  /*                                                                       */
+  /*    version_patch    :: The current patch level of the library.        */
+  /*                                                                       */
+  /*    num_modules      :: The number of modules currently registered     */
+  /*                        within this library.  This is set to 0 for new */
+  /*                        libraries.  New modules are added through the  */
+  /*                        FT_Add_Module() API function.                  */
+  /*                                                                       */
+  /*    modules          :: A table used to store handles to the currently */
+  /*                        registered modules. Note that each font driver */
+  /*                        contains a list of its opened faces.           */
+  /*                                                                       */
+  /*    renderers        :: The list of renderers currently registered     */
+  /*                        within the library.                            */
+  /*                                                                       */
+  /*    cur_renderer     :: The current outline renderer.  This is a       */
+  /*                        shortcut used to avoid parsing the list on     */
+  /*                        each call to FT_Outline_Render().  It is a     */
+  /*                        handle to the current renderer for the         */
+  /*                        FT_GLYPH_FORMAT_OUTLINE format.                */
+  /*                                                                       */
+  /*    auto_hinter      :: XXX                                            */
+  /*                                                                       */
+  /*    raster_pool      :: The raster object's render pool.  This can     */
+  /*                        ideally be changed dynamically at run-time.    */
+  /*                                                                       */
+  /*    raster_pool_size :: The size of the render pool in bytes.          */
+  /*                                                                       */
+  /*    debug_hooks      :: XXX                                            */
+  /*                                                                       */
+  /*    lcd_filter       :: If subpixel rendering is activated, the        */
+  /*                        selected LCD filter mode.                      */
+  /*                                                                       */
+  /*    lcd_extra        :: If subpixel rendering is activated, the number */
+  /*                        of extra pixels needed for the LCD filter.     */
+  /*                                                                       */
+  /*    lcd_weights      :: If subpixel rendering is activated, the LCD    */
+  /*                        filter weights, if any.                        */
+  /*                                                                       */
+  /*    lcd_filter_func  :: If subpixel rendering is activated, the LCD    */
+  /*                        filtering callback function.                   */
+  /*                                                                       */
+  /*    pic_container    :: Contains global structs and tables, instead    */
+  /*                        of defining them globallly.                    */
+  /*                                                                       */
+  /*    refcount         :: A counter initialized to~1 at the time an      */
+  /*                        @FT_Library structure is created.              */
+  /*                        @FT_Reference_Library increments this counter, */
+  /*                        and @FT_Done_Library only destroys a library   */
+  /*                        if the counter is~1, otherwise it simply       */
+  /*                        decrements it.                                 */
+  /*                                                                       */
+  typedef struct  FT_LibraryRec_
+  {
+    FT_Memory          memory;           /* library's memory manager */
+
+    FT_Int             version_major;
+    FT_Int             version_minor;
+    FT_Int             version_patch;
+
+    FT_UInt            num_modules;
+    FT_Module          modules[FT_MAX_MODULES];  /* module objects  */
+
+    FT_ListRec         renderers;        /* list of renderers        */
+    FT_Renderer        cur_renderer;     /* current outline renderer */
+    FT_Module          auto_hinter;
+
+    FT_Byte*           raster_pool;      /* scan-line conversion */
+                                         /* render pool          */
+    FT_ULong           raster_pool_size; /* size of render pool in bytes */
+
+    FT_DebugHook_Func  debug_hooks[4];
+
+#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+    FT_LcdFilter             lcd_filter;
+    FT_Int                   lcd_extra;        /* number of extra pixels */
+    FT_Byte                  lcd_weights[7];   /* filter weights, if any */
+    FT_Bitmap_LcdFilterFunc  lcd_filter_func;  /* filtering callback     */
+#endif
+
+#ifdef FT_CONFIG_OPTION_PIC
+    FT_PIC_Container   pic_container;
+#endif
+
+    FT_Int             refcount;
+
+  } FT_LibraryRec;
+
+
+  FT_BASE( FT_Renderer )
+  FT_Lookup_Renderer( FT_Library       library,
+                      FT_Glyph_Format  format,
+                      FT_ListNode*     node );
+
+  FT_BASE( FT_Error )
+  FT_Render_Glyph_Internal( FT_Library      library,
+                            FT_GlyphSlot    slot,
+                            FT_Render_Mode  render_mode );
+
+  typedef const char*
+  (*FT_Face_GetPostscriptNameFunc)( FT_Face  face );
+
+  typedef FT_Error
+  (*FT_Face_GetGlyphNameFunc)( FT_Face     face,
+                               FT_UInt     glyph_index,
+                               FT_Pointer  buffer,
+                               FT_UInt     buffer_max );
+
+  typedef FT_UInt
+  (*FT_Face_GetGlyphNameIndexFunc)( FT_Face     face,
+                                    FT_String*  glyph_name );
+
+
+#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_New_Memory                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Creates a new memory object.                                       */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A pointer to the new memory object.  0 in case of error.           */
+  /*                                                                       */
+  FT_BASE( FT_Memory )
+  FT_New_Memory( void );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Done_Memory                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Discards memory manager.                                           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    memory :: A handle to the memory manager.                          */
+  /*                                                                       */
+  FT_BASE( void )
+  FT_Done_Memory( FT_Memory  memory );
+
+#endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
+
+
+  /* Define default raster's interface.  The default raster is located in  */
+  /* `src/base/ftraster.c'.                                                */
+  /*                                                                       */
+  /* Client applications can register new rasters through the              */
+  /* FT_Set_Raster() API.                                                  */
+
+#ifndef FT_NO_DEFAULT_RASTER
+  FT_EXPORT_VAR( FT_Raster_Funcs )  ft_default_raster;
+#endif
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                      P I C   S U P P O R T                      ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /* PIC support macros for ftimage.h */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_OUTLINE_FUNCS                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of FT_Outline_Funcs struct.         */
+  /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
+  /*    be called with a pre-allocated structure to be filled.             */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
+  /*    allocated in the global scope (or the scope where the macro        */
+  /*    is used).                                                          */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_OUTLINE_FUNCS(           \
+          class_,                          \
+          move_to_,                        \
+          line_to_,                        \
+          conic_to_,                       \
+          cubic_to_,                       \
+          shift_,                          \
+          delta_ )                         \
+  static const  FT_Outline_Funcs class_ =  \
+  {                                        \
+    move_to_,                              \
+    line_to_,                              \
+    conic_to_,                             \
+    cubic_to_,                             \
+    shift_,                                \
+    delta_                                 \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_OUTLINE_FUNCS(                     \
+          class_,                                    \
+          move_to_,                                  \
+          line_to_,                                  \
+          conic_to_,                                 \
+          cubic_to_,                                 \
+          shift_,                                    \
+          delta_ )                                   \
+  static FT_Error                                    \
+  Init_Class_ ## class_( FT_Outline_Funcs*  clazz )  \
+  {                                                  \
+    clazz->move_to  = move_to_;                      \
+    clazz->line_to  = line_to_;                      \
+    clazz->conic_to = conic_to_;                     \
+    clazz->cubic_to = cubic_to_;                     \
+    clazz->shift    = shift_;                        \
+    clazz->delta    = delta_;                        \
+                                                     \
+    return FT_Err_Ok;                                \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_RASTER_FUNCS                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of FT_Raster_Funcs struct.          */
+  /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
+  /*    be called with a pre-allocated structure to be filled.             */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
+  /*    allocated in the global scope (or the scope where the macro        */
+  /*    is used).                                                          */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_RASTER_FUNCS(    \
+          class_,                  \
+          glyph_format_,           \
+          raster_new_,             \
+          raster_reset_,           \
+          raster_set_mode_,        \
+          raster_render_,          \
+          raster_done_ )           \
+  const FT_Raster_Funcs  class_ =  \
+  {                                \
+    glyph_format_,                 \
+    raster_new_,                   \
+    raster_reset_,                 \
+    raster_set_mode_,              \
+    raster_render_,                \
+    raster_done_                   \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_RASTER_FUNCS(                        \
+          class_,                                      \
+          glyph_format_,                               \
+          raster_new_,                                 \
+          raster_reset_,                               \
+          raster_set_mode_,                            \
+          raster_render_,                              \
+          raster_done_ )                               \
+  void                                                 \
+  FT_Init_Class_ ## class_( FT_Raster_Funcs*  clazz )  \
+  {                                                    \
+    clazz->glyph_format    = glyph_format_;            \
+    clazz->raster_new      = raster_new_;              \
+    clazz->raster_reset    = raster_reset_;            \
+    clazz->raster_set_mode = raster_set_mode_;         \
+    clazz->raster_render   = raster_render_;           \
+    clazz->raster_done     = raster_done_;             \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+  /* PIC support macros for ftrender.h */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_GLYPH                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of FT_Glyph_Class struct.           */
+  /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
+  /*    be called with a pre-allocated stcture to be filled.               */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
+  /*    allocated in the global scope (or the scope where the macro        */
+  /*    is used).                                                          */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_GLYPH(          \
+          class_,                 \
+          size_,                  \
+          format_,                \
+          init_,                  \
+          done_,                  \
+          copy_,                  \
+          transform_,             \
+          bbox_,                  \
+          prepare_ )              \
+  FT_CALLBACK_TABLE_DEF           \
+  const FT_Glyph_Class  class_ =  \
+  {                               \
+    size_,                        \
+    format_,                      \
+    init_,                        \
+    done_,                        \
+    copy_,                        \
+    transform_,                   \
+    bbox_,                        \
+    prepare_                      \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_GLYPH(                              \
+          class_,                                     \
+          size_,                                      \
+          format_,                                    \
+          init_,                                      \
+          done_,                                      \
+          copy_,                                      \
+          transform_,                                 \
+          bbox_,                                      \
+          prepare_ )                                  \
+  void                                                \
+  FT_Init_Class_ ## class_( FT_Glyph_Class*  clazz )  \
+  {                                                   \
+    clazz->glyph_size      = size_;                   \
+    clazz->glyph_format    = format_;                 \
+    clazz->glyph_init      = init_;                   \
+    clazz->glyph_done      = done_;                   \
+    clazz->glyph_copy      = copy_;                   \
+    clazz->glyph_transform = transform_;              \
+    clazz->glyph_bbox      = bbox_;                   \
+    clazz->glyph_prepare   = prepare_;                \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DECLARE_RENDERER                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to create a forward declaration of a                          */
+  /*    FT_Renderer_Class struct instance.                                 */
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_RENDERER                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of FT_Renderer_Class struct.        */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is defined a `create' funtion will need  */
+  /*    to be called with a pointer where the allocated structure is       */
+  /*    returned.  And when it is no longer needed a `destroy' function    */
+  /*    needs to be called to release that allocation.                     */
+  /*    `fcinit.c' (ft_create_default_module_classes) already contains     */
+  /*    a mechanism to call these functions for the default modules        */
+  /*    described in `ftmodule.h'.                                         */
+  /*                                                                       */
+  /*    Notice that the created `create' and `destroy' functions call      */
+  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
+  /*    initialize any additional global data, like a module specific      */
+  /*    interface, and put them in the global pic container defined in     */
+  /*    `ftpic.h'.  If you don't need them just implement the functions as */
+  /*    empty to resolve the link error.  Also the `pic_init' and          */
+  /*    `pic_free' functions should be declared in `pic.h', to be referred */
+  /*    by the renderer definition calling `FT_DEFINE_RENDERER' in the     */
+  /*    following.                                                         */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
+  /*    allocated in the global scope (or the scope where the macro        */
+  /*    is used).                                                          */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DECLARE_RENDERER( class_ )               \
+  FT_EXPORT_VAR( const FT_Renderer_Class ) class_;
+
+#define FT_DEFINE_RENDERER(                  \
+          class_,                            \
+          flags_,                            \
+          size_,                             \
+          name_,                             \
+          version_,                          \
+          requires_,                         \
+          interface_,                        \
+          init_,                             \
+          done_,                             \
+          get_interface_,                    \
+          glyph_format_,                     \
+          render_glyph_,                     \
+          transform_glyph_,                  \
+          get_glyph_cbox_,                   \
+          set_mode_,                         \
+          raster_class_ )                    \
+  FT_CALLBACK_TABLE_DEF                      \
+  const FT_Renderer_Class  class_ =          \
+  {                                          \
+    FT_DEFINE_ROOT_MODULE( flags_,           \
+                           size_,            \
+                           name_,            \
+                           version_,         \
+                           requires_,        \
+                           interface_,       \
+                           init_,            \
+                           done_,            \
+                           get_interface_ )  \
+    glyph_format_,                           \
+                                             \
+    render_glyph_,                           \
+    transform_glyph_,                        \
+    get_glyph_cbox_,                         \
+    set_mode_,                               \
+                                             \
+    raster_class_                            \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DECLARE_RENDERER( class_ )  FT_DECLARE_MODULE( class_ )
+
+#define FT_DEFINE_RENDERER(                                      \
+          class_,                                                \
+          flags_,                                                \
+          size_,                                                 \
+          name_,                                                 \
+          version_,                                              \
+          requires_,                                             \
+          interface_,                                            \
+          init_,                                                 \
+          done_,                                                 \
+          get_interface_,                                        \
+          glyph_format_,                                         \
+          render_glyph_,                                         \
+          transform_glyph_,                                      \
+          get_glyph_cbox_,                                       \
+          set_mode_,                                             \
+          raster_class_ )                                        \
+  void                                                           \
+  FT_Destroy_Class_ ## class_( FT_Library        library,        \
+                               FT_Module_Class*  clazz )         \
+  {                                                              \
+    FT_Renderer_Class*  rclazz = (FT_Renderer_Class*)clazz;      \
+    FT_Memory           memory = library->memory;                \
+                                                                 \
+                                                                 \
+    class_ ## _pic_free( library );                              \
+    if ( rclazz )                                                \
+      FT_FREE( rclazz );                                         \
+  }                                                              \
+                                                                 \
+                                                                 \
+  FT_Error                                                       \
+  FT_Create_Class_ ## class_( FT_Library         library,        \
+                              FT_Module_Class**  output_class )  \
+  {                                                              \
+    FT_Renderer_Class*  clazz = NULL;                            \
+    FT_Error            error;                                   \
+    FT_Memory           memory = library->memory;                \
+                                                                 \
+                                                                 \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
+      return error;                                              \
+                                                                 \
+    error = class_ ## _pic_init( library );                      \
+    if ( error )                                                 \
+    {                                                            \
+      FT_FREE( clazz );                                          \
+      return error;                                              \
+    }                                                            \
+                                                                 \
+    FT_DEFINE_ROOT_MODULE( flags_,                               \
+                           size_,                                \
+                           name_,                                \
+                           version_,                             \
+                           requires_,                            \
+                           interface_,                           \
+                           init_,                                \
+                           done_,                                \
+                           get_interface_ )                      \
+                                                                 \
+    clazz->glyph_format    = glyph_format_;                      \
+                                                                 \
+    clazz->render_glyph    = render_glyph_;                      \
+    clazz->transform_glyph = transform_glyph_;                   \
+    clazz->get_glyph_cbox  = get_glyph_cbox_;                    \
+    clazz->set_mode        = set_mode_;                          \
+                                                                 \
+    clazz->raster_class    = raster_class_;                      \
+                                                                 \
+    *output_class = (FT_Module_Class*)clazz;                     \
+                                                                 \
+    return FT_Err_Ok;                                            \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+  /* PIC support macros for ftmodapi.h **/
+
+
+#ifdef FT_CONFIG_OPTION_PIC
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Module_Creator                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to create (allocate) a new module class object.    */
+  /*    The object's members are initialized, but the module itself is     */
+  /*    not.                                                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    memory       :: A handle to the memory manager.                    */
+  /*    output_class :: Initialized with the newly allocated class.        */
+  /*                                                                       */
+  typedef FT_Error
+  (*FT_Module_Creator)( FT_Memory          memory,
+                        FT_Module_Class**  output_class );
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    FT_Module_Destroyer                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A function used to destroy (deallocate) a module class object.     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    memory :: A handle to the memory manager.                          */
+  /*    clazz  :: Module class to destroy.                                 */
+  /*                                                                       */
+  typedef void
+  (*FT_Module_Destroyer)( FT_Memory         memory,
+                          FT_Module_Class*  clazz );
+
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DECLARE_MODULE                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to create a forward declaration of a                          */
+  /*    FT_Module_Class struct instance.                                   */
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_MODULE                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of an FT_Module_Class struct.       */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is defined a `create' funtion needs to   */
+  /*    be called with a pointer where the allocated structure is          */
+  /*    returned.  And when it is no longer needed a `destroy' function    */
+  /*    needs to be called to release that allocation.                     */
+  /*    `fcinit.c' (ft_create_default_module_classes) already contains     */
+  /*    a mechanism to call these functions for the default modules        */
+  /*    described in `ftmodule.h'.                                         */
+  /*                                                                       */
+  /*    Notice that the created `create' and `destroy' functions call      */
+  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
+  /*    initialize any additional global data, like a module specific      */
+  /*    interface, and put them in the global pic container defined in     */
+  /*    `ftpic.h'.  If you don't need them just implement the functions as */
+  /*    empty to resolve the link error.  Also the `pic_init' and          */
+  /*    `pic_free' functions should be declared in `pic.h', to be referred */
+  /*    by the module definition calling `FT_DEFINE_MODULE' in the         */
+  /*    following.                                                         */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
+  /*    allocated in the global scope (or the scope where the macro        */
+  /*    is used).                                                          */
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_ROOT_MODULE                                              */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an instance of an FT_Module_Class struct inside */
+  /*    another struct that contains it or in a function that initializes  */
+  /*    that containing struct.                                            */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DECLARE_MODULE( class_ )  \
+  FT_CALLBACK_TABLE                  \
+  const FT_Module_Class  class_;
+
+#define FT_DEFINE_ROOT_MODULE(  \
+          flags_,               \
+          size_,                \
+          name_,                \
+          version_,             \
+          requires_,            \
+          interface_,           \
+          init_,                \
+          done_,                \
+          get_interface_ )      \
+  {                             \
+    flags_,                     \
+    size_,                      \
+                                \
+    name_,                      \
+    version_,                   \
+    requires_,                  \
+                                \
+    interface_,                 \
+                                \
+    init_,                      \
+    done_,                      \
+    get_interface_,             \
+  },
+
+#define FT_DEFINE_MODULE(         \
+          class_,                 \
+          flags_,                 \
+          size_,                  \
+          name_,                  \
+          version_,               \
+          requires_,              \
+          interface_,             \
+          init_,                  \
+          done_,                  \
+          get_interface_ )        \
+  FT_CALLBACK_TABLE_DEF           \
+  const FT_Module_Class class_ =  \
+  {                               \
+    flags_,                       \
+    size_,                        \
+                                  \
+    name_,                        \
+    version_,                     \
+    requires_,                    \
+                                  \
+    interface_,                   \
+                                  \
+    init_,                        \
+    done_,                        \
+    get_interface_,               \
+  };
+
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DECLARE_MODULE( class_ )                               \
+  FT_Error                                                        \
+  FT_Create_Class_ ## class_( FT_Library         library,         \
+                              FT_Module_Class**  output_class );  \
+  void                                                            \
+  FT_Destroy_Class_ ## class_( FT_Library        library,         \
+                               FT_Module_Class*  clazz );
+
+#define FT_DEFINE_ROOT_MODULE(                      \
+          flags_,                                   \
+          size_,                                    \
+          name_,                                    \
+          version_,                                 \
+          requires_,                                \
+          interface_,                               \
+          init_,                                    \
+          done_,                                    \
+          get_interface_ )                          \
+    clazz->root.module_flags     = flags_;          \
+    clazz->root.module_size      = size_;           \
+    clazz->root.module_name      = name_;           \
+    clazz->root.module_version   = version_;        \
+    clazz->root.module_requires  = requires_;       \
+                                                    \
+    clazz->root.module_interface = interface_;      \
+                                                    \
+    clazz->root.module_init      = init_;           \
+    clazz->root.module_done      = done_;           \
+    clazz->root.get_interface    = get_interface_;
+
+#define FT_DEFINE_MODULE(                                        \
+          class_,                                                \
+          flags_,                                                \
+          size_,                                                 \
+          name_,                                                 \
+          version_,                                              \
+          requires_,                                             \
+          interface_,                                            \
+          init_,                                                 \
+          done_,                                                 \
+          get_interface_ )                                       \
+  void                                                           \
+  FT_Destroy_Class_ ## class_( FT_Library        library,        \
+                               FT_Module_Class*  clazz )         \
+  {                                                              \
+    FT_Memory memory = library->memory;                          \
+                                                                 \
+                                                                 \
+    class_ ## _pic_free( library );                              \
+    if ( clazz )                                                 \
+      FT_FREE( clazz );                                          \
+  }                                                              \
+                                                                 \
+                                                                 \
+  FT_Error                                                       \
+  FT_Create_Class_ ## class_( FT_Library         library,        \
+                              FT_Module_Class**  output_class )  \
+  {                                                              \
+    FT_Memory         memory = library->memory;                  \
+    FT_Module_Class*  clazz  = NULL;                             \
+    FT_Error          error;                                     \
+                                                                 \
+                                                                 \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
+      return error;                                              \
+    error = class_ ## _pic_init( library );                      \
+    if ( error )                                                 \
+    {                                                            \
+      FT_FREE( clazz );                                          \
+      return error;                                              \
+    }                                                            \
+                                                                 \
+    clazz->module_flags     = flags_;                            \
+    clazz->module_size      = size_;                             \
+    clazz->module_name      = name_;                             \
+    clazz->module_version   = version_;                          \
+    clazz->module_requires  = requires_;                         \
+                                                                 \
+    clazz->module_interface = interface_;                        \
+                                                                 \
+    clazz->module_init      = init_;                             \
+    clazz->module_done      = done_;                             \
+    clazz->get_interface    = get_interface_;                    \
+                                                                 \
+    *output_class = clazz;                                       \
+                                                                 \
+    return FT_Err_Ok;                                            \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+FT_END_HEADER
+
+#endif /* __FTOBJS_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftobjs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftpic.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftpic.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftpic.h	(rÃ©vision 62573)
@@ -0,0 +1,71 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftpic.h                                                                */
+/*                                                                         */
+/*    The FreeType position independent code services (declaration).       */
+/*                                                                         */
+/*  Copyright 2009, 2012 by                                                */
+/*  Oran Agra and Mickey Gabel.                                            */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  Modules that ordinarily have const global data that need address     */
+  /*  can instead define pointers here.                                    */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTPIC_H__
+#define __FTPIC_H__
+
+
+FT_BEGIN_HEADER
+
+#ifdef FT_CONFIG_OPTION_PIC
+
+  typedef struct  FT_PIC_Container_
+  {
+    /* pic containers for base */
+    void*  base;
+
+    /* pic containers for modules */
+    void*  autofit;
+    void*  cff;
+    void*  pshinter;
+    void*  psnames;
+    void*  raster;
+    void*  sfnt;
+    void*  smooth;
+    void*  truetype;
+
+  } FT_PIC_Container;
+
+
+  /* Initialize the various function tables, structs, etc. */
+  /* stored in the container.                              */
+  FT_BASE( FT_Error )
+  ft_pic_container_init( FT_Library  library );
+
+
+  /* Destroy the contents of the container. */
+  FT_BASE( void )
+  ft_pic_container_destroy( FT_Library  library );
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTPIC_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftpic.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftrfork.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftrfork.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftrfork.h	(rÃ©vision 62573)
@@ -0,0 +1,258 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftrfork.h                                                              */
+/*                                                                         */
+/*    Embedded resource forks accessor (specification).                    */
+/*                                                                         */
+/*  Copyright 2004, 2006, 2007, 2012 by                                    */
+/*  Masatake YAMATO and Redhat K.K.                                        */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/***************************************************************************/
+/* Development of the code in this file is support of                      */
+/* Information-technology Promotion Agency, Japan.                         */
+/***************************************************************************/
+
+
+#ifndef __FTRFORK_H__
+#define __FTRFORK_H__
+
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+
+
+FT_BEGIN_HEADER
+
+
+  /* Number of guessing rules supported in `FT_Raccess_Guess'.            */
+  /* Don't forget to increment the number if you add a new guessing rule. */
+#define FT_RACCESS_N_RULES  9
+
+
+  /* A structure to describe a reference in a resource by its resource ID */
+  /* and internal offset.  The `POST' resource expects to be concatenated */
+  /* by the order of resource IDs instead of its appearance in the file.  */
+
+  typedef struct  FT_RFork_Ref_
+  {
+    FT_UShort  res_id;
+    FT_ULong   offset;
+
+  } FT_RFork_Ref;
+
+#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+  typedef FT_Error
+  (*ft_raccess_guess_func)( FT_Library  library,
+                            FT_Stream   stream,
+                            char       *base_file_name,
+                            char      **result_file_name,
+                            FT_Long    *result_offset );
+
+  typedef enum  FT_RFork_Rule_ {
+    FT_RFork_Rule_invalid = -2,
+    FT_RFork_Rule_uknown, /* -1 */
+    FT_RFork_Rule_apple_double,
+    FT_RFork_Rule_apple_single,
+    FT_RFork_Rule_darwin_ufs_export,
+    FT_RFork_Rule_darwin_newvfs,
+    FT_RFork_Rule_darwin_hfsplus,
+    FT_RFork_Rule_vfat,
+    FT_RFork_Rule_linux_cap,
+    FT_RFork_Rule_linux_double,
+    FT_RFork_Rule_linux_netatalk
+  } FT_RFork_Rule;
+
+  /* For fast translation between rule index and rule type,
+   * the macros FT_RFORK_xxx should be kept consistent with
+   * the raccess_guess_funcs table
+   */
+  typedef struct ft_raccess_guess_rec_ {
+    ft_raccess_guess_func  func;
+    FT_RFork_Rule          type;
+  } ft_raccess_guess_rec;
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+  /* this array is a storage in non-PIC mode, so ; is needed in END */
+#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
+          const type name[] = {
+#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix )  \
+          { raccess_guess_ ## func_suffix,                           \
+            FT_RFork_Rule_ ## type_suffix },
+#define CONST_FT_RFORK_RULE_ARRAY_END  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+  /* this array is a function in PIC mode, so no ; is needed in END */
+#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
+          void                                         \
+          FT_Init_ ## name( type*  storage )           \
+          {                                            \
+            type*  local = storage;                    \
+                                                       \
+                                                       \
+            int  i = 0;
+#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix )  \
+          local[i].func = raccess_guess_ ## func_suffix;             \
+          local[i].type = FT_RFork_Rule_ ## type_suffix;             \
+          i++;
+#define CONST_FT_RFORK_RULE_ARRAY_END  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Raccess_Guess                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Guess a file name and offset where the actual resource fork is     */
+  /*    stored.  The macro FT_RACCESS_N_RULES holds the number of          */
+  /*    guessing rules;  the guessed result for the Nth rule is            */
+  /*    represented as a triplet: a new file name (new_names[N]), a file   */
+  /*    offset (offsets[N]), and an error code (errors[N]).                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library ::                                                         */
+  /*      A FreeType library instance.                                     */
+  /*                                                                       */
+  /*    stream ::                                                          */
+  /*      A file stream containing the resource fork.                      */
+  /*                                                                       */
+  /*    base_name ::                                                       */
+  /*      The (base) file name of the resource fork used for some          */
+  /*      guessing rules.                                                  */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    new_names ::                                                       */
+  /*      An array of guessed file names in which the resource forks may   */
+  /*      exist.  If `new_names[N]' is NULL, the guessed file name is      */
+  /*      equal to `base_name'.                                            */
+  /*                                                                       */
+  /*    offsets ::                                                         */
+  /*      An array of guessed file offsets.  `offsets[N]' holds the file   */
+  /*      offset of the possible start of the resource fork in file        */
+  /*      `new_names[N]'.                                                  */
+  /*                                                                       */
+  /*    errors ::                                                          */
+  /*      An array of FreeType error codes.  `errors[N]' is the error      */
+  /*      code of Nth guessing rule function.  If `errors[N]' is not       */
+  /*      FT_Err_Ok, `new_names[N]' and `offsets[N]' are meaningless.      */
+  /*                                                                       */
+  FT_BASE( void )
+  FT_Raccess_Guess( FT_Library  library,
+                    FT_Stream   stream,
+                    char*       base_name,
+                    char**      new_names,
+                    FT_Long*    offsets,
+                    FT_Error*   errors );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Raccess_Get_HeaderInfo                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Get the information from the header of resource fork.  The         */
+  /*    information includes the file offset where the resource map        */
+  /*    starts, and the file offset where the resource data starts.        */
+  /*    `FT_Raccess_Get_DataOffsets' requires these two data.              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library ::                                                         */
+  /*      A FreeType library instance.                                     */
+  /*                                                                       */
+  /*    stream ::                                                          */
+  /*      A file stream containing the resource fork.                      */
+  /*                                                                       */
+  /*    rfork_offset ::                                                    */
+  /*      The file offset where the resource fork starts.                  */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    map_offset ::                                                      */
+  /*      The file offset where the resource map starts.                   */
+  /*                                                                       */
+  /*    rdata_pos ::                                                       */
+  /*      The file offset where the resource data starts.                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  FT_Err_Ok means success.                     */
+  /*                                                                       */
+  FT_BASE( FT_Error )
+  FT_Raccess_Get_HeaderInfo( FT_Library  library,
+                             FT_Stream   stream,
+                             FT_Long     rfork_offset,
+                             FT_Long    *map_offset,
+                             FT_Long    *rdata_pos );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Raccess_Get_DataOffsets                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Get the data offsets for a tag in a resource fork.  Offsets are    */
+  /*    stored in an array because, in some cases, resources in a resource */
+  /*    fork have the same tag.                                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    library ::                                                         */
+  /*      A FreeType library instance.                                     */
+  /*                                                                       */
+  /*    stream ::                                                          */
+  /*      A file stream containing the resource fork.                      */
+  /*                                                                       */
+  /*    map_offset ::                                                      */
+  /*      The file offset where the resource map starts.                   */
+  /*                                                                       */
+  /*    rdata_pos ::                                                       */
+  /*      The file offset where the resource data starts.                  */
+  /*                                                                       */
+  /*    tag ::                                                             */
+  /*      The resource tag.                                                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    offsets ::                                                         */
+  /*      The stream offsets for the resource data specified by `tag'.     */
+  /*      This array is allocated by the function, so you have to call     */
+  /*      @ft_mem_free after use.                                          */
+  /*                                                                       */
+  /*    count ::                                                           */
+  /*      The length of offsets array.                                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  FT_Err_Ok means success.                     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Normally you should use `FT_Raccess_Get_HeaderInfo' to get the     */
+  /*    value for `map_offset' and `rdata_pos'.                            */
+  /*                                                                       */
+  FT_BASE( FT_Error )
+  FT_Raccess_Get_DataOffsets( FT_Library  library,
+                              FT_Stream   stream,
+                              FT_Long     map_offset,
+                              FT_Long     rdata_pos,
+                              FT_Long     tag,
+                              FT_Long   **offsets,
+                              FT_Long    *count );
+
+
+FT_END_HEADER
+
+#endif /* __FTRFORK_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftrfork.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftserv.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftserv.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftserv.h	(rÃ©vision 62573)
@@ -0,0 +1,763 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftserv.h                                                               */
+/*                                                                         */
+/*    The FreeType services (specification only).                          */
+/*                                                                         */
+/*  Copyright 2003-2007, 2009, 2012, 2013 by                               */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  Each module can export one or more `services'.  Each service is      */
+  /*  identified by a constant string and modeled by a pointer; the latter */
+  /*  generally corresponds to a structure containing function pointers.   */
+  /*                                                                       */
+  /*  Note that a service's data cannot be a mere function pointer because */
+  /*  in C it is possible that function pointers might be implemented      */
+  /*  differently than data pointers (e.g. 48 bits instead of 32).         */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#ifndef __FTSERV_H__
+#define __FTSERV_H__
+
+
+FT_BEGIN_HEADER
+
+  /*
+   * @macro:
+   *   FT_FACE_FIND_SERVICE
+   *
+   * @description:
+   *   This macro is used to look up a service from a face's driver module.
+   *
+   * @input:
+   *   face ::
+   *     The source face handle.
+   *
+   *   id ::
+   *     A string describing the service as defined in the service's
+   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
+   *     `multi-masters').  It is automatically prefixed with
+   *     `FT_SERVICE_ID_'.
+   *
+   * @output:
+   *   ptr ::
+   *     A variable that receives the service pointer.  Will be NULL
+   *     if not found.
+   */
+#ifdef __cplusplus
+
+#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
+  FT_BEGIN_STMNT                                                            \
+    FT_Module    module = FT_MODULE( FT_FACE( face )->driver );             \
+    FT_Pointer   _tmp_  = NULL;                                             \
+    FT_Pointer*  _pptr_ = (FT_Pointer*)&(ptr);                              \
+                                                                            \
+                                                                            \
+    if ( module->clazz->get_interface )                                     \
+      _tmp_ = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
+    *_pptr_ = _tmp_;                                                        \
+  FT_END_STMNT
+
+#else /* !C++ */
+
+#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
+  FT_BEGIN_STMNT                                                            \
+    FT_Module   module = FT_MODULE( FT_FACE( face )->driver );              \
+    FT_Pointer  _tmp_  = NULL;                                              \
+                                                                            \
+    if ( module->clazz->get_interface )                                     \
+      _tmp_ = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
+    ptr = _tmp_;                                                            \
+  FT_END_STMNT
+
+#endif /* !C++ */
+
+
+  /*
+   * @macro:
+   *   FT_FACE_FIND_GLOBAL_SERVICE
+   *
+   * @description:
+   *   This macro is used to look up a service from all modules.
+   *
+   * @input:
+   *   face ::
+   *     The source face handle.
+   *
+   *   id ::
+   *     A string describing the service as defined in the service's
+   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
+   *     `multi-masters').  It is automatically prefixed with
+   *     `FT_SERVICE_ID_'.
+   *
+   * @output:
+   *   ptr ::
+   *     A variable that receives the service pointer.  Will be NULL
+   *     if not found.
+   */
+#ifdef __cplusplus
+
+#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
+  FT_BEGIN_STMNT                                                   \
+    FT_Module    module = FT_MODULE( FT_FACE( face )->driver );    \
+    FT_Pointer   _tmp_;                                            \
+    FT_Pointer*  _pptr_ = (FT_Pointer*)&(ptr);                     \
+                                                                   \
+                                                                   \
+    _tmp_ = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
+    *_pptr_ = _tmp_;                                               \
+  FT_END_STMNT
+
+#else /* !C++ */
+
+#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
+  FT_BEGIN_STMNT                                                   \
+    FT_Module   module = FT_MODULE( FT_FACE( face )->driver );     \
+    FT_Pointer  _tmp_;                                             \
+                                                                   \
+                                                                   \
+    _tmp_ = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
+    ptr   = _tmp_;                                                 \
+  FT_END_STMNT
+
+#endif /* !C++ */
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****         S E R V I C E   D E S C R I P T O R S                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   *  The following structure is used to _describe_ a given service
+   *  to the library.  This is useful to build simple static service lists.
+   */
+  typedef struct  FT_ServiceDescRec_
+  {
+    const char*  serv_id;     /* service name         */
+    const void*  serv_data;   /* service pointer/data */
+
+  } FT_ServiceDescRec;
+
+  typedef const FT_ServiceDescRec*  FT_ServiceDesc;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Macro>                                                               */
+  /*    FT_DEFINE_SERVICEDESCREC1                                          */
+  /*    FT_DEFINE_SERVICEDESCREC2                                          */
+  /*    FT_DEFINE_SERVICEDESCREC3                                          */
+  /*    FT_DEFINE_SERVICEDESCREC4                                          */
+  /*    FT_DEFINE_SERVICEDESCREC5                                          */
+  /*    FT_DEFINE_SERVICEDESCREC6                                          */
+  /*    FT_DEFINE_SERVICEDESCREC7                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Used to initialize an array of FT_ServiceDescRec structures.       */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function needs to  */
+  /*    be called with a pointer to return an allocated array.  As soon as */
+  /*    it is no longer needed, a `destroy' function needs to be called to */
+  /*    release that allocation.                                           */
+  /*                                                                       */
+  /*    These functions should be manually called from the `pic_init' and  */
+  /*    `pic_free' functions of your module (see FT_DEFINE_MODULE).        */
+  /*                                                                       */
+  /*    When FT_CONFIG_OPTION_PIC is not defined the array will be         */
+  /*    allocated in the global scope (or the scope where the macro is     */
+  /*    used).                                                             */
+  /*                                                                       */
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
+                                   serv_id_1, serv_data_1 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { serv_id_5, serv_data_5 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5,                  \
+                                   serv_id_6, serv_data_6 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { serv_id_5, serv_data_5 },                                             \
+    { serv_id_6, serv_data_6 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#define FT_DEFINE_SERVICEDESCREC7( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5,                  \
+                                   serv_id_6, serv_data_6,                  \
+                                   serv_id_7, serv_data_7 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { serv_id_5, serv_data_5 },                                             \
+    { serv_id_6, serv_data_6 },                                             \
+    { serv_id_7, serv_data_7 },                                             \
+    { NULL, NULL }                                                          \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
+                                   serv_id_1, serv_data_1 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 2 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = NULL;                                              \
+    clazz[1].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 3 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = NULL;                                              \
+    clazz[2].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 4 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = NULL;                                              \
+    clazz[3].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 5 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = NULL;                                              \
+    clazz[4].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 6 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = serv_id_5;                                         \
+    clazz[4].serv_data = serv_data_5;                                       \
+    clazz[5].serv_id   = NULL;                                              \
+    clazz[5].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5,                  \
+                                   serv_id_6, serv_data_6 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class)            \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 7 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = serv_id_5;                                         \
+    clazz[4].serv_data = serv_data_5;                                       \
+    clazz[5].serv_id   = serv_id_6;                                         \
+    clazz[5].serv_data = serv_data_6;                                       \
+    clazz[6].serv_id   = NULL;                                              \
+    clazz[6].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC7( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5,                  \
+                                   serv_id_6, serv_data_6,                  \
+                                   serv_id_7, serv_data_7 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class)            \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz  = NULL;                                      \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 8 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = serv_id_5;                                         \
+    clazz[4].serv_data = serv_data_5;                                       \
+    clazz[5].serv_id   = serv_id_6;                                         \
+    clazz[5].serv_data = serv_data_6;                                       \
+    clazz[6].serv_id   = serv_id_7;                                         \
+    clazz[6].serv_data = serv_data_7;                                       \
+    clazz[7].serv_id   = NULL;                                              \
+    clazz[7].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+  /*
+   *  Parse a list of FT_ServiceDescRec descriptors and look for
+   *  a specific service by ID.  Note that the last element in the
+   *  array must be { NULL, NULL }, and that the function should
+   *  return NULL if the service isn't available.
+   *
+   *  This function can be used by modules to implement their
+   *  `get_service' method.
+   */
+  FT_BASE( FT_Pointer )
+  ft_service_list_lookup( FT_ServiceDesc  service_descriptors,
+                          const char*     service_id );
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****             S E R V I C E S   C A C H E                       *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   *  This structure is used to store a cache for several frequently used
+   *  services.  It is the type of `face->internal->services'.  You
+   *  should only use FT_FACE_LOOKUP_SERVICE to access it.
+   *
+   *  All fields should have the type FT_Pointer to relax compilation
+   *  dependencies.  We assume the developer isn't completely stupid.
+   *
+   *  Each field must be named `service_XXXX' where `XXX' corresponds to
+   *  the correct FT_SERVICE_ID_XXXX macro.  See the definition of
+   *  FT_FACE_LOOKUP_SERVICE below how this is implemented.
+   *
+   */
+  typedef struct  FT_ServiceCacheRec_
+  {
+    FT_Pointer  service_POSTSCRIPT_FONT_NAME;
+    FT_Pointer  service_MULTI_MASTERS;
+    FT_Pointer  service_GLYPH_DICT;
+    FT_Pointer  service_PFR_METRICS;
+    FT_Pointer  service_WINFNT;
+
+  } FT_ServiceCacheRec, *FT_ServiceCache;
+
+
+  /*
+   *  A magic number used within the services cache.
+   */
+
+  /* ensure that value `1' has the same width as a pointer */
+#define FT_SERVICE_UNAVAILABLE  ((FT_Pointer)~(FT_PtrDist)1)
+
+
+  /*
+   * @macro:
+   *   FT_FACE_LOOKUP_SERVICE
+   *
+   * @description:
+   *   This macro is used to lookup a service from a face's driver module
+   *   using its cache.
+   *
+   * @input:
+   *   face::
+   *     The source face handle containing the cache.
+   *
+   *   field ::
+   *     The field name in the cache.
+   *
+   *   id ::
+   *     The service ID.
+   *
+   * @output:
+   *   ptr ::
+   *     A variable receiving the service data.  NULL if not available.
+   */
+#ifdef __cplusplus
+
+#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                \
+  FT_BEGIN_STMNT                                               \
+    FT_Pointer   svc;                                          \
+    FT_Pointer*  Pptr = (FT_Pointer*)&(ptr);                   \
+                                                               \
+                                                               \
+    svc = FT_FACE( face )->internal->services. service_ ## id; \
+    if ( svc == FT_SERVICE_UNAVAILABLE )                       \
+      svc = NULL;                                              \
+    else if ( svc == NULL )                                    \
+    {                                                          \
+      FT_FACE_FIND_SERVICE( face, svc, id );                   \
+                                                               \
+      FT_FACE( face )->internal->services. service_ ## id =    \
+        (FT_Pointer)( svc != NULL ? svc                        \
+                                  : FT_SERVICE_UNAVAILABLE );  \
+    }                                                          \
+    *Pptr = svc;                                               \
+  FT_END_STMNT
+
+#else /* !C++ */
+
+#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                \
+  FT_BEGIN_STMNT                                               \
+    FT_Pointer  svc;                                           \
+                                                               \
+                                                               \
+    svc = FT_FACE( face )->internal->services. service_ ## id; \
+    if ( svc == FT_SERVICE_UNAVAILABLE )                       \
+      svc = NULL;                                              \
+    else if ( svc == NULL )                                    \
+    {                                                          \
+      FT_FACE_FIND_SERVICE( face, svc, id );                   \
+                                                               \
+      FT_FACE( face )->internal->services. service_ ## id =    \
+        (FT_Pointer)( svc != NULL ? svc                        \
+                                  : FT_SERVICE_UNAVAILABLE );  \
+    }                                                          \
+    ptr = svc;                                                 \
+  FT_END_STMNT
+
+#endif /* !C++ */
+
+  /*
+   *  A macro used to define new service structure types.
+   */
+
+#define FT_DEFINE_SERVICE( name )            \
+  typedef struct FT_Service_ ## name ## Rec_ \
+    FT_Service_ ## name ## Rec ;             \
+  typedef struct FT_Service_ ## name ## Rec_ \
+    const * FT_Service_ ## name ;            \
+  struct FT_Service_ ## name ## Rec_
+
+  /* */
+
+  /*
+   *  The header files containing the services.
+   */
+
+#define FT_SERVICE_BDF_H                <internal/services/svbdf.h>
+#define FT_SERVICE_CID_H                <internal/services/svcid.h>
+#define FT_SERVICE_GLYPH_DICT_H         <internal/services/svgldict.h>
+#define FT_SERVICE_GX_VALIDATE_H        <internal/services/svgxval.h>
+#define FT_SERVICE_KERNING_H            <internal/services/svkern.h>
+#define FT_SERVICE_MULTIPLE_MASTERS_H   <internal/services/svmm.h>
+#define FT_SERVICE_OPENTYPE_VALIDATE_H  <internal/services/svotval.h>
+#define FT_SERVICE_PFR_H                <internal/services/svpfr.h>
+#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <internal/services/svpscmap.h>
+#define FT_SERVICE_POSTSCRIPT_INFO_H    <internal/services/svpsinfo.h>
+#define FT_SERVICE_POSTSCRIPT_NAME_H    <internal/services/svpostnm.h>
+#define FT_SERVICE_PROPERTIES_H         <internal/services/svprop.h>
+#define FT_SERVICE_SFNT_H               <internal/services/svsfnt.h>
+#define FT_SERVICE_TRUETYPE_ENGINE_H    <internal/services/svtteng.h>
+#define FT_SERVICE_TT_CMAP_H            <internal/services/svttcmap.h>
+#define FT_SERVICE_WINFNT_H             <internal/services/svwinfnt.h>
+#define FT_SERVICE_XFREE86_NAME_H       <internal/services/svxf86nm.h>
+#define FT_SERVICE_TRUETYPE_GLYF_H      <internal/services/svttglyf.h>
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __FTSERV_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftserv.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftstream.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftstream.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftstream.h	(rÃ©vision 62573)
@@ -0,0 +1,536 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftstream.h                                                             */
+/*                                                                         */
+/*    Stream handling (specification).                                     */
+/*                                                                         */
+/*  Copyright 1996-2002, 2004-2006, 2011, 2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTSTREAM_H__
+#define __FTSTREAM_H__
+
+
+#include <ft2build.h>
+#include FT_SYSTEM_H
+#include FT_INTERNAL_OBJECTS_H
+
+
+FT_BEGIN_HEADER
+
+
+  /* format of an 8-bit frame_op value:           */
+  /*                                              */
+  /* bit  76543210                                */
+  /*      xxxxxxes                                */
+  /*                                              */
+  /* s is set to 1 if the value is signed.        */
+  /* e is set to 1 if the value is little-endian. */
+  /* xxx is a command.                            */
+
+#define FT_FRAME_OP_SHIFT         2
+#define FT_FRAME_OP_SIGNED        1
+#define FT_FRAME_OP_LITTLE        2
+#define FT_FRAME_OP_COMMAND( x )  ( x >> FT_FRAME_OP_SHIFT )
+
+#define FT_MAKE_FRAME_OP( command, little, sign ) \
+          ( ( command << FT_FRAME_OP_SHIFT ) | ( little << 1 ) | sign )
+
+#define FT_FRAME_OP_END    0
+#define FT_FRAME_OP_START  1  /* start a new frame     */
+#define FT_FRAME_OP_BYTE   2  /* read 1-byte value     */
+#define FT_FRAME_OP_SHORT  3  /* read 2-byte value     */
+#define FT_FRAME_OP_LONG   4  /* read 4-byte value     */
+#define FT_FRAME_OP_OFF3   5  /* read 3-byte value     */
+#define FT_FRAME_OP_BYTES  6  /* read a bytes sequence */
+
+
+  typedef enum  FT_Frame_Op_
+  {
+    ft_frame_end       = 0,
+    ft_frame_start     = FT_MAKE_FRAME_OP( FT_FRAME_OP_START, 0, 0 ),
+
+    ft_frame_byte      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 0 ),
+    ft_frame_schar     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 1 ),
+
+    ft_frame_ushort_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 0 ),
+    ft_frame_short_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 1 ),
+    ft_frame_ushort_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 0 ),
+    ft_frame_short_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 1 ),
+
+    ft_frame_ulong_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 0 ),
+    ft_frame_long_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 1 ),
+    ft_frame_ulong_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 0 ),
+    ft_frame_long_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 1 ),
+
+    ft_frame_uoff3_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 0 ),
+    ft_frame_off3_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 1 ),
+    ft_frame_uoff3_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 0 ),
+    ft_frame_off3_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 1 ),
+
+    ft_frame_bytes     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 0 ),
+    ft_frame_skip      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 1 )
+
+  } FT_Frame_Op;
+
+
+  typedef struct  FT_Frame_Field_
+  {
+    FT_Byte    value;
+    FT_Byte    size;
+    FT_UShort  offset;
+
+  } FT_Frame_Field;
+
+
+  /* Construct an FT_Frame_Field out of a structure type and a field name. */
+  /* The structure type must be set in the FT_STRUCTURE macro before       */
+  /* calling the FT_FRAME_START() macro.                                   */
+  /*                                                                       */
+#define FT_FIELD_SIZE( f ) \
+          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f )
+
+#define FT_FIELD_SIZE_DELTA( f ) \
+          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f[0] )
+
+#define FT_FIELD_OFFSET( f ) \
+          (FT_UShort)( offsetof( FT_STRUCTURE, f ) )
+
+#define FT_FRAME_FIELD( frame_op, field ) \
+          {                               \
+            frame_op,                     \
+            FT_FIELD_SIZE( field ),       \
+            FT_FIELD_OFFSET( field )      \
+          }
+
+#define FT_MAKE_EMPTY_FIELD( frame_op )  { frame_op, 0, 0 }
+
+#define FT_FRAME_START( size )   { ft_frame_start, 0, size }
+#define FT_FRAME_END             { ft_frame_end, 0, 0 }
+
+#define FT_FRAME_LONG( f )       FT_FRAME_FIELD( ft_frame_long_be, f )
+#define FT_FRAME_ULONG( f )      FT_FRAME_FIELD( ft_frame_ulong_be, f )
+#define FT_FRAME_SHORT( f )      FT_FRAME_FIELD( ft_frame_short_be, f )
+#define FT_FRAME_USHORT( f )     FT_FRAME_FIELD( ft_frame_ushort_be, f )
+#define FT_FRAME_OFF3( f )       FT_FRAME_FIELD( ft_frame_off3_be, f )
+#define FT_FRAME_UOFF3( f )      FT_FRAME_FIELD( ft_frame_uoff3_be, f )
+#define FT_FRAME_BYTE( f )       FT_FRAME_FIELD( ft_frame_byte, f )
+#define FT_FRAME_CHAR( f )       FT_FRAME_FIELD( ft_frame_schar, f )
+
+#define FT_FRAME_LONG_LE( f )    FT_FRAME_FIELD( ft_frame_long_le, f )
+#define FT_FRAME_ULONG_LE( f )   FT_FRAME_FIELD( ft_frame_ulong_le, f )
+#define FT_FRAME_SHORT_LE( f )   FT_FRAME_FIELD( ft_frame_short_le, f )
+#define FT_FRAME_USHORT_LE( f )  FT_FRAME_FIELD( ft_frame_ushort_le, f )
+#define FT_FRAME_OFF3_LE( f )    FT_FRAME_FIELD( ft_frame_off3_le, f )
+#define FT_FRAME_UOFF3_LE( f )   FT_FRAME_FIELD( ft_frame_uoff3_le, f )
+
+#define FT_FRAME_SKIP_LONG       { ft_frame_long_be, 0, 0 }
+#define FT_FRAME_SKIP_SHORT      { ft_frame_short_be, 0, 0 }
+#define FT_FRAME_SKIP_BYTE       { ft_frame_byte, 0, 0 }
+
+#define FT_FRAME_BYTES( field, count ) \
+          {                            \
+            ft_frame_bytes,            \
+            count,                     \
+            FT_FIELD_OFFSET( field )   \
+          }
+
+#define FT_FRAME_SKIP_BYTES( count )  { ft_frame_skip, count, 0 }
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Integer extraction macros -- the `buffer' parameter must ALWAYS be of */
+  /* type `char*' or equivalent (1-byte elements).                         */
+  /*                                                                       */
+
+#define FT_BYTE_( p, i )  ( ((const FT_Byte*)(p))[(i)] )
+
+#define FT_INT16( x )   ( (FT_Int16)(x)  )
+#define FT_UINT16( x )  ( (FT_UInt16)(x) )
+#define FT_INT32( x )   ( (FT_Int32)(x)  )
+#define FT_UINT32( x )  ( (FT_UInt32)(x) )
+
+
+#define FT_BYTE_U16( p, i, s )  ( FT_UINT16( FT_BYTE_( p, i ) ) << (s) )
+#define FT_BYTE_U32( p, i, s )  ( FT_UINT32( FT_BYTE_( p, i ) ) << (s) )
+
+
+#define FT_PEEK_SHORT( p )  FT_INT16( FT_BYTE_U16( p, 0, 8) | \
+                                      FT_BYTE_U16( p, 1, 0) )
+
+#define FT_PEEK_USHORT( p )  FT_UINT16( FT_BYTE_U16( p, 0, 8 ) | \
+                                        FT_BYTE_U16( p, 1, 0 ) )
+
+#define FT_PEEK_LONG( p )  FT_INT32( FT_BYTE_U32( p, 0, 24 ) | \
+                                     FT_BYTE_U32( p, 1, 16 ) | \
+                                     FT_BYTE_U32( p, 2,  8 ) | \
+                                     FT_BYTE_U32( p, 3,  0 ) )
+
+#define FT_PEEK_ULONG( p )  FT_UINT32( FT_BYTE_U32( p, 0, 24 ) | \
+                                       FT_BYTE_U32( p, 1, 16 ) | \
+                                       FT_BYTE_U32( p, 2,  8 ) | \
+                                       FT_BYTE_U32( p, 3,  0 ) )
+
+#define FT_PEEK_OFF3( p )  FT_INT32( FT_BYTE_U32( p, 0, 16 ) | \
+                                     FT_BYTE_U32( p, 1,  8 ) | \
+                                     FT_BYTE_U32( p, 2,  0 ) )
+
+#define FT_PEEK_UOFF3( p )  FT_UINT32( FT_BYTE_U32( p, 0, 16 ) | \
+                                       FT_BYTE_U32( p, 1,  8 ) | \
+                                       FT_BYTE_U32( p, 2,  0 ) )
+
+#define FT_PEEK_SHORT_LE( p )  FT_INT16( FT_BYTE_U16( p, 1, 8 ) | \
+                                         FT_BYTE_U16( p, 0, 0 ) )
+
+#define FT_PEEK_USHORT_LE( p )  FT_UINT16( FT_BYTE_U16( p, 1, 8 ) |  \
+                                           FT_BYTE_U16( p, 0, 0 ) )
+
+#define FT_PEEK_LONG_LE( p )  FT_INT32( FT_BYTE_U32( p, 3, 24 ) | \
+                                        FT_BYTE_U32( p, 2, 16 ) | \
+                                        FT_BYTE_U32( p, 1,  8 ) | \
+                                        FT_BYTE_U32( p, 0,  0 ) )
+
+#define FT_PEEK_ULONG_LE( p )  FT_UINT32( FT_BYTE_U32( p, 3, 24 ) | \
+                                          FT_BYTE_U32( p, 2, 16 ) | \
+                                          FT_BYTE_U32( p, 1,  8 ) | \
+                                          FT_BYTE_U32( p, 0,  0 ) )
+
+#define FT_PEEK_OFF3_LE( p )  FT_INT32( FT_BYTE_U32( p, 2, 16 ) | \
+                                        FT_BYTE_U32( p, 1,  8 ) | \
+                                        FT_BYTE_U32( p, 0,  0 ) )
+
+#define FT_PEEK_UOFF3_LE( p )  FT_UINT32( FT_BYTE_U32( p, 2, 16 ) | \
+                                          FT_BYTE_U32( p, 1,  8 ) | \
+                                          FT_BYTE_U32( p, 0,  0 ) )
+
+
+#define FT_NEXT_CHAR( buffer )       \
+          ( (signed char)*buffer++ )
+
+#define FT_NEXT_BYTE( buffer )         \
+          ( (unsigned char)*buffer++ )
+
+#define FT_NEXT_SHORT( buffer )                                   \
+          ( (short)( buffer += 2, FT_PEEK_SHORT( buffer - 2 ) ) )
+
+#define FT_NEXT_USHORT( buffer )                                            \
+          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT( buffer - 2 ) ) )
+
+#define FT_NEXT_OFF3( buffer )                                  \
+          ( (long)( buffer += 3, FT_PEEK_OFF3( buffer - 3 ) ) )
+
+#define FT_NEXT_UOFF3( buffer )                                           \
+          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3( buffer - 3 ) ) )
+
+#define FT_NEXT_LONG( buffer )                                  \
+          ( (long)( buffer += 4, FT_PEEK_LONG( buffer - 4 ) ) )
+
+#define FT_NEXT_ULONG( buffer )                                           \
+          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG( buffer - 4 ) ) )
+
+
+#define FT_NEXT_SHORT_LE( buffer )                                   \
+          ( (short)( buffer += 2, FT_PEEK_SHORT_LE( buffer - 2 ) ) )
+
+#define FT_NEXT_USHORT_LE( buffer )                                            \
+          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT_LE( buffer - 2 ) ) )
+
+#define FT_NEXT_OFF3_LE( buffer )                                  \
+          ( (long)( buffer += 3, FT_PEEK_OFF3_LE( buffer - 3 ) ) )
+
+#define FT_NEXT_UOFF3_LE( buffer )                                           \
+          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3_LE( buffer - 3 ) ) )
+
+#define FT_NEXT_LONG_LE( buffer )                                  \
+          ( (long)( buffer += 4, FT_PEEK_LONG_LE( buffer - 4 ) ) )
+
+#define FT_NEXT_ULONG_LE( buffer )                                           \
+          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG_LE( buffer - 4 ) ) )
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Each GET_xxxx() macro uses an implicit `stream' variable.             */
+  /*                                                                       */
+#if 0
+#define FT_GET_MACRO( type )    FT_NEXT_ ## type ( stream->cursor )
+
+#define FT_GET_CHAR()       FT_GET_MACRO( CHAR )
+#define FT_GET_BYTE()       FT_GET_MACRO( BYTE )
+#define FT_GET_SHORT()      FT_GET_MACRO( SHORT )
+#define FT_GET_USHORT()     FT_GET_MACRO( USHORT )
+#define FT_GET_OFF3()       FT_GET_MACRO( OFF3 )
+#define FT_GET_UOFF3()      FT_GET_MACRO( UOFF3 )
+#define FT_GET_LONG()       FT_GET_MACRO( LONG )
+#define FT_GET_ULONG()      FT_GET_MACRO( ULONG )
+#define FT_GET_TAG4()       FT_GET_MACRO( ULONG )
+
+#define FT_GET_SHORT_LE()   FT_GET_MACRO( SHORT_LE )
+#define FT_GET_USHORT_LE()  FT_GET_MACRO( USHORT_LE )
+#define FT_GET_LONG_LE()    FT_GET_MACRO( LONG_LE )
+#define FT_GET_ULONG_LE()   FT_GET_MACRO( ULONG_LE )
+
+#else
+#define FT_GET_MACRO( func, type )        ( (type)func( stream ) )
+
+#define FT_GET_CHAR()       FT_GET_MACRO( FT_Stream_GetChar, FT_Char )
+#define FT_GET_BYTE()       FT_GET_MACRO( FT_Stream_GetChar, FT_Byte )
+#define FT_GET_SHORT()      FT_GET_MACRO( FT_Stream_GetUShort, FT_Short )
+#define FT_GET_USHORT()     FT_GET_MACRO( FT_Stream_GetUShort, FT_UShort )
+#define FT_GET_OFF3()       FT_GET_MACRO( FT_Stream_GetUOffset, FT_Long )
+#define FT_GET_UOFF3()      FT_GET_MACRO( FT_Stream_GetUOffset, FT_ULong )
+#define FT_GET_LONG()       FT_GET_MACRO( FT_Stream_GetULong, FT_Long )
+#define FT_GET_ULONG()      FT_GET_MACRO( FT_Stream_GetULong, FT_ULong )
+#define FT_GET_TAG4()       FT_GET_MACRO( FT_Stream_GetULong, FT_ULong )
+
+#define FT_GET_SHORT_LE()   FT_GET_MACRO( FT_Stream_GetUShortLE, FT_Short )
+#define FT_GET_USHORT_LE()  FT_GET_MACRO( FT_Stream_GetUShortLE, FT_UShort )
+#define FT_GET_LONG_LE()    FT_GET_MACRO( FT_Stream_GetULongLE, FT_Long )
+#define FT_GET_ULONG_LE()   FT_GET_MACRO( FT_Stream_GetULongLE, FT_ULong )
+#endif
+
+#define FT_READ_MACRO( func, type, var )        \
+          ( var = (type)func( stream, &error ), \
+            error != FT_Err_Ok )
+
+#define FT_READ_BYTE( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Byte, var )
+#define FT_READ_CHAR( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Char, var )
+#define FT_READ_SHORT( var )      FT_READ_MACRO( FT_Stream_ReadUShort, FT_Short, var )
+#define FT_READ_USHORT( var )     FT_READ_MACRO( FT_Stream_ReadUShort, FT_UShort, var )
+#define FT_READ_OFF3( var )       FT_READ_MACRO( FT_Stream_ReadUOffset, FT_Long, var )
+#define FT_READ_UOFF3( var )      FT_READ_MACRO( FT_Stream_ReadUOffset, FT_ULong, var )
+#define FT_READ_LONG( var )       FT_READ_MACRO( FT_Stream_ReadULong, FT_Long, var )
+#define FT_READ_ULONG( var )      FT_READ_MACRO( FT_Stream_ReadULong, FT_ULong, var )
+
+#define FT_READ_SHORT_LE( var )   FT_READ_MACRO( FT_Stream_ReadUShortLE, FT_Short, var )
+#define FT_READ_USHORT_LE( var )  FT_READ_MACRO( FT_Stream_ReadUShortLE, FT_UShort, var )
+#define FT_READ_LONG_LE( var )    FT_READ_MACRO( FT_Stream_ReadULongLE, FT_Long, var )
+#define FT_READ_ULONG_LE( var )   FT_READ_MACRO( FT_Stream_ReadULongLE, FT_ULong, var )
+
+
+#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
+
+  /* initialize a stream for reading a regular system stream */
+  FT_BASE( FT_Error )
+  FT_Stream_Open( FT_Stream    stream,
+                  const char*  filepathname );
+
+#endif /* FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
+
+
+  /* create a new (input) stream from an FT_Open_Args structure */
+  FT_BASE( FT_Error )
+  FT_Stream_New( FT_Library           library,
+                 const FT_Open_Args*  args,
+                 FT_Stream           *astream );
+
+  /* free a stream */
+  FT_BASE( void )
+  FT_Stream_Free( FT_Stream  stream,
+                  FT_Int     external );
+
+  /* initialize a stream for reading in-memory data */
+  FT_BASE( void )
+  FT_Stream_OpenMemory( FT_Stream       stream,
+                        const FT_Byte*  base,
+                        FT_ULong        size );
+
+  /* close a stream (does not destroy the stream structure) */
+  FT_BASE( void )
+  FT_Stream_Close( FT_Stream  stream );
+
+
+  /* seek within a stream. position is relative to start of stream */
+  FT_BASE( FT_Error )
+  FT_Stream_Seek( FT_Stream  stream,
+                  FT_ULong   pos );
+
+  /* skip bytes in a stream */
+  FT_BASE( FT_Error )
+  FT_Stream_Skip( FT_Stream  stream,
+                  FT_Long    distance );
+
+  /* return current stream position */
+  FT_BASE( FT_Long )
+  FT_Stream_Pos( FT_Stream  stream );
+
+  /* read bytes from a stream into a user-allocated buffer, returns an */
+  /* error if not all bytes could be read.                             */
+  FT_BASE( FT_Error )
+  FT_Stream_Read( FT_Stream  stream,
+                  FT_Byte*   buffer,
+                  FT_ULong   count );
+
+  /* read bytes from a stream at a given position */
+  FT_BASE( FT_Error )
+  FT_Stream_ReadAt( FT_Stream  stream,
+                    FT_ULong   pos,
+                    FT_Byte*   buffer,
+                    FT_ULong   count );
+
+  /* try to read bytes at the end of a stream; return number of bytes */
+  /* really available                                                 */
+  FT_BASE( FT_ULong )
+  FT_Stream_TryRead( FT_Stream  stream,
+                     FT_Byte*   buffer,
+                     FT_ULong   count );
+
+  /* Enter a frame of `count' consecutive bytes in a stream.  Returns an */
+  /* error if the frame could not be read/accessed.  The caller can use  */
+  /* the FT_Stream_Get_XXX functions to retrieve frame data without      */
+  /* error checks.                                                       */
+  /*                                                                     */
+  /* You must _always_ call FT_Stream_ExitFrame() once you have entered  */
+  /* a stream frame!                                                     */
+  /*                                                                     */
+  FT_BASE( FT_Error )
+  FT_Stream_EnterFrame( FT_Stream  stream,
+                        FT_ULong   count );
+
+  /* exit a stream frame */
+  FT_BASE( void )
+  FT_Stream_ExitFrame( FT_Stream  stream );
+
+  /* Extract a stream frame.  If the stream is disk-based, a heap block */
+  /* is allocated and the frame bytes are read into it.  If the stream  */
+  /* is memory-based, this function simply set a pointer to the data.   */
+  /*                                                                    */
+  /* Useful to optimize access to memory-based streams transparently.   */
+  /*                                                                    */
+  /* All extracted frames must be `freed' with a call to the function   */
+  /* FT_Stream_ReleaseFrame().                                          */
+  /*                                                                    */
+  FT_BASE( FT_Error )
+  FT_Stream_ExtractFrame( FT_Stream  stream,
+                          FT_ULong   count,
+                          FT_Byte**  pbytes );
+
+  /* release an extract frame (see FT_Stream_ExtractFrame) */
+  FT_BASE( void )
+  FT_Stream_ReleaseFrame( FT_Stream  stream,
+                          FT_Byte**  pbytes );
+
+  /* read a byte from an entered frame */
+  FT_BASE( FT_Char )
+  FT_Stream_GetChar( FT_Stream  stream );
+
+  /* read a 16-bit big-endian unsigned integer from an entered frame */
+  FT_BASE( FT_UShort )
+  FT_Stream_GetUShort( FT_Stream  stream );
+
+  /* read a 24-bit big-endian unsigned integer from an entered frame */
+  FT_BASE( FT_ULong )
+  FT_Stream_GetUOffset( FT_Stream  stream );
+
+  /* read a 32-bit big-endian unsigned integer from an entered frame */
+  FT_BASE( FT_ULong )
+  FT_Stream_GetULong( FT_Stream  stream );
+
+  /* read a 16-bit little-endian unsigned integer from an entered frame */
+  FT_BASE( FT_UShort )
+  FT_Stream_GetUShortLE( FT_Stream  stream );
+
+  /* read a 32-bit little-endian unsigned integer from an entered frame */
+  FT_BASE( FT_ULong )
+  FT_Stream_GetULongLE( FT_Stream  stream );
+
+
+  /* read a byte from a stream */
+  FT_BASE( FT_Char )
+  FT_Stream_ReadChar( FT_Stream  stream,
+                      FT_Error*  error );
+
+  /* read a 16-bit big-endian unsigned integer from a stream */
+  FT_BASE( FT_UShort )
+  FT_Stream_ReadUShort( FT_Stream  stream,
+                        FT_Error*  error );
+
+  /* read a 24-bit big-endian unsigned integer from a stream */
+  FT_BASE( FT_ULong )
+  FT_Stream_ReadUOffset( FT_Stream  stream,
+                         FT_Error*  error );
+
+  /* read a 32-bit big-endian integer from a stream */
+  FT_BASE( FT_ULong )
+  FT_Stream_ReadULong( FT_Stream  stream,
+                       FT_Error*  error );
+
+  /* read a 16-bit little-endian unsigned integer from a stream */
+  FT_BASE( FT_UShort )
+  FT_Stream_ReadUShortLE( FT_Stream  stream,
+                          FT_Error*  error );
+
+  /* read a 32-bit little-endian unsigned integer from a stream */
+  FT_BASE( FT_ULong )
+  FT_Stream_ReadULongLE( FT_Stream  stream,
+                         FT_Error*  error );
+
+  /* Read a structure from a stream.  The structure must be described */
+  /* by an array of FT_Frame_Field records.                           */
+  FT_BASE( FT_Error )
+  FT_Stream_ReadFields( FT_Stream              stream,
+                        const FT_Frame_Field*  fields,
+                        void*                  structure );
+
+
+#define FT_STREAM_POS()           \
+          FT_Stream_Pos( stream )
+
+#define FT_STREAM_SEEK( position )                               \
+          FT_SET_ERROR( FT_Stream_Seek( stream,                  \
+                                        (FT_ULong)(position) ) )
+
+#define FT_STREAM_SKIP( distance )                              \
+          FT_SET_ERROR( FT_Stream_Skip( stream,                 \
+                                        (FT_Long)(distance) ) )
+
+#define FT_STREAM_READ( buffer, count )                       \
+          FT_SET_ERROR( FT_Stream_Read( stream,               \
+                                        (FT_Byte*)(buffer),   \
+                                        (FT_ULong)(count) ) )
+
+#define FT_STREAM_READ_AT( position, buffer, count )            \
+          FT_SET_ERROR( FT_Stream_ReadAt( stream,               \
+                                          (FT_ULong)(position), \
+                                          (FT_Byte*)buffer,     \
+                                          (FT_ULong)(count) ) )
+
+#define FT_STREAM_READ_FIELDS( fields, object )                          \
+          FT_SET_ERROR( FT_Stream_ReadFields( stream, fields, object ) )
+
+
+#define FT_FRAME_ENTER( size )                                           \
+          FT_SET_ERROR(                                                  \
+            FT_DEBUG_INNER( FT_Stream_EnterFrame( stream,                \
+                                                  (FT_ULong)(size) ) ) )
+
+#define FT_FRAME_EXIT()                                   \
+          FT_DEBUG_INNER( FT_Stream_ExitFrame( stream ) )
+
+#define FT_FRAME_EXTRACT( size, bytes )                                       \
+          FT_SET_ERROR(                                                       \
+            FT_DEBUG_INNER( FT_Stream_ExtractFrame( stream,                   \
+                                                    (FT_ULong)(size),         \
+                                                    (FT_Byte**)&(bytes) ) ) )
+
+#define FT_FRAME_RELEASE( bytes )                                         \
+          FT_DEBUG_INNER( FT_Stream_ReleaseFrame( stream,                 \
+                                                  (FT_Byte**)&(bytes) ) )
+
+
+FT_END_HEADER
+
+#endif /* __FTSTREAM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftstream.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/fttrace.h
===================================================================
--- lib/3rdparty/freetype/include/internal/fttrace.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/fttrace.h	(rÃ©vision 62573)
@@ -0,0 +1,152 @@
+/***************************************************************************/
+/*                                                                         */
+/*  fttrace.h                                                              */
+/*                                                                         */
+/*    Tracing handling (specification only).                               */
+/*                                                                         */
+/*  Copyright 2002, 2004-2007, 2009, 2011-2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /* definitions of trace levels for FreeType 2 */
+
+  /* the first level must always be `trace_any' */
+FT_TRACE_DEF( any )
+
+  /* base components */
+FT_TRACE_DEF( calc )      /* calculations            (ftcalc.c)   */
+FT_TRACE_DEF( memory )    /* memory manager          (ftobjs.c)   */
+FT_TRACE_DEF( stream )    /* stream manager          (ftstream.c) */
+FT_TRACE_DEF( io )        /* i/o interface           (ftsystem.c) */
+FT_TRACE_DEF( list )      /* list management         (ftlist.c)   */
+FT_TRACE_DEF( init )      /* initialization          (ftinit.c)   */
+FT_TRACE_DEF( objs )      /* base objects            (ftobjs.c)   */
+FT_TRACE_DEF( outline )   /* outline management      (ftoutln.c)  */
+FT_TRACE_DEF( glyph )     /* glyph management        (ftglyph.c)  */
+FT_TRACE_DEF( gloader )   /* glyph loader            (ftgloadr.c) */
+
+FT_TRACE_DEF( raster )    /* monochrome rasterizer   (ftraster.c) */
+FT_TRACE_DEF( smooth )    /* anti-aliasing raster    (ftgrays.c)  */
+FT_TRACE_DEF( mm )        /* MM interface            (ftmm.c)     */
+FT_TRACE_DEF( raccess )   /* resource fork accessor  (ftrfork.c)  */
+FT_TRACE_DEF( synth )     /* bold/slant synthesizer  (ftsynth.c)  */
+FT_TRACE_DEF( bitmap )    /* bitmap checksum         (ftobjs.c)   */
+
+  /* Cache sub-system */
+FT_TRACE_DEF( cache )     /* cache sub-system        (ftcache.c, etc.) */
+
+  /* SFNT driver components */
+FT_TRACE_DEF( sfdriver )  /* SFNT font driver        (sfdriver.c) */
+FT_TRACE_DEF( sfobjs )    /* SFNT object handler     (sfobjs.c)   */
+FT_TRACE_DEF( ttcmap )    /* charmap handler         (ttcmap.c)   */
+FT_TRACE_DEF( ttkern )    /* kerning handler         (ttkern.c)   */
+FT_TRACE_DEF( ttload )    /* basic TrueType tables   (ttload.c)   */
+FT_TRACE_DEF( ttmtx )     /* metrics-related tables  (ttmtx.c)    */
+FT_TRACE_DEF( ttpost )    /* PS table processing     (ttpost.c)   */
+FT_TRACE_DEF( ttsbit )    /* TrueType sbit handling  (ttsbit.c)   */
+FT_TRACE_DEF( ttbdf )     /* TrueType embedded BDF   (ttbdf.c)    */
+
+  /* TrueType driver components */
+FT_TRACE_DEF( ttdriver )  /* TT font driver          (ttdriver.c) */
+FT_TRACE_DEF( ttgload )   /* TT glyph loader         (ttgload.c)  */
+FT_TRACE_DEF( ttinterp )  /* bytecode interpreter    (ttinterp.c) */
+FT_TRACE_DEF( ttobjs )    /* TT objects manager      (ttobjs.c)   */
+FT_TRACE_DEF( ttpload )   /* TT data/program loader  (ttpload.c)  */
+FT_TRACE_DEF( ttgxvar )   /* TrueType GX var handler (ttgxvar.c)  */
+
+  /* Type 1 driver components */
+FT_TRACE_DEF( t1afm )
+FT_TRACE_DEF( t1driver )
+FT_TRACE_DEF( t1gload )
+FT_TRACE_DEF( t1hint )
+FT_TRACE_DEF( t1load )
+FT_TRACE_DEF( t1objs )
+FT_TRACE_DEF( t1parse )
+
+  /* PostScript helper module `psaux' */
+FT_TRACE_DEF( t1decode )
+FT_TRACE_DEF( psobjs )
+FT_TRACE_DEF( psconv )
+
+  /* PostScript hinting module `pshinter' */
+FT_TRACE_DEF( pshrec )
+FT_TRACE_DEF( pshalgo1 )
+FT_TRACE_DEF( pshalgo2 )
+
+  /* Type 2 driver components */
+FT_TRACE_DEF( cffdriver )
+FT_TRACE_DEF( cffgload )
+FT_TRACE_DEF( cffload )
+FT_TRACE_DEF( cffobjs )
+FT_TRACE_DEF( cffparse )
+
+FT_TRACE_DEF( cf2blues )
+FT_TRACE_DEF( cf2hints )
+FT_TRACE_DEF( cf2interp )
+
+  /* Type 42 driver component */
+FT_TRACE_DEF( t42 )
+
+  /* CID driver components */
+FT_TRACE_DEF( cidafm )
+FT_TRACE_DEF( ciddriver )
+FT_TRACE_DEF( cidgload )
+FT_TRACE_DEF( cidload )
+FT_TRACE_DEF( cidobjs )
+FT_TRACE_DEF( cidparse )
+
+  /* Windows font component */
+FT_TRACE_DEF( winfnt )
+
+  /* PCF font components */
+FT_TRACE_DEF( pcfdriver )
+FT_TRACE_DEF( pcfread )
+
+  /* BDF font components */
+FT_TRACE_DEF( bdfdriver )
+FT_TRACE_DEF( bdflib )
+
+  /* PFR font component */
+FT_TRACE_DEF( pfr )
+
+  /* OpenType validation components */
+FT_TRACE_DEF( otvmodule )
+FT_TRACE_DEF( otvcommon )
+FT_TRACE_DEF( otvbase )
+FT_TRACE_DEF( otvgdef )
+FT_TRACE_DEF( otvgpos )
+FT_TRACE_DEF( otvgsub )
+FT_TRACE_DEF( otvjstf )
+FT_TRACE_DEF( otvmath )
+
+  /* TrueTypeGX/AAT validation components */
+FT_TRACE_DEF( gxvmodule )
+FT_TRACE_DEF( gxvcommon )
+FT_TRACE_DEF( gxvfeat )
+FT_TRACE_DEF( gxvmort )
+FT_TRACE_DEF( gxvmorx )
+FT_TRACE_DEF( gxvbsln )
+FT_TRACE_DEF( gxvjust )
+FT_TRACE_DEF( gxvkern )
+FT_TRACE_DEF( gxvopbd )
+FT_TRACE_DEF( gxvtrak )
+FT_TRACE_DEF( gxvprop )
+FT_TRACE_DEF( gxvlcar )
+
+  /* autofit components */
+FT_TRACE_DEF( afmodule )
+FT_TRACE_DEF( afhints )
+FT_TRACE_DEF( afcjk )
+FT_TRACE_DEF( aflatin )
+FT_TRACE_DEF( aflatin2 )
+FT_TRACE_DEF( afwarp )
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/fttrace.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/ftvalid.h
===================================================================
--- lib/3rdparty/freetype/include/internal/ftvalid.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/ftvalid.h	(rÃ©vision 62573)
@@ -0,0 +1,161 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftvalid.h                                                              */
+/*                                                                         */
+/*    FreeType validation support (specification).                         */
+/*                                                                         */
+/*  Copyright 2004, 2013 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FTVALID_H__
+#define __FTVALID_H__
+
+#include <ft2build.h>
+#include FT_CONFIG_STANDARD_LIBRARY_H   /* for ft_setjmp and ft_longjmp */
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /****                    V A L I D A T I O N                          ****/
+  /****                                                                 ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* handle to a validation object */
+  typedef struct FT_ValidatorRec_ volatile*  FT_Validator;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* There are three distinct validation levels defined here:              */
+  /*                                                                       */
+  /* FT_VALIDATE_DEFAULT ::                                                */
+  /*   A table that passes this validation level can be used reliably by   */
+  /*   FreeType.  It generally means that all offsets have been checked to */
+  /*   prevent out-of-bound reads, that array counts are correct, etc.     */
+  /*                                                                       */
+  /* FT_VALIDATE_TIGHT ::                                                  */
+  /*   A table that passes this validation level can be used reliably and  */
+  /*   doesn't contain invalid data.  For example, a charmap table that    */
+  /*   returns invalid glyph indices will not pass, even though it can     */
+  /*   be used with FreeType in default mode (the library will simply      */
+  /*   return an error later when trying to load the glyph).               */
+  /*                                                                       */
+  /*   It also checks that fields which must be a multiple of 2, 4, or 8,  */
+  /*   don't have incorrect values, etc.                                   */
+  /*                                                                       */
+  /* FT_VALIDATE_PARANOID ::                                               */
+  /*   Only for font debugging.  Checks that a table follows the           */
+  /*   specification by 100%.  Very few fonts will be able to pass this    */
+  /*   level anyway but it can be useful for certain tools like font       */
+  /*   editors/converters.                                                 */
+  /*                                                                       */
+  typedef enum  FT_ValidationLevel_
+  {
+    FT_VALIDATE_DEFAULT = 0,
+    FT_VALIDATE_TIGHT,
+    FT_VALIDATE_PARANOID
+
+  } FT_ValidationLevel;
+
+
+#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
+  /* We disable the warning `structure was padded due to   */
+  /* __declspec(align())' in order to compile cleanly with */
+  /* the maximum level of warnings.                        */
+#pragma warning( push )
+#pragma warning( disable : 4324 )
+#endif /* _MSC_VER */
+
+  /* validator structure */
+  typedef struct  FT_ValidatorRec_
+  {
+    const FT_Byte*      base;        /* address of table in memory       */
+    const FT_Byte*      limit;       /* `base' + sizeof(table) in memory */
+    FT_ValidationLevel  level;       /* validation level                 */
+    FT_Error            error;       /* error returned. 0 means success  */
+
+    ft_jmp_buf          jump_buffer; /* used for exception handling      */
+
+  } FT_ValidatorRec;
+
+#if defined( _MSC_VER )
+#pragma warning( pop )
+#endif
+
+#define FT_VALIDATOR( x )  ( (FT_Validator)( x ) )
+
+
+  FT_BASE( void )
+  ft_validator_init( FT_Validator        valid,
+                     const FT_Byte*      base,
+                     const FT_Byte*      limit,
+                     FT_ValidationLevel  level );
+
+  /* Do not use this. It's broken and will cause your validator to crash */
+  /* if you run it on an invalid font.                                   */
+  FT_BASE( FT_Int )
+  ft_validator_run( FT_Validator  valid );
+
+  /* Sets the error field in a validator, then calls `longjmp' to return */
+  /* to high-level caller.  Using `setjmp/longjmp' avoids many stupid    */
+  /* error checks within the validation routines.                        */
+  /*                                                                     */
+  FT_BASE( void )
+  ft_validator_error( FT_Validator  valid,
+                      FT_Error      error );
+
+
+  /* Calls ft_validate_error.  Assumes that the `valid' local variable */
+  /* holds a pointer to the current validator object.                  */
+  /*                                                                   */
+  /* Use preprocessor prescan to pass FT_ERR_PREFIX.                   */
+  /*                                                                   */
+#define FT_INVALID( _prefix, _error )  FT_INVALID_( _prefix, _error )
+#define FT_INVALID_( _prefix, _error ) \
+          ft_validator_error( valid, _prefix ## _error )
+
+  /* called when a broken table is detected */
+#define FT_INVALID_TOO_SHORT \
+          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
+
+  /* called when an invalid offset is detected */
+#define FT_INVALID_OFFSET \
+          FT_INVALID( FT_ERR_PREFIX, Invalid_Offset )
+
+  /* called when an invalid format/value is detected */
+#define FT_INVALID_FORMAT \
+          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
+
+  /* called when an invalid glyph index is detected */
+#define FT_INVALID_GLYPH_ID \
+          FT_INVALID( FT_ERR_PREFIX, Invalid_Glyph_Index )
+
+  /* called when an invalid field value is detected */
+#define FT_INVALID_DATA \
+          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
+
+
+FT_END_HEADER
+
+#endif /* __FTVALID_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/ftvalid.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/internal.h
===================================================================
--- lib/3rdparty/freetype/include/internal/internal.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/internal.h	(rÃ©vision 62573)
@@ -0,0 +1,63 @@
+/***************************************************************************/
+/*                                                                         */
+/*  internal.h                                                             */
+/*                                                                         */
+/*    Internal header files (specification only).                          */
+/*                                                                         */
+/*  Copyright 1996-2004, 2013 by                                           */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This file is automatically included by `ft2build.h'.                  */
+  /* Do not include it manually!                                           */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#define FT_INTERNAL_OBJECTS_H             <internal/ftobjs.h>
+#define FT_INTERNAL_PIC_H                 <internal/ftpic.h>
+#define FT_INTERNAL_STREAM_H              <internal/ftstream.h>
+#define FT_INTERNAL_MEMORY_H              <internal/ftmemory.h>
+#define FT_INTERNAL_DEBUG_H               <internal/ftdebug.h>
+#define FT_INTERNAL_CALC_H                <internal/ftcalc.h>
+#define FT_INTERNAL_DRIVER_H              <internal/ftdriver.h>
+#define FT_INTERNAL_TRACE_H               <internal/fttrace.h>
+#define FT_INTERNAL_GLYPH_LOADER_H        <internal/ftgloadr.h>
+#define FT_INTERNAL_SFNT_H                <internal/sfnt.h>
+#define FT_INTERNAL_SERVICE_H             <internal/ftserv.h>
+#define FT_INTERNAL_RFORK_H               <internal/ftrfork.h>
+#define FT_INTERNAL_VALIDATE_H            <internal/ftvalid.h>
+
+#define FT_INTERNAL_TRUETYPE_TYPES_H      <internal/tttypes.h>
+#define FT_INTERNAL_TYPE1_TYPES_H         <internal/t1types.h>
+
+#define FT_INTERNAL_POSTSCRIPT_AUX_H      <internal/psaux.h>
+#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <internal/pshints.h>
+#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <internal/psglobal.h>
+
+#define FT_INTERNAL_AUTOHINT_H            <internal/autohint.h>
+
+
+#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
+
+  /* We disable the warning `conditional expression is constant' here */
+  /* in order to compile cleanly with the maximum level of warnings.  */
+  /* In particular, the warning complains about stuff like `while(0)' */
+  /* which is very useful in macro definitions.  There is no benefit  */
+  /* in having it enabled.                                            */
+#pragma warning( disable : 4127 )
+
+#endif /* _MSC_VER */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/internal.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/psaux.h
===================================================================
--- lib/3rdparty/freetype/include/internal/psaux.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/psaux.h	(rÃ©vision 62573)
@@ -0,0 +1,877 @@
+/***************************************************************************/
+/*                                                                         */
+/*  psaux.h                                                                */
+/*                                                                         */
+/*    Auxiliary functions and data structures related to PostScript fonts  */
+/*    (specification).                                                     */
+/*                                                                         */
+/*  Copyright 1996-2004, 2006, 2008, 2009, 2012 by                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __PSAUX_H__
+#define __PSAUX_H__
+
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_TYPE1_TYPES_H
+#include FT_SERVICE_POSTSCRIPT_CMAPS_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                             T1_TABLE                          *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  typedef struct PS_TableRec_*              PS_Table;
+  typedef const struct PS_Table_FuncsRec_*  PS_Table_Funcs;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_Table_FuncsRec                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A set of function pointers to manage PS_Table objects.             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    table_init    :: Used to initialize a table.                       */
+  /*                                                                       */
+  /*    table_done    :: Finalizes resp. destroy a given table.            */
+  /*                                                                       */
+  /*    table_add     :: Adds a new object to a table.                     */
+  /*                                                                       */
+  /*    table_release :: Releases table data, then finalizes it.           */
+  /*                                                                       */
+  typedef struct  PS_Table_FuncsRec_
+  {
+    FT_Error
+    (*init)( PS_Table   table,
+             FT_Int     count,
+             FT_Memory  memory );
+
+    void
+    (*done)( PS_Table  table );
+
+    FT_Error
+    (*add)( PS_Table    table,
+            FT_Int      idx,
+            void*       object,
+            FT_PtrDist  length );
+
+    void
+    (*release)( PS_Table  table );
+
+  } PS_Table_FuncsRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_TableRec                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A PS_Table is a simple object used to store an array of objects in */
+  /*    a single memory block.                                             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    block     :: The address in memory of the growheap's block.  This  */
+  /*                 can change between two object adds, due to            */
+  /*                 reallocation.                                         */
+  /*                                                                       */
+  /*    cursor    :: The current top of the grow heap within its block.    */
+  /*                                                                       */
+  /*    capacity  :: The current size of the heap block.  Increments by    */
+  /*                 1kByte chunks.                                        */
+  /*                                                                       */
+  /*    init      :: Set to 0xDEADBEEF if `elements' and `lengths' have    */
+  /*                 been allocated.                                       */
+  /*                                                                       */
+  /*    max_elems :: The maximum number of elements in table.              */
+  /*                                                                       */
+  /*    num_elems :: The current number of elements in table.              */
+  /*                                                                       */
+  /*    elements  :: A table of element addresses within the block.        */
+  /*                                                                       */
+  /*    lengths   :: A table of element sizes within the block.            */
+  /*                                                                       */
+  /*    memory    :: The object used for memory operations                 */
+  /*                 (alloc/realloc).                                      */
+  /*                                                                       */
+  /*    funcs     :: A table of method pointers for this object.           */
+  /*                                                                       */
+  typedef struct  PS_TableRec_
+  {
+    FT_Byte*           block;          /* current memory block           */
+    FT_Offset          cursor;         /* current cursor in memory block */
+    FT_Offset          capacity;       /* current size of memory block   */
+    FT_Long            init;
+
+    FT_Int             max_elems;
+    FT_Int             num_elems;
+    FT_Byte**          elements;       /* addresses of table elements */
+    FT_PtrDist*        lengths;        /* lengths of table elements   */
+
+    FT_Memory          memory;
+    PS_Table_FuncsRec  funcs;
+
+  } PS_TableRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                       T1 FIELDS & TOKENS                      *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef struct PS_ParserRec_*  PS_Parser;
+
+  typedef struct T1_TokenRec_*   T1_Token;
+
+  typedef struct T1_FieldRec_*   T1_Field;
+
+
+  /* simple enumeration type used to identify token types */
+  typedef enum  T1_TokenType_
+  {
+    T1_TOKEN_TYPE_NONE = 0,
+    T1_TOKEN_TYPE_ANY,
+    T1_TOKEN_TYPE_STRING,
+    T1_TOKEN_TYPE_ARRAY,
+    T1_TOKEN_TYPE_KEY, /* aka `name' */
+
+    /* do not remove */
+    T1_TOKEN_TYPE_MAX
+
+  } T1_TokenType;
+
+
+  /* a simple structure used to identify tokens */
+  typedef struct  T1_TokenRec_
+  {
+    FT_Byte*      start;   /* first character of token in input stream */
+    FT_Byte*      limit;   /* first character after the token          */
+    T1_TokenType  type;    /* type of token                            */
+
+  } T1_TokenRec;
+
+
+  /* enumeration type used to identify object fields */
+  typedef enum  T1_FieldType_
+  {
+    T1_FIELD_TYPE_NONE = 0,
+    T1_FIELD_TYPE_BOOL,
+    T1_FIELD_TYPE_INTEGER,
+    T1_FIELD_TYPE_FIXED,
+    T1_FIELD_TYPE_FIXED_1000,
+    T1_FIELD_TYPE_STRING,
+    T1_FIELD_TYPE_KEY,
+    T1_FIELD_TYPE_BBOX,
+    T1_FIELD_TYPE_MM_BBOX,
+    T1_FIELD_TYPE_INTEGER_ARRAY,
+    T1_FIELD_TYPE_FIXED_ARRAY,
+    T1_FIELD_TYPE_CALLBACK,
+
+    /* do not remove */
+    T1_FIELD_TYPE_MAX
+
+  } T1_FieldType;
+
+
+  typedef enum  T1_FieldLocation_
+  {
+    T1_FIELD_LOCATION_CID_INFO,
+    T1_FIELD_LOCATION_FONT_DICT,
+    T1_FIELD_LOCATION_FONT_EXTRA,
+    T1_FIELD_LOCATION_FONT_INFO,
+    T1_FIELD_LOCATION_PRIVATE,
+    T1_FIELD_LOCATION_BBOX,
+    T1_FIELD_LOCATION_LOADER,
+    T1_FIELD_LOCATION_FACE,
+    T1_FIELD_LOCATION_BLEND,
+
+    /* do not remove */
+    T1_FIELD_LOCATION_MAX
+
+  } T1_FieldLocation;
+
+
+  typedef void
+  (*T1_Field_ParseFunc)( FT_Face     face,
+                         FT_Pointer  parser );
+
+
+  /* structure type used to model object fields */
+  typedef struct  T1_FieldRec_
+  {
+    const char*         ident;        /* field identifier               */
+    T1_FieldLocation    location;
+    T1_FieldType        type;         /* type of field                  */
+    T1_Field_ParseFunc  reader;
+    FT_UInt             offset;       /* offset of field in object      */
+    FT_Byte             size;         /* size of field in bytes         */
+    FT_UInt             array_max;    /* maximum number of elements for */
+                                      /* array                          */
+    FT_UInt             count_offset; /* offset of element count for    */
+                                      /* arrays; must not be zero if in */
+                                      /* use -- in other words, a       */
+                                      /* `num_FOO' element must not     */
+                                      /* start the used structure if we */
+                                      /* parse a `FOO' array            */
+    FT_UInt             dict;         /* where we expect it             */
+  } T1_FieldRec;
+
+#define T1_FIELD_DICT_FONTDICT ( 1 << 0 ) /* also FontInfo and FDArray */
+#define T1_FIELD_DICT_PRIVATE  ( 1 << 1 )
+
+
+
+#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname, _dict ) \
+          {                                                 \
+            _ident, T1CODE, _type,                          \
+            0,                                              \
+            FT_FIELD_OFFSET( _fname ),                      \
+            FT_FIELD_SIZE( _fname ),                        \
+            0, 0,                                           \
+            _dict                                           \
+          },
+
+#define T1_NEW_CALLBACK_FIELD( _ident, _reader, _dict ) \
+          {                                             \
+            _ident, T1CODE, T1_FIELD_TYPE_CALLBACK,     \
+            (T1_Field_ParseFunc)_reader,                \
+            0, 0,                                       \
+            0, 0,                                       \
+            _dict                                       \
+          },
+
+#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max, _dict ) \
+          {                                                      \
+            _ident, T1CODE, _type,                               \
+            0,                                                   \
+            FT_FIELD_OFFSET( _fname ),                           \
+            FT_FIELD_SIZE_DELTA( _fname ),                       \
+            _max,                                                \
+            FT_FIELD_OFFSET( num_ ## _fname ),                   \
+            _dict                                                \
+          },
+
+#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max, _dict ) \
+          {                                                       \
+            _ident, T1CODE, _type,                                \
+            0,                                                    \
+            FT_FIELD_OFFSET( _fname ),                            \
+            FT_FIELD_SIZE_DELTA( _fname ),                        \
+            _max, 0,                                              \
+            _dict                                                 \
+          },
+
+
+#define T1_FIELD_BOOL( _ident, _fname, _dict )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BOOL, _fname, _dict )
+
+#define T1_FIELD_NUM( _ident, _fname, _dict )                                 \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER, _fname, _dict )
+
+#define T1_FIELD_FIXED( _ident, _fname, _dict )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED, _fname, _dict )
+
+#define T1_FIELD_FIXED_1000( _ident, _fname, _dict )                     \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_1000, _fname, \
+                               _dict )
+
+#define T1_FIELD_STRING( _ident, _fname, _dict )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_STRING, _fname, _dict )
+
+#define T1_FIELD_KEY( _ident, _fname, _dict )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_KEY, _fname, _dict )
+
+#define T1_FIELD_BBOX( _ident, _fname, _dict )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BBOX, _fname, _dict )
+
+
+#define T1_FIELD_NUM_TABLE( _ident, _fname, _fmax, _dict )         \
+          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
+                              _fname, _fmax, _dict )
+
+#define T1_FIELD_FIXED_TABLE( _ident, _fname, _fmax, _dict )     \
+          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
+                              _fname, _fmax, _dict )
+
+#define T1_FIELD_NUM_TABLE2( _ident, _fname, _fmax, _dict )         \
+          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
+                               _fname, _fmax, _dict )
+
+#define T1_FIELD_FIXED_TABLE2( _ident, _fname, _fmax, _dict )     \
+          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
+                               _fname, _fmax, _dict )
+
+#define T1_FIELD_CALLBACK( _ident, _name, _dict )       \
+          T1_NEW_CALLBACK_FIELD( _ident, _name, _dict )
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                            T1 PARSER                          *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef const struct PS_Parser_FuncsRec_*  PS_Parser_Funcs;
+
+  typedef struct  PS_Parser_FuncsRec_
+  {
+    void
+    (*init)( PS_Parser  parser,
+             FT_Byte*   base,
+             FT_Byte*   limit,
+             FT_Memory  memory );
+
+    void
+    (*done)( PS_Parser  parser );
+
+    void
+    (*skip_spaces)( PS_Parser  parser );
+    void
+    (*skip_PS_token)( PS_Parser  parser );
+
+    FT_Long
+    (*to_int)( PS_Parser  parser );
+    FT_Fixed
+    (*to_fixed)( PS_Parser  parser,
+                 FT_Int     power_ten );
+
+    FT_Error
+    (*to_bytes)( PS_Parser  parser,
+                 FT_Byte*   bytes,
+                 FT_Offset  max_bytes,
+                 FT_Long*   pnum_bytes,
+                 FT_Bool    delimiters );
+
+    FT_Int
+    (*to_coord_array)( PS_Parser  parser,
+                       FT_Int     max_coords,
+                       FT_Short*  coords );
+    FT_Int
+    (*to_fixed_array)( PS_Parser  parser,
+                       FT_Int     max_values,
+                       FT_Fixed*  values,
+                       FT_Int     power_ten );
+
+    void
+    (*to_token)( PS_Parser  parser,
+                 T1_Token   token );
+    void
+    (*to_token_array)( PS_Parser  parser,
+                       T1_Token   tokens,
+                       FT_UInt    max_tokens,
+                       FT_Int*    pnum_tokens );
+
+    FT_Error
+    (*load_field)( PS_Parser       parser,
+                   const T1_Field  field,
+                   void**          objects,
+                   FT_UInt         max_objects,
+                   FT_ULong*       pflags );
+
+    FT_Error
+    (*load_field_table)( PS_Parser       parser,
+                         const T1_Field  field,
+                         void**          objects,
+                         FT_UInt         max_objects,
+                         FT_ULong*       pflags );
+
+  } PS_Parser_FuncsRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_ParserRec                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A PS_Parser is an object used to parse a Type 1 font very quickly. */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    cursor :: The current position in the text.                        */
+  /*                                                                       */
+  /*    base   :: Start of the processed text.                             */
+  /*                                                                       */
+  /*    limit  :: End of the processed text.                               */
+  /*                                                                       */
+  /*    error  :: The last error returned.                                 */
+  /*                                                                       */
+  /*    memory :: The object used for memory operations (alloc/realloc).   */
+  /*                                                                       */
+  /*    funcs  :: A table of functions for the parser.                     */
+  /*                                                                       */
+  typedef struct  PS_ParserRec_
+  {
+    FT_Byte*   cursor;
+    FT_Byte*   base;
+    FT_Byte*   limit;
+    FT_Error   error;
+    FT_Memory  memory;
+
+    PS_Parser_FuncsRec  funcs;
+
+  } PS_ParserRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                         T1 BUILDER                            *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  typedef struct T1_BuilderRec_*  T1_Builder;
+
+
+  typedef FT_Error
+  (*T1_Builder_Check_Points_Func)( T1_Builder  builder,
+                                   FT_Int      count );
+
+  typedef void
+  (*T1_Builder_Add_Point_Func)( T1_Builder  builder,
+                                FT_Pos      x,
+                                FT_Pos      y,
+                                FT_Byte     flag );
+
+  typedef FT_Error
+  (*T1_Builder_Add_Point1_Func)( T1_Builder  builder,
+                                 FT_Pos      x,
+                                 FT_Pos      y );
+
+  typedef FT_Error
+  (*T1_Builder_Add_Contour_Func)( T1_Builder  builder );
+
+  typedef FT_Error
+  (*T1_Builder_Start_Point_Func)( T1_Builder  builder,
+                                  FT_Pos      x,
+                                  FT_Pos      y );
+
+  typedef void
+  (*T1_Builder_Close_Contour_Func)( T1_Builder  builder );
+
+
+  typedef const struct T1_Builder_FuncsRec_*  T1_Builder_Funcs;
+
+  typedef struct  T1_Builder_FuncsRec_
+  {
+    void
+    (*init)( T1_Builder    builder,
+             FT_Face       face,
+             FT_Size       size,
+             FT_GlyphSlot  slot,
+             FT_Bool       hinting );
+
+    void
+    (*done)( T1_Builder   builder );
+
+    T1_Builder_Check_Points_Func   check_points;
+    T1_Builder_Add_Point_Func      add_point;
+    T1_Builder_Add_Point1_Func     add_point1;
+    T1_Builder_Add_Contour_Func    add_contour;
+    T1_Builder_Start_Point_Func    start_point;
+    T1_Builder_Close_Contour_Func  close_contour;
+
+  } T1_Builder_FuncsRec;
+
+
+  /* an enumeration type to handle charstring parsing states */
+  typedef enum  T1_ParseState_
+  {
+    T1_Parse_Start,
+    T1_Parse_Have_Width,
+    T1_Parse_Have_Moveto,
+    T1_Parse_Have_Path
+
+  } T1_ParseState;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Structure>                                                           */
+  /*    T1_BuilderRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*     A structure used during glyph loading to store its outline.       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    memory       :: The current memory object.                         */
+  /*                                                                       */
+  /*    face         :: The current face object.                           */
+  /*                                                                       */
+  /*    glyph        :: The current glyph slot.                            */
+  /*                                                                       */
+  /*    loader       :: XXX                                                */
+  /*                                                                       */
+  /*    base         :: The base glyph outline.                            */
+  /*                                                                       */
+  /*    current      :: The current glyph outline.                         */
+  /*                                                                       */
+  /*    max_points   :: maximum points in builder outline                  */
+  /*                                                                       */
+  /*    max_contours :: Maximum number of contours in builder outline.     */
+  /*                                                                       */
+  /*    pos_x        :: The horizontal translation (if composite glyph).   */
+  /*                                                                       */
+  /*    pos_y        :: The vertical translation (if composite glyph).     */
+  /*                                                                       */
+  /*    left_bearing :: The left side bearing point.                       */
+  /*                                                                       */
+  /*    advance      :: The horizontal advance vector.                     */
+  /*                                                                       */
+  /*    bbox         :: Unused.                                            */
+  /*                                                                       */
+  /*    parse_state  :: An enumeration which controls the charstring       */
+  /*                    parsing state.                                     */
+  /*                                                                       */
+  /*    load_points  :: If this flag is not set, no points are loaded.     */
+  /*                                                                       */
+  /*    no_recurse   :: Set but not used.                                  */
+  /*                                                                       */
+  /*    metrics_only :: A boolean indicating that we only want to compute  */
+  /*                    the metrics of a given glyph, not load all of its  */
+  /*                    points.                                            */
+  /*                                                                       */
+  /*    funcs        :: An array of function pointers for the builder.     */
+  /*                                                                       */
+  typedef struct  T1_BuilderRec_
+  {
+    FT_Memory       memory;
+    FT_Face         face;
+    FT_GlyphSlot    glyph;
+    FT_GlyphLoader  loader;
+    FT_Outline*     base;
+    FT_Outline*     current;
+
+    FT_Pos          pos_x;
+    FT_Pos          pos_y;
+
+    FT_Vector       left_bearing;
+    FT_Vector       advance;
+
+    FT_BBox         bbox;          /* bounding box */
+    T1_ParseState   parse_state;
+    FT_Bool         load_points;
+    FT_Bool         no_recurse;
+
+    FT_Bool         metrics_only;
+
+    void*           hints_funcs;    /* hinter-specific */
+    void*           hints_globals;  /* hinter-specific */
+
+    T1_Builder_FuncsRec  funcs;
+
+  } T1_BuilderRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                         T1 DECODER                            *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
+  /* calls during glyph loading.                                           */
+  /*                                                                       */
+#define T1_MAX_SUBRS_CALLS  8
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
+  /* minimum of 16 is required.                                            */
+  /*                                                                       */
+#define T1_MAX_CHARSTRINGS_OPERANDS  32
+
+#endif /* 0 */
+
+
+  typedef struct  T1_Decoder_ZoneRec_
+  {
+    FT_Byte*  cursor;
+    FT_Byte*  base;
+    FT_Byte*  limit;
+
+  } T1_Decoder_ZoneRec, *T1_Decoder_Zone;
+
+
+  typedef struct T1_DecoderRec_*              T1_Decoder;
+  typedef const struct T1_Decoder_FuncsRec_*  T1_Decoder_Funcs;
+
+
+  typedef FT_Error
+  (*T1_Decoder_Callback)( T1_Decoder  decoder,
+                          FT_UInt     glyph_index );
+
+
+  typedef struct  T1_Decoder_FuncsRec_
+  {
+    FT_Error
+    (*init)( T1_Decoder           decoder,
+             FT_Face              face,
+             FT_Size              size,
+             FT_GlyphSlot         slot,
+             FT_Byte**            glyph_names,
+             PS_Blend             blend,
+             FT_Bool              hinting,
+             FT_Render_Mode       hint_mode,
+             T1_Decoder_Callback  callback );
+
+    void
+    (*done)( T1_Decoder  decoder );
+
+    FT_Error
+    (*parse_charstrings)( T1_Decoder  decoder,
+                          FT_Byte*    base,
+                          FT_UInt     len );
+
+  } T1_Decoder_FuncsRec;
+
+
+  typedef struct  T1_DecoderRec_
+  {
+    T1_BuilderRec        builder;
+
+    FT_Long              stack[T1_MAX_CHARSTRINGS_OPERANDS];
+    FT_Long*             top;
+
+    T1_Decoder_ZoneRec   zones[T1_MAX_SUBRS_CALLS + 1];
+    T1_Decoder_Zone      zone;
+
+    FT_Service_PsCMaps   psnames;      /* for seac */
+    FT_UInt              num_glyphs;
+    FT_Byte**            glyph_names;
+
+    FT_Int               lenIV;        /* internal for sub routine calls */
+    FT_UInt              num_subrs;
+    FT_Byte**            subrs;
+    FT_PtrDist*          subrs_len;    /* array of subrs length (optional) */
+
+    FT_Matrix            font_matrix;
+    FT_Vector            font_offset;
+
+    FT_Int               flex_state;
+    FT_Int               num_flex_vectors;
+    FT_Vector            flex_vectors[7];
+
+    PS_Blend             blend;       /* for multiple master support */
+
+    FT_Render_Mode       hint_mode;
+
+    T1_Decoder_Callback  parse_callback;
+    T1_Decoder_FuncsRec  funcs;
+
+    FT_Long*             buildchar;
+    FT_UInt              len_buildchar;
+
+    FT_Bool              seac;
+
+  } T1_DecoderRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                            AFM PARSER                         *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef struct AFM_ParserRec_*  AFM_Parser;
+
+  typedef struct  AFM_Parser_FuncsRec_
+  {
+    FT_Error
+    (*init)( AFM_Parser  parser,
+             FT_Memory   memory,
+             FT_Byte*    base,
+             FT_Byte*    limit );
+
+    void
+    (*done)( AFM_Parser  parser );
+
+    FT_Error
+    (*parse)( AFM_Parser  parser );
+
+  } AFM_Parser_FuncsRec;
+
+
+  typedef struct AFM_StreamRec_*  AFM_Stream;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    AFM_ParserRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An AFM_Parser is a parser for the AFM files.                       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    memory    :: The object used for memory operations (alloc and      */
+  /*                 realloc).                                             */
+  /*                                                                       */
+  /*    stream    :: This is an opaque object.                             */
+  /*                                                                       */
+  /*    FontInfo  :: The result will be stored here.                       */
+  /*                                                                       */
+  /*    get_index :: A user provided function to get a glyph index by its  */
+  /*                 name.                                                 */
+  /*                                                                       */
+  typedef struct  AFM_ParserRec_
+  {
+    FT_Memory     memory;
+    AFM_Stream    stream;
+
+    AFM_FontInfo  FontInfo;
+
+    FT_Int
+    (*get_index)( const char*  name,
+                  FT_Offset    len,
+                  void*        user_data );
+
+    void*         user_data;
+
+  } AFM_ParserRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                     TYPE1 CHARMAPS                            *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef const struct T1_CMap_ClassesRec_*  T1_CMap_Classes;
+
+  typedef struct T1_CMap_ClassesRec_
+  {
+    FT_CMap_Class  standard;
+    FT_CMap_Class  expert;
+    FT_CMap_Class  custom;
+    FT_CMap_Class  unicode;
+
+  } T1_CMap_ClassesRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                        PSAux Module Interface                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef struct  PSAux_ServiceRec_
+  {
+    /* don't use `PS_Table_Funcs' and friends to avoid compiler warnings */
+    const PS_Table_FuncsRec*    ps_table_funcs;
+    const PS_Parser_FuncsRec*   ps_parser_funcs;
+    const T1_Builder_FuncsRec*  t1_builder_funcs;
+    const T1_Decoder_FuncsRec*  t1_decoder_funcs;
+
+    void
+    (*t1_decrypt)( FT_Byte*   buffer,
+                   FT_Offset  length,
+                   FT_UShort  seed );
+
+    T1_CMap_Classes  t1_cmap_classes;
+
+    /* fields after this comment line were added after version 2.1.10 */
+    const AFM_Parser_FuncsRec*  afm_parser_funcs;
+
+  } PSAux_ServiceRec, *PSAux_Service;
+
+  /* backwards-compatible type definition */
+  typedef PSAux_ServiceRec   PSAux_Interface;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                 Some convenience functions                    *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+#define IS_PS_NEWLINE( ch ) \
+  ( (ch) == '\r' ||         \
+    (ch) == '\n' )
+
+#define IS_PS_SPACE( ch )  \
+  ( (ch) == ' '         || \
+    IS_PS_NEWLINE( ch ) || \
+    (ch) == '\t'        || \
+    (ch) == '\f'        || \
+    (ch) == '\0' )
+
+#define IS_PS_SPECIAL( ch )       \
+  ( (ch) == '/'                || \
+    (ch) == '(' || (ch) == ')' || \
+    (ch) == '<' || (ch) == '>' || \
+    (ch) == '[' || (ch) == ']' || \
+    (ch) == '{' || (ch) == '}' || \
+    (ch) == '%'                )
+
+#define IS_PS_DELIM( ch )  \
+  ( IS_PS_SPACE( ch )   || \
+    IS_PS_SPECIAL( ch ) )
+
+#define IS_PS_DIGIT( ch )        \
+  ( (ch) >= '0' && (ch) <= '9' )
+
+#define IS_PS_XDIGIT( ch )            \
+  ( IS_PS_DIGIT( ch )              || \
+    ( (ch) >= 'A' && (ch) <= 'F' ) || \
+    ( (ch) >= 'a' && (ch) <= 'f' ) )
+
+#define IS_PS_BASE85( ch )       \
+  ( (ch) >= '!' && (ch) <= 'u' )
+
+#define IS_PS_TOKEN( cur, limit, token )                                \
+  ( (char)(cur)[0] == (token)[0]                                     && \
+    ( (cur) + sizeof ( (token) ) == (limit) ||                          \
+      ( (cur) + sizeof( (token) ) < (limit)          &&                 \
+        IS_PS_DELIM( (cur)[sizeof ( (token) ) - 1] ) ) )             && \
+    ft_strncmp( (char*)(cur), (token), sizeof ( (token) ) - 1 ) == 0 )
+
+
+FT_END_HEADER
+
+#endif /* __PSAUX_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/psaux.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/pshints.h
===================================================================
--- lib/3rdparty/freetype/include/internal/pshints.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/pshints.h	(rÃ©vision 62573)
@@ -0,0 +1,722 @@
+/***************************************************************************/
+/*                                                                         */
+/*  pshints.h                                                              */
+/*                                                                         */
+/*    Interface to Postscript-specific (Type 1 and Type 2) hints           */
+/*    recorders (specification only).  These are used to support native    */
+/*    T1/T2 hints in the `type1', `cid', and `cff' font drivers.           */
+/*                                                                         */
+/*  Copyright 2001-2003, 2005-2007, 2009, 2012 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __PSHINTS_H__
+#define __PSHINTS_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TYPE1_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****               INTERNAL REPRESENTATION OF GLOBALS              *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef struct PSH_GlobalsRec_*  PSH_Globals;
+
+  typedef FT_Error
+  (*PSH_Globals_NewFunc)( FT_Memory     memory,
+                          T1_Private*   private_dict,
+                          PSH_Globals*  aglobals );
+
+  typedef FT_Error
+  (*PSH_Globals_SetScaleFunc)( PSH_Globals  globals,
+                               FT_Fixed     x_scale,
+                               FT_Fixed     y_scale,
+                               FT_Fixed     x_delta,
+                               FT_Fixed     y_delta );
+
+  typedef void
+  (*PSH_Globals_DestroyFunc)( PSH_Globals  globals );
+
+
+  typedef struct  PSH_Globals_FuncsRec_
+  {
+    PSH_Globals_NewFunc       create;
+    PSH_Globals_SetScaleFunc  set_scale;
+    PSH_Globals_DestroyFunc   destroy;
+
+  } PSH_Globals_FuncsRec, *PSH_Globals_Funcs;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                  PUBLIC TYPE 1 HINTS RECORDER                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*************************************************************************
+   *
+   * @type:
+   *   T1_Hints
+   *
+   * @description:
+   *   This is a handle to an opaque structure used to record glyph hints
+   *   from a Type 1 character glyph character string.
+   *
+   *   The methods used to operate on this object are defined by the
+   *   @T1_Hints_FuncsRec structure.  Recording glyph hints is normally
+   *   achieved through the following scheme:
+   *
+   *   - Open a new hint recording session by calling the `open' method.
+   *     This rewinds the recorder and prepare it for new input.
+   *
+   *   - For each hint found in the glyph charstring, call the corresponding
+   *     method (`stem', `stem3', or `reset').  Note that these functions do
+   *     not return an error code.
+   *
+   *   - Close the recording session by calling the `close' method.  It
+   *     returns an error code if the hints were invalid or something
+   *     strange happened (e.g., memory shortage).
+   *
+   *   The hints accumulated in the object can later be used by the
+   *   PostScript hinter.
+   *
+   */
+  typedef struct T1_HintsRec_*  T1_Hints;
+
+
+  /*************************************************************************
+   *
+   * @type:
+   *   T1_Hints_Funcs
+   *
+   * @description:
+   *   A pointer to the @T1_Hints_FuncsRec structure that defines the API of
+   *   a given @T1_Hints object.
+   *
+   */
+  typedef const struct T1_Hints_FuncsRec_*  T1_Hints_Funcs;
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T1_Hints_OpenFunc
+   *
+   * @description:
+   *   A method of the @T1_Hints class used to prepare it for a new Type 1
+   *   hints recording session.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 1 hints recorder.
+   *
+   * @note:
+   *   You should always call the @T1_Hints_CloseFunc method in order to
+   *   close an opened recording session.
+   *
+   */
+  typedef void
+  (*T1_Hints_OpenFunc)( T1_Hints  hints );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T1_Hints_SetStemFunc
+   *
+   * @description:
+   *   A method of the @T1_Hints class used to record a new horizontal or
+   *   vertical stem.  This corresponds to the Type 1 `hstem' and `vstem'
+   *   operators.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 1 hints recorder.
+   *
+   *   dimension ::
+   *     0 for horizontal stems (hstem), 1 for vertical ones (vstem).
+   *
+   *   coords ::
+   *     Array of 2 coordinates in 16.16 format, used as (position,length)
+   *     stem descriptor.
+   *
+   * @note:
+   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
+   *   horizontal coordinates (x) for vertical stems (dim=1).
+   *
+   *   `coords[0]' is the absolute stem position (lowest coordinate);
+   *   `coords[1]' is the length.
+   *
+   *   The length can be negative, in which case it must be either -20 or
+   *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
+   *   specification.
+   *
+   *   If the length is -21 (corresponding to a bottom ghost stem), then
+   *   the real stem position is `coords[0]+coords[1]'.
+   *
+   */
+  typedef void
+  (*T1_Hints_SetStemFunc)( T1_Hints   hints,
+                           FT_UInt    dimension,
+                           FT_Fixed*  coords );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T1_Hints_SetStem3Func
+   *
+   * @description:
+   *   A method of the @T1_Hints class used to record three
+   *   counter-controlled horizontal or vertical stems at once.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 1 hints recorder.
+   *
+   *   dimension ::
+   *     0 for horizontal stems, 1 for vertical ones.
+   *
+   *   coords ::
+   *     An array of 6 values in 16.16 format, holding 3 (position,length)
+   *     pairs for the counter-controlled stems.
+   *
+   * @note:
+   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
+   *   horizontal coordinates (x) for vertical stems (dim=1).
+   *
+   *   The lengths cannot be negative (ghost stems are never
+   *   counter-controlled).
+   *
+   */
+  typedef void
+  (*T1_Hints_SetStem3Func)( T1_Hints   hints,
+                            FT_UInt    dimension,
+                            FT_Fixed*  coords );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T1_Hints_ResetFunc
+   *
+   * @description:
+   *   A method of the @T1_Hints class used to reset the stems hints in a
+   *   recording session.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 1 hints recorder.
+   *
+   *   end_point ::
+   *     The index of the last point in the input glyph in which the
+   *     previously defined hints apply.
+   *
+   */
+  typedef void
+  (*T1_Hints_ResetFunc)( T1_Hints  hints,
+                         FT_UInt   end_point );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T1_Hints_CloseFunc
+   *
+   * @description:
+   *   A method of the @T1_Hints class used to close a hint recording
+   *   session.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 1 hints recorder.
+   *
+   *   end_point ::
+   *     The index of the last point in the input glyph.
+   *
+   * @return:
+   *   FreeType error code.  0 means success.
+   *
+   * @note:
+   *   The error code is set to indicate that an error occurred during the
+   *   recording session.
+   *
+   */
+  typedef FT_Error
+  (*T1_Hints_CloseFunc)( T1_Hints  hints,
+                         FT_UInt   end_point );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T1_Hints_ApplyFunc
+   *
+   * @description:
+   *   A method of the @T1_Hints class used to apply hints to the
+   *   corresponding glyph outline.  Must be called once all hints have been
+   *   recorded.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 1 hints recorder.
+   *
+   *   outline ::
+   *     A pointer to the target outline descriptor.
+   *
+   *   globals ::
+   *     The hinter globals for this font.
+   *
+   *   hint_mode ::
+   *     Hinting information.
+   *
+   * @return:
+   *   FreeType error code.  0 means success.
+   *
+   * @note:
+   *   On input, all points within the outline are in font coordinates. On
+   *   output, they are in 1/64th of pixels.
+   *
+   *   The scaling transformation is taken from the `globals' object which
+   *   must correspond to the same font as the glyph.
+   *
+   */
+  typedef FT_Error
+  (*T1_Hints_ApplyFunc)( T1_Hints        hints,
+                         FT_Outline*     outline,
+                         PSH_Globals     globals,
+                         FT_Render_Mode  hint_mode );
+
+
+  /*************************************************************************
+   *
+   * @struct:
+   *   T1_Hints_FuncsRec
+   *
+   * @description:
+   *   The structure used to provide the API to @T1_Hints objects.
+   *
+   * @fields:
+   *   hints ::
+   *     A handle to the T1 Hints recorder.
+   *
+   *   open ::
+   *     The function to open a recording session.
+   *
+   *   close ::
+   *     The function to close a recording session.
+   *
+   *   stem ::
+   *     The function to set a simple stem.
+   *
+   *   stem3 ::
+   *     The function to set counter-controlled stems.
+   *
+   *   reset ::
+   *     The function to reset stem hints.
+   *
+   *   apply ::
+   *     The function to apply the hints to the corresponding glyph outline.
+   *
+   */
+  typedef struct  T1_Hints_FuncsRec_
+  {
+    T1_Hints               hints;
+    T1_Hints_OpenFunc      open;
+    T1_Hints_CloseFunc     close;
+    T1_Hints_SetStemFunc   stem;
+    T1_Hints_SetStem3Func  stem3;
+    T1_Hints_ResetFunc     reset;
+    T1_Hints_ApplyFunc     apply;
+
+  } T1_Hints_FuncsRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                  PUBLIC TYPE 2 HINTS RECORDER                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*************************************************************************
+   *
+   * @type:
+   *   T2_Hints
+   *
+   * @description:
+   *   This is a handle to an opaque structure used to record glyph hints
+   *   from a Type 2 character glyph character string.
+   *
+   *   The methods used to operate on this object are defined by the
+   *   @T2_Hints_FuncsRec structure.  Recording glyph hints is normally
+   *   achieved through the following scheme:
+   *
+   *   - Open a new hint recording session by calling the `open' method.
+   *     This rewinds the recorder and prepare it for new input.
+   *
+   *   - For each hint found in the glyph charstring, call the corresponding
+   *     method (`stems', `hintmask', `counters').  Note that these
+   *     functions do not return an error code.
+   *
+   *   - Close the recording session by calling the `close' method.  It
+   *     returns an error code if the hints were invalid or something
+   *     strange happened (e.g., memory shortage).
+   *
+   *   The hints accumulated in the object can later be used by the
+   *   Postscript hinter.
+   *
+   */
+  typedef struct T2_HintsRec_*  T2_Hints;
+
+
+  /*************************************************************************
+   *
+   * @type:
+   *   T2_Hints_Funcs
+   *
+   * @description:
+   *   A pointer to the @T2_Hints_FuncsRec structure that defines the API of
+   *   a given @T2_Hints object.
+   *
+   */
+  typedef const struct T2_Hints_FuncsRec_*  T2_Hints_Funcs;
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T2_Hints_OpenFunc
+   *
+   * @description:
+   *   A method of the @T2_Hints class used to prepare it for a new Type 2
+   *   hints recording session.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 2 hints recorder.
+   *
+   * @note:
+   *   You should always call the @T2_Hints_CloseFunc method in order to
+   *   close an opened recording session.
+   *
+   */
+  typedef void
+  (*T2_Hints_OpenFunc)( T2_Hints  hints );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T2_Hints_StemsFunc
+   *
+   * @description:
+   *   A method of the @T2_Hints class used to set the table of stems in
+   *   either the vertical or horizontal dimension.  Equivalent to the
+   *   `hstem', `vstem', `hstemhm', and `vstemhm' Type 2 operators.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 2 hints recorder.
+   *
+   *   dimension ::
+   *     0 for horizontal stems (hstem), 1 for vertical ones (vstem).
+   *
+   *   count ::
+   *     The number of stems.
+   *
+   *   coords ::
+   *     An array of `count' (position,length) pairs in 16.16 format.
+   *
+   * @note:
+   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
+   *   horizontal coordinates (x) for vertical stems (dim=1).
+   *
+   *   There are `2*count' elements in the `coords' array.  Each even
+   *   element is an absolute position in font units, each odd element is a
+   *   length in font units.
+   *
+   *   A length can be negative, in which case it must be either -20 or
+   *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
+   *   specification.
+   *
+   */
+  typedef void
+  (*T2_Hints_StemsFunc)( T2_Hints   hints,
+                         FT_UInt    dimension,
+                         FT_UInt    count,
+                         FT_Fixed*  coordinates );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T2_Hints_MaskFunc
+   *
+   * @description:
+   *   A method of the @T2_Hints class used to set a given hintmask (this
+   *   corresponds to the `hintmask' Type 2 operator).
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 2 hints recorder.
+   *
+   *   end_point ::
+   *     The glyph index of the last point to which the previously defined
+   *     or activated hints apply.
+   *
+   *   bit_count ::
+   *     The number of bits in the hint mask.
+   *
+   *   bytes ::
+   *     An array of bytes modelling the hint mask.
+   *
+   * @note:
+   *   If the hintmask starts the charstring (before any glyph point
+   *   definition), the value of `end_point' should be 0.
+   *
+   *   `bit_count' is the number of meaningful bits in the `bytes' array; it
+   *   must be equal to the total number of hints defined so far (i.e.,
+   *   horizontal+verticals).
+   *
+   *   The `bytes' array can come directly from the Type 2 charstring and
+   *   respects the same format.
+   *
+   */
+  typedef void
+  (*T2_Hints_MaskFunc)( T2_Hints        hints,
+                        FT_UInt         end_point,
+                        FT_UInt         bit_count,
+                        const FT_Byte*  bytes );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T2_Hints_CounterFunc
+   *
+   * @description:
+   *   A method of the @T2_Hints class used to set a given counter mask
+   *   (this corresponds to the `hintmask' Type 2 operator).
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 2 hints recorder.
+   *
+   *   end_point ::
+   *     A glyph index of the last point to which the previously defined or
+   *     active hints apply.
+   *
+   *   bit_count ::
+   *     The number of bits in the hint mask.
+   *
+   *   bytes ::
+   *     An array of bytes modelling the hint mask.
+   *
+   * @note:
+   *   If the hintmask starts the charstring (before any glyph point
+   *   definition), the value of `end_point' should be 0.
+   *
+   *   `bit_count' is the number of meaningful bits in the `bytes' array; it
+   *   must be equal to the total number of hints defined so far (i.e.,
+   *   horizontal+verticals).
+   *
+   *    The `bytes' array can come directly from the Type 2 charstring and
+   *    respects the same format.
+   *
+   */
+  typedef void
+  (*T2_Hints_CounterFunc)( T2_Hints        hints,
+                           FT_UInt         bit_count,
+                           const FT_Byte*  bytes );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T2_Hints_CloseFunc
+   *
+   * @description:
+   *   A method of the @T2_Hints class used to close a hint recording
+   *   session.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 2 hints recorder.
+   *
+   *   end_point ::
+   *     The index of the last point in the input glyph.
+   *
+   * @return:
+   *   FreeType error code.  0 means success.
+   *
+   * @note:
+   *   The error code is set to indicate that an error occurred during the
+   *   recording session.
+   *
+   */
+  typedef FT_Error
+  (*T2_Hints_CloseFunc)( T2_Hints  hints,
+                         FT_UInt   end_point );
+
+
+  /*************************************************************************
+   *
+   * @functype:
+   *   T2_Hints_ApplyFunc
+   *
+   * @description:
+   *   A method of the @T2_Hints class used to apply hints to the
+   *   corresponding glyph outline.  Must be called after the `close'
+   *   method.
+   *
+   * @input:
+   *   hints ::
+   *     A handle to the Type 2 hints recorder.
+   *
+   *   outline ::
+   *     A pointer to the target outline descriptor.
+   *
+   *   globals ::
+   *     The hinter globals for this font.
+   *
+   *   hint_mode ::
+   *     Hinting information.
+   *
+   * @return:
+   *   FreeType error code.  0 means success.
+   *
+   * @note:
+   *   On input, all points within the outline are in font coordinates. On
+   *   output, they are in 1/64th of pixels.
+   *
+   *   The scaling transformation is taken from the `globals' object which
+   *   must correspond to the same font than the glyph.
+   *
+   */
+  typedef FT_Error
+  (*T2_Hints_ApplyFunc)( T2_Hints        hints,
+                         FT_Outline*     outline,
+                         PSH_Globals     globals,
+                         FT_Render_Mode  hint_mode );
+
+
+  /*************************************************************************
+   *
+   * @struct:
+   *   T2_Hints_FuncsRec
+   *
+   * @description:
+   *   The structure used to provide the API to @T2_Hints objects.
+   *
+   * @fields:
+   *   hints ::
+   *     A handle to the T2 hints recorder object.
+   *
+   *   open ::
+   *     The function to open a recording session.
+   *
+   *   close ::
+   *     The function to close a recording session.
+   *
+   *   stems ::
+   *     The function to set the dimension's stems table.
+   *
+   *   hintmask ::
+   *     The function to set hint masks.
+   *
+   *   counter ::
+   *     The function to set counter masks.
+   *
+   *   apply ::
+   *     The function to apply the hints on the corresponding glyph outline.
+   *
+   */
+  typedef struct  T2_Hints_FuncsRec_
+  {
+    T2_Hints              hints;
+    T2_Hints_OpenFunc     open;
+    T2_Hints_CloseFunc    close;
+    T2_Hints_StemsFunc    stems;
+    T2_Hints_MaskFunc     hintmask;
+    T2_Hints_CounterFunc  counter;
+    T2_Hints_ApplyFunc    apply;
+
+  } T2_Hints_FuncsRec;
+
+
+  /* */
+
+
+  typedef struct  PSHinter_Interface_
+  {
+    PSH_Globals_Funcs  (*get_globals_funcs)( FT_Module  module );
+    T1_Hints_Funcs     (*get_t1_funcs)     ( FT_Module  module );
+    T2_Hints_Funcs     (*get_t2_funcs)     ( FT_Module  module );
+
+  } PSHinter_Interface;
+
+  typedef PSHinter_Interface*  PSHinter_Service;
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_PSHINTER_INTERFACE(        \
+          class_,                            \
+          get_globals_funcs_,                \
+          get_t1_funcs_,                     \
+          get_t2_funcs_ )                    \
+  static const PSHinter_Interface  class_ =  \
+  {                                          \
+    get_globals_funcs_,                      \
+    get_t1_funcs_,                           \
+    get_t2_funcs_                            \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_PSHINTER_INTERFACE(                      \
+          class_,                                          \
+          get_globals_funcs_,                              \
+          get_t1_funcs_,                                   \
+          get_t2_funcs_ )                                  \
+  void                                                     \
+  FT_Init_Class_ ## class_( FT_Library           library,  \
+                            PSHinter_Interface*  clazz )   \
+  {                                                        \
+    FT_UNUSED( library );                                  \
+                                                           \
+    clazz->get_globals_funcs = get_globals_funcs_;         \
+    clazz->get_t1_funcs      = get_t1_funcs_;              \
+    clazz->get_t2_funcs      = get_t2_funcs_;              \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+FT_END_HEADER
+
+#endif /* __PSHINTS_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/pshints.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svbdf.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svbdf.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svbdf.h	(rÃ©vision 62573)
@@ -0,0 +1,82 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svbdf.h                                                                */
+/*                                                                         */
+/*    The FreeType BDF services (specification).                           */
+/*                                                                         */
+/*  Copyright 2003, 2009, 2012 by                                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVBDF_H__
+#define __SVBDF_H__
+
+#include FT_BDF_H
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_BDF  "bdf"
+
+  typedef FT_Error
+  (*FT_BDF_GetCharsetIdFunc)( FT_Face       face,
+                              const char*  *acharset_encoding,
+                              const char*  *acharset_registry );
+
+  typedef FT_Error
+  (*FT_BDF_GetPropertyFunc)( FT_Face           face,
+                             const char*       prop_name,
+                             BDF_PropertyRec  *aproperty );
+
+
+  FT_DEFINE_SERVICE( BDF )
+  {
+    FT_BDF_GetCharsetIdFunc  get_charset_id;
+    FT_BDF_GetPropertyFunc   get_property;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
+                                  get_charset_id_,                       \
+                                  get_property_ )                        \
+  static const FT_Service_BDFRec  class_ =                               \
+  {                                                                      \
+    get_charset_id_, get_property_                                       \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
+                                  get_charset_id_,                       \
+                                  get_property_ )                        \
+  void                                                                   \
+  FT_Init_Class_ ## class_( FT_Service_BDFRec*  clazz )                  \
+  {                                                                      \
+    clazz->get_charset_id = get_charset_id_;                             \
+    clazz->get_property   = get_property_;                               \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVBDF_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svbdf.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svcid.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svcid.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svcid.h	(rÃ©vision 62573)
@@ -0,0 +1,89 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svcid.h                                                                */
+/*                                                                         */
+/*    The FreeType CID font services (specification).                      */
+/*                                                                         */
+/*  Copyright 2007, 2009, 2012 by Derek Clegg, Michael Toftdal.            */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVCID_H__
+#define __SVCID_H__
+
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_CID  "CID"
+
+  typedef FT_Error
+  (*FT_CID_GetRegistryOrderingSupplementFunc)( FT_Face       face,
+                                               const char*  *registry,
+                                               const char*  *ordering,
+                                               FT_Int       *supplement );
+  typedef FT_Error
+  (*FT_CID_GetIsInternallyCIDKeyedFunc)( FT_Face   face,
+                                         FT_Bool  *is_cid );
+  typedef FT_Error
+  (*FT_CID_GetCIDFromGlyphIndexFunc)( FT_Face   face,
+                                      FT_UInt   glyph_index,
+                                      FT_UInt  *cid );
+
+  FT_DEFINE_SERVICE( CID )
+  {
+    FT_CID_GetRegistryOrderingSupplementFunc  get_ros;
+    FT_CID_GetIsInternallyCIDKeyedFunc        get_is_cid;
+    FT_CID_GetCIDFromGlyphIndexFunc           get_cid_from_glyph_index;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
+                                  get_ros_,                                 \
+                                  get_is_cid_,                              \
+                                  get_cid_from_glyph_index_ )               \
+  static const FT_Service_CIDRec class_ =                                   \
+  {                                                                         \
+    get_ros_, get_is_cid_, get_cid_from_glyph_index_                        \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
+                                  get_ros_,                                 \
+                                  get_is_cid_,                              \
+                                  get_cid_from_glyph_index_ )               \
+  void                                                                      \
+  FT_Init_Class_ ## class_( FT_Library          library,                    \
+                            FT_Service_CIDRec*  clazz )                     \
+  {                                                                         \
+    FT_UNUSED( library );                                                   \
+                                                                            \
+    clazz->get_ros                  = get_ros_;                             \
+    clazz->get_is_cid               = get_is_cid_;                          \
+    clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_;            \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVCID_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svcid.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svgldict.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svgldict.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svgldict.h	(rÃ©vision 62573)
@@ -0,0 +1,88 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svgldict.h                                                             */
+/*                                                                         */
+/*    The FreeType glyph dictionary services (specification).              */
+/*                                                                         */
+/*  Copyright 2003, 2009, 2012 by                                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVGLDICT_H__
+#define __SVGLDICT_H__
+
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*
+   *  A service used to retrieve glyph names, as well as to find the
+   *  index of a given glyph name in a font.
+   *
+   */
+
+#define FT_SERVICE_ID_GLYPH_DICT  "glyph-dict"
+
+
+  typedef FT_Error
+  (*FT_GlyphDict_GetNameFunc)( FT_Face     face,
+                               FT_UInt     glyph_index,
+                               FT_Pointer  buffer,
+                               FT_UInt     buffer_max );
+
+  typedef FT_UInt
+  (*FT_GlyphDict_NameIndexFunc)( FT_Face     face,
+                                 FT_String*  glyph_name );
+
+
+  FT_DEFINE_SERVICE( GlyphDict )
+  {
+    FT_GlyphDict_GetNameFunc    get_name;
+    FT_GlyphDict_NameIndexFunc  name_index;  /* optional */
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
+                                        get_name_,                     \
+                                        name_index_)                   \
+  static const FT_Service_GlyphDictRec  class_ =                       \
+  {                                                                    \
+    get_name_, name_index_                                             \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
+                                        get_name_,                     \
+                                        name_index_)                   \
+  void                                                                 \
+  FT_Init_Class_ ## class_( FT_Library                library,         \
+                            FT_Service_GlyphDictRec*  clazz )          \
+  {                                                                    \
+    FT_UNUSED( library );                                              \
+                                                                       \
+    clazz->get_name   = get_name_;                                     \
+    clazz->name_index = name_index_;                                   \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVGLDICT_H__ */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svgldict.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svgxval.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svgxval.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svgxval.h	(rÃ©vision 62573)
@@ -0,0 +1,72 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svgxval.h                                                              */
+/*                                                                         */
+/*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
+/*                                                                         */
+/*  Copyright 2004, 2005 by                                                */
+/*  Masatake YAMATO, Red Hat K.K.,                                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/***************************************************************************/
+/*                                                                         */
+/* gxvalid is derived from both gxlayout module and otvalid module.        */
+/* Development of gxlayout is supported by the Information-technology      */
+/* Promotion Agency(IPA), Japan.                                           */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVGXVAL_H__
+#define __SVGXVAL_H__
+
+#include FT_GX_VALIDATE_H
+#include FT_INTERNAL_VALIDATE_H
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_GX_VALIDATE           "truetypegx-validate"
+#define FT_SERVICE_ID_CLASSICKERN_VALIDATE  "classickern-validate"
+
+  typedef FT_Error
+  (*gxv_validate_func)( FT_Face   face,
+                        FT_UInt   gx_flags,
+                        FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
+                        FT_UInt   table_length );
+
+
+  typedef FT_Error
+  (*ckern_validate_func)( FT_Face   face,
+                          FT_UInt   ckern_flags,
+                          FT_Bytes  *ckern_table );
+
+
+  FT_DEFINE_SERVICE( GXvalidate )
+  {
+    gxv_validate_func  validate;
+  };
+
+  FT_DEFINE_SERVICE( CKERNvalidate )
+  {
+    ckern_validate_func  validate;
+  };
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVGXVAL_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svgxval.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svkern.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svkern.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svkern.h	(rÃ©vision 62573)
@@ -0,0 +1,51 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svkern.h                                                               */
+/*                                                                         */
+/*    The FreeType Kerning service (specification).                        */
+/*                                                                         */
+/*  Copyright 2006 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVKERN_H__
+#define __SVKERN_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_TRUETYPE_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+#define FT_SERVICE_ID_KERNING  "kerning"
+
+
+  typedef FT_Error
+  (*FT_Kerning_TrackGetFunc)( FT_Face    face,
+                              FT_Fixed   point_size,
+                              FT_Int     degree,
+                              FT_Fixed*  akerning );
+
+  FT_DEFINE_SERVICE( Kerning )
+  {
+    FT_Kerning_TrackGetFunc  get_track;
+  };
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVKERN_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svkern.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svmm.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svmm.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svmm.h	(rÃ©vision 62573)
@@ -0,0 +1,113 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svmm.h                                                                 */
+/*                                                                         */
+/*    The FreeType Multiple Masters and GX var services (specification).   */
+/*                                                                         */
+/*  Copyright 2003, 2004, 2009, 2012 by                                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVMM_H__
+#define __SVMM_H__
+
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*
+   *  A service used to manage multiple-masters data in a given face.
+   *
+   *  See the related APIs in `ftmm.h' (FT_MULTIPLE_MASTERS_H).
+   *
+   */
+
+#define FT_SERVICE_ID_MULTI_MASTERS  "multi-masters"
+
+
+  typedef FT_Error
+  (*FT_Get_MM_Func)( FT_Face           face,
+                     FT_Multi_Master*  master );
+
+  typedef FT_Error
+  (*FT_Get_MM_Var_Func)( FT_Face      face,
+                         FT_MM_Var*  *master );
+
+  typedef FT_Error
+  (*FT_Set_MM_Design_Func)( FT_Face   face,
+                            FT_UInt   num_coords,
+                            FT_Long*  coords );
+
+  typedef FT_Error
+  (*FT_Set_Var_Design_Func)( FT_Face    face,
+                             FT_UInt    num_coords,
+                             FT_Fixed*  coords );
+
+  typedef FT_Error
+  (*FT_Set_MM_Blend_Func)( FT_Face   face,
+                           FT_UInt   num_coords,
+                           FT_Long*  coords );
+
+
+  FT_DEFINE_SERVICE( MultiMasters )
+  {
+    FT_Get_MM_Func          get_mm;
+    FT_Set_MM_Design_Func   set_mm_design;
+    FT_Set_MM_Blend_Func    set_mm_blend;
+    FT_Get_MM_Var_Func      get_mm_var;
+    FT_Set_Var_Design_Func  set_var_design;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
+                                           get_mm_,                         \
+                                           set_mm_design_,                  \
+                                           set_mm_blend_,                   \
+                                           get_mm_var_,                     \
+                                           set_var_design_ )                \
+  static const FT_Service_MultiMastersRec  class_ =                         \
+  {                                                                         \
+    get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_    \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
+                                           get_mm_,                         \
+                                           set_mm_design_,                  \
+                                           set_mm_blend_,                   \
+                                           get_mm_var_,                     \
+                                           set_var_design_ )                \
+  void                                                                      \
+  FT_Init_Class_ ## class_( FT_Service_MultiMastersRec*  clazz )            \
+  {                                                                         \
+    clazz->get_mm         = get_mm_;                                        \
+    clazz->set_mm_design  = set_mm_design_;                                 \
+    clazz->set_mm_blend   = set_mm_blend_;                                  \
+    clazz->get_mm_var     = get_mm_var_;                                    \
+    clazz->set_var_design = set_var_design_;                                \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __SVMM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svmm.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svotval.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svotval.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svotval.h	(rÃ©vision 62573)
@@ -0,0 +1,55 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svotval.h                                                              */
+/*                                                                         */
+/*    The FreeType OpenType validation service (specification).            */
+/*                                                                         */
+/*  Copyright 2004, 2006 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVOTVAL_H__
+#define __SVOTVAL_H__
+
+#include FT_OPENTYPE_VALIDATE_H
+#include FT_INTERNAL_VALIDATE_H
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_OPENTYPE_VALIDATE  "opentype-validate"
+
+
+  typedef FT_Error
+  (*otv_validate_func)( FT_Face volatile  face,
+                        FT_UInt           ot_flags,
+                        FT_Bytes         *base,
+                        FT_Bytes         *gdef,
+                        FT_Bytes         *gpos,
+                        FT_Bytes         *gsub,
+                        FT_Bytes         *jstf );
+
+
+  FT_DEFINE_SERVICE( OTvalidate )
+  {
+    otv_validate_func  validate;
+  };
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVOTVAL_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svotval.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svpfr.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svpfr.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svpfr.h	(rÃ©vision 62573)
@@ -0,0 +1,66 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svpfr.h                                                                */
+/*                                                                         */
+/*    Internal PFR service functions (specification).                      */
+/*                                                                         */
+/*  Copyright 2003, 2006 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVPFR_H__
+#define __SVPFR_H__
+
+#include FT_PFR_H
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_PFR_METRICS  "pfr-metrics"
+
+
+  typedef FT_Error
+  (*FT_PFR_GetMetricsFunc)( FT_Face    face,
+                            FT_UInt   *aoutline,
+                            FT_UInt   *ametrics,
+                            FT_Fixed  *ax_scale,
+                            FT_Fixed  *ay_scale );
+
+  typedef FT_Error
+  (*FT_PFR_GetKerningFunc)( FT_Face     face,
+                            FT_UInt     left,
+                            FT_UInt     right,
+                            FT_Vector  *avector );
+
+  typedef FT_Error
+  (*FT_PFR_GetAdvanceFunc)( FT_Face   face,
+                            FT_UInt   gindex,
+                            FT_Pos   *aadvance );
+
+
+  FT_DEFINE_SERVICE( PfrMetrics )
+  {
+    FT_PFR_GetMetricsFunc  get_metrics;
+    FT_PFR_GetKerningFunc  get_kerning;
+    FT_PFR_GetAdvanceFunc  get_advance;
+
+  };
+
+ /* */
+
+FT_END_HEADER
+
+#endif /* __SVPFR_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svpfr.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svpostnm.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svpostnm.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svpostnm.h	(rÃ©vision 62573)
@@ -0,0 +1,81 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svpostnm.h                                                             */
+/*                                                                         */
+/*    The FreeType PostScript name services (specification).               */
+/*                                                                         */
+/*  Copyright 2003, 2007, 2009, 2012 by                                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVPOSTNM_H__
+#define __SVPOSTNM_H__
+
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+  /*
+   *  A trivial service used to retrieve the PostScript name of a given
+   *  font when available.  The `get_name' field should never be NULL.
+   *
+   *  The corresponding function can return NULL to indicate that the
+   *  PostScript name is not available.
+   *
+   *  The name is owned by the face and will be destroyed with it.
+   */
+
+#define FT_SERVICE_ID_POSTSCRIPT_FONT_NAME  "postscript-font-name"
+
+
+  typedef const char*
+  (*FT_PsName_GetFunc)( FT_Face  face );
+
+
+  FT_DEFINE_SERVICE( PsFontName )
+  {
+    FT_PsName_GetFunc  get_ps_font_name;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
+  static const FT_Service_PsFontNameRec  class_ =                    \
+  {                                                                  \
+    get_ps_font_name_                                                \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
+  void                                                               \
+  FT_Init_Class_ ## class_( FT_Library                 library,      \
+                            FT_Service_PsFontNameRec*  clazz )       \
+  {                                                                  \
+    FT_UNUSED( library );                                            \
+                                                                     \
+    clazz->get_ps_font_name = get_ps_font_name_;                     \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVPOSTNM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svpostnm.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svprop.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svprop.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svprop.h	(rÃ©vision 62573)
@@ -0,0 +1,81 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svprop.h                                                               */
+/*                                                                         */
+/*    The FreeType property service (specification).                       */
+/*                                                                         */
+/*  Copyright 2012 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVPROP_H__
+#define __SVPROP_H__
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_PROPERTIES  "properties"
+
+
+  typedef FT_Error
+  (*FT_Properties_SetFunc)( FT_Module    module,
+                            const char*  property_name,
+                            const void*  value );
+
+  typedef FT_Error
+  (*FT_Properties_GetFunc)( FT_Module    module,
+                            const char*  property_name,
+                            void*        value );
+
+
+  FT_DEFINE_SERVICE( Properties )
+  {
+    FT_Properties_SetFunc  set_property;
+    FT_Properties_GetFunc  get_property;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_PROPERTIESREC( class_,          \
+                                         set_property_,   \
+                                         get_property_ )  \
+  static const FT_Service_PropertiesRec  class_ =         \
+  {                                                       \
+    set_property_,                                        \
+    get_property_                                         \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_PROPERTIESREC( class_,                \
+                                         set_property_,         \
+                                         get_property_ )        \
+  void                                                          \
+  FT_Init_Class_ ## class_( FT_Service_PropertiesRec*  clazz )  \
+  {                                                             \
+    clazz->set_property = set_property_;                        \
+    clazz->get_property = get_property_;                        \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVPROP_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svprop.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svpscmap.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svpscmap.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svpscmap.h	(rÃ©vision 62573)
@@ -0,0 +1,177 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svpscmap.h                                                             */
+/*                                                                         */
+/*    The FreeType PostScript charmap service (specification).             */
+/*                                                                         */
+/*  Copyright 2003, 2006, 2009, 2012 by                                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVPSCMAP_H__
+#define __SVPSCMAP_H__
+
+#include FT_INTERNAL_OBJECTS_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_POSTSCRIPT_CMAPS  "postscript-cmaps"
+
+
+  /*
+   *  Adobe glyph name to unicode value.
+   */
+  typedef FT_UInt32
+  (*PS_Unicode_ValueFunc)( const char*  glyph_name );
+
+  /*
+   *  Macintosh name id to glyph name.  NULL if invalid index.
+   */
+  typedef const char*
+  (*PS_Macintosh_NameFunc)( FT_UInt  name_index );
+
+  /*
+   *  Adobe standard string ID to glyph name.  NULL if invalid index.
+   */
+  typedef const char*
+  (*PS_Adobe_Std_StringsFunc)( FT_UInt  string_index );
+
+
+  /*
+   *  Simple unicode -> glyph index charmap built from font glyph names
+   *  table.
+   */
+  typedef struct  PS_UniMap_
+  {
+    FT_UInt32  unicode;      /* bit 31 set: is glyph variant */
+    FT_UInt    glyph_index;
+
+  } PS_UniMap;
+
+
+  typedef struct PS_UnicodesRec_*  PS_Unicodes;
+
+  typedef struct  PS_UnicodesRec_
+  {
+    FT_CMapRec  cmap;
+    FT_UInt     num_maps;
+    PS_UniMap*  maps;
+
+  } PS_UnicodesRec;
+
+
+  /*
+   *  A function which returns a glyph name for a given index.  Returns
+   *  NULL if invalid index.
+   */
+  typedef const char*
+  (*PS_GetGlyphNameFunc)( FT_Pointer  data,
+                          FT_UInt     string_index );
+
+  /*
+   *  A function used to release the glyph name returned by
+   *  PS_GetGlyphNameFunc, when needed
+   */
+  typedef void
+  (*PS_FreeGlyphNameFunc)( FT_Pointer  data,
+                           const char*  name );
+
+  typedef FT_Error
+  (*PS_Unicodes_InitFunc)( FT_Memory             memory,
+                           PS_Unicodes           unicodes,
+                           FT_UInt               num_glyphs,
+                           PS_GetGlyphNameFunc   get_glyph_name,
+                           PS_FreeGlyphNameFunc  free_glyph_name,
+                           FT_Pointer            glyph_data );
+
+  typedef FT_UInt
+  (*PS_Unicodes_CharIndexFunc)( PS_Unicodes  unicodes,
+                                FT_UInt32    unicode );
+
+  typedef FT_UInt32
+  (*PS_Unicodes_CharNextFunc)( PS_Unicodes  unicodes,
+                               FT_UInt32   *unicode );
+
+
+  FT_DEFINE_SERVICE( PsCMaps )
+  {
+    PS_Unicode_ValueFunc       unicode_value;
+
+    PS_Unicodes_InitFunc       unicodes_init;
+    PS_Unicodes_CharIndexFunc  unicodes_char_index;
+    PS_Unicodes_CharNextFunc   unicodes_char_next;
+
+    PS_Macintosh_NameFunc      macintosh_name;
+    PS_Adobe_Std_StringsFunc   adobe_std_strings;
+    const unsigned short*      adobe_std_encoding;
+    const unsigned short*      adobe_expert_encoding;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
+                                      unicode_value_,                       \
+                                      unicodes_init_,                       \
+                                      unicodes_char_index_,                 \
+                                      unicodes_char_next_,                  \
+                                      macintosh_name_,                      \
+                                      adobe_std_strings_,                   \
+                                      adobe_std_encoding_,                  \
+                                      adobe_expert_encoding_ )              \
+  static const FT_Service_PsCMapsRec  class_ =                              \
+  {                                                                         \
+    unicode_value_, unicodes_init_,                                         \
+    unicodes_char_index_, unicodes_char_next_, macintosh_name_,             \
+    adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_         \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
+                                      unicode_value_,                       \
+                                      unicodes_init_,                       \
+                                      unicodes_char_index_,                 \
+                                      unicodes_char_next_,                  \
+                                      macintosh_name_,                      \
+                                      adobe_std_strings_,                   \
+                                      adobe_std_encoding_,                  \
+                                      adobe_expert_encoding_ )              \
+  void                                                                      \
+  FT_Init_Class_ ## class_( FT_Library              library,                \
+                            FT_Service_PsCMapsRec*  clazz )                 \
+  {                                                                         \
+    FT_UNUSED( library );                                                   \
+                                                                            \
+    clazz->unicode_value         = unicode_value_;                          \
+    clazz->unicodes_init         = unicodes_init_;                          \
+    clazz->unicodes_char_index   = unicodes_char_index_;                    \
+    clazz->unicodes_char_next    = unicodes_char_next_;                     \
+    clazz->macintosh_name        = macintosh_name_;                         \
+    clazz->adobe_std_strings     = adobe_std_strings_;                      \
+    clazz->adobe_std_encoding    = adobe_std_encoding_;                     \
+    clazz->adobe_expert_encoding = adobe_expert_encoding_;                  \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVPSCMAP_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svpscmap.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svpsinfo.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svpsinfo.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svpsinfo.h	(rÃ©vision 62573)
@@ -0,0 +1,111 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svpsinfo.h                                                             */
+/*                                                                         */
+/*    The FreeType PostScript info service (specification).                */
+/*                                                                         */
+/*  Copyright 2003, 2004, 2009, 2011, 2012 by                              */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVPSINFO_H__
+#define __SVPSINFO_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_INTERNAL_TYPE1_TYPES_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_POSTSCRIPT_INFO  "postscript-info"
+
+
+  typedef FT_Error
+  (*PS_GetFontInfoFunc)( FT_Face          face,
+                         PS_FontInfoRec*  afont_info );
+
+  typedef FT_Error
+  (*PS_GetFontExtraFunc)( FT_Face           face,
+                          PS_FontExtraRec*  afont_extra );
+
+  typedef FT_Int
+  (*PS_HasGlyphNamesFunc)( FT_Face  face );
+
+  typedef FT_Error
+  (*PS_GetFontPrivateFunc)( FT_Face         face,
+                            PS_PrivateRec*  afont_private );
+
+  typedef FT_Long
+  (*PS_GetFontValueFunc)( FT_Face       face,
+                          PS_Dict_Keys  key,
+                          FT_UInt       idx,
+                          void         *value,
+                          FT_Long       value_len );
+
+
+  FT_DEFINE_SERVICE( PsInfo )
+  {
+    PS_GetFontInfoFunc     ps_get_font_info;
+    PS_GetFontExtraFunc    ps_get_font_extra;
+    PS_HasGlyphNamesFunc   ps_has_glyph_names;
+    PS_GetFontPrivateFunc  ps_get_font_private;
+    PS_GetFontValueFunc    ps_get_font_value;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
+                                     get_font_info_,             \
+                                     ps_get_font_extra_,         \
+                                     has_glyph_names_,           \
+                                     get_font_private_,          \
+                                     get_font_value_ )           \
+  static const FT_Service_PsInfoRec  class_ =                    \
+  {                                                              \
+    get_font_info_, ps_get_font_extra_, has_glyph_names_,        \
+    get_font_private_, get_font_value_                           \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
+                                     get_font_info_,             \
+                                     ps_get_font_extra_,         \
+                                     has_glyph_names_,           \
+                                     get_font_private_,          \
+                                     get_font_value_ )           \
+  void                                                           \
+  FT_Init_Class_ ## class_( FT_Library             library,      \
+                            FT_Service_PsInfoRec*  clazz )       \
+  {                                                              \
+    FT_UNUSED( library );                                        \
+                                                                 \
+    clazz->ps_get_font_info    = get_font_info_;                 \
+    clazz->ps_get_font_extra   = ps_get_font_extra_;             \
+    clazz->ps_has_glyph_names  = has_glyph_names_;               \
+    clazz->ps_get_font_private = get_font_private_;              \
+    clazz->ps_get_font_value   = get_font_value_;                \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVPSINFO_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svpsinfo.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svsfnt.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svsfnt.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svsfnt.h	(rÃ©vision 62573)
@@ -0,0 +1,103 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svsfnt.h                                                               */
+/*                                                                         */
+/*    The FreeType SFNT table loading service (specification).             */
+/*                                                                         */
+/*  Copyright 2003, 2004, 2009, 2012 by                                    */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVSFNT_H__
+#define __SVSFNT_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_TRUETYPE_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*
+   *  SFNT table loading service.
+   */
+
+#define FT_SERVICE_ID_SFNT_TABLE  "sfnt-table"
+
+
+  /*
+   * Used to implement FT_Load_Sfnt_Table().
+   */
+  typedef FT_Error
+  (*FT_SFNT_TableLoadFunc)( FT_Face    face,
+                            FT_ULong   tag,
+                            FT_Long    offset,
+                            FT_Byte*   buffer,
+                            FT_ULong*  length );
+
+  /*
+   * Used to implement FT_Get_Sfnt_Table().
+   */
+  typedef void*
+  (*FT_SFNT_TableGetFunc)( FT_Face      face,
+                           FT_Sfnt_Tag  tag );
+
+
+  /*
+   * Used to implement FT_Sfnt_Table_Info().
+   */
+  typedef FT_Error
+  (*FT_SFNT_TableInfoFunc)( FT_Face    face,
+                            FT_UInt    idx,
+                            FT_ULong  *tag,
+                            FT_ULong  *offset,
+                            FT_ULong  *length );
+
+
+  FT_DEFINE_SERVICE( SFNT_Table )
+  {
+    FT_SFNT_TableLoadFunc  load_table;
+    FT_SFNT_TableGetFunc   get_table;
+    FT_SFNT_TableInfoFunc  table_info;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ )  \
+  static const FT_Service_SFNT_TableRec  class_ =                      \
+  {                                                                    \
+    load_, get_, info_                                                 \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ ) \
+  void                                                                \
+  FT_Init_Class_ ## class_( FT_Service_SFNT_TableRec*  clazz )        \
+  {                                                                   \
+    clazz->load_table = load_;                                        \
+    clazz->get_table  = get_;                                         \
+    clazz->table_info = info_;                                        \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVSFNT_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svsfnt.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svttcmap.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svttcmap.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svttcmap.h	(rÃ©vision 62573)
@@ -0,0 +1,107 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svttcmap.h                                                             */
+/*                                                                         */
+/*    The FreeType TrueType/sfnt cmap extra information service.           */
+/*                                                                         */
+/*  Copyright 2003 by                                                      */
+/*  Masatake YAMATO, Redhat K.K.                                           */
+/*                                                                         */
+/*  Copyright 2003, 2008, 2009, 2012, 2013 by                              */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/* Development of this service is support of
+   Information-technology Promotion Agency, Japan. */
+
+#ifndef __SVTTCMAP_H__
+#define __SVTTCMAP_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_TRUETYPE_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_TT_CMAP  "tt-cmaps"
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_CMapInfo                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to store TrueType/sfnt specific cmap information  */
+  /*    which is not covered by the generic @FT_CharMap structure.  This   */
+  /*    structure can be accessed with the @FT_Get_TT_CMap_Info function.  */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    language ::                                                        */
+  /*      The language ID used in Mac fonts.  Definitions of values are in */
+  /*      `ttnameid.h'.                                                    */
+  /*                                                                       */
+  /*    format ::                                                          */
+  /*      The cmap format.  OpenType 1.5 defines the formats 0 (byte       */
+  /*      encoding table), 2~(high-byte mapping through table), 4~(segment */
+  /*      mapping to delta values), 6~(trimmed table mapping), 8~(mixed    */
+  /*      16-bit and 32-bit coverage), 10~(trimmed array), 12~(segmented   */
+  /*      coverage), and 14 (Unicode Variation Sequences).                 */
+  /*                                                                       */
+  typedef struct  TT_CMapInfo_
+  {
+    FT_ULong  language;
+    FT_Long   format;
+
+  } TT_CMapInfo;
+
+
+  typedef FT_Error
+  (*TT_CMap_Info_GetFunc)( FT_CharMap    charmap,
+                           TT_CMapInfo  *cmap_info );
+
+
+  FT_DEFINE_SERVICE( TTCMaps )
+  {
+    TT_CMap_Info_GetFunc  get_cmap_info;
+  };
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
+  static const FT_Service_TTCMapsRec  class_ =                  \
+  {                                                             \
+    get_cmap_info_                                              \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
+  void                                                          \
+  FT_Init_Class_ ## class_( FT_Library              library,    \
+                            FT_Service_TTCMapsRec*  clazz )     \
+  {                                                             \
+    FT_UNUSED( library );                                       \
+                                                                \
+    clazz->get_cmap_info = get_cmap_info_;                      \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __SVTTCMAP_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svttcmap.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svtteng.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svtteng.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svtteng.h	(rÃ©vision 62573)
@@ -0,0 +1,53 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svtteng.h                                                              */
+/*                                                                         */
+/*    The FreeType TrueType engine query service (specification).          */
+/*                                                                         */
+/*  Copyright 2006 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVTTENG_H__
+#define __SVTTENG_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_MODULE_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*
+   *  SFNT table loading service.
+   */
+
+#define FT_SERVICE_ID_TRUETYPE_ENGINE  "truetype-engine"
+
+  /*
+   * Used to implement FT_Get_TrueType_Engine_Type
+   */
+
+  FT_DEFINE_SERVICE( TrueTypeEngine )
+  {
+    FT_TrueTypeEngineType  engine_type;
+  };
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVTTENG_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svtteng.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svttglyf.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svttglyf.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svttglyf.h	(rÃ©vision 62573)
@@ -0,0 +1,68 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svttglyf.h                                                             */
+/*                                                                         */
+/*    The FreeType TrueType glyph service.                                 */
+/*                                                                         */
+/*  Copyright 2007, 2009, 2012 by David Turner.                            */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+#ifndef __SVTTGLYF_H__
+#define __SVTTGLYF_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_TRUETYPE_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_TT_GLYF  "tt-glyf"
+
+
+  typedef FT_ULong
+  (*TT_Glyf_GetLocationFunc)( FT_Face    face,
+                              FT_UInt    gindex,
+                              FT_ULong  *psize );
+
+  FT_DEFINE_SERVICE( TTGlyf )
+  {
+    TT_Glyf_GetLocationFunc  get_location;
+  };
+
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
+  static const FT_Service_TTGlyfRec  class_ =                 \
+  {                                                           \
+    get_location_                                             \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
+  void                                                        \
+  FT_Init_Class_ ## class_( FT_Service_TTGlyfRec*  clazz )    \
+  {                                                           \
+    clazz->get_location = get_location_;                      \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __SVTTGLYF_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svttglyf.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svwinfnt.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svwinfnt.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svwinfnt.h	(rÃ©vision 62573)
@@ -0,0 +1,50 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svwinfnt.h                                                             */
+/*                                                                         */
+/*    The FreeType Windows FNT/FONT service (specification).               */
+/*                                                                         */
+/*  Copyright 2003 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVWINFNT_H__
+#define __SVWINFNT_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_WINFONTS_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_WINFNT  "winfonts"
+
+  typedef FT_Error
+  (*FT_WinFnt_GetHeaderFunc)( FT_Face               face,
+                              FT_WinFNT_HeaderRec  *aheader );
+
+
+  FT_DEFINE_SERVICE( WinFnt )
+  {
+    FT_WinFnt_GetHeaderFunc  get_header;
+  };
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVWINFNT_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svwinfnt.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services/svxf86nm.h
===================================================================
--- lib/3rdparty/freetype/include/internal/services/svxf86nm.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services/svxf86nm.h	(rÃ©vision 62573)
@@ -0,0 +1,55 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svxf86nm.h                                                             */
+/*                                                                         */
+/*    The FreeType XFree86 services (specification only).                  */
+/*                                                                         */
+/*  Copyright 2003 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SVXF86NM_H__
+#define __SVXF86NM_H__
+
+#include FT_INTERNAL_SERVICE_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*
+   *  A trivial service used to return the name of a face's font driver,
+   *  according to the XFree86 nomenclature.  Note that the service data
+   *  is a simple constant string pointer.
+   */
+
+#define FT_SERVICE_ID_XF86_NAME  "xf86-driver-name"
+
+#define FT_XF86_FORMAT_TRUETYPE  "TrueType"
+#define FT_XF86_FORMAT_TYPE_1    "Type 1"
+#define FT_XF86_FORMAT_BDF       "BDF"
+#define FT_XF86_FORMAT_PCF       "PCF"
+#define FT_XF86_FORMAT_TYPE_42   "Type 42"
+#define FT_XF86_FORMAT_CID       "CID Type 1"
+#define FT_XF86_FORMAT_CFF       "CFF"
+#define FT_XF86_FORMAT_PFR       "PFR"
+#define FT_XF86_FORMAT_WINFNT    "Windows FNT"
+
+  /* */
+
+
+FT_END_HEADER
+
+
+#endif /* __SVXF86NM_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services/svxf86nm.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/services
===================================================================
--- lib/3rdparty/freetype/include/internal/services	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/services	(copie de travail)

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/services
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,7 ##
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln
Index: lib/3rdparty/freetype/include/internal/sfnt.h
===================================================================
--- lib/3rdparty/freetype/include/internal/sfnt.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/sfnt.h	(rÃ©vision 62573)
@@ -0,0 +1,707 @@
+/***************************************************************************/
+/*                                                                         */
+/*  sfnt.h                                                                 */
+/*                                                                         */
+/*    High-level `sfnt' driver interface (specification).                  */
+/*                                                                         */
+/*  Copyright 1996-2006, 2009, 2012-2013 by                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __SFNT_H__
+#define __SFNT_H__
+
+
+#include <ft2build.h>
+#include FT_INTERNAL_DRIVER_H
+#include FT_INTERNAL_TRUETYPE_TYPES_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Init_Face_Func                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    First part of the SFNT face object initialization.  This finds     */
+  /*    the face in a SFNT file or collection, and load its format tag in  */
+  /*    face->format_tag.                                                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    stream     :: The input stream.                                    */
+  /*                                                                       */
+  /*    face       :: A handle to the target face object.                  */
+  /*                                                                       */
+  /*    face_index :: The index of the TrueType font, if we are opening a  */
+  /*                  collection.                                          */
+  /*                                                                       */
+  /*    num_params :: The number of additional parameters.                 */
+  /*                                                                       */
+  /*    params     :: Optional additional parameters.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The stream cursor must be at the font file's origin.               */
+  /*                                                                       */
+  /*    This function recognizes fonts embedded in a `TrueType             */
+  /*    collection'.                                                       */
+  /*                                                                       */
+  /*    Once the format tag has been validated by the font driver, it      */
+  /*    should then call the TT_Load_Face_Func() callback to read the rest */
+  /*    of the SFNT tables in the object.                                  */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Init_Face_Func)( FT_Stream      stream,
+                        TT_Face        face,
+                        FT_Int         face_index,
+                        FT_Int         num_params,
+                        FT_Parameter*  params );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_Face_Func                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Second part of the SFNT face object initialization.  This loads    */
+  /*    the common SFNT tables (head, OS/2, maxp, metrics, etc.) in the    */
+  /*    face object.                                                       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    stream     :: The input stream.                                    */
+  /*                                                                       */
+  /*    face       :: A handle to the target face object.                  */
+  /*                                                                       */
+  /*    face_index :: The index of the TrueType font, if we are opening a  */
+  /*                  collection.                                          */
+  /*                                                                       */
+  /*    num_params :: The number of additional parameters.                 */
+  /*                                                                       */
+  /*    params     :: Optional additional parameters.                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function must be called after TT_Init_Face_Func().            */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_Face_Func)( FT_Stream      stream,
+                        TT_Face        face,
+                        FT_Int         face_index,
+                        FT_Int         num_params,
+                        FT_Parameter*  params );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Done_Face_Func                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A callback used to delete the common SFNT data from a face.        */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the target face object.                        */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function does NOT destroy the face object.                    */
+  /*                                                                       */
+  typedef void
+  (*TT_Done_Face_Func)( TT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_Any_Func                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Load any font table into client memory.                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face   :: The face object to look for.                             */
+  /*                                                                       */
+  /*    tag    :: The tag of table to load.  Use the value 0 if you want   */
+  /*              to access the whole font file, else set this parameter   */
+  /*              to a valid TrueType table tag that you can forge with    */
+  /*              the MAKE_TT_TAG macro.                                   */
+  /*                                                                       */
+  /*    offset :: The starting offset in the table (or the file if         */
+  /*              tag == 0).                                               */
+  /*                                                                       */
+  /*    length :: The address of the decision variable:                    */
+  /*                                                                       */
+  /*                If length == NULL:                                     */
+  /*                  Loads the whole table.  Returns an error if          */
+  /*                  `offset' == 0!                                       */
+  /*                                                                       */
+  /*                If *length == 0:                                       */
+  /*                  Exits immediately; returning the length of the given */
+  /*                  table or of the font file, depending on the value of */
+  /*                  `tag'.                                               */
+  /*                                                                       */
+  /*                If *length != 0:                                       */
+  /*                  Loads the next `length' bytes of table or font,      */
+  /*                  starting at offset `offset' (in table or font too).  */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    buffer :: The address of target buffer.                            */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    TrueType error code.  0 means success.                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_Any_Func)( TT_Face    face,
+                       FT_ULong   tag,
+                       FT_Long    offset,
+                       FT_Byte   *buffer,
+                       FT_ULong*  length );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Find_SBit_Image_Func                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Check whether an embedded bitmap (an `sbit') exists for a given    */
+  /*    glyph, at a given strike.                                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face          :: The target face object.                           */
+  /*                                                                       */
+  /*    glyph_index   :: The glyph index.                                  */
+  /*                                                                       */
+  /*    strike_index  :: The current strike index.                         */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    arange        :: The SBit range containing the glyph index.        */
+  /*                                                                       */
+  /*    astrike       :: The SBit strike containing the glyph index.       */
+  /*                                                                       */
+  /*    aglyph_offset :: The offset of the glyph data in `EBDT' table.     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.  Returns                    */
+  /*    SFNT_Err_Invalid_Argument if no sbit exists for the requested      */
+  /*    glyph.                                                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Find_SBit_Image_Func)( TT_Face          face,
+                              FT_UInt          glyph_index,
+                              FT_ULong         strike_index,
+                              TT_SBit_Range   *arange,
+                              TT_SBit_Strike  *astrike,
+                              FT_ULong        *aglyph_offset );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_SBit_Metrics_Func                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Get the big metrics for a given embedded bitmap.                   */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    stream      :: The input stream.                                   */
+  /*                                                                       */
+  /*    range       :: The SBit range containing the glyph.                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    big_metrics :: A big SBit metrics structure for the glyph.         */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The stream cursor must be positioned at the glyph's offset within  */
+  /*    the `EBDT' table before the call.                                  */
+  /*                                                                       */
+  /*    If the image format uses variable metrics, the stream cursor is    */
+  /*    positioned just after the metrics header in the `EBDT' table on    */
+  /*    function exit.                                                     */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_SBit_Metrics_Func)( FT_Stream        stream,
+                                TT_SBit_Range    range,
+                                TT_SBit_Metrics  metrics );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_SBit_Image_Func                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Load a given glyph sbit image from the font resource.  This also   */
+  /*    returns its metrics.                                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face ::                                                            */
+  /*      The target face object.                                          */
+  /*                                                                       */
+  /*    strike_index ::                                                    */
+  /*      The strike index.                                                */
+  /*                                                                       */
+  /*    glyph_index ::                                                     */
+  /*      The current glyph index.                                         */
+  /*                                                                       */
+  /*    load_flags ::                                                      */
+  /*      The current load flags.                                          */
+  /*                                                                       */
+  /*    stream ::                                                          */
+  /*      The input stream.                                                */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    amap ::                                                            */
+  /*      The target pixmap.                                               */
+  /*                                                                       */
+  /*    ametrics ::                                                        */
+  /*      A big sbit metrics structure for the glyph image.                */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.  Returns an error if no     */
+  /*    glyph sbit exists for the index.                                   */
+  /*                                                                       */
+  /*  <Note>                                                               */
+  /*    The `map.buffer' field is always freed before the glyph is loaded. */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_SBit_Image_Func)( TT_Face              face,
+                              FT_ULong             strike_index,
+                              FT_UInt              glyph_index,
+                              FT_UInt              load_flags,
+                              FT_Stream            stream,
+                              FT_Bitmap           *amap,
+                              TT_SBit_MetricsRec  *ametrics );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Set_SBit_Strike_Func                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Select an sbit strike for a given size request.                    */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face          :: The target face object.                           */
+  /*                                                                       */
+  /*    req           :: The size request.                                 */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    astrike_index :: The index of the sbit strike.                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.  Returns an error if no     */
+  /*    sbit strike exists for the selected ppem values.                   */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Set_SBit_Strike_Func)( TT_Face          face,
+                              FT_Size_Request  req,
+                              FT_ULong*        astrike_index );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_Strike_Metrics_Func                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Load the metrics of a given strike.                                */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face          :: The target face object.                           */
+  /*                                                                       */
+  /*    strike_index  :: The strike index.                                 */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    metrics       :: the metrics of the strike.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.  Returns an error if no     */
+  /*    such sbit strike exists.                                           */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_Strike_Metrics_Func)( TT_Face           face,
+                                  FT_ULong          strike_index,
+                                  FT_Size_Metrics*  metrics );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Get_PS_Name_Func                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Get the PostScript glyph name of a glyph.                          */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    idx  :: The glyph index.                                           */
+  /*                                                                       */
+  /*    PSname :: The address of a string pointer.  Will be NULL in case   */
+  /*              of error, otherwise it is a pointer to the glyph name.   */
+  /*                                                                       */
+  /*              You must not modify the returned string!                 */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Get_PS_Name_Func)( TT_Face      face,
+                          FT_UInt      idx,
+                          FT_String**  PSname );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_Metrics_Func                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Load a metrics table, which is a table with a horizontal and a     */
+  /*    vertical version.                                                  */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face     :: A handle to the target face object.                    */
+  /*                                                                       */
+  /*    stream   :: The input stream.                                      */
+  /*                                                                       */
+  /*    vertical :: A boolean flag.  If set, load the vertical one.        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_Metrics_Func)( TT_Face    face,
+                           FT_Stream  stream,
+                           FT_Bool    vertical );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Get_Metrics_Func                                                */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Load the horizontal or vertical header in a face object.           */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face     :: A handle to the target face object.                    */
+  /*                                                                       */
+  /*    stream   :: The input stream.                                      */
+  /*                                                                       */
+  /*    vertical :: A boolean flag.  If set, load vertical metrics.        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Get_Metrics_Func)( TT_Face     face,
+                          FT_Bool     vertical,
+                          FT_UInt     gindex,
+                          FT_Short*   abearing,
+                          FT_UShort*  aadvance );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Load_Table_Func                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Load a given TrueType table.                                       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face   :: A handle to the target face object.                      */
+  /*                                                                       */
+  /*    stream :: The input stream.                                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The function uses `face->goto_table' to seek the stream to the     */
+  /*    start of the table, except while loading the font directory.       */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Load_Table_Func)( TT_Face    face,
+                         FT_Stream  stream );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Free_Table_Func                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Free a given TrueType table.                                       */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the target face object.                        */
+  /*                                                                       */
+  typedef void
+  (*TT_Free_Table_Func)( TT_Face  face );
+
+
+  /*
+   * @functype:
+   *    TT_Face_GetKerningFunc
+   *
+   * @description:
+   *    Return the horizontal kerning value between two glyphs.
+   *
+   * @input:
+   *    face        :: A handle to the source face object.
+   *    left_glyph  :: The left glyph index.
+   *    right_glyph :: The right glyph index.
+   *
+   * @return:
+   *    The kerning value in font units.
+   */
+  typedef FT_Int
+  (*TT_Face_GetKerningFunc)( TT_Face  face,
+                             FT_UInt  left_glyph,
+                             FT_UInt  right_glyph );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    SFNT_Interface                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure holds pointers to the functions used to load and    */
+  /*    free the basic tables that are required in a `sfnt' font file.     */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    Check the various xxx_Func() descriptions for details.             */
+  /*                                                                       */
+  typedef struct  SFNT_Interface_
+  {
+    TT_Loader_GotoTableFunc      goto_table;
+
+    TT_Init_Face_Func            init_face;
+    TT_Load_Face_Func            load_face;
+    TT_Done_Face_Func            done_face;
+    FT_Module_Requester          get_interface;
+
+    TT_Load_Any_Func             load_any;
+
+    /* these functions are called by `load_face' but they can also  */
+    /* be called from external modules, if there is a need to do so */
+    TT_Load_Table_Func           load_head;
+    TT_Load_Metrics_Func         load_hhea;
+    TT_Load_Table_Func           load_cmap;
+    TT_Load_Table_Func           load_maxp;
+    TT_Load_Table_Func           load_os2;
+    TT_Load_Table_Func           load_post;
+
+    TT_Load_Table_Func           load_name;
+    TT_Free_Table_Func           free_name;
+
+    /* this field was called `load_kerning' up to version 2.1.10 */
+    TT_Load_Table_Func           load_kern;
+
+    TT_Load_Table_Func           load_gasp;
+    TT_Load_Table_Func           load_pclt;
+
+    /* see `ttload.h'; this field was called `load_bitmap_header' up to */
+    /* version 2.1.10                                                   */
+    TT_Load_Table_Func           load_bhed;
+
+    TT_Load_SBit_Image_Func      load_sbit_image;
+
+    /* see `ttpost.h' */
+    TT_Get_PS_Name_Func          get_psname;
+    TT_Free_Table_Func           free_psnames;
+
+    /* starting here, the structure differs from version 2.1.7 */
+
+    /* this field was introduced in version 2.1.8, named `get_psname' */
+    TT_Face_GetKerningFunc       get_kerning;
+
+    /* new elements introduced after version 2.1.10 */
+
+    /* load the font directory, i.e., the offset table and */
+    /* the table directory                                 */
+    TT_Load_Table_Func           load_font_dir;
+    TT_Load_Metrics_Func         load_hmtx;
+
+    TT_Load_Table_Func           load_eblc;
+    TT_Free_Table_Func           free_eblc;
+
+    TT_Set_SBit_Strike_Func      set_sbit_strike;
+    TT_Load_Strike_Metrics_Func  load_strike_metrics;
+
+    TT_Get_Metrics_Func          get_metrics;
+
+  } SFNT_Interface;
+
+
+  /* transitional */
+  typedef SFNT_Interface*   SFNT_Service;
+
+#ifndef FT_CONFIG_OPTION_PIC
+
+#define FT_DEFINE_SFNT_INTERFACE(        \
+          class_,                        \
+          goto_table_,                   \
+          init_face_,                    \
+          load_face_,                    \
+          done_face_,                    \
+          get_interface_,                \
+          load_any_,                     \
+          load_head_,                    \
+          load_hhea_,                    \
+          load_cmap_,                    \
+          load_maxp_,                    \
+          load_os2_,                     \
+          load_post_,                    \
+          load_name_,                    \
+          free_name_,                    \
+          load_kern_,                    \
+          load_gasp_,                    \
+          load_pclt_,                    \
+          load_bhed_,                    \
+          load_sbit_image_,              \
+          get_psname_,                   \
+          free_psnames_,                 \
+          get_kerning_,                  \
+          load_font_dir_,                \
+          load_hmtx_,                    \
+          load_eblc_,                    \
+          free_eblc_,                    \
+          set_sbit_strike_,              \
+          load_strike_metrics_,          \
+          get_metrics_ )                 \
+  static const SFNT_Interface  class_ =  \
+  {                                      \
+    goto_table_,                         \
+    init_face_,                          \
+    load_face_,                          \
+    done_face_,                          \
+    get_interface_,                      \
+    load_any_,                           \
+    load_head_,                          \
+    load_hhea_,                          \
+    load_cmap_,                          \
+    load_maxp_,                          \
+    load_os2_,                           \
+    load_post_,                          \
+    load_name_,                          \
+    free_name_,                          \
+    load_kern_,                          \
+    load_gasp_,                          \
+    load_pclt_,                          \
+    load_bhed_,                          \
+    load_sbit_image_,                    \
+    get_psname_,                         \
+    free_psnames_,                       \
+    get_kerning_,                        \
+    load_font_dir_,                      \
+    load_hmtx_,                          \
+    load_eblc_,                          \
+    free_eblc_,                          \
+    set_sbit_strike_,                    \
+    load_strike_metrics_,                \
+    get_metrics_,                        \
+  };
+
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_INTERNAL( a, a_ )  \
+          clazz->a = a_;
+
+#define FT_DEFINE_SFNT_INTERFACE(                       \
+          class_,                                       \
+          goto_table_,                                  \
+          init_face_,                                   \
+          load_face_,                                   \
+          done_face_,                                   \
+          get_interface_,                               \
+          load_any_,                                    \
+          load_head_,                                   \
+          load_hhea_,                                   \
+          load_cmap_,                                   \
+          load_maxp_,                                   \
+          load_os2_,                                    \
+          load_post_,                                   \
+          load_name_,                                   \
+          free_name_,                                   \
+          load_kern_,                                   \
+          load_gasp_,                                   \
+          load_pclt_,                                   \
+          load_bhed_,                                   \
+          load_sbit_image_,                             \
+          get_psname_,                                  \
+          free_psnames_,                                \
+          get_kerning_,                                 \
+          load_font_dir_,                               \
+          load_hmtx_,                                   \
+          load_eblc_,                                   \
+          free_eblc_,                                   \
+          set_sbit_strike_,                             \
+          load_strike_metrics_,                         \
+          get_metrics_ )                                \
+  void                                                  \
+  FT_Init_Class_ ## class_( FT_Library       library,   \
+                            SFNT_Interface*  clazz )    \
+  {                                                     \
+    FT_UNUSED( library );                               \
+                                                        \
+    clazz->goto_table          = goto_table_;           \
+    clazz->init_face           = init_face_;            \
+    clazz->load_face           = load_face_;            \
+    clazz->done_face           = done_face_;            \
+    clazz->get_interface       = get_interface_;        \
+    clazz->load_any            = load_any_;             \
+    clazz->load_head           = load_head_;            \
+    clazz->load_hhea           = load_hhea_;            \
+    clazz->load_cmap           = load_cmap_;            \
+    clazz->load_maxp           = load_maxp_;            \
+    clazz->load_os2            = load_os2_;             \
+    clazz->load_post           = load_post_;            \
+    clazz->load_name           = load_name_;            \
+    clazz->free_name           = free_name_;            \
+    clazz->load_kern           = load_kern_;            \
+    clazz->load_gasp           = load_gasp_;            \
+    clazz->load_pclt           = load_pclt_;            \
+    clazz->load_bhed           = load_bhed_;            \
+    clazz->load_sbit_image     = load_sbit_image_;      \
+    clazz->get_psname          = get_psname_;           \
+    clazz->free_psnames        = free_psnames_;         \
+    clazz->get_kerning         = get_kerning_;          \
+    clazz->load_font_dir       = load_font_dir_;        \
+    clazz->load_hmtx           = load_hmtx_;            \
+    clazz->load_eblc           = load_eblc_;            \
+    clazz->free_eblc           = free_eblc_;            \
+    clazz->set_sbit_strike     = set_sbit_strike_;      \
+    clazz->load_strike_metrics = load_strike_metrics_;  \
+    clazz->get_metrics         = get_metrics_;          \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+FT_END_HEADER
+
+#endif /* __SFNT_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/sfnt.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/t1types.h
===================================================================
--- lib/3rdparty/freetype/include/internal/t1types.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/t1types.h	(rÃ©vision 62573)
@@ -0,0 +1,255 @@
+/***************************************************************************/
+/*                                                                         */
+/*  t1types.h                                                              */
+/*                                                                         */
+/*    Basic Type1/Type2 type definitions and interface (specification      */
+/*    only).                                                               */
+/*                                                                         */
+/*  Copyright 1996-2004, 2006, 2008, 2009, 2011, 2013 by                   */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __T1TYPES_H__
+#define __T1TYPES_H__
+
+
+#include <ft2build.h>
+#include FT_TYPE1_TABLES_H
+#include FT_INTERNAL_POSTSCRIPT_HINTS_H
+#include FT_INTERNAL_SERVICE_H
+#include FT_SERVICE_POSTSCRIPT_CMAPS_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***              REQUIRED TYPE1/TYPE2 TABLES DEFINITIONS              ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    T1_EncodingRec                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure modeling a custom encoding.                            */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    num_chars  :: The number of character codes in the encoding.       */
+  /*                  Usually 256.                                         */
+  /*                                                                       */
+  /*    code_first :: The lowest valid character code in the encoding.     */
+  /*                                                                       */
+  /*    code_last  :: The highest valid character code in the encoding     */
+  /*                  + 1. When equal to code_first there are no valid     */
+  /*                  character codes.                                     */
+  /*                                                                       */
+  /*    char_index :: An array of corresponding glyph indices.             */
+  /*                                                                       */
+  /*    char_name  :: An array of corresponding glyph names.               */
+  /*                                                                       */
+  typedef struct  T1_EncodingRecRec_
+  {
+    FT_Int       num_chars;
+    FT_Int       code_first;
+    FT_Int       code_last;
+
+    FT_UShort*   char_index;
+    FT_String**  char_name;
+
+  } T1_EncodingRec, *T1_Encoding;
+
+
+  /* used to hold extra data of PS_FontInfoRec that
+   * cannot be stored in the publicly defined structure.
+   *
+   * Note these can't be blended with multiple-masters.
+   */
+  typedef struct  PS_FontExtraRec_
+  {
+    FT_UShort  fs_type;
+
+  } PS_FontExtraRec;
+
+
+  typedef struct  T1_FontRec_
+  {
+    PS_FontInfoRec   font_info;         /* font info dictionary   */
+    PS_FontExtraRec  font_extra;        /* font info extra fields */
+    PS_PrivateRec    private_dict;      /* private dictionary     */
+    FT_String*       font_name;         /* top-level dictionary   */
+
+    T1_EncodingType  encoding_type;
+    T1_EncodingRec   encoding;
+
+    FT_Byte*         subrs_block;
+    FT_Byte*         charstrings_block;
+    FT_Byte*         glyph_names_block;
+
+    FT_Int           num_subrs;
+    FT_Byte**        subrs;
+    FT_PtrDist*      subrs_len;
+
+    FT_Int           num_glyphs;
+    FT_String**      glyph_names;       /* array of glyph names       */
+    FT_Byte**        charstrings;       /* array of glyph charstrings */
+    FT_PtrDist*      charstrings_len;
+
+    FT_Byte          paint_type;
+    FT_Byte          font_type;
+    FT_Matrix        font_matrix;
+    FT_Vector        font_offset;
+    FT_BBox          font_bbox;
+    FT_Long          font_id;
+
+    FT_Fixed         stroke_width;
+
+  } T1_FontRec, *T1_Font;
+
+
+  typedef struct  CID_SubrsRec_
+  {
+    FT_UInt    num_subrs;
+    FT_Byte**  code;
+
+  } CID_SubrsRec, *CID_Subrs;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***                AFM FONT INFORMATION STRUCTURES                    ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  typedef struct  AFM_TrackKernRec_
+  {
+    FT_Int    degree;
+    FT_Fixed  min_ptsize;
+    FT_Fixed  min_kern;
+    FT_Fixed  max_ptsize;
+    FT_Fixed  max_kern;
+
+  } AFM_TrackKernRec, *AFM_TrackKern;
+
+  typedef struct  AFM_KernPairRec_
+  {
+    FT_Int  index1;
+    FT_Int  index2;
+    FT_Int  x;
+    FT_Int  y;
+
+  } AFM_KernPairRec, *AFM_KernPair;
+
+  typedef struct  AFM_FontInfoRec_
+  {
+    FT_Bool        IsCIDFont;
+    FT_BBox        FontBBox;
+    FT_Fixed       Ascender;
+    FT_Fixed       Descender;
+    AFM_TrackKern  TrackKerns;   /* free if non-NULL */
+    FT_Int         NumTrackKern;
+    AFM_KernPair   KernPairs;    /* free if non-NULL */
+    FT_Int         NumKernPair;
+
+  } AFM_FontInfoRec, *AFM_FontInfo;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***                ORIGINAL T1_FACE CLASS DEFINITION                  ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  typedef struct T1_FaceRec_*   T1_Face;
+  typedef struct CID_FaceRec_*  CID_Face;
+
+
+  typedef struct  T1_FaceRec_
+  {
+    FT_FaceRec      root;
+    T1_FontRec      type1;
+    const void*     psnames;
+    const void*     psaux;
+    const void*     afm_data;
+    FT_CharMapRec   charmaprecs[2];
+    FT_CharMap      charmaps[2];
+
+    /* support for Multiple Masters fonts */
+    PS_Blend        blend;
+
+    /* undocumented, optional: indices of subroutines that express      */
+    /* the NormalizeDesignVector and the ConvertDesignVector procedure, */
+    /* respectively, as Type 2 charstrings; -1 if keywords not present  */
+    FT_Int           ndv_idx;
+    FT_Int           cdv_idx;
+
+    /* undocumented, optional: has the same meaning as len_buildchar */
+    /* for Type 2 fonts; manipulated by othersubrs 19, 24, and 25    */
+    FT_UInt          len_buildchar;
+    FT_Long*         buildchar;
+
+    /* since version 2.1 - interface to PostScript hinter */
+    const void*     pshinter;
+
+  } T1_FaceRec;
+
+
+  typedef struct  CID_FaceRec_
+  {
+    FT_FaceRec       root;
+    void*            psnames;
+    void*            psaux;
+    CID_FaceInfoRec  cid;
+    PS_FontExtraRec  font_extra;
+#if 0
+    void*            afm_data;
+#endif
+    CID_Subrs        subrs;
+
+    /* since version 2.1 - interface to PostScript hinter */
+    void*            pshinter;
+
+    /* since version 2.1.8, but was originally positioned after `afm_data' */
+    FT_Byte*         binary_data; /* used if hex data has been converted */
+    FT_Stream        cid_stream;
+
+  } CID_FaceRec;
+
+
+FT_END_HEADER
+
+#endif /* __T1TYPES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/t1types.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal/tttypes.h
===================================================================
--- lib/3rdparty/freetype/include/internal/tttypes.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal/tttypes.h	(rÃ©vision 62573)
@@ -0,0 +1,1516 @@
+/***************************************************************************/
+/*                                                                         */
+/*  tttypes.h                                                              */
+/*                                                                         */
+/*    Basic SFNT/TrueType type definitions and interface (specification    */
+/*    only).                                                               */
+/*                                                                         */
+/*  Copyright 1996-2002, 2004-2008, 2012-2013 by                           */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __TTTYPES_H__
+#define __TTTYPES_H__
+
+
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+#include FT_INTERNAL_OBJECTS_H
+
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#include FT_MULTIPLE_MASTERS_H
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***             REQUIRED TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TTC_HeaderRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    TrueType collection header.  This table contains the offsets of    */
+  /*    the font headers of each distinct TrueType face in the file.       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    tag     :: Must be `ttc ' to indicate a TrueType collection.       */
+  /*                                                                       */
+  /*    version :: The version number.                                     */
+  /*                                                                       */
+  /*    count   :: The number of faces in the collection.  The             */
+  /*               specification says this should be an unsigned long, but */
+  /*               we use a signed long since we need the value -1 for     */
+  /*               specific purposes.                                      */
+  /*                                                                       */
+  /*    offsets :: The offsets of the font headers, one per face.          */
+  /*                                                                       */
+  typedef struct  TTC_HeaderRec_
+  {
+    FT_ULong   tag;
+    FT_Fixed   version;
+    FT_Long    count;
+    FT_ULong*  offsets;
+
+  } TTC_HeaderRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    SFNT_HeaderRec                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    SFNT file format header.                                           */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    format_tag     :: The font format tag.                             */
+  /*                                                                       */
+  /*    num_tables     :: The number of tables in file.                    */
+  /*                                                                       */
+  /*    search_range   :: Must be `16 * (max power of 2 <= num_tables)'.   */
+  /*                                                                       */
+  /*    entry_selector :: Must be log2 of `search_range / 16'.             */
+  /*                                                                       */
+  /*    range_shift    :: Must be `num_tables * 16 - search_range'.        */
+  /*                                                                       */
+  typedef struct  SFNT_HeaderRec_
+  {
+    FT_ULong   format_tag;
+    FT_UShort  num_tables;
+    FT_UShort  search_range;
+    FT_UShort  entry_selector;
+    FT_UShort  range_shift;
+
+    FT_ULong   offset;  /* not in file */
+
+  } SFNT_HeaderRec, *SFNT_Header;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_TableRec                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure describes a given table of a TrueType font.         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    Tag      :: A four-bytes tag describing the table.                 */
+  /*                                                                       */
+  /*    CheckSum :: The table checksum.  This value can be ignored.        */
+  /*                                                                       */
+  /*    Offset   :: The offset of the table from the start of the TrueType */
+  /*                font in its resource.                                  */
+  /*                                                                       */
+  /*    Length   :: The table length (in bytes).                           */
+  /*                                                                       */
+  typedef struct  TT_TableRec_
+  {
+    FT_ULong  Tag;        /*        table type */
+    FT_ULong  CheckSum;   /*    table checksum */
+    FT_ULong  Offset;     /* table file offset */
+    FT_ULong  Length;     /*      table length */
+
+  } TT_TableRec, *TT_Table;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    WOFF_HeaderRec                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    WOFF file format header.                                           */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    See                                                                */
+  /*                                                                       */
+  /*      http://www.w3.org/TR/WOFF/#WOFFHeader                            */
+  /*                                                                       */
+  typedef struct  WOFF_HeaderRec_
+  {
+    FT_ULong   signature;
+    FT_ULong   flavor;
+    FT_ULong   length;
+    FT_UShort  num_tables;
+    FT_UShort  reserved;
+    FT_ULong   totalSfntSize;
+    FT_UShort  majorVersion;
+    FT_UShort  minorVersion;
+    FT_ULong   metaOffset;
+    FT_ULong   metaLength;
+    FT_ULong   metaOrigLength;
+    FT_ULong   privOffset;
+    FT_ULong   privLength;
+
+  } WOFF_HeaderRec, *WOFF_Header;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    WOFF_TableRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure describes a given table of a WOFF font.             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    Tag        :: A four-bytes tag describing the table.               */
+  /*                                                                       */
+  /*    Offset     :: The offset of the table from the start of the WOFF   */
+  /*                  font in its resource.                                */
+  /*                                                                       */
+  /*    CompLength :: Compressed table length (in bytes).                  */
+  /*                                                                       */
+  /*    OrigLength :: Unompressed table length (in bytes).                 */
+  /*                                                                       */
+  /*    CheckSum   :: The table checksum.  This value can be ignored.      */
+  /*                                                                       */
+  /*    OrigOffset :: The uncompressed table file offset.  This value gets */
+  /*                  computed while constructing the (uncompressed) SFNT  */
+  /*                  header.  It is not contained in the WOFF file.       */
+  /*                                                                       */
+  typedef struct  WOFF_TableRec_
+  {
+    FT_ULong  Tag;           /* table ID                  */
+    FT_ULong  Offset;        /* table file offset         */
+    FT_ULong  CompLength;    /* compressed table length   */
+    FT_ULong  OrigLength;    /* uncompressed table length */
+    FT_ULong  CheckSum;      /* uncompressed checksum     */
+
+    FT_ULong  OrigOffset;    /* uncompressed table file offset */
+                             /* (not in the WOFF file)         */
+  } WOFF_TableRec, *WOFF_Table;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_LongMetricsRec                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure modeling the long metrics of the `hmtx' and `vmtx'     */
+  /*    TrueType tables.  The values are expressed in font units.          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    advance :: The advance width or height for the glyph.              */
+  /*                                                                       */
+  /*    bearing :: The left-side or top-side bearing for the glyph.        */
+  /*                                                                       */
+  typedef struct  TT_LongMetricsRec_
+  {
+    FT_UShort  advance;
+    FT_Short   bearing;
+
+  } TT_LongMetricsRec, *TT_LongMetrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    TT_ShortMetrics                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple type to model the short metrics of the `hmtx' and `vmtx'  */
+  /*    tables.                                                            */
+  /*                                                                       */
+  typedef FT_Short  TT_ShortMetrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_NameEntryRec                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure modeling TrueType name records.  Name records are used */
+  /*    to store important strings like family name, style name,           */
+  /*    copyright, etc. in _localized_ versions (i.e., language, encoding, */
+  /*    etc).                                                              */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    platformID   :: The ID of the name's encoding platform.            */
+  /*                                                                       */
+  /*    encodingID   :: The platform-specific ID for the name's encoding.  */
+  /*                                                                       */
+  /*    languageID   :: The platform-specific ID for the name's language.  */
+  /*                                                                       */
+  /*    nameID       :: The ID specifying what kind of name this is.       */
+  /*                                                                       */
+  /*    stringLength :: The length of the string in bytes.                 */
+  /*                                                                       */
+  /*    stringOffset :: The offset to the string in the `name' table.      */
+  /*                                                                       */
+  /*    string       :: A pointer to the string's bytes.  Note that these  */
+  /*                    are usually UTF-16 encoded characters.             */
+  /*                                                                       */
+  typedef struct  TT_NameEntryRec_
+  {
+    FT_UShort  platformID;
+    FT_UShort  encodingID;
+    FT_UShort  languageID;
+    FT_UShort  nameID;
+    FT_UShort  stringLength;
+    FT_ULong   stringOffset;
+
+    /* this last field is not defined in the spec */
+    /* but used by the FreeType engine            */
+
+    FT_Byte*   string;
+
+  } TT_NameEntryRec, *TT_NameEntry;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_NameTableRec                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure modeling the TrueType name table.                      */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    format         :: The format of the name table.                    */
+  /*                                                                       */
+  /*    numNameRecords :: The number of names in table.                    */
+  /*                                                                       */
+  /*    storageOffset  :: The offset of the name table in the `name'       */
+  /*                      TrueType table.                                  */
+  /*                                                                       */
+  /*    names          :: An array of name records.                        */
+  /*                                                                       */
+  /*    stream         :: the file's input stream.                         */
+  /*                                                                       */
+  typedef struct  TT_NameTableRec_
+  {
+    FT_UShort         format;
+    FT_UInt           numNameRecords;
+    FT_UInt           storageOffset;
+    TT_NameEntryRec*  names;
+    FT_Stream         stream;
+
+  } TT_NameTableRec, *TT_NameTable;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***             OPTIONAL TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_GaspRangeRec                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A tiny structure used to model a gasp range according to the       */
+  /*    TrueType specification.                                            */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    maxPPEM  :: The maximum ppem value to which `gaspFlag' applies.    */
+  /*                                                                       */
+  /*    gaspFlag :: A flag describing the grid-fitting and anti-aliasing   */
+  /*                modes to be used.                                      */
+  /*                                                                       */
+  typedef struct  TT_GaspRangeRec_
+  {
+    FT_UShort  maxPPEM;
+    FT_UShort  gaspFlag;
+
+  } TT_GaspRangeRec, *TT_GaspRange;
+
+
+#define TT_GASP_GRIDFIT  0x01
+#define TT_GASP_DOGRAY   0x02
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_GaspRec                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure modeling the TrueType `gasp' table used to specify     */
+  /*    grid-fitting and anti-aliasing behaviour.                          */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    version    :: The version number.                                  */
+  /*                                                                       */
+  /*    numRanges  :: The number of gasp ranges in table.                  */
+  /*                                                                       */
+  /*    gaspRanges :: An array of gasp ranges.                             */
+  /*                                                                       */
+  typedef struct  TT_Gasp_
+  {
+    FT_UShort     version;
+    FT_UShort     numRanges;
+    TT_GaspRange  gaspRanges;
+
+  } TT_GaspRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***                    EMBEDDED BITMAPS SUPPORT                       ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_MetricsRec                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to hold the big metrics of a given glyph bitmap   */
+  /*    in a TrueType or OpenType font.  These are usually found in the    */
+  /*    `EBDT' (Microsoft) or `bloc' (Apple) table.                        */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    height       :: The glyph height in pixels.                        */
+  /*                                                                       */
+  /*    width        :: The glyph width in pixels.                         */
+  /*                                                                       */
+  /*    horiBearingX :: The horizontal left bearing.                       */
+  /*                                                                       */
+  /*    horiBearingY :: The horizontal top bearing.                        */
+  /*                                                                       */
+  /*    horiAdvance  :: The horizontal advance.                            */
+  /*                                                                       */
+  /*    vertBearingX :: The vertical left bearing.                         */
+  /*                                                                       */
+  /*    vertBearingY :: The vertical top bearing.                          */
+  /*                                                                       */
+  /*    vertAdvance  :: The vertical advance.                              */
+  /*                                                                       */
+  typedef struct  TT_SBit_MetricsRec_
+  {
+    FT_UShort  height;
+    FT_UShort  width;
+
+    FT_Short   horiBearingX;
+    FT_Short   horiBearingY;
+    FT_UShort  horiAdvance;
+
+    FT_Short   vertBearingX;
+    FT_Short   vertBearingY;
+    FT_UShort  vertAdvance;
+
+  } TT_SBit_MetricsRec, *TT_SBit_Metrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_SmallMetricsRec                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to hold the small metrics of a given glyph bitmap */
+  /*    in a TrueType or OpenType font.  These are usually found in the    */
+  /*    `EBDT' (Microsoft) or the `bdat' (Apple) table.                    */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    height   :: The glyph height in pixels.                            */
+  /*                                                                       */
+  /*    width    :: The glyph width in pixels.                             */
+  /*                                                                       */
+  /*    bearingX :: The left-side bearing.                                 */
+  /*                                                                       */
+  /*    bearingY :: The top-side bearing.                                  */
+  /*                                                                       */
+  /*    advance  :: The advance width or height.                           */
+  /*                                                                       */
+  typedef struct  TT_SBit_Small_Metrics_
+  {
+    FT_Byte  height;
+    FT_Byte  width;
+
+    FT_Char  bearingX;
+    FT_Char  bearingY;
+    FT_Byte  advance;
+
+  } TT_SBit_SmallMetricsRec, *TT_SBit_SmallMetrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_LineMetricsRec                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to describe the text line metrics of a given      */
+  /*    bitmap strike, for either a horizontal or vertical layout.         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    ascender                :: The ascender in pixels.                 */
+  /*                                                                       */
+  /*    descender               :: The descender in pixels.                */
+  /*                                                                       */
+  /*    max_width               :: The maximum glyph width in pixels.      */
+  /*                                                                       */
+  /*    caret_slope_enumerator  :: Rise of the caret slope, typically set  */
+  /*                               to 1 for non-italic fonts.              */
+  /*                                                                       */
+  /*    caret_slope_denominator :: Rise of the caret slope, typically set  */
+  /*                               to 0 for non-italic fonts.              */
+  /*                                                                       */
+  /*    caret_offset            :: Offset in pixels to move the caret for  */
+  /*                               proper positioning.                     */
+  /*                                                                       */
+  /*    min_origin_SB           :: Minimum of horiBearingX (resp.          */
+  /*                               vertBearingY).                          */
+  /*    min_advance_SB          :: Minimum of                              */
+  /*                                                                       */
+  /*                                 horizontal advance -                  */
+  /*                                   ( horiBearingX + width )            */
+  /*                                                                       */
+  /*                               resp.                                   */
+  /*                                                                       */
+  /*                                 vertical advance -                    */
+  /*                                   ( vertBearingY + height )           */
+  /*                                                                       */
+  /*    max_before_BL           :: Maximum of horiBearingY (resp.          */
+  /*                               vertBearingY).                          */
+  /*                                                                       */
+  /*    min_after_BL            :: Minimum of                              */
+  /*                                                                       */
+  /*                                 horiBearingY - height                 */
+  /*                                                                       */
+  /*                               resp.                                   */
+  /*                                                                       */
+  /*                                 vertBearingX - width                  */
+  /*                                                                       */
+  /*    pads                    :: Unused (to make the size of the record  */
+  /*                               a multiple of 32 bits.                  */
+  /*                                                                       */
+  typedef struct  TT_SBit_LineMetricsRec_
+  {
+    FT_Char  ascender;
+    FT_Char  descender;
+    FT_Byte  max_width;
+    FT_Char  caret_slope_numerator;
+    FT_Char  caret_slope_denominator;
+    FT_Char  caret_offset;
+    FT_Char  min_origin_SB;
+    FT_Char  min_advance_SB;
+    FT_Char  max_before_BL;
+    FT_Char  min_after_BL;
+    FT_Char  pads[2];
+
+  } TT_SBit_LineMetricsRec, *TT_SBit_LineMetrics;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_RangeRec                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A TrueType/OpenType subIndexTable as defined in the `EBLC'         */
+  /*    (Microsoft) or `bloc' (Apple) tables.                              */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    first_glyph   :: The first glyph index in the range.               */
+  /*                                                                       */
+  /*    last_glyph    :: The last glyph index in the range.                */
+  /*                                                                       */
+  /*    index_format  :: The format of index table.  Valid values are 1    */
+  /*                     to 5.                                             */
+  /*                                                                       */
+  /*    image_format  :: The format of `EBDT' image data.                  */
+  /*                                                                       */
+  /*    image_offset  :: The offset to image data in `EBDT'.               */
+  /*                                                                       */
+  /*    image_size    :: For index formats 2 and 5.  This is the size in   */
+  /*                     bytes of each glyph bitmap.                       */
+  /*                                                                       */
+  /*    big_metrics   :: For index formats 2 and 5.  This is the big       */
+  /*                     metrics for each glyph bitmap.                    */
+  /*                                                                       */
+  /*    num_glyphs    :: For index formats 4 and 5.  This is the number of */
+  /*                     glyphs in the code array.                         */
+  /*                                                                       */
+  /*    glyph_offsets :: For index formats 1 and 3.                        */
+  /*                                                                       */
+  /*    glyph_codes   :: For index formats 4 and 5.                        */
+  /*                                                                       */
+  /*    table_offset  :: The offset of the index table in the `EBLC'       */
+  /*                     table.  Only used during strike loading.          */
+  /*                                                                       */
+  typedef struct  TT_SBit_RangeRec_
+  {
+    FT_UShort           first_glyph;
+    FT_UShort           last_glyph;
+
+    FT_UShort           index_format;
+    FT_UShort           image_format;
+    FT_ULong            image_offset;
+
+    FT_ULong            image_size;
+    TT_SBit_MetricsRec  metrics;
+    FT_ULong            num_glyphs;
+
+    FT_ULong*           glyph_offsets;
+    FT_UShort*          glyph_codes;
+
+    FT_ULong            table_offset;
+
+  } TT_SBit_RangeRec, *TT_SBit_Range;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_StrikeRec                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used describe a given bitmap strike in the `EBLC'      */
+  /*    (Microsoft) or `bloc' (Apple) tables.                              */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*   num_index_ranges :: The number of index ranges.                     */
+  /*                                                                       */
+  /*   index_ranges     :: An array of glyph index ranges.                 */
+  /*                                                                       */
+  /*   color_ref        :: Unused.  `color_ref' is put in for future       */
+  /*                       enhancements, but these fields are already      */
+  /*                       in use by other platforms (e.g. Newton).        */
+  /*                       For details, please see                         */
+  /*                                                                       */
+  /*                         http://fonts.apple.com/                       */
+  /*                                TTRefMan/RM06/Chap6bloc.html           */
+  /*                                                                       */
+  /*   hori             :: The line metrics for horizontal layouts.        */
+  /*                                                                       */
+  /*   vert             :: The line metrics for vertical layouts.          */
+  /*                                                                       */
+  /*   start_glyph      :: The lowest glyph index for this strike.         */
+  /*                                                                       */
+  /*   end_glyph        :: The highest glyph index for this strike.        */
+  /*                                                                       */
+  /*   x_ppem           :: The number of horizontal pixels per EM.         */
+  /*                                                                       */
+  /*   y_ppem           :: The number of vertical pixels per EM.           */
+  /*                                                                       */
+  /*   bit_depth        :: The bit depth.  Valid values are 1, 2, 4,       */
+  /*                       and 8.                                          */
+  /*                                                                       */
+  /*   flags            :: Is this a vertical or horizontal strike?  For   */
+  /*                       details, please see                             */
+  /*                                                                       */
+  /*                         http://fonts.apple.com/                       */
+  /*                                TTRefMan/RM06/Chap6bloc.html           */
+  /*                                                                       */
+  typedef struct  TT_SBit_StrikeRec_
+  {
+    FT_Int                  num_ranges;
+    TT_SBit_Range           sbit_ranges;
+    FT_ULong                ranges_offset;
+
+    FT_ULong                color_ref;
+
+    TT_SBit_LineMetricsRec  hori;
+    TT_SBit_LineMetricsRec  vert;
+
+    FT_UShort               start_glyph;
+    FT_UShort               end_glyph;
+
+    FT_Byte                 x_ppem;
+    FT_Byte                 y_ppem;
+
+    FT_Byte                 bit_depth;
+    FT_Char                 flags;
+
+  } TT_SBit_StrikeRec, *TT_SBit_Strike;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_ComponentRec                                               */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A simple structure to describe a compound sbit element.            */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    glyph_code :: The element's glyph index.                           */
+  /*                                                                       */
+  /*    x_offset   :: The element's left bearing.                          */
+  /*                                                                       */
+  /*    y_offset   :: The element's top bearing.                           */
+  /*                                                                       */
+  typedef struct  TT_SBit_ComponentRec_
+  {
+    FT_UShort  glyph_code;
+    FT_Char    x_offset;
+    FT_Char    y_offset;
+
+  } TT_SBit_ComponentRec, *TT_SBit_Component;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_SBit_ScaleRec                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used describe a given bitmap scaling table, as defined */
+  /*    in the `EBSC' table.                                               */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    hori              :: The horizontal line metrics.                  */
+  /*                                                                       */
+  /*    vert              :: The vertical line metrics.                    */
+  /*                                                                       */
+  /*    x_ppem            :: The number of horizontal pixels per EM.       */
+  /*                                                                       */
+  /*    y_ppem            :: The number of vertical pixels per EM.         */
+  /*                                                                       */
+  /*    x_ppem_substitute :: Substitution x_ppem value.                    */
+  /*                                                                       */
+  /*    y_ppem_substitute :: Substitution y_ppem value.                    */
+  /*                                                                       */
+  typedef struct  TT_SBit_ScaleRec_
+  {
+    TT_SBit_LineMetricsRec  hori;
+    TT_SBit_LineMetricsRec  vert;
+
+    FT_Byte                 x_ppem;
+    FT_Byte                 y_ppem;
+
+    FT_Byte                 x_ppem_substitute;
+    FT_Byte                 y_ppem_substitute;
+
+  } TT_SBit_ScaleRec, *TT_SBit_Scale;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***                  POSTSCRIPT GLYPH NAMES SUPPORT                   ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_Post_20Rec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Postscript names sub-table, format 2.0.  Stores the PS name of     */
+  /*    each glyph in the font face.                                       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    num_glyphs    :: The number of named glyphs in the table.          */
+  /*                                                                       */
+  /*    num_names     :: The number of PS names stored in the table.       */
+  /*                                                                       */
+  /*    glyph_indices :: The indices of the glyphs in the names arrays.    */
+  /*                                                                       */
+  /*    glyph_names   :: The PS names not in Mac Encoding.                 */
+  /*                                                                       */
+  typedef struct  TT_Post_20Rec_
+  {
+    FT_UShort   num_glyphs;
+    FT_UShort   num_names;
+    FT_UShort*  glyph_indices;
+    FT_Char**   glyph_names;
+
+  } TT_Post_20Rec, *TT_Post_20;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_Post_25Rec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Postscript names sub-table, format 2.5.  Stores the PS name of     */
+  /*    each glyph in the font face.                                       */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    num_glyphs :: The number of glyphs in the table.                   */
+  /*                                                                       */
+  /*    offsets    :: An array of signed offsets in a normal Mac           */
+  /*                  Postscript name encoding.                            */
+  /*                                                                       */
+  typedef struct  TT_Post_25_
+  {
+    FT_UShort  num_glyphs;
+    FT_Char*   offsets;
+
+  } TT_Post_25Rec, *TT_Post_25;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_Post_NamesRec                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Postscript names table, either format 2.0 or 2.5.                  */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    loaded    :: A flag to indicate whether the PS names are loaded.   */
+  /*                                                                       */
+  /*    format_20 :: The sub-table used for format 2.0.                    */
+  /*                                                                       */
+  /*    format_25 :: The sub-table used for format 2.5.                    */
+  /*                                                                       */
+  typedef struct  TT_Post_NamesRec_
+  {
+    FT_Bool  loaded;
+
+    union
+    {
+      TT_Post_20Rec  format_20;
+      TT_Post_25Rec  format_25;
+
+    } names;
+
+  } TT_Post_NamesRec, *TT_Post_Names;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***                    GX VARIATION TABLE SUPPORT                     ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+  typedef struct GX_BlendRec_  *GX_Blend;
+#endif
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***              EMBEDDED BDF PROPERTIES TABLE SUPPORT                ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   * These types are used to support a `BDF ' table that isn't part of the
+   * official TrueType specification.  It is mainly used in SFNT-based
+   * bitmap fonts that were generated from a set of BDF fonts.
+   *
+   * The format of the table is as follows.
+   *
+   *   USHORT   version      `BDF ' table version number, should be 0x0001.
+   *   USHORT   strikeCount  Number of strikes (bitmap sizes) in this table.
+   *   ULONG    stringTable  Offset (from start of BDF table) to string
+   *                         table.
+   *
+   * This is followed by an array of `strikeCount' descriptors, having the
+   * following format.
+   *
+   *   USHORT   ppem         Vertical pixels per EM for this strike.
+   *   USHORT   numItems     Number of items for this strike (properties and
+   *                         atoms).  Maximum is 255.
+   *
+   * This array in turn is followed by `strikeCount' value sets.  Each
+   * `value set' is an array of `numItems' items with the following format.
+   *
+   *   ULONG    item_name    Offset in string table to item name.
+   *   USHORT   item_type    The item type.  Possible values are
+   *                            0 => string (e.g., COMMENT)
+   *                            1 => atom   (e.g., FONT or even SIZE)
+   *                            2 => int32
+   *                            3 => uint32
+   *                         0x10 => A flag to indicate a properties.  This
+   *                                 is ORed with the above values.
+   *   ULONG    item_value   For strings  => Offset into string table without
+   *                                         the corresponding double quotes.
+   *                         For atoms    => Offset into string table.
+   *                         For integers => Direct value.
+   *
+   * All strings in the string table consist of bytes and are
+   * zero-terminated.
+   *
+   */
+
+#ifdef TT_CONFIG_OPTION_BDF
+
+  typedef struct  TT_BDFRec_
+  {
+    FT_Byte*   table;
+    FT_Byte*   table_end;
+    FT_Byte*   strings;
+    FT_ULong   strings_size;
+    FT_UInt    num_strikes;
+    FT_Bool    loaded;
+
+  } TT_BDFRec, *TT_BDF;
+
+#endif /* TT_CONFIG_OPTION_BDF */
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /***                  ORIGINAL TT_FACE CLASS DEFINITION                ***/
+  /***                                                                   ***/
+  /***                                                                   ***/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This structure/class is defined here because it is common to the      */
+  /* following formats: TTF, OpenType-TT, and OpenType-CFF.                */
+  /*                                                                       */
+  /* Note, however, that the classes TT_Size and TT_GlyphSlot are not      */
+  /* shared between font drivers, and are thus defined in `ttobjs.h'.      */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    TT_Face                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a TrueType face/font object.  A TT_Face encapsulates   */
+  /*    the resolution and scaling independent parts of a TrueType font    */
+  /*    resource.                                                          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The TT_Face structure is also used as a `parent class' for the     */
+  /*    OpenType-CFF class (T2_Face).                                      */
+  /*                                                                       */
+  typedef struct TT_FaceRec_*  TT_Face;
+
+
+  /* a function type used for the truetype bytecode interpreter hooks */
+  typedef FT_Error
+  (*TT_Interpreter)( void*  exec_context );
+
+  /* forward declaration */
+  typedef struct TT_LoaderRec_*  TT_Loader;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Loader_GotoTableFunc                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Seeks a stream to the start of a given TrueType table.             */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face   :: A handle to the target face object.                      */
+  /*                                                                       */
+  /*    tag    :: A 4-byte tag used to name the table.                     */
+  /*                                                                       */
+  /*    stream :: The input stream.                                        */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    length :: The length of the table in bytes.  Set to 0 if not       */
+  /*              needed.                                                  */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The stream cursor must be at the font file's origin.               */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Loader_GotoTableFunc)( TT_Face    face,
+                              FT_ULong   tag,
+                              FT_Stream  stream,
+                              FT_ULong*  length );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Loader_StartGlyphFunc                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Seeks a stream to the start of a given glyph element, and opens a  */
+  /*    frame for it.                                                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    loader      :: The current TrueType glyph loader object.           */
+  /*                                                                       */
+  /*    glyph index :: The index of the glyph to access.                   */
+  /*                                                                       */
+  /*    offset      :: The offset of the glyph according to the            */
+  /*                   `locations' table.                                  */
+  /*                                                                       */
+  /*    byte_count  :: The size of the frame in bytes.                     */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This function is normally equivalent to FT_STREAM_SEEK(offset)     */
+  /*    followed by FT_FRAME_ENTER(byte_count) with the loader's stream,   */
+  /*    but alternative formats (e.g. compressed ones) might use something */
+  /*    different.                                                         */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Loader_StartGlyphFunc)( TT_Loader  loader,
+                               FT_UInt    glyph_index,
+                               FT_ULong   offset,
+                               FT_UInt    byte_count );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Loader_ReadGlyphFunc                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Reads one glyph element (its header, a simple glyph, or a          */
+  /*    composite) from the loader's current stream frame.                 */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    loader :: The current TrueType glyph loader object.                */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  typedef FT_Error
+  (*TT_Loader_ReadGlyphFunc)( TT_Loader  loader );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <FuncType>                                                            */
+  /*    TT_Loader_EndGlyphFunc                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Closes the current loader stream frame for the glyph.              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    loader :: The current TrueType glyph loader object.                */
+  /*                                                                       */
+  typedef void
+  (*TT_Loader_EndGlyphFunc)( TT_Loader  loader );
+
+
+  typedef enum TT_SbitTableType_
+  {
+    TT_SBIT_TABLE_TYPE_NONE = 0,
+    TT_SBIT_TABLE_TYPE_EBLC, /* `EBLC' (Microsoft), */
+                             /* `bloc' (Apple)      */
+    TT_SBIT_TABLE_TYPE_CBLC, /* `CBLC' (Google)     */
+    TT_SBIT_TABLE_TYPE_SBIX, /* `sbix' (Apple)      */
+
+    /* do not remove */
+    TT_SBIT_TABLE_TYPE_MAX
+
+  } TT_SbitTableType;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                         TrueType Face Type                            */
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_Face                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The TrueType face class.  These objects model the resolution and   */
+  /*    point-size independent data found in a TrueType font file.         */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    root                 :: The base FT_Face structure, managed by the */
+  /*                            base layer.                                */
+  /*                                                                       */
+  /*    ttc_header           :: The TrueType collection header, used when  */
+  /*                            the file is a `ttc' rather than a `ttf'.   */
+  /*                            For ordinary font files, the field         */
+  /*                            `ttc_header.count' is set to 0.            */
+  /*                                                                       */
+  /*    format_tag           :: The font format tag.                       */
+  /*                                                                       */
+  /*    num_tables           :: The number of TrueType tables in this font */
+  /*                            file.                                      */
+  /*                                                                       */
+  /*    dir_tables           :: The directory of TrueType tables for this  */
+  /*                            font file.                                 */
+  /*                                                                       */
+  /*    header               :: The font's font header (`head' table).     */
+  /*                            Read on font opening.                      */
+  /*                                                                       */
+  /*    horizontal           :: The font's horizontal header (`hhea'       */
+  /*                            table).  This field also contains the      */
+  /*                            associated horizontal metrics table        */
+  /*                            (`hmtx').                                  */
+  /*                                                                       */
+  /*    max_profile          :: The font's maximum profile table.  Read on */
+  /*                            font opening.  Note that some maximum      */
+  /*                            values cannot be taken directly from this  */
+  /*                            table.  We thus define additional fields   */
+  /*                            below to hold the computed maxima.         */
+  /*                                                                       */
+  /*    vertical_info        :: A boolean which is set when the font file  */
+  /*                            contains vertical metrics.  If not, the    */
+  /*                            value of the `vertical' field is           */
+  /*                            undefined.                                 */
+  /*                                                                       */
+  /*    vertical             :: The font's vertical header (`vhea' table). */
+  /*                            This field also contains the associated    */
+  /*                            vertical metrics table (`vmtx'), if found. */
+  /*                            IMPORTANT: The contents of this field is   */
+  /*                            undefined if the `verticalInfo' field is   */
+  /*                            unset.                                     */
+  /*                                                                       */
+  /*    num_names            :: The number of name records within this     */
+  /*                            TrueType font.                             */
+  /*                                                                       */
+  /*    name_table           :: The table of name records (`name').        */
+  /*                                                                       */
+  /*    os2                  :: The font's OS/2 table (`OS/2').            */
+  /*                                                                       */
+  /*    postscript           :: The font's PostScript table (`post'        */
+  /*                            table).  The PostScript glyph names are    */
+  /*                            not loaded by the driver on face opening.  */
+  /*                            See the `ttpost' module for more details.  */
+  /*                                                                       */
+  /*    cmap_table           :: Address of the face's `cmap' SFNT table    */
+  /*                            in memory (it's an extracted frame).       */
+  /*                                                                       */
+  /*    cmap_size            :: The size in bytes of the `cmap_table'      */
+  /*                            described above.                           */
+  /*                                                                       */
+  /*    goto_table           :: A function called by each TrueType table   */
+  /*                            loader to position a stream's cursor to    */
+  /*                            the start of a given table according to    */
+  /*                            its tag.  It defaults to TT_Goto_Face but  */
+  /*                            can be different for strange formats (e.g. */
+  /*                            Type 42).                                  */
+  /*                                                                       */
+  /*    access_glyph_frame   :: A function used to access the frame of a   */
+  /*                            given glyph within the face's font file.   */
+  /*                                                                       */
+  /*    forget_glyph_frame   :: A function used to forget the frame of a   */
+  /*                            given glyph when all data has been loaded. */
+  /*                                                                       */
+  /*    read_glyph_header    :: A function used to read a glyph header.    */
+  /*                            It must be called between an `access' and  */
+  /*                            `forget'.                                  */
+  /*                                                                       */
+  /*    read_simple_glyph    :: A function used to read a simple glyph.    */
+  /*                            It must be called after the header was     */
+  /*                            read, and before the `forget'.             */
+  /*                                                                       */
+  /*    read_composite_glyph :: A function used to read a composite glyph. */
+  /*                            It must be called after the header was     */
+  /*                            read, and before the `forget'.             */
+  /*                                                                       */
+  /*    sfnt                 :: A pointer to the SFNT service.             */
+  /*                                                                       */
+  /*    psnames              :: A pointer to the PostScript names service. */
+  /*                                                                       */
+  /*    hdmx                 :: The face's horizontal device metrics       */
+  /*                            (`hdmx' table).  This table is optional in */
+  /*                            TrueType/OpenType fonts.                   */
+  /*                                                                       */
+  /*    gasp                 :: The grid-fitting and scaling properties    */
+  /*                            table (`gasp').  This table is optional in */
+  /*                            TrueType/OpenType fonts.                   */
+  /*                                                                       */
+  /*    pclt                 :: The `pclt' SFNT table.                     */
+  /*                                                                       */
+  /*    num_sbit_scales      :: The number of sbit scales for this font.   */
+  /*                                                                       */
+  /*    sbit_scales          :: Array of sbit scales embedded in this      */
+  /*                            font.  This table is optional in a         */
+  /*                            TrueType/OpenType font.                    */
+  /*                                                                       */
+  /*    postscript_names     :: A table used to store the Postscript names */
+  /*                            of  the glyphs for this font.  See the     */
+  /*                            file  `ttconfig.h' for comments on the     */
+  /*                            TT_CONFIG_OPTION_POSTSCRIPT_NAMES option.  */
+  /*                                                                       */
+  /*    num_locations        :: The number of glyph locations in this      */
+  /*                            TrueType file.  This should be             */
+  /*                            identical to the number of glyphs.         */
+  /*                            Ignored for Type 2 fonts.                  */
+  /*                                                                       */
+  /*    glyph_locations      :: An array of longs.  These are offsets to   */
+  /*                            glyph data within the `glyf' table.        */
+  /*                            Ignored for Type 2 font faces.             */
+  /*                                                                       */
+  /*    glyf_len             :: The length of the `glyf' table.  Needed    */
+  /*                            for malformed `loca' tables.               */
+  /*                                                                       */
+  /*    font_program_size    :: Size in bytecodes of the face's font       */
+  /*                            program.  0 if none defined.  Ignored for  */
+  /*                            Type 2 fonts.                              */
+  /*                                                                       */
+  /*    font_program         :: The face's font program (bytecode stream)  */
+  /*                            executed at load time, also used during    */
+  /*                            glyph rendering.  Comes from the `fpgm'    */
+  /*                            table.  Ignored for Type 2 font fonts.     */
+  /*                                                                       */
+  /*    cvt_program_size     :: The size in bytecodes of the face's cvt    */
+  /*                            program.  Ignored for Type 2 fonts.        */
+  /*                                                                       */
+  /*    cvt_program          :: The face's cvt program (bytecode stream)   */
+  /*                            executed each time an instance/size is     */
+  /*                            changed/reset.  Comes from the `prep'      */
+  /*                            table.  Ignored for Type 2 fonts.          */
+  /*                                                                       */
+  /*    cvt_size             :: Size of the control value table (in        */
+  /*                            entries).   Ignored for Type 2 fonts.      */
+  /*                                                                       */
+  /*    cvt                  :: The face's original control value table.   */
+  /*                            Coordinates are expressed in unscaled font */
+  /*                            units.  Comes from the `cvt ' table.       */
+  /*                            Ignored for Type 2 fonts.                  */
+  /*                                                                       */
+  /*    num_kern_pairs       :: The number of kerning pairs present in the */
+  /*                            font file.  The engine only loads the      */
+  /*                            first horizontal format 0 kern table it    */
+  /*                            finds in the font file.  Ignored for       */
+  /*                            Type 2 fonts.                              */
+  /*                                                                       */
+  /*    kern_table_index     :: The index of the kerning table in the font */
+  /*                            kerning directory.  Ignored for Type 2     */
+  /*                            fonts.                                     */
+  /*                                                                       */
+  /*    interpreter          :: A pointer to the TrueType bytecode         */
+  /*                            interpreters field is also used to hook    */
+  /*                            the debugger in `ttdebug'.                 */
+  /*                                                                       */
+  /*    unpatented_hinting   :: If true, use only unpatented methods in    */
+  /*                            the bytecode interpreter.                  */
+  /*                                                                       */
+  /*    doblend              :: A boolean which is set if the font should  */
+  /*                            be blended (this is for GX var).           */
+  /*                                                                       */
+  /*    blend                :: Contains the data needed to control GX     */
+  /*                            variation tables (rather like Multiple     */
+  /*                            Master data).                              */
+  /*                                                                       */
+  /*    extra                :: Reserved for third-party font drivers.     */
+  /*                                                                       */
+  /*    postscript_name      :: The PS name of the font.  Used by the      */
+  /*                            postscript name service.                   */
+  /*                                                                       */
+  typedef struct  TT_FaceRec_
+  {
+    FT_FaceRec            root;
+
+    TTC_HeaderRec         ttc_header;
+
+    FT_ULong              format_tag;
+    FT_UShort             num_tables;
+    TT_Table              dir_tables;
+
+    TT_Header             header;       /* TrueType header table          */
+    TT_HoriHeader         horizontal;   /* TrueType horizontal header     */
+
+    TT_MaxProfile         max_profile;
+
+    FT_Bool               vertical_info;
+    TT_VertHeader         vertical;     /* TT Vertical header, if present */
+
+    FT_UShort             num_names;    /* number of name records  */
+    TT_NameTableRec       name_table;   /* name table              */
+
+    TT_OS2                os2;          /* TrueType OS/2 table            */
+    TT_Postscript         postscript;   /* TrueType Postscript table      */
+
+    FT_Byte*              cmap_table;   /* extracted `cmap' table */
+    FT_ULong              cmap_size;
+
+    TT_Loader_GotoTableFunc   goto_table;
+
+    TT_Loader_StartGlyphFunc  access_glyph_frame;
+    TT_Loader_EndGlyphFunc    forget_glyph_frame;
+    TT_Loader_ReadGlyphFunc   read_glyph_header;
+    TT_Loader_ReadGlyphFunc   read_simple_glyph;
+    TT_Loader_ReadGlyphFunc   read_composite_glyph;
+
+    /* a typeless pointer to the SFNT_Interface table used to load */
+    /* the basic TrueType tables in the face object                */
+    void*                 sfnt;
+
+    /* a typeless pointer to the FT_Service_PsCMapsRec table used to */
+    /* handle glyph names <-> unicode & Mac values                   */
+    void*                 psnames;
+
+
+    /***********************************************************************/
+    /*                                                                     */
+    /* Optional TrueType/OpenType tables                                   */
+    /*                                                                     */
+    /***********************************************************************/
+
+    /* grid-fitting and scaling table */
+    TT_GaspRec            gasp;                 /* the `gasp' table */
+
+    /* PCL 5 table */
+    TT_PCLT               pclt;
+
+    /* embedded bitmaps support */
+    FT_ULong              num_sbit_scales;
+    TT_SBit_Scale         sbit_scales;
+
+    /* postscript names table */
+    TT_Post_NamesRec      postscript_names;
+
+
+    /***********************************************************************/
+    /*                                                                     */
+    /* TrueType-specific fields (ignored by the OTF-Type2 driver)          */
+    /*                                                                     */
+    /***********************************************************************/
+
+    /* the font program, if any */
+    FT_ULong              font_program_size;
+    FT_Byte*              font_program;
+
+    /* the cvt program, if any */
+    FT_ULong              cvt_program_size;
+    FT_Byte*              cvt_program;
+
+    /* the original, unscaled, control value table */
+    FT_ULong              cvt_size;
+    FT_Short*             cvt;
+
+    /* A pointer to the bytecode interpreter to use.  This is also */
+    /* used to hook the debugger for the `ttdebug' utility.        */
+    TT_Interpreter        interpreter;
+
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    /* Use unpatented hinting only. */
+    FT_Bool               unpatented_hinting;
+#endif
+
+    /***********************************************************************/
+    /*                                                                     */
+    /* Other tables or fields. This is used by derivative formats like     */
+    /* OpenType.                                                           */
+    /*                                                                     */
+    /***********************************************************************/
+
+    FT_Generic            extra;
+
+    const char*           postscript_name;
+
+    FT_ULong              glyf_len;
+
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+    FT_Bool               doblend;
+    GX_Blend              blend;
+#endif
+
+    /* since version 2.2 */
+
+    FT_Byte*              horz_metrics;
+    FT_ULong              horz_metrics_size;
+
+    FT_Byte*              vert_metrics;
+    FT_ULong              vert_metrics_size;
+
+    FT_ULong              num_locations; /* in broken TTF, gid > 0xFFFF */
+    FT_Byte*              glyph_locations;
+
+    FT_Byte*              hdmx_table;
+    FT_ULong              hdmx_table_size;
+    FT_UInt               hdmx_record_count;
+    FT_ULong              hdmx_record_size;
+    FT_Byte*              hdmx_record_sizes;
+
+    FT_Byte*              sbit_table;
+    FT_ULong              sbit_table_size;
+    TT_SbitTableType      sbit_table_type;
+    FT_UInt               sbit_num_strikes;
+
+    FT_Byte*              kern_table;
+    FT_ULong              kern_table_size;
+    FT_UInt               num_kern_tables;
+    FT_UInt32             kern_avail_bits;
+    FT_UInt32             kern_order_bits;
+
+#ifdef TT_CONFIG_OPTION_BDF
+    TT_BDFRec             bdf;
+#endif /* TT_CONFIG_OPTION_BDF */
+
+    /* since 2.3.0 */
+    FT_ULong              horz_metrics_offset;
+    FT_ULong              vert_metrics_offset;
+
+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+    /* since 2.4.12 */
+    FT_ULong              sph_found_func_flags; /* special functions found */
+                                                /* for this face           */
+    FT_Bool               sph_compatibility_mode;
+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
+
+  } TT_FaceRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*  <Struct>                                                             */
+  /*     TT_GlyphZoneRec                                                   */
+  /*                                                                       */
+  /*  <Description>                                                        */
+  /*     A glyph zone is used to load, scale and hint glyph outline        */
+  /*     coordinates.                                                      */
+  /*                                                                       */
+  /*  <Fields>                                                             */
+  /*     memory       :: A handle to the memory manager.                   */
+  /*                                                                       */
+  /*     max_points   :: The maximum size in points of the zone.           */
+  /*                                                                       */
+  /*     max_contours :: Max size in links contours of the zone.           */
+  /*                                                                       */
+  /*     n_points     :: The current number of points in the zone.         */
+  /*                                                                       */
+  /*     n_contours   :: The current number of contours in the zone.       */
+  /*                                                                       */
+  /*     org          :: The original glyph coordinates (font              */
+  /*                     units/scaled).                                    */
+  /*                                                                       */
+  /*     cur          :: The current glyph coordinates (scaled/hinted).    */
+  /*                                                                       */
+  /*     tags         :: The point control tags.                           */
+  /*                                                                       */
+  /*     contours     :: The contours end points.                          */
+  /*                                                                       */
+  /*     first_point  :: Offset of the current subglyph's first point.     */
+  /*                                                                       */
+  typedef struct  TT_GlyphZoneRec_
+  {
+    FT_Memory   memory;
+    FT_UShort   max_points;
+    FT_UShort   max_contours;
+    FT_UShort   n_points;    /* number of points in zone    */
+    FT_Short    n_contours;  /* number of contours          */
+
+    FT_Vector*  org;         /* original point coordinates  */
+    FT_Vector*  cur;         /* current point coordinates   */
+    FT_Vector*  orus;        /* original (unscaled) point coordinates */
+
+    FT_Byte*    tags;        /* current touch flags         */
+    FT_UShort*  contours;    /* contour end points          */
+
+    FT_UShort   first_point; /* offset of first (#0) point  */
+
+  } TT_GlyphZoneRec, *TT_GlyphZone;
+
+
+  /* handle to execution context */
+  typedef struct TT_ExecContextRec_*  TT_ExecContext;
+
+  /* glyph loader structure */
+  typedef struct  TT_LoaderRec_
+  {
+    FT_Face          face;
+    FT_Size          size;
+    FT_GlyphSlot     glyph;
+    FT_GlyphLoader   gloader;
+
+    FT_ULong         load_flags;
+    FT_UInt          glyph_index;
+
+    FT_Stream        stream;
+    FT_Int           byte_len;
+
+    FT_Short         n_contours;
+    FT_BBox          bbox;
+    FT_Int           left_bearing;
+    FT_Int           advance;
+    FT_Int           linear;
+    FT_Bool          linear_def;
+    FT_Vector        pp1;
+    FT_Vector        pp2;
+
+    FT_ULong         glyf_offset;
+
+    /* the zone where we load our glyphs */
+    TT_GlyphZoneRec  base;
+    TT_GlyphZoneRec  zone;
+
+    TT_ExecContext   exec;
+    FT_Byte*         instructions;
+    FT_ULong         ins_pos;
+
+    /* for possible extensibility in other formats */
+    void*            other;
+
+    /* since version 2.1.8 */
+    FT_Int           top_bearing;
+    FT_Int           vadvance;
+    FT_Vector        pp3;
+    FT_Vector        pp4;
+
+    /* since version 2.2.1 */
+    FT_Byte*         cursor;
+    FT_Byte*         limit;
+
+  } TT_LoaderRec;
+
+
+FT_END_HEADER
+
+#endif /* __TTTYPES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal/tttypes.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/internal
===================================================================
--- lib/3rdparty/freetype/include/internal	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/internal	(copie de travail)

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/internal
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,7 ##
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln
Index: lib/3rdparty/freetype/include/t1tables.h
===================================================================
--- lib/3rdparty/freetype/include/t1tables.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/t1tables.h	(rÃ©vision 62573)
@@ -0,0 +1,662 @@
+/***************************************************************************/
+/*                                                                         */
+/*  t1tables.h                                                             */
+/*                                                                         */
+/*    Basic Type 1/Type 2 tables definitions and interface (specification  */
+/*    only).                                                               */
+/*                                                                         */
+/*  Copyright 1996-2004, 2006, 2008, 2009, 2011 by                         */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __T1TABLES_H__
+#define __T1TABLES_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    type1_tables                                                       */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    Type 1 Tables                                                      */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    Type~1 (PostScript) specific font tables.                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the definition of Type 1-specific tables,    */
+  /*    including structures related to other PostScript font formats.     */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /* Note that we separate font data in PS_FontInfoRec and PS_PrivateRec */
+  /* structures in order to support Multiple Master fonts.               */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_FontInfoRec                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a Type~1 or Type~2 FontInfo dictionary.  */
+  /*    Note that for Multiple Master fonts, each instance has its own     */
+  /*    FontInfo dictionary.                                               */
+  /*                                                                       */
+  typedef struct  PS_FontInfoRec_
+  {
+    FT_String*  version;
+    FT_String*  notice;
+    FT_String*  full_name;
+    FT_String*  family_name;
+    FT_String*  weight;
+    FT_Long     italic_angle;
+    FT_Bool     is_fixed_pitch;
+    FT_Short    underline_position;
+    FT_UShort   underline_thickness;
+
+  } PS_FontInfoRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_FontInfo                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a @PS_FontInfoRec structure.                           */
+  /*                                                                       */
+  typedef struct PS_FontInfoRec_*  PS_FontInfo;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    T1_FontInfo                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This type is equivalent to @PS_FontInfoRec.  It is deprecated but  */
+  /*    kept to maintain source compatibility between various versions of  */
+  /*    FreeType.                                                          */
+  /*                                                                       */
+  typedef PS_FontInfoRec  T1_FontInfo;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_PrivateRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a Type~1 or Type~2 private dictionary.   */
+  /*    Note that for Multiple Master fonts, each instance has its own     */
+  /*    Private dictionary.                                                */
+  /*                                                                       */
+  typedef struct  PS_PrivateRec_
+  {
+    FT_Int     unique_id;
+    FT_Int     lenIV;
+
+    FT_Byte    num_blue_values;
+    FT_Byte    num_other_blues;
+    FT_Byte    num_family_blues;
+    FT_Byte    num_family_other_blues;
+
+    FT_Short   blue_values[14];
+    FT_Short   other_blues[10];
+
+    FT_Short   family_blues      [14];
+    FT_Short   family_other_blues[10];
+
+    FT_Fixed   blue_scale;
+    FT_Int     blue_shift;
+    FT_Int     blue_fuzz;
+
+    FT_UShort  standard_width[1];
+    FT_UShort  standard_height[1];
+
+    FT_Byte    num_snap_widths;
+    FT_Byte    num_snap_heights;
+    FT_Bool    force_bold;
+    FT_Bool    round_stem_up;
+
+    FT_Short   snap_widths [13];  /* including std width  */
+    FT_Short   snap_heights[13];  /* including std height */
+
+    FT_Fixed   expansion_factor;
+
+    FT_Long    language_group;
+    FT_Long    password;
+
+    FT_Short   min_feature[2];
+
+  } PS_PrivateRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    PS_Private                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a @PS_PrivateRec structure.                            */
+  /*                                                                       */
+  typedef struct PS_PrivateRec_*  PS_Private;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    T1_Private                                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*   This type is equivalent to @PS_PrivateRec.  It is deprecated but    */
+  /*   kept to maintain source compatibility between various versions of   */
+  /*   FreeType.                                                           */
+  /*                                                                       */
+  typedef PS_PrivateRec  T1_Private;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    T1_Blend_Flags                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A set of flags used to indicate which fields are present in a      */
+  /*    given blend dictionary (font info or private).  Used to support    */
+  /*    Multiple Masters fonts.                                            */
+  /*                                                                       */
+  typedef enum  T1_Blend_Flags_
+  {
+    /*# required fields in a FontInfo blend dictionary */
+    T1_BLEND_UNDERLINE_POSITION = 0,
+    T1_BLEND_UNDERLINE_THICKNESS,
+    T1_BLEND_ITALIC_ANGLE,
+
+    /*# required fields in a Private blend dictionary */
+    T1_BLEND_BLUE_VALUES,
+    T1_BLEND_OTHER_BLUES,
+    T1_BLEND_STANDARD_WIDTH,
+    T1_BLEND_STANDARD_HEIGHT,
+    T1_BLEND_STEM_SNAP_WIDTHS,
+    T1_BLEND_STEM_SNAP_HEIGHTS,
+    T1_BLEND_BLUE_SCALE,
+    T1_BLEND_BLUE_SHIFT,
+    T1_BLEND_FAMILY_BLUES,
+    T1_BLEND_FAMILY_OTHER_BLUES,
+    T1_BLEND_FORCE_BOLD,
+
+    /*# never remove */
+    T1_BLEND_MAX
+
+  } T1_Blend_Flags;
+
+  /* */
+
+
+  /*# backwards compatible definitions */
+#define t1_blend_underline_position   T1_BLEND_UNDERLINE_POSITION
+#define t1_blend_underline_thickness  T1_BLEND_UNDERLINE_THICKNESS
+#define t1_blend_italic_angle         T1_BLEND_ITALIC_ANGLE
+#define t1_blend_blue_values          T1_BLEND_BLUE_VALUES
+#define t1_blend_other_blues          T1_BLEND_OTHER_BLUES
+#define t1_blend_standard_widths      T1_BLEND_STANDARD_WIDTH
+#define t1_blend_standard_height      T1_BLEND_STANDARD_HEIGHT
+#define t1_blend_stem_snap_widths     T1_BLEND_STEM_SNAP_WIDTHS
+#define t1_blend_stem_snap_heights    T1_BLEND_STEM_SNAP_HEIGHTS
+#define t1_blend_blue_scale           T1_BLEND_BLUE_SCALE
+#define t1_blend_blue_shift           T1_BLEND_BLUE_SHIFT
+#define t1_blend_family_blues         T1_BLEND_FAMILY_BLUES
+#define t1_blend_family_other_blues   T1_BLEND_FAMILY_OTHER_BLUES
+#define t1_blend_force_bold           T1_BLEND_FORCE_BOLD
+#define t1_blend_max                  T1_BLEND_MAX
+
+
+  /* maximum number of Multiple Masters designs, as defined in the spec */
+#define T1_MAX_MM_DESIGNS     16
+
+  /* maximum number of Multiple Masters axes, as defined in the spec */
+#define T1_MAX_MM_AXIS        4
+
+  /* maximum number of elements in a design map */
+#define T1_MAX_MM_MAP_POINTS  20
+
+
+  /* this structure is used to store the BlendDesignMap entry for an axis */
+  typedef struct  PS_DesignMap_
+  {
+    FT_Byte    num_points;
+    FT_Long*   design_points;
+    FT_Fixed*  blend_points;
+
+  } PS_DesignMapRec, *PS_DesignMap;
+
+  /* backwards-compatible definition */
+  typedef PS_DesignMapRec  T1_DesignMap;
+
+
+  typedef struct  PS_BlendRec_
+  {
+    FT_UInt          num_designs;
+    FT_UInt          num_axis;
+
+    FT_String*       axis_names[T1_MAX_MM_AXIS];
+    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
+    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
+
+    FT_Fixed*        weight_vector;
+    FT_Fixed*        default_weight_vector;
+
+    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
+    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
+
+    FT_ULong         blend_bitflags;
+
+    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
+
+    /* since 2.3.0 */
+
+    /* undocumented, optional: the default design instance;   */
+    /* corresponds to default_weight_vector --                */
+    /* num_default_design_vector == 0 means it is not present */
+    /* in the font and associated metrics files               */
+    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
+    FT_UInt          num_default_design_vector;
+
+  } PS_BlendRec, *PS_Blend;
+
+
+  /* backwards-compatible definition */
+  typedef PS_BlendRec  T1_Blend;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    CID_FaceDictRec                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to represent data in a CID top-level dictionary.  */
+  /*                                                                       */
+  typedef struct  CID_FaceDictRec_
+  {
+    PS_PrivateRec  private_dict;
+
+    FT_UInt        len_buildchar;
+    FT_Fixed       forcebold_threshold;
+    FT_Pos         stroke_width;
+    FT_Fixed       expansion_factor;
+
+    FT_Byte        paint_type;
+    FT_Byte        font_type;
+    FT_Matrix      font_matrix;
+    FT_Vector      font_offset;
+
+    FT_UInt        num_subrs;
+    FT_ULong       subrmap_offset;
+    FT_Int         sd_bytes;
+
+  } CID_FaceDictRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    CID_FaceDict                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a @CID_FaceDictRec structure.                          */
+  /*                                                                       */
+  typedef struct CID_FaceDictRec_*  CID_FaceDict;
+
+  /* */
+
+
+  /* backwards-compatible definition */
+  typedef CID_FaceDictRec  CID_FontDict;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    CID_FaceInfoRec                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to represent CID Face information.                */
+  /*                                                                       */
+  typedef struct  CID_FaceInfoRec_
+  {
+    FT_String*      cid_font_name;
+    FT_Fixed        cid_version;
+    FT_Int          cid_font_type;
+
+    FT_String*      registry;
+    FT_String*      ordering;
+    FT_Int          supplement;
+
+    PS_FontInfoRec  font_info;
+    FT_BBox         font_bbox;
+    FT_ULong        uid_base;
+
+    FT_Int          num_xuid;
+    FT_ULong        xuid[16];
+
+    FT_ULong        cidmap_offset;
+    FT_Int          fd_bytes;
+    FT_Int          gd_bytes;
+    FT_ULong        cid_count;
+
+    FT_Int          num_dicts;
+    CID_FaceDict    font_dicts;
+
+    FT_ULong        data_offset;
+
+  } CID_FaceInfoRec;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    CID_FaceInfo                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A handle to a @CID_FaceInfoRec structure.                          */
+  /*                                                                       */
+  typedef struct CID_FaceInfoRec_*  CID_FaceInfo;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    CID_Info                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*   This type is equivalent to @CID_FaceInfoRec.  It is deprecated but  */
+  /*   kept to maintain source compatibility between various versions of   */
+  /*   FreeType.                                                           */
+  /*                                                                       */
+  typedef CID_FaceInfoRec  CID_Info;
+
+
+  /************************************************************************
+   *
+   * @function:
+   *    FT_Has_PS_Glyph_Names
+   *
+   * @description:
+   *    Return true if a given face provides reliable PostScript glyph
+   *    names.  This is similar to using the @FT_HAS_GLYPH_NAMES macro,
+   *    except that certain fonts (mostly TrueType) contain incorrect
+   *    glyph name tables.
+   *
+   *    When this function returns true, the caller is sure that the glyph
+   *    names returned by @FT_Get_Glyph_Name are reliable.
+   *
+   * @input:
+   *    face ::
+   *       face handle
+   *
+   * @return:
+   *    Boolean.  True if glyph names are reliable.
+   *
+   */
+  FT_EXPORT( FT_Int )
+  FT_Has_PS_Glyph_Names( FT_Face  face );
+
+
+  /************************************************************************
+   *
+   * @function:
+   *    FT_Get_PS_Font_Info
+   *
+   * @description:
+   *    Retrieve the @PS_FontInfoRec structure corresponding to a given
+   *    PostScript font.
+   *
+   * @input:
+   *    face ::
+   *       PostScript face handle.
+   *
+   * @output:
+   *    afont_info ::
+   *       Output font info structure pointer.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *    The string pointers within the font info structure are owned by
+   *    the face and don't need to be freed by the caller.
+   *
+   *    If the font's format is not PostScript-based, this function will
+   *    return the `FT_Err_Invalid_Argument' error code.
+   *
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_PS_Font_Info( FT_Face      face,
+                       PS_FontInfo  afont_info );
+
+
+  /************************************************************************
+   *
+   * @function:
+   *    FT_Get_PS_Font_Private
+   *
+   * @description:
+   *    Retrieve the @PS_PrivateRec structure corresponding to a given
+   *    PostScript font.
+   *
+   * @input:
+   *    face ::
+   *       PostScript face handle.
+   *
+   * @output:
+   *    afont_private ::
+   *       Output private dictionary structure pointer.
+   *
+   * @return:
+   *    FreeType error code.  0~means success.
+   *
+   * @note:
+   *    The string pointers within the @PS_PrivateRec structure are owned by
+   *    the face and don't need to be freed by the caller.
+   *
+   *    If the font's format is not PostScript-based, this function returns
+   *    the `FT_Err_Invalid_Argument' error code.
+   *
+   */
+  FT_EXPORT( FT_Error )
+  FT_Get_PS_Font_Private( FT_Face     face,
+                          PS_Private  afont_private );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    T1_EncodingType                                                    */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration describing the `Encoding' entry in a Type 1         */
+  /*    dictionary.                                                        */
+  /*                                                                       */
+  typedef enum  T1_EncodingType_
+  {
+    T1_ENCODING_TYPE_NONE = 0,
+    T1_ENCODING_TYPE_ARRAY,
+    T1_ENCODING_TYPE_STANDARD,
+    T1_ENCODING_TYPE_ISOLATIN1,
+    T1_ENCODING_TYPE_EXPERT
+
+  } T1_EncodingType;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    PS_Dict_Keys                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration used in calls to @FT_Get_PS_Font_Value to identify  */
+  /*    the Type~1 dictionary entry to retrieve.                           */
+  /*                                                                       */
+  typedef enum  PS_Dict_Keys_
+  {
+    /* conventionally in the font dictionary */
+    PS_DICT_FONT_TYPE,              /* FT_Byte         */
+    PS_DICT_FONT_MATRIX,            /* FT_Fixed        */
+    PS_DICT_FONT_BBOX,              /* FT_Fixed        */
+    PS_DICT_PAINT_TYPE,             /* FT_Byte         */
+    PS_DICT_FONT_NAME,              /* FT_String*      */
+    PS_DICT_UNIQUE_ID,              /* FT_Int          */
+    PS_DICT_NUM_CHAR_STRINGS,       /* FT_Int          */
+    PS_DICT_CHAR_STRING_KEY,        /* FT_String*      */
+    PS_DICT_CHAR_STRING,            /* FT_String*      */
+    PS_DICT_ENCODING_TYPE,          /* T1_EncodingType */
+    PS_DICT_ENCODING_ENTRY,         /* FT_String*      */
+
+    /* conventionally in the font Private dictionary */
+    PS_DICT_NUM_SUBRS,              /* FT_Int     */
+    PS_DICT_SUBR,                   /* FT_String* */
+    PS_DICT_STD_HW,                 /* FT_UShort  */
+    PS_DICT_STD_VW,                 /* FT_UShort  */
+    PS_DICT_NUM_BLUE_VALUES,        /* FT_Byte    */
+    PS_DICT_BLUE_VALUE,             /* FT_Short   */
+    PS_DICT_BLUE_FUZZ,              /* FT_Int     */
+    PS_DICT_NUM_OTHER_BLUES,        /* FT_Byte    */
+    PS_DICT_OTHER_BLUE,             /* FT_Short   */
+    PS_DICT_NUM_FAMILY_BLUES,       /* FT_Byte    */
+    PS_DICT_FAMILY_BLUE,            /* FT_Short   */
+    PS_DICT_NUM_FAMILY_OTHER_BLUES, /* FT_Byte    */
+    PS_DICT_FAMILY_OTHER_BLUE,      /* FT_Short   */
+    PS_DICT_BLUE_SCALE,             /* FT_Fixed   */
+    PS_DICT_BLUE_SHIFT,             /* FT_Int     */
+    PS_DICT_NUM_STEM_SNAP_H,        /* FT_Byte    */
+    PS_DICT_STEM_SNAP_H,            /* FT_Short   */
+    PS_DICT_NUM_STEM_SNAP_V,        /* FT_Byte    */
+    PS_DICT_STEM_SNAP_V,            /* FT_Short   */
+    PS_DICT_FORCE_BOLD,             /* FT_Bool    */
+    PS_DICT_RND_STEM_UP,            /* FT_Bool    */
+    PS_DICT_MIN_FEATURE,            /* FT_Short   */
+    PS_DICT_LEN_IV,                 /* FT_Int     */
+    PS_DICT_PASSWORD,               /* FT_Long    */
+    PS_DICT_LANGUAGE_GROUP,         /* FT_Long    */
+
+    /* conventionally in the font FontInfo dictionary */
+    PS_DICT_VERSION,                /* FT_String* */
+    PS_DICT_NOTICE,                 /* FT_String* */
+    PS_DICT_FULL_NAME,              /* FT_String* */
+    PS_DICT_FAMILY_NAME,            /* FT_String* */
+    PS_DICT_WEIGHT,                 /* FT_String* */
+    PS_DICT_IS_FIXED_PITCH,         /* FT_Bool    */
+    PS_DICT_UNDERLINE_POSITION,     /* FT_Short   */
+    PS_DICT_UNDERLINE_THICKNESS,    /* FT_UShort  */
+    PS_DICT_FS_TYPE,                /* FT_UShort  */
+    PS_DICT_ITALIC_ANGLE,           /* FT_Long    */
+
+    PS_DICT_MAX = PS_DICT_ITALIC_ANGLE
+
+  } PS_Dict_Keys;
+
+
+  /************************************************************************
+   *
+   * @function:
+   *    FT_Get_PS_Font_Value
+   *
+   * @description:
+   *    Retrieve the value for the supplied key from a PostScript font.
+   *
+   * @input:
+   *    face ::
+   *       PostScript face handle.
+   *
+   *    key ::
+   *       An enumeration value representing the dictionary key to retrieve.
+   *
+   *    idx ::
+   *       For array values, this specifies the index to be returned.
+   *
+   *    value ::
+   *       A pointer to memory into which to write the value.
+   *
+   *    valen_len ::
+   *       The size, in bytes, of the memory supplied for the value.
+   *
+   * @output:
+   *    value ::
+   *       The value matching the above key, if it exists.
+   *
+   * @return:
+   *    The amount of memory (in bytes) required to hold the requested
+   *    value (if it exists, -1 otherwise).
+   *
+   * @note:
+   *    The values returned are not pointers into the internal structures of
+   *    the face, but are `fresh' copies, so that the memory containing them
+   *    belongs to the calling application.  This also enforces the
+   *    `read-only' nature of these values, i.e., this function cannot be
+   *    used to manipulate the face.
+   *
+   *    `value' is a void pointer because the values returned can be of
+   *    various types.
+   *
+   *    If either `value' is NULL or `value_len' is too small, just the
+   *    required memory size for the requested entry is returned.
+   *
+   *    The `idx' parameter is used, not only to retrieve elements of, for
+   *    example, the FontMatrix or FontBBox, but also to retrieve name keys
+   *    from the CharStrings dictionary, and the charstrings themselves.  It
+   *    is ignored for atomic values.
+   *
+   *    PS_DICT_BLUE_SCALE returns a value that is scaled up by 1000.  To
+   *    get the value as in the font stream, you need to divide by
+   *    65536000.0 (to remove the FT_Fixed scale, and the x1000 scale).
+   *
+   *    IMPORTANT: Only key/value pairs read by the FreeType interpreter can
+   *    be retrieved.  So, for example, PostScript procedures such as NP,
+   *    ND, and RD are not available.  Arbitrary keys are, obviously, not be
+   *    available either.
+   *
+   *    If the font's format is not PostScript-based, this function returns
+   *    the `FT_Err_Invalid_Argument' error code.
+   *
+   */
+  FT_EXPORT( FT_Long )
+  FT_Get_PS_Font_Value( FT_Face       face,
+                        PS_Dict_Keys  key,
+                        FT_UInt       idx,
+                        void         *value,
+                        FT_Long       value_len );
+
+  /* */
+
+FT_END_HEADER
+
+#endif /* __T1TABLES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/t1tables.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ttnameid.h
===================================================================
--- lib/3rdparty/freetype/include/ttnameid.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ttnameid.h	(rÃ©vision 62573)
@@ -0,0 +1,1237 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ttnameid.h                                                             */
+/*                                                                         */
+/*    TrueType name ID definitions (specification only).                   */
+/*                                                                         */
+/*  Copyright 1996-2004, 2006-2008, 2012, 2013 by                          */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __TTNAMEID_H__
+#define __TTNAMEID_H__
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    truetype_tables                                                    */
+  /*                                                                       */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Possible values for the `platform' identifier code in the name        */
+  /* records of the TTF `name' table.                                      */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /***********************************************************************
+   *
+   * @enum:
+   *   TT_PLATFORM_XXX
+   *
+   * @description:
+   *   A list of valid values for the `platform_id' identifier code in
+   *   @FT_CharMapRec and @FT_SfntName structures.
+   *
+   * @values:
+   *   TT_PLATFORM_APPLE_UNICODE ::
+   *     Used by Apple to indicate a Unicode character map and/or name entry.
+   *     See @TT_APPLE_ID_XXX for corresponding `encoding_id' values.  Note
+   *     that name entries in this format are coded as big-endian UCS-2
+   *     character codes _only_.
+   *
+   *   TT_PLATFORM_MACINTOSH ::
+   *     Used by Apple to indicate a MacOS-specific charmap and/or name entry.
+   *     See @TT_MAC_ID_XXX for corresponding `encoding_id' values.  Note that
+   *     most TrueType fonts contain an Apple roman charmap to be usable on
+   *     MacOS systems (even if they contain a Microsoft charmap as well).
+   *
+   *   TT_PLATFORM_ISO ::
+   *     This value was used to specify ISO/IEC 10646 charmaps.  It is however
+   *     now deprecated.  See @TT_ISO_ID_XXX for a list of corresponding
+   *     `encoding_id' values.
+   *
+   *   TT_PLATFORM_MICROSOFT ::
+   *     Used by Microsoft to indicate Windows-specific charmaps.  See
+   *     @TT_MS_ID_XXX for a list of corresponding `encoding_id' values.
+   *     Note that most fonts contain a Unicode charmap using
+   *     (TT_PLATFORM_MICROSOFT, @TT_MS_ID_UNICODE_CS).
+   *
+   *   TT_PLATFORM_CUSTOM ::
+   *     Used to indicate application-specific charmaps.
+   *
+   *   TT_PLATFORM_ADOBE ::
+   *     This value isn't part of any font format specification, but is used
+   *     by FreeType to report Adobe-specific charmaps in an @FT_CharMapRec
+   *     structure.  See @TT_ADOBE_ID_XXX.
+   */
+
+#define TT_PLATFORM_APPLE_UNICODE  0
+#define TT_PLATFORM_MACINTOSH      1
+#define TT_PLATFORM_ISO            2 /* deprecated */
+#define TT_PLATFORM_MICROSOFT      3
+#define TT_PLATFORM_CUSTOM         4
+#define TT_PLATFORM_ADOBE          7 /* artificial */
+
+
+  /***********************************************************************
+   *
+   * @enum:
+   *   TT_APPLE_ID_XXX
+   *
+   * @description:
+   *   A list of valid values for the `encoding_id' for
+   *   @TT_PLATFORM_APPLE_UNICODE charmaps and name entries.
+   *
+   * @values:
+   *   TT_APPLE_ID_DEFAULT ::
+   *     Unicode version 1.0.
+   *
+   *   TT_APPLE_ID_UNICODE_1_1 ::
+   *     Unicode 1.1; specifies Hangul characters starting at U+34xx.
+   *
+   *   TT_APPLE_ID_ISO_10646 ::
+   *     Deprecated (identical to preceding).
+   *
+   *   TT_APPLE_ID_UNICODE_2_0 ::
+   *     Unicode 2.0 and beyond (UTF-16 BMP only).
+   *
+   *   TT_APPLE_ID_UNICODE_32 ::
+   *     Unicode 3.1 and beyond, using UTF-32.
+   *
+   *   TT_APPLE_ID_VARIANT_SELECTOR ::
+   *     From Adobe, not Apple.  Not a normal cmap.  Specifies variations
+   *     on a real cmap.
+   */
+
+#define TT_APPLE_ID_DEFAULT           0 /* Unicode 1.0 */
+#define TT_APPLE_ID_UNICODE_1_1       1 /* specify Hangul at U+34xx */
+#define TT_APPLE_ID_ISO_10646         2 /* deprecated */
+#define TT_APPLE_ID_UNICODE_2_0       3 /* or later */
+#define TT_APPLE_ID_UNICODE_32        4 /* 2.0 or later, full repertoire */
+#define TT_APPLE_ID_VARIANT_SELECTOR  5 /* variation selector data */
+
+
+  /***********************************************************************
+   *
+   * @enum:
+   *   TT_MAC_ID_XXX
+   *
+   * @description:
+   *   A list of valid values for the `encoding_id' for
+   *   @TT_PLATFORM_MACINTOSH charmaps and name entries.
+   *
+   * @values:
+   *   TT_MAC_ID_ROMAN ::
+   *   TT_MAC_ID_JAPANESE ::
+   *   TT_MAC_ID_TRADITIONAL_CHINESE ::
+   *   TT_MAC_ID_KOREAN ::
+   *   TT_MAC_ID_ARABIC ::
+   *   TT_MAC_ID_HEBREW ::
+   *   TT_MAC_ID_GREEK ::
+   *   TT_MAC_ID_RUSSIAN ::
+   *   TT_MAC_ID_RSYMBOL ::
+   *   TT_MAC_ID_DEVANAGARI ::
+   *   TT_MAC_ID_GURMUKHI ::
+   *   TT_MAC_ID_GUJARATI ::
+   *   TT_MAC_ID_ORIYA ::
+   *   TT_MAC_ID_BENGALI ::
+   *   TT_MAC_ID_TAMIL ::
+   *   TT_MAC_ID_TELUGU ::
+   *   TT_MAC_ID_KANNADA ::
+   *   TT_MAC_ID_MALAYALAM ::
+   *   TT_MAC_ID_SINHALESE ::
+   *   TT_MAC_ID_BURMESE ::
+   *   TT_MAC_ID_KHMER ::
+   *   TT_MAC_ID_THAI ::
+   *   TT_MAC_ID_LAOTIAN ::
+   *   TT_MAC_ID_GEORGIAN ::
+   *   TT_MAC_ID_ARMENIAN ::
+   *   TT_MAC_ID_MALDIVIAN ::
+   *   TT_MAC_ID_SIMPLIFIED_CHINESE ::
+   *   TT_MAC_ID_TIBETAN ::
+   *   TT_MAC_ID_MONGOLIAN ::
+   *   TT_MAC_ID_GEEZ ::
+   *   TT_MAC_ID_SLAVIC ::
+   *   TT_MAC_ID_VIETNAMESE ::
+   *   TT_MAC_ID_SINDHI ::
+   *   TT_MAC_ID_UNINTERP ::
+   */
+
+#define TT_MAC_ID_ROMAN                 0
+#define TT_MAC_ID_JAPANESE              1
+#define TT_MAC_ID_TRADITIONAL_CHINESE   2
+#define TT_MAC_ID_KOREAN                3
+#define TT_MAC_ID_ARABIC                4
+#define TT_MAC_ID_HEBREW                5
+#define TT_MAC_ID_GREEK                 6
+#define TT_MAC_ID_RUSSIAN               7
+#define TT_MAC_ID_RSYMBOL               8
+#define TT_MAC_ID_DEVANAGARI            9
+#define TT_MAC_ID_GURMUKHI             10
+#define TT_MAC_ID_GUJARATI             11
+#define TT_MAC_ID_ORIYA                12
+#define TT_MAC_ID_BENGALI              13
+#define TT_MAC_ID_TAMIL                14
+#define TT_MAC_ID_TELUGU               15
+#define TT_MAC_ID_KANNADA              16
+#define TT_MAC_ID_MALAYALAM            17
+#define TT_MAC_ID_SINHALESE            18
+#define TT_MAC_ID_BURMESE              19
+#define TT_MAC_ID_KHMER                20
+#define TT_MAC_ID_THAI                 21
+#define TT_MAC_ID_LAOTIAN              22
+#define TT_MAC_ID_GEORGIAN             23
+#define TT_MAC_ID_ARMENIAN             24
+#define TT_MAC_ID_MALDIVIAN            25
+#define TT_MAC_ID_SIMPLIFIED_CHINESE   25
+#define TT_MAC_ID_TIBETAN              26
+#define TT_MAC_ID_MONGOLIAN            27
+#define TT_MAC_ID_GEEZ                 28
+#define TT_MAC_ID_SLAVIC               29
+#define TT_MAC_ID_VIETNAMESE           30
+#define TT_MAC_ID_SINDHI               31
+#define TT_MAC_ID_UNINTERP             32
+
+
+  /***********************************************************************
+   *
+   * @enum:
+   *   TT_ISO_ID_XXX
+   *
+   * @description:
+   *   A list of valid values for the `encoding_id' for
+   *   @TT_PLATFORM_ISO charmaps and name entries.
+   *
+   *   Their use is now deprecated.
+   *
+   * @values:
+   *   TT_ISO_ID_7BIT_ASCII ::
+   *     ASCII.
+   *   TT_ISO_ID_10646 ::
+   *     ISO/10646.
+   *   TT_ISO_ID_8859_1 ::
+   *     Also known as Latin-1.
+   */
+
+#define TT_ISO_ID_7BIT_ASCII  0
+#define TT_ISO_ID_10646       1
+#define TT_ISO_ID_8859_1      2
+
+
+  /***********************************************************************
+   *
+   * @enum:
+   *   TT_MS_ID_XXX
+   *
+   * @description:
+   *   A list of valid values for the `encoding_id' for
+   *   @TT_PLATFORM_MICROSOFT charmaps and name entries.
+   *
+   * @values:
+   *   TT_MS_ID_SYMBOL_CS ::
+   *     Corresponds to Microsoft symbol encoding. See
+   *     @FT_ENCODING_MS_SYMBOL.
+   *
+   *   TT_MS_ID_UNICODE_CS ::
+   *     Corresponds to a Microsoft WGL4 charmap, matching Unicode.  See
+   *     @FT_ENCODING_UNICODE.
+   *
+   *   TT_MS_ID_SJIS ::
+   *     Corresponds to SJIS Japanese encoding.  See @FT_ENCODING_SJIS.
+   *
+   *   TT_MS_ID_GB2312 ::
+   *     Corresponds to Simplified Chinese as used in Mainland China.  See
+   *     @FT_ENCODING_GB2312.
+   *
+   *   TT_MS_ID_BIG_5 ::
+   *     Corresponds to Traditional Chinese as used in Taiwan and Hong Kong.
+   *     See @FT_ENCODING_BIG5.
+   *
+   *   TT_MS_ID_WANSUNG ::
+   *     Corresponds to Korean Wansung encoding.  See @FT_ENCODING_WANSUNG.
+   *
+   *   TT_MS_ID_JOHAB ::
+   *     Corresponds to Johab encoding.  See @FT_ENCODING_JOHAB.
+   *
+   *   TT_MS_ID_UCS_4 ::
+   *     Corresponds to UCS-4 or UTF-32 charmaps.  This has been added to
+   *     the OpenType specification version 1.4 (mid-2001.)
+   */
+
+#define TT_MS_ID_SYMBOL_CS    0
+#define TT_MS_ID_UNICODE_CS   1
+#define TT_MS_ID_SJIS         2
+#define TT_MS_ID_GB2312       3
+#define TT_MS_ID_BIG_5        4
+#define TT_MS_ID_WANSUNG      5
+#define TT_MS_ID_JOHAB        6
+#define TT_MS_ID_UCS_4       10
+
+
+  /***********************************************************************
+   *
+   * @enum:
+   *   TT_ADOBE_ID_XXX
+   *
+   * @description:
+   *   A list of valid values for the `encoding_id' for
+   *   @TT_PLATFORM_ADOBE charmaps.  This is a FreeType-specific extension!
+   *
+   * @values:
+   *   TT_ADOBE_ID_STANDARD ::
+   *     Adobe standard encoding.
+   *   TT_ADOBE_ID_EXPERT ::
+   *     Adobe expert encoding.
+   *   TT_ADOBE_ID_CUSTOM ::
+   *     Adobe custom encoding.
+   *   TT_ADOBE_ID_LATIN_1 ::
+   *     Adobe Latin~1 encoding.
+   */
+
+#define TT_ADOBE_ID_STANDARD  0
+#define TT_ADOBE_ID_EXPERT    1
+#define TT_ADOBE_ID_CUSTOM    2
+#define TT_ADOBE_ID_LATIN_1   3
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Possible values of the language identifier field in the name records  */
+  /* of the TTF `name' table if the `platform' identifier code is          */
+  /* TT_PLATFORM_MACINTOSH.  These values are also used as return values   */
+  /* for function @FT_Get_CMap_Language_ID.                                */
+  /*                                                                       */
+  /* The canonical source for the Apple assigned Language ID's is at       */
+  /*                                                                       */
+  /*   https://developer.apple.com/fonts/TTRefMan/RM06/Chap6name.html      */
+  /*                                                                       */
+#define TT_MAC_LANGID_ENGLISH                       0
+#define TT_MAC_LANGID_FRENCH                        1
+#define TT_MAC_LANGID_GERMAN                        2
+#define TT_MAC_LANGID_ITALIAN                       3
+#define TT_MAC_LANGID_DUTCH                         4
+#define TT_MAC_LANGID_SWEDISH                       5
+#define TT_MAC_LANGID_SPANISH                       6
+#define TT_MAC_LANGID_DANISH                        7
+#define TT_MAC_LANGID_PORTUGUESE                    8
+#define TT_MAC_LANGID_NORWEGIAN                     9
+#define TT_MAC_LANGID_HEBREW                       10
+#define TT_MAC_LANGID_JAPANESE                     11
+#define TT_MAC_LANGID_ARABIC                       12
+#define TT_MAC_LANGID_FINNISH                      13
+#define TT_MAC_LANGID_GREEK                        14
+#define TT_MAC_LANGID_ICELANDIC                    15
+#define TT_MAC_LANGID_MALTESE                      16
+#define TT_MAC_LANGID_TURKISH                      17
+#define TT_MAC_LANGID_CROATIAN                     18
+#define TT_MAC_LANGID_CHINESE_TRADITIONAL          19
+#define TT_MAC_LANGID_URDU                         20
+#define TT_MAC_LANGID_HINDI                        21
+#define TT_MAC_LANGID_THAI                         22
+#define TT_MAC_LANGID_KOREAN                       23
+#define TT_MAC_LANGID_LITHUANIAN                   24
+#define TT_MAC_LANGID_POLISH                       25
+#define TT_MAC_LANGID_HUNGARIAN                    26
+#define TT_MAC_LANGID_ESTONIAN                     27
+#define TT_MAC_LANGID_LETTISH                      28
+#define TT_MAC_LANGID_SAAMISK                      29
+#define TT_MAC_LANGID_FAEROESE                     30
+#define TT_MAC_LANGID_FARSI                        31
+#define TT_MAC_LANGID_RUSSIAN                      32
+#define TT_MAC_LANGID_CHINESE_SIMPLIFIED           33
+#define TT_MAC_LANGID_FLEMISH                      34
+#define TT_MAC_LANGID_IRISH                        35
+#define TT_MAC_LANGID_ALBANIAN                     36
+#define TT_MAC_LANGID_ROMANIAN                     37
+#define TT_MAC_LANGID_CZECH                        38
+#define TT_MAC_LANGID_SLOVAK                       39
+#define TT_MAC_LANGID_SLOVENIAN                    40
+#define TT_MAC_LANGID_YIDDISH                      41
+#define TT_MAC_LANGID_SERBIAN                      42
+#define TT_MAC_LANGID_MACEDONIAN                   43
+#define TT_MAC_LANGID_BULGARIAN                    44
+#define TT_MAC_LANGID_UKRAINIAN                    45
+#define TT_MAC_LANGID_BYELORUSSIAN                 46
+#define TT_MAC_LANGID_UZBEK                        47
+#define TT_MAC_LANGID_KAZAKH                       48
+#define TT_MAC_LANGID_AZERBAIJANI                  49
+#define TT_MAC_LANGID_AZERBAIJANI_CYRILLIC_SCRIPT  49
+#define TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT    50
+#define TT_MAC_LANGID_ARMENIAN                     51
+#define TT_MAC_LANGID_GEORGIAN                     52
+#define TT_MAC_LANGID_MOLDAVIAN                    53
+#define TT_MAC_LANGID_KIRGHIZ                      54
+#define TT_MAC_LANGID_TAJIKI                       55
+#define TT_MAC_LANGID_TURKMEN                      56
+#define TT_MAC_LANGID_MONGOLIAN                    57
+#define TT_MAC_LANGID_MONGOLIAN_MONGOLIAN_SCRIPT   57
+#define TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT    58
+#define TT_MAC_LANGID_PASHTO                       59
+#define TT_MAC_LANGID_KURDISH                      60
+#define TT_MAC_LANGID_KASHMIRI                     61
+#define TT_MAC_LANGID_SINDHI                       62
+#define TT_MAC_LANGID_TIBETAN                      63
+#define TT_MAC_LANGID_NEPALI                       64
+#define TT_MAC_LANGID_SANSKRIT                     65
+#define TT_MAC_LANGID_MARATHI                      66
+#define TT_MAC_LANGID_BENGALI                      67
+#define TT_MAC_LANGID_ASSAMESE                     68
+#define TT_MAC_LANGID_GUJARATI                     69
+#define TT_MAC_LANGID_PUNJABI                      70
+#define TT_MAC_LANGID_ORIYA                        71
+#define TT_MAC_LANGID_MALAYALAM                    72
+#define TT_MAC_LANGID_KANNADA                      73
+#define TT_MAC_LANGID_TAMIL                        74
+#define TT_MAC_LANGID_TELUGU                       75
+#define TT_MAC_LANGID_SINHALESE                    76
+#define TT_MAC_LANGID_BURMESE                      77
+#define TT_MAC_LANGID_KHMER                        78
+#define TT_MAC_LANGID_LAO                          79
+#define TT_MAC_LANGID_VIETNAMESE                   80
+#define TT_MAC_LANGID_INDONESIAN                   81
+#define TT_MAC_LANGID_TAGALOG                      82
+#define TT_MAC_LANGID_MALAY_ROMAN_SCRIPT           83
+#define TT_MAC_LANGID_MALAY_ARABIC_SCRIPT          84
+#define TT_MAC_LANGID_AMHARIC                      85
+#define TT_MAC_LANGID_TIGRINYA                     86
+#define TT_MAC_LANGID_GALLA                        87
+#define TT_MAC_LANGID_SOMALI                       88
+#define TT_MAC_LANGID_SWAHILI                      89
+#define TT_MAC_LANGID_RUANDA                       90
+#define TT_MAC_LANGID_RUNDI                        91
+#define TT_MAC_LANGID_CHEWA                        92
+#define TT_MAC_LANGID_MALAGASY                     93
+#define TT_MAC_LANGID_ESPERANTO                    94
+#define TT_MAC_LANGID_WELSH                       128
+#define TT_MAC_LANGID_BASQUE                      129
+#define TT_MAC_LANGID_CATALAN                     130
+#define TT_MAC_LANGID_LATIN                       131
+#define TT_MAC_LANGID_QUECHUA                     132
+#define TT_MAC_LANGID_GUARANI                     133
+#define TT_MAC_LANGID_AYMARA                      134
+#define TT_MAC_LANGID_TATAR                       135
+#define TT_MAC_LANGID_UIGHUR                      136
+#define TT_MAC_LANGID_DZONGKHA                    137
+#define TT_MAC_LANGID_JAVANESE                    138
+#define TT_MAC_LANGID_SUNDANESE                   139
+
+
+#if 0  /* these seem to be errors that have been dropped */
+
+#define TT_MAC_LANGID_SCOTTISH_GAELIC             140
+#define TT_MAC_LANGID_IRISH_GAELIC                141
+
+#endif
+
+
+  /* The following codes are new as of 2000-03-10 */
+#define TT_MAC_LANGID_GALICIAN                    140
+#define TT_MAC_LANGID_AFRIKAANS                   141
+#define TT_MAC_LANGID_BRETON                      142
+#define TT_MAC_LANGID_INUKTITUT                   143
+#define TT_MAC_LANGID_SCOTTISH_GAELIC             144
+#define TT_MAC_LANGID_MANX_GAELIC                 145
+#define TT_MAC_LANGID_IRISH_GAELIC                146
+#define TT_MAC_LANGID_TONGAN                      147
+#define TT_MAC_LANGID_GREEK_POLYTONIC             148
+#define TT_MAC_LANGID_GREELANDIC                  149
+#define TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT    150
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Possible values of the language identifier field in the name records  */
+  /* of the TTF `name' table if the `platform' identifier code is          */
+  /* TT_PLATFORM_MICROSOFT.                                                */
+  /*                                                                       */
+  /* The canonical source for the MS assigned LCIDs is                     */
+  /*                                                                       */
+  /*   http://www.microsoft.com/globaldev/reference/lcid-all.mspx          */
+  /*                                                                       */
+
+#define TT_MS_LANGID_ARABIC_GENERAL                    0x0001
+#define TT_MS_LANGID_ARABIC_SAUDI_ARABIA               0x0401
+#define TT_MS_LANGID_ARABIC_IRAQ                       0x0801
+#define TT_MS_LANGID_ARABIC_EGYPT                      0x0c01
+#define TT_MS_LANGID_ARABIC_LIBYA                      0x1001
+#define TT_MS_LANGID_ARABIC_ALGERIA                    0x1401
+#define TT_MS_LANGID_ARABIC_MOROCCO                    0x1801
+#define TT_MS_LANGID_ARABIC_TUNISIA                    0x1c01
+#define TT_MS_LANGID_ARABIC_OMAN                       0x2001
+#define TT_MS_LANGID_ARABIC_YEMEN                      0x2401
+#define TT_MS_LANGID_ARABIC_SYRIA                      0x2801
+#define TT_MS_LANGID_ARABIC_JORDAN                     0x2c01
+#define TT_MS_LANGID_ARABIC_LEBANON                    0x3001
+#define TT_MS_LANGID_ARABIC_KUWAIT                     0x3401
+#define TT_MS_LANGID_ARABIC_UAE                        0x3801
+#define TT_MS_LANGID_ARABIC_BAHRAIN                    0x3c01
+#define TT_MS_LANGID_ARABIC_QATAR                      0x4001
+#define TT_MS_LANGID_BULGARIAN_BULGARIA                0x0402
+#define TT_MS_LANGID_CATALAN_SPAIN                     0x0403
+#define TT_MS_LANGID_CHINESE_GENERAL                   0x0004
+#define TT_MS_LANGID_CHINESE_TAIWAN                    0x0404
+#define TT_MS_LANGID_CHINESE_PRC                       0x0804
+#define TT_MS_LANGID_CHINESE_HONG_KONG                 0x0c04
+#define TT_MS_LANGID_CHINESE_SINGAPORE                 0x1004
+
+#if 1  /* this looks like the correct value */
+#define TT_MS_LANGID_CHINESE_MACAU                     0x1404
+#else  /* but beware, Microsoft may change its mind...
+          the most recent Word reference has the following: */
+#define TT_MS_LANGID_CHINESE_MACAU  TT_MS_LANGID_CHINESE_HONG_KONG
+#endif
+
+#if 0  /* used only with .NET `cultures'; commented out */
+#define TT_MS_LANGID_CHINESE_TRADITIONAL               0x7C04
+#endif
+
+#define TT_MS_LANGID_CZECH_CZECH_REPUBLIC              0x0405
+#define TT_MS_LANGID_DANISH_DENMARK                    0x0406
+#define TT_MS_LANGID_GERMAN_GERMANY                    0x0407
+#define TT_MS_LANGID_GERMAN_SWITZERLAND                0x0807
+#define TT_MS_LANGID_GERMAN_AUSTRIA                    0x0c07
+#define TT_MS_LANGID_GERMAN_LUXEMBOURG                 0x1007
+#define TT_MS_LANGID_GERMAN_LIECHTENSTEI               0x1407
+#define TT_MS_LANGID_GREEK_GREECE                      0x0408
+
+  /* don't ask what this one means... It is commented out currently. */
+#if 0
+#define TT_MS_LANGID_GREEK_GREECE2                     0x2008
+#endif
+
+#define TT_MS_LANGID_ENGLISH_GENERAL                   0x0009
+#define TT_MS_LANGID_ENGLISH_UNITED_STATES             0x0409
+#define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM            0x0809
+#define TT_MS_LANGID_ENGLISH_AUSTRALIA                 0x0c09
+#define TT_MS_LANGID_ENGLISH_CANADA                    0x1009
+#define TT_MS_LANGID_ENGLISH_NEW_ZEALAND               0x1409
+#define TT_MS_LANGID_ENGLISH_IRELAND                   0x1809
+#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA              0x1c09
+#define TT_MS_LANGID_ENGLISH_JAMAICA                   0x2009
+#define TT_MS_LANGID_ENGLISH_CARIBBEAN                 0x2409
+#define TT_MS_LANGID_ENGLISH_BELIZE                    0x2809
+#define TT_MS_LANGID_ENGLISH_TRINIDAD                  0x2c09
+#define TT_MS_LANGID_ENGLISH_ZIMBABWE                  0x3009
+#define TT_MS_LANGID_ENGLISH_PHILIPPINES               0x3409
+#define TT_MS_LANGID_ENGLISH_INDONESIA                 0x3809
+#define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3c09
+#define TT_MS_LANGID_ENGLISH_INDIA                     0x4009
+#define TT_MS_LANGID_ENGLISH_MALAYSIA                  0x4409
+#define TT_MS_LANGID_ENGLISH_SINGAPORE                 0x4809
+#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT    0x040a
+#define TT_MS_LANGID_SPANISH_MEXICO                    0x080a
+#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT  0x0c0a
+#define TT_MS_LANGID_SPANISH_GUATEMALA                 0x100a
+#define TT_MS_LANGID_SPANISH_COSTA_RICA                0x140a
+#define TT_MS_LANGID_SPANISH_PANAMA                    0x180a
+#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC        0x1c0a
+#define TT_MS_LANGID_SPANISH_VENEZUELA                 0x200a
+#define TT_MS_LANGID_SPANISH_COLOMBIA                  0x240a
+#define TT_MS_LANGID_SPANISH_PERU                      0x280a
+#define TT_MS_LANGID_SPANISH_ARGENTINA                 0x2c0a
+#define TT_MS_LANGID_SPANISH_ECUADOR                   0x300a
+#define TT_MS_LANGID_SPANISH_CHILE                     0x340a
+#define TT_MS_LANGID_SPANISH_URUGUAY                   0x380a
+#define TT_MS_LANGID_SPANISH_PARAGUAY                  0x3c0a
+#define TT_MS_LANGID_SPANISH_BOLIVIA                   0x400a
+#define TT_MS_LANGID_SPANISH_EL_SALVADOR               0x440a
+#define TT_MS_LANGID_SPANISH_HONDURAS                  0x480a
+#define TT_MS_LANGID_SPANISH_NICARAGUA                 0x4c0a
+#define TT_MS_LANGID_SPANISH_PUERTO_RICO               0x500a
+#define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540a
+  /* The following ID blatantly violate MS specs by using a */
+  /* sublanguage > 0x1F.                                    */
+#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40aU
+#define TT_MS_LANGID_FINNISH_FINLAND                   0x040b
+#define TT_MS_LANGID_FRENCH_FRANCE                     0x040c
+#define TT_MS_LANGID_FRENCH_BELGIUM                    0x080c
+#define TT_MS_LANGID_FRENCH_CANADA                     0x0c0c
+#define TT_MS_LANGID_FRENCH_SWITZERLAND                0x100c
+#define TT_MS_LANGID_FRENCH_LUXEMBOURG                 0x140c
+#define TT_MS_LANGID_FRENCH_MONACO                     0x180c
+#define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1c0c
+#define TT_MS_LANGID_FRENCH_REUNION                    0x200c
+#define TT_MS_LANGID_FRENCH_CONGO                      0x240c
+  /* which was formerly: */
+#define TT_MS_LANGID_FRENCH_ZAIRE  TT_MS_LANGID_FRENCH_CONGO
+#define TT_MS_LANGID_FRENCH_SENEGAL                    0x280c
+#define TT_MS_LANGID_FRENCH_CAMEROON                   0x2c0c
+#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE              0x300c
+#define TT_MS_LANGID_FRENCH_MALI                       0x340c
+#define TT_MS_LANGID_FRENCH_MOROCCO                    0x380c
+#define TT_MS_LANGID_FRENCH_HAITI                      0x3c0c
+  /* and another violation of the spec (see 0xE40aU) */
+#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40cU
+#define TT_MS_LANGID_HEBREW_ISRAEL                     0x040d
+#define TT_MS_LANGID_HUNGARIAN_HUNGARY                 0x040e
+#define TT_MS_LANGID_ICELANDIC_ICELAND                 0x040f
+#define TT_MS_LANGID_ITALIAN_ITALY                     0x0410
+#define TT_MS_LANGID_ITALIAN_SWITZERLAND               0x0810
+#define TT_MS_LANGID_JAPANESE_JAPAN                    0x0411
+#define TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA     0x0412
+#define TT_MS_LANGID_KOREAN_JOHAB_KOREA                0x0812
+#define TT_MS_LANGID_DUTCH_NETHERLANDS                 0x0413
+#define TT_MS_LANGID_DUTCH_BELGIUM                     0x0813
+#define TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL           0x0414
+#define TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK          0x0814
+#define TT_MS_LANGID_POLISH_POLAND                     0x0415
+#define TT_MS_LANGID_PORTUGUESE_BRAZIL                 0x0416
+#define TT_MS_LANGID_PORTUGUESE_PORTUGAL               0x0816
+#define TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND        0x0417
+#define TT_MS_LANGID_ROMANIAN_ROMANIA                  0x0418
+#define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA                0x0818
+#define TT_MS_LANGID_RUSSIAN_RUSSIA                    0x0419
+#define TT_MS_LANGID_RUSSIAN_MOLDAVIA                  0x0819
+#define TT_MS_LANGID_CROATIAN_CROATIA                  0x041a
+#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN              0x081a
+#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC           0x0c1a
+
+#if 0  /* this used to be this value, but it looks like we were wrong */
+#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x101a
+#else  /* current sources say */
+#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA       0x101a
+#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x141a
+       /* and XPsp2 Platform SDK added (2004-07-26) */
+       /* Names are shortened to be significant within 40 chars. */
+#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN         0x181a
+#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC      0x181a
+#endif
+
+#define TT_MS_LANGID_SLOVAK_SLOVAKIA                   0x041b
+#define TT_MS_LANGID_ALBANIAN_ALBANIA                  0x041c
+#define TT_MS_LANGID_SWEDISH_SWEDEN                    0x041d
+#define TT_MS_LANGID_SWEDISH_FINLAND                   0x081d
+#define TT_MS_LANGID_THAI_THAILAND                     0x041e
+#define TT_MS_LANGID_TURKISH_TURKEY                    0x041f
+#define TT_MS_LANGID_URDU_PAKISTAN                     0x0420
+#define TT_MS_LANGID_URDU_INDIA                        0x0820
+#define TT_MS_LANGID_INDONESIAN_INDONESIA              0x0421
+#define TT_MS_LANGID_UKRAINIAN_UKRAINE                 0x0422
+#define TT_MS_LANGID_BELARUSIAN_BELARUS                0x0423
+#define TT_MS_LANGID_SLOVENE_SLOVENIA                  0x0424
+#define TT_MS_LANGID_ESTONIAN_ESTONIA                  0x0425
+#define TT_MS_LANGID_LATVIAN_LATVIA                    0x0426
+#define TT_MS_LANGID_LITHUANIAN_LITHUANIA              0x0427
+#define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA      0x0827
+#define TT_MS_LANGID_TAJIK_TAJIKISTAN                  0x0428
+#define TT_MS_LANGID_FARSI_IRAN                        0x0429
+#define TT_MS_LANGID_VIETNAMESE_VIET_NAM               0x042a
+#define TT_MS_LANGID_ARMENIAN_ARMENIA                  0x042b
+#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN            0x042c
+#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC         0x082c
+#define TT_MS_LANGID_BASQUE_SPAIN                      0x042d
+#define TT_MS_LANGID_SORBIAN_GERMANY                   0x042e
+#define TT_MS_LANGID_MACEDONIAN_MACEDONIA              0x042f
+#define TT_MS_LANGID_SUTU_SOUTH_AFRICA                 0x0430
+#define TT_MS_LANGID_TSONGA_SOUTH_AFRICA               0x0431
+#define TT_MS_LANGID_TSWANA_SOUTH_AFRICA               0x0432
+#define TT_MS_LANGID_VENDA_SOUTH_AFRICA                0x0433
+#define TT_MS_LANGID_XHOSA_SOUTH_AFRICA                0x0434
+#define TT_MS_LANGID_ZULU_SOUTH_AFRICA                 0x0435
+#define TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA            0x0436
+#define TT_MS_LANGID_GEORGIAN_GEORGIA                  0x0437
+#define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS           0x0438
+#define TT_MS_LANGID_HINDI_INDIA                       0x0439
+#define TT_MS_LANGID_MALTESE_MALTA                     0x043a
+  /* Added by XPsp2 Platform SDK (2004-07-26) */
+#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY              0x043b
+#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN              0x083b
+#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND             0x0C3b
+#define TT_MS_LANGID_SAMI_LULE_NORWAY                  0x103b
+#define TT_MS_LANGID_SAMI_LULE_SWEDEN                  0x143b
+#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY              0x183b
+#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN              0x1C3b
+#define TT_MS_LANGID_SAMI_SKOLT_FINLAND                0x203b
+#define TT_MS_LANGID_SAMI_INARI_FINLAND                0x243b
+  /* ... and we also keep our old identifier... */
+#define TT_MS_LANGID_SAAMI_LAPONIA                     0x043b
+
+#if 0 /* this seems to be a previous inversion */
+#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
+#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
+#else
+#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
+#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
+#endif
+
+#define TT_MS_LANGID_YIDDISH_GERMANY                   0x043d
+#define TT_MS_LANGID_MALAY_MALAYSIA                    0x043e
+#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM           0x083e
+#define TT_MS_LANGID_KAZAK_KAZAKSTAN                   0x043f
+#define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN /* Cyrillic*/ 0x0440
+  /* alias declared in Windows 2000 */
+#define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \
+          TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN
+
+#define TT_MS_LANGID_SWAHILI_KENYA                     0x0441
+#define TT_MS_LANGID_TURKMEN_TURKMENISTAN              0x0442
+#define TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN            0x0443
+#define TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC         0x0843
+#define TT_MS_LANGID_TATAR_TATARSTAN                   0x0444
+#define TT_MS_LANGID_BENGALI_INDIA                     0x0445
+#define TT_MS_LANGID_BENGALI_BANGLADESH                0x0845
+#define TT_MS_LANGID_PUNJABI_INDIA                     0x0446
+#define TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN           0x0846
+#define TT_MS_LANGID_GUJARATI_INDIA                    0x0447
+#define TT_MS_LANGID_ORIYA_INDIA                       0x0448
+#define TT_MS_LANGID_TAMIL_INDIA                       0x0449
+#define TT_MS_LANGID_TELUGU_INDIA                      0x044a
+#define TT_MS_LANGID_KANNADA_INDIA                     0x044b
+#define TT_MS_LANGID_MALAYALAM_INDIA                   0x044c
+#define TT_MS_LANGID_ASSAMESE_INDIA                    0x044d
+#define TT_MS_LANGID_MARATHI_INDIA                     0x044e
+#define TT_MS_LANGID_SANSKRIT_INDIA                    0x044f
+#define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450
+#define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN      0x0850
+#define TT_MS_LANGID_TIBETAN_CHINA                     0x0451
+  /* Don't use the next constant!  It has            */
+  /*   (1) the wrong spelling (Dzonghka)             */
+  /*   (2) Microsoft doesn't officially define it -- */
+  /*       at least it is not in the List of Local   */
+  /*       ID Values.                                */
+  /*   (3) Dzongkha is not the same language as      */
+  /*       Tibetan, so merging it is wrong anyway.   */
+  /*                                                 */
+  /* TT_MS_LANGID_TIBETAN_BHUTAN is correct, BTW.    */
+#define TT_MS_LANGID_DZONGHKA_BHUTAN                   0x0851
+
+#if 0
+  /* the following used to be defined */
+#define TT_MS_LANGID_TIBETAN_BHUTAN                    0x0451
+  /* ... but it was changed; */
+#else
+  /* So we will continue to #define it, but with the correct value */
+#define TT_MS_LANGID_TIBETAN_BHUTAN   TT_MS_LANGID_DZONGHKA_BHUTAN
+#endif
+
+#define TT_MS_LANGID_WELSH_WALES                       0x0452
+#define TT_MS_LANGID_KHMER_CAMBODIA                    0x0453
+#define TT_MS_LANGID_LAO_LAOS                          0x0454
+#define TT_MS_LANGID_BURMESE_MYANMAR                   0x0455
+#define TT_MS_LANGID_GALICIAN_SPAIN                    0x0456
+#define TT_MS_LANGID_KONKANI_INDIA                     0x0457
+#define TT_MS_LANGID_MANIPURI_INDIA  /* Bengali */     0x0458
+#define TT_MS_LANGID_SINDHI_INDIA /* Arabic */         0x0459
+#define TT_MS_LANGID_SINDHI_PAKISTAN                   0x0859
+  /* Missing a LCID for Sindhi in Devanagari script */
+#define TT_MS_LANGID_SYRIAC_SYRIA                      0x045a
+#define TT_MS_LANGID_SINHALESE_SRI_LANKA               0x045b
+#define TT_MS_LANGID_CHEROKEE_UNITED_STATES            0x045c
+#define TT_MS_LANGID_INUKTITUT_CANADA                  0x045d
+#define TT_MS_LANGID_AMHARIC_ETHIOPIA                  0x045e
+#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */    0x045f
+#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN           0x085f
+  /* Missing a LCID for Tifinagh script */
+#define TT_MS_LANGID_KASHMIRI_PAKISTAN /* Arabic */    0x0460
+  /* Spelled this way by XPsp2 Platform SDK (2004-07-26) */
+  /* script is yet unclear... might be Arabic, Nagari or Sharada */
+#define TT_MS_LANGID_KASHMIRI_SASIA                    0x0860
+  /* ... and aliased (by MS) for compatibility reasons. */
+#define TT_MS_LANGID_KASHMIRI_INDIA TT_MS_LANGID_KASHMIRI_SASIA
+#define TT_MS_LANGID_NEPALI_NEPAL                      0x0461
+#define TT_MS_LANGID_NEPALI_INDIA                      0x0861
+#define TT_MS_LANGID_FRISIAN_NETHERLANDS               0x0462
+#define TT_MS_LANGID_PASHTO_AFGHANISTAN                0x0463
+#define TT_MS_LANGID_FILIPINO_PHILIPPINES              0x0464
+#define TT_MS_LANGID_DHIVEHI_MALDIVES                  0x0465
+  /* alias declared in Windows 2000 */
+#define TT_MS_LANGID_DIVEHI_MALDIVES  TT_MS_LANGID_DHIVEHI_MALDIVES
+#define TT_MS_LANGID_EDO_NIGERIA                       0x0466
+#define TT_MS_LANGID_FULFULDE_NIGERIA                  0x0467
+#define TT_MS_LANGID_HAUSA_NIGERIA                     0x0468
+#define TT_MS_LANGID_IBIBIO_NIGERIA                    0x0469
+#define TT_MS_LANGID_YORUBA_NIGERIA                    0x046a
+#define TT_MS_LANGID_QUECHUA_BOLIVIA                   0x046b
+#define TT_MS_LANGID_QUECHUA_ECUADOR                   0x086b
+#define TT_MS_LANGID_QUECHUA_PERU                      0x0c6b
+#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA               0x046c
+  /* Also spelled by XPsp2 Platform SDK (2004-07-26) */
+#define TT_MS_LANGID_SOTHO_SOUTHERN_SOUTH_AFRICA \
+          TT_MS_LANGID_SEPEDI_SOUTH_AFRICA
+  /* language codes 0x046d, 0x046e and 0x046f are (still) unknown. */
+#define TT_MS_LANGID_IGBO_NIGERIA                      0x0470
+#define TT_MS_LANGID_KANURI_NIGERIA                    0x0471
+#define TT_MS_LANGID_OROMO_ETHIOPIA                    0x0472
+#define TT_MS_LANGID_TIGRIGNA_ETHIOPIA                 0x0473
+#define TT_MS_LANGID_TIGRIGNA_ERYTHREA                 0x0873
+  /* also spelled in the `Passport SDK' list as: */
+#define TT_MS_LANGID_TIGRIGNA_ERYTREA  TT_MS_LANGID_TIGRIGNA_ERYTHREA
+#define TT_MS_LANGID_GUARANI_PARAGUAY                  0x0474
+#define TT_MS_LANGID_HAWAIIAN_UNITED_STATES            0x0475
+#define TT_MS_LANGID_LATIN                             0x0476
+#define TT_MS_LANGID_SOMALI_SOMALIA                    0x0477
+  /* Note: Yi does not have a (proper) ISO 639-2 code, since it is mostly */
+  /*       not written (but OTOH the peculiar writing system is worth     */
+  /*       studying).                                                     */
+#define TT_MS_LANGID_YI_CHINA                          0x0478
+#define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES   0x0479
+  /* language codes from 0x047a to 0x047f are (still) unknown. */
+#define TT_MS_LANGID_UIGHUR_CHINA                      0x0480
+#define TT_MS_LANGID_MAORI_NEW_ZEALAND                 0x0481
+
+#if 0  /* not deemed useful for fonts */
+#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE            0x04ff
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Possible values of the `name' identifier field in the name records of */
+  /* the TTF `name' table.  These values are platform independent.         */
+  /*                                                                       */
+#define TT_NAME_ID_COPYRIGHT            0
+#define TT_NAME_ID_FONT_FAMILY          1
+#define TT_NAME_ID_FONT_SUBFAMILY       2
+#define TT_NAME_ID_UNIQUE_ID            3
+#define TT_NAME_ID_FULL_NAME            4
+#define TT_NAME_ID_VERSION_STRING       5
+#define TT_NAME_ID_PS_NAME              6
+#define TT_NAME_ID_TRADEMARK            7
+
+  /* the following values are from the OpenType spec */
+#define TT_NAME_ID_MANUFACTURER         8
+#define TT_NAME_ID_DESIGNER             9
+#define TT_NAME_ID_DESCRIPTION          10
+#define TT_NAME_ID_VENDOR_URL           11
+#define TT_NAME_ID_DESIGNER_URL         12
+#define TT_NAME_ID_LICENSE              13
+#define TT_NAME_ID_LICENSE_URL          14
+  /* number 15 is reserved */
+#define TT_NAME_ID_PREFERRED_FAMILY     16
+#define TT_NAME_ID_PREFERRED_SUBFAMILY  17
+#define TT_NAME_ID_MAC_FULL_NAME        18
+
+  /* The following code is new as of 2000-01-21 */
+#define TT_NAME_ID_SAMPLE_TEXT          19
+
+  /* This is new in OpenType 1.3 */
+#define TT_NAME_ID_CID_FINDFONT_NAME    20
+
+  /* This is new in OpenType 1.5 */
+#define TT_NAME_ID_WWS_FAMILY           21
+#define TT_NAME_ID_WWS_SUBFAMILY        22
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Bit mask values for the Unicode Ranges from the TTF `OS2 ' table.     */
+  /*                                                                       */
+  /* Updated 08-Nov-2008.                                                  */
+  /*                                                                       */
+
+  /* Bit  0   Basic Latin */
+#define TT_UCR_BASIC_LATIN                     (1L <<  0) /* U+0020-U+007E */
+  /* Bit  1   C1 Controls and Latin-1 Supplement */
+#define TT_UCR_LATIN1_SUPPLEMENT               (1L <<  1) /* U+0080-U+00FF */
+  /* Bit  2   Latin Extended-A */
+#define TT_UCR_LATIN_EXTENDED_A                (1L <<  2) /* U+0100-U+017F */
+  /* Bit  3   Latin Extended-B */
+#define TT_UCR_LATIN_EXTENDED_B                (1L <<  3) /* U+0180-U+024F */
+  /* Bit  4   IPA Extensions                 */
+  /*          Phonetic Extensions            */
+  /*          Phonetic Extensions Supplement */
+#define TT_UCR_IPA_EXTENSIONS                  (1L <<  4) /* U+0250-U+02AF */
+                                                          /* U+1D00-U+1D7F */
+                                                          /* U+1D80-U+1DBF */
+  /* Bit  5   Spacing Modifier Letters */
+  /*          Modifier Tone Letters    */
+#define TT_UCR_SPACING_MODIFIER                (1L <<  5) /* U+02B0-U+02FF */
+                                                          /* U+A700-U+A71F */
+  /* Bit  6   Combining Diacritical Marks            */
+  /*          Combining Diacritical Marks Supplement */
+#define TT_UCR_COMBINING_DIACRITICS            (1L <<  6) /* U+0300-U+036F */
+                                                          /* U+1DC0-U+1DFF */
+  /* Bit  7   Greek and Coptic */
+#define TT_UCR_GREEK                           (1L <<  7) /* U+0370-U+03FF */
+  /* Bit  8   Coptic */
+#define TT_UCR_COPTIC                          (1L <<  8) /* U+2C80-U+2CFF */
+  /* Bit  9   Cyrillic            */
+  /*          Cyrillic Supplement */
+  /*          Cyrillic Extended-A */
+  /*          Cyrillic Extended-B */
+#define TT_UCR_CYRILLIC                        (1L <<  9) /* U+0400-U+04FF */
+                                                          /* U+0500-U+052F */
+                                                          /* U+2DE0-U+2DFF */
+                                                          /* U+A640-U+A69F */
+  /* Bit 10   Armenian */
+#define TT_UCR_ARMENIAN                        (1L << 10) /* U+0530-U+058F */
+  /* Bit 11   Hebrew */
+#define TT_UCR_HEBREW                          (1L << 11) /* U+0590-U+05FF */
+  /* Bit 12   Vai */
+#define TT_UCR_VAI                             (1L << 12) /* U+A500-U+A63F */
+  /* Bit 13   Arabic            */
+  /*          Arabic Supplement */
+#define TT_UCR_ARABIC                          (1L << 13) /* U+0600-U+06FF */
+                                                          /* U+0750-U+077F */
+  /* Bit 14   NKo */
+#define TT_UCR_NKO                             (1L << 14) /* U+07C0-U+07FF */
+  /* Bit 15   Devanagari */
+#define TT_UCR_DEVANAGARI                      (1L << 15) /* U+0900-U+097F */
+  /* Bit 16   Bengali */
+#define TT_UCR_BENGALI                         (1L << 16) /* U+0980-U+09FF */
+  /* Bit 17   Gurmukhi */
+#define TT_UCR_GURMUKHI                        (1L << 17) /* U+0A00-U+0A7F */
+  /* Bit 18   Gujarati */
+#define TT_UCR_GUJARATI                        (1L << 18) /* U+0A80-U+0AFF */
+  /* Bit 19   Oriya */
+#define TT_UCR_ORIYA                           (1L << 19) /* U+0B00-U+0B7F */
+  /* Bit 20   Tamil */
+#define TT_UCR_TAMIL                           (1L << 20) /* U+0B80-U+0BFF */
+  /* Bit 21   Telugu */
+#define TT_UCR_TELUGU                          (1L << 21) /* U+0C00-U+0C7F */
+  /* Bit 22   Kannada */
+#define TT_UCR_KANNADA                         (1L << 22) /* U+0C80-U+0CFF */
+  /* Bit 23   Malayalam */
+#define TT_UCR_MALAYALAM                       (1L << 23) /* U+0D00-U+0D7F */
+  /* Bit 24   Thai */
+#define TT_UCR_THAI                            (1L << 24) /* U+0E00-U+0E7F */
+  /* Bit 25   Lao */
+#define TT_UCR_LAO                             (1L << 25) /* U+0E80-U+0EFF */
+  /* Bit 26   Georgian            */
+  /*          Georgian Supplement */
+#define TT_UCR_GEORGIAN                        (1L << 26) /* U+10A0-U+10FF */
+                                                          /* U+2D00-U+2D2F */
+  /* Bit 27   Balinese */
+#define TT_UCR_BALINESE                        (1L << 27) /* U+1B00-U+1B7F */
+  /* Bit 28   Hangul Jamo */
+#define TT_UCR_HANGUL_JAMO                     (1L << 28) /* U+1100-U+11FF */
+  /* Bit 29   Latin Extended Additional */
+  /*          Latin Extended-C          */
+  /*          Latin Extended-D          */
+#define TT_UCR_LATIN_EXTENDED_ADDITIONAL       (1L << 29) /* U+1E00-U+1EFF */
+                                                          /* U+2C60-U+2C7F */
+                                                          /* U+A720-U+A7FF */
+  /* Bit 30   Greek Extended */
+#define TT_UCR_GREEK_EXTENDED                  (1L << 30) /* U+1F00-U+1FFF */
+  /* Bit 31   General Punctuation      */
+  /*          Supplemental Punctuation */
+#define TT_UCR_GENERAL_PUNCTUATION             (1L << 31) /* U+2000-U+206F */
+                                                          /* U+2E00-U+2E7F */
+  /* Bit 32   Superscripts And Subscripts */
+#define TT_UCR_SUPERSCRIPTS_SUBSCRIPTS         (1L <<  0) /* U+2070-U+209F */
+  /* Bit 33   Currency Symbols */
+#define TT_UCR_CURRENCY_SYMBOLS                (1L <<  1) /* U+20A0-U+20CF */
+  /* Bit 34   Combining Diacritical Marks For Symbols */
+#define TT_UCR_COMBINING_DIACRITICS_SYMB       (1L <<  2) /* U+20D0-U+20FF */
+  /* Bit 35   Letterlike Symbols */
+#define TT_UCR_LETTERLIKE_SYMBOLS              (1L <<  3) /* U+2100-U+214F */
+  /* Bit 36   Number Forms */
+#define TT_UCR_NUMBER_FORMS                    (1L <<  4) /* U+2150-U+218F */
+  /* Bit 37   Arrows                           */
+  /*          Supplemental Arrows-A            */
+  /*          Supplemental Arrows-B            */
+  /*          Miscellaneous Symbols and Arrows */
+#define TT_UCR_ARROWS                          (1L <<  5) /* U+2190-U+21FF */
+                                                          /* U+27F0-U+27FF */
+                                                          /* U+2900-U+297F */
+                                                          /* U+2B00-U+2BFF */
+  /* Bit 38   Mathematical Operators               */
+  /*          Supplemental Mathematical Operators  */
+  /*          Miscellaneous Mathematical Symbols-A */
+  /*          Miscellaneous Mathematical Symbols-B */
+#define TT_UCR_MATHEMATICAL_OPERATORS          (1L <<  6) /* U+2200-U+22FF */
+                                                          /* U+2A00-U+2AFF */
+                                                          /* U+27C0-U+27EF */
+                                                          /* U+2980-U+29FF */
+  /* Bit 39 Miscellaneous Technical */
+#define TT_UCR_MISCELLANEOUS_TECHNICAL         (1L <<  7) /* U+2300-U+23FF */
+  /* Bit 40   Control Pictures */
+#define TT_UCR_CONTROL_PICTURES                (1L <<  8) /* U+2400-U+243F */
+  /* Bit 41   Optical Character Recognition */
+#define TT_UCR_OCR                             (1L <<  9) /* U+2440-U+245F */
+  /* Bit 42   Enclosed Alphanumerics */
+#define TT_UCR_ENCLOSED_ALPHANUMERICS          (1L << 10) /* U+2460-U+24FF */
+  /* Bit 43   Box Drawing */
+#define TT_UCR_BOX_DRAWING                     (1L << 11) /* U+2500-U+257F */
+  /* Bit 44   Block Elements */
+#define TT_UCR_BLOCK_ELEMENTS                  (1L << 12) /* U+2580-U+259F */
+  /* Bit 45   Geometric Shapes */
+#define TT_UCR_GEOMETRIC_SHAPES                (1L << 13) /* U+25A0-U+25FF */
+  /* Bit 46   Miscellaneous Symbols */
+#define TT_UCR_MISCELLANEOUS_SYMBOLS           (1L << 14) /* U+2600-U+26FF */
+  /* Bit 47   Dingbats */
+#define TT_UCR_DINGBATS                        (1L << 15) /* U+2700-U+27BF */
+  /* Bit 48   CJK Symbols and Punctuation */
+#define TT_UCR_CJK_SYMBOLS                     (1L << 16) /* U+3000-U+303F */
+  /* Bit 49   Hiragana */
+#define TT_UCR_HIRAGANA                        (1L << 17) /* U+3040-U+309F */
+  /* Bit 50   Katakana                     */
+  /*          Katakana Phonetic Extensions */
+#define TT_UCR_KATAKANA                        (1L << 18) /* U+30A0-U+30FF */
+                                                          /* U+31F0-U+31FF */
+  /* Bit 51   Bopomofo          */
+  /*          Bopomofo Extended */
+#define TT_UCR_BOPOMOFO                        (1L << 19) /* U+3100-U+312F */
+                                                          /* U+31A0-U+31BF */
+  /* Bit 52   Hangul Compatibility Jamo */
+#define TT_UCR_HANGUL_COMPATIBILITY_JAMO       (1L << 20) /* U+3130-U+318F */
+  /* Bit 53   Phags-Pa */
+#define TT_UCR_CJK_MISC                        (1L << 21) /* U+A840-U+A87F */
+#define TT_UCR_KANBUN  TT_UCR_CJK_MISC /* deprecated */
+#define TT_UCR_PHAGSPA
+  /* Bit 54   Enclosed CJK Letters and Months */
+#define TT_UCR_ENCLOSED_CJK_LETTERS_MONTHS     (1L << 22) /* U+3200-U+32FF */
+  /* Bit 55   CJK Compatibility */
+#define TT_UCR_CJK_COMPATIBILITY               (1L << 23) /* U+3300-U+33FF */
+  /* Bit 56   Hangul Syllables */
+#define TT_UCR_HANGUL                          (1L << 24) /* U+AC00-U+D7A3 */
+  /* Bit 57   High Surrogates              */
+  /*          High Private Use Surrogates  */
+  /*          Low Surrogates               */
+  /*                                       */
+  /* According to OpenType specs v.1.3+,   */
+  /* setting bit 57 implies that there is  */
+  /* at least one codepoint beyond the     */
+  /* Basic Multilingual Plane that is      */
+  /* supported by this font.  So it really */
+  /* means >= U+10000                      */
+#define TT_UCR_SURROGATES                      (1L << 25) /* U+D800-U+DB7F */
+                                                          /* U+DB80-U+DBFF */
+                                                          /* U+DC00-U+DFFF */
+#define TT_UCR_NON_PLANE_0  TT_UCR_SURROGATES
+  /* Bit 58  Phoenician */
+#define TT_UCR_PHOENICIAN                      (1L << 26) /*U+10900-U+1091F*/
+  /* Bit 59   CJK Unified Ideographs             */
+  /*          CJK Radicals Supplement            */
+  /*          Kangxi Radicals                    */
+  /*          Ideographic Description Characters */
+  /*          CJK Unified Ideographs Extension A */
+  /*          CJK Unified Ideographs Extension B */
+  /*          Kanbun                             */
+#define TT_UCR_CJK_UNIFIED_IDEOGRAPHS          (1L << 27) /* U+4E00-U+9FFF */
+                                                          /* U+2E80-U+2EFF */
+                                                          /* U+2F00-U+2FDF */
+                                                          /* U+2FF0-U+2FFF */
+                                                          /* U+3400-U+4DB5 */
+                                                          /*U+20000-U+2A6DF*/
+                                                          /* U+3190-U+319F */
+  /* Bit 60   Private Use */
+#define TT_UCR_PRIVATE_USE                     (1L << 28) /* U+E000-U+F8FF */
+  /* Bit 61   CJK Strokes                             */
+  /*          CJK Compatibility Ideographs            */
+  /*          CJK Compatibility Ideographs Supplement */
+#define TT_UCR_CJK_COMPATIBILITY_IDEOGRAPHS    (1L << 29) /* U+31C0-U+31EF */
+                                                          /* U+F900-U+FAFF */
+                                                          /*U+2F800-U+2FA1F*/
+  /* Bit 62   Alphabetic Presentation Forms */
+#define TT_UCR_ALPHABETIC_PRESENTATION_FORMS   (1L << 30) /* U+FB00-U+FB4F */
+  /* Bit 63   Arabic Presentation Forms-A */
+#define TT_UCR_ARABIC_PRESENTATIONS_A          (1L << 31) /* U+FB50-U+FDFF */
+  /* Bit 64   Combining Half Marks */
+#define TT_UCR_COMBINING_HALF_MARKS            (1L <<  0) /* U+FE20-U+FE2F */
+  /* Bit 65   Vertical forms          */
+  /*          CJK Compatibility Forms */
+#define TT_UCR_CJK_COMPATIBILITY_FORMS         (1L <<  1) /* U+FE10-U+FE1F */
+                                                          /* U+FE30-U+FE4F */
+  /* Bit 66   Small Form Variants */
+#define TT_UCR_SMALL_FORM_VARIANTS             (1L <<  2) /* U+FE50-U+FE6F */
+  /* Bit 67   Arabic Presentation Forms-B */
+#define TT_UCR_ARABIC_PRESENTATIONS_B          (1L <<  3) /* U+FE70-U+FEFE */
+  /* Bit 68   Halfwidth and Fullwidth Forms */
+#define TT_UCR_HALFWIDTH_FULLWIDTH_FORMS       (1L <<  4) /* U+FF00-U+FFEF */
+  /* Bit 69   Specials */
+#define TT_UCR_SPECIALS                        (1L <<  5) /* U+FFF0-U+FFFD */
+  /* Bit 70   Tibetan */
+#define TT_UCR_TIBETAN                         (1L <<  6) /* U+0F00-U+0FFF */
+  /* Bit 71   Syriac */
+#define TT_UCR_SYRIAC                          (1L <<  7) /* U+0700-U+074F */
+  /* Bit 72   Thaana */
+#define TT_UCR_THAANA                          (1L <<  8) /* U+0780-U+07BF */
+  /* Bit 73   Sinhala */
+#define TT_UCR_SINHALA                         (1L <<  9) /* U+0D80-U+0DFF */
+  /* Bit 74   Myanmar */
+#define TT_UCR_MYANMAR                         (1L << 10) /* U+1000-U+109F */
+  /* Bit 75   Ethiopic            */
+  /*          Ethiopic Supplement */
+  /*          Ethiopic Extended   */
+#define TT_UCR_ETHIOPIC                        (1L << 11) /* U+1200-U+137F */
+                                                          /* U+1380-U+139F */
+                                                          /* U+2D80-U+2DDF */
+  /* Bit 76   Cherokee */
+#define TT_UCR_CHEROKEE                        (1L << 12) /* U+13A0-U+13FF */
+  /* Bit 77   Unified Canadian Aboriginal Syllabics */
+#define TT_UCR_CANADIAN_ABORIGINAL_SYLLABICS   (1L << 13) /* U+1400-U+167F */
+  /* Bit 78   Ogham */
+#define TT_UCR_OGHAM                           (1L << 14) /* U+1680-U+169F */
+  /* Bit 79   Runic */
+#define TT_UCR_RUNIC                           (1L << 15) /* U+16A0-U+16FF */
+  /* Bit 80   Khmer         */
+  /*          Khmer Symbols */
+#define TT_UCR_KHMER                           (1L << 16) /* U+1780-U+17FF */
+                                                          /* U+19E0-U+19FF */
+  /* Bit 81   Mongolian */
+#define TT_UCR_MONGOLIAN                       (1L << 17) /* U+1800-U+18AF */
+  /* Bit 82   Braille Patterns */
+#define TT_UCR_BRAILLE                         (1L << 18) /* U+2800-U+28FF */
+  /* Bit 83   Yi Syllables */
+  /*          Yi Radicals  */
+#define TT_UCR_YI                              (1L << 19) /* U+A000-U+A48F */
+                                                          /* U+A490-U+A4CF */
+  /* Bit 84   Tagalog  */
+  /*          Hanunoo  */
+  /*          Buhid    */
+  /*          Tagbanwa */
+#define TT_UCR_PHILIPPINE                      (1L << 20) /* U+1700-U+171F */
+                                                          /* U+1720-U+173F */
+                                                          /* U+1740-U+175F */
+                                                          /* U+1760-U+177F */
+  /* Bit 85   Old Italic */
+#define TT_UCR_OLD_ITALIC                      (1L << 21) /*U+10300-U+1032F*/
+  /* Bit 86   Gothic */
+#define TT_UCR_GOTHIC                          (1L << 22) /*U+10330-U+1034F*/
+  /* Bit 87   Deseret */
+#define TT_UCR_DESERET                         (1L << 23) /*U+10400-U+1044F*/
+  /* Bit 88   Byzantine Musical Symbols      */
+  /*          Musical Symbols                */
+  /*          Ancient Greek Musical Notation */
+#define TT_UCR_MUSICAL_SYMBOLS                 (1L << 24) /*U+1D000-U+1D0FF*/
+                                                          /*U+1D100-U+1D1FF*/
+                                                          /*U+1D200-U+1D24F*/
+  /* Bit 89   Mathematical Alphanumeric Symbols */
+#define TT_UCR_MATH_ALPHANUMERIC_SYMBOLS       (1L << 25) /*U+1D400-U+1D7FF*/
+  /* Bit 90   Private Use (plane 15) */
+  /*          Private Use (plane 16) */
+#define TT_UCR_PRIVATE_USE_SUPPLEMENTARY       (1L << 26) /*U+F0000-U+FFFFD*/
+                                                        /*U+100000-U+10FFFD*/
+  /* Bit 91   Variation Selectors            */
+  /*          Variation Selectors Supplement */
+#define TT_UCR_VARIATION_SELECTORS             (1L << 27) /* U+FE00-U+FE0F */
+                                                          /*U+E0100-U+E01EF*/
+  /* Bit 92   Tags */
+#define TT_UCR_TAGS                            (1L << 28) /*U+E0000-U+E007F*/
+  /* Bit 93   Limbu */
+#define TT_UCR_LIMBU                           (1L << 29) /* U+1900-U+194F */
+  /* Bit 94   Tai Le */
+#define TT_UCR_TAI_LE                          (1L << 30) /* U+1950-U+197F */
+  /* Bit 95   New Tai Lue */
+#define TT_UCR_NEW_TAI_LUE                     (1L << 31) /* U+1980-U+19DF */
+  /* Bit 96   Buginese */
+#define TT_UCR_BUGINESE                        (1L <<  0) /* U+1A00-U+1A1F */
+  /* Bit 97   Glagolitic */
+#define TT_UCR_GLAGOLITIC                      (1L <<  1) /* U+2C00-U+2C5F */
+  /* Bit 98   Tifinagh */
+#define TT_UCR_TIFINAGH                        (1L <<  2) /* U+2D30-U+2D7F */
+  /* Bit 99   Yijing Hexagram Symbols */
+#define TT_UCR_YIJING                          (1L <<  3) /* U+4DC0-U+4DFF */
+  /* Bit 100  Syloti Nagri */
+#define TT_UCR_SYLOTI_NAGRI                    (1L <<  4) /* U+A800-U+A82F */
+  /* Bit 101  Linear B Syllabary */
+  /*          Linear B Ideograms */
+  /*          Aegean Numbers     */
+#define TT_UCR_LINEAR_B                        (1L <<  5) /*U+10000-U+1007F*/
+                                                          /*U+10080-U+100FF*/
+                                                          /*U+10100-U+1013F*/
+  /* Bit 102  Ancient Greek Numbers */
+#define TT_UCR_ANCIENT_GREEK_NUMBERS           (1L <<  6) /*U+10140-U+1018F*/
+  /* Bit 103  Ugaritic */
+#define TT_UCR_UGARITIC                        (1L <<  7) /*U+10380-U+1039F*/
+  /* Bit 104  Old Persian */
+#define TT_UCR_OLD_PERSIAN                     (1L <<  8) /*U+103A0-U+103DF*/
+  /* Bit 105  Shavian */
+#define TT_UCR_SHAVIAN                         (1L <<  9) /*U+10450-U+1047F*/
+  /* Bit 106  Osmanya */
+#define TT_UCR_OSMANYA                         (1L << 10) /*U+10480-U+104AF*/
+  /* Bit 107  Cypriot Syllabary */
+#define TT_UCR_CYPRIOT_SYLLABARY               (1L << 11) /*U+10800-U+1083F*/
+  /* Bit 108  Kharoshthi */
+#define TT_UCR_KHAROSHTHI                      (1L << 12) /*U+10A00-U+10A5F*/
+  /* Bit 109  Tai Xuan Jing Symbols */
+#define TT_UCR_TAI_XUAN_JING                   (1L << 13) /*U+1D300-U+1D35F*/
+  /* Bit 110  Cuneiform                         */
+  /*          Cuneiform Numbers and Punctuation */
+#define TT_UCR_CUNEIFORM                       (1L << 14) /*U+12000-U+123FF*/
+                                                          /*U+12400-U+1247F*/
+  /* Bit 111  Counting Rod Numerals */
+#define TT_UCR_COUNTING_ROD_NUMERALS           (1L << 15) /*U+1D360-U+1D37F*/
+  /* Bit 112  Sundanese */
+#define TT_UCR_SUNDANESE                       (1L << 16) /* U+1B80-U+1BBF */
+  /* Bit 113  Lepcha */
+#define TT_UCR_LEPCHA                          (1L << 17) /* U+1C00-U+1C4F */
+  /* Bit 114  Ol Chiki */
+#define TT_UCR_OL_CHIKI                        (1L << 18) /* U+1C50-U+1C7F */
+  /* Bit 115  Saurashtra */
+#define TT_UCR_SAURASHTRA                      (1L << 19) /* U+A880-U+A8DF */
+  /* Bit 116  Kayah Li */
+#define TT_UCR_KAYAH_LI                        (1L << 20) /* U+A900-U+A92F */
+  /* Bit 117  Rejang */
+#define TT_UCR_REJANG                          (1L << 21) /* U+A930-U+A95F */
+  /* Bit 118  Cham */
+#define TT_UCR_CHAM                            (1L << 22) /* U+AA00-U+AA5F */
+  /* Bit 119  Ancient Symbols */
+#define TT_UCR_ANCIENT_SYMBOLS                 (1L << 23) /*U+10190-U+101CF*/
+  /* Bit 120  Phaistos Disc */
+#define TT_UCR_PHAISTOS_DISC                   (1L << 24) /*U+101D0-U+101FF*/
+  /* Bit 121  Carian */
+  /*          Lycian */
+  /*          Lydian */
+#define TT_UCR_OLD_ANATOLIAN                   (1L << 25) /*U+102A0-U+102DF*/
+                                                          /*U+10280-U+1029F*/
+                                                          /*U+10920-U+1093F*/
+  /* Bit 122  Domino Tiles  */
+  /*          Mahjong Tiles */
+#define TT_UCR_GAME_TILES                      (1L << 26) /*U+1F030-U+1F09F*/
+                                                          /*U+1F000-U+1F02F*/
+  /* Bit 123-127 Reserved for process-internal usage */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Some compilers have a very limited length of identifiers.             */
+  /*                                                                       */
+#if defined( __TURBOC__ ) && __TURBOC__ < 0x0410 || defined( __PACIFIC__ )
+#define HAVE_LIMIT_ON_IDENTS
+#endif
+
+
+#ifndef HAVE_LIMIT_ON_IDENTS
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Here some alias #defines in order to be clearer.                      */
+  /*                                                                       */
+  /* These are not always #defined to stay within the 31~character limit,  */
+  /* which some compilers have.                                            */
+  /*                                                                       */
+  /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern  */
+  /* Borland compilers (read: from BC++ 3.1 on) can increase this limit.   */
+  /* If you get a warning with such a compiler, use the -i40 switch.       */
+  /*                                                                       */
+#define TT_UCR_ARABIC_PRESENTATION_FORMS_A      \
+         TT_UCR_ARABIC_PRESENTATIONS_A
+#define TT_UCR_ARABIC_PRESENTATION_FORMS_B      \
+         TT_UCR_ARABIC_PRESENTATIONS_B
+
+#define TT_UCR_COMBINING_DIACRITICAL_MARKS      \
+         TT_UCR_COMBINING_DIACRITICS
+#define TT_UCR_COMBINING_DIACRITICAL_MARKS_SYMB \
+         TT_UCR_COMBINING_DIACRITICS_SYMB
+
+
+#endif /* !HAVE_LIMIT_ON_IDENTS */
+
+
+FT_END_HEADER
+
+#endif /* __TTNAMEID_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ttnameid.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/tttables.h
===================================================================
--- lib/3rdparty/freetype/include/tttables.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/tttables.h	(rÃ©vision 62573)
@@ -0,0 +1,787 @@
+/***************************************************************************/
+/*                                                                         */
+/*  tttables.h                                                             */
+/*                                                                         */
+/*    Basic SFNT/TrueType tables definitions and interface                 */
+/*    (specification only).                                                */
+/*                                                                         */
+/*  Copyright 1996-2005, 2008-2013 by                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __TTTABLES_H__
+#define __TTTABLES_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    truetype_tables                                                    */
+  /*                                                                       */
+  /* <Title>                                                               */
+  /*    TrueType Tables                                                    */
+  /*                                                                       */
+  /* <Abstract>                                                            */
+  /*    TrueType specific table types and functions.                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This section contains the definition of TrueType-specific tables   */
+  /*    as well as some routines used to access and process them.          */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_Header                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a TrueType font header table.  All       */
+  /*    fields follow the TrueType specification.                          */
+  /*                                                                       */
+  typedef struct  TT_Header_
+  {
+    FT_Fixed   Table_Version;
+    FT_Fixed   Font_Revision;
+
+    FT_Long    CheckSum_Adjust;
+    FT_Long    Magic_Number;
+
+    FT_UShort  Flags;
+    FT_UShort  Units_Per_EM;
+
+    FT_Long    Created [2];
+    FT_Long    Modified[2];
+
+    FT_Short   xMin;
+    FT_Short   yMin;
+    FT_Short   xMax;
+    FT_Short   yMax;
+
+    FT_UShort  Mac_Style;
+    FT_UShort  Lowest_Rec_PPEM;
+
+    FT_Short   Font_Direction;
+    FT_Short   Index_To_Loc_Format;
+    FT_Short   Glyph_Data_Format;
+
+  } TT_Header;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_HoriHeader                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a TrueType horizontal header, the `hhea' */
+  /*    table, as well as the corresponding horizontal metrics table,      */
+  /*    i.e., the `hmtx' table.                                            */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    Version                :: The table version.                       */
+  /*                                                                       */
+  /*    Ascender               :: The font's ascender, i.e., the distance  */
+  /*                              from the baseline to the top-most of all */
+  /*                              glyph points found in the font.          */
+  /*                                                                       */
+  /*                              This value is invalid in many fonts, as  */
+  /*                              it is usually set by the font designer,  */
+  /*                              and often reflects only a portion of the */
+  /*                              glyphs found in the font (maybe ASCII).  */
+  /*                                                                       */
+  /*                              You should use the `sTypoAscender' field */
+  /*                              of the OS/2 table instead if you want    */
+  /*                              the correct one.                         */
+  /*                                                                       */
+  /*    Descender              :: The font's descender, i.e., the distance */
+  /*                              from the baseline to the bottom-most of  */
+  /*                              all glyph points found in the font.  It  */
+  /*                              is negative.                             */
+  /*                                                                       */
+  /*                              This value is invalid in many fonts, as  */
+  /*                              it is usually set by the font designer,  */
+  /*                              and often reflects only a portion of the */
+  /*                              glyphs found in the font (maybe ASCII).  */
+  /*                                                                       */
+  /*                              You should use the `sTypoDescender'      */
+  /*                              field of the OS/2 table instead if you   */
+  /*                              want the correct one.                    */
+  /*                                                                       */
+  /*    Line_Gap               :: The font's line gap, i.e., the distance  */
+  /*                              to add to the ascender and descender to  */
+  /*                              get the BTB, i.e., the                   */
+  /*                              baseline-to-baseline distance for the    */
+  /*                              font.                                    */
+  /*                                                                       */
+  /*    advance_Width_Max      :: This field is the maximum of all advance */
+  /*                              widths found in the font.  It can be     */
+  /*                              used to compute the maximum width of an  */
+  /*                              arbitrary string of text.                */
+  /*                                                                       */
+  /*    min_Left_Side_Bearing  :: The minimum left side bearing of all     */
+  /*                              glyphs within the font.                  */
+  /*                                                                       */
+  /*    min_Right_Side_Bearing :: The minimum right side bearing of all    */
+  /*                              glyphs within the font.                  */
+  /*                                                                       */
+  /*    xMax_Extent            :: The maximum horizontal extent (i.e., the */
+  /*                              `width' of a glyph's bounding box) for   */
+  /*                              all glyphs in the font.                  */
+  /*                                                                       */
+  /*    caret_Slope_Rise       :: The rise coefficient of the cursor's     */
+  /*                              slope of the cursor (slope=rise/run).    */
+  /*                                                                       */
+  /*    caret_Slope_Run        :: The run coefficient of the cursor's      */
+  /*                              slope.                                   */
+  /*                                                                       */
+  /*    Reserved               :: 8~reserved bytes.                        */
+  /*                                                                       */
+  /*    metric_Data_Format     :: Always~0.                                */
+  /*                                                                       */
+  /*    number_Of_HMetrics     :: Number of HMetrics entries in the `hmtx' */
+  /*                              table -- this value can be smaller than  */
+  /*                              the total number of glyphs in the font.  */
+  /*                                                                       */
+  /*    long_metrics           :: A pointer into the `hmtx' table.         */
+  /*                                                                       */
+  /*    short_metrics          :: A pointer into the `hmtx' table.         */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
+  /*               be identical except for the names of their fields,      */
+  /*               which are different.                                    */
+  /*                                                                       */
+  /*               This ensures that a single function in the `ttload'     */
+  /*               module is able to read both the horizontal and vertical */
+  /*               headers.                                                */
+  /*                                                                       */
+  typedef struct  TT_HoriHeader_
+  {
+    FT_Fixed   Version;
+    FT_Short   Ascender;
+    FT_Short   Descender;
+    FT_Short   Line_Gap;
+
+    FT_UShort  advance_Width_Max;      /* advance width maximum */
+
+    FT_Short   min_Left_Side_Bearing;  /* minimum left-sb       */
+    FT_Short   min_Right_Side_Bearing; /* minimum right-sb      */
+    FT_Short   xMax_Extent;            /* xmax extents          */
+    FT_Short   caret_Slope_Rise;
+    FT_Short   caret_Slope_Run;
+    FT_Short   caret_Offset;
+
+    FT_Short   Reserved[4];
+
+    FT_Short   metric_Data_Format;
+    FT_UShort  number_Of_HMetrics;
+
+    /* The following fields are not defined by the TrueType specification */
+    /* but they are used to connect the metrics header to the relevant    */
+    /* `HMTX' table.                                                      */
+
+    void*      long_metrics;
+    void*      short_metrics;
+
+  } TT_HoriHeader;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_VertHeader                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a TrueType vertical header, the `vhea'   */
+  /*    table, as well as the corresponding vertical metrics table, i.e.,  */
+  /*    the `vmtx' table.                                                  */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    Version                 :: The table version.                      */
+  /*                                                                       */
+  /*    Ascender                :: The font's ascender, i.e., the distance */
+  /*                               from the baseline to the top-most of    */
+  /*                               all glyph points found in the font.     */
+  /*                                                                       */
+  /*                               This value is invalid in many fonts, as */
+  /*                               it is usually set by the font designer, */
+  /*                               and often reflects only a portion of    */
+  /*                               the glyphs found in the font (maybe     */
+  /*                               ASCII).                                 */
+  /*                                                                       */
+  /*                               You should use the `sTypoAscender'      */
+  /*                               field of the OS/2 table instead if you  */
+  /*                               want the correct one.                   */
+  /*                                                                       */
+  /*    Descender               :: The font's descender, i.e., the         */
+  /*                               distance from the baseline to the       */
+  /*                               bottom-most of all glyph points found   */
+  /*                               in the font.  It is negative.           */
+  /*                                                                       */
+  /*                               This value is invalid in many fonts, as */
+  /*                               it is usually set by the font designer, */
+  /*                               and often reflects only a portion of    */
+  /*                               the glyphs found in the font (maybe     */
+  /*                               ASCII).                                 */
+  /*                                                                       */
+  /*                               You should use the `sTypoDescender'     */
+  /*                               field of the OS/2 table instead if you  */
+  /*                               want the correct one.                   */
+  /*                                                                       */
+  /*    Line_Gap                :: The font's line gap, i.e., the distance */
+  /*                               to add to the ascender and descender to */
+  /*                               get the BTB, i.e., the                  */
+  /*                               baseline-to-baseline distance for the   */
+  /*                               font.                                   */
+  /*                                                                       */
+  /*    advance_Height_Max      :: This field is the maximum of all        */
+  /*                               advance heights found in the font.  It  */
+  /*                               can be used to compute the maximum      */
+  /*                               height of an arbitrary string of text.  */
+  /*                                                                       */
+  /*    min_Top_Side_Bearing    :: The minimum top side bearing of all     */
+  /*                               glyphs within the font.                 */
+  /*                                                                       */
+  /*    min_Bottom_Side_Bearing :: The minimum bottom side bearing of all  */
+  /*                               glyphs within the font.                 */
+  /*                                                                       */
+  /*    yMax_Extent             :: The maximum vertical extent (i.e., the  */
+  /*                               `height' of a glyph's bounding box) for */
+  /*                               all glyphs in the font.                 */
+  /*                                                                       */
+  /*    caret_Slope_Rise        :: The rise coefficient of the cursor's    */
+  /*                               slope of the cursor (slope=rise/run).   */
+  /*                                                                       */
+  /*    caret_Slope_Run         :: The run coefficient of the cursor's     */
+  /*                               slope.                                  */
+  /*                                                                       */
+  /*    caret_Offset            :: The cursor's offset for slanted fonts.  */
+  /*                               This value is `reserved' in vmtx        */
+  /*                               version 1.0.                            */
+  /*                                                                       */
+  /*    Reserved                :: 8~reserved bytes.                       */
+  /*                                                                       */
+  /*    metric_Data_Format      :: Always~0.                               */
+  /*                                                                       */
+  /*    number_Of_HMetrics      :: Number of VMetrics entries in the       */
+  /*                               `vmtx' table -- this value can be       */
+  /*                               smaller than the total number of glyphs */
+  /*                               in the font.                            */
+  /*                                                                       */
+  /*    long_metrics           :: A pointer into the `vmtx' table.         */
+  /*                                                                       */
+  /*    short_metrics          :: A pointer into the `vmtx' table.         */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
+  /*               be identical except for the names of their fields,      */
+  /*               which are different.                                    */
+  /*                                                                       */
+  /*               This ensures that a single function in the `ttload'     */
+  /*               module is able to read both the horizontal and vertical */
+  /*               headers.                                                */
+  /*                                                                       */
+  typedef struct  TT_VertHeader_
+  {
+    FT_Fixed   Version;
+    FT_Short   Ascender;
+    FT_Short   Descender;
+    FT_Short   Line_Gap;
+
+    FT_UShort  advance_Height_Max;      /* advance height maximum */
+
+    FT_Short   min_Top_Side_Bearing;    /* minimum left-sb or top-sb       */
+    FT_Short   min_Bottom_Side_Bearing; /* minimum right-sb or bottom-sb   */
+    FT_Short   yMax_Extent;             /* xmax or ymax extents            */
+    FT_Short   caret_Slope_Rise;
+    FT_Short   caret_Slope_Run;
+    FT_Short   caret_Offset;
+
+    FT_Short   Reserved[4];
+
+    FT_Short   metric_Data_Format;
+    FT_UShort  number_Of_VMetrics;
+
+    /* The following fields are not defined by the TrueType specification */
+    /* but they're used to connect the metrics header to the relevant     */
+    /* `HMTX' or `VMTX' table.                                            */
+
+    void*      long_metrics;
+    void*      short_metrics;
+
+  } TT_VertHeader;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_OS2                                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a TrueType OS/2 table.  All fields       */
+  /*    comply to the OpenType specification.                              */
+  /*                                                                       */
+  /*    Note that we now support old Mac fonts that do not include an OS/2 */
+  /*    table.  In this case, the `version' field is always set to 0xFFFF. */
+  /*                                                                       */
+  typedef struct  TT_OS2_
+  {
+    FT_UShort  version;                /* 0x0001 - more or 0xFFFF */
+    FT_Short   xAvgCharWidth;
+    FT_UShort  usWeightClass;
+    FT_UShort  usWidthClass;
+    FT_Short   fsType;
+    FT_Short   ySubscriptXSize;
+    FT_Short   ySubscriptYSize;
+    FT_Short   ySubscriptXOffset;
+    FT_Short   ySubscriptYOffset;
+    FT_Short   ySuperscriptXSize;
+    FT_Short   ySuperscriptYSize;
+    FT_Short   ySuperscriptXOffset;
+    FT_Short   ySuperscriptYOffset;
+    FT_Short   yStrikeoutSize;
+    FT_Short   yStrikeoutPosition;
+    FT_Short   sFamilyClass;
+
+    FT_Byte    panose[10];
+
+    FT_ULong   ulUnicodeRange1;        /* Bits 0-31   */
+    FT_ULong   ulUnicodeRange2;        /* Bits 32-63  */
+    FT_ULong   ulUnicodeRange3;        /* Bits 64-95  */
+    FT_ULong   ulUnicodeRange4;        /* Bits 96-127 */
+
+    FT_Char    achVendID[4];
+
+    FT_UShort  fsSelection;
+    FT_UShort  usFirstCharIndex;
+    FT_UShort  usLastCharIndex;
+    FT_Short   sTypoAscender;
+    FT_Short   sTypoDescender;
+    FT_Short   sTypoLineGap;
+    FT_UShort  usWinAscent;
+    FT_UShort  usWinDescent;
+
+    /* only version 1 and higher: */
+
+    FT_ULong   ulCodePageRange1;       /* Bits 0-31   */
+    FT_ULong   ulCodePageRange2;       /* Bits 32-63  */
+
+    /* only version 2 and higher: */
+
+    FT_Short   sxHeight;
+    FT_Short   sCapHeight;
+    FT_UShort  usDefaultChar;
+    FT_UShort  usBreakChar;
+    FT_UShort  usMaxContext;
+
+    /* only version 5 and higher: */
+
+    FT_UShort  usLowerOpticalPointSize;       /* in twips (1/20th points) */
+    FT_UShort  usUpperOpticalPointSize;       /* in twips (1/20th points) */
+
+  } TT_OS2;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_Postscript                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a TrueType PostScript table.  All fields */
+  /*    comply to the TrueType specification.  This structure does not     */
+  /*    reference the PostScript glyph names, which can be nevertheless    */
+  /*    accessed with the `ttpost' module.                                 */
+  /*                                                                       */
+  typedef struct  TT_Postscript_
+  {
+    FT_Fixed  FormatType;
+    FT_Fixed  italicAngle;
+    FT_Short  underlinePosition;
+    FT_Short  underlineThickness;
+    FT_ULong  isFixedPitch;
+    FT_ULong  minMemType42;
+    FT_ULong  maxMemType42;
+    FT_ULong  minMemType1;
+    FT_ULong  maxMemType1;
+
+    /* Glyph names follow in the file, but we don't   */
+    /* load them by default.  See the ttpost.c file.  */
+
+  } TT_Postscript;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_PCLT                                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model a TrueType PCLT table.  All fields       */
+  /*    comply to the TrueType specification.                              */
+  /*                                                                       */
+  typedef struct  TT_PCLT_
+  {
+    FT_Fixed   Version;
+    FT_ULong   FontNumber;
+    FT_UShort  Pitch;
+    FT_UShort  xHeight;
+    FT_UShort  Style;
+    FT_UShort  TypeFamily;
+    FT_UShort  CapHeight;
+    FT_UShort  SymbolSet;
+    FT_Char    TypeFace[16];
+    FT_Char    CharacterComplement[8];
+    FT_Char    FileName[6];
+    FT_Char    StrokeWeight;
+    FT_Char    WidthType;
+    FT_Byte    SerifStyle;
+    FT_Byte    Reserved;
+
+  } TT_PCLT;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    TT_MaxProfile                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The maximum profile is a table containing many max values, which   */
+  /*    can be used to pre-allocate arrays.  This ensures that no memory   */
+  /*    allocation occurs during a glyph load.                             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    version               :: The version number.                       */
+  /*                                                                       */
+  /*    numGlyphs             :: The number of glyphs in this TrueType     */
+  /*                             font.                                     */
+  /*                                                                       */
+  /*    maxPoints             :: The maximum number of points in a         */
+  /*                             non-composite TrueType glyph.  See also   */
+  /*                             the structure element                     */
+  /*                             `maxCompositePoints'.                     */
+  /*                                                                       */
+  /*    maxContours           :: The maximum number of contours in a       */
+  /*                             non-composite TrueType glyph.  See also   */
+  /*                             the structure element                     */
+  /*                             `maxCompositeContours'.                   */
+  /*                                                                       */
+  /*    maxCompositePoints    :: The maximum number of points in a         */
+  /*                             composite TrueType glyph.  See also the   */
+  /*                             structure element `maxPoints'.            */
+  /*                                                                       */
+  /*    maxCompositeContours  :: The maximum number of contours in a       */
+  /*                             composite TrueType glyph.  See also the   */
+  /*                             structure element `maxContours'.          */
+  /*                                                                       */
+  /*    maxZones              :: The maximum number of zones used for      */
+  /*                             glyph hinting.                            */
+  /*                                                                       */
+  /*    maxTwilightPoints     :: The maximum number of points in the       */
+  /*                             twilight zone used for glyph hinting.     */
+  /*                                                                       */
+  /*    maxStorage            :: The maximum number of elements in the     */
+  /*                             storage area used for glyph hinting.      */
+  /*                                                                       */
+  /*    maxFunctionDefs       :: The maximum number of function            */
+  /*                             definitions in the TrueType bytecode for  */
+  /*                             this font.                                */
+  /*                                                                       */
+  /*    maxInstructionDefs    :: The maximum number of instruction         */
+  /*                             definitions in the TrueType bytecode for  */
+  /*                             this font.                                */
+  /*                                                                       */
+  /*    maxStackElements      :: The maximum number of stack elements used */
+  /*                             during bytecode interpretation.           */
+  /*                                                                       */
+  /*    maxSizeOfInstructions :: The maximum number of TrueType opcodes    */
+  /*                             used for glyph hinting.                   */
+  /*                                                                       */
+  /*    maxComponentElements  :: The maximum number of simple (i.e., non-  */
+  /*                             composite) glyphs in a composite glyph.   */
+  /*                                                                       */
+  /*    maxComponentDepth     :: The maximum nesting depth of composite    */
+  /*                             glyphs.                                   */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    This structure is only used during font loading.                   */
+  /*                                                                       */
+  typedef struct  TT_MaxProfile_
+  {
+    FT_Fixed   version;
+    FT_UShort  numGlyphs;
+    FT_UShort  maxPoints;
+    FT_UShort  maxContours;
+    FT_UShort  maxCompositePoints;
+    FT_UShort  maxCompositeContours;
+    FT_UShort  maxZones;
+    FT_UShort  maxTwilightPoints;
+    FT_UShort  maxStorage;
+    FT_UShort  maxFunctionDefs;
+    FT_UShort  maxInstructionDefs;
+    FT_UShort  maxStackElements;
+    FT_UShort  maxSizeOfInstructions;
+    FT_UShort  maxComponentElements;
+    FT_UShort  maxComponentDepth;
+
+  } TT_MaxProfile;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Sfnt_Tag                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration used to specify the index of an SFNT table.         */
+  /*    Used in the @FT_Get_Sfnt_Table API function.                       */
+  /*                                                                       */
+  typedef enum  FT_Sfnt_Tag_
+  {
+    ft_sfnt_head = 0,    /* TT_Header     */
+    ft_sfnt_maxp = 1,    /* TT_MaxProfile */
+    ft_sfnt_os2  = 2,    /* TT_OS2        */
+    ft_sfnt_hhea = 3,    /* TT_HoriHeader */
+    ft_sfnt_vhea = 4,    /* TT_VertHeader */
+    ft_sfnt_post = 5,    /* TT_Postscript */
+    ft_sfnt_pclt = 6,    /* TT_PCLT       */
+
+    sfnt_max   /* internal end mark */
+
+  } FT_Sfnt_Tag;
+
+  /* */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Table                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return a pointer to a given SFNT table within a face.              */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the source.                                    */
+  /*                                                                       */
+  /*    tag  :: The index of the SFNT table.                               */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    A type-less pointer to the table.  This will be~0 in case of       */
+  /*    error, or if the corresponding table was not found *OR* loaded     */
+  /*    from the file.                                                     */
+  /*                                                                       */
+  /*    Use a typecast according to `tag' to access the structure          */
+  /*    elements.                                                          */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The table is owned by the face object and disappears with it.      */
+  /*                                                                       */
+  /*    This function is only useful to access SFNT tables that are loaded */
+  /*    by the sfnt, truetype, and opentype drivers.  See @FT_Sfnt_Tag for */
+  /*    a list.                                                            */
+  /*                                                                       */
+  /*    Here an example how to access the `vhea' table:                    */
+  /*                                                                       */
+  /*    {                                                                  */
+  /*      TT_VertHeader*  vert_header;                                     */
+  /*                                                                       */
+  /*                                                                       */
+  /*      vert_header =                                                    */
+  /*        (TT_VertHeader*)FT_Get_Sfnt_Table( face, ft_sfnt_vhea );       */
+  /*    }                                                                  */
+  /*                                                                       */
+  FT_EXPORT( void* )
+  FT_Get_Sfnt_Table( FT_Face      face,
+                     FT_Sfnt_Tag  tag );
+
+
+ /**************************************************************************
+  *
+  * @function:
+  *   FT_Load_Sfnt_Table
+  *
+  * @description:
+  *   Load any font table into client memory.
+  *
+  * @input:
+  *   face ::
+  *     A handle to the source face.
+  *
+  *   tag ::
+  *     The four-byte tag of the table to load.  Use the value~0 if you want
+  *     to access the whole font file.  Otherwise, you can use one of the
+  *     definitions found in the @FT_TRUETYPE_TAGS_H file, or forge a new
+  *     one with @FT_MAKE_TAG.
+  *
+  *   offset ::
+  *     The starting offset in the table (or file if tag == 0).
+  *
+  * @output:
+  *   buffer ::
+  *     The target buffer address.  The client must ensure that the memory
+  *     array is big enough to hold the data.
+  *
+  * @inout:
+  *   length ::
+  *     If the `length' parameter is NULL, then try to load the whole table.
+  *     Return an error code if it fails.
+  *
+  *     Else, if `*length' is~0, exit immediately while returning the
+  *     table's (or file) full size in it.
+  *
+  *     Else the number of bytes to read from the table or file, from the
+  *     starting offset.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   If you need to determine the table's length you should first call this
+  *   function with `*length' set to~0, as in the following example:
+  *
+  *     {
+  *       FT_ULong  length = 0;
+  *
+  *
+  *       error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
+  *       if ( error ) { ... table does not exist ... }
+  *
+  *       buffer = malloc( length );
+  *       if ( buffer == NULL ) { ... not enough memory ... }
+  *
+  *       error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length );
+  *       if ( error ) { ... could not load table ... }
+  *     }
+  *
+  *   Note that structures like @TT_Header or @TT_OS2 can't be used with
+  *   this function; they are limited to @FT_Get_Sfnt_Table.  Reason is that
+  *   those structures depend on the processor architecture, with varying
+  *   size (e.g. 32bit vs. 64bit) or order (big endian vs. little endian).
+  *
+  */
+  FT_EXPORT( FT_Error )
+  FT_Load_Sfnt_Table( FT_Face    face,
+                      FT_ULong   tag,
+                      FT_Long    offset,
+                      FT_Byte*   buffer,
+                      FT_ULong*  length );
+
+
+ /**************************************************************************
+  *
+  * @function:
+  *   FT_Sfnt_Table_Info
+  *
+  * @description:
+  *   Return information on an SFNT table.
+  *
+  * @input:
+  *   face ::
+  *     A handle to the source face.
+  *
+  *   table_index ::
+  *     The index of an SFNT table.  The function returns
+  *     FT_Err_Table_Missing for an invalid value.
+  *
+  * @inout:
+  *   tag ::
+  *     The name tag of the SFNT table.  If the value is NULL, `table_index'
+  *     is ignored, and `length' returns the number of SFNT tables in the
+  *     font.
+  *
+  * @output:
+  *   length ::
+  *     The length of the SFNT table (or the number of SFNT tables, depending
+  *     on `tag').
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   While parsing fonts, FreeType handles SFNT tables with length zero as
+  *   missing.
+  *
+  */
+  FT_EXPORT( FT_Error )
+  FT_Sfnt_Table_Info( FT_Face    face,
+                      FT_UInt    table_index,
+                      FT_ULong  *tag,
+                      FT_ULong  *length );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_CMap_Language_ID                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return TrueType/sfnt specific cmap language ID.  Definitions of    */
+  /*    language ID values are in `ttnameid.h'.                            */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    charmap ::                                                         */
+  /*      The target charmap.                                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The language ID of `charmap'.  If `charmap' doesn't belong to a    */
+  /*    TrueType/sfnt face, just return~0 as the default value.            */
+  /*                                                                       */
+  /*    For a format~14 cmap (to access Unicode IVS), the return value is  */
+  /*    0xFFFFFFFF.                                                        */
+  /*                                                                       */
+  FT_EXPORT( FT_ULong )
+  FT_Get_CMap_Language_ID( FT_CharMap  charmap );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_CMap_Format                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return TrueType/sfnt specific cmap format.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    charmap ::                                                         */
+  /*      The target charmap.                                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The format of `charmap'.  If `charmap' doesn't belong to a         */
+  /*    TrueType/sfnt face, return -1.                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Long )
+  FT_Get_CMap_Format( FT_CharMap  charmap );
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __TTTABLES_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/tttables.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/tttags.h
===================================================================
--- lib/3rdparty/freetype/include/tttags.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/tttags.h	(rÃ©vision 62573)
@@ -0,0 +1,111 @@
+/***************************************************************************/
+/*                                                                         */
+/*  tttags.h                                                               */
+/*                                                                         */
+/*    Tags for TrueType and OpenType tables (specification only).          */
+/*                                                                         */
+/*  Copyright 1996-2001, 2004, 2005, 2007, 2008, 2013 by                   */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __TTAGS_H__
+#define __TTAGS_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+#define TTAG_avar  FT_MAKE_TAG( 'a', 'v', 'a', 'r' )
+#define TTAG_BASE  FT_MAKE_TAG( 'B', 'A', 'S', 'E' )
+#define TTAG_bdat  FT_MAKE_TAG( 'b', 'd', 'a', 't' )
+#define TTAG_BDF   FT_MAKE_TAG( 'B', 'D', 'F', ' ' )
+#define TTAG_bhed  FT_MAKE_TAG( 'b', 'h', 'e', 'd' )
+#define TTAG_bloc  FT_MAKE_TAG( 'b', 'l', 'o', 'c' )
+#define TTAG_bsln  FT_MAKE_TAG( 'b', 's', 'l', 'n' )
+#define TTAG_CBDT  FT_MAKE_TAG( 'C', 'B', 'D', 'T' )
+#define TTAG_CBLC  FT_MAKE_TAG( 'C', 'B', 'L', 'C' )
+#define TTAG_CFF   FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
+#define TTAG_CID   FT_MAKE_TAG( 'C', 'I', 'D', ' ' )
+#define TTAG_cmap  FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
+#define TTAG_cvar  FT_MAKE_TAG( 'c', 'v', 'a', 'r' )
+#define TTAG_cvt   FT_MAKE_TAG( 'c', 'v', 't', ' ' )
+#define TTAG_DSIG  FT_MAKE_TAG( 'D', 'S', 'I', 'G' )
+#define TTAG_EBDT  FT_MAKE_TAG( 'E', 'B', 'D', 'T' )
+#define TTAG_EBLC  FT_MAKE_TAG( 'E', 'B', 'L', 'C' )
+#define TTAG_EBSC  FT_MAKE_TAG( 'E', 'B', 'S', 'C' )
+#define TTAG_feat  FT_MAKE_TAG( 'f', 'e', 'a', 't' )
+#define TTAG_FOND  FT_MAKE_TAG( 'F', 'O', 'N', 'D' )
+#define TTAG_fpgm  FT_MAKE_TAG( 'f', 'p', 'g', 'm' )
+#define TTAG_fvar  FT_MAKE_TAG( 'f', 'v', 'a', 'r' )
+#define TTAG_gasp  FT_MAKE_TAG( 'g', 'a', 's', 'p' )
+#define TTAG_GDEF  FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
+#define TTAG_glyf  FT_MAKE_TAG( 'g', 'l', 'y', 'f' )
+#define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
+#define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
+#define TTAG_gvar  FT_MAKE_TAG( 'g', 'v', 'a', 'r' )
+#define TTAG_hdmx  FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
+#define TTAG_head  FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
+#define TTAG_hhea  FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
+#define TTAG_hmtx  FT_MAKE_TAG( 'h', 'm', 't', 'x' )
+#define TTAG_JSTF  FT_MAKE_TAG( 'J', 'S', 'T', 'F' )
+#define TTAG_just  FT_MAKE_TAG( 'j', 'u', 's', 't' )
+#define TTAG_kern  FT_MAKE_TAG( 'k', 'e', 'r', 'n' )
+#define TTAG_lcar  FT_MAKE_TAG( 'l', 'c', 'a', 'r' )
+#define TTAG_loca  FT_MAKE_TAG( 'l', 'o', 'c', 'a' )
+#define TTAG_LTSH  FT_MAKE_TAG( 'L', 'T', 'S', 'H' )
+#define TTAG_LWFN  FT_MAKE_TAG( 'L', 'W', 'F', 'N' )
+#define TTAG_MATH  FT_MAKE_TAG( 'M', 'A', 'T', 'H' )
+#define TTAG_maxp  FT_MAKE_TAG( 'm', 'a', 'x', 'p' )
+#define TTAG_META  FT_MAKE_TAG( 'M', 'E', 'T', 'A' )
+#define TTAG_MMFX  FT_MAKE_TAG( 'M', 'M', 'F', 'X' )
+#define TTAG_MMSD  FT_MAKE_TAG( 'M', 'M', 'S', 'D' )
+#define TTAG_mort  FT_MAKE_TAG( 'm', 'o', 'r', 't' )
+#define TTAG_morx  FT_MAKE_TAG( 'm', 'o', 'r', 'x' )
+#define TTAG_name  FT_MAKE_TAG( 'n', 'a', 'm', 'e' )
+#define TTAG_opbd  FT_MAKE_TAG( 'o', 'p', 'b', 'd' )
+#define TTAG_OS2   FT_MAKE_TAG( 'O', 'S', '/', '2' )
+#define TTAG_OTTO  FT_MAKE_TAG( 'O', 'T', 'T', 'O' )
+#define TTAG_PCLT  FT_MAKE_TAG( 'P', 'C', 'L', 'T' )
+#define TTAG_POST  FT_MAKE_TAG( 'P', 'O', 'S', 'T' )
+#define TTAG_post  FT_MAKE_TAG( 'p', 'o', 's', 't' )
+#define TTAG_prep  FT_MAKE_TAG( 'p', 'r', 'e', 'p' )
+#define TTAG_prop  FT_MAKE_TAG( 'p', 'r', 'o', 'p' )
+#define TTAG_sbix  FT_MAKE_TAG( 's', 'b', 'i', 'x' )
+#define TTAG_sfnt  FT_MAKE_TAG( 's', 'f', 'n', 't' )
+#define TTAG_SING  FT_MAKE_TAG( 'S', 'I', 'N', 'G' )
+#define TTAG_trak  FT_MAKE_TAG( 't', 'r', 'a', 'k' )
+#define TTAG_true  FT_MAKE_TAG( 't', 'r', 'u', 'e' )
+#define TTAG_ttc   FT_MAKE_TAG( 't', 't', 'c', ' ' )
+#define TTAG_ttcf  FT_MAKE_TAG( 't', 't', 'c', 'f' )
+#define TTAG_TYP1  FT_MAKE_TAG( 'T', 'Y', 'P', '1' )
+#define TTAG_typ1  FT_MAKE_TAG( 't', 'y', 'p', '1' )
+#define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
+#define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
+#define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
+#define TTAG_wOFF  FT_MAKE_TAG( 'w', 'O', 'F', 'F' )
+
+
+FT_END_HEADER
+
+#endif /* __TTAGS_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/tttags.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/include/ttunpat.h
===================================================================
--- lib/3rdparty/freetype/include/ttunpat.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/include/ttunpat.h	(rÃ©vision 62573)
@@ -0,0 +1,59 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ttunpat.h                                                              */
+/*                                                                         */
+/*    Definitions for the unpatented TrueType hinting system               */
+/*                                                                         */
+/*  Copyright 2003, 2006 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  Written by Graham Asher <graham.asher@btinternet.com>                  */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __TTUNPAT_H__
+#define __TTUNPAT_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+ /***************************************************************************
+  *
+  * @constant:
+  *   FT_PARAM_TAG_UNPATENTED_HINTING
+  *
+  * @description:
+  *   A constant used as the tag of an @FT_Parameter structure to indicate
+  *   that unpatented methods only should be used by the TrueType bytecode
+  *   interpreter for a typeface opened by @FT_Open_Face.
+  *
+  */
+#define FT_PARAM_TAG_UNPATENTED_HINTING  FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
+
+ /* */
+
+FT_END_HEADER
+
+
+#endif /* __TTUNPAT_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/include/ttunpat.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/modules.cfg
===================================================================
--- lib/3rdparty/freetype/modules.cfg	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/modules.cfg	(copie de travail)
@@ -1,6 +1,6 @@
 # modules.cfg
 #
-# Copyright 2005-2007, 2009-2011 by
+# Copyright 2005-2007, 2009-2011, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,7 +19,7 @@
 # activate a module, remove the comment character.
 #
 # Note that many modules and components are further controlled with macros
-# in the file `include/freetype/config/ftoption.h'.
+# in the file `include/config/ftoption.h'.
 
 
 ####
@@ -85,7 +85,7 @@
 HINTING_MODULES += pshinter
 
 # The TrueType hinting engine doesn't have a module of its own but is
-# controlled in file include/freetype/config/ftoption.h
+# controlled in file include/config/ftoption.h
 # (TT_CONFIG_OPTION_BYTECODE_INTERPRETER and friends).
 
 
@@ -106,7 +106,7 @@
 
 # FreeType's cache sub-system (quite stable but still in beta -- this means
 # that its public API is subject to change if necessary).  See
-# include/freetype/ftcache.h.  Needs ftglyph.c.
+# include/ftcache.h.  Needs ftglyph.c.
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
@@ -114,17 +114,17 @@
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
-# See include/freetype/ftgzip.h for the API.
+# See include/ftgzip.h for the API.
 AUX_MODULES += gzip
 
 # Support for streams compressed with LZW (files with suffix .Z).
 #
-# See include/freetype/ftlzw.h for the API.
+# See include/ftlzw.h for the API.
 AUX_MODULES += lzw
 
 # Support for streams compressed with bzip2 (files with suffix .bz2).
 #
-# See include/freetype/ftbzip2.h for the API.
+# See include/ftbzip2.h for the API.
 AUX_MODULES += bzip2
 
 # OpenType table validation.  Needs ftotval.c below.
@@ -149,95 +149,95 @@
 
 # Exact bounding box calculation.
 #
-# See include/freetype/ftbbox.h for the API.
+# See include/ftbbox.h for the API.
 BASE_EXTENSIONS += ftbbox.c
 
 # Access BDF-specific strings.  Needs BDF font driver.
 #
-# See include/freetype/ftbdf.h for the API.
+# See include/ftbdf.h for the API.
 BASE_EXTENSIONS += ftbdf.c
 
 # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into
 # 8bpp format, and for emboldening of bitmap glyphs.
 #
-# See include/freetype/ftbitmap.h for the API.
+# See include/ftbitmap.h for the API.
 BASE_EXTENSIONS += ftbitmap.c
 
 # Access CID font information.
 #
-# See include/freetype/ftcid.h for the API.
+# See include/ftcid.h for the API.
 BASE_EXTENSIONS += ftcid.c
 
 # Access FSType information.  Needs fttype1.c.
 #
-# See include/freetype/freetype.h for the API.
+# See include/freetype.h for the API.
 BASE_EXTENSIONS += ftfstype.c
 
 # Support for GASP table queries.
 #
-# See include/freetype/ftgasp.h for the API.
+# See include/ftgasp.h for the API.
 BASE_EXTENSIONS += ftgasp.c
 
 # Convenience functions to handle glyphs.  Needs ftbitmap.c.
 #
-# See include/freetype/ftglyph.h for the API.
+# See include/ftglyph.h for the API.
 BASE_EXTENSIONS += ftglyph.c
 
 # Interface for gxvalid module.
 #
-# See include/freetype/ftgxval.h for the API.
+# See include/ftgxval.h for the API.
 BASE_EXTENSIONS += ftgxval.c
 
 # Support for LCD color filtering of subpixel bitmaps.
 #
-# See include/freetype/ftlcdfil.h for the API.
+# See include/ftlcdfil.h for the API.
 BASE_EXTENSIONS += ftlcdfil.c
 
 # Multiple Master font interface.
 #
-# See include/freetype/ftmm.h for the API.
+# See include/ftmm.h for the API.
 BASE_EXTENSIONS += ftmm.c
 
 # Interface for otvalid module.
 #
-# See include/freetype/ftotval.h for the API.
+# See include/ftotval.h for the API.
 BASE_EXTENSIONS += ftotval.c
 
 # Support for FT_Face_CheckTrueTypePatents.
 #
-# See include/freetype/freetype.h for the API.
+# See include/freetype.h for the API.
 BASE_EXTENSIONS += ftpatent.c
 
 # Interface for accessing PFR-specific data.  Needs PFR font driver.
 #
-# See include/freetype/ftpfr.h for the API.
+# See include/ftpfr.h for the API.
 BASE_EXTENSIONS += ftpfr.c
 
 # Path stroker.  Needs ftglyph.c.
 #
-# See include/freetype/ftstroke.h for the API.
+# See include/ftstroke.h for the API.
 BASE_EXTENSIONS += ftstroke.c
 
 # Support for synthetic embolding and slanting of fonts.  Needs ftbitmap.c.
 #
-# See include/freetype/ftsynth.h for the API.
+# See include/ftsynth.h for the API.
 BASE_EXTENSIONS += ftsynth.c
 
 # Interface to access data specific to PostScript Type 1 and Type 2 (CFF)
 # fonts.
 #
-# See include/freetype/t1tables.h for the API.
+# See include/t1tables.h for the API.
 BASE_EXTENSIONS += fttype1.c
 
 # Interface for accessing data specific to Windows FNT files.  Needs winfnt
 # driver.
 #
-# See include/freetype/ftwinfnt.h for the API.
+# See include/ftwinfnt.h for the API.
 BASE_EXTENSIONS += ftwinfnt.c
 
 # Support functions for X11.
 #
-# See include/freetype/ftxf86.h for the API.
+# See include/ftxf86.h for the API.
 BASE_EXTENSIONS += ftxf86.c
 
 ####
Index: lib/3rdparty/freetype/ChangeLog
===================================================================
--- lib/3rdparty/freetype/ChangeLog	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/ChangeLog	(copie de travail)
@@ -1,3 +1,1559 @@
+2013-12-08  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.5.2 released.
+	=========================
+
+
+	Tag sources with `VER-2-5-2'.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.5.2.
+
+	* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
+	builds/windows/vc2005/index.html,
+	builds/windows/vc2008/freetype.vcproj,
+	builds/windows/vc2008/index.html,
+	builds/windows/vc2010/freetype.vcxproj,
+	builds/windows/vc2010/index.html,
+	builds/windows/visualc/freetype.dsp,
+	builds/windows/visualc/freetype.vcproj,
+	builds/windows/visualc/index.html,
+	builds/windows/visualce/freetype.dsp,
+	builds/windows/visualce/freetype.vcproj,
+	builds/windows/visualce/index.html,
+	builds/wince/vc2005-ce/freetype.vcproj,
+	builds/wince/vc2005-ce/index.html,
+	builds/wince/vc2008-ce/freetype.vcproj,
+	builds/wince/vc2008-ce/index.html: s/2.5.1/2.5.2/, s/251/252/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
+
+	* builds/unix/configure.raw (version_info): Set to 17:1:11.
+	* docs/CHANGES: Updated.
+
+2013-12-07  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Next round in phantom point handling.
+
+	Greg Hitchcock provided very interesting insights into the
+	complicated history of the horizontal positions of the TSB and BSB
+	phantom points.
+
+	* src/truetype/ttgload.c (TT_LOADER_SET_PP)
+	[TT_CONFIG_OPTION_SUBPIXEL_HINTING]: Use `subpixel_hinting' and
+	`grayscale_hinting' flags as conditionals for the x position of TSB
+	and BSB.
+
+2013-12-05  Werner Lemberg  <wl@gnu.org>
+
+	* builds/freetype.mk (FT_CC): Removed.  Unused.
+
+2013-12-04  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Fix handling of embedded bitmap strikes.
+
+	This corrects the commit from 2013-11-21.  Problem reported by
+	Andrey Panov <panov@canopus.iacp.dvo.ru>.
+
+	* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Fix logic to
+	detect excessive bytes for bit-aligned bitmaps.
+
+2013-12-03  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Remove dead code.
+
+	Reported by Nigel Tao <nigeltao@golang.org>.
+
+	* include/internal/tttypes.h (TT_LoaderRec): Remove unused
+	`preserve_pps' field.
+	* src/truetype/ttgload.c (TT_Hint_Glyph): Updated.
+
+2013-12-03  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix phantom point handling.
+
+	This is a further improvement to the changes from 2013-11-06.
+
+	* src/truetype/ttgload.c (TT_Hint_Glyph): Horizontal phantom points
+	are rounded horizontally, vertical ones are rounded vertically.
+	(TT_LOADER_SET_PP): The horizontal position of vertical phantom
+	points in pre-ClearType mode is zero, as shown in the OpenType
+	specification.
+
+2013-12-02  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix change from 2013-11-20.
+
+	Problem reported by Akira Kakuto <kakuto@fuk.kindai.ac.jp>.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Protect call to
+	`Update_Max' with both a TT_USE_BYTECODE_INTERPRETER guard and a
+	`IS_HINTED' clause.
+	Also remove redundant check using `maxSizeOfInstructions' â€“ in
+	simple glyphs, the bytecode data comes before the outline data, and
+	a validity test for this is already present.
+
+2013-11-27  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix use of dumping functions in `ftgrid' demo program.
+
+	* src/autofit/afhints.c (AF_DUMP) [FT_DEBUG_AUTOFIT]: New macro.
+	(af_glyph_hints_dump_points, af_glyph_hints_dump_segments,
+	af_glyph_hints_dump_edges) [FT_DEBUG_AUTOFIT]: Add parameter to
+	handle output to stdout.
+	Use AF_DUMP.
+	(af_glyph_hints_dump_points, af_glyph_hints_dump_segments,
+	af_glyph_hints_dump_edges) [!FT_DEBUG_AUTOFIT]: Removed.
+
+2013-11-25  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.5.1 released.
+	=========================
+
+
+	Tag sources with `VER-2-5-1'.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.5.1.
+
+	* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
+	builds/windows/vc2005/index.html,
+	builds/windows/vc2008/freetype.vcproj,
+	builds/windows/vc2008/index.html,
+	builds/windows/vc2010/freetype.vcxproj,
+	builds/windows/vc2010/index.html,
+	builds/windows/visualc/freetype.dsp,
+	builds/windows/visualc/freetype.vcproj,
+	builds/windows/visualc/index.html,
+	builds/windows/visualce/freetype.dsp,
+	builds/windows/visualce/freetype.vcproj,
+	builds/windows/visualce/index.html,
+	builds/wince/vc2005-ce/freetype.vcproj,
+	builds/wince/vc2005-ce/index.html,
+	builds/wince/vc2008-ce/freetype.vcproj,
+	builds/wince/vc2008-ce/index.html: s/2.5.0/2.5.1/, s/250/251/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
+
+	* builds/unix/configure.raw (version_info): Set to 17:0:11.
+	* CMakeLists.txt (VERSION_PATCH): Set to 2.
+	* docs/CHANGES, docs/release: Updated.
+
+2013-11-23  Werner Lemberg  <wl@gnu.org>
+
+	[truetype]: Add tricky font names `hkscsiic.ttf' and `iicore.ttf'.
+
+	* src/truetype/ttobjs.c (TRICK_NAMES_MAX_CHARACTERS,
+	TRICK_NAMES_COUNT): Updated.
+	(trick_names): Add family name for the two fonts.
+
+2013-11-23  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Typo.
+
+2013-11-21  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Typo.
+
+	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Return correct `bsize->width'
+	value if the font lacks an `OS/2' table.
+
+2013-11-21  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Improve handling of buggy embedded bitmap strikes.
+
+	We are now able to successfully load `AppleMyoungJo.ttf'.
+	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>.
+
+	* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Don't trust glyph
+	format.
+
+2013-11-20  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Don't trust `maxp's `maxSizeOfInstructions'.
+
+	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>; see
+
+	  http://lists.nongnu.org/archive/html/freetype-devel/2013-08/msg00005.html
+
+	for details.
+
+	* src/base/ftobjs.c (FT_Load_Glyph): Check size of `fpgm' and `prep'
+	tables also for setting `autohint'.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Use code from
+	`TT_Process_Composite_Glyph' for handling unreliable values of
+	`maxSizeOfInstructions'.
+
+2013-11-16  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Fix `OS/2' table version 5 support.
+
+	We now follow the `official' announcement from Microsoft (on the
+	OpenType mailing list, which unfortunately hasn't a public archive).
+
+	* include/freetype/tttables.h (TT_OS2):
+	s/usLowerPointSize/usLowerOpticalPointSize/,
+	s/usUpperPointSize/usUpperOpticalPointSize/.
+
+	* src/sfnt/ttload.c (tt_face_load_os2): Update, and set correct
+	default values.
+
+2013-11-13  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/ft2unix.h: Remove.  No longer necessary.
+
+	* builds/unix/install.mk (install): Updated.
+
+2013-11-13  Werner Lemberg  <wl@gnu.org>
+
+	Simplify header file hierarchy.
+
+	This large patch changes the header file directory layout from
+	`include/freetype/...' to `include/...', effectively removing one
+	level.  Since the file `ft2build.h' is also located in `include'
+	(and it stays there even after installation), all FreeType header
+	files are now in a single directory.
+
+	Applications that use (a) `freetype-config' or FreeType's
+	`pkg-config' file to get the include directory for the compiler, and
+	(b) the documented way for header inclusion like
+
+	  #include <ft2build.h>
+	  #include FT_FREETYPE_H
+	  ...
+
+	don't need any change to the source code.
+
+	* include/freetype/*: Move up to...
+	* include/*: ... this directory.
+
+	* builds/amiga/include/freetype/*: Move up to...
+	* builds/amiga/include/*: ... this directory.
+
+	*/*: Essentially do `s@/freetype/@/@' where appropriate.
+
+	* CMakeList.txt: Simplify.
+	* builds/unix/freetype-config.in, builds/unix/freetype2.in: For
+	`--cflags', return a single directory.
+	* builds/unix/install.mk (install): No longer try to remove `cache'
+	and `internal' subdirectories; instead, remove the `freetype'
+	subdirectory.
+
+2013-11-12  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix last `truetype' commit.
+
+	* src/truetype/ttgload.c (tt_get_metrics): Preserve stream position.
+	Return error value.
+	(load_truetype_glyph): Updated.
+
+2013-11-10  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CMAKE: New dummy file.
+
+2013-11-08  Dave Arnold  <darnold@adobe.com>
+
+	[cff] Fix for hints that touch.
+
+	* src/cff/cf2hints.c (cf2_hintmap_insertHint): Fix condition for
+	finding index value of insertion point.
+
+2013-11-06  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix handling of phantom points in composite glyphs.
+	Problem reported by Nigel Tao <nigeltao@golang.org>.
+
+	This is a follow-up commit to the previous one.
+
+	* src/truetype/ttgload.c (load_truetype_glyph): Call
+	`tt_get_metrics' after loading the glyph header.
+
+2013-11-06  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Improve emulation of vertical metrics.
+
+	This commit also improves the start values of vertical phantom
+	points.  Kudos to Greg Hitchcock for help.
+
+	* src/truetype/ttgload.c (TT_Get_VMetrics): Add parameter to pass
+	`yMax' value.  Replace code with fixed Microsoft definition.
+	(tt_get_metrics): Updated.
+	(TT_LOADER_SET_PP): Add explanation how to initialize phantom
+	points, taken from both the OpenType specification and private
+	communication with Greg (which will eventually be added to the
+	standard).
+	Fix horizontal position of `pp3' and `pp4'.
+
+	* src/truetype/ttgload.h: Updated.
+
+	* src/truetype/ttdriver.c (tt_get_advances): Updated.
+
+	* docs/CHANGES: Updated.
+
+2013-11-05  Werner Lemberg  <wl@gnu.org>
+
+	* builds/windows/vc2010/freetype.vcxproj: s/v110/v100/.
+	PlatformToolSet version 110 is for VC2012.
+
+	Problem reported (with solution) by Dave Arnold <darnold@adobe.com>.
+
+2013-11-05  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Correctly reset point tags for glyph components.
+	Problem reported by Nigel Tao <nigeltao@golang.org>.
+
+	* src/truetype/ttgload.c (TT_Process_Composite_Glyph): Fix loop.
+
+2013-11-02  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix GETINFO opcode handling of subpixel hinting bits.
+
+	* src/truetype/ttinterp.c (Ins_GETINFO): Don't request bit 6 set to
+	get info on subpixel hinting.
+
+	* docs/CHANGES: Updated.
+
+2013-11-02  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #40451.
+
+	Simply apply the patch from the bug report.
+
+	* builds/unix/ftconfig.in, builds/vms/ftconfig.h,
+	include/freetype/config/ftconfig.h: The used #pragma directives only
+	work with gcc versions 4.6 and higher.
+
+2013-11-01  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2013-11-01  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Minor code refactoring.
+
+	Two benefits: The allocated FDEF (and IDEF) array gets slightly
+	smaller, and the `ttdebug' demo program has access to function
+	numbers without additional costs.
+
+	Fortunately, no changes to FontForge are necessary â€“ this is the
+	only external TrueType debugger I know of, but others may exist and
+	should check the code accordingly.
+
+	* src/truetype/ttinterp.h (TT_CallRec): Replace `Cur_Restart' and
+	`Cur_End' with a pointer to the corresponding `TT_DefRecord'
+	structure.
+
+	* src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF, Ins_ENDF,
+	Ins_CALL, Ins_LOOPCALL, Ins_UNKNOWN, TT_RunIns <Invalid_Opcode>):
+	Updated.
+
+2013-10-27  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Implement support for `OS/2' table version 5.
+
+	See
+
+	  http://typedrawers.com/discussion/470/new-microsoft-size-specific-design-selection-mechanism
+
+	for the announcement.
+
+	* include/freetype/tttables.h (TT_OS2): Add fields
+	`usLowerPointSize' and `usUpperPointSize'.  Since FreeType returns
+	this structure only as a pointer through `FT_Get_Sfnt_Table', there
+	shouldn't be any ABI problems.
+
+	* src/sfnt/ttload.c (tt_face_load_os2): Implement it.
+
+	* docs/CHANGES: Updated.
+
+2013-10-24  Werner Lemberg  <wl@gnu.org>
+
+	* README.git, docs/CHANGES, docs/INSTALL: Updated.
+
+2013-10-24  John Cary  <cary@txcorp.com>
+
+	Provide cmake support.
+
+	* CMakeLists.txt: New file.
+
+2013-10-23  Kenneth Miller  <kennethadammiller@yahoo.com>
+	    Werner Lemberg  <wl@gnu.org>
+
+	Provide support for x64 builds in Visual C++ project files.
+
+	* src/builds/win32: Renamed to...
+	* src/builds/windows: This.
+
+	* src/builds/windows/vc2010/*: Updated to handle x64 target.
+
+	* src/builds/windows/*.mk, docs/INSTALL.GNU: s/win32/windows/ where
+	appropriate.
+
+2013-10-22  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/md5.c, src/base/md5.h: Updated to recent version.
+
+	* src/base/ftobjs.c: Updated; `md5.c' no longer uses `free'.
+
+	The canonical URL to get updates for this file is
+
+	  http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/popa3d/popa3d/md5/
+
+	as the author told me in private communication.
+
+2013-10-19  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] s/SMALL_TOP/X_HEIGHT/.
+
+	* src/autofit/afblue.dat: Updated.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/aflatin.c, src/autofit/aflatin.h,
+	src/autofit/atlatin2.c: Updated.
+
+2013-10-19  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/afblue.dat: s/MINOR/DESCENDER/.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+2013-10-16  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add description strings to script entries.
+
+	Currently, this is unused.
+
+	* src/autofit/afscript.h: Do it.
+	* src/autofit/afglobal.c, src/autofit/afpic.c,
+	src/autofit/aftypes.h: Updated.
+
+2013-10-16  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve tracing message for extra light flag.
+
+	* src/autofit/aflatin.c (af_latin_metrics_scale_dim): Do it.
+
+2013-10-15  Chongyu Zhu  <lembacon@gmail.com>
+
+	[arm] Fix thumb2 inline assembly under LLVM.
+
+	When using `ADD' with an immediate operand, the instruction is
+	actually `ADD Rd, Rn, #<imm12>', that is, the maximum of the
+	immediate operand cannot exceed 4095.  It will fail to compile with
+	LLVM.
+
+	However, in GCC, due to some legacy compatibility considerations,
+	`ADD.W' will be automatically emitted when the immediate operand is
+	larger than 4095.
+
+	* builds/unix/ftconfig.in, include/freetype/config/ftconfig.h
+	(FT_MulFix_arm) [__GNUC__]: Support clang compiler.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_arm) [__GNUC__]: Ditto.
+
+2013-10-12  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve tracing of `latin' hinter.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Report blue
+	zone types.
+	(af_latin_metrics_scale_dim): Report scaling changes due to x height
+	alignment.
+	Report scaled stroke width and blue zone values.
+
+2013-10-03  Dave Arnold  <darnold@adobe.com>
+
+	* src/cff/cf2font.c (cf2_computeDarkening): Avoid division by zero.
+
+	Note that the old code avoided using a region of the piecewise
+	linear function where the slope was zero.  The recovery was to use a
+	different section of the function, which produced a different,
+	incorrect amount of darkening.
+
+2013-10-02  Darrell Bellert  <darrell.bellert@hl.konicaminolta.us>
+
+	* src/sfnt/ttload.c (tt_face_load_pclt): Fix `pclt_fields'.
+
+2013-10-02  Dave Arnold  <darnold@adobe.com>
+
+	* src/cff/cf2font.c (cf2_computeDarkening): Initialize darkenAmount.
+
+	This line was lost in commit 89ca1fd6 (from 2013-06-25).  The effect
+	is to use a previous darkening amount when producing an unhinted,
+	unscaled outline.  This can cause autohint samples in ftgrid and
+	ftview to be based on darkened CFF outlines instead of unhinted,
+	undarkened ones.
+
+2013-09-29  Dave Arnold  <darnold@adobe.com>
+
+	Fix Savannah bug #39295.
+
+	The bug was caused by switching to the initial hintmap (the one in
+	effect when `moveto' executes) just before drawing the final element
+	in the charstring.  This ensured that the path was closed (in both
+	Character Space and Device Space).  But if the final element was a
+	curve and if the final hintmap was different enough from the initial
+	one, then the curve was visibly distorted.
+
+	The first part of the fix is to draw the final curve using the final
+	hintmap as specified by the charstring.  This corrects the
+	distortion but does not ensure closing in Device Space.  It may
+	require the rasterizer to automatically generate an extra closing
+	line.  Depending on the hintmap differences, this line could be from
+	zero to a couple pixels in length.
+
+	The second part of the fix covers the case where the charstring
+	subpath is closed with an explicit line.  We now modify that line's
+	end point to avoid the distortion.
+
+	Some glyphs in the bug report font (TexGyreHeros-Regular) that show
+	the change are:
+
+	  25ppem    S (98)
+	  24ppem    eight (52)
+	  25.5ppem  p (85)
+
+	Curves at the *end* of a subpath are no longer distorted.  However,
+	some of these glyphs have bad hint substitutions in the middle of a
+	subpath, and these are not affected.
+
+	The patch has been tested with a set of 106 fonts that shipped with
+	Adobe Creative Suite 4, together with 756 Open Source CFF fonts from
+	Google Fonts.  There are 1.5 million glyphs, of which some 20k are
+	changed with the fix.  A sampling of a few hundred of these changes
+	have been examined more closely, and the changes look good (or at
+	least acceptable).
+
+	* src/cff/cf2hints.h (CF2_GlyphPathRec): New element `pathIsClosing'
+	to indicate that we synthesize a closepath line.
+
+	* src/cff/cf2hints.c (cf2_glyphpath_init): Updated.
+	(cf2_glyphpath_pushPrevElem): If closing, use first hint map (for
+	`lineto' operator) and adjust hint zone.
+	For synthesized closing lines, use end point in first hint zone.
+	(cf2_glyphpath_lineTo): Take care of synthesized closing lines.  In
+	particular, shift the detection of zero-length lines from character
+	space to device space.
+	(cf2_glyphpath_closeOpenPath): Remove assertion.
+	Updated.
+
+2013-09-25  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/aflatin.c (af_{grek,cyrl}_uniranges): Fix arrays.
+
+2013-09-25  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[bdf, pcf] Refuse non-zero face_index.
+
+	Suggested by Akira Tagoh, see
+
+	  http://lists.gnu.org/archive/html/freetype/2013-09/msg00030.html
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init): Return `Invalid_Argument'
+	error if the font could be opened but non-zero `face_index' is
+	given.
+	* src/pcf/pcfdrivr.c (PCF_Face_Init): Ditto.
+
+	* src/type42/t42objs.c (T42_Face_Init): Remove unrequired FT_UNUSED
+	macro for `face_index' because it is validated later.
+
+2013-09-23  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #40090.
+
+	* src/autofit/afcjk.c (af_cjk_metrics_scale): Revert commit
+	306f8c5d (from 2013-08-25) affecting this function.
+
+2013-09-22  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Disunify Cyrillic and Greek handling from Latin.
+
+	* src/autofit/afscript.h: Add Cyrillic and Greek.
+
+	* src/autofit/afblue.dat (AF_BLUE_STRINGSET_GREK,
+	AF_BLUE_STRINGSET_CYRL): Add blue zones for Greek and Cyrillic.
+	(AF_BLUE_STRINGSET_LATN): Fix typo.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/aflatin.c (af_grek_uniranges, af_cyrl_uniranges): New
+	arrays.
+	(af_grek_script_class, af_cyrl_script_class): New scripts.
+	* src/autofit/aflatin.h: Updated.
+
+2013-09-20  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2013-09-20  Behdad Esfahbod  <behdad@behdad.org>
+
+	Fix vertical size of emboldened glyphs.
+
+	Cf. https://bugzilla.gnome.org/show_bug.cgi?id=686709
+
+	* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Adjust `horiBearingY'
+	also.
+
+2013-09-11  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* include/freetype/ftoutln.h: Correct FT_Outline_Get_Orientation
+	algorithm description.
+
+2013-09-11  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve Hebrew rendering.
+
+	This change introduces a new blue zone property
+	`AF_BLUE_PROPERTY_LATIN_LONG' to make the auto-hinter ignore short
+	top segments.
+
+	* src/autofit/afblue.dat: Fix Hebrew blue strings.
+	Use AF_BLUE_PROPERTY_LATIN_LONG for AF_BLUE_STRING_HEBREW_TOP.
+
+	* src/autofit/afblue.hin (AF_BLUE_PROPERTY_LATIN_LONG): New macro.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Updated.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Handle
+	`AF_LATIN_IS_LONG_BLUE'.
+
+	* src/autofit/aflatin.h (AF_LATIN_IS_LONG_BLUE): New macro.
+
+2013-08-28  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] Fix frame access while reading WOFF table directory.
+
+	* src/sfnt/sfobjs.c (woff_open_font): Using single memory frame
+	while reading the directory entries for the whole loop.
+
+2013-08-29  Werner Lemberg  <wl@gnu.org>
+            Behdad Esfahbod  <behdad@google.com>
+
+	Implement support for WOFF containers.
+
+	We simply synthesize a SFNT from the WOFF, create a memory stream
+	for the new data, and load the SFNT as usual.
+
+	Does NOT add any API to access WOFF metadata or private blocks.
+
+	* include/freetype/internal/tttypes.h (WOFF_HeaderRec,
+	WOFF_TableRec): New structures.
+
+	* include/freetype/tttags.h (TTAG_wOFF): New macro.
+
+	* src/base/ftobjs.c (FT_Open_Face): Set `stream' after calling
+	`open_face'.
+
+	* src/sfnt/sfobjs.c [FT_CONFIG_OPTION_SYSTEM_ZLIB]: Include
+	`FT_GZIP_H'.
+	(WRITE_BYTE, WRITE_USHORT, WRITE_ULONG): New temporary macros for
+	writing to a stream.
+	(sfnt_stream_close, compare_offsets, woff_open_font): New functions.
+	(sfnt_open_font): Handle `TTAG_wOFF'.
+	(sfnt_init_face): Set `stream' after calling `sfnt_open_font'.
+
+	* src/truetype/ttobjs.c (tt_face_init): Set `stream' after calling
+	`sfnt->init_face'.
+
+	* src/base/ftobjs.c (open_face): Use a pointer to FT_Stream as an
+	argument so that a changed stream survives.
+	Update callers.
+
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[gzip] New function `FT_Gzip_Uncompress'.
+
+	This is modeled after zlib's `uncompress' function.  We need this
+	for WOFF support.
+
+	* include/freetype/ftgzip.h, src/gzip/ftgzip.c (FT_Gzip_Uncompress):
+	New function.
+
+	* src/gzip/rules.mk: Rewrite to better reflect dependencies.
+
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi' compilation.
+
+	* src/autofit/afblue.cin, src/autofit/afblue.c: Don't include
+	`afblue.h' but `aftypes.h'.
+	* src/autofit/afcjk.c: Don't include `aftypes.h' but `afglobal.h'.
+
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix C++ compilation.
+
+	* src/autofit/afglobal.c (af_face_globals_get_metrics),
+	src/autofit/afdummy.c (af_dflt_script_class), src/autofit/afindic.c
+	(af_deva_script_class): Use proper casts.
+
+2013-08-27  Behdad Esfahbod  <behdad@google.com>
+
+	* src/sfnt/ttload.c (tt_face_load_font_dir): Fix sign typos.
+
+2013-08-27  Behdad Esfahbod  <behdad@google.com>
+
+	FT_Open_Face: Improve external stream handling.
+
+	If the font's `clazz->init_face' function wants to swap to new
+	stream, handling of whether original stream was external could
+	result to either memory leak or double free.  Mark externality into
+	face flags before calling `init_face' such that the clazz can handle
+	external streams properly.
+
+	* src/base/ftobjs.c (FT_Open_Face): Move code to set
+	FT_FACE_FLAG_EXTERNAL_STREAM to...
+	(open_face): This function.
+
+2013-08-27  Werner Lemberg  <wl@gnu.org>
+
+	Remove `FT_SqrtFixed' function.
+
+	It's no longer used.
+
+	* include/freetype/internal/ftcalc.h, src/base/ftcalc.c: Do it.
+
+2013-08-27  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] While tracing, report script names instead of ID values.
+
+	* src/autofit/afglobal.c (af_script_names) [FT_DEBUG_LEVEL_TRACE]:
+	New array.
+	* src/autofit/afglobal.h: Updated.
+
+	* src/autofit/afcjk.c (af_cjk_metrics_init_widths,
+	af_cjk_hint_edges): Use `af_script_names'.
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths,
+	af_latin_hint_edges): Ditto.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Report used script while hinting a glyph.
+
+	* src/autofit/afcjk.c (af_cjk_hint_edges), src/autofit/aflatin.c
+	(af_latin_hint_edges): Implement it.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add support for Hebrew script.
+
+	* src/autofit/afblue.dat: Add blue strings for Hebrew.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/aflatin.c (af_hebr_uniranges): New array.
+	(af_hebr_script_class): New script.
+	* src/autofit/aflatin.h, src/autofit/afscript.h: Updated.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve tracing messages.
+
+	* src/autofit/afcjk.c (af_cjk_metrics_init_widths): Mention script
+	ID in tracing message.
+	(af_cjk_metrics_init_blues): Initialize `axis' outside of the inner
+	loop.
+	Improve tracing messages.
+	(af_cjk_hint_edges) [FT_DEBUG_LEVEL_TRACE]: New variable
+	`num_actions' to count hinting actions.
+	Improve tracing messages.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Mention
+	script ID in tracing message.
+	(af_latin_metrics_init_blues, af_latin_hint_edges): Improve tracing
+	messages.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	Better tracing of loaded glyphs.
+
+	Previously, the loading of a glyph was traced at level 4, if at all.
+	With this change, all font loading routines emit a tracing message
+	at level 1, making it easier to select tracing output (for example
+	using F2_DEBUG="any:1 afhints:7 aflatin:7").
+
+	* src/bdf/bdfdrivr.c (BDF_Glyph_Load): Add tracing message.
+	* src/cff/cffdrivr.c (cff_glyph_load): Ditto.
+	* src/cff/cffgload.c (cff_decoder_prepare): Improve tracing
+	messages.
+	* src/cid/cidgload.c (cid_load_glyph): Use level 1 for tracing
+	message.
+	* src/pcf/pcfdrivr.c (PCF_Glyph_Load): Ditto.
+	* src/pfr/pfrobjs.c (pfr_slot_load): Add tracing message.
+	* src/truetype/ttgload.c (TT_Load_Glyph): Ditto.
+	* src/type1/t1gload.c (T1_Load_Glyph): Ditto.
+	* src/type42/t42objs.c (T42_GlyphSlot_Load): Ditto.
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Ditto.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix script selection.
+
+	* src/autofit/afglobal.c (af_face_globals_get_metrics): Use
+	`AF_SCRIPT_DFLT', not value 0.
+	Simplify code.
+
+	* src/autofit/afscript.h: Sort by script name.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Make `dummy' hinter work as expected.
+
+	* src/autofit/afdummy.c (af_dummy_hints_init): Properly set scaling
+	information.
+	(af_dummy_hints_apply): Scale the glyphs.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Make `cjk' module use blue stringsets.
+
+	* src/autofit/afcjk.c (AF_CJK_MAX_TEST_CHARACTERS): Removed.
+	(af_cjk_hani_blue_chars): Removed.
+	(AF_CJK_BLUE_TYPE_*): Removed.
+	(af_cjk_metrics_init_blues): Replace AF_CJK_MAX_TEST_CHARACTERS with
+	AF_BLUE_STRING_MAX_LEN.
+	Change loops to use offsets (in file `afblue.h') into the new arrays
+	`af_blue_stringsets' and `af_blue_strings' (in file `afblue.c').
+	Instead of three dimensions (as used in the old blue string array)
+	we now use properties to do the same, saving one loop nesting level.
+
+	* src/autofit/afcjk.h: Remove old enumeration values superseded by
+	the new data in `afblue.h'.
+	(AF_CJK_IS_TOP_BLUE, AF_CJK_IS_HORIZ_BLUE, AF_CJK_IS_FILLED_BLUE,
+	AF_CJK_IS_RIGHT_BLUE): New macros, to be used in
+	`af_cjk_metrics_init_blues'.
+	(AF_CJK_BLUE_IS_RIGHT): Remove this now redundant enum value.
+	(AF_CJK_BLUE_IS_TOP): Renamed to...
+	(AF_CJK_BLUE_TOP): This.
+	(AF_CJK_MAX_BLUES): Remove.
+	(AF_CJKAxisRec): Updated.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Typo.
+
+	* src/autofit/afblue.hin, src/autofit/afblue.c (GET_UTF8_CHAR): Use
+	cast.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Synchronize `cjk' with `latin' module (and vice versa).
+
+	* src/autofit/afcjk.c (af_cjk_metrics_init_widths): Add tracing
+	messages.
+	(af_cjk_metrics_init_blues): Don't pass blue string array as
+	argument but use the global array directly.
+	Use `outline' directly.
+	Update and add tracing messages.
+	(af_cjk_metrics_init): Simplify code.
+	(af_cjk_metrics_scale_dim): Improve tracing message.
+	(af_cjk_metrics_scale): Synchronize.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths,
+	af_latin_metrics_init_blues): Improve and add tracing messages.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Make `latin' module use blue stringsets.
+
+	* src/autofit/aflatin.c (AF_LATIN_MAX_TEST_CHARACTERS): Removed.
+	(af_latin_blue_chars): Removed.
+	(af_latin_metrics_init_blues): Replace AF_LATIN_MAX_TEST_CHARACTERS
+	with AF_BLUE_STRING_MAX_LEN.
+	Change loops to use offsets (in file `afblue.h') into the new arrays
+	`af_blue_stringsets' and `af_blue_strings' (in file `afblue.c').
+	Use `AF_LATIN_IS_SMALL_TOP_BLUE' macro.
+
+	* src/autofit/aflatin.h: Remove old enumeration values superseded by
+	the new data in `afblue.h'.
+	(AF_LATIN_IS_TOP_BLUE): Updated definition.
+	(AF_LATIN_IS_SMALL_TOP_BLUE): New macro.
+	(AF_LATIN_MAX_BLUES): Remove.
+	(AF_LatinAxisRec): Updated.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add blue stringsets.
+
+	* src/autofit/aftypes.h: Include `afblue.h'.
+	(AF_ScriptClassRec): Add `blue_stringset' field.
+	(AF_DEFINE_SCRIPT_CLASS): Updated.
+
+	* src/autofit/autofit.c: Include `afblue.c'.
+
+	* src/autofit/afcjk.c (af_hani_script_class), src/autofit/afdummy.c
+	(af_dflt_script_class), src/autofit/afindic.c
+	(af_deva_script_class), src/autofit/aflatin.c
+	(af_latn_script_class), src/autofit/aflatin2.c
+	(af_ltn2_script_class): Updated.
+
+	* src/autofit/rules.mk (AUTOF_DRV_SRC): Add `afblue.c'.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Introduce data file for blue strings.
+
+	The idea is to have a central file which gets processed by a Perl
+	script to create proper `.c' and `.h' files using templates.  There
+	are two other reasons to do that:
+
+	  . The data file should be easily readable.  We use UTF-8 encoding
+	    which then gets converted to single bytes.
+
+	  . Since the number of supported scripts will increase soon, the
+	    current usage of blue string arrays is a waste of space.  Using
+	    the Perl script it is possible to imitate jagged arrays,
+	    defining enumeration constants as offsets into the arrays.
+
+	This commit only adds files without changing any functionality.
+
+	* src/autofit/afblue.dat: New data file.
+	* src/tools/afblue.pl: New Perl script for processing `afblue.dat'.
+
+	* src/autofit/afblue.cin, src/autofit/afblue.hin: New template files
+	for...
+	* src/autofit/afblue.c, src/autofit/afblue.c: New source files.
+	To avoid a dependency on Perl, we add them too.
+
+2013-08-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Enable new algorithm for `BBox_Cubic_Check'.
+
+	* src/base/ftbbox.c: Enable new BBox_Cubic_Check algorithm, remove
+	the old one.
+	Improve comments.
+
+2013-08-18  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/unix-def.in (freetype2.pc): Don't set executable bit.
+
+2013-08-18  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #39804.
+
+	* builds/unix/configure.raw (LIBPNG): Define and export.
+	* builds/unix/freetype-config.in, builds/unix/freetype2.in: Handle
+	libpng.
+
+2013-08-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Clean up BBox_Conic_Check.
+
+	* src/base/ftbbox.c (BBox_Conic_Check): Remove redundant checks for
+	extremum at the segment ends, which are already within the bbox.
+	Slightly modify calculations.
+
+2013-08-15  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Finish experimental (disabled) BBox_Cubic_Check implementation.
+
+	* src/base/ftbbox.c (BBox_Cubic_Check): Scale arguments to improve
+	accuracy and avoid overflows.
+
+2013-08-13  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Refactor experimental (disabled) BBox_Cubic_Check.
+
+	* src/base/ftbbox.c (BBox_Cubic_Check): Implement the minimum search
+	as the mirror image of the maximum search implemented here...
+	(update_max): New function.
+
+2013-08-06  John Tytgat  <John.Tytgat@esko.com>
+
+	Fix Savannah bug #39702.
+
+	* src/cff/cffload.c (cff_index_get_pointers): Check for `cur_offset
+	!= 0'; this stronger test is mandated by the CFF specification.
+	Fix test for INDEX structures which have one or more empty entries
+	at the end.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix gcc pragmas, part 2.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_long_long,
+	TT_DotFix14_long_long): `#pragma gcc diagnostic {push,pop}' has been
+	introduced with gcc version 4.6.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix gcc pragmas.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_long_long,
+	TT_DotFix14_long_long): Older gcc versions don't accept diagnostic
+	pragmas within a function body.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #39700.
+
+	* builds/unix/ftconfig.h: Synchronize with
+	`include/freetype/config/ftconfig.h'.
+
+	* builds/vms/ftconfig.h: Ditto.
+	Make the differences to the master `ftconfig.h' file as small as
+	possible for easier maintainance.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve handling of `near' points.
+
+	Points which are very near to each other are now marked as such.
+	The `weak' flag is then computed by using the `in' vector of the
+	first and the `out' vector of the last point of a group of near
+	points.
+
+	For example, this fixes the rendering of glyph `Oslash' in
+	`Roboto-Thin.ttf'.
+
+	* src/autofit/afhints.h (AF_Flags): New value `AF_FLAGS_NEAR'.
+
+	* src/autofit/afhints.c (af_glyph_hints_reload): Introduce
+	the heuristic value `near_limit' to decide whether the current point
+	is near to the previous one, then set `AF_FLAG_NEAR' accordingly.
+	Store good `in' vector (of last non-near point) in
+	`last_good_in_{x,y}' and use it as an argument to
+	`ft_corner_is_flat' if necessary.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/ftcffdrv.h: Improve documentation.
+	This is based on blog entries from David Lemon and Dave Arnold (both
+	from Adobe) with kind permission.  Dave also helped in
+	proof-reading.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Move declaration of scripts into separate file.
+
+	This has the benefit that we don't need to duplicate the data at
+	different places.
+
+	* src/autofit/afscript.h: New file.
+
+	* src/autofit/aftypes.h (AF_Script): Include `afscript.h' to define
+	the enumeration values.
+
+	* src/autofit/afglobal.c: Include `afscript.h' to get the script
+	specific header files.
+	(af_script_classes): Include `afscript.h' to fill this array.
+
+	* src/autofit/afpic.c: Include `afscript.h' to get the script
+	specific header files.
+	(autofit_module_class_pic_init): Include `afscript.h' for
+	initialization.
+	* src/autofit/afpic.h (AF_SCRIPT_CLASSES_COUNT,
+	AF_SCRIPT_CLASSES_REC_COUNT): Removed.  Use `AF_SCRIPT_MAX' instead.
+
+	* src/autofit/rules.mk (AUTOF_DRV_H): Updated.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Move declaration of writing systems into separate file.
+
+	This has the benefit that we don't need to duplicate the data at
+	different places.
+
+	* src/autofit/afwrtsys.h: New file.
+
+	* src/autofit/aftypes.h (AF_WritingSystem): Include `afwrtsys.h' to
+	define the enumeration values.
+
+	* src/autofit/afglobal.c: Include `afwrtsys.h' to get the writing
+	system specific header files.
+	Include `afpic.h'.
+	(af_writing_system_classes): Include `afwrtsys.h' to fill this
+	array.
+
+	* src/autofit/afpic.c: Include `afwrtsys.h' to get the writing
+	system specific header files.
+	(autofit_module_class_pic_init): Include `afwrtsys.h' for
+	initialization.
+	* src/autofit/afpic.h (AF_WRITING_SYSTEM_CLASSES_COUNT,
+	AF_WRITING_SYSTEM_CLASSES_REC_COUNT): Removed.  Use
+	`AF_WRITING_SYSTEM_MAX' instead.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Fix compilation with g++.
+
+	* src/sfnt/pngshim.c (error_callback, read_data_from_FT_stream): Use
+	cast.
+	(Load_SBit_Png): Pacify compiler.
+
+2013-08-02  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+            Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi'.
+
+	* include/freetype/config/ftconfig.h (FT_LOCAL_ARRAY,
+	FT_LOCAL_ARRAY_DEF): New macros.
+
+	* src/autofit/afglobal.c (af_writing_system_classes,
+	af_script_classes): Use FT_LOCAL_ARRAY_DEF.
+	* src/autofit/afglobal.h: Declare `af_writing_system_classes' and
+	`af_script_classes'.
+	* src/autofit/afloader.c: Include `afpic.h'.
+
+2013-08-01  Werner Lemberg  <wl@gnu.org>
+
+	Another round of cppcheck nitpicks.
+
+	The call was (from the top-level of the FreeType tree):
+
+	  cppcheck --force \
+	           --enable=all \
+	           -I /usr/include \
+	           -I /usr/local/include \
+	           -I /usr/lib/gcc/i586-suse-linux/4.7/include \
+	           -I include \
+	           -I include/freetype \
+	           -I include/freetype/config \
+	           -I include/freetype/internal \
+	           -DFT2_BUILD_LIBRARY \
+	           . &> cppcheck.log
+
+	using cppcheck git commit f7e93f99.
+
+	Note that cppcheck still can't handle `#include FOO' (with `FOO' a
+	macro).
+
+	*/* Improve variable scopes.
+	*/* Remove redundant initializations which get overwritten.
+
+	* src/gxvalid/*: Comment out redundant code or guard it with
+	FT_DEBUG_LEVEL_TRACE.
+
+2013-07-30  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Introduce `writing systems'.
+
+	This patch adds a new top level to the auto-hinter's script class
+	hierarchy.  It defines `writing systems' which can contain multiple
+	scripts.
+
+	For example, the `latin' writing system (in file `aflatin.c') is
+	able to support scripts like Latin, Cyrillic, Armenian, etc., which
+	can be handled similarly.
+
+	Scripts are now named using four-letter OpenType tags.
+
+	* src/autofit/aftypes.h (AF_ScriptClassRec): Move relevant members
+	to...
+	(AF_WritingSystemClassRec): This new structure.  It holds pointers
+	to functions which can be shared among related scripts.
+	(AF_WritingSystem): New enumeration.
+	(AF_Script): Revised values using four-letter tags.
+	(AF_DEFINE_WRITING_SYSTEM_CLASS): New macro.
+	(AF_DEFINE_SCRIPT_CLASS): Updated.
+
+	* src/autofit/afglobal.c (af_writing_system_classes): New global,
+	constant array.
+	(af_script_classes): Updated.
+	(af_face_globals_free): Updated.
+	Remove assertion.
+	(af_face_globals_get_metrics): Updated.
+
+	* src/autofit/afglobal.h (AF_SCRIPT_FALLBACK)
+	[!AF_CONFIG_OPTION_CJK]: Handle this case.
+
+	* src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph):
+	Updated.
+
+	* src/autofit/afpic.c (autofit_module_class_pic_init): Updated;
+	initialize structures for both writing systems and scripts.
+	* src/autofit/afpic.h: Updated.
+	(AF_WRITING_SYSTEM_CLASSES_GET): New macro.
+
+	* src/autofit/afcjk.c (af_cjk_writing_system_class): New writing
+	system.
+	(af_cjk_uniranges): Renamed to...
+	(af_hani_uniranges): This.
+	(af_cjk_script_class): Reduced and renamed to...
+	(af_hani_script_class): This.
+	* src/autofit/afcjk.h: Updated.
+
+	* src/autofit/afdummy.c (af_dummy_writing_system_class): New writing
+	system.
+	(af_dummy_script_class): Reduced and renamed to...
+	(af_dflt_script_class): This.
+	* src/autofit/afdummy.h: Updated.
+
+	* src/autofit/afindic.c (af_indic_writing_system_class): New writing
+	system.
+	(af_indic_uniranges): Renamed to...
+	(af_deva_uniranges): This.
+	(af_indic_script_class): Reduced and renamed to...
+	(af_deva_script_class): This.
+	* src/autofit/afcjk.h: Updated.
+
+	* src/autofit/aflatin.c (af_latin_writing_system_class): New writing
+	system.
+	(af_latin_uniranges): Renamed to...
+	(af_latn_uniranges): This.
+	(af_latin_script_class): Reduced and renamed to...
+	(af_latn_script_class): This.
+	* src/autofit/aflatin.h: Updated.
+
+	* src/autofit/aflatin2.c (af_latin2_writing_system_class): New
+	writing system.
+	(af_latin2_uniranges): Renamed to...
+	(af_ltn2_uniranges): This.
+	Synchronize ranges with `latin'.
+	(af_latin2_script_class): Reduced and renamed to...
+	(af_ltn2_script_class): This.
+	* src/autofit/aflatin2.h: Updated.
+
+2013-07-30  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Variable renaming.
+
+	* src/autofit/aftypes.h (AF_ScriptMetricsRec):
+	s/clazz/script_class/.
+	Update all users.
+
+2013-07-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Ignore libpng-config under cross-building configuration,
+	because it will return the flags for the hosting environment.
+
+	* builds/unix/configure.raw: Ignore libpng-config when
+	`cross_compiling' == yes.
+
+2013-07-30  Behdad Esfahbod  <behdad@google.com>
+
+	Prevent division by zero by a transparent color.
+
+	* src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra):
+	Return 0 immediately, when alpha channel is zero.
+
+2013-07-25  Behdad Esfahbod  <behdad@google.com>
+
+	Add FT_FACE_FLAG_COLOR and FT_HAS_COLOR.
+
+	Also disambiguate Google's color bitmap tables.
+
+	* include/freetype/freetype.h (FT_FACE_FLAG_COLOR, FT_HAS_COLOR):
+	New macros.
+
+	* include/freetype/internal/tttypes.h (TT_SbitTableType): Add
+	TT_SBIT_TABLE_TYPE_CBLC.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Handle FT_FACE_FLAG_COLOR.
+
+	* src/sfnt/ttsbit.c (tt_face_load_sbit,
+	tt_face_load_strike_metrics, tt_face_load_sbit_image): Handle
+	TT_SBIT_TABLE_TYPE_CBLC.
+
+2013-07-24  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[sfnt] Fix for `make multi' target.
+
+	* src/sfnt/pngshim.c (Load_SBit_Png): Use FT_LOCAL_DEF().
+
+2013-07-20  Werner Lemberg  <wl@gnu.org>
+
+	* docs/INSTALL.GNU: Updated.
+
+2013-07-20  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] Fix `sbix' table version handling.
+
+	* src/sfnt/ttsbit.c (tt_face_load_sbit) [TT_SBIT_TABLE_TYPE_SBIX]:
+	USHORT version numbers are to be considered as `minor'.
+
+2013-07-19  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix segment classification for blue zones.
+
+	The old code (essentially unchanged since the very beginning)
+	incorrectly handled this configuration
+
+	               x -o- x
+	                /   \
+	               /     \
+	              /       \
+	             o         o
+
+	as flat and this
+
+	                o               o
+	               /               /
+	             x|              x|
+	              |               |
+	              o---------------o
+
+	as round.  (`o' and `x' are on and off points, respectively).
+
+	This is a major change which should improve the rendering results
+	enormously for many TrueType fonts, especially in the range approx.
+	20-40ppem, fixing the appearance of many overshoots.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Look at the
+	first and last points of the segment, not the points right before
+	and after.
+
+2013-07-19  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] `sbix' fix-ups.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Apple's `sbix' color bitmaps
+	are rendered scaled and then the `glyf' outline rendered on top.  We
+	don't support that yet, so just ignore the `glyf' outline and
+	advertise it as a bitmap-only font.
+
+	* src/sfnt/ttsbit.c (tt_face_load_strike_metrics)
+	[TT_SBIT_TABLE_TYPE_SBIX]: Return metrics in 26.6 units.
+	(tt_face_load_sbix_image): Typo.
+
+2013-07-18  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] Add support for Apple's `sbix' color bitmap table.
+
+	* include/freetype/internal/tttypes.h (TT_SBit_MetricsRec): Widen
+	fields to FT_Short and FT_UShort, respectively.
+	(TT_SBitTableType): New enumeration.
+	(TT_FaceRec): Add `sbit_table_type' field.
+
+	* include/freetype/tttags.h (TTAG_sbix): New macro.
+
+	* src/sfnt/pngshim.c (Load_SBit_Png): Pass a more generic
+	FT_GlyphSlot argument instead FT_Bitmap.
+	Add flag to control map and metrics handling.
+	Update all users.
+
+	* src/sfnt/ttsbit.c: Include `ttmtx.h'.
+	(tt_face_load_eblc): Renamed to...
+	(tt_face_load_sbit): This.
+	Handlic `sbix' bitmaps.
+	(tt_face_free_eblc): Renamed to...
+	(tt_face_load_sbit): This.
+	Updated.
+	(tt_face_load_strike_metrics): Handle `sbix' bitmaps.
+	(tt_face_load_sbix_image): New function.
+	(tt_sbit_decoder_alloc_bitmap, tt_sbit_decoder_load_image,
+	tt_sbit_decoder_load_byte_aligned, tt_sbit_decoder_load_bit_aligned,
+	tt_sbit_decoder_load_compound, tt_sbit_decoder_load_png,
+	tt_sbit_decoder_load_image, tt_sbit_decoder_load_bitmap): Don't pass
+	and handle load flags.
+	(tt_sbit_decoder_load_bitmap) [!FT_CONFIG_OPTION_USE_PNG]: Better
+	handle formats 17-19.
+	Move color to grayscale conversion to...
+	(tt_face_load_sbit_image): Here.
+	Handle `sbix' bitmaps.
+
+	* src/sfnt/pngshim.h: Updated.
+	* src/sfnt/ttsbit.h: Updated.
+	* src/sfnt/sfdriver.c: Updated.
+
+2013-07-18  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Ignore invalid magic number in `head' or `bhed'.
+
+	Other font engines seem to ignore it also.  Problem reported by
+	Hin-Tak Leung <htl10@users.sourceforge.net>.
+
+	* src/sfnt/ttload.c (check_table_dir): Don't abort but warn only if
+	we have an invalid magic number.
+
+2013-07-16  Werner Lemberg  <wl@gnu.org>
+
+	[smooth] Fix segfault caused by previous commit.
+
+	* src/smooth/ftgrays.c (gray_set_cell): Always compute
+	`ras.invalid'.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	[smooth] Improve performance.
+
+	Provide a work-around for an ARM-specific performance bug in GCC.
+	This speeds up the rasterizer by more than 5%.
+
+	Also slightly optimize `set_gray_cell' and `gray_record_cell' (which
+	also improves performance on other platforms by a tiny bit (<1%).
+
+	* src/smooth/ftgrays.c (FT_DIV_MOD): New macro.
+	Use it where appropriate.
+
+	(gray_record_cell, gray_set_cell, gray_move_to,
+	gray_convert_glyph_inner): Streamline condition handling.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	[truetype] Add assembler code for TT_MulFix14 and TT_DotFix14.
+
+	This patch provides slightly optimized versions for ARM, x86, and
+	x86_64 CPUs if built with GCC.
+
+	Also remove some dead code.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_arm, TT_MulFix14_long_long,
+	TT_DotFix14_long_long): New functions.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	Optimize FT_MulFix for x86_64 GCC builds.
+
+	This patch provides an optimized `FT_MulFix' implementation for
+	x86_64 machines when FreeType is built with GCC, or compatible
+	compilers like Clang.
+
+	Example:
+	  bin/ftbench -p -t 5 -s 14 -f 0008 Arial.ttf
+
+	Before:
+
+	  Load                       4.863 us/op
+	  Load_Advances (Normal)     4.816 us/op
+	  Load_Advances (Fast)       0.028 us/op
+	  Render                     2.753 us/op
+	  Get_Glyph                  0.463 us/op
+	  Get_CBox                   0.077 us/op
+	  Get_Char_Index             0.023 us/op
+	  Iterate CMap              13.898 us/op
+	  New_Face                  12.368 us/op
+	  Embolden                   0.028 us/op
+	  Get_BBox                   0.302 us/op
+
+	After:
+
+	  Load                       4.617 us/op
+	  Load_Advances (Normal)     4.645 us/op
+	  Load_Advances (Fast)       0.027 us/op
+	  Render                     2.789 us/op
+	  Get_Glyph                  0.460 us/op
+	  Get_CBox                   0.077 us/op
+	  Get_Char_Index             0.024 us/op
+	  Iterate CMap              13.403 us/op
+	  New_Face                  12.278 us/op
+	  Embolden                   0.028 us/op
+	  Get_BBox                   0.301 us/op
+
+	* builds/unix/ftconfig.in, include/freetype/config/ftconfig.h
+	(FT_MulFix_x86_64): New function.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	Speed up ARMv7 support.
+
+	When building for ARMv7 with thumb2 instructions, the optimized
+	`FT_MulFix_arm' assembly routine was not being used.
+
+	The reason for this is in the `ftconfig.h' header, namely:
+
+	- The assembly routine uses the `smull' instruction which is not
+	  available when generating Thumb-1 machine code.  It is available
+	  in Thumb-2 mode, though.
+
+	- The header was written a long time ago before Thumb-2 became
+	  widely popular (e.g. with Android).  So it simply doesn't use the
+	  assembly routine if the `__thumb__' built-in macro is defined.
+
+	- When compiling in Thumb-2 mode, the compiler will define both
+	  `__thumb__' and `__thumb2__'.
+
+	By checking for `(__thumb2__ || !__thumb__)', we ensure that the
+	assembly routine is only avoided when generating Thumb-1 code.
+
+	Given that this is performance-sensitive function, this improves
+	`ftbench' as follows on a Galaxy Nexus:
+
+	                           Before (us/op)   After (us/op)
+
+	  - loading Arial.ttf glyphs at 14 ppem [1]
+
+	      Load                   34.285          33.098
+
+	  - same operation with the light auto-hinter [2]
+
+	      Load                   31.317          29.590
+
+	  - same operation without hinting [3]
+
+	      Load                    6.143           5.376
+
+	  - loading Arial.ttf advances at 14 ppem [4]
+
+	      Load_Advances (normal) 34.216          33.016
+	      Load_Advances (fast)    0.176           0.176
+
+	  [1] ftbench -t 5 -p -s 14 -b a -f 0008 Arial.ttf
+	  [2] ftbench -t 5 -p -s 14 -b a -r 1 -f 0028 Arial.ttf
+	  [3] ftbench -t 5 -p -s 14 -b a -f 000a Arial.ttf
+	  [4] ftbench -t 5 -p -s 14 -b b -f 0008 Arial.ttf
+
+	* builds/unix/ftconfig.in, include/freetype/config/ftconfig.h
+	(FT_MULFIX_ASSEMBLER): Fix handling for ARMv7.
+
+2013-06-28  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2013-06-27  Werner Lemberg  <wl@gnu.org>
+
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Fix bitmap width guard.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Add darkening limit to `darkening-parameters'.
+
+	* src/cff/cffdrivr.c (cff_property_set): Add check.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Add `darkening-parameters' property.
+
+	* include/freetype/ftcffdrv.h: Document it.
+
+	* src/cff/cffdrivr.c (cff_property_set, cff_property_get): Handle
+	`darkening-parameters' property.
+
+	* src/cff/cf2font.h (CF2_FontRec): Add `darkenParams' array.
+
+	* src/cff/cf2font.c (cf2_computeDarkening): Add `darkenParams'
+	argument and use it.
+	Update all callers.
+
+	* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Copy
+	`darken_params' values.
+
+	* src/cff/cffobjs.h (CFF_DriverRec): Add `darken_params' array.
+
+	* src/cff/cffobjs.c (cff_driver_init): Set default values for
+	`darken_params'.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Code shuffling.
+
+	* src/tools/docmaker/tohtml.py (re_url): Move regexp...
+	* src/tools/docmaker/sources.py: ... to this file.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Remove unused functions.
+
+	* src/tools/docmaker/content.py (DocMarkup.get_start,
+	DocBlock.get_markup_name): Removed.
+	* src/tools/docmaker/tohtml.py (html_quote0, dump_html_code,
+	HtmlFormatter.make_html_words): Removed.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	* builds/freetype.mk (dll): Remove target.
+
+	Problem reported by JÃ¶rg GÃ¼nnewig <joerg.guennewig@googlemail.com>.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Recognise URLs.
+
+	* src/tools/docmaker/tohtml.py (re_url): New regular expression.
+	(make_html_para): Use it.
+
 2013-06-19  Werner Lemberg  <wl@gnu.org>
 
 	* Version 2.5.0.1 released.
@@ -295,7 +1851,7 @@
 	*/* Improve variable scopes.
 	*/* Remove redundant initializations which get overwritten.
 
-	* src/base/ftmac.c ,builds/mac/ftmac.c (count_faces_scalable):
+	* src/base/ftmac.c, builds/mac/ftmac.c (count_faces_scalable):
 	Remove unused variable.
 
 	* src/base/ftdbgmem.c (ft_mem_table_destroy): `table' can't be zero.
@@ -575,7 +2131,7 @@
 	[sfnt] Clean up bitmap code.
 
 	* src/sfnt/ttsbit.c: Deleted.
-	* src/sfnt/ttsbit0.c: Renamed to `ttsbit.c'. 
+	* src/sfnt/ttsbit0.c: Renamed to `ttsbit.c'.
 	* rules.mk (SFNT_DRV_H): Updated.
 
 2013-05-10  Werner Lemberg  <wl@gnu.org>
Index: lib/3rdparty/freetype/src/pcf/pcfread.c
===================================================================
--- lib/3rdparty/freetype/src/pcf/pcfread.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pcf/pcfread.c	(copie de travail)
@@ -1096,7 +1096,7 @@
   pcf_load_font( FT_Stream  stream,
                  PCF_Face   face )
   {
-    FT_Error   error  = FT_Err_Ok;
+    FT_Error   error;
     FT_Memory  memory = FT_FACE( face )->memory;
     FT_Bool    hasBDFAccelerators;
 
Index: lib/3rdparty/freetype/src/pcf/pcfutil.c
===================================================================
--- lib/3rdparty/freetype/src/pcf/pcfutil.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pcf/pcfutil.c	(copie de travail)
@@ -66,11 +66,11 @@
   TwoByteSwap( unsigned char*  buf,
                size_t          nbytes )
   {
-    unsigned char  c;
+    for ( ; nbytes >= 2; nbytes -= 2, buf += 2 )
+    {
+      unsigned char  c;
 
 
-    for ( ; nbytes >= 2; nbytes -= 2, buf += 2 )
-    {
       c      = buf[0];
       buf[0] = buf[1];
       buf[1] = c;
@@ -85,11 +85,11 @@
   FourByteSwap( unsigned char*  buf,
                 size_t          nbytes )
   {
-    unsigned char  c;
+    for ( ; nbytes >= 4; nbytes -= 4, buf += 4 )
+    {
+      unsigned char  c;
 
 
-    for ( ; nbytes >= 4; nbytes -= 4, buf += 4 )
-    {
       c      = buf[0];
       buf[0] = buf[3];
       buf[3] = c;
Index: lib/3rdparty/freetype/src/pcf/pcfdrivr.c
===================================================================
--- lib/3rdparty/freetype/src/pcf/pcfdrivr.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pcf/pcfdrivr.c	(copie de travail)
@@ -218,25 +218,24 @@
     FT_FREE( face->metrics );
 
     /* free properties */
+    if ( face->properties )
     {
-      PCF_Property  prop;
-      FT_Int        i;
+      FT_Int  i;
 
 
-      if ( face->properties )
+      for ( i = 0; i < face->nprops; i++ )
       {
-        for ( i = 0; i < face->nprops; i++ )
+        PCF_Property  prop = &face->properties[i];
+
+
+        if ( prop )
         {
-          prop = &face->properties[i];
-
-          if ( prop )
-          {
-            FT_FREE( prop->name );
-            if ( prop->isString )
-              FT_FREE( prop->value.atom );
-          }
+          FT_FREE( prop->name );
+          if ( prop->isString )
+            FT_FREE( prop->value.atom );
         }
       }
+
       FT_FREE( face->properties );
     }
 
@@ -264,11 +263,10 @@
                  FT_Parameter*  params )
   {
     PCF_Face  face  = (PCF_Face)pcfface;
-    FT_Error  error = FT_Err_Ok;
+    FT_Error  error;
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
 
 
     FT_TRACE2(( "PCF driver\n" ));
@@ -347,6 +345,18 @@
 #endif
     }
 
+    /* PCF could not have multiple face in single font file.
+     * XXX: non-zero face_index is already invalid argument, but
+     *      Type1, Type42 driver has a convention to return
+     *      an invalid argument error when the font could be
+     *      opened by the specified driver.
+     */
+    if ( face_index > 0 ) {
+      FT_ERROR(( "PCF_Face_Init: invalid face index\n" ));
+      PCF_Face_Done( pcfface );
+      return FT_THROW( Invalid_Argument );
+    }
+
     /* set up charmap */
     {
       FT_String  *charset_registry = face->charset_registry;
@@ -482,7 +492,7 @@
     FT_UNUSED( load_flags );
 
 
-    FT_TRACE4(( "load_glyph %d ---", glyph_index ));
+    FT_TRACE1(( "PCF_Glyph_Load: glyph index %d\n", glyph_index ));
 
     if ( !face || glyph_index >= (FT_UInt)face->root.num_glyphs )
     {
@@ -576,8 +586,6 @@
                                     ( face->accel.fontAscent +
                                       face->accel.fontDescent ) << 6 );
 
-    FT_TRACE4(( " --- ok\n" ));
-
   Exit:
     return error;
   }
Index: lib/3rdparty/freetype/src/gzip/rules.mk
===================================================================
--- lib/3rdparty/freetype/src/gzip/rules.mk	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gzip/rules.mk	(copie de travail)
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2002, 2003 by
+# Copyright 2002, 2003, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -27,49 +27,52 @@
 endif
 
 
-# gzip support sources (i.e., C files)
+# gzip support sources
 #
-GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c
-
-# gzip support headers
+# All source and header files get loaded by `ftgzip.c' only if SYTEM_ZLIB is
+# not defined (regardless whether we have a `single' or a `multi' build).
+# However, it doesn't harm if we add everything as a dependency
+# unconditionally.
 #
-GZIP_DRV_H :=
+GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c  \
+                 $(GZIP_DIR)/infblock.c \
+                 $(GZIP_DIR)/infblock.h \
+                 $(GZIP_DIR)/infcodes.c \
+                 $(GZIP_DIR)/infcodes.h \
+                 $(GZIP_DIR)/inffixed.h \
+                 $(GZIP_DIR)/inflate.c  \
+                 $(GZIP_DIR)/inftrees.c \
+                 $(GZIP_DIR)/inftrees.h \
+                 $(GZIP_DIR)/infutil.c  \
+                 $(GZIP_DIR)/infutil.h  \
+                 $(GZIP_DIR)/zconf.h    \
+                 $(GZIP_DIR)/zlib.h     \
+                 $(GZIP_DIR)/zutil.c    \
+                 $(GZIP_DIR)/zutil.h
 
 
 # gzip driver object(s)
 #
-#   GZIP_DRV_OBJ_M is used during `multi' builds
-#   GZIP_DRV_OBJ_S is used during `single' builds
+#   GZIP_DRV_OBJ is used during both `single' and `multi' builds
 #
-ifeq ($(SYSTEM_ZLIB),)
-  GZIP_DRV_OBJ_M := $(GZIP_DRV_SRC:$(GZIP_DIR)/%.c=$(OBJ_DIR)/%.$O)
-else
-  GZIP_DRV_OBJ_M := $(OBJ_DIR)/ftgzip.$O
-endif
-GZIP_DRV_OBJ_S := $(OBJ_DIR)/ftgzip.$O
+GZIP_DRV_OBJ := $(OBJ_DIR)/ftgzip.$O
 
-# gzip support source file for single build
-#
-GZIP_DRV_SRC_S := $(GZIP_DIR)/ftgzip.c
 
-
-# gzip support - single object
+# gzip main source file
 #
-$(GZIP_DRV_OBJ_S): $(GZIP_DRV_SRC_S) $(GZIP_DRV_SRC) $(FREETYPE_H) \
-                   $(GZIP_DRV_H)
-	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC_S))
+GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c
 
 
-# gzip support - multiple objects
+# gzip support - object
 #
-$(OBJ_DIR)/%.$O: $(GZIP_DIR)/%.c $(FREETYPE_H) $(GZIP_DRV_H)
-	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+$(GZIP_DRV_OBJ): $(GZIP_DRV_SRC) $(GZIP_DRV_SRCS) $(FREETYPE_H)
+	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC))
 
 
 # update main driver object lists
 #
-DRV_OBJS_S += $(GZIP_DRV_OBJ_S)
-DRV_OBJS_M += $(GZIP_DRV_OBJ_M)
+DRV_OBJS_S += $(GZIP_DRV_OBJ)
+DRV_OBJS_M += $(GZIP_DRV_OBJ)
 
 
 # EOF
Index: lib/3rdparty/freetype/src/gzip/Jamfile
===================================================================
--- lib/3rdparty/freetype/src/gzip/Jamfile	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gzip/Jamfile	(copie de travail)
@@ -1,16 +0,0 @@
-# FreeType 2 src/gzip Jamfile
-#
-# Copyright 2001 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) gzip ;
-
-Library  $(FT2_LIB) : ftgzip.c ;
-
-# end of src/pcf Jamfile
Index: lib/3rdparty/freetype/src/gzip/ftgzip.c
===================================================================
--- lib/3rdparty/freetype/src/gzip/ftgzip.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gzip/ftgzip.c	(copie de travail)
@@ -596,6 +596,8 @@
   }
 
 
+  /* documentation is in ftgzip.h */
+
   FT_EXPORT_DEF( FT_Error )
   FT_Stream_OpenGzip( FT_Stream  stream,
                       FT_Stream  source )
@@ -684,9 +686,66 @@
     return error;
   }
 
-#else  /* !FT_CONFIG_OPTION_USE_ZLIB */
 
+  /* documentation is in ftgzip.h */
+
   FT_EXPORT_DEF( FT_Error )
+  FT_Gzip_Uncompress( FT_Memory       memory,
+                      FT_Byte*        output,
+                      FT_ULong*       output_len,
+                      const FT_Byte*  input,
+                      FT_ULong        input_len )
+  {
+    z_stream  stream;
+    int       err;
+
+
+    /* this function is modeled after zlib's `uncompress' function */
+
+    stream.next_in  = (Bytef*)input;
+    stream.avail_in = (uInt)input_len;
+
+    stream.next_out  = output;
+    stream.avail_out = (uInt)*output_len;
+
+    stream.zalloc = (alloc_func)ft_gzip_alloc;
+    stream.zfree  = (free_func) ft_gzip_free;
+    stream.opaque = memory;
+
+    err = inflateInit2( &stream, MAX_WBITS );
+    if ( err != Z_OK )
+      return FT_THROW( Invalid_Argument );
+
+    err = inflate( &stream, Z_FINISH );
+    if ( err != Z_STREAM_END )
+    {
+      inflateEnd( &stream );
+      if ( err == Z_OK )
+        err = Z_BUF_ERROR;
+    }
+    else
+    {
+      *output_len = stream.total_out;
+
+      err = inflateEnd( &stream );
+    }
+
+    if ( err == Z_MEM_ERROR )
+      return FT_THROW( Out_Of_Memory );
+
+    if ( err == Z_BUF_ERROR )
+      return FT_THROW( Array_Too_Large );
+
+    if ( err == Z_DATA_ERROR )
+      return FT_THROW( Invalid_Table );
+
+    return FT_Err_Ok;
+  }
+
+
+#else /* !FT_CONFIG_OPTION_USE_ZLIB */
+
+  FT_EXPORT_DEF( FT_Error )
   FT_Stream_OpenGzip( FT_Stream  stream,
                       FT_Stream  source )
   {
@@ -696,6 +755,23 @@
     return FT_THROW( Unimplemented_Feature );
   }
 
+
+  FT_EXPORT_DEF( FT_Error )
+  FT_Gzip_Uncompress( FT_Memory       memory,
+                      FT_Byte*        output,
+                      FT_ULong*       output_len,
+                      const FT_Byte*  input,
+                      FT_ULong        input_len )
+  {
+    FT_UNUSED( memory );
+    FT_UNUSED( output );
+    FT_UNUSED( output_len );
+    FT_UNUSED( input );
+    FT_UNUSED( input_len );
+
+    return FT_THROW( Unimplemented_Feature );
+  }
+
 #endif /* !FT_CONFIG_OPTION_USE_ZLIB */
 
 
Index: lib/3rdparty/freetype/src/smooth/ftgrays.c
===================================================================
--- lib/3rdparty/freetype/src/smooth/ftgrays.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/smooth/ftgrays.c	(copie de travail)
@@ -24,8 +24,8 @@
   /*                                                                       */
   /* - copy `src/smooth/ftgrays.c' (this file) to your current directory   */
   /*                                                                       */
-  /* - copy `include/freetype/ftimage.h' and `src/smooth/ftgrays.h' to the */
-  /*   same directory                                                      */
+  /* - copy `include/ftimage.h' and `src/smooth/ftgrays.h' to the same     */
+  /*   directory                                                           */
   /*                                                                       */
   /* - compile `ftgrays' with the _STANDALONE_ macro defined, as in        */
   /*                                                                       */
@@ -310,6 +310,40 @@
 #endif
 
 
+  /* Compute `dividend / divisor' and return both its quotient and     */
+  /* remainder, cast to a specific type.  This macro also ensures that */
+  /* the remainder is always positive.                                 */
+#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \
+  FT_BEGIN_STMNT                                                   \
+    (quotient)  = (type)( (dividend) / (divisor) );                \
+    (remainder) = (type)( (dividend) % (divisor) );                \
+    if ( (remainder) < 0 )                                         \
+    {                                                              \
+      (quotient)--;                                                \
+      (remainder) += (type)(divisor);                              \
+    }                                                              \
+  FT_END_STMNT
+
+#ifdef  __arm__
+  /* Work around a bug specific to GCC which make the compiler fail to */
+  /* optimize a division and modulo operation on the same parameters   */
+  /* into a single call to `__aeabi_idivmod'.  See                     */
+  /*                                                                   */
+  /*  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43721                */
+#undef FT_DIV_MOD
+#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \
+  FT_BEGIN_STMNT                                                   \
+    (quotient)  = (type)( (dividend) / (divisor) );                \
+    (remainder) = (type)( (dividend) - (quotient) * (divisor) );   \
+    if ( (remainder) < 0 )                                         \
+    {                                                              \
+      (quotient)--;                                                \
+      (remainder) += (type)(divisor);                              \
+    }                                                              \
+  FT_END_STMNT
+#endif /* __arm__ */
+
+
   /*************************************************************************/
   /*                                                                       */
   /*   TYPE DEFINITIONS                                                    */
@@ -548,7 +582,7 @@
   static void
   gray_record_cell( RAS_ARG )
   {
-    if ( !ras.invalid && ( ras.area | ras.cover ) )
+    if ( ras.area | ras.cover )
     {
       PCell  cell = gray_find_cell( RAS_VAR );
 
@@ -597,10 +631,10 @@
 
       ras.area  = 0;
       ras.cover = 0;
+      ras.ex    = ex;
+      ras.ey    = ey;
     }
 
-    ras.ex      = ex;
-    ras.ey      = ey;
     ras.invalid = ( (unsigned)ey >= (unsigned)ras.count_ey ||
                               ex >= ras.count_ex           );
   }
@@ -686,13 +720,7 @@
       dx    = -dx;
     }
 
-    delta = (TCoord)( p / dx );
-    mod   = (TCoord)( p % dx );
-    if ( mod < 0 )
-    {
-      delta--;
-      mod += (TCoord)dx;
-    }
+    FT_DIV_MOD( TCoord, p, dx, delta, mod );
 
     ras.area  += (TArea)(( fx1 + first ) * delta);
     ras.cover += delta;
@@ -706,14 +734,8 @@
       TCoord  lift, rem;
 
 
-      p    = ONE_PIXEL * ( y2 - y1 + delta );
-      lift = (TCoord)( p / dx );
-      rem  = (TCoord)( p % dx );
-      if ( rem < 0 )
-      {
-        lift--;
-        rem += (TCoord)dx;
-      }
+      p = ONE_PIXEL * ( y2 - y1 + delta );
+      FT_DIV_MOD( TCoord, p, dx, lift, rem );
 
       mod -= (int)dx;
 
@@ -763,9 +785,6 @@
     dx = to_x - ras.x;
     dy = to_y - ras.y;
 
-    /* XXX: we should do something about the trivial case where dx == 0, */
-    /*      as it happens very often!                                    */
-
     /* perform vertical clipping */
     {
       TCoord  min, max;
@@ -844,13 +863,7 @@
       dy    = -dy;
     }
 
-    delta = (int)( p / dy );
-    mod   = (int)( p % dy );
-    if ( mod < 0 )
-    {
-      delta--;
-      mod += (TCoord)dy;
-    }
+    FT_DIV_MOD( int, p, dy, delta, mod );
 
     x = ras.x + delta;
     gray_render_scanline( RAS_VAR_ ey1, ras.x, fy1, x, (TCoord)first );
@@ -861,13 +874,7 @@
     if ( ey1 != ey2 )
     {
       p     = ONE_PIXEL * dx;
-      lift  = (int)( p / dy );
-      rem   = (int)( p % dy );
-      if ( rem < 0 )
-      {
-        lift--;
-        rem += (int)dy;
-      }
+      FT_DIV_MOD( int, p, dy, lift, rem );
       mod -= (int)dy;
 
       while ( ey1 != ey2 )
@@ -1171,7 +1178,8 @@
 
 
     /* record current cell, if any */
-    gray_record_cell( RAS_VAR );
+    if ( !ras.invalid )
+      gray_record_cell( RAS_VAR );
 
     /* start to a new position */
     x = UPSCALE( to->x );
@@ -1781,7 +1789,8 @@
     if ( ft_setjmp( ras.jump_buffer ) == 0 )
     {
       error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras );
-      gray_record_cell( RAS_VAR );
+      if ( !ras.invalid )
+        gray_record_cell( RAS_VAR );
     }
     else
       error = FT_THROW( Memory_Overflow );
Index: lib/3rdparty/freetype/src/base/ftbitmap.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftbitmap.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftbitmap.c	(copie de travail)
@@ -385,6 +385,10 @@
     FT_Long  l;
 
 
+    /* Short-circuit transparent color to avoid div-by-zero. */
+    if ( !a )
+      return 0;
+
     /*
      * Luminosity for sRGB is defined using ~0.2126,0.7152,0.0722
      * coefficients for RGB channels *on the linear colors*.
Index: lib/3rdparty/freetype/src/base/ftdebug.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftdebug.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftdebug.c	(copie de travail)
@@ -152,7 +152,7 @@
   /* the memory and stream components which are set to 7 and 5,            */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <include/freetype/internal/fttrace.h> for details of the */
+  /* See the file <include/internal/fttrace.h> for details of the          */
   /* available toggle names.                                               */
   /*                                                                       */
   /* The level must be between 0 and 7; 0 means quiet (except for serious  */
Index: lib/3rdparty/freetype/src/base/ftmac.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftmac.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftmac.c	(copie de travail)
@@ -963,7 +963,6 @@
     if ( !pathname )
       return FT_THROW( Invalid_Argument );
 
-    error  = FT_Err_Ok;
     *aface = NULL;
 
     /* try resourcefork based font: LWFN, FFIL */
Index: lib/3rdparty/freetype/src/base/ftoutln.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftoutln.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftoutln.c	(copie de travail)
@@ -576,11 +576,13 @@
       {
         char*  p = outline->tags + first;
         char*  q = outline->tags + last;
-        char   swap;
 
 
         while ( p < q )
         {
+          char  swap;
+
+
           swap = *p;
           *p   = *q;
           *q   = swap;
@@ -721,7 +723,8 @@
 #if 0
 
 #define FT_OUTLINE_GET_CONTOUR( outline, c, first, last )  \
-  do {                                                     \
+  do                                                       \
+  {                                                        \
     (first) = ( c > 0 ) ? (outline)->points +              \
                             (outline)->contours[c - 1] + 1 \
                         : (outline)->points;               \
Index: lib/3rdparty/freetype/src/base/ftcalc.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftcalc.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftcalc.c	(copie de travail)
@@ -816,6 +816,8 @@
   }
 
 
+#if 0
+
   /* documentation is in ftcalc.h */
 
   FT_BASE_DEF( FT_Int32 )
@@ -850,7 +852,9 @@
     return (FT_Int32)root;
   }
 
+#endif /* 0 */
 
+
   /* documentation is in ftcalc.h */
 
   FT_BASE_DEF( FT_Int )
@@ -945,11 +949,27 @@
     FT_Pos  d_in, d_out, d_corner;
 
 
+    /* We approximate the Euclidean metric (sqrt(x^2 + y^2)) with */
+    /* the Taxicab metric (|x| + |y|), which can be computed much */
+    /* faster.  If one of the two vectors is much longer than the */
+    /* other one, the direction of the shorter vector doesn't     */
+    /* influence the result any more.                             */
+    /*                                                            */
+    /*                 corner                                     */
+    /*       x---------------------------x                        */
+    /*        \                      /                            */
+    /*         \                /                                 */
+    /*      in  \          /  out                                 */
+    /*           \    /                                           */
+    /*            o                                               */
+    /*              Point                                         */
+    /*                                                            */
+
     if ( ax < 0 )
       ax = -ax;
     if ( ay < 0 )
       ay = -ay;
-    d_in = ax + ay;
+    d_in = ax + ay;  /* d_in = || in || */
 
     ax = out_x;
     if ( ax < 0 )
@@ -957,7 +977,7 @@
     ay = out_y;
     if ( ay < 0 )
       ay = -ay;
-    d_out = ax + ay;
+    d_out = ax + ay;  /* d_out = || out || */
 
     ax = out_x + in_x;
     if ( ax < 0 )
@@ -965,8 +985,12 @@
     ay = out_y + in_y;
     if ( ay < 0 )
       ay = -ay;
-    d_corner = ax + ay;
+    d_corner = ax + ay;  /* d_corner = || in + out || */
 
+    /* now do a simple length comparison: */
+    /*                                    */
+    /*   d_in + d_out < 17/16 d_corner    */
+
     return ( d_in + d_out - d_corner ) < ( d_corner >> 4 );
   }
 
Index: lib/3rdparty/freetype/src/base/ftinit.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftinit.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftinit.c	(copie de travail)
@@ -23,8 +23,8 @@
   /*  FT_Add_Default_Modules():                                            */
   /*     This function is used to add the set of default modules to a      */
   /*     fresh new library object.  The set is taken from the header file  */
-  /*     `freetype/config/ftmodule.h'.  See the document `FreeType 2.0     */
-  /*     Build System' for more information.                               */
+  /*     `config/ftmodule.h'.  See the document `FreeType 2.0 Build        */
+  /*     System' for more information.                                     */
   /*                                                                       */
   /*  FT_Init_FreeType():                                                  */
   /*     This function creates a system object for the current platform,   */
Index: lib/3rdparty/freetype/src/base/ftsynth.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftsynth.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftsynth.c	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType synthesizing code for emboldening and slanting (body).      */
 /*                                                                         */
-/*  Copyright 2000-2006, 2010, 2012 by                                     */
+/*  Copyright 2000-2006, 2010, 2012, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -139,10 +139,11 @@
     if ( slot->advance.y )
       slot->advance.y += ystr;
 
-    slot->metrics.width       += xstr;
-    slot->metrics.height      += ystr;
-    slot->metrics.horiAdvance += xstr;
-    slot->metrics.vertAdvance += ystr;
+    slot->metrics.width        += xstr;
+    slot->metrics.height       += ystr;
+    slot->metrics.horiAdvance  += xstr;
+    slot->metrics.vertAdvance  += ystr;
+    slot->metrics.horiBearingY += ystr;
 
     /* XXX: 16-bit overflow case must be excluded before here */
     if ( slot->format == FT_GLYPH_FORMAT_BITMAP )
Index: lib/3rdparty/freetype/src/base/ftpic.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftpic.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftpic.c	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType position independent code services (body).              */
 /*                                                                         */
-/*  Copyright 2009 by                                                      */
+/*  Copyright 2009, 2013 by                                                */
 /*  Oran Agra and Mickey Gabel.                                            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,7 +29,7 @@
   ft_pic_container_init( FT_Library  library )
   {
     FT_PIC_Container*  pic_container = &library->pic_container;
-    FT_Error           error         = FT_Err_Ok;
+    FT_Error           error;
 
 
     FT_MEM_SET( pic_container, 0, sizeof ( *pic_container ) );
Index: lib/3rdparty/freetype/src/base/ftglyph.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftglyph.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftglyph.c	(copie de travail)
@@ -424,8 +424,7 @@
                       FT_Matrix*  matrix,
                       FT_Vector*  delta )
   {
-    const FT_Glyph_Class*  clazz;
-    FT_Error               error = FT_Err_Ok;
+    FT_Error  error = FT_Err_Ok;
 
 
     if ( !glyph || !glyph->clazz )
@@ -432,7 +431,9 @@
       error = FT_THROW( Invalid_Argument );
     else
     {
-      clazz = glyph->clazz;
+      const FT_Glyph_Class*  clazz = glyph->clazz;
+
+
       if ( clazz->glyph_transform )
       {
         /* transform glyph image */
@@ -466,38 +467,33 @@
 
     if ( !glyph || !glyph->clazz )
       return;
-    else
-    {
-      clazz = glyph->clazz;
-      if ( !clazz->glyph_bbox )
-        return;
-      else
-      {
-        /* retrieve bbox in 26.6 coordinates */
-        clazz->glyph_bbox( glyph, acbox );
 
-        /* perform grid fitting if needed */
-        if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT ||
-             bbox_mode == FT_GLYPH_BBOX_PIXELS  )
-        {
-          acbox->xMin = FT_PIX_FLOOR( acbox->xMin );
-          acbox->yMin = FT_PIX_FLOOR( acbox->yMin );
-          acbox->xMax = FT_PIX_CEIL( acbox->xMax );
-          acbox->yMax = FT_PIX_CEIL( acbox->yMax );
-        }
+    clazz = glyph->clazz;
+    if ( !clazz->glyph_bbox )
+      return;
 
-        /* convert to integer pixels if needed */
-        if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE ||
-             bbox_mode == FT_GLYPH_BBOX_PIXELS   )
-        {
-          acbox->xMin >>= 6;
-          acbox->yMin >>= 6;
-          acbox->xMax >>= 6;
-          acbox->yMax >>= 6;
-        }
-      }
+    /* retrieve bbox in 26.6 coordinates */
+    clazz->glyph_bbox( glyph, acbox );
+
+    /* perform grid fitting if needed */
+    if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT ||
+         bbox_mode == FT_GLYPH_BBOX_PIXELS  )
+    {
+      acbox->xMin = FT_PIX_FLOOR( acbox->xMin );
+      acbox->yMin = FT_PIX_FLOOR( acbox->yMin );
+      acbox->xMax = FT_PIX_CEIL( acbox->xMax );
+      acbox->yMax = FT_PIX_CEIL( acbox->yMax );
     }
-    return;
+
+    /* convert to integer pixels if needed */
+    if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE ||
+         bbox_mode == FT_GLYPH_BBOX_PIXELS   )
+    {
+      acbox->xMin >>= 6;
+      acbox->yMin >>= 6;
+      acbox->xMax >>= 6;
+      acbox->yMax >>= 6;
+    }
   }
 
 
Index: lib/3rdparty/freetype/src/base/rules.mk
===================================================================
--- lib/3rdparty/freetype/src/base/rules.mk	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/rules.mk	(copie de travail)
@@ -19,8 +19,8 @@
 #   BASE_OBJ_S:   The single-object base layer.
 #   BASE_OBJ_M:   A list of all objects for a multiple-objects build.
 #   BASE_EXT_OBJ: A list of base layer extensions, i.e., components found
-#                 in `freetype/src/base' which are not compiled within the
-#                 base layer proper.
+#                 in `src/base' which are not compiled within the base
+#                 layer proper.
 
 
 BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base)
Index: lib/3rdparty/freetype/src/base/ftbbox.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftbbox.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftbbox.c	(copie de travail)
@@ -85,7 +85,7 @@
   /*    BBox_Conic_Check                                                   */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Finds the extrema of a 1-dimensional conic Bezier curve and update */
+  /*    Find the extrema of a 1-dimensional conic Bezier curve and update  */
   /*    a bounding range.  This version uses direct computation, as it     */
   /*    doesn't need square roots.                                         */
   /*                                                                       */
@@ -108,30 +108,19 @@
                     FT_Pos*  min,
                     FT_Pos*  max )
   {
-    if ( y1 <= y3 && y2 == y1 )     /* flat arc */
-      goto Suite;
+    /* This function is only called when a control off-point is outside */
+    /* the bbox that contains all on-points.  It finds a local extremum */
+    /* within the segment, equal to (y1*y3 - y2*y2)/(y1 - 2*y2 + y3).   */
+    /* Or, offsetting from y2, we get                                   */
 
-    if ( y1 < y3 )
-    {
-      if ( y2 >= y1 && y2 <= y3 )   /* ascending arc */
-        goto Suite;
-    }
-    else
-    {
-      if ( y2 >= y3 && y2 <= y1 )   /* descending arc */
-      {
-        y2 = y1;
-        y1 = y3;
-        y3 = y2;
-        goto Suite;
-      }
-    }
+    y1 -= y2;
+    y3 -= y2;
+    y2 += FT_MulDiv( y1, y3, y1 + y3 );
 
-    y1 = y3 = y1 - FT_MulDiv( y2 - y1, y2 - y1, y1 - 2*y2 + y3 );
-
-  Suite:
-    if ( y1 < *min ) *min = y1;
-    if ( y3 > *max ) *max = y3;
+    if ( y2 < *min )
+      *min = y2;
+    if ( y2 > *max )
+      *max = y2;
   }
 
 
@@ -195,9 +184,9 @@
   /*    BBox_Cubic_Check                                                   */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Finds the extrema of a 1-dimensional cubic Bezier curve and        */
-  /*    updates a bounding range.  This version uses splitting because we  */
-  /*    don't want to use square roots and extra accuracy.                 */
+  /*    Find the extrema of a 1-dimensional cubic Bezier curve and         */
+  /*    update a bounding range.  This version uses iterative splitting    */
+  /*    because it is faster than the exact solution with square roots.    */
   /*                                                                       */
   /* <Input>                                                               */
   /*    p1  :: The start coordinate.                                       */
@@ -213,28 +202,16 @@
   /*                                                                       */
   /*    max :: The address of the current maximum.                         */
   /*                                                                       */
-
-#if 0
-
-  static void
-  BBox_Cubic_Check( FT_Pos   p1,
-                    FT_Pos   p2,
-                    FT_Pos   p3,
-                    FT_Pos   p4,
-                    FT_Pos*  min,
-                    FT_Pos*  max )
+  static FT_Pos
+  update_cubic_max( FT_Pos  q1,
+                    FT_Pos  q2,
+                    FT_Pos  q3,
+                    FT_Pos  q4,
+                    FT_Pos  max )
   {
-    FT_Pos  q1, q2, q3, q4;
-
-
-    q1 = p1;
-    q2 = p2;
-    q3 = p3;
-    q4 = p4;
-
-    /* for a conic segment to possibly reach new maximum     */
-    /* one of its off-points must be above the current value */
-    while ( q2 > *max || q3 > *max )
+    /* for a cubic segment to possibly reach new maximum, at least */
+    /* one of its off-points must stay above the current value     */
+    while ( q2 > max || q3 > max )
     {
       /* determine which half contains the maximum and split */
       if ( q1 + q2 > q3 + q4 ) /* first half */
@@ -260,233 +237,93 @@
         q3 = q3 / 2;
       }
 
-      /* check if either end reached the maximum */
+      /* check whether either end reached the maximum */
       if ( q1 == q2 && q1 >= q3 )
       {
-        *max = q1;
+        max = q1;
         break;
       }
       if ( q3 == q4 && q2 <= q4 )
       {
-        *max = q4;
+        max = q4;
         break;
       }
     }
 
-    q1 = p1;
-    q2 = p2;
-    q3 = p3;
-    q4 = p4;
-
-    /* for a conic segment to possibly reach new minimum     */
-    /* one of its off-points must be below the current value */
-    while ( q2 < *min || q3 < *min )
-    {
-      /* determine which half contains the minimum and split */
-      if ( q1 + q2 < q3 + q4 ) /* first half */
-      {
-        q4 = q4 + q3;
-        q3 = q3 + q2;
-        q2 = q2 + q1;
-        q4 = q4 + q3;
-        q3 = q3 + q2;
-        q4 = ( q4 + q3 ) / 8;
-        q3 = q3 / 4;
-        q2 = q2 / 2;
-      }
-      else                     /* second half */
-      {
-        q1 = q1 + q2;
-        q2 = q2 + q3;
-        q3 = q3 + q4;
-        q1 = q1 + q2;
-        q2 = q2 + q3;
-        q1 = ( q1 + q2 ) / 8;
-        q2 = q2 / 4;
-        q3 = q3 / 2;
-      }
-
-      /* check if either end reached the minimum */
-      if ( q1 == q2 && q1 <= q3 )
-      {
-        *min = q1;
-        break;
-      }
-      if ( q3 == q4 && q2 >= q4 )
-      {
-        *min = q4;
-        break;
-      }
-    }
+    return max;
   }
 
-#else
 
   static void
-  test_cubic_extrema( FT_Pos    y1,
-                      FT_Pos    y2,
-                      FT_Pos    y3,
-                      FT_Pos    y4,
-                      FT_Fixed  u,
-                      FT_Pos*   min,
-                      FT_Pos*   max )
+  BBox_Cubic_Check( FT_Pos   p1,
+                    FT_Pos   p2,
+                    FT_Pos   p3,
+                    FT_Pos   p4,
+                    FT_Pos*  min,
+                    FT_Pos*  max )
   {
- /* FT_Pos    a = y4 - 3*y3 + 3*y2 - y1; */
-    FT_Pos    b = y3 - 2*y2 + y1;
-    FT_Pos    c = y2 - y1;
-    FT_Pos    d = y1;
-    FT_Pos    y;
-    FT_Fixed  uu;
+    FT_Pos  nmin, nmax;
+    FT_Int  shift;
 
-    FT_UNUSED ( y4 );
 
+    /* This function is only called when a control off-point is outside  */
+    /* the bbox that contains all on-points.  It finds a local extremum  */
+    /* within the segment using iterative bisection of the segment.      */
+    /* The fixed-point arithmetic of bisection is inherently stable      */
+    /* but may loose accuracy in the two lowest bits.  To compensate,    */
+    /* we upscale the segment if there is room.  Large values may need   */
+    /* to be downscaled to avoid overflows during bisection.             */
+    /* The control off-point outside the bbox is likely to have the top  */
+    /* absolute value among arguments.                                   */
 
-    /* The polynomial is                      */
-    /*                                        */
-    /*    P(x) = a*x^3 + 3b*x^2 + 3c*x + d  , */
-    /*                                        */
-    /*   dP/dx = 3a*x^2 + 6b*x + 3c         . */
-    /*                                        */
-    /* However, we also have                  */
-    /*                                        */
-    /*   dP/dx(u) = 0                       , */
-    /*                                        */
-    /* which implies by subtraction that      */
-    /*                                        */
-    /*   P(u) = b*u^2 + 2c*u + d            . */
+    shift = 27 - FT_MSB( FT_ABS( p2 ) | FT_ABS( p3 ) );
 
-    if ( u > 0 && u < 0x10000L )
+    if ( shift > 0 )
     {
-      uu = FT_MulFix( u, u );
-      y  = d + FT_MulFix( c, 2*u ) + FT_MulFix( b, uu );
+      /* upscaling too much just wastes time */
+      if ( shift > 2 )
+        shift = 2;
 
-      if ( y < *min ) *min = y;
-      if ( y > *max ) *max = y;
+      p1 <<=  shift;
+      p2 <<=  shift;
+      p3 <<=  shift;
+      p4 <<=  shift;
+      nmin = *min << shift;
+      nmax = *max << shift;
     }
-  }
+    else
+    {
+      p1 >>= -shift;
+      p2 >>= -shift;
+      p3 >>= -shift;
+      p4 >>= -shift;
+      nmin = *min >> -shift;
+      nmax = *max >> -shift;
+    }
 
+    nmax =  update_cubic_max(  p1,  p2,  p3,  p4,  nmax );
 
-  static void
-  BBox_Cubic_Check( FT_Pos   y1,
-                    FT_Pos   y2,
-                    FT_Pos   y3,
-                    FT_Pos   y4,
-                    FT_Pos*  min,
-                    FT_Pos*  max )
-  {
-    /* always compare first and last points */
-    if      ( y1 < *min )  *min = y1;
-    else if ( y1 > *max )  *max = y1;
+    /* now flip the signs to update the minimum */
+    nmin = -update_cubic_max( -p1, -p2, -p3, -p4, -nmin );
 
-    if      ( y4 < *min )  *min = y4;
-    else if ( y4 > *max )  *max = y4;
-
-    /* now, try to see if there are split points here */
-    if ( y1 <= y4 )
+    if ( shift > 0 )
     {
-      /* flat or ascending arc test */
-      if ( y1 <= y2 && y2 <= y4 && y1 <= y3 && y3 <= y4 )
-        return;
+      nmin >>=  shift;
+      nmax >>=  shift;
     }
-    else /* y1 > y4 */
+    else
     {
-      /* descending arc test */
-      if ( y1 >= y2 && y2 >= y4 && y1 >= y3 && y3 >= y4 )
-        return;
+      nmin <<= -shift;
+      nmax <<= -shift;
     }
 
-    /* There are some split points.  Find them.                        */
-    /* We already made sure that a, b, and c below cannot be all zero. */
-    {
-      FT_Pos    a = y4 - 3*y3 + 3*y2 - y1;
-      FT_Pos    b = y3 - 2*y2 + y1;
-      FT_Pos    c = y2 - y1;
-      FT_Pos    d;
-      FT_Fixed  t;
-      FT_Int    shift;
-
-
-      /* We need to solve `ax^2+2bx+c' here, without floating points!      */
-      /* The trick is to normalize to a different representation in order  */
-      /* to use our 16.16 fixed-point routines.                            */
-      /*                                                                   */
-      /* We compute FT_MulFix(b,b) and FT_MulFix(a,c) after normalization. */
-      /* These values must fit into a single 16.16 value.                  */
-      /*                                                                   */
-      /* We normalize a, b, and c to `8.16' fixed-point values to ensure   */
-      /* that their product is held in a `16.16' value including the sign. */
-      /* Necessarily, we need to shift `a', `b', and `c' so that the most  */
-      /* significant bit of their absolute values is at position 22.       */
-      /*                                                                   */
-      /* This also means that we are using 23 bits of precision to compute */
-      /* the zeros, independently of the range of the original polynomial  */
-      /* coefficients.                                                     */
-      /*                                                                   */
-      /* This algorithm should ensure reasonably accurate values for the   */
-      /* zeros.  Note that they are only expressed with 16 bits when       */
-      /* computing the extrema (the zeros need to be in 0..1 exclusive     */
-      /* to be considered part of the arc).                                */
-
-      shift = FT_MSB( FT_ABS( a ) | FT_ABS( b ) | FT_ABS( c ) );
-
-      if ( shift > 22 )
-      {
-        shift -= 22;
-
-        /* this loses some bits of precision, but we use 23 of them */
-        /* for the computation anyway                               */
-        a >>= shift;
-        b >>= shift;
-        c >>= shift;
-      }
-      else
-      {
-        shift = 22 - shift;
-
-        a <<= shift;
-        b <<= shift;
-        c <<= shift;
-      }
-
-      /* handle a == 0 */
-      if ( a == 0 )
-      {
-        if ( b != 0 )
-        {
-          t = - FT_DivFix( c, b ) / 2;
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-        }
-      }
-      else
-      {
-        /* solve the equation now */
-        d = FT_MulFix( b, b ) - FT_MulFix( a, c );
-        if ( d < 0 )
-          return;
-
-        if ( d == 0 )
-        {
-          /* there is a single split point at -b/a */
-          t = - FT_DivFix( b, a );
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-        }
-        else
-        {
-          /* there are two solutions; we need to filter them */
-          d = FT_SqrtFixed( (FT_Int32)d );
-          t = - FT_DivFix( b - d, a );
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-
-          t = - FT_DivFix( b + d, a );
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-        }
-      }
-    }
+    if ( nmin < *min )
+      *min = nmin;
+    if ( nmax > *max )
+      *max = nmax;
   }
 
-#endif
 
-
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -521,8 +358,9 @@
                  FT_Vector*  to,
                  TBBox_Rec*  user )
   {
-    /* we don't need to check `to' since it is always an `on' point, thus */
-    /* within the bbox                                                    */
+    /* We don't need to check `to' since it is always an on-point,    */
+    /* thus within the bbox.  Only segments with an off-point outside */
+    /* the bbox can possibly reach new extreme values.                */
 
     if ( CHECK_X( control1, user->bbox ) ||
          CHECK_X( control2, user->bbox ) )
Index: lib/3rdparty/freetype/src/base/md5.c
===================================================================
--- lib/3rdparty/freetype/src/base/md5.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/md5.c	(copie de travail)
@@ -50,7 +50,8 @@
  */
 #define F(x, y, z)			((z) ^ ((x) & ((y) ^ (z))))
 #define G(x, y, z)			((y) ^ ((z) & ((x) ^ (y))))
-#define H(x, y, z)			((x) ^ (y) ^ (z))
+#define H(x, y, z)			(((x) ^ (y)) ^ (z))
+#define H2(x, y, z)			((x) ^ ((y) ^ (z)))
 #define I(x, y, z)			((y) ^ ((x) | ~(z)))
 
 /*
@@ -89,13 +90,13 @@
  * This processes one or more 64-byte data blocks, but does NOT update
  * the bit counters.  There are no alignment requirements.
  */
-static void *body(MD5_CTX *ctx, void *data, unsigned long size)
+static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
 {
-	unsigned char *ptr;
+	const unsigned char *ptr;
 	MD5_u32plus a, b, c, d;
 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;
 
-	ptr = (unsigned char *)data;
+	ptr = (const unsigned char *)data;
 
 	a = ctx->a;
 	b = ctx->b;
@@ -146,21 +147,21 @@
 
 /* Round 3 */
 		STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4)
-		STEP(H, d, a, b, c, GET(8), 0x8771f681, 11)
+		STEP(H2, d, a, b, c, GET(8), 0x8771f681, 11)
 		STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16)
-		STEP(H, b, c, d, a, GET(14), 0xfde5380c, 23)
+		STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23)
 		STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4)
-		STEP(H, d, a, b, c, GET(4), 0x4bdecfa9, 11)
+		STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9, 11)
 		STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16)
-		STEP(H, b, c, d, a, GET(10), 0xbebfbc70, 23)
+		STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23)
 		STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4)
-		STEP(H, d, a, b, c, GET(0), 0xeaa127fa, 11)
+		STEP(H2, d, a, b, c, GET(0), 0xeaa127fa, 11)
 		STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16)
-		STEP(H, b, c, d, a, GET(6), 0x04881d05, 23)
+		STEP(H2, b, c, d, a, GET(6), 0x04881d05, 23)
 		STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4)
-		STEP(H, d, a, b, c, GET(12), 0xe6db99e5, 11)
+		STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11)
 		STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16)
-		STEP(H, b, c, d, a, GET(2), 0xc4ac5665, 23)
+		STEP(H2, b, c, d, a, GET(2), 0xc4ac5665, 23)
 
 /* Round 4 */
 		STEP(I, a, b, c, d, GET(0), 0xf4292244, 6)
@@ -207,10 +208,10 @@
 	ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
 {
 	MD5_u32plus saved_lo;
-	unsigned long used, free;
+	unsigned long used, available;
 
 	saved_lo = ctx->lo;
 	if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
@@ -220,16 +221,16 @@
 	used = saved_lo & 0x3f;
 
 	if (used) {
-		free = 64 - used;
+		available = 64 - used;
 
-		if (size < free) {
+		if (size < available) {
 			memcpy(&ctx->buffer[used], data, size);
 			return;
 		}
 
-		memcpy(&ctx->buffer[used], data, free);
-		data = (unsigned char *)data + free;
-		size -= free;
+		memcpy(&ctx->buffer[used], data, available);
+		data = (const unsigned char *)data + available;
+		size -= available;
 		body(ctx, ctx->buffer, 64);
 	}
 
@@ -243,22 +244,22 @@
 
 void MD5_Final(unsigned char *result, MD5_CTX *ctx)
 {
-	unsigned long used, free;
+	unsigned long used, available;
 
 	used = ctx->lo & 0x3f;
 
 	ctx->buffer[used++] = 0x80;
 
-	free = 64 - used;
+	available = 64 - used;
 
-	if (free < 8) {
-		memset(&ctx->buffer[used], 0, free);
+	if (available < 8) {
+		memset(&ctx->buffer[used], 0, available);
 		body(ctx, ctx->buffer, 64);
 		used = 0;
-		free = 64;
+		available = 64;
 	}
 
-	memset(&ctx->buffer[used], 0, free - 8);
+	memset(&ctx->buffer[used], 0, available - 8);
 
 	ctx->lo <<= 3;
 	ctx->buffer[56] = ctx->lo;
Index: lib/3rdparty/freetype/src/base/ftobjs.c
===================================================================
--- lib/3rdparty/freetype/src/base/ftobjs.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/ftobjs.c	(copie de travail)
@@ -56,9 +56,7 @@
 #endif /* _MSC_VER */
 
   /* it's easiest to include `md5.c' directly */
-#define free  md5_free /* suppress a shadow warning */
 #include "md5.c"
-#undef free
 
 #if defined( _MSC_VER )
 #pragma warning( pop )
@@ -667,11 +665,18 @@
 
         /* the check for `num_locations' assures that we actually    */
         /* test for instructions in a TTF and not in a CFF-based OTF */
+        /*                                                           */
+        /* since `maxSizeOfInstructions' might be unreliable, we     */
+        /* check the size of the `fpgm' and `prep' tables, too --    */
+        /* the assumption is that there don't exist real TTFs where  */
+        /* both `fpgm' and `prep' tables are missing                 */
         if ( mode == FT_RENDER_MODE_LIGHT                       ||
              face->internal->ignore_unpatented_hinter           ||
              ( FT_IS_SFNT( face )                             &&
                ttface->num_locations                          &&
-               ttface->max_profile.maxSizeOfInstructions == 0 ) )
+               ttface->max_profile.maxSizeOfInstructions == 0 &&
+               ttface->font_program_size == 0                 &&
+               ttface->cvt_program_size == 0                  ) )
           autohint = TRUE;
       }
     }
@@ -1133,7 +1138,8 @@
   /*                                                                       */
   static FT_Error
   open_face( FT_Driver      driver,
-             FT_Stream      stream,
+             FT_Stream      *astream,
+             FT_Bool        external_stream,
              FT_Long        face_index,
              FT_Int         num_params,
              FT_Parameter*  params,
@@ -1141,11 +1147,12 @@
   {
     FT_Memory         memory;
     FT_Driver_Class   clazz;
-    FT_Face           face = 0;
-    FT_Error          error, error2;
+    FT_Face           face     = NULL;
     FT_Face_Internal  internal = NULL;
 
+    FT_Error          error, error2;
 
+
     clazz  = driver->clazz;
     memory = driver->root.memory;
 
@@ -1155,8 +1162,12 @@
 
     face->driver = driver;
     face->memory = memory;
-    face->stream = stream;
+    face->stream = *astream;
 
+    /* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */
+    if ( external_stream )
+      face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
+
     if ( FT_NEW( internal ) )
       goto Fail;
 
@@ -1177,11 +1188,12 @@
 #endif
 
     if ( clazz->init_face )
-      error = clazz->init_face( stream,
+      error = clazz->init_face( *astream,
                                 face,
                                 (FT_Int)face_index,
                                 num_params,
                                 params );
+    *astream = face->stream; /* Stream may have been changed. */
     if ( error )
       goto Fail;
 
@@ -2069,7 +2081,7 @@
           params     = args->params;
         }
 
-        error = open_face( driver, stream, face_index,
+        error = open_face( driver, &stream, external_stream, face_index,
                            num_params, params, &face );
         if ( !error )
           goto Success;
@@ -2105,7 +2117,7 @@
             params     = args->params;
           }
 
-          error = open_face( driver, stream, face_index,
+          error = open_face( driver, &stream, external_stream, face_index,
                              num_params, params, &face );
           if ( !error )
             goto Success;
@@ -2174,10 +2186,6 @@
   Success:
     FT_TRACE4(( "FT_Open_Face: New face object, adding to list\n" ));
 
-    /* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */
-    if ( external_stream )
-      face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
-
     /* add the face object to its driver's list */
     if ( FT_NEW( node ) )
       goto Fail;
@@ -3380,8 +3388,10 @@
       FT_CMap    cmap = FT_CMAP( face->charmap );
 
 
-      do {
+      do
+      {
         gindex = cmap->clazz->char_next( cmap, &code );
+
       } while ( gindex >= (FT_UInt)face->num_glyphs );
 
       result = ( gindex == 0 ) ? 0 : code;
Index: lib/3rdparty/freetype/src/base/md5.h
===================================================================
--- lib/3rdparty/freetype/src/base/md5.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/base/md5.h	(copie de travail)
@@ -39,7 +39,7 @@
 } MD5_CTX;
 
 extern void MD5_Init(MD5_CTX *ctx);
-extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
+extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
 
 #endif
Index: lib/3rdparty/freetype/src/sfnt/ttsbit.h
===================================================================
--- lib/3rdparty/freetype/src/sfnt/ttsbit.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/ttsbit.h	(copie de travail)
@@ -28,11 +28,11 @@
 
 
   FT_LOCAL( FT_Error )
-  tt_face_load_eblc( TT_Face    face,
+  tt_face_load_sbit( TT_Face    face,
                      FT_Stream  stream );
 
   FT_LOCAL( void )
-  tt_face_free_eblc( TT_Face  face );
+  tt_face_free_sbit( TT_Face  face );
 
 
   FT_LOCAL( FT_Error )
Index: lib/3rdparty/freetype/src/sfnt/ttmtx.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/ttmtx.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/ttmtx.c	(copie de travail)
@@ -183,20 +183,23 @@
   /*    tt_face_get_metrics                                                */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Returns the horizontal or vertical metrics in font units for a     */
-  /*    given glyph.  The metrics are the left side bearing (resp. top     */
-  /*    side bearing) and advance width (resp. advance height).            */
+  /*    Return the horizontal or vertical metrics in font units for a      */
+  /*    given glyph.  The values are the left side bearing (top side       */
+  /*    bearing for vertical metrics) and advance width (advance height    */
+  /*    for vertical metrics).                                             */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    header  :: A pointer to either the horizontal or vertical metrics  */
-  /*               structure.                                              */
+  /*    face     :: A pointer to the TrueType face structure.              */
   /*                                                                       */
-  /*    idx     :: The glyph index.                                        */
+  /*    vertical :: If set to TRUE, get vertical metrics.                  */
   /*                                                                       */
+  /*    gindex   :: The glyph index.                                       */
+  /*                                                                       */
   /* <Output>                                                              */
-  /*    bearing :: The bearing, either left side or top side.              */
+  /*    abearing :: The bearing, either left side or top side.             */
   /*                                                                       */
-  /*    advance :: The advance width resp. advance height.                 */
+  /*    aadvance :: The advance width or advance height, depending on      */
+  /*                the `vertical' flag.                                   */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
   tt_face_get_metrics( TT_Face     face,
Index: lib/3rdparty/freetype/src/sfnt/sfdriver.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/sfdriver.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/sfdriver.c	(copie de travail)
@@ -499,8 +499,8 @@
     tt_face_load_hmtx,
 
     /* see `ttsbit.h' and `sfnt.h' */
-    PUT_EMBEDDED_BITMAPS( tt_face_load_eblc ),
-    PUT_EMBEDDED_BITMAPS( tt_face_free_eblc ),
+    PUT_EMBEDDED_BITMAPS( tt_face_load_sbit ),
+    PUT_EMBEDDED_BITMAPS( tt_face_free_sbit ),
 
     PUT_EMBEDDED_BITMAPS( tt_face_set_sbit_strike     ),
     PUT_EMBEDDED_BITMAPS( tt_face_load_strike_metrics ),
Index: lib/3rdparty/freetype/src/sfnt/sfobjs.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/sfobjs.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/sfobjs.c	(copie de travail)
@@ -27,6 +27,7 @@
 #include FT_TRUETYPE_TAGS_H
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
 #include FT_SFNT_NAMES_H
+#include FT_GZIP_H
 #include "sferrors.h"
 
 #ifdef TT_CONFIG_OPTION_BDF
@@ -347,6 +348,380 @@
   }
 
 
+#define WRITE_BYTE( p, v )     \
+          do                   \
+          {                    \
+            *(p)++ = (v) >> 0; \
+                               \
+          } while ( 0 )
+
+#define WRITE_USHORT( p, v )   \
+          do                   \
+          {                    \
+            *(p)++ = (v) >> 8; \
+            *(p)++ = (v) >> 0; \
+                               \
+          } while ( 0 )
+
+#define WRITE_ULONG( p, v )     \
+          do                    \
+          {                     \
+            *(p)++ = (v) >> 24; \
+            *(p)++ = (v) >> 16; \
+            *(p)++ = (v) >>  8; \
+            *(p)++ = (v) >>  0; \
+                                \
+          } while ( 0 )
+
+
+  static void
+  sfnt_stream_close( FT_Stream  stream )
+  {
+    FT_Memory  memory = stream->memory;
+
+
+    FT_FREE( stream->base );
+
+    stream->size  = 0;
+    stream->base  = 0;
+    stream->close = 0;
+  }
+
+
+  FT_CALLBACK_DEF( int )
+  compare_offsets( const void*  a,
+                   const void*  b )
+  {
+    WOFF_Table  table1 = *(WOFF_Table*)a;
+    WOFF_Table  table2 = *(WOFF_Table*)b;
+
+    FT_ULong  offset1 = table1->Offset;
+    FT_ULong  offset2 = table2->Offset;
+
+
+    if ( offset1 > offset2 )
+      return 1;
+    else if ( offset1 < offset2 )
+      return -1;
+    else
+      return 0;
+  }
+
+
+  /* Replace `face->root.stream' with a stream containing the extracted */
+  /* SFNT of a WOFF font.                                               */
+
+  static FT_Error
+  woff_open_font( FT_Stream  stream,
+                  TT_Face    face )
+  {
+    FT_Memory       memory = stream->memory;
+    FT_Error        error  = FT_Err_Ok;
+
+    WOFF_HeaderRec  woff;
+    WOFF_Table      tables  = NULL;
+    WOFF_Table*     indices = NULL;
+
+    FT_ULong        woff_offset;
+
+    FT_Byte*        sfnt        = NULL;
+    FT_Stream       sfnt_stream = NULL;
+
+    FT_Byte*        sfnt_header;
+    FT_ULong        sfnt_offset;
+
+    FT_Int          nn;
+    FT_ULong        old_tag = 0;
+
+    static const FT_Frame_Field  woff_header_fields[] =
+    {
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  WOFF_HeaderRec
+
+      FT_FRAME_START( 44 ),
+        FT_FRAME_ULONG ( signature ),
+        FT_FRAME_ULONG ( flavor ),
+        FT_FRAME_ULONG ( length ),
+        FT_FRAME_USHORT( num_tables ),
+        FT_FRAME_USHORT( reserved ),
+        FT_FRAME_ULONG ( totalSfntSize ),
+        FT_FRAME_USHORT( majorVersion ),
+        FT_FRAME_USHORT( minorVersion ),
+        FT_FRAME_ULONG ( metaOffset ),
+        FT_FRAME_ULONG ( metaLength ),
+        FT_FRAME_ULONG ( metaOrigLength ),
+        FT_FRAME_ULONG ( privOffset ),
+        FT_FRAME_ULONG ( privLength ),
+      FT_FRAME_END
+    };
+
+
+    FT_ASSERT( stream == face->root.stream );
+    FT_ASSERT( FT_STREAM_POS() == 0 );
+
+    if ( FT_STREAM_READ_FIELDS( woff_header_fields, &woff ) )
+      return error;
+
+    /* Make sure we don't recurse back here or hit TTC code. */
+    if ( woff.flavor == TTAG_wOFF || woff.flavor == TTAG_ttcf )
+      return FT_THROW( Invalid_Table );
+
+    /* Miscellaneous checks. */
+    if ( woff.length != stream->size                              ||
+         woff.num_tables == 0                                     ||
+         44 + woff.num_tables * 20UL >= woff.length               ||
+         12 + woff.num_tables * 16UL >= woff.totalSfntSize        ||
+         ( woff.totalSfntSize & 3 ) != 0                          ||
+         ( woff.metaOffset == 0 && ( woff.metaLength != 0     ||
+                                     woff.metaOrigLength != 0 ) ) ||
+         ( woff.metaLength != 0 && woff.metaOrigLength == 0 )     ||
+         ( woff.privOffset == 0 && woff.privLength != 0 )         )
+      return FT_THROW( Invalid_Table );
+
+    if ( FT_ALLOC( sfnt, woff.totalSfntSize ) ||
+         FT_NEW( sfnt_stream )                )
+      goto Exit;
+
+    sfnt_header = sfnt;
+
+    /* Write sfnt header. */
+    {
+      FT_UInt  searchRange, entrySelector, rangeShift, x;
+
+
+      x             = woff.num_tables;
+      entrySelector = 0;
+      while ( x )
+      {
+        x            >>= 1;
+        entrySelector += 1;
+      }
+      entrySelector--;
+
+      searchRange = ( 1 << entrySelector ) * 16;
+      rangeShift  = woff.num_tables * 16 - searchRange;
+
+      WRITE_ULONG ( sfnt_header, woff.flavor );
+      WRITE_USHORT( sfnt_header, woff.num_tables );
+      WRITE_USHORT( sfnt_header, searchRange );
+      WRITE_USHORT( sfnt_header, entrySelector );
+      WRITE_USHORT( sfnt_header, rangeShift );
+    }
+
+    /* While the entries in the sfnt header must be sorted by the */
+    /* tag value, the tables themselves are not.  We thus have to */
+    /* sort them by offset and check that they don't overlap.     */
+
+    if ( FT_NEW_ARRAY( tables, woff.num_tables )  ||
+         FT_NEW_ARRAY( indices, woff.num_tables ) )
+      goto Exit;
+
+    FT_TRACE2(( "\n"
+                "  tag    offset    compLen  origLen  checksum\n"
+                "  -------------------------------------------\n" ));
+
+    if ( FT_FRAME_ENTER( 20L * woff.num_tables ) )
+      goto Exit;
+
+    for ( nn = 0; nn < woff.num_tables; nn++ )
+    {
+      WOFF_Table  table = tables + nn;
+
+      table->Tag        = FT_GET_TAG4();
+      table->Offset     = FT_GET_ULONG();
+      table->CompLength = FT_GET_ULONG();
+      table->OrigLength = FT_GET_ULONG();
+      table->CheckSum   = FT_GET_ULONG();
+
+      FT_TRACE2(( "  %c%c%c%c  %08lx  %08lx  %08lx  %08lx\n",
+                  (FT_Char)( table->Tag >> 24 ),
+                  (FT_Char)( table->Tag >> 16 ),
+                  (FT_Char)( table->Tag >> 8  ),
+                  (FT_Char)( table->Tag       ),
+                  table->Offset,
+                  table->CompLength,
+                  table->OrigLength,
+                  table->CheckSum ));
+
+      if ( table->Tag <= old_tag )
+      {
+        FT_FRAME_EXIT();
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      old_tag     = table->Tag;
+      indices[nn] = table;
+    }
+
+    FT_FRAME_EXIT();
+
+    /* Sort by offset. */
+
+    ft_qsort( indices,
+              woff.num_tables,
+              sizeof ( WOFF_Table ),
+              compare_offsets );
+
+    /* Check offsets and lengths. */
+
+    woff_offset = 44 + woff.num_tables * 20L;
+    sfnt_offset = 12 + woff.num_tables * 16L;
+
+    for ( nn = 0; nn < woff.num_tables; nn++ )
+    {
+      WOFF_Table  table = indices[nn];
+
+
+      if ( table->Offset != woff_offset                         ||
+           table->Offset + table->CompLength > woff.length      ||
+           sfnt_offset + table->OrigLength > woff.totalSfntSize ||
+           table->CompLength > table->OrigLength                )
+      {
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      table->OrigOffset = sfnt_offset;
+
+      /* The offsets must be multiples of 4. */
+      woff_offset += ( table->CompLength + 3 ) & ~3;
+      sfnt_offset += ( table->OrigLength + 3 ) & ~3;
+    }
+
+    /*
+     * Final checks!
+     *
+     * We don't decode and check the metadata block.
+     * We don't check table checksums either.
+     * But other than those, I think we implement all
+     * `MUST' checks from the spec.
+     */
+
+    if ( woff.metaOffset )
+    {
+      if ( woff.metaOffset != woff_offset                  ||
+           woff.metaOffset + woff.metaLength > woff.length )
+      {
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      /* We have padding only ... */
+      woff_offset += woff.metaLength;
+    }
+
+    if ( woff.privOffset )
+    {
+      /* ... if it isn't the last block. */
+      woff_offset = ( woff_offset + 3 ) & ~3;
+
+      if ( woff.privOffset != woff_offset                  ||
+           woff.privOffset + woff.privLength > woff.length )
+      {
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      /* No padding for the last block. */
+      woff_offset += woff.privLength;
+    }
+
+    if ( sfnt_offset != woff.totalSfntSize ||
+         woff_offset != woff.length        )
+    {
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+
+    /* Write the tables. */
+
+    for ( nn = 0; nn < woff.num_tables; nn++ )
+    {
+      WOFF_Table  table = tables + nn;
+
+
+      /* Write SFNT table entry. */
+      WRITE_ULONG( sfnt_header, table->Tag );
+      WRITE_ULONG( sfnt_header, table->CheckSum );
+      WRITE_ULONG( sfnt_header, table->OrigOffset );
+      WRITE_ULONG( sfnt_header, table->OrigLength );
+
+      /* Write table data. */
+      if ( FT_STREAM_SEEK( table->Offset )     ||
+           FT_FRAME_ENTER( table->CompLength ) )
+        goto Exit;
+
+      if ( table->CompLength == table->OrigLength )
+      {
+        /* Uncompressed data; just copy. */
+        ft_memcpy( sfnt + table->OrigOffset,
+                   stream->cursor,
+                   table->OrigLength );
+      }
+      else
+      {
+        /* Uncompress with zlib. */
+        FT_ULong  output_len = table->OrigLength;
+
+
+        error = FT_Gzip_Uncompress( memory,
+                                    sfnt + table->OrigOffset, &output_len,
+                                    stream->cursor, table->CompLength );
+        if ( error )
+          goto Exit;
+        if ( output_len != table->OrigLength )
+        {
+          error = FT_THROW( Invalid_Table );
+          goto Exit;
+        }
+      }
+
+      FT_FRAME_EXIT();
+
+      /* We don't check whether the padding bytes in the WOFF file are     */
+      /* actually '\0'.  For the output, however, we do set them properly. */
+      sfnt_offset = table->OrigOffset + table->OrigLength;
+      while ( sfnt_offset & 3 )
+      {
+        sfnt[sfnt_offset] = '\0';
+        sfnt_offset++;
+      }
+    }
+
+    /* Ok!  Finally ready.  Swap out stream and return. */
+    FT_Stream_OpenMemory( sfnt_stream, sfnt, woff.totalSfntSize );
+    sfnt_stream->memory = stream->memory;
+    sfnt_stream->close  = sfnt_stream_close;
+
+    FT_Stream_Free(
+      face->root.stream,
+      ( face->root.face_flags & FT_FACE_FLAG_EXTERNAL_STREAM ) != 0 );
+
+    face->root.stream = sfnt_stream;
+
+    face->root.face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM;
+
+  Exit:
+    FT_FREE( tables );
+    FT_FREE( indices );
+
+    if ( error )
+    {
+      FT_FREE( sfnt );
+      FT_Stream_Close( sfnt_stream );
+      FT_FREE( sfnt_stream );
+    }
+
+    return error;
+  }
+
+
+#undef WRITE_BYTE
+#undef WRITE_USHORT
+#undef WRITE_ULONG
+
+
   /* Fill in face->ttc_header.  If the font is not a TTC, it is */
   /* synthesized into a TTC with one offset table.              */
   static FT_Error
@@ -373,11 +748,28 @@
     face->ttc_header.version = 0;
     face->ttc_header.count   = 0;
 
+  retry:
     offset = FT_STREAM_POS();
 
     if ( FT_READ_ULONG( tag ) )
       return error;
 
+    if ( tag == TTAG_wOFF )
+    {
+      FT_TRACE2(( "sfnt_open_font: file is a WOFF; synthesizing SFNT\n" ));
+
+      if ( FT_STREAM_SEEK( offset ) )
+        return error;
+
+      error = woff_open_font( stream, face );
+      if ( error )
+        return error;
+
+      /* Swap out stream and retry! */
+      stream = face->root.stream;
+      goto retry;
+    }
+
     if ( tag != 0x00010000UL &&
          tag != TTAG_ttcf    &&
          tag != TTAG_OTTO    &&
@@ -480,6 +872,9 @@
     if ( error )
       return error;
 
+    /* Stream may have changed in sfnt_open_font. */
+    stream = face->root.stream;
+
     FT_TRACE2(( "sfnt_init_face: %08p, %ld\n", face, face_index ));
 
     if ( face_index < 0 )
@@ -504,7 +899,8 @@
 
 
 #define LOAD_( x )                                          \
-  do {                                                      \
+  do                                                        \
+  {                                                         \
     FT_TRACE2(( "`" #x "' " ));                             \
     FT_TRACE3(( "-->\n" ));                                 \
                                                             \
@@ -519,7 +915,8 @@
   } while ( 0 )
 
 #define LOADM_( x, vertical )                               \
-  do {                                                      \
+  do                                                        \
+  {                                                         \
     FT_TRACE2(( "`%s" #x "' ",                              \
                 vertical ? "vertical " : "" ));             \
     FT_TRACE3(( "-->\n" ));                                 \
@@ -535,7 +932,8 @@
   } while ( 0 )
 
 #define GET_NAME( id, field )                                   \
-  do {                                                          \
+  do                                                            \
+  {                                                             \
     error = tt_face_get_name( face, TT_NAME_ID_ ## id, field ); \
     if ( error )                                                \
       goto Exit;                                                \
@@ -555,6 +953,7 @@
 #endif
     FT_Bool       has_outline;
     FT_Bool       is_apple_sbit;
+    FT_Bool       is_apple_sbix;
     FT_Bool       ignore_preferred_family    = FALSE;
     FT_Bool       ignore_preferred_subfamily = FALSE;
 
@@ -608,7 +1007,15 @@
 #endif
 
     is_apple_sbit = 0;
+    is_apple_sbix = !face->goto_table( face, TTAG_sbix, stream, 0 );
 
+    /* Apple 'sbix' color bitmaps are rendered scaled and then the 'glyf'
+     * outline rendered on top.  We don't support that yet, so just ignore
+     * the 'glyf' outline and advertise it as a bitmap-only font. */
+    if ( is_apple_sbix )
+      has_outline = FALSE;
+
+
     /* if this font doesn't contain outlines, we try to load */
     /* a `bhed' table                                        */
     if ( !has_outline && sfnt->load_bhed )
@@ -619,7 +1026,7 @@
 
     /* load the font header (`head' table) if this isn't an Apple */
     /* sbit font file                                             */
-    if ( !is_apple_sbit )
+    if ( !is_apple_sbit || is_apple_sbix )
     {
       LOAD_( head );
       if ( error )
@@ -803,6 +1210,10 @@
       /*                                                                   */
       /* Compute face flags.                                               */
       /*                                                                   */
+      if ( face->sbit_table_type == TT_SBIT_TABLE_TYPE_CBLC ||
+           face->sbit_table_type == TT_SBIT_TABLE_TYPE_SBIX )
+        flags |= FT_FACE_FLAG_COLOR;      /* color glyphs */
+
       if ( has_outline == TRUE )
         flags |= FT_FACE_FLAG_SCALABLE;   /* scalable outlines */
 
@@ -931,7 +1342,7 @@
 
           if ( em_size == 0 || face->os2.version == 0xFFFFU )
           {
-            avgwidth = 0;
+            avgwidth = 1;
             em_size = 1;
           }
 
Index: lib/3rdparty/freetype/src/sfnt/ttload.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/ttload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/ttload.c	(copie de travail)
@@ -236,7 +236,8 @@
          */
         if ( table.Length < 0x36 )
         {
-          FT_TRACE2(( "check_table_dir: `head' table too small\n" ));
+          FT_TRACE2(( "check_table_dir:"
+                      " `head' or `bhed' table too small\n" ));
           error = FT_THROW( Table_Missing );
           goto Exit;
         }
@@ -246,12 +247,8 @@
           goto Exit;
 
         if ( magic != 0x5F0F3CF5UL )
-        {
           FT_TRACE2(( "check_table_dir:"
-                      " no magic number found in `head' table\n"));
-          error = FT_THROW( Table_Missing );
-          goto Exit;
-        }
+                      " invalid magic number in `head' or `bhed' table\n"));
 
         if ( FT_STREAM_SEEK( offset + ( nn + 1 ) * 16 ) )
           goto Exit;
@@ -394,8 +391,8 @@
     {
       entry->Tag      = FT_GET_TAG4();
       entry->CheckSum = FT_GET_ULONG();
-      entry->Offset   = FT_GET_LONG();
-      entry->Length   = FT_GET_LONG();
+      entry->Offset   = FT_GET_ULONG();
+      entry->Length   = FT_GET_ULONG();
 
       /* ignore invalid tables */
       if ( entry->Offset + entry->Length > stream->size )
@@ -1006,7 +1003,8 @@
       FT_FRAME_END
     };
 
-    static const FT_Frame_Field  os2_fields_extra[] =
+    /* `OS/2' version 1 and newer */
+    static const FT_Frame_Field  os2_fields_extra1[] =
     {
       FT_FRAME_START( 8 ),
         FT_FRAME_ULONG( ulCodePageRange1 ),
@@ -1014,6 +1012,7 @@
       FT_FRAME_END
     };
 
+    /* `OS/2' version 2 and newer */
     static const FT_Frame_Field  os2_fields_extra2[] =
     {
       FT_FRAME_START( 10 ),
@@ -1025,7 +1024,16 @@
       FT_FRAME_END
     };
 
+    /* `OS/2' version 5 and newer */
+    static const FT_Frame_Field  os2_fields_extra5[] =
+    {
+      FT_FRAME_START( 4 ),
+        FT_FRAME_USHORT( usLowerOpticalPointSize ),
+        FT_FRAME_USHORT( usUpperOpticalPointSize ),
+      FT_FRAME_END
+    };
 
+
     /* We now support old Mac fonts where the OS/2 table doesn't  */
     /* exist.  Simply put, we set the `version' field to 0xFFFF   */
     /* and test this value each time we need to access the table. */
@@ -1038,18 +1046,20 @@
     if ( FT_STREAM_READ_FIELDS( os2_fields, os2 ) )
       goto Exit;
 
-    os2->ulCodePageRange1 = 0;
-    os2->ulCodePageRange2 = 0;
-    os2->sxHeight         = 0;
-    os2->sCapHeight       = 0;
-    os2->usDefaultChar    = 0;
-    os2->usBreakChar      = 0;
-    os2->usMaxContext     = 0;
+    os2->ulCodePageRange1        = 0;
+    os2->ulCodePageRange2        = 0;
+    os2->sxHeight                = 0;
+    os2->sCapHeight              = 0;
+    os2->usDefaultChar           = 0;
+    os2->usBreakChar             = 0;
+    os2->usMaxContext            = 0;
+    os2->usLowerOpticalPointSize = 0;
+    os2->usUpperOpticalPointSize = 0xFFFF;
 
     if ( os2->version >= 0x0001 )
     {
       /* only version 1 tables */
-      if ( FT_STREAM_READ_FIELDS( os2_fields_extra, os2 ) )
+      if ( FT_STREAM_READ_FIELDS( os2_fields_extra1, os2 ) )
         goto Exit;
 
       if ( os2->version >= 0x0002 )
@@ -1057,6 +1067,13 @@
         /* only version 2 tables */
         if ( FT_STREAM_READ_FIELDS( os2_fields_extra2, os2 ) )
           goto Exit;
+
+        if ( os2->version >= 0x0005 )
+        {
+          /* only version 5 tables */
+          if ( FT_STREAM_READ_FIELDS( os2_fields_extra5, os2 ) )
+            goto Exit;
+        }
       }
     }
 
@@ -1164,6 +1181,7 @@
         FT_FRAME_USHORT( Style ),
         FT_FRAME_USHORT( TypeFamily ),
         FT_FRAME_USHORT( CapHeight ),
+        FT_FRAME_USHORT( SymbolSet ),
         FT_FRAME_BYTES ( TypeFace, 16 ),
         FT_FRAME_BYTES ( CharacterComplement, 8 ),
         FT_FRAME_BYTES ( FileName, 6 ),
Index: lib/3rdparty/freetype/src/sfnt/ttcmap.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/ttcmap.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/ttcmap.c	(copie de travail)
@@ -320,9 +320,8 @@
     /* parse sub-headers */
     for ( n = 0; n <= max_subs; n++ )
     {
-      FT_UInt   first_code, code_count, offset;
-      FT_Int    delta;
-      FT_Byte*  ids;
+      FT_UInt  first_code, code_count, offset;
+      FT_Int   delta;
 
 
       first_code = TT_NEXT_USHORT( p );
@@ -344,6 +343,9 @@
       /* check offset */
       if ( offset != 0 )
       {
+        FT_Byte*  ids;
+
+
         ids = p - 2 + offset;
         if ( ids < glyph_ids || ids + code_count*2 > table + length )
           FT_INVALID_OFFSET;
@@ -3208,7 +3210,6 @@
   {
     FT_Byte    *p  = tt_cmap14_find_variant( cmap->data + 6,
                                              variantSelector );
-    FT_UInt32  *ret;
     FT_Int      i;
     FT_ULong    defOff;
     FT_ULong    nondefOff;
@@ -3242,7 +3243,9 @@
       FT_Byte*   dp;
       FT_UInt    di, ni, k;
 
+      FT_UInt32  *ret;
 
+
       p  = cmap->data + nondefOff;
       dp = cmap->data + defOff;
 
Index: lib/3rdparty/freetype/src/sfnt/pngshim.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/pngshim.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/pngshim.c	(copie de travail)
@@ -122,7 +122,7 @@
   error_callback( png_structp      png,
                   png_const_charp  error_msg )
   {
-    FT_Error*  error = png_get_error_ptr( png );
+    FT_Error*  error = (FT_Error*)png_get_error_ptr( png );
 
     FT_UNUSED( error_msg );
 
@@ -159,7 +159,7 @@
 
     if ( FT_FRAME_ENTER( length ) )
     {
-      FT_Error*  e = png_get_error_ptr( png );
+      FT_Error*  e = (FT_Error*)png_get_error_ptr( png );
 
 
       *e = FT_THROW( Invalid_Stream_Read );
@@ -174,8 +174,8 @@
   }
 
 
-  static FT_Error
-  Load_SBit_Png( FT_Bitmap*       map,
+  FT_LOCAL_DEF( FT_Error )
+  Load_SBit_Png( FT_GlyphSlot     slot,
                  FT_Int           x_offset,
                  FT_Int           y_offset,
                  FT_Int           pix_bits,
@@ -182,8 +182,10 @@
                  TT_SBit_Metrics  metrics,
                  FT_Memory        memory,
                  FT_Byte*         data,
-                 FT_UInt          png_len )
+                 FT_UInt          png_len,
+                 FT_Bool          populate_map_and_metrics )
   {
+    FT_Bitmap    *map   = &slot->bitmap;
     FT_Error      error = FT_Err_Ok;
     FT_StreamRec  stream;
 
@@ -193,17 +195,26 @@
 
     int         bitdepth, color_type, interlace;
     FT_Int      i;
-    png_byte*  *rows;
+    png_byte*  *rows = NULL; /* pacify compiler */
 
 
-    if ( x_offset < 0 || x_offset + metrics->width  > map->width ||
-         y_offset < 0 || y_offset + metrics->height > map->rows  ||
-         pix_bits != 32 || map->pixel_mode != FT_PIXEL_MODE_BGRA )
+    if ( x_offset < 0 ||
+         y_offset < 0 )
     {
       error = FT_THROW( Invalid_Argument );
       goto Exit;
     }
 
+    if ( !populate_map_and_metrics                   &&
+         ( x_offset + metrics->width  > map->width ||
+           y_offset + metrics->height > map->rows  ||
+           pix_bits != 32                          ||
+           map->pixel_mode != FT_PIXEL_MODE_BGRA   ) )
+    {
+      error = FT_THROW( Invalid_Argument );
+      goto Exit;
+    }
+
     FT_Stream_OpenMemory( &stream, data, png_len );
 
     png = png_create_read_struct( PNG_LIBPNG_VER_STRING,
@@ -238,11 +249,33 @@
                   &bitdepth, &color_type, &interlace,
                   NULL, NULL );
 
-    if ( error != FT_Err_Ok                   ||
-         (FT_Int)imgWidth  != metrics->width  ||
-         (FT_Int)imgHeight != metrics->height )
+    if ( error                                        ||
+         ( !populate_map_and_metrics                &&
+           ( (FT_Int)imgWidth  != metrics->width  ||
+             (FT_Int)imgHeight != metrics->height ) ) )
       goto DestroyExit;
 
+    if ( populate_map_and_metrics )
+    {
+      FT_Long  size;
+
+
+      metrics->width  = (FT_Int)imgWidth;
+      metrics->height = (FT_Int)imgHeight;
+
+      map->width      = metrics->width;
+      map->rows       = metrics->height;
+      map->pixel_mode = FT_PIXEL_MODE_BGRA;
+      map->pitch      = map->width * 4;
+      map->num_grays  = 256;
+
+      size = map->rows * map->pitch;
+
+      error = ft_glyphslot_alloc_bitmap( slot, size );
+      if ( error )
+        goto DestroyExit;
+    }
+
     /* convert palette/gray image to rgb */
     if ( color_type == PNG_COLOR_TYPE_PALETTE )
       png_set_palette_to_rgb( png );
Index: lib/3rdparty/freetype/src/sfnt/ttkern.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/ttkern.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/ttkern.c	(copie de travail)
@@ -5,7 +5,7 @@
 /*    Load the basic TrueType kerning table.  This doesn't handle          */
 /*    kerning data within the GPOS table at the moment.                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */
+/*  Copyright 1996-2007, 2009, 2010, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -183,7 +183,7 @@
                        FT_UInt  right_glyph )
   {
     FT_Int    result = 0;
-    FT_UInt   count, mask = 1;
+    FT_UInt   count, mask;
     FT_Byte*  p       = face->kern_table;
     FT_Byte*  p_limit = p + face->kern_table_size;
 
@@ -196,7 +196,7 @@
           count--, mask <<= 1 )
     {
       FT_Byte* base     = p;
-      FT_Byte* next     = base;
+      FT_Byte* next;
       FT_UInt  version  = FT_NEXT_USHORT( p );
       FT_UInt  length   = FT_NEXT_USHORT( p );
       FT_UInt  coverage = FT_NEXT_USHORT( p );
Index: lib/3rdparty/freetype/src/sfnt/ttsbit.c
===================================================================
--- lib/3rdparty/freetype/src/sfnt/ttsbit.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/ttsbit.c	(copie de travail)
@@ -28,6 +28,7 @@
 
 #include "sferrors.h"
 
+#include "ttmtx.h"
 #include "pngshim.h"
 
 
@@ -42,25 +43,36 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  tt_face_load_eblc( TT_Face    face,
+  tt_face_load_sbit( TT_Face    face,
                      FT_Stream  stream )
   {
-    FT_Error  error = FT_Err_Ok;
-    FT_Fixed  version;
-    FT_ULong  num_strikes, table_size;
-    FT_Byte*  p;
-    FT_Byte*  p_limit;
-    FT_UInt   count;
+    FT_Error  error;
+    FT_ULong  table_size;
 
 
+    face->sbit_table       = NULL;
+    face->sbit_table_size  = 0;
+    face->sbit_table_type  = TT_SBIT_TABLE_TYPE_NONE;
     face->sbit_num_strikes = 0;
 
-    /* this table is optional */
     error = face->goto_table( face, TTAG_CBLC, stream, &table_size );
-    if ( error )
+    if ( !error )
+      face->sbit_table_type = TT_SBIT_TABLE_TYPE_CBLC;
+    else
+    {
       error = face->goto_table( face, TTAG_EBLC, stream, &table_size );
+      if ( error )
+        error = face->goto_table( face, TTAG_bloc, stream, &table_size );
+      if ( !error )
+        face->sbit_table_type = TT_SBIT_TABLE_TYPE_EBLC;
+    }
+
     if ( error )
-      error = face->goto_table( face, TTAG_bloc, stream, &table_size );
+    {
+      error = face->goto_table( face, TTAG_sbix, stream, &table_size );
+      if ( !error )
+        face->sbit_table_type = TT_SBIT_TABLE_TYPE_SBIX;
+    }
     if ( error )
       goto Exit;
 
@@ -71,47 +83,123 @@
       goto Exit;
     }
 
-    if ( FT_FRAME_EXTRACT( table_size, face->sbit_table ) )
-      goto Exit;
+    switch ( (FT_UInt)face->sbit_table_type )
+    {
+    case TT_SBIT_TABLE_TYPE_EBLC:
+    case TT_SBIT_TABLE_TYPE_CBLC:
+      {
+        FT_Byte*  p;
+        FT_Fixed  version;
+        FT_ULong  num_strikes;
+        FT_UInt   count;
 
-    face->sbit_table_size = table_size;
 
-    p       = face->sbit_table;
-    p_limit = p + table_size;
+        if ( FT_FRAME_EXTRACT( table_size, face->sbit_table ) )
+          goto Exit;
 
-    version     = FT_NEXT_ULONG( p );
-    num_strikes = FT_NEXT_ULONG( p );
+        face->sbit_table_size = table_size;
 
-    if ( version != 0x00020000UL || num_strikes >= 0x10000UL )
-    {
-      FT_ERROR(( "tt_face_load_sbit_strikes: invalid table version\n" ));
-      error = FT_THROW( Invalid_File_Format );
-      goto Fail;
+        p = face->sbit_table;
+
+        version     = FT_NEXT_ULONG( p );
+        num_strikes = FT_NEXT_ULONG( p );
+
+        if ( ( version & 0xFFFF0000UL ) != 0x00020000UL )
+        {
+          error = FT_THROW( Unknown_File_Format );
+          goto Exit;
+        }
+
+        if ( num_strikes >= 0x10000UL )
+        {
+          error = FT_THROW( Invalid_File_Format );
+          goto Exit;
+        }
+
+        /*
+         *  Count the number of strikes available in the table.  We are a bit
+         *  paranoid there and don't trust the data.
+         */
+        count = (FT_UInt)num_strikes;
+        if ( 8 + 48UL * count > table_size )
+          count = (FT_UInt)( ( table_size - 8 ) / 48 );
+
+        face->sbit_num_strikes = count;
+      }
+      break;
+
+    case TT_SBIT_TABLE_TYPE_SBIX:
+      {
+        FT_UShort  version;
+        FT_UShort  flags;
+        FT_ULong   num_strikes;
+        FT_UInt    count;
+
+
+        if ( FT_FRAME_ENTER( 8 ) )
+          goto Exit;
+
+        version     = FT_GET_USHORT();
+        flags       = FT_GET_USHORT();
+        num_strikes = FT_GET_ULONG();
+
+        FT_FRAME_EXIT();
+
+        if ( version < 1 )
+        {
+          error = FT_THROW( Unknown_File_Format );
+          goto Exit;
+        }
+        if ( flags != 0x0001 || num_strikes >= 0x10000UL )
+        {
+          error = FT_THROW( Invalid_File_Format );
+          goto Exit;
+        }
+
+        /*
+         *  Count the number of strikes available in the table.  We are a bit
+         *  paranoid there and don't trust the data.
+         */
+        count = (FT_UInt)num_strikes;
+        if ( 8 + 4UL * count > table_size )
+          count = (FT_UInt)( ( table_size - 8 ) / 4 );
+
+        if ( FT_STREAM_SEEK( FT_STREAM_POS() - 8 ) )
+          goto Exit;
+
+        face->sbit_table_size = 8 + count * 4;
+        if ( FT_FRAME_EXTRACT( face->sbit_table_size, face->sbit_table ) )
+          goto Exit;
+
+        face->sbit_num_strikes = count;
+      }
+      break;
+
+    default:
+      error = FT_THROW( Unknown_File_Format );
+      break;
     }
 
-    /*
-     *  Count the number of strikes available in the table.  We are a bit
-     *  paranoid there and don't trust the data.
-     */
-    count = (FT_UInt)num_strikes;
-    if ( 8 + 48UL * count > table_size )
-      count = (FT_UInt)( ( p_limit - p ) / 48 );
+    if ( !error )
+      FT_TRACE3(( "sbit_num_strikes: %u\n", face->sbit_num_strikes ));
 
-    face->sbit_num_strikes = count;
+    return FT_Err_Ok;
 
-    FT_TRACE3(( "sbit_num_strikes: %u\n", count ));
   Exit:
+    if ( error )
+    {
+      if ( face->sbit_table )
+        FT_FRAME_RELEASE( face->sbit_table );
+      face->sbit_table_size = 0;
+      face->sbit_table_type = TT_SBIT_TABLE_TYPE_NONE;
+    }
+
     return error;
-
-  Fail:
-    FT_FRAME_RELEASE( face->sbit_table );
-    face->sbit_table_size = 0;
-    goto Exit;
   }
 
 
   FT_LOCAL_DEF( void )
-  tt_face_free_eblc( TT_Face  face )
+  tt_face_free_sbit( TT_Face  face )
   {
     FT_Stream  stream = face->root.stream;
 
@@ -118,6 +206,7 @@
 
     FT_FRAME_RELEASE( face->sbit_table );
     face->sbit_table_size  = 0;
+    face->sbit_table_type  = TT_SBIT_TABLE_TYPE_NONE;
     face->sbit_num_strikes = 0;
   }
 
@@ -136,28 +225,85 @@
                                FT_ULong          strike_index,
                                FT_Size_Metrics*  metrics )
   {
-    FT_Byte*  strike;
-
-
     if ( strike_index >= (FT_ULong)face->sbit_num_strikes )
       return FT_THROW( Invalid_Argument );
 
-    strike = face->sbit_table + 8 + strike_index * 48;
+    switch ( (FT_UInt)face->sbit_table_type )
+    {
+    case TT_SBIT_TABLE_TYPE_EBLC:
+    case TT_SBIT_TABLE_TYPE_CBLC:
+      {
+        FT_Byte*  strike;
 
-    metrics->x_ppem = (FT_UShort)strike[44];
-    metrics->y_ppem = (FT_UShort)strike[45];
 
-    metrics->ascender  = (FT_Char)strike[16] << 6;  /* hori.ascender  */
-    metrics->descender = (FT_Char)strike[17] << 6;  /* hori.descender */
-    metrics->height    = metrics->ascender - metrics->descender;
+        strike = face->sbit_table + 8 + strike_index * 48;
 
-    /* XXX: Is this correct? */
-    metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB  */
-                                      strike[18] + /* max_width      */
-                             (FT_Char)strike[23]   /* min_advance_SB */
-                                                 ) << 6;
+        metrics->x_ppem = (FT_UShort)strike[44];
+        metrics->y_ppem = (FT_UShort)strike[45];
 
-    return FT_Err_Ok;
+        metrics->ascender  = (FT_Char)strike[16] << 6;  /* hori.ascender  */
+        metrics->descender = (FT_Char)strike[17] << 6;  /* hori.descender */
+        metrics->height    = metrics->ascender - metrics->descender;
+
+        /* Is this correct? */
+        metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB  */
+                                          strike[18] + /* max_width      */
+                                 (FT_Char)strike[23]   /* min_advance_SB */
+                                                     ) << 6;
+        return FT_Err_Ok;
+      }
+
+    case TT_SBIT_TABLE_TYPE_SBIX:
+      {
+        FT_Stream       stream = face->root.stream;
+        FT_UInt         offset, ppem, resolution, upem;
+        TT_HoriHeader  *hori;
+        FT_ULong        table_size;
+
+        FT_Error  error;
+        FT_Byte*  p;
+
+
+        p      = face->sbit_table + 8 + 4 * strike_index;
+        offset = FT_NEXT_ULONG( p );
+
+        error = face->goto_table( face, TTAG_sbix, stream, &table_size );
+        if ( error )
+          return error;
+
+        if ( offset + 4  > table_size )
+          return FT_THROW( Invalid_File_Format );
+
+        if ( FT_STREAM_SEEK( FT_STREAM_POS() + offset ) ||
+             FT_FRAME_ENTER( 4 )                        )
+          return error;
+
+        ppem       = FT_GET_USHORT();
+        resolution = FT_GET_USHORT();
+
+        FT_UNUSED( resolution ); /* What to do with this? */
+
+        FT_FRAME_EXIT();
+
+        upem = face->header.Units_Per_EM;
+        hori = &face->horizontal;
+
+        metrics->x_ppem = ppem;
+        metrics->y_ppem = ppem;
+
+        metrics->ascender    = ppem * hori->Ascender * 64 / upem;
+        metrics->descender   = ppem * hori->Descender * 64 / upem;
+        metrics->height      = ppem * ( hori->Ascender -
+                                        hori->Descender +
+                                        hori->Line_Gap ) * 64 / upem;
+        metrics->max_advance = ppem * hori->advance_Width_Max * 64 / upem;
+
+        return error;
+      }
+
+    default:
+      return FT_THROW( Unknown_File_Format );
+    }
   }
 
 
@@ -253,8 +399,7 @@
 
 
   static FT_Error
-  tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder  decoder,
-                                FT_UInt         load_flags )
+  tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder  decoder )
   {
     FT_Error    error = FT_Err_Ok;
     FT_UInt     width, height;
@@ -301,18 +446,9 @@
       break;
 
     case 32:
-      if ( load_flags & FT_LOAD_COLOR )
-      {
-        map->pixel_mode = FT_PIXEL_MODE_BGRA;
-        map->pitch      = map->width * 4;
-        map->num_grays  = 256;
-      }
-      else
-      {
-        map->pixel_mode = FT_PIXEL_MODE_GRAY;
-        map->pitch      = map->width;
-        map->num_grays  = 256;
-      }
+      map->pixel_mode = FT_PIXEL_MODE_BGRA;
+      map->pitch      = map->width * 4;
+      map->num_grays  = 256;
       break;
 
     default:
@@ -382,13 +518,11 @@
   /* forward declaration */
   static FT_Error
   tt_sbit_decoder_load_image( TT_SBitDecoder  decoder,
-                              FT_UInt         load_flags,
                               FT_UInt         glyph_index,
                               FT_Int          x_pos,
                               FT_Int          y_pos );
 
   typedef FT_Error  (*TT_SBitDecoder_LoadFunc)( TT_SBitDecoder  decoder,
-                                                FT_UInt         load_flags,
                                                 FT_Byte*        p,
                                                 FT_Byte*        plimit,
                                                 FT_Int          x_pos,
@@ -397,7 +531,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_byte_aligned( TT_SBitDecoder  decoder,
-                                     FT_UInt         load_flags,
                                      FT_Byte*        p,
                                      FT_Byte*        limit,
                                      FT_Int          x_pos,
@@ -408,9 +541,7 @@
     FT_Int      bit_height, bit_width, pitch, width, height, line_bits, h;
     FT_Bitmap*  bitmap;
 
-    FT_UNUSED( load_flags );
 
-
     /* check that we can write the glyph into the bitmap */
     bitmap     = decoder->bitmap;
     bit_width  = bitmap->width;
@@ -538,7 +669,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_bit_aligned( TT_SBitDecoder  decoder,
-                                    FT_UInt         load_flags,
                                     FT_Byte*        p,
                                     FT_Byte*        limit,
                                     FT_Int          x_pos,
@@ -550,9 +680,7 @@
     FT_Bitmap*  bitmap;
     FT_UShort   rval;
 
-    FT_UNUSED( load_flags );
 
-
     /* check that we can write the glyph into the bitmap */
     bitmap     = decoder->bitmap;
     bit_width  = bitmap->width;
@@ -664,7 +792,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_compound( TT_SBitDecoder  decoder,
-                                 FT_UInt         load_flags,
                                  FT_Byte*        p,
                                  FT_Byte*        limit,
                                  FT_Int          x_pos,
@@ -702,7 +829,7 @@
 
 
       /* NB: a recursive call */
-      error = tt_sbit_decoder_load_image( decoder, load_flags, gindex,
+      error = tt_sbit_decoder_load_image( decoder, gindex,
                                           x_pos + dx, y_pos + dy );
       if ( error )
         break;
@@ -732,7 +859,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_png( TT_SBitDecoder  decoder,
-                            FT_UInt         load_flags,
                             FT_Byte*        p,
                             FT_Byte*        limit,
                             FT_Int          x_pos,
@@ -741,9 +867,7 @@
     FT_Error  error = FT_Err_Ok;
     FT_ULong  png_len;
 
-    FT_UNUSED( load_flags );
 
-
     if ( limit - p < 4 )
     {
       FT_TRACE1(( "tt_sbit_decoder_load_png: broken bitmap\n" ));
@@ -759,7 +883,7 @@
       goto Exit;
     }
 
-    error = Load_SBit_Png( decoder->bitmap,
+    error = Load_SBit_Png( decoder->face->root.glyph,
                            x_pos,
                            y_pos,
                            decoder->bit_depth,
@@ -766,7 +890,8 @@
                            decoder->metrics,
                            decoder->stream->memory,
                            p,
-                           png_len );
+                           png_len,
+                           FALSE );
 
   Exit:
     if ( !error )
@@ -779,7 +904,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_bitmap( TT_SBitDecoder  decoder,
-                               FT_UInt         load_flags,
                                FT_UInt         glyph_format,
                                FT_ULong        glyph_start,
                                FT_ULong        glyph_size,
@@ -845,7 +969,32 @@
       case 2:
       case 5:
       case 7:
-        loader = tt_sbit_decoder_load_bit_aligned;
+        {
+          /* Don't trust `glyph_format'.  For example, Apple's main Korean */
+          /* system font, `AppleMyungJo.ttf' (version 7.0d2e6), uses glyph */
+          /* format 7, but the data is format 6.  We check whether we have */
+          /* an excessive number of bytes in the image: If it is equal to  */
+          /* the value for a byte-aligned glyph, use the other loading     */
+          /* routine.                                                      */
+          /*                                                               */
+          /* Note that for some (width,height) combinations, where the     */
+          /* width is not a multiple of 8, the sizes for bit- and          */
+          /* byte-aligned data are equal, for example (7,7) or (15,6).  We */
+          /* then prefer what `glyph_format' specifies.                    */
+
+          FT_UInt  width  = decoder->metrics->width;
+          FT_UInt  height = decoder->metrics->height;
+
+          FT_UInt  bit_size  = ( width * height + 7 ) >> 3;
+          FT_UInt  byte_size = height * ( ( width + 7 ) >> 3 );
+
+
+          if ( bit_size < byte_size                  &&
+               byte_size == (FT_UInt)( p_limit - p ) )
+            loader = tt_sbit_decoder_load_byte_aligned;
+          else
+            loader = tt_sbit_decoder_load_bit_aligned;
+        }
         break;
 
       case 8:
@@ -859,13 +1008,15 @@
         loader = tt_sbit_decoder_load_compound;
         break;
 
-#ifdef FT_CONFIG_OPTION_USE_PNG
       case 17: /* small metrics, PNG image data   */
       case 18: /* big metrics, PNG image data     */
       case 19: /* metrics in EBLC, PNG image data */
+#ifdef FT_CONFIG_OPTION_USE_PNG
         loader = tt_sbit_decoder_load_png;
+#else
+        error = FT_THROW( Unimplemented_Feature );
+#endif /* FT_CONFIG_OPTION_USE_PNG */
         break;
-#endif /* FT_CONFIG_OPTION_USE_PNG */
 
       default:
         error = FT_THROW( Invalid_Table );
@@ -874,64 +1025,12 @@
 
       if ( !decoder->bitmap_allocated )
       {
-        error = tt_sbit_decoder_alloc_bitmap( decoder, load_flags );
+        error = tt_sbit_decoder_alloc_bitmap( decoder );
         if ( error )
           goto Fail;
       }
 
-      if ( decoder->bit_depth == 32                          &&
-           decoder->bitmap->pixel_mode != FT_PIXEL_MODE_BGRA )
-      {
-        /* Flatten color bitmaps if color was not requested. */
-
-        FT_Library library = decoder->face->root.glyph->library;
-        FT_Memory  memory  = decoder->stream->memory;
-
-        FT_Bitmap color, *orig;
-
-
-        if ( decoder->bitmap->pixel_mode != FT_PIXEL_MODE_GRAY ||
-             x_pos != 0 || y_pos != 0                          )
-        {
-          /* Shouldn't happen. */
-          error = FT_THROW( Invalid_Table );
-          goto Fail;
-        }
-
-        FT_Bitmap_New( &color );
-
-        color.rows       = decoder->bitmap->rows;
-        color.width      = decoder->bitmap->width;
-        color.pitch      = color.width * 4;
-        color.pixel_mode = FT_PIXEL_MODE_BGRA;
-
-        if ( FT_ALLOC( color.buffer, color.rows * color.pitch ) )
-          goto Fail;
-
-        orig            = decoder->bitmap;
-        decoder->bitmap = &color;
-
-        error = loader( decoder, load_flags, p, p_limit, x_pos, y_pos );
-
-        decoder->bitmap = orig;
-
-        /* explicitly test against FT_Err_Ok to avoid compiler warnings */
-        /* (we do an assignment within a conditional)                   */
-        if ( error                                           ||
-             ( error = FT_Bitmap_Convert( library,
-                                          &color,
-                                          decoder->bitmap,
-                                          1 ) ) != FT_Err_Ok )
-        {
-          FT_Bitmap_Done( library, &color );
-          goto Fail;
-        }
-
-        FT_Bitmap_Done( library, &color );
-      }
-
-      else
-        error = loader( decoder, load_flags, p, p_limit, x_pos, y_pos );
+      error = loader( decoder, p, p_limit, x_pos, y_pos );
     }
 
   Fail:
@@ -944,7 +1043,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_image( TT_SBitDecoder  decoder,
-                              FT_UInt         load_flags,
                               FT_UInt         glyph_index,
                               FT_Int          x_pos,
                               FT_Int          y_pos )
@@ -993,17 +1091,15 @@
     switch ( index_format )
     {
     case 1: /* 4-byte offsets relative to `image_offset' */
-      {
-        p += 4 * ( glyph_index - start );
-        if ( p + 8 > p_limit )
-          goto NoBitmap;
+      p += 4 * ( glyph_index - start );
+      if ( p + 8 > p_limit )
+        goto NoBitmap;
 
-        image_start = FT_NEXT_ULONG( p );
-        image_end   = FT_NEXT_ULONG( p );
+      image_start = FT_NEXT_ULONG( p );
+      image_end   = FT_NEXT_ULONG( p );
 
-        if ( image_start == image_end )  /* missing glyph */
-          goto NoBitmap;
-      }
+      if ( image_start == image_end )  /* missing glyph */
+        goto NoBitmap;
       break;
 
     case 2: /* big metrics, constant image size */
@@ -1025,17 +1121,15 @@
       break;
 
     case 3: /* 2-byte offsets relative to 'image_offset' */
-      {
-        p += 2 * ( glyph_index - start );
-        if ( p + 4 > p_limit )
-          goto NoBitmap;
+      p += 2 * ( glyph_index - start );
+      if ( p + 4 > p_limit )
+        goto NoBitmap;
 
-        image_start = FT_NEXT_USHORT( p );
-        image_end   = FT_NEXT_USHORT( p );
+      image_start = FT_NEXT_USHORT( p );
+      image_end   = FT_NEXT_USHORT( p );
 
-        if ( image_start == image_end )  /* missing glyph */
-          goto NoBitmap;
-      }
+      if ( image_start == image_end )  /* missing glyph */
+        goto NoBitmap;
       break;
 
     case 4: /* sparse glyph array with (glyph,offset) pairs */
@@ -1124,7 +1218,6 @@
                 image_format, glyph_index ));
 
     return tt_sbit_decoder_load_bitmap( decoder,
-                                        load_flags,
                                         image_format,
                                         image_start,
                                         image_end,
@@ -1142,6 +1235,129 @@
   }
 
 
+  static FT_Error
+  tt_face_load_sbix_image( TT_Face              face,
+                           FT_ULong             strike_index,
+                           FT_UInt              glyph_index,
+                           FT_Stream            stream,
+                           FT_Bitmap           *map,
+                           TT_SBit_MetricsRec  *metrics )
+  {
+    FT_UInt     sbix_pos, strike_offset, glyph_start, glyph_end;
+    FT_ULong    table_size, data_size;
+    FT_Int      originOffsetX, originOffsetY;
+    FT_Tag      graphicType;
+    FT_Int      recurse_depth = 0;
+
+    FT_Error  error;
+    FT_Byte*  p;
+
+    FT_UNUSED( map );
+
+
+    metrics->width  = 0;
+    metrics->height = 0;
+
+    p = face->sbit_table + 8 + 4 * strike_index;
+    strike_offset = FT_NEXT_ULONG( p );
+
+    error = face->goto_table( face, TTAG_sbix, stream, &table_size );
+    if ( error )
+      return error;
+    sbix_pos = FT_STREAM_POS();
+
+  retry:
+    if ( glyph_index > (FT_UInt)face->root.num_glyphs )
+      return FT_THROW( Invalid_Argument );
+
+    if ( strike_offset >= table_size                          ||
+         table_size - strike_offset < 4 + glyph_index * 4 + 8 )
+      return FT_THROW( Invalid_File_Format );
+
+    if ( FT_STREAM_SEEK( sbix_pos + strike_offset + 4 + glyph_index * 4 ) ||
+         FT_FRAME_ENTER( 8 )                                              )
+      return error;
+
+    glyph_start = FT_GET_ULONG();
+    glyph_end   = FT_GET_ULONG();
+
+    FT_FRAME_EXIT();
+
+    if ( glyph_start == glyph_end )
+      return FT_THROW( Invalid_Argument );
+    if ( glyph_start > glyph_end                ||
+         glyph_end - glyph_start < 8            ||
+         table_size - strike_offset < glyph_end )
+      return FT_THROW( Invalid_File_Format );
+
+    if ( FT_STREAM_SEEK( sbix_pos + strike_offset + glyph_start ) ||
+         FT_FRAME_ENTER( glyph_end - glyph_start )                )
+      return error;
+
+    originOffsetX = FT_GET_SHORT();
+    originOffsetY = FT_GET_SHORT();
+
+    graphicType = FT_GET_TAG4();
+    data_size   = glyph_end - glyph_start - 8;
+
+    switch ( graphicType )
+    {
+    case FT_MAKE_TAG( 'd', 'u', 'p', 'e' ):
+      if ( recurse_depth < 4 )
+      {
+        glyph_index = FT_GET_USHORT();
+        FT_FRAME_EXIT();
+        recurse_depth++;
+        goto retry;
+      }
+      error = FT_THROW( Invalid_File_Format );
+      break;
+
+    case FT_MAKE_TAG( 'p', 'n', 'g', ' ' ):
+#ifdef FT_CONFIG_OPTION_USE_PNG
+      error = Load_SBit_Png( face->root.glyph,
+                             0,
+                             0,
+                             32,
+                             metrics,
+                             stream->memory,
+                             stream->cursor,
+                             data_size,
+                             TRUE );
+#else
+      error = FT_THROW( Unimplemented_Feature );
+#endif
+      break;
+
+    case FT_MAKE_TAG( 'j', 'p', 'g', ' ' ):
+    case FT_MAKE_TAG( 't', 'i', 'f', 'f' ):
+      error = FT_THROW( Unknown_File_Format );
+      break;
+
+    default:
+      error = FT_THROW( Unimplemented_Feature );
+      break;
+    }
+
+    FT_FRAME_EXIT();
+
+    if ( !error )
+    {
+      FT_Short   abearing;
+      FT_UShort  aadvance;
+
+
+      tt_face_get_metrics( face, FALSE, glyph_index, &abearing, &aadvance );
+
+      metrics->horiBearingX = originOffsetX;
+      metrics->horiBearingY = -originOffsetY + metrics->height;
+      metrics->horiAdvance  = aadvance * face->root.size->metrics.x_ppem /
+                                face->header.Units_Per_EM;
+    }
+
+    return error;
+  }
+
   FT_LOCAL( FT_Error )
   tt_face_load_sbit_image( TT_Face              face,
                            FT_ULong             strike_index,
@@ -1151,23 +1367,67 @@
                            FT_Bitmap           *map,
                            TT_SBit_MetricsRec  *metrics )
   {
-    TT_SBitDecoderRec  decoder[1];
-    FT_Error           error;
+    FT_Error  error = FT_Err_Ok;
 
-    FT_UNUSED( load_flags );
-    FT_UNUSED( stream );
-    FT_UNUSED( map );
 
+    switch ( (FT_UInt)face->sbit_table_type )
+    {
+    case TT_SBIT_TABLE_TYPE_EBLC:
+    case TT_SBIT_TABLE_TYPE_CBLC:
+      {
+        TT_SBitDecoderRec  decoder[1];
 
-    error = tt_sbit_decoder_init( decoder, face, strike_index, metrics );
-    if ( !error )
+
+        error = tt_sbit_decoder_init( decoder, face, strike_index, metrics );
+        if ( !error )
+        {
+          error = tt_sbit_decoder_load_image( decoder,
+                                              glyph_index,
+                                              0,
+                                              0 );
+          tt_sbit_decoder_done( decoder );
+        }
+      }
+      break;
+
+    case TT_SBIT_TABLE_TYPE_SBIX:
+      error = tt_face_load_sbix_image( face,
+                                       strike_index,
+                                       glyph_index,
+                                       stream,
+                                       map,
+                                       metrics );
+      break;
+
+    default:
+      error = FT_THROW( Unknown_File_Format );
+      break;
+    }
+
+    /* Flatten color bitmaps if color was not requested. */
+    if ( !error                                &&
+         !( load_flags & FT_LOAD_COLOR )       &&
+         map->pixel_mode == FT_PIXEL_MODE_BGRA )
     {
-      error = tt_sbit_decoder_load_image( decoder,
-                                          load_flags,
-                                          glyph_index,
-                                          0,
-                                          0 );
-      tt_sbit_decoder_done( decoder );
+      FT_Bitmap   new_map;
+      FT_Library  library = face->root.glyph->library;
+
+
+      FT_Bitmap_New( &new_map );
+
+      /* Convert to 8bit grayscale. */
+      error = FT_Bitmap_Convert( library, map, &new_map, 1 );
+      if ( error )
+        FT_Bitmap_Done( library, &new_map );
+      else
+      {
+        map->pixel_mode = new_map.pixel_mode;
+        map->pitch      = new_map.pitch;
+        map->num_grays  = new_map.num_grays;
+
+        ft_glyphslot_set_bitmap( face->root.glyph, new_map.buffer );
+        face->root.glyph->internal->flags |= FT_GLYPH_OWN_BITMAP;
+      }
     }
 
     return error;
Index: lib/3rdparty/freetype/src/sfnt/pngshim.h
===================================================================
--- lib/3rdparty/freetype/src/sfnt/pngshim.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/sfnt/pngshim.h	(copie de travail)
@@ -29,7 +29,7 @@
 #ifdef FT_CONFIG_OPTION_USE_PNG
 
   FT_LOCAL( FT_Error )
-  Load_SBit_Png( FT_Bitmap*       map,
+  Load_SBit_Png( FT_GlyphSlot     slot,
                  FT_Int           x_offset,
                  FT_Int           y_offset,
                  FT_Int           pix_bits,
@@ -36,7 +36,8 @@
                  TT_SBit_Metrics  metrics,
                  FT_Memory        memory,
                  FT_Byte*         data,
-                 FT_UInt          png_len );
+                 FT_UInt          png_len,
+                 FT_Bool          populate_map_and_metrics );
 
 #endif
 
Index: lib/3rdparty/freetype/src/autofit/afpic.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afpic.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afpic.c	(copie de travail)
@@ -43,15 +43,12 @@
 
 
   /* forward declaration of PIC init functions from script classes */
-#include "aflatin.h"
-#ifdef FT_OPTION_AUTOFIT2
-#include "aflatin2.h"
-#endif
-#include "afcjk.h"
-#include "afdummy.h"
-#include "afindic.h"
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )  /* empty */
 
+#include "afwrtsys.h"
 
+
   void
   autofit_module_class_pic_free( FT_Library  library )
   {
@@ -100,28 +97,32 @@
 
     FT_Init_Class_af_service_properties( &container->af_service_properties );
 
-    for ( ss = 0 ; ss < AF_SCRIPT_CLASSES_REC_COUNT ; ss++ )
-    {
+    for ( ss = 0; ss < AF_WRITING_SYSTEM_MAX - 1; ss++ )
+      container->af_writing_system_classes[ss] =
+        &container->af_writing_system_classes_rec[ss];
+    container->af_writing_system_classes[AF_WRITING_SYSTEM_MAX - 1] = NULL;
+
+    for ( ss = 0; ss < AF_SCRIPT_MAX - 1; ss++ )
       container->af_script_classes[ss] =
         &container->af_script_classes_rec[ss];
-    }
-    container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL;
+    container->af_script_classes[AF_SCRIPT_MAX - 1] = NULL;
 
-    /* add call to initialization function when you add new scripts */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )                             \
+        FT_Init_Class_af_ ## ws ## _writing_system_class(    \
+          &container->af_writing_system_classes_rec[ss++] );
+
     ss = 0;
-    FT_Init_Class_af_dummy_script_class(
-      &container->af_script_classes_rec[ss++] );
-#ifdef FT_OPTION_AUTOFIT2
-    FT_Init_Class_af_latin2_script_class(
-      &container->af_script_classes_rec[ss++] );
-#endif
-    FT_Init_Class_af_latin_script_class(
-      &container->af_script_classes_rec[ss++] );
-    FT_Init_Class_af_cjk_script_class(
-      &container->af_script_classes_rec[ss++] );
-    FT_Init_Class_af_indic_script_class(
-      &container->af_script_classes_rec[ss++] );
+#include "afwrtsys.h"
 
+#undef  SCRIPT
+#define SCRIPT( s, S, d )                            \
+        FT_Init_Class_af_ ## s ## _script_class(     \
+          &container->af_script_classes_rec[ss++] );
+
+    ss = 0;
+#include "afscript.h"
+
     FT_Init_Class_af_autofitter_interface(
       library, &container->af_autofitter_interface );
 
Index: lib/3rdparty/freetype/src/autofit/aflatin.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/aflatin.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/aflatin.h	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for latin script (specification).       */
 /*                                                                         */
-/*  Copyright 2003-2007, 2009, 2011-2012 by                                */
+/*  Copyright 2003-2007, 2009, 2011-2013 by                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -24,12 +24,22 @@
 
 FT_BEGIN_HEADER
 
+  /* the `latin' writing system */
 
-  /* the latin-specific script class */
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_latin_writing_system_class )
 
-  AF_DECLARE_SCRIPT_CLASS( af_latin_script_class )
 
+  /* the latin-specific script classes */
 
+  AF_DECLARE_SCRIPT_CLASS( af_cyrl_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_grek_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_latn_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_hebr_script_class )
+#if 0
+  AF_DECLARE_SCRIPT_CLASS( af_armn_script_class )
+#endif
+
+
   /* constants are given with units_per_em == 2048 in mind */
 #define AF_LATIN_CONSTANT( metrics, c )                                      \
   ( ( (c) * (FT_Long)( (AF_LatinMetrics)(metrics) )->units_per_em ) / 2048 )
@@ -51,27 +61,14 @@
    */
 
 
-  /* Latin (global) metrics management */
+#define AF_LATIN_IS_TOP_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_LATIN_TOP )
+#define AF_LATIN_IS_X_HEIGHT_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_LATIN_X_HEIGHT )
+#define AF_LATIN_IS_LONG_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_LATIN_LONG )
 
-  enum
-  {
-    AF_LATIN_BLUE_CAPITAL_TOP,
-    AF_LATIN_BLUE_CAPITAL_BOTTOM,
-    AF_LATIN_BLUE_SMALL_F_TOP,
-    AF_LATIN_BLUE_SMALL_TOP,
-    AF_LATIN_BLUE_SMALL_BOTTOM,
-    AF_LATIN_BLUE_SMALL_MINOR,
-
-    AF_LATIN_BLUE_MAX
-  };
-
-
-#define AF_LATIN_IS_TOP_BLUE( b )  ( (b) == AF_LATIN_BLUE_CAPITAL_TOP || \
-                                     (b) == AF_LATIN_BLUE_SMALL_F_TOP || \
-                                     (b) == AF_LATIN_BLUE_SMALL_TOP   )
-
 #define AF_LATIN_MAX_WIDTHS  16
-#define AF_LATIN_MAX_BLUES   AF_LATIN_BLUE_MAX
 
 
   enum
@@ -106,7 +103,7 @@
 
     /* ignored for horizontal metrics */
     FT_UInt          blue_count;
-    AF_LatinBlueRec  blues[AF_LATIN_BLUE_MAX];
+    AF_LatinBlueRec  blues[AF_BLUE_STRINGSET_MAX];
 
     FT_Fixed         org_scale;
     FT_Pos           org_delta;
Index: lib/3rdparty/freetype/src/autofit/afcjk.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afcjk.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afcjk.h	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for CJK script (specification).         */
 /*                                                                         */
-/*  Copyright 2006, 2007, 2011, 2012 by                                    */
+/*  Copyright 2006, 2007, 2011-2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -26,39 +26,48 @@
 FT_BEGIN_HEADER
 
 
-  /* the CJK-specific script class */
+  /* the CJK-specific writing system */
 
-  AF_DECLARE_SCRIPT_CLASS( af_cjk_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_cjk_writing_system_class )
 
-  /* CJK (global) metrics management */
 
+  /* the CJK-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_hani_script_class )
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****              C J K   G L O B A L   M E T R I C S              *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
   /*
    *  CJK glyphs tend to fill the square.  So we have both vertical and
    *  horizontal blue zones.  But some glyphs have flat bounding strokes that
    *  leave some space between neighbour glyphs.
    */
-  enum
-  {
-    AF_CJK_BLUE_TOP,
-    AF_CJK_BLUE_BOTTOM,
-    AF_CJK_BLUE_LEFT,
-    AF_CJK_BLUE_RIGHT,
 
-    AF_CJK_BLUE_MAX
-  };
+#define AF_CJK_IS_TOP_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_CJK_TOP )
+#define AF_CJK_IS_HORIZ_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_CJK_HORIZ )
+#define AF_CJK_IS_FILLED_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_CJK_FILL )
+#define AF_CJK_IS_RIGHT_BLUE  AF_CJK_IS_TOP_BLUE
 
-
 #define AF_CJK_MAX_WIDTHS  16
-#define AF_CJK_MAX_BLUES   AF_CJK_BLUE_MAX
 
 
   enum
   {
-    AF_CJK_BLUE_ACTIVE     = 1 << 0,
-    AF_CJK_BLUE_IS_TOP     = 1 << 1,
-    AF_CJK_BLUE_IS_RIGHT   = 1 << 2,
-    AF_CJK_BLUE_ADJUSTMENT = 1 << 3,  /* used for scale adjustment */
-                                      /* optimization              */
+    AF_CJK_BLUE_ACTIVE     = 1 << 0,  /* set if zone height is <= 3/4px */
+    AF_CJK_BLUE_TOP        = 1 << 1,  /* result of AF_CJK_IS_TOP_BLUE   */
+    AF_CJK_BLUE_ADJUSTMENT = 1 << 2,  /* used for scale adjustment      */
+                                      /* optimization                   */
     AF_CJK_BLUE_FLAG_MAX
   };
 
@@ -77,16 +86,16 @@
     FT_Fixed       scale;
     FT_Pos         delta;
 
-    FT_UInt        width_count;
-    AF_WidthRec    widths[AF_CJK_MAX_WIDTHS];
-    FT_Pos         edge_distance_threshold;
-    FT_Pos         standard_width;
-    FT_Bool        extra_light;
+    FT_UInt        width_count;                   /* number of used widths */
+    AF_WidthRec    widths[AF_CJK_MAX_WIDTHS];     /* widths array          */
+    FT_Pos         edge_distance_threshold;     /* used for creating edges */
+    FT_Pos         standard_width;           /* the default stem thickness */
+    FT_Bool        extra_light;           /* is standard width very light? */
 
     /* used for horizontal metrics too for CJK */
     FT_Bool        control_overshoot;
     FT_UInt        blue_count;
-    AF_CJKBlueRec  blues[AF_CJK_BLUE_MAX];
+    AF_CJKBlueRec  blues[AF_BLUE_STRINGSET_MAX];
 
     FT_Fixed       org_scale;
     FT_Pos         org_delta;
Index: lib/3rdparty/freetype/src/autofit/afpic.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afpic.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afpic.h	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType position independent code services for autofit module.  */
 /*                                                                         */
-/*  Copyright 2009, 2011-2012 by                                           */
+/*  Copyright 2009, 2011-2013 by                                           */
 /*  Oran Agra and Mickey Gabel.                                            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -27,11 +27,12 @@
 
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define AF_SERVICES_GET            af_services
-#define AF_SERVICE_PROPERTIES_GET  af_service_properties
+#define AF_SERVICES_GET                af_services
+#define AF_SERVICE_PROPERTIES_GET      af_service_properties
 
-#define AF_SCRIPT_CLASSES_GET      af_script_classes
-#define AF_INTERFACE_GET           af_autofitter_interface
+#define AF_WRITING_SYSTEM_CLASSES_GET  af_writing_system_classes
+#define AF_SCRIPT_CLASSES_GET          af_script_classes
+#define AF_INTERFACE_GET               af_autofitter_interface
 
 #else /* FT_CONFIG_OPTION_PIC */
 
@@ -40,24 +41,22 @@
 
 #include "aftypes.h"
 
-  /* increase these when you add new scripts, */
-  /* and update autofit_module_class_pic_init */
-#ifdef FT_OPTION_AUTOFIT2
-#define AF_SCRIPT_CLASSES_COUNT  6
-#else
-#define AF_SCRIPT_CLASSES_COUNT  5
-#endif
 
-#define AF_SCRIPT_CLASSES_REC_COUNT  ( AF_SCRIPT_CLASSES_COUNT - 1 )
-
-
   typedef struct  AFModulePIC_
   {
     FT_ServiceDescRec*          af_services;
     FT_Service_PropertiesRec    af_service_properties;
 
-    AF_ScriptClass              af_script_classes[AF_SCRIPT_CLASSES_COUNT];
-    AF_ScriptClassRec           af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT];
+    AF_WritingSystemClass       af_writing_system_classes
+                                  [AF_WRITING_SYSTEM_MAX];
+    AF_WritingSystemClassRec    af_writing_system_classes_rec
+                                  [AF_WRITING_SYSTEM_MAX - 1];
+
+    AF_ScriptClass              af_script_classes
+                                  [AF_SCRIPT_MAX];
+    AF_ScriptClassRec           af_script_classes_rec
+                                  [AF_SCRIPT_MAX - 1];
+
     FT_AutoHinter_InterfaceRec  af_autofitter_interface;
 
   } AFModulePIC;
@@ -71,6 +70,8 @@
 #define AF_SERVICE_PROPERTIES_GET  \
           ( GET_PIC( library )->af_service_properties )
 
+#define AF_WRITING_SYSTEM_CLASSES_GET  \
+          ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_writing_system_classes )
 #define AF_SCRIPT_CLASSES_GET  \
           ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_script_classes )
 #define AF_INTERFACE_GET  \
Index: lib/3rdparty/freetype/src/autofit/afhints.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afhints.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afhints.c	(copie de travail)
@@ -144,6 +144,17 @@
 
 #include FT_CONFIG_STANDARD_LIBRARY_H
 
+  /* The dump functions are used in the `ftgrid' demo program, too. */
+#define AF_DUMP( varformat )          \
+          do                          \
+          {                           \
+            if ( to_stdout )          \
+              printf varformat;       \
+            else                      \
+              FT_TRACE7( varformat ); \
+          } while ( 0 )
+
+
   static const char*
   af_dir_str( AF_Direction  dir )
   {
@@ -179,7 +190,8 @@
   extern "C" {
 #endif
   void
-  af_glyph_hints_dump_points( AF_GlyphHints  hints )
+  af_glyph_hints_dump_points( AF_GlyphHints  hints,
+                              FT_Bool        to_stdout )
   {
     AF_Point  points = hints->points;
     AF_Point  limit  = points + hints->num_points;
@@ -186,27 +198,27 @@
     AF_Point  point;
 
 
-    FT_TRACE7(( "Table of points:\n"
-                "  [ index |  xorg |  yorg | xscale | yscale"
-                " |  xfit |  yfit |  flags ]\n" ));
+    AF_DUMP(( "Table of points:\n"
+              "  [ index |  xorg |  yorg | xscale | yscale"
+              " |  xfit |  yfit |  flags ]\n" ));
 
     for ( point = points; point < limit; point++ )
-      FT_TRACE7(( "  [ %5d | %5d | %5d | %6.2f | %6.2f"
-                  " | %5.2f | %5.2f | %c%c%c%c%c%c ]\n",
-                  point - points,
-                  point->fx,
-                  point->fy,
-                  point->ox / 64.0,
-                  point->oy / 64.0,
-                  point->x / 64.0,
-                  point->y / 64.0,
-                  ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) ? 'w' : ' ',
-                  ( point->flags & AF_FLAG_INFLECTION )         ? 'i' : ' ',
-                  ( point->flags & AF_FLAG_EXTREMA_X )          ? '<' : ' ',
-                  ( point->flags & AF_FLAG_EXTREMA_Y )          ? 'v' : ' ',
-                  ( point->flags & AF_FLAG_ROUND_X )            ? '(' : ' ',
-                  ( point->flags & AF_FLAG_ROUND_Y )            ? 'u' : ' '));
-    FT_TRACE7(( "\n" ));
+      AF_DUMP(( "  [ %5d | %5d | %5d | %6.2f | %6.2f"
+                " | %5.2f | %5.2f | %c%c%c%c%c%c ]\n",
+                point - points,
+                point->fx,
+                point->fy,
+                point->ox / 64.0,
+                point->oy / 64.0,
+                point->x / 64.0,
+                point->y / 64.0,
+                ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) ? 'w' : ' ',
+                ( point->flags & AF_FLAG_INFLECTION )         ? 'i' : ' ',
+                ( point->flags & AF_FLAG_EXTREMA_X )          ? '<' : ' ',
+                ( point->flags & AF_FLAG_EXTREMA_Y )          ? 'v' : ' ',
+                ( point->flags & AF_FLAG_ROUND_X )            ? '(' : ' ',
+                ( point->flags & AF_FLAG_ROUND_Y )            ? 'u' : ' '));
+    AF_DUMP(( "\n" ));
   }
 #ifdef __cplusplus
   }
@@ -247,7 +259,8 @@
   extern "C" {
 #endif
   void
-  af_glyph_hints_dump_segments( AF_GlyphHints  hints )
+  af_glyph_hints_dump_segments( AF_GlyphHints  hints,
+                                FT_Bool        to_stdout )
   {
     FT_Int  dimension;
 
@@ -262,34 +275,34 @@
       AF_Segment    seg;
 
 
-      FT_TRACE7(( "Table of %s segments:\n",
-                  dimension == AF_DIMENSION_HORZ ? "vertical"
-                                                 : "horizontal" ));
+      AF_DUMP(( "Table of %s segments:\n",
+                dimension == AF_DIMENSION_HORZ ? "vertical"
+                                               : "horizontal" ));
       if ( axis->num_segments )
-        FT_TRACE7(( "  [ index |  pos  |  dir  | from"
-                    " |  to  | link | serif | edge"
-                    " | height | extra |    flags    ]\n" ));
+        AF_DUMP(( "  [ index |  pos  |  dir  | from"
+                  " |  to  | link | serif | edge"
+                  " | height | extra |    flags    ]\n" ));
       else
-        FT_TRACE7(( "  (none)\n" ));
+        AF_DUMP(( "  (none)\n" ));
 
       for ( seg = segments; seg < limit; seg++ )
-        FT_TRACE7(( "  [ %5d | %5.2g | %5s | %4d"
-                    " | %4d | %4d | %5d | %4d"
-                    " | %6d | %5d | %11s ]\n",
-                    seg - segments,
-                    dimension == AF_DIMENSION_HORZ
-                                 ? (int)seg->first->ox / 64.0
-                                 : (int)seg->first->oy / 64.0,
-                    af_dir_str( (AF_Direction)seg->dir ),
-                    AF_INDEX_NUM( seg->first, points ),
-                    AF_INDEX_NUM( seg->last, points ),
-                    AF_INDEX_NUM( seg->link, segments ),
-                    AF_INDEX_NUM( seg->serif, segments ),
-                    AF_INDEX_NUM( seg->edge, edges ),
-                    seg->height,
-                    seg->height - ( seg->max_coord - seg->min_coord ),
-                    af_edge_flags_to_string( (AF_Edge_Flags)seg->flags ) ));
-      FT_TRACE7(( "\n" ));
+        AF_DUMP(( "  [ %5d | %5.2g | %5s | %4d"
+                  " | %4d | %4d | %5d | %4d"
+                  " | %6d | %5d | %11s ]\n",
+                  seg - segments,
+                  dimension == AF_DIMENSION_HORZ
+                               ? (int)seg->first->ox / 64.0
+                               : (int)seg->first->oy / 64.0,
+                  af_dir_str( (AF_Direction)seg->dir ),
+                  AF_INDEX_NUM( seg->first, points ),
+                  AF_INDEX_NUM( seg->last, points ),
+                  AF_INDEX_NUM( seg->link, segments ),
+                  AF_INDEX_NUM( seg->serif, segments ),
+                  AF_INDEX_NUM( seg->edge, edges ),
+                  seg->height,
+                  seg->height - ( seg->max_coord - seg->min_coord ),
+                  af_edge_flags_to_string( (AF_Edge_Flags)seg->flags ) ));
+      AF_DUMP(( "\n" ));
     }
   }
 #ifdef __cplusplus
@@ -366,7 +379,8 @@
   extern "C" {
 #endif
   void
-  af_glyph_hints_dump_edges( AF_GlyphHints  hints )
+  af_glyph_hints_dump_edges( AF_GlyphHints  hints,
+                             FT_Bool        to_stdout )
   {
     FT_Int  dimension;
 
@@ -383,28 +397,28 @@
        *  note: AF_DIMENSION_HORZ corresponds to _vertical_ edges
        *        since they have a constant X coordinate.
        */
-      FT_TRACE7(( "Table of %s edges:\n",
-                  dimension == AF_DIMENSION_HORZ ? "vertical"
-                                                 : "horizontal" ));
+      AF_DUMP(( "Table of %s edges:\n",
+                dimension == AF_DIMENSION_HORZ ? "vertical"
+                                               : "horizontal" ));
       if ( axis->num_edges )
-        FT_TRACE7(( "  [ index |  pos  |  dir  | link"
-                    " | serif | blue | opos  |  pos  |    flags    ]\n" ));
+        AF_DUMP(( "  [ index |  pos  |  dir  | link"
+                  " | serif | blue | opos  |  pos  |    flags    ]\n" ));
       else
-        FT_TRACE7(( "  (none)\n" ));
+        AF_DUMP(( "  (none)\n" ));
 
       for ( edge = edges; edge < limit; edge++ )
-        FT_TRACE7(( "  [ %5d | %5.2g | %5s | %4d"
-                    " | %5d |   %c  | %5.2f | %5.2f | %11s ]\n",
-                    edge - edges,
-                    (int)edge->opos / 64.0,
-                    af_dir_str( (AF_Direction)edge->dir ),
-                    AF_INDEX_NUM( edge->link, edges ),
-                    AF_INDEX_NUM( edge->serif, edges ),
-                    edge->blue_edge ? 'y' : 'n',
-                    edge->opos / 64.0,
-                    edge->pos / 64.0,
-                    af_edge_flags_to_string( (AF_Edge_Flags)edge->flags ) ));
-      FT_TRACE7(( "\n" ));
+        AF_DUMP(( "  [ %5d | %5.2g | %5s | %4d"
+                  " | %5d |   %c  | %5.2f | %5.2f | %11s ]\n",
+                  edge - edges,
+                  (int)edge->opos / 64.0,
+                  af_dir_str( (AF_Direction)edge->dir ),
+                  AF_INDEX_NUM( edge->link, edges ),
+                  AF_INDEX_NUM( edge->serif, edges ),
+                  edge->blue_edge ? 'y' : 'n',
+                  edge->opos / 64.0,
+                  edge->pos / 64.0,
+                  af_edge_flags_to_string( (AF_Edge_Flags)edge->flags ) ));
+      AF_DUMP(( "\n" ));
     }
   }
 #ifdef __cplusplus
@@ -411,67 +425,8 @@
   }
 #endif
 
-#else /* !FT_DEBUG_AUTOFIT */
+#undef AF_DUMP
 
-  /* these empty stubs are only used to link the `ftgrid' test program */
-  /* if debugging is disabled                                          */
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-  void
-  af_glyph_hints_dump_points( AF_GlyphHints  hints )
-  {
-    FT_UNUSED( hints );
-  }
-
-
-  void
-  af_glyph_hints_dump_segments( AF_GlyphHints  hints )
-  {
-    FT_UNUSED( hints );
-  }
-
-
-  FT_Error
-  af_glyph_hints_get_num_segments( AF_GlyphHints  hints,
-                                   FT_Int         dimension,
-                                   FT_Int*        num_segments )
-  {
-    FT_UNUSED( hints );
-    FT_UNUSED( dimension );
-    FT_UNUSED( num_segments );
-
-    return 0;
-  }
-
-
-  FT_Error
-  af_glyph_hints_get_segment_offset( AF_GlyphHints  hints,
-                                     FT_Int         dimension,
-                                     FT_Int         idx,
-                                     FT_Pos*        offset )
-  {
-    FT_UNUSED( hints );
-    FT_UNUSED( dimension );
-    FT_UNUSED( idx );
-    FT_UNUSED( offset );
-
-    return 0;
-  }
-
-
-  void
-  af_glyph_hints_dump_edges( AF_GlyphHints  hints )
-  {
-    FT_UNUSED( hints );
-  }
-
-#ifdef __cplusplus
-  }
-#endif
-
 #endif /* !FT_DEBUG_AUTOFIT */
 
 
@@ -740,7 +695,13 @@
         FT_Pos        in_y   = 0;
         AF_Direction  in_dir = AF_DIR_NONE;
 
+        FT_Pos  last_good_in_x = 0;
+        FT_Pos  last_good_in_y = 0;
 
+        FT_UInt  units_per_em = hints->metrics->scaler.face->units_per_EM;
+        FT_Int   near_limit   = 20 * units_per_em / 2048;
+
+
         for ( point = points; point < point_limit; point++ )
         {
           AF_Point  next;
@@ -749,9 +710,41 @@
 
           if ( point == first )
           {
-            prev   = first->prev;
-            in_x   = first->fx - prev->fx;
-            in_y   = first->fy - prev->fy;
+            prev = first->prev;
+
+            in_x = first->fx - prev->fx;
+            in_y = first->fy - prev->fy;
+
+            last_good_in_x = in_x;
+            last_good_in_y = in_y;
+
+            if ( FT_ABS( in_x ) + FT_ABS( in_y ) < near_limit )
+            {
+              /* search first non-near point to get a good `in_dir' value */
+
+              AF_Point  point_ = prev;
+
+
+              while ( point_ != first )
+              {
+                AF_Point  prev_ = point_->prev;
+
+                FT_Pos  in_x_ = point_->fx - prev_->fx;
+                FT_Pos  in_y_ = point_->fy - prev_->fy;
+
+
+                if ( FT_ABS( in_x_ ) + FT_ABS( in_y_ ) >= near_limit )
+                {
+                  last_good_in_x = in_x_;
+                  last_good_in_y = in_y_;
+
+                  break;
+                }
+
+                point_ = prev_;
+              }
+            }
+
             in_dir = af_direction_compute( in_x, in_y );
             first  = prev + 1;
           }
@@ -758,6 +751,18 @@
 
           point->in_dir = (FT_Char)in_dir;
 
+          /* check whether the current point is near to the previous one */
+          /* (value 20 in `near_limit' is heuristic; we use Taxicab      */
+          /* metrics for the test)                                       */
+
+          if ( FT_ABS( in_x ) + FT_ABS( in_y ) < near_limit )
+            point->flags |= AF_FLAG_NEAR;
+          else
+          {
+            last_good_in_x = in_x;
+            last_good_in_y = in_y;
+          }
+
           next  = point->next;
           out_x = next->fx - point->fx;
           out_y = next->fy - point->fy;
@@ -765,10 +770,12 @@
           in_dir         = af_direction_compute( out_x, out_y );
           point->out_dir = (FT_Char)in_dir;
 
-          /* check for weak points */
+          /* Check for weak points.  The remaining points not collected */
+          /* in edges are then implicitly classified as strong points.  */
 
           if ( point->flags & AF_FLAG_CONTROL )
           {
+            /* control points are always weak */
           Is_Weak_Point:
             point->flags |= AF_FLAG_WEAK_INTERPOLATION;
           }
@@ -775,13 +782,31 @@
           else if ( point->out_dir == point->in_dir )
           {
             if ( point->out_dir != AF_DIR_NONE )
+            {
+              /* current point lies on a horizontal or          */
+              /* vertical segment (but doesn't start or end it) */
               goto Is_Weak_Point;
+            }
 
-            if ( ft_corner_is_flat( in_x, in_y, out_x, out_y ) )
+            /* test whether `in' and `out' direction is approximately */
+            /* the same (and use the last good `in' vector in case    */
+            /* the current point is near to the previous one)         */
+            if ( ft_corner_is_flat(
+                   point->flags & AF_FLAG_NEAR ? last_good_in_x : in_x,
+                   point->flags & AF_FLAG_NEAR ? last_good_in_y : in_y,
+                   out_x,
+                   out_y ) )
+            {
+              /* current point lies on a straight, diagonal line */
+              /* (more or less)                                  */
               goto Is_Weak_Point;
+            }
           }
           else if ( point->in_dir == -point->out_dir )
+          {
+            /* current point forms a spike */
             goto Is_Weak_Point;
+          }
 
           in_x = out_x;
           in_y = out_y;
Index: lib/3rdparty/freetype/src/autofit/afindic.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afindic.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afindic.c	(copie de travail)
@@ -97,27 +97,11 @@
   /*************************************************************************/
 
 
-  static const AF_Script_UniRangeRec  af_indic_uniranges[] =
-  {
-#if 0
-    AF_UNIRANGE_REC( 0x0100UL, 0xFFFFUL ),  /* why this? */
-#endif
-    AF_UNIRANGE_REC( 0x0900UL, 0x0DFFUL),    /* Indic Range */
-    AF_UNIRANGE_REC( 0x0F00UL, 0x0FFFUL),    /* Tibetan */
-    AF_UNIRANGE_REC( 0x1900UL, 0x194FUL),    /* Limbu */
-    AF_UNIRANGE_REC( 0x1B80UL, 0x1BBFUL),    /* Sundanese */
-    AF_UNIRANGE_REC( 0x1C80UL, 0x1CDFUL),    /* Meetei Mayak */
-    AF_UNIRANGE_REC( 0xA800UL, 0xA82FUL),    /* Syloti Nagri */
-    AF_UNIRANGE_REC( 0x11800UL, 0x118DFUL),  /* Sharada */
-    AF_UNIRANGE_REC(      0UL,      0UL)
-  };
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_indic_writing_system_class,
 
+    AF_WRITING_SYSTEM_INDIC,
 
-  AF_DEFINE_SCRIPT_CLASS( af_indic_script_class,
-    AF_SCRIPT_INDIC,
-    af_indic_uniranges,
-    'o', /* XXX */
-
     sizeof ( AF_CJKMetricsRec ),
 
     (AF_Script_InitMetricsFunc) af_indic_metrics_init,
@@ -128,19 +112,29 @@
     (AF_Script_ApplyHintsFunc)  af_indic_hints_apply
   )
 
-#else /* !AF_CONFIG_OPTION_INDIC */
+  /* XXX: this should probably fine tuned to differentiate better between */
+  /*      scripts...                                                      */
 
-  static const AF_Script_UniRangeRec  af_indic_uniranges[] =
+  static const AF_Script_UniRangeRec  af_deva_uniranges[] =
   {
-    { 0, 0 }
+    AF_UNIRANGE_REC(  0x0900UL,  0x0DFFUL ),  /* Indic Range  */
+    AF_UNIRANGE_REC(  0x0F00UL,  0x0FFFUL ),  /* Tibetan      */
+    AF_UNIRANGE_REC(  0x1900UL,  0x194FUL ),  /* Limbu        */
+    AF_UNIRANGE_REC(  0x1B80UL,  0x1BBFUL ),  /* Sundanese    */
+    AF_UNIRANGE_REC(  0x1C80UL,  0x1CDFUL ),  /* Meetei Mayak */
+    AF_UNIRANGE_REC(  0xA800UL,  0xA82FUL ),  /* Syloti Nagri */
+    AF_UNIRANGE_REC( 0x11800UL, 0x118DFUL ),  /* Sharada      */
+    AF_UNIRANGE_REC(       0UL,       0UL )
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS( af_indic_script_class,
-    AF_SCRIPT_INDIC,
-    af_indic_uniranges,
-    0,
+#else /* !AF_CONFIG_OPTION_INDIC */
 
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_indic_writing_system_class,
+
+    AF_WRITING_SYSTEM_INDIC,
+
     sizeof ( AF_CJKMetricsRec ),
 
     (AF_Script_InitMetricsFunc) NULL,
@@ -151,7 +145,25 @@
     (AF_Script_ApplyHintsFunc)  NULL
   )
 
+
+  static const AF_Script_UniRangeRec  af_deva_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0UL, 0UL )
+  };
+
 #endif /* !AF_CONFIG_OPTION_INDIC */
 
 
+  AF_DEFINE_SCRIPT_CLASS(
+    af_deva_script_class,
+
+    AF_SCRIPT_DEVA,
+    (AF_Blue_Stringset)0, /* XXX */
+    AF_WRITING_SYSTEM_INDIC,
+
+    af_deva_uniranges,
+    'o' /* XXX */
+  )
+
+
 /* END */
Index: lib/3rdparty/freetype/src/autofit/aflatin2.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/aflatin2.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/aflatin2.c	(copie de travail)
@@ -76,8 +76,9 @@
       AF_Scaler            scaler = &dummy->root.scaler;
 
 
-      glyph_index = FT_Get_Char_Index( face,
-                                       metrics->root.clazz->standard_char );
+      glyph_index = FT_Get_Char_Index(
+                      face,
+                      metrics->root.script_class->standard_char );
       if ( glyph_index == 0 )
         goto Exit;
 
@@ -409,11 +410,11 @@
         blue->flags |= AF_LATIN_BLUE_TOP;
 
       /*
-       * The following flags is used later to adjust the y and x scales
+       * The following flag is used later to adjust the y and x scales
        * in order to optimize the pixel grid alignment of the top of small
        * letters.
        */
-      if ( bb == AF_LATIN_BLUE_SMALL_TOP )
+      if ( AF_LATIN_IS_X_HEIGHT_BLUE( bb ) )
         blue->flags |= AF_LATIN_BLUE_ADJUSTMENT;
 
       FT_TRACE5(( "    -> reference = %ld\n"
@@ -2379,19 +2380,11 @@
   /*************************************************************************/
 
 
-  static const AF_Script_UniRangeRec  af_latin2_uniranges[] =
-  {
-    AF_UNIRANGE_REC( 32UL,  127UL ),    /* TODO: Add new Unicode ranges here! */
-    AF_UNIRANGE_REC( 160UL, 255UL ),
-    AF_UNIRANGE_REC( 0UL,   0UL )
-  };
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_latin2_writing_system_class,
 
+    AF_WRITING_SYSTEM_LATIN2,
 
-  AF_DEFINE_SCRIPT_CLASS( af_latin2_script_class,
-    AF_SCRIPT_LATIN2,
-    af_latin2_uniranges,
-    'o',
-
     sizeof ( AF_LatinMetricsRec ),
 
     (AF_Script_InitMetricsFunc) af_latin2_metrics_init,
@@ -2403,4 +2396,53 @@
   )
 
 
+  /* XXX: this should probably fine tuned to differentiate better between */
+  /*      scripts...                                                      */
+
+  static const AF_Script_UniRangeRec  af_ltn2_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0020UL,  0x007FUL ),  /* Basic Latin (no control chars) */
+    AF_UNIRANGE_REC(  0x00A0UL,  0x00FFUL ),  /* Latin-1 Supplement (no control chars) */
+    AF_UNIRANGE_REC(  0x0100UL,  0x017FUL ),  /* Latin Extended-A */
+    AF_UNIRANGE_REC(  0x0180UL,  0x024FUL ),  /* Latin Extended-B */
+    AF_UNIRANGE_REC(  0x0250UL,  0x02AFUL ),  /* IPA Extensions */
+    AF_UNIRANGE_REC(  0x02B0UL,  0x02FFUL ),  /* Spacing Modifier Letters */
+    AF_UNIRANGE_REC(  0x0300UL,  0x036FUL ),  /* Combining Diacritical Marks */
+    AF_UNIRANGE_REC(  0x0370UL,  0x03FFUL ),  /* Greek and Coptic */
+    AF_UNIRANGE_REC(  0x0400UL,  0x04FFUL ),  /* Cyrillic */
+    AF_UNIRANGE_REC(  0x0500UL,  0x052FUL ),  /* Cyrillic Supplement */
+    AF_UNIRANGE_REC(  0x1D00UL,  0x1D7FUL ),  /* Phonetic Extensions */
+    AF_UNIRANGE_REC(  0x1D80UL,  0x1DBFUL ),  /* Phonetic Extensions Supplement */
+    AF_UNIRANGE_REC(  0x1DC0UL,  0x1DFFUL ),  /* Combining Diacritical Marks Supplement */
+    AF_UNIRANGE_REC(  0x1E00UL,  0x1EFFUL ),  /* Latin Extended Additional */
+    AF_UNIRANGE_REC(  0x1F00UL,  0x1FFFUL ),  /* Greek Extended */
+    AF_UNIRANGE_REC(  0x2000UL,  0x206FUL ),  /* General Punctuation */
+    AF_UNIRANGE_REC(  0x2070UL,  0x209FUL ),  /* Superscripts and Subscripts */
+    AF_UNIRANGE_REC(  0x20A0UL,  0x20CFUL ),  /* Currency Symbols */
+    AF_UNIRANGE_REC(  0x2150UL,  0x218FUL ),  /* Number Forms */
+    AF_UNIRANGE_REC(  0x2460UL,  0x24FFUL ),  /* Enclosed Alphanumerics */
+    AF_UNIRANGE_REC(  0x2C60UL,  0x2C7FUL ),  /* Latin Extended-C */
+    AF_UNIRANGE_REC(  0x2DE0UL,  0x2DFFUL ),  /* Cyrillic Extended-A */
+    AF_UNIRANGE_REC(  0x2E00UL,  0x2E7FUL ),  /* Supplemental Punctuation */
+    AF_UNIRANGE_REC(  0xA640UL,  0xA69FUL ),  /* Cyrillic Extended-B */
+    AF_UNIRANGE_REC(  0xA720UL,  0xA7FFUL ),  /* Latin Extended-D */
+    AF_UNIRANGE_REC(  0xFB00UL,  0xFB06UL ),  /* Alphab. Present. Forms (Latin Ligs) */
+    AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ),  /* Mathematical Alphanumeric Symbols */
+    AF_UNIRANGE_REC( 0x1F100UL, 0x1F1FFUL ),  /* Enclosed Alphanumeric Supplement */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
+
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_ltn2_script_class,
+
+    AF_SCRIPT_LTN2,
+    AF_BLUE_STRINGSET_LATN,
+    AF_WRITING_SYSTEM_LATIN2,
+
+    af_ltn2_uniranges,
+    'o'
+  )
+
+
 /* END */
Index: lib/3rdparty/freetype/src/autofit/afhints.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afhints.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afhints.h	(copie de travail)
@@ -62,16 +62,20 @@
    *
    *  by David Turner and Werner Lemberg
    *
-   *   http://www.tug.org/TUGboat/Articles/tb24-3/lemberg.pdf
+   *    http://www.tug.org/TUGboat/Articles/tb24-3/lemberg.pdf
    *
+   *  with appropriate updates.
    *
+   *
    *  Segments
    *
    *    `af_{cjk,latin,...}_hints_compute_segments' are the functions to
-   *    find segments in an outline.  A segment is a series of consecutive
-   *    points that are approximately aligned along a coordinate axis.  The
-   *    analysis to do so is specific to a script.
+   *    find segments in an outline.
    *
+   *    A segment is a series of consecutive points that are approximately
+   *    aligned along a coordinate axis.  The analysis to do so is specific
+   *    to a writing system.
+   *
    *    A segment must have at least two points, except in the case of
    *    `fake' segments that are generated to hint metrics appropriately,
    *    and which consist of a single point.
@@ -79,18 +83,19 @@
    *
    *  Edges
    *
+   *    `af_{cjk,latin,...}_hints_compute_edges' are the functions to find
+   *    edges.
+   *
    *    As soon as segments are defined, the auto-hinter groups them into
    *    edges.  An edge corresponds to a single position on the main
    *    dimension that collects one or more segments (allowing for a small
    *    threshold).
    *
-   *    The auto-hinter first tries to grid fit edges, then to align
-   *    segments on the edges unless it detects that they form a serif.
+   *    As an example, the `latin' writing system first tries to grid-fit
+   *    edges, then to align segments on the edges unless it detects that
+   *    they form a serif.
    *
-   *    `af_{cjk,latin,...}_hints_compute_edges' are the functions to find
-   *    edges; they are specific to a script.
    *
-   *
    *                      A          H
    *                       |        |
    *                       |        |
@@ -107,6 +112,8 @@
    *
    *  Stems
    *
+   *    Stems are detected by `af_{cjk,latin,...}_hint_edges'.
+   *
    *    Segments need to be `linked' to other ones in order to detect stems.
    *    A stem is made of two segments that face each other in opposite
    *    directions and that are sufficiently close to each other.  Using
@@ -127,18 +134,22 @@
    *    The best candidate is stored in field `link' in structure
    *    `AF_Segment'.
    *
-   *    Stems are detected by `af_{cjk,latin,...}_hint_edges'.
-   *
    *    In the above ASCII drawing, the best candidate for both AB and CD is
    *    GH, while the best candidate for GH is AB.  Similarly, the best
    *    candidate for EF and GH is AB, while the best candidate for AB is
    *    GH.
    *
+   *    The detection and handling of stems is dependent on the writing
+   *    system.
    *
+   *
    *  Serifs
    *
-   *    On the opposite, a serif has
+   *    Serifs are detected by `af_{cjk,latin,...}_hint_edges'.
    *
+   *    In comparison to a stem, a serif (as handled by the auto-hinter
+   *    module which takes care of the `latin' writing system) has
+   *
    *      best segment_1 = segment_2 && best segment_2 != segment_1
    *
    *    where segment_1 corresponds to the serif segment (CD and EF in the
@@ -147,9 +158,7 @@
    *    The best candidate is stored in field `serif' in structure
    *    `AF_Segment' (and `link' is set to NULL).
    *
-   *    Serifs are detected by `af_{cjk,latin,...}_hint_edges'.
    *
-   *
    *  Touched points
    *
    *    A point is called `touched' if it has been processed somehow by the
@@ -178,7 +187,8 @@
    *      differ greatly)
    *
    *    - inflection points (i.e., where the `in' and `out' angles are the
-   *      same, but the curvature changes sign)
+   *      same, but the curvature changes sign) [currently, such points
+   *      aren't handled in the auto-hinter]
    *
    *    `af_glyph_hints_align_strong_points' is the function which takes
    *    care of such situations; it is equivalent to the TrueType `IP'
@@ -226,8 +236,11 @@
     AF_FLAG_WEAK_INTERPOLATION = 1 << 8,
 
     /* all inflection points in the outline have this flag set */
-    AF_FLAG_INFLECTION = 1 << 9
+    AF_FLAG_INFLECTION = 1 << 9,
 
+    /* the current point is very near to another one */
+    AF_FLAG_NEAR = 1 << 10
+
   } AF_Flags;
 
 
Index: lib/3rdparty/freetype/src/autofit/afdummy.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afdummy.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afdummy.c	(copie de travail)
@@ -26,8 +26,13 @@
   af_dummy_hints_init( AF_GlyphHints     hints,
                        AF_ScriptMetrics  metrics )
   {
-    af_glyph_hints_rescale( hints,
-                            metrics );
+    af_glyph_hints_rescale( hints, metrics );
+
+    hints->x_scale = metrics->scaler.x_scale;
+    hints->y_scale = metrics->scaler.y_scale;
+    hints->x_delta = metrics->scaler.x_delta;
+    hints->y_delta = metrics->scaler.y_delta;
+
     return FT_Err_Ok;
   }
 
@@ -36,18 +41,22 @@
   af_dummy_hints_apply( AF_GlyphHints  hints,
                         FT_Outline*    outline )
   {
-    FT_UNUSED( hints );
-    FT_UNUSED( outline );
+    FT_Error  error;
 
-    return FT_Err_Ok;
+
+    error = af_glyph_hints_reload( hints, outline );
+    if ( !error )
+      af_glyph_hints_save( hints, outline );
+
+    return error;
   }
 
 
-  AF_DEFINE_SCRIPT_CLASS( af_dummy_script_class,
-    AF_SCRIPT_DUMMY,
-    NULL,
-    0,
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_dummy_writing_system_class,
 
+    AF_WRITING_SYSTEM_DUMMY,
+
     sizeof ( AF_ScriptMetricsRec ),
 
     (AF_Script_InitMetricsFunc) NULL,
@@ -59,4 +68,16 @@
   )
 
 
+  AF_DEFINE_SCRIPT_CLASS(
+    af_dflt_script_class,
+
+    AF_SCRIPT_DFLT,
+    (AF_Blue_Stringset)0,
+    AF_WRITING_SYSTEM_DUMMY,
+
+    NULL,
+    '\0'
+  )
+
+
 /* END */
Index: lib/3rdparty/freetype/src/autofit/afindic.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afindic.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afindic.h	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for Indic scripts (specification).      */
 /*                                                                         */
-/*  Copyright 2007, 2012 by                                                */
+/*  Copyright 2007, 2012, 2013 by                                          */
 /*  Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.    */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,11 +25,16 @@
 FT_BEGIN_HEADER
 
 
-  /* the Indic-specific script class */
+  /* the `indic' writing system */
 
-  AF_DECLARE_SCRIPT_CLASS( af_indic_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_indic_writing_system_class )
 
 
+  /* the indic-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_deva_script_class )
+
+
 /* */
 
 FT_END_HEADER
Index: lib/3rdparty/freetype/src/autofit/aflatin2.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/aflatin2.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/aflatin2.h	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for latin script (specification).       */
 /*                                                                         */
-/*  Copyright 2003-2007, 2012 by                                           */
+/*  Copyright 2003-2007, 2012, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,10 +25,22 @@
 FT_BEGIN_HEADER
 
 
-  /* the latin-specific script class */
+  /* the `latin' writing system */
 
-  AF_DECLARE_SCRIPT_CLASS( af_latin2_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_latin2_writing_system_class )
 
+
+  /* the latin-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_ltn2_script_class )  /* XXX */
+#if 0
+  AF_DECLARE_SCRIPT_CLASS( af_arm2_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_cyr2_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_grk2_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_hbr2_script_class )
+#endif
+
+
 /* */
 
 FT_END_HEADER
Index: lib/3rdparty/freetype/src/autofit/afdummy.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afdummy.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afdummy.h	(copie de travail)
@@ -5,7 +5,7 @@
 /*    Auto-fitter dummy routines to be used if no hinting should be        */
 /*    performed (specification).                                           */
 /*                                                                         */
-/*  Copyright 2003-2005, 2011 by                                           */
+/*  Copyright 2003-2005, 2011, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,12 +25,14 @@
 
 FT_BEGIN_HEADER
 
- /*  A dummy script metrics class used when no hinting should
-  *  be performed.  This is the default for non-latin glyphs!
+ /*  A dummy writing system and script class used when no hinting should be
+  *  performed.
   */
 
-  AF_DECLARE_SCRIPT_CLASS( af_dummy_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_dummy_writing_system_class )
 
+  AF_DECLARE_SCRIPT_CLASS( af_dflt_script_class )
+
 /* */
 
 FT_END_HEADER
Index: lib/3rdparty/freetype/src/autofit/afglobal.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afglobal.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afglobal.c	(copie de travail)
@@ -17,39 +17,64 @@
 
 
 #include "afglobal.h"
-#include "afdummy.h"
-#include "aflatin.h"
-#include "afcjk.h"
-#include "afindic.h"
-#include "afpic.h"
 
+  /* get writing system specific header files */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )  /* empty */
+#include "afwrtsys.h"
+
 #include "aferrors.h"
+#include "afpic.h"
 
-#ifdef FT_OPTION_AUTOFIT2
-#include "aflatin2.h"
-#endif
 
 #ifndef FT_CONFIG_OPTION_PIC
 
-  /* when updating this table, don't forget to update          */
-  /* AF_SCRIPT_CLASSES_COUNT and autofit_module_class_pic_init */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )               \
+          &af_ ## ws ## _writing_system_class,
 
-  /* populate this list when you add new scripts */
-  static AF_ScriptClass const  af_script_classes[] =
+  FT_LOCAL_ARRAY_DEF( AF_WritingSystemClass )
+  af_writing_system_classes[] =
   {
-    &af_dummy_script_class,
-#ifdef FT_OPTION_AUTOFIT2
-    &af_latin2_script_class,
-#endif
-    &af_latin_script_class,
-    &af_cjk_script_class,
-    &af_indic_script_class,
+
+#include "afwrtsys.h"
+
     NULL  /* do not remove */
   };
 
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d )             \
+          &af_ ## s ## _script_class,
+
+  FT_LOCAL_ARRAY_DEF( AF_ScriptClass )
+  af_script_classes[] =
+  {
+
+#include "afscript.h"
+
+    NULL  /* do not remove */
+  };
+
 #endif /* !FT_CONFIG_OPTION_PIC */
 
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d )  #s,
+
+  FT_LOCAL_ARRAY_DEF( char* )
+  af_script_names[] =
+  {
+
+#include "afscript.h"
+
+  };
+
+#endif /* FT_DEBUG_LEVEL_TRACE */
+
+
   /* Compute the script index of each glyph within a given face. */
 
   static FT_Error
@@ -82,11 +107,11 @@
     /* scan each script in a Unicode charmap */
     for ( ss = 0; AF_SCRIPT_CLASSES_GET[ss]; ss++ )
     {
-      AF_ScriptClass      clazz = AF_SCRIPT_CLASSES_GET[ss];
+      AF_ScriptClass      script_class = AF_SCRIPT_CLASSES_GET[ss];
       AF_Script_UniRange  range;
 
 
-      if ( clazz->script_uni_ranges == NULL )
+      if ( script_class->script_uni_ranges == NULL )
         continue;
 
       /*
@@ -93,7 +118,9 @@
        *  Scan all Unicode points in the range and set the corresponding
        *  glyph script index.
        */
-      for ( range = clazz->script_uni_ranges; range->first != 0; range++ )
+      for ( range = script_class->script_uni_ranges;
+            range->first != 0;
+            range++ )
       {
         FT_ULong  charcode = range->first;
         FT_UInt   gindex;
@@ -204,14 +231,15 @@
       {
         if ( globals->metrics[nn] )
         {
-          AF_ScriptClass  clazz = AF_SCRIPT_CLASSES_GET[nn];
+          AF_ScriptClass         script_class =
+            AF_SCRIPT_CLASSES_GET[nn];
+          AF_WritingSystemClass  writing_system_class =
+            AF_WRITING_SYSTEM_CLASSES_GET[script_class->writing_system];
 
 
-          FT_ASSERT( globals->metrics[nn]->clazz == clazz );
+          if ( writing_system_class->script_metrics_done )
+            writing_system_class->script_metrics_done( globals->metrics[nn] );
 
-          if ( clazz->script_metrics_done )
-            clazz->script_metrics_done( globals->metrics[nn] );
-
           FT_FREE( globals->metrics[nn] );
         }
       }
@@ -232,14 +260,14 @@
                                AF_ScriptMetrics  *ametrics )
   {
     AF_ScriptMetrics  metrics = NULL;
-    FT_UInt           gidx;
-    AF_ScriptClass    clazz;
-    FT_UInt           script     = options & 15;
-    const FT_Offset   script_max = sizeof ( AF_SCRIPT_CLASSES_GET ) /
-                                     sizeof ( AF_SCRIPT_CLASSES_GET[0] );
-    FT_Error          error      = FT_Err_Ok;
 
+    AF_Script              script = (AF_Script)( options & 15 );
+    AF_WritingSystemClass  writing_system_class;
+    AF_ScriptClass         script_class;
 
+    FT_Error  error = FT_Err_Ok;
+
+
     if ( gindex >= (FT_ULong)globals->glyph_count )
     {
       error = FT_THROW( Invalid_Argument );
@@ -246,15 +274,16 @@
       goto Exit;
     }
 
-    gidx = script;
-    if ( gidx == 0 || gidx + 1 >= script_max )
-      gidx = globals->glyph_scripts[gindex] & AF_SCRIPT_NONE;
+    /* if we have a forced script (via `options'), use it, */
+    /* otherwise look into `glyph_scripts' array           */
+    if ( script == AF_SCRIPT_DFLT || script + 1 >= AF_SCRIPT_MAX )
+      script = (AF_Script)( globals->glyph_scripts[gindex] & AF_SCRIPT_NONE );
 
-    clazz = AF_SCRIPT_CLASSES_GET[gidx];
-    if ( script == 0 )
-      script = clazz->script;
+    script_class         = AF_SCRIPT_CLASSES_GET[script];
+    writing_system_class = AF_WRITING_SYSTEM_CLASSES_GET
+                             [script_class->writing_system];
 
-    metrics = globals->metrics[clazz->script];
+    metrics = globals->metrics[script];
     if ( metrics == NULL )
     {
       /* create the global metrics object if necessary */
@@ -261,19 +290,20 @@
       FT_Memory  memory = globals->face->memory;
 
 
-      if ( FT_ALLOC( metrics, clazz->script_metrics_size ) )
+      if ( FT_ALLOC( metrics, writing_system_class->script_metrics_size ) )
         goto Exit;
 
-      metrics->clazz   = clazz;
-      metrics->globals = globals;
+      metrics->script_class = script_class;
+      metrics->globals      = globals;
 
-      if ( clazz->script_metrics_init )
+      if ( writing_system_class->script_metrics_init )
       {
-        error = clazz->script_metrics_init( metrics, globals->face );
+        error = writing_system_class->script_metrics_init( metrics,
+                                                           globals->face );
         if ( error )
         {
-          if ( clazz->script_metrics_done )
-            clazz->script_metrics_done( metrics );
+          if ( writing_system_class->script_metrics_done )
+            writing_system_class->script_metrics_done( metrics );
 
           FT_FREE( metrics );
           goto Exit;
@@ -280,7 +310,7 @@
         }
       }
 
-      globals->metrics[clazz->script] = metrics;
+      globals->metrics[script] = metrics;
     }
 
   Exit:
Index: lib/3rdparty/freetype/src/autofit/autofit.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/autofit.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/autofit.c	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter module (body).                                           */
 /*                                                                         */
-/*  Copyright 2003-2007, 2011 by                                           */
+/*  Copyright 2003-2007, 2011, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,6 +20,7 @@
 #include <ft2build.h>
 #include "afpic.c"
 #include "afangles.c"
+#include "afblue.c"
 #include "afglobal.c"
 #include "afhints.c"
 
Index: lib/3rdparty/freetype/src/autofit/afglobal.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afglobal.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afglobal.h	(copie de travail)
@@ -5,7 +5,7 @@
 /*    Auto-fitter routines to compute global hinting values                */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2003-2005, 2007, 2009, 2011-2012 by                          */
+/*  Copyright 2003-2005, 2007, 2009, 2011-2013 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -28,6 +28,17 @@
 FT_BEGIN_HEADER
 
 
+  FT_LOCAL_ARRAY( AF_WritingSystemClass )
+  af_writing_system_classes[];
+
+  FT_LOCAL_ARRAY( AF_ScriptClass )
+  af_script_classes[];
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+  FT_LOCAL_ARRAY( char* )
+  af_script_names[];
+#endif
+
   /*
    *  Default values and flags for both autofitter globals (found in
    *  AF_ModuleRec) and face globals (in AF_FaceGlobalsRec).
@@ -34,7 +45,11 @@
    */
 
   /* index of fallback script in `af_script_classes' */
-#define AF_SCRIPT_FALLBACK  2
+#ifdef AF_CONFIG_OPTION_CJK
+#define AF_SCRIPT_FALLBACK  AF_SCRIPT_HANI
+#else
+#define AF_SCRIPT_FALLBACK  AF_SCRIPT_DFLT
+#endif
   /* a bit mask indicating an uncovered glyph        */
 #define AF_SCRIPT_NONE      0x7F
   /* if this flag is set, we have an ASCII digit     */
@@ -55,8 +70,8 @@
 
 
   /*
-   *  Note that glyph_scripts[] is used to map each glyph into
-   *  an index into the `af_script_classes' array.
+   *  Note that glyph_scripts[] maps each glyph to an index into the
+   *  `af_script_classes' array.
    *
    */
   typedef struct  AF_FaceGlobalsRec_
Index: lib/3rdparty/freetype/src/autofit/afloader.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afloader.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afloader.c	(copie de travail)
@@ -21,6 +21,7 @@
 #include "afhints.h"
 #include "aferrors.h"
 #include "afmodule.h"
+#include "afpic.h"
 
 
   /* Initialize glyph loader. */
@@ -180,11 +181,21 @@
 
       /* now load the slot image into the auto-outline and run the */
       /* automatic hinting process                                 */
-      if ( metrics->clazz->script_hints_apply )
-        metrics->clazz->script_hints_apply( hints,
-                                            &gloader->current.outline,
-                                            metrics );
+      {
+#ifdef FT_CONFIG_OPTION_PIC
+        AF_FaceGlobals         globals              = loader->globals;
+#endif
+        AF_WritingSystemClass  writing_system_class =
+                                 AF_WRITING_SYSTEM_CLASSES_GET
+                                   [metrics->script_class->writing_system];
 
+
+        if ( writing_system_class->script_hints_apply )
+          writing_system_class->script_hints_apply( hints,
+                                                    &gloader->current.outline,
+                                                    metrics );
+      }
+
       /* we now need to adjust the metrics according to the change in */
       /* width/positioning that occurred during the hinting process   */
       if ( scaler->render_mode != FT_RENDER_MODE_LIGHT )
@@ -519,13 +530,13 @@
     if ( !error )
     {
       AF_ScriptMetrics  metrics;
-      FT_UInt           options = 0;
+      FT_UInt           options = AF_SCRIPT_DFLT;
 
 
 #ifdef FT_OPTION_AUTOFIT2
-      /* XXX: undocumented hook to activate the latin2 hinter */
+      /* XXX: undocumented hook to activate the latin2 writing system */
       if ( load_flags & ( 1UL << 20 ) )
-        options = 2;
+        options = AF_SCRIPT_LTN2;
 #endif
 
       error = af_face_globals_get_metrics( loader->globals, gindex,
@@ -532,10 +543,18 @@
                                            options, &metrics );
       if ( !error )
       {
+#ifdef FT_CONFIG_OPTION_PIC
+        AF_FaceGlobals         globals              = loader->globals;
+#endif
+        AF_WritingSystemClass  writing_system_class =
+                                 AF_WRITING_SYSTEM_CLASSES_GET
+                                   [metrics->script_class->writing_system];
+
+
         loader->metrics = metrics;
 
-        if ( metrics->clazz->script_metrics_scale )
-          metrics->clazz->script_metrics_scale( metrics, &scaler );
+        if ( writing_system_class->script_metrics_scale )
+          writing_system_class->script_metrics_scale( metrics, &scaler );
         else
           metrics->scaler = scaler;
 
@@ -542,10 +561,10 @@
         load_flags |=  FT_LOAD_NO_SCALE | FT_LOAD_IGNORE_TRANSFORM;
         load_flags &= ~FT_LOAD_RENDER;
 
-        if ( metrics->clazz->script_hints_init )
+        if ( writing_system_class->script_hints_init )
         {
-          error = metrics->clazz->script_hints_init( &loader->hints,
-                                                     metrics );
+          error = writing_system_class->script_hints_init( &loader->hints,
+                                                           metrics );
           if ( error )
             goto Exit;
         }
Index: lib/3rdparty/freetype/src/autofit/afcjk.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afcjk.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/afcjk.c	(copie de travail)
@@ -26,7 +26,7 @@
 #include FT_ADVANCES_H
 #include FT_INTERNAL_DEBUG_H
 
-#include "aftypes.h"
+#include "afglobal.h"
 #include "aflatin.h"
 
 
@@ -73,6 +73,12 @@
     AF_GlyphHintsRec  hints[1];
 
 
+    FT_TRACE5(( "\n"
+                "cjk standard widths computation (script `%s')\n"
+                "===============================================\n"
+                "\n",
+                af_script_names[metrics->root.script_class->script] ));
+
     af_glyph_hints_init( hints, face->memory );
 
     metrics->axis[AF_DIMENSION_HORZ].width_count = 0;
@@ -86,11 +92,15 @@
       AF_Scaler         scaler = &dummy->root.scaler;
 
 
-      glyph_index = FT_Get_Char_Index( face,
-                                       metrics->root.clazz->standard_char );
+      glyph_index = FT_Get_Char_Index(
+                      face,
+                      metrics->root.script_class->standard_char );
       if ( glyph_index == 0 )
         goto Exit;
 
+      FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
+                  metrics->root.script_class->standard_char, glyph_index ));
+
       error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
       if ( error || face->glyph->outline.n_points <= 0 )
         goto Exit;
@@ -122,11 +132,13 @@
         FT_UInt       num_widths = 0;
 
 
-        error = af_latin_hints_compute_segments( hints, (AF_Dimension)dim );
+        error = af_latin_hints_compute_segments( hints,
+                                                 (AF_Dimension)dim );
         if ( error )
           goto Exit;
 
-        af_latin_hints_link_segments( hints, (AF_Dimension)dim );
+        af_latin_hints_link_segments( hints,
+                                      (AF_Dimension)dim );
 
         seg   = axhints->segments;
         limit = seg + axhints->num_segments;
@@ -151,7 +163,7 @@
         }
 
         /* this also replaces multiple almost identical stem widths */
-        /* with a single one (the value 100 is heuristic) */
+        /* with a single one (the value 100 is heuristic)           */
         af_sort_and_quantize_widths( &num_widths, axis->widths,
                                      dummy->units_per_em / 100 );
         axis->width_count = num_widths;
@@ -171,263 +183,201 @@
         axis->edge_distance_threshold = stdw / 5;
         axis->standard_width          = stdw;
         axis->extra_light             = 0;
-      }
-    }
 
-    af_glyph_hints_done( hints );
-  }
+#ifdef FT_DEBUG_LEVEL_TRACE
+        {
+          FT_UInt  i;
 
 
-#define AF_CJK_MAX_TEST_CHARACTERS  32
+          FT_TRACE5(( "%s widths:\n",
+                      dim == AF_DIMENSION_VERT ? "horizontal"
+                                               : "vertical" ));
 
+          FT_TRACE5(( "  %d (standard)", axis->standard_width ));
+          for ( i = 1; i < axis->width_count; i++ )
+            FT_TRACE5(( " %d", axis->widths[i].org ));
 
-  /* Each blue zone has two types of fill and unfill, this is, */
-  /* filling the entire glyph square or not.                   */
+          FT_TRACE5(( "\n" ));
+        }
+#endif
+      }
+    }
 
-  enum
-  {
-    AF_CJK_BLUE_TYPE_FILL,
-    AF_CJK_BLUE_TYPE_UNFILL,
-    AF_CJK_BLUE_TYPE_MAX
-  };
+    FT_TRACE5(( "\n" ));
 
+    af_glyph_hints_done( hints );
+  }
 
-  /* Put some common and representative Han Ideographs characters here. */
-  static const FT_ULong af_cjk_hani_blue_chars[AF_CJK_BLUE_MAX]
-                                              [AF_CJK_BLUE_TYPE_MAX]
-                                              [AF_CJK_MAX_TEST_CHARACTERS] =
-  {
-    {
-      {
-        0x4ED6, 0x4EEC, 0x4F60, 0x4F86, 0x5011, 0x5230, 0x548C, 0x5730,
-        0x5BF9, 0x5C0D, 0x5C31, 0x5E2D, 0x6211, 0x65F6, 0x6642, 0x6703,
-        0x6765, 0x70BA, 0x80FD, 0x8230, 0x8AAA, 0x8BF4, 0x8FD9, 0x9019,
-        0x9F4A /* top fill */
-      },
-      {
-        0x519B, 0x540C, 0x5DF2, 0x613F, 0x65E2, 0x661F, 0x662F, 0x666F,
-        0x6C11, 0x7167, 0x73B0, 0x73FE, 0x7406, 0x7528, 0x7F6E, 0x8981,
-        0x8ECD, 0x90A3, 0x914D, 0x91CC, 0x958B, 0x96F7, 0x9732, 0x9762,
-        0x987E /* top unfill */
-      }
-    },
-    {
-      {
-        0x4E2A, 0x4E3A, 0x4EBA, 0x4ED6, 0x4EE5, 0x4EEC, 0x4F60, 0x4F86,
-        0x500B, 0x5011, 0x5230, 0x548C, 0x5927, 0x5BF9, 0x5C0D, 0x5C31,
-        0x6211, 0x65F6, 0x6642, 0x6709, 0x6765, 0x70BA, 0x8981, 0x8AAA,
-        0x8BF4 /* bottom fill */
-      },
-      {
-        0x4E3B, 0x4E9B, 0x56E0, 0x5B83, 0x60F3, 0x610F, 0x7406, 0x751F,
-        0x7576, 0x770B, 0x7740, 0x7F6E, 0x8005, 0x81EA, 0x8457, 0x88E1,
-        0x8FC7, 0x8FD8, 0x8FDB, 0x9032, 0x904E, 0x9053, 0x9084, 0x91CC,
-        0x9762 /* bottom unfill */
-      }
-    },
-#ifndef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
-      { {0x0000}, {0x0000} },
-      { {0x0000}, {0x0000} }
-#else
-    {
-      {
-        0x4E9B, 0x4EEC, 0x4F60, 0x4F86, 0x5011, 0x5230, 0x548C, 0x5730,
-        0x5979, 0x5C06, 0x5C07, 0x5C31, 0x5E74, 0x5F97, 0x60C5, 0x6700,
-        0x6837, 0x6A23, 0x7406, 0x80FD, 0x8AAA, 0x8BF4, 0x8FD9, 0x9019,
-        0x901A /* left fill */
-      },
-      {
-        0x5373, 0x5417, 0x5427, 0x542C, 0x5462, 0x54C1, 0x54CD, 0x55CE,
-        0x5E08, 0x5E2B, 0x6536, 0x65AD, 0x65B7, 0x660E, 0x773C, 0x9593,
-        0x95F4, 0x9645, 0x9648, 0x9650, 0x9664, 0x9673, 0x968F, 0x969B,
-        0x96A8 /* left unfill */
-      }
-    },
-    {
-      {
-        0x4E8B, 0x524D, 0x5B78, 0x5C06, 0x5C07, 0x60C5, 0x60F3, 0x6216,
-        0x653F, 0x65AF, 0x65B0, 0x6837, 0x6A23, 0x6C11, 0x6C92, 0x6CA1,
-        0x7136, 0x7279, 0x73B0, 0x73FE, 0x7403, 0x7B2C, 0x7D93, 0x8C01,
-        0x8D77 /* right fill */
-      },
-      {
-        0x4F8B, 0x5225, 0x522B, 0x5236, 0x52A8, 0x52D5, 0x5417, 0x55CE,
-        0x589E, 0x6307, 0x660E, 0x671D, 0x671F, 0x6784, 0x7269, 0x786E,
-        0x79CD, 0x8ABF, 0x8C03, 0x8CBB, 0x8D39, 0x90A3, 0x90FD, 0x9593,
-        0x95F4 /* right unfill */
-      }
-    }
-#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
-  };
 
+  /* Find all blue zones. */
 
-  /* Calculate blue zones for all the CJK_BLUE_XXX's. */
-
   static void
-  af_cjk_metrics_init_blues( AF_CJKMetrics   metrics,
-                             FT_Face         face,
-                             const FT_ULong  blue_chars
-                                               [AF_CJK_BLUE_MAX]
-                                               [AF_CJK_BLUE_TYPE_MAX]
-                                               [AF_CJK_MAX_TEST_CHARACTERS] )
+  af_cjk_metrics_init_blues( AF_CJKMetrics  metrics,
+                             FT_Face        face )
   {
-    FT_Pos        fills[AF_CJK_MAX_TEST_CHARACTERS];
-    FT_Pos        flats[AF_CJK_MAX_TEST_CHARACTERS];
+    FT_Pos      fills[AF_BLUE_STRING_MAX_LEN];
+    FT_Pos      flats[AF_BLUE_STRING_MAX_LEN];
 
-    FT_Int        num_fills;
-    FT_Int        num_flats;
+    FT_Int      num_fills;
+    FT_Int      num_flats;
 
-    FT_Int        bb;
-    AF_CJKBlue    blue;
-    FT_Error      error;
-    AF_CJKAxis    axis;
-    FT_GlyphSlot  glyph = face->glyph;
+    AF_CJKBlue  blue;
+    FT_Error    error;
+    AF_CJKAxis  axis;
+    FT_Outline  outline;
 
+    AF_Blue_Stringset         bss = metrics->root.script_class->blue_stringset;
+    const AF_Blue_StringRec*  bs  = &af_blue_stringsets[bss];
+
 #ifdef FT_DEBUG_LEVEL_TRACE
-    FT_String*  cjk_blue_name[AF_CJK_BLUE_MAX] = {
-      (FT_String*)"top",
-      (FT_String*)"bottom",
-      (FT_String*)"left",
-      (FT_String*)"right"
+    FT_String*  cjk_blue_name[4] =
+    {
+      (FT_String*)"bottom",    /* --   , --  */
+      (FT_String*)"top",       /* --   , TOP */
+      (FT_String*)"left",      /* HORIZ, --  */
+      (FT_String*)"right"      /* HORIZ, TOP */
     };
-    FT_String*  cjk_blue_type_name[AF_CJK_BLUE_TYPE_MAX] = {
-      (FT_String*)"filled",
-      (FT_String*)"unfilled"
+
+    FT_String*  cjk_blue_type_name[2] =
+    {
+      (FT_String*)"unfilled",  /* --   */
+      (FT_String*)"filled"     /* FILL */
     };
 #endif
 
 
-    /* We compute the blues simply by loading each character from the */
-    /* `blue_chars[blues]' string, then computing its extreme points  */
-    /* (depending blue zone type etc.).                               */
+    /* we walk over the blue character strings as specified in the    */
+    /* script's entry in the `af_blue_stringset' array, computing its */
+    /* extremum points (depending on the string properties)           */
 
-    FT_TRACE5(( "cjk blue zones computation\n" ));
-    FT_TRACE5(( "------------------------------------------------\n" ));
+    FT_TRACE5(( "cjk blue zones computation\n"
+                "==========================\n"
+                "\n" ));
 
-    for ( bb = 0; bb < AF_CJK_BLUE_MAX; bb++ )
+    for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ )
     {
-      FT_Int   fill_type;
-      FT_Pos*  blue_ref;
-      FT_Pos*  blue_shoot;
+      const char*  p = &af_blue_strings[bs->string];
+      FT_Pos*      blue_ref;
+      FT_Pos*      blue_shoot;
 
 
+      if ( AF_CJK_IS_HORIZ_BLUE( bs ) )
+        axis = &metrics->axis[AF_DIMENSION_HORZ];
+      else
+        axis = &metrics->axis[AF_DIMENSION_VERT];
+
+      FT_TRACE5(( "blue zone %d:\n", axis->blue_count ));
+
       num_fills = 0;
       num_flats = 0;
 
-      for ( fill_type = 0; fill_type < AF_CJK_BLUE_TYPE_MAX; fill_type++ )
+      FT_TRACE5(( "  cjk blue %s/%s\n",
+                  cjk_blue_name[AF_CJK_IS_HORIZ_BLUE( bs ) |
+                                AF_CJK_IS_TOP_BLUE( bs )   ],
+                  cjk_blue_type_name[!!AF_CJK_IS_FILLED_BLUE( bs )] ));
+
+      while ( *p )
       {
-        const FT_ULong*  p     = blue_chars[bb][fill_type];
-        const FT_ULong*  limit = p + AF_CJK_MAX_TEST_CHARACTERS;
-        FT_Bool          fill  = FT_BOOL(
-                                   fill_type == AF_CJK_BLUE_TYPE_FILL );
+        FT_ULong    ch;
+        FT_UInt     glyph_index;
+        FT_Pos      best_pos;       /* same as points.y or points.x, resp. */
+        FT_Int      best_point;
+        FT_Vector*  points;
 
 
-        FT_TRACE5(( "cjk blue %s/%s\n", cjk_blue_name[bb],
-                                        cjk_blue_type_name[fill_type] ));
+        GET_UTF8_CHAR( ch, p );
 
+        /* load the character in the face -- skip unknown or empty ones */
+        glyph_index = FT_Get_Char_Index( face, ch );
+        if ( glyph_index == 0 )
+        {
+          FT_TRACE5(( "  U+%04lX unavailable\n", ch ));
+          continue;
+        }
 
-        for ( ; p < limit && *p; p++ )
+        error   = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
+        outline = face->glyph->outline;
+        if ( error || outline.n_points <= 0 )
         {
-          FT_UInt     glyph_index;
-          FT_Pos      best_pos; /* same as points.y */
-          FT_Int      best_point;
-          FT_Vector*  points;
+          FT_TRACE5(( "  U+%04lX contains no outlines\n", ch ));
+          continue;
+        }
 
+        /* now compute min or max point indices and coordinates */
+        points     = outline.points;
+        best_point = -1;
+        best_pos   = 0;  /* make compiler happy */
 
-          FT_TRACE5(( "  U+%lX...", *p ));
+        {
+          FT_Int  nn;
+          FT_Int  first = 0;
+          FT_Int  last  = -1;
 
-          /* load the character in the face -- skip unknown or empty ones */
-          glyph_index = FT_Get_Char_Index( face, *p );
-          if ( glyph_index == 0 )
-          {
-            FT_TRACE5(( "unavailable\n" ));
-            continue;
-          }
 
-          error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
-          if ( error || glyph->outline.n_points <= 0 )
+          for ( nn = 0; nn < outline.n_contours; first = last + 1, nn++ )
           {
-            FT_TRACE5(( "no outline\n" ));
-            continue;
-          }
+            FT_Int  pp;
 
-          /* now compute min or max point indices and coordinates */
-          points     = glyph->outline.points;
-          best_point = -1;
-          best_pos   = 0;  /* make compiler happy */
 
-          {
-            FT_Int  nn;
-            FT_Int  first = 0;
-            FT_Int  last  = -1;
+            last = outline.contours[nn];
 
+            /* Avoid single-point contours since they are never rasterized. */
+            /* In some fonts, they correspond to mark attachment points     */
+            /* which are way outside of the glyph's real outline.           */
+            if ( last <= first )
+              continue;
 
-            for ( nn = 0;
-                  nn < glyph->outline.n_contours;
-                  first = last + 1, nn++ )
+            if ( AF_CJK_IS_HORIZ_BLUE( bs ) )
             {
-              FT_Int  pp;
-
-
-              last = glyph->outline.contours[nn];
-
-              /* Avoid single-point contours since they are never       */
-              /* rasterized.  In some fonts, they correspond to mark    */
-              /* attachment points which are way outside of the glyph's */
-              /* real outline.                                          */
-              if ( last <= first )
-                continue;
-
-              switch ( bb )
+              if ( AF_CJK_IS_RIGHT_BLUE( bs ) )
               {
-              case AF_CJK_BLUE_TOP:
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].y > best_pos )
+                  if ( best_point < 0 || points[pp].x > best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].y;
+                    best_pos   = points[pp].x;
                   }
-                break;
-
-              case AF_CJK_BLUE_BOTTOM:
+              }
+              else
+              {
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].y < best_pos )
+                  if ( best_point < 0 || points[pp].x < best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].y;
+                    best_pos   = points[pp].x;
                   }
-                break;
-
-              case AF_CJK_BLUE_LEFT:
+              }
+            }
+            else
+            {
+              if ( AF_CJK_IS_TOP_BLUE( bs ) )
+              {
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].x < best_pos )
+                  if ( best_point < 0 || points[pp].y > best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].x;
+                    best_pos   = points[pp].y;
                   }
-                break;
-
-              case AF_CJK_BLUE_RIGHT:
+              }
+              else
+              {
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].x > best_pos )
+                  if ( best_point < 0 || points[pp].y < best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].x;
+                    best_pos   = points[pp].y;
                   }
-                break;
-
-              default:
-                ;
               }
             }
-            FT_TRACE5(( "best_pos=%5ld\n", best_pos ));
           }
 
-          if ( fill )
-            fills[num_fills++] = best_pos;
-          else
-            flats[num_flats++] = best_pos;
+          FT_TRACE5(( "  U+%04lX: best_pos = %5ld\n", ch, best_pos ));
         }
+
+        if ( AF_CJK_IS_FILLED_BLUE( bs ) )
+          fills[num_fills++] = best_pos;
+        else
+          flats[num_flats++] = best_pos;
       }
 
       if ( num_flats == 0 && num_fills == 0 )
@@ -436,34 +386,30 @@
          *  we couldn't find a single glyph to compute this blue zone,
          *  we will simply ignore it then
          */
-        FT_TRACE5(( "empty\n" ));
+        FT_TRACE5(( "    empty\n" ));
         continue;
       }
 
       /* we have computed the contents of the `fill' and `flats' tables, */
-      /* now determine the reference position of the blue --             */
+      /* now determine the reference position of the blue zone --        */
       /* we simply take the median value after a simple sort             */
       af_sort_pos( num_flats, flats );
       af_sort_pos( num_fills, fills );
 
-      if ( AF_CJK_BLUE_TOP == bb || AF_CJK_BLUE_BOTTOM == bb )
-        axis = &metrics->axis[AF_DIMENSION_VERT];
-      else
-        axis = &metrics->axis[AF_DIMENSION_HORZ];
+      blue       = &axis->blues[axis->blue_count];
+      blue_ref   = &blue->ref.org;
+      blue_shoot = &blue->shoot.org;
 
-      blue       = & axis->blues[axis->blue_count];
-      blue_ref   = & blue->ref.org;
-      blue_shoot = & blue->shoot.org;
+      axis->blue_count++;
 
-      axis->blue_count++;
       if ( num_flats == 0 )
       {
-        *blue_ref   = fills[num_fills / 2];
+        *blue_ref   =
         *blue_shoot = fills[num_fills / 2];
       }
       else if ( num_fills == 0 )
       {
-        *blue_ref   = flats[num_flats / 2];
+        *blue_ref   =
         *blue_shoot = flats[num_flats / 2];
       }
       else
@@ -481,26 +427,34 @@
         FT_Bool  under_ref = FT_BOOL( shoot < ref );
 
 
-        if ( ( AF_CJK_BLUE_TOP == bb   ||
-               AF_CJK_BLUE_RIGHT == bb ) ^ under_ref )
-          *blue_shoot = *blue_ref = ( shoot + ref ) / 2;
+        /* AF_CJK_IS_TOP_BLUE covers `right' and `top' */
+        if ( AF_CJK_IS_TOP_BLUE( bs ) ^ under_ref )
+        {
+          *blue_ref   =
+          *blue_shoot = ( shoot + ref ) / 2;
+
+          FT_TRACE5(( "  [overshoot smaller than reference,"
+                      " taking mean value]\n" ));
+        }
       }
 
       blue->flags = 0;
-      if ( AF_CJK_BLUE_TOP == bb )
-        blue->flags |= AF_CJK_BLUE_IS_TOP;
-      else if ( AF_CJK_BLUE_RIGHT == bb )
-        blue->flags |= AF_CJK_BLUE_IS_RIGHT;
+      if ( AF_CJK_IS_TOP_BLUE( bs ) )
+        blue->flags |= AF_CJK_BLUE_TOP;
 
-      FT_TRACE5(( "-- cjk %s bluezone ref = %ld shoot = %ld\n",
-                  cjk_blue_name[bb], *blue_ref, *blue_shoot ));
+      FT_TRACE5(( "    -> reference = %ld\n"
+                  "       overshoot = %ld\n",
+                  *blue_ref, *blue_shoot ));
     }
 
+    FT_TRACE5(( "\n" ));
+
     return;
   }
 
 
   /* Basically the Latin version with type AF_CJKMetrics for metrics. */
+
   FT_LOCAL_DEF( void )
   af_cjk_metrics_check_digits( AF_CJKMetrics  metrics,
                                FT_Face        face )
@@ -510,8 +464,7 @@
     FT_Fixed  advance, old_advance = 0;
 
 
-    /* check whether all ASCII digits have the same advance width; */
-    /* digit `0' is 0x30 in all supported charmaps                 */
+    /* digit `0' is 0x30 in all supported charmaps */
     for ( i = 0x30; i <= 0x39; i++ )
     {
       FT_UInt  glyph_index;
@@ -547,6 +500,8 @@
   }
 
 
+  /* Initialize global metrics. */
+
   FT_LOCAL_DEF( FT_Error )
   af_cjk_metrics_init( AF_CJKMetrics  metrics,
                        FT_Face        face )
@@ -556,21 +511,21 @@
 
     metrics->units_per_em = face->units_per_EM;
 
-    if ( FT_Select_Charmap( face, FT_ENCODING_UNICODE ) )
-      face->charmap = NULL;
-    else
+    if ( !FT_Select_Charmap( face, FT_ENCODING_UNICODE ) )
     {
       af_cjk_metrics_init_widths( metrics, face );
-      af_cjk_metrics_init_blues( metrics, face, af_cjk_hani_blue_chars );
+      af_cjk_metrics_init_blues( metrics, face );
       af_cjk_metrics_check_digits( metrics, face );
     }
 
     FT_Set_Charmap( face, oldmap );
-
     return FT_Err_Ok;
   }
 
 
+  /* Adjust scaling value, then scale and shift widths   */
+  /* and blue zones (if applicable) for given dimension. */
+
   static void
   af_cjk_metrics_scale_dim( AF_CJKMetrics  metrics,
                             AF_Scaler      scaler,
@@ -582,8 +537,6 @@
     FT_UInt     nn;
 
 
-    axis = &metrics->axis[dim];
-
     if ( dim == AF_DIMENSION_HORZ )
     {
       scale = scaler->x_scale;
@@ -595,6 +548,8 @@
       delta = scaler->y_delta;
     }
 
+    axis = &metrics->axis[dim];
+
     if ( axis->org_scale == scale && axis->org_delta == delta )
       return;
 
@@ -650,12 +605,13 @@
 
         blue->shoot.fit = blue->ref.fit - delta2;
 
-        FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]: "
-                     "ref: cur=%.2f fit=%.2f shoot: cur=%.2f fit=%.2f\n",
-                       ( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V',
-                       nn, blue->ref.org, blue->shoot.org,
-                       blue->ref.cur / 64.0, blue->ref.fit / 64.0,
-                       blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 ));
+        FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]:\n"
+                    "     ref:   cur=%.2f fit=%.2f\n"
+                    "     shoot: cur=%.2f fit=%.2f\n",
+                    ( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V',
+                    nn, blue->ref.org, blue->shoot.org,
+                    blue->ref.cur / 64.0, blue->ref.fit / 64.0,
+                    blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 ));
 
         blue->flags |= AF_CJK_BLUE_ACTIVE;
       }
@@ -663,10 +619,14 @@
   }
 
 
+  /* Scale global values in both directions. */
+
   FT_LOCAL_DEF( void )
   af_cjk_metrics_scale( AF_CJKMetrics  metrics,
                         AF_Scaler      scaler )
   {
+    /* we copy the whole structure since the x and y scaling values */
+    /* are not modified, contrary to e.g. the `latin' auto-hinter   */
     metrics->root.scaler = *scaler;
 
     af_cjk_metrics_scale_dim( metrics, scaler, AF_DIMENSION_HORZ );
@@ -682,6 +642,9 @@
   /*************************************************************************/
   /*************************************************************************/
 
+
+  /* Walk over all contours and compute its segments. */
+
   static FT_Error
   af_cjk_hints_compute_segments( AF_GlyphHints  hints,
                                  AF_Dimension   dim )
@@ -938,7 +901,7 @@
 
     for ( seg = segments; seg < segment_limit; seg++ )
     {
-      AF_Edge  found = 0;
+      AF_Edge  found = NULL;
       FT_Pos   best  = 0xFFFFU;
       FT_Int   ee;
 
@@ -1026,25 +989,26 @@
       }
     }
 
-    /*********************************************************************/
-    /*                                                                   */
-    /* Good, we now compute each edge's properties according to segments */
-    /* found on its position.  Basically, these are as follows.          */
-    /*                                                                   */
-    /*  - edge's main direction                                          */
-    /*  - stem edge, serif edge or both (which defaults to stem then)    */
-    /*  - rounded edge, straight or both (which defaults to straight)    */
-    /*  - link for edge                                                  */
-    /*                                                                   */
-    /*********************************************************************/
+    /******************************************************************/
+    /*                                                                */
+    /* Good, we now compute each edge's properties according to the   */
+    /* segments found on its position.  Basically, these are          */
+    /*                                                                */
+    /*  - the edge's main direction                                   */
+    /*  - stem edge, serif edge or both (which defaults to stem then) */
+    /*  - rounded edge, straight or both (which defaults to straight) */
+    /*  - link for edge                                               */
+    /*                                                                */
+    /******************************************************************/
 
-    /* first of all, set the `edge' field in each segment -- this is     */
-    /* required in order to compute edge links                           */
-    /*                                                                   */
-    /* Note that removing this loop and setting the `edge' field of each */
-    /* segment directly in the code above slows down execution speed for */
-    /* some reasons on platforms like the Sun.                           */
+    /* first of all, set the `edge' field in each segment -- this is */
+    /* required in order to compute edge links                       */
 
+    /*
+     * Note that removing this loop and setting the `edge' field of each
+     * segment directly in the code above slows down execution speed for
+     * some reasons on platforms like the Sun.
+     */
     {
       AF_Edge  edges      = axis->edges;
       AF_Edge  edge_limit = edges + axis->num_edges;
@@ -1153,6 +1117,8 @@
   }
 
 
+  /* Detect segments and edges for given dimension. */
+
   static FT_Error
   af_cjk_hints_detect_features( AF_GlyphHints  hints,
                                 AF_Dimension   dim )
@@ -1171,6 +1137,8 @@
   }
 
 
+  /* Compute all edges which lie within blue zones. */
+
   FT_LOCAL_DEF( void )
   af_cjk_hints_compute_blue_edges( AF_GlyphHints  hints,
                                    AF_CJKMetrics  metrics,
@@ -1218,10 +1186,8 @@
         /* zone, check for left edges                                      */
         /*                                                                 */
         /* of course, that's for TrueType                                  */
-        is_top_right_blue  =
-          FT_BOOL( ( ( blue->flags & AF_CJK_BLUE_IS_TOP )   != 0 ) ||
-                   ( ( blue->flags & AF_CJK_BLUE_IS_RIGHT ) != 0 ) );
-        is_major_dir = FT_BOOL( edge->dir == axis->major_dir );
+        is_top_right_blue = FT_BOOL( blue->flags & AF_CJK_BLUE_TOP );
+        is_major_dir      = FT_BOOL( edge->dir == axis->major_dir );
 
         /* if it is a top zone, the edge must be against the major    */
         /* direction; if it is a bottom zone, it must be in the major */
@@ -1258,6 +1224,8 @@
   }
 
 
+  /* Initalize hinting engine. */
+
   FT_LOCAL_DEF( FT_Error )
   af_cjk_hints_init( AF_GlyphHints  hints,
                      AF_CJKMetrics  metrics )
@@ -1316,7 +1284,7 @@
     hints->scaler_flags = scaler_flags;
     hints->other_flags  = other_flags;
 
-    return 0;
+    return FT_Err_Ok;
   }
 
 
@@ -1328,8 +1296,8 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* snap a given width in scaled coordinates to one of the */
-  /* current standard widths                                */
+  /* Snap a given width in scaled coordinates to one of the */
+  /* current standard widths.                               */
 
   static FT_Pos
   af_cjk_snap_width( AF_Width  widths,
@@ -1376,7 +1344,9 @@
   }
 
 
-  /* compute the snapped width of a given stem */
+  /* Compute the snapped width of a given stem.                          */
+  /* There is a lot of voodoo in this function; changing the hard-coded  */
+  /* parameters influence the whole hinting process.                     */
 
   static FT_Pos
   af_cjk_compute_stem_width( AF_GlyphHints  hints,
@@ -1385,8 +1355,8 @@
                              AF_Edge_Flags  base_flags,
                              AF_Edge_Flags  stem_flags )
   {
-    AF_CJKMetrics  metrics  = (AF_CJKMetrics) hints->metrics;
-    AF_CJKAxis     axis     = & metrics->axis[dim];
+    AF_CJKMetrics  metrics  = (AF_CJKMetrics)hints->metrics;
+    AF_CJKAxis     axis     = &metrics->axis[dim];
     FT_Pos         dist     = width;
     FT_Int         sign     = 0;
     FT_Bool        vertical = FT_BOOL( dim == AF_DIMENSION_VERT );
@@ -1497,7 +1467,7 @@
   }
 
 
-  /* align one stem edge relative to the previous stem edge */
+  /* Align one stem edge relative to the previous stem edge. */
 
   static void
   af_cjk_align_linked_edge( AF_GlyphHints  hints,
@@ -1517,6 +1487,9 @@
   }
 
 
+  /* Shift the coordinates of the `serif' edge by the same amount */
+  /* as the corresponding `base' edge has been moved already.     */
+
   static void
   af_cjk_align_serif_edge( AF_GlyphHints  hints,
                            AF_Edge        base,
@@ -1670,6 +1643,8 @@
   }
 
 
+  /* The main grid-fitting routine. */
+
   static void
   af_cjk_hint_edges( AF_GlyphHints  hints,
                      AF_Dimension   dim )
@@ -1685,10 +1660,16 @@
     FT_Bool       has_last_stem = FALSE;
     FT_Pos        last_stem_pos = 0;
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+    FT_UInt       num_actions = 0;
+#endif
 
+
+    FT_TRACE5(( "cjk %s edge hinting (script `%s')\n",
+                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical",
+                af_script_names[hints->metrics->script_class->script] ));
+
     /* we begin by aligning all stems relative to the blue zone */
-    FT_TRACE5(( "==== cjk hinting %s edges =====\n",
-          dim == AF_DIMENSION_HORZ ? "vertical" : "horizontal" ));
 
     if ( AF_HINTS_DO_BLUES( hints ) )
     {
@@ -1719,11 +1700,15 @@
         if ( !edge1 )
           continue;
 
-        FT_TRACE5(( "CJKBLUE: edge %d @%d (opos=%.2f) snapped to (%.2f), "
-                 "was (%.2f)\n",
-                 edge1-edges, edge1->fpos, edge1->opos / 64.0, blue->fit / 64.0,
-                 edge1->pos / 64.0 ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+        FT_TRACE5(( "  CJKBLUE: edge %d @%d (opos=%.2f) snapped to %.2f,"
+                    " was %.2f\n",
+                    edge1 - edges, edge1->fpos, edge1->opos / 64.0,
+                    blue->fit / 64.0, edge1->pos / 64.0 ));
 
+        num_actions++;
+#endif
+
         edge1->pos    = blue->fit;
         edge1->flags |= AF_EDGE_DONE;
 
@@ -1731,6 +1716,10 @@
         {
           af_cjk_align_linked_edge( hints, dim, edge1, edge2 );
           edge2->flags |= AF_EDGE_DONE;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+          num_actions++;
+#endif
         }
 
         if ( !anchor )
@@ -1772,6 +1761,7 @@
       }
 
       /* now align the stem */
+
       /* this should not happen, but it's better to be safe */
       if ( edge2->blue_edge )
       {
@@ -1779,6 +1769,11 @@
 
         af_cjk_align_linked_edge( hints, dim, edge2, edge );
         edge->flags |= AF_EDGE_DONE;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+        num_actions++;
+#endif
+
         continue;
       }
 
@@ -1786,6 +1781,11 @@
       {
         af_cjk_align_linked_edge( hints, dim, edge2, edge );
         edge->flags |= AF_EDGE_DONE;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+        num_actions++;
+#endif
+
         /* We rarely reaches here it seems;
          * usually the two edges belonging
          * to one stem are marked as DONE together
@@ -1953,7 +1953,7 @@
     }
 
     if ( !skipped )
-      return;
+      goto Exit;
 
     /*
      *  now hint the remaining edges (serifs and single) in order
@@ -1973,7 +1973,7 @@
     }
 
     if ( !skipped )
-      return;
+      goto Exit;
 
     for ( edge = edges; edge < edge_limit; edge++ )
     {
@@ -2011,6 +2011,16 @@
         }
       }
     }
+
+  Exit:
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+    if ( !num_actions )
+      FT_TRACE5(( "  (none)\n" ));
+    FT_TRACE5(( "\n" ));
+#endif
+
+    return;
   }
 
 
@@ -2104,6 +2114,8 @@
   }
 
 
+  /* Apply the complete hinting algorithm to a CJK glyph. */
+
   FT_LOCAL_DEF( FT_Error )
   af_cjk_hints_apply( AF_GlyphHints  hints,
                       FT_Outline*    outline,
@@ -2191,9 +2203,28 @@
   /*************************************************************************/
 
 
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_cjk_writing_system_class,
+
+    AF_WRITING_SYSTEM_CJK,
+
+    sizeof ( AF_CJKMetricsRec ),
+
+    (AF_Script_InitMetricsFunc) af_cjk_metrics_init,
+    (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale,
+    (AF_Script_DoneMetricsFunc) NULL,
+
+    (AF_Script_InitHintsFunc)   af_cjk_hints_init,
+    (AF_Script_ApplyHintsFunc)  af_cjk_hints_apply
+  )
+
+
   /* this corresponds to Unicode 6.0 */
 
-  static const AF_Script_UniRangeRec  af_cjk_uniranges[] =
+  /* XXX: this should probably fine tuned to differentiate better between */
+  /*      scripts...                                                      */
+
+  static const AF_Script_UniRangeRec  af_hani_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x1100UL,  0x11FFUL ),  /* Hangul Jamo                             */
     AF_UNIRANGE_REC(  0x2E80UL,  0x2EFFUL ),  /* CJK Radicals Supplement                 */
@@ -2231,45 +2262,42 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class,
-    AF_SCRIPT_CJK,
-    af_cjk_uniranges,
-    0x7530, /* ç”° */
+#else /* !AF_CONFIG_OPTION_CJK */
 
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_cjk_writing_system_class,
+
+    AF_WRITING_SYSTEM_CJK,
+
     sizeof ( AF_CJKMetricsRec ),
 
-    (AF_Script_InitMetricsFunc) af_cjk_metrics_init,
-    (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale,
+    (AF_Script_InitMetricsFunc) NULL,
+    (AF_Script_ScaleMetricsFunc)NULL,
     (AF_Script_DoneMetricsFunc) NULL,
 
-    (AF_Script_InitHintsFunc)   af_cjk_hints_init,
-    (AF_Script_ApplyHintsFunc)  af_cjk_hints_apply
+    (AF_Script_InitHintsFunc)   NULL,
+    (AF_Script_ApplyHintsFunc)  NULL
   )
 
-#else /* !AF_CONFIG_OPTION_CJK */
 
-  static const AF_Script_UniRangeRec  af_cjk_uniranges[] =
+  static const AF_Script_UniRangeRec  af_hani_uniranges[] =
   {
     AF_UNIRANGE_REC( 0UL, 0UL )
   };
 
+#endif /* !AF_CONFIG_OPTION_CJK */
 
-  AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class,
-    AF_SCRIPT_CJK,
-    af_cjk_uniranges,
-    0,
 
-    sizeof ( AF_CJKMetricsRec ),
+  AF_DEFINE_SCRIPT_CLASS(
+    af_hani_script_class,
 
-    (AF_Script_InitMetricsFunc) NULL,
-    (AF_Script_ScaleMetricsFunc)NULL,
-    (AF_Script_DoneMetricsFunc) NULL,
+    AF_SCRIPT_HANI,
+    AF_BLUE_STRINGSET_HANI,
+    AF_WRITING_SYSTEM_CJK,
 
-    (AF_Script_InitHintsFunc)   NULL,
-    (AF_Script_ApplyHintsFunc)  NULL
+    af_hani_uniranges,
+    0x7530 /* ç”° */
   )
 
-#endif /* !AF_CONFIG_OPTION_CJK */
 
-
 /* END */
Index: lib/3rdparty/freetype/src/autofit/aflatin.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/aflatin.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/aflatin.c	(copie de travail)
@@ -60,8 +60,11 @@
     AF_GlyphHintsRec  hints[1];
 
 
-    FT_TRACE5(( "standard widths computation\n"
-                "===========================\n\n" ));
+    FT_TRACE5(( "\n"
+                "latin standard widths computation (script `%s')\n"
+                "=================================================\n"
+                "\n",
+                af_script_names[metrics->root.script_class->script] ));
 
     af_glyph_hints_init( hints, face->memory );
 
@@ -76,13 +79,14 @@
       AF_Scaler           scaler = &dummy->root.scaler;
 
 
-      glyph_index = FT_Get_Char_Index( face,
-                                       metrics->root.clazz->standard_char );
+      glyph_index = FT_Get_Char_Index(
+                      face,
+                      metrics->root.script_class->standard_char );
       if ( glyph_index == 0 )
         goto Exit;
 
-      FT_TRACE5(( "standard character: 0x%X (glyph index %d)\n",
-                  metrics->root.clazz->standard_char, glyph_index ));
+      FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
+                  metrics->root.script_class->standard_char, glyph_index ));
 
       error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
       if ( error || face->glyph->outline.n_points <= 0 )
@@ -146,13 +150,13 @@
         }
 
         /* this also replaces multiple almost identical stem widths */
-        /* with a single one (the value 100 is heuristic) */
+        /* with a single one (the value 100 is heuristic)           */
         af_sort_and_quantize_widths( &num_widths, axis->widths,
                                      dummy->units_per_em / 100 );
         axis->width_count = num_widths;
       }
 
-  Exit:
+    Exit:
       for ( dim = 0; dim < AF_DIMENSION_MAX; dim++ )
       {
         AF_LatinAxis  axis = &metrics->axis[dim];
@@ -159,9 +163,8 @@
         FT_Pos        stdw;
 
 
-        stdw = ( axis->width_count > 0 )
-                 ? axis->widths[0].org
-                 : AF_LATIN_CONSTANT( metrics, 50 );
+        stdw = ( axis->width_count > 0 ) ? axis->widths[0].org
+                                         : AF_LATIN_CONSTANT( metrics, 50 );
 
         /* let's try 20% of the smallest width */
         axis->edge_distance_threshold = stdw / 5;
@@ -193,22 +196,6 @@
   }
 
 
-
-#define AF_LATIN_MAX_TEST_CHARACTERS  12
-
-
-  static const char af_latin_blue_chars[AF_LATIN_MAX_BLUES]
-                                       [AF_LATIN_MAX_TEST_CHARACTERS + 1] =
-  {
-    "THEZOCQS",
-    "HEZLOCUS",
-    "fijkdbh",
-    "xzroesc",
-    "xzroesc",
-    "pqgjy"
-  };
-
-
   /* Find all blue zones.  Flat segments give the reference points, */
   /* round segments the overshoot positions.                        */
 
@@ -216,39 +203,80 @@
   af_latin_metrics_init_blues( AF_LatinMetrics  metrics,
                                FT_Face          face )
   {
-    FT_Pos        flats [AF_LATIN_MAX_TEST_CHARACTERS];
-    FT_Pos        rounds[AF_LATIN_MAX_TEST_CHARACTERS];
+    FT_Pos        flats [AF_BLUE_STRING_MAX_LEN];
+    FT_Pos        rounds[AF_BLUE_STRING_MAX_LEN];
+
     FT_Int        num_flats;
     FT_Int        num_rounds;
-    FT_Int        bb;
+
     AF_LatinBlue  blue;
     FT_Error      error;
-    AF_LatinAxis  axis  = &metrics->axis[AF_DIMENSION_VERT];
+    AF_LatinAxis  axis = &metrics->axis[AF_DIMENSION_VERT];
     FT_Outline    outline;
 
+    AF_Blue_Stringset         bss = metrics->root.script_class->blue_stringset;
+    const AF_Blue_StringRec*  bs  = &af_blue_stringsets[bss];
 
-    /* we compute the blues simply by loading each character from the    */
-    /* `af_latin_blue_chars[blues]' string, then finding its top-most or */
-    /* bottom-most points (depending on `AF_IS_TOP_BLUE')                */
 
-    FT_TRACE5(( "blue zones computation\n"
-                "======================\n\n" ));
+    /* we walk over the blue character strings as specified in the  */
+    /* script's entry in the `af_blue_stringset' array              */
 
-    for ( bb = 0; bb < AF_LATIN_BLUE_MAX; bb++ )
+    FT_TRACE5(( "latin blue zones computation\n"
+                "============================\n"
+                "\n" ));
+
+    for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ )
     {
-      const char*  p     = af_latin_blue_chars[bb];
-      const char*  limit = p + AF_LATIN_MAX_TEST_CHARACTERS;
+      const char*  p = &af_blue_strings[bs->string];
       FT_Pos*      blue_ref;
       FT_Pos*      blue_shoot;
 
 
-      FT_TRACE5(( "blue zone %d:\n", bb ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+      {
+        FT_Bool  have_flag = 0;
 
+
+        FT_TRACE5(( "blue zone %d", axis->blue_count ));
+
+        if ( bs->properties )
+        {
+          FT_TRACE5(( " (" ));
+
+          if ( AF_LATIN_IS_TOP_BLUE( bs ) )
+          {
+            FT_TRACE5(( "top" ));
+            have_flag = 1;
+          }
+
+          if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) )
+          {
+            if ( have_flag )
+              FT_TRACE5(( ", " ));
+            FT_TRACE5(( "small top" ));
+            have_flag = 1;
+          }
+
+          if ( AF_LATIN_IS_LONG_BLUE( bs ) )
+          {
+            if ( have_flag )
+              FT_TRACE5(( ", " ));
+            FT_TRACE5(( "long" ));
+          }
+
+          FT_TRACE5(( ")" ));
+        }
+
+        FT_TRACE5(( ":\n" ));
+      }
+#endif /* FT_DEBUG_LEVEL_TRACE */
+
       num_flats  = 0;
       num_rounds = 0;
 
-      for ( ; p < limit && *p; p++ )
+      while ( *p )
       {
+        FT_ULong    ch;
         FT_UInt     glyph_index;
         FT_Pos      best_y;                            /* same as points.y */
         FT_Int      best_point, best_contour_first, best_contour_last;
@@ -256,15 +284,23 @@
         FT_Bool     round = 0;
 
 
+        GET_UTF8_CHAR( ch, p );
+
         /* load the character in the face -- skip unknown or empty ones */
-        glyph_index = FT_Get_Char_Index( face, (FT_UInt)*p );
+        glyph_index = FT_Get_Char_Index( face, ch );
         if ( glyph_index == 0 )
+        {
+          FT_TRACE5(( "  U+%04lX unavailable\n", ch ));
           continue;
+        }
 
         error   = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
         outline = face->glyph->outline;
         if ( error || outline.n_points <= 0 )
+        {
+          FT_TRACE5(( "  U+%04lX contains no outlines\n", ch ));
           continue;
+        }
 
         /* now compute min or max point indices and coordinates */
         points             = outline.points;
@@ -289,11 +325,11 @@
 
             /* Avoid single-point contours since they are never rasterized. */
             /* In some fonts, they correspond to mark attachment points     */
-            /* which are way outside of the glyph's real outline.           */
+            /* that are way outside of the glyph's real outline.            */
             if ( last <= first )
               continue;
 
-            if ( AF_LATIN_IS_TOP_BLUE( bb ) )
+            if ( AF_LATIN_IS_TOP_BLUE( bs ) )
             {
               for ( pp = first; pp <= last; pp++ )
                 if ( best_point < 0 || points[pp].y > best_y )
@@ -318,7 +354,6 @@
               best_contour_last  = last;
             }
           }
-          FT_TRACE5(( "  %c  %ld", *p, best_y ));
         }
 
         /* now check whether the point belongs to a straight or round   */
@@ -328,10 +363,14 @@
         {
           FT_Pos  best_x = points[best_point].x;
           FT_Int  prev, next;
+          FT_Int  best_segment_first, best_segment_last;
           FT_Int  best_on_point_first, best_on_point_last;
           FT_Pos  dist;
 
 
+          best_segment_first = best_point;
+          best_segment_last  = best_point;
+
           if ( FT_CURVE_TAG( outline.tags[best_point] ) == FT_CURVE_TAG_ON )
           {
             best_on_point_first = best_point;
@@ -343,8 +382,9 @@
             best_on_point_last  = -1;
           }
 
-          /* look for the previous and next points that are not on the */
-          /* same Y coordinate, then threshold the `closeness'...      */
+          /* look for the previous and next points on the contour  */
+          /* that are not on the same Y coordinate, then threshold */
+          /* the `closeness'...                                    */
           prev = best_point;
           next = prev;
 
@@ -362,6 +402,8 @@
               if ( FT_ABS( points[prev].x - best_x ) <= 20 * dist )
                 break;
 
+            best_segment_first = prev;
+
             if ( FT_CURVE_TAG( outline.tags[prev] ) == FT_CURVE_TAG_ON )
             {
               best_on_point_first = prev;
@@ -383,6 +425,8 @@
               if ( FT_ABS( points[next].x - best_x ) <= 20 * dist )
                 break;
 
+            best_segment_last = next;
+
             if ( FT_CURVE_TAG( outline.tags[next] ) == FT_CURVE_TAG_ON )
             {
               best_on_point_last = next;
@@ -392,8 +436,186 @@
 
           } while ( next != best_point );
 
-          /* now set the `round' flag depending on the segment's kind */
-          /* (value 8 is heuristic)                                   */
+          if ( AF_LATIN_IS_LONG_BLUE( bs ) )
+          {
+            /* If this flag is set, we have an additional constraint to  */
+            /* get the blue zone distance: Find a segment of the topmost */
+            /* (or bottommost) contour that is longer than a heuristic   */
+            /* threshold.  This ensures that small bumps in the outline  */
+            /* are ignored (for example, the `vertical serifs' found in  */
+            /* many Hebrew glyph designs).                               */
+
+            /* If this segment is long enough, we are done.  Otherwise,  */
+            /* search the segment next to the extremum that is long      */
+            /* enough, has the same direction, and a not too large       */
+            /* vertical distance from the extremum.  Note that the       */
+            /* algorithm doesn't check whether the found segment is      */
+            /* actually the one (vertically) nearest to the extremum.    */
+
+            /* heuristic threshold value */
+            FT_Pos  length_threshold = metrics->units_per_em / 25;
+
+
+            dist = FT_ABS( points[best_segment_last].x -
+                             points[best_segment_first].x );
+
+            if ( dist < length_threshold                       &&
+                 best_segment_last - best_segment_first + 2 <=
+                   best_contour_last - best_contour_first      )
+            {
+              /* heuristic threshold value */
+              FT_Pos  height_threshold = metrics->units_per_em / 4;
+
+              FT_Int   first;
+              FT_Int   last;
+              FT_Bool  hit;
+
+              FT_Bool  left2right;
+
+
+              /* compute direction */
+              prev = best_point;
+
+              do
+              {
+                if ( prev > best_contour_first )
+                  prev--;
+                else
+                  prev = best_contour_last;
+
+                if ( points[prev].x != best_x )
+                  break;
+
+              } while ( prev != best_point );
+
+              /* skip glyph for the degenerate case */
+              if ( prev == best_point )
+                continue;
+
+              left2right = FT_BOOL( points[prev].x < points[best_point].x );
+
+              first = best_segment_last;
+              last  = first;
+              hit   = 0;
+
+              do
+              {
+                FT_Bool  l2r;
+                FT_Pos   d;
+                FT_Int   p_first, p_last;
+
+
+                if ( !hit )
+                {
+                  /* no hit; adjust first point */
+                  first = last;
+
+                  /* also adjust first and last on point */
+                  if ( FT_CURVE_TAG( outline.tags[first] ) ==
+                         FT_CURVE_TAG_ON )
+                  {
+                    p_first = first;
+                    p_last  = first;
+                  }
+                  else
+                  {
+                    p_first = -1;
+                    p_last  = -1;
+                  }
+
+                  hit = 1;
+                }
+
+                if ( last < best_contour_last )
+                  last++;
+                else
+                  last = best_contour_first;
+
+                if ( FT_ABS( best_y - points[first].y ) > height_threshold )
+                {
+                  /* vertical distance too large */
+                  hit = 0;
+                  continue;
+                }
+
+                /* same test as above */
+                dist = FT_ABS( points[last].y - points[first].y );
+                if ( dist > 5 )
+                  if ( FT_ABS( points[last].x - points[first].x ) <=
+                         20 * dist )
+                  {
+                    hit = 0;
+                    continue;
+                  }
+
+                if ( FT_CURVE_TAG( outline.tags[last] ) == FT_CURVE_TAG_ON )
+                {
+                  p_last = last;
+                  if ( p_first < 0 )
+                    p_first = last;
+                }
+
+                l2r = FT_BOOL( points[first].x < points[last].x );
+                d   = FT_ABS( points[last].x - points[first].x );
+
+                if ( l2r == left2right     &&
+                     d >= length_threshold )
+                {
+                  /* all constraints are met; update segment after finding */
+                  /* its end                                               */
+                  do
+                  {
+                    if ( last < best_contour_last )
+                      last++;
+                    else
+                      last = best_contour_first;
+
+                    d = FT_ABS( points[last].y - points[first].y );
+                    if ( d > 5 )
+                      if ( FT_ABS( points[next].x - points[first].x ) <=
+                             20 * dist )
+                      {
+                        last--;
+                        break;
+                      }
+
+                    p_last = last;
+
+                    if ( FT_CURVE_TAG( outline.tags[last] ) ==
+                           FT_CURVE_TAG_ON )
+                    {
+                      p_last = last;
+                      if ( p_first < 0 )
+                        p_first = last;
+                    }
+
+                  } while ( last != best_segment_first );
+
+                  best_y = points[first].y;
+
+                  best_segment_first = first;
+                  best_segment_last  = last;
+
+                  best_on_point_first = p_first;
+                  best_on_point_last  = p_last;
+
+                  break;
+                }
+
+              } while ( last != best_segment_first );
+            }
+          }
+
+          FT_TRACE5(( "  U+%04lX: best_y = %5ld", ch, best_y ));
+
+          /* now set the `round' flag depending on the segment's kind: */
+          /*                                                           */
+          /* - if the horizontal distance between the first and last   */
+          /*   `on' point is larger than upem/8 (value 8 is heuristic) */
+          /*   we have a flat segment                                  */
+          /* - if either the first or the last point of the segment is */
+          /*   an `off' point, the segment is round, otherwise it is   */
+          /*   flat                                                    */
           if ( best_on_point_first >= 0                               &&
                best_on_point_last >= 0                                &&
                (FT_UInt)( FT_ABS( points[best_on_point_last].x -
@@ -402,8 +624,10 @@
             round = 0;
           else
             round = FT_BOOL(
-              FT_CURVE_TAG( outline.tags[prev] ) != FT_CURVE_TAG_ON ||
-              FT_CURVE_TAG( outline.tags[next] ) != FT_CURVE_TAG_ON );
+                      FT_CURVE_TAG( outline.tags[best_segment_first] ) !=
+                        FT_CURVE_TAG_ON                                   ||
+                      FT_CURVE_TAG( outline.tags[best_segment_last]  ) !=
+                        FT_CURVE_TAG_ON                                   );
 
           FT_TRACE5(( " (%s)\n", round ? "round" : "flat" ));
         }
@@ -448,7 +672,7 @@
       }
       else
       {
-        *blue_ref   = flats[num_flats / 2];
+        *blue_ref   = flats [num_flats  / 2];
         *blue_shoot = rounds[num_rounds / 2];
       }
 
@@ -462,7 +686,7 @@
         FT_Bool  over_ref = FT_BOOL( shoot > ref );
 
 
-        if ( AF_LATIN_IS_TOP_BLUE( bb ) ^ over_ref )
+        if ( AF_LATIN_IS_TOP_BLUE( bs ) ^ over_ref )
         {
           *blue_ref   =
           *blue_shoot = ( shoot + ref ) / 2;
@@ -473,7 +697,7 @@
       }
 
       blue->flags = 0;
-      if ( AF_LATIN_IS_TOP_BLUE( bb ) )
+      if ( AF_LATIN_IS_TOP_BLUE( bs ) )
         blue->flags |= AF_LATIN_BLUE_TOP;
 
       /*
@@ -481,7 +705,7 @@
        * in order to optimize the pixel grid alignment of the top of small
        * letters.
        */
-      if ( bb == AF_LATIN_BLUE_SMALL_TOP )
+      if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) )
         blue->flags |= AF_LATIN_BLUE_ADJUSTMENT;
 
       FT_TRACE5(( "    -> reference = %ld\n"
@@ -650,7 +874,20 @@
           else
 #endif
           if ( dim == AF_DIMENSION_VERT )
+          {
             scale = FT_MulDiv( scale, fitted, scaled );
+
+            FT_TRACE5((
+              "af_latin_metrics_scale_dim:"
+              " x height alignment (script `%s'):\n"
+              "                           "
+              " vertical scaling changed from %.4f to %.4f (by %d%%)\n"
+              "\n",
+              af_script_names[metrics->root.script_class->script],
+              axis->org_scale / 65536.0,
+              scale / 65536.0,
+              ( fitted - scaled ) * 100 / scaled ));
+          }
         }
       }
     }
@@ -669,6 +906,10 @@
       metrics->root.scaler.y_delta = delta;
     }
 
+    FT_TRACE5(( "%s widths (script `%s')\n",
+                dim == AF_DIMENSION_HORZ ? "horizontal" : "vertical",
+                af_script_names[metrics->root.script_class->script] ));
+
     /* scale the widths */
     for ( nn = 0; nn < axis->width_count; nn++ )
     {
@@ -677,15 +918,31 @@
 
       width->cur = FT_MulFix( width->org, scale );
       width->fit = width->cur;
+
+      FT_TRACE5(( "  %d scaled to %.2f\n",
+                  width->org,
+                  width->cur / 64.0 ));
     }
 
+    FT_TRACE5(( "\n" ));
+
     /* an extra-light axis corresponds to a standard width that is */
     /* smaller than 5/8 pixels                                     */
     axis->extra_light =
       (FT_Bool)( FT_MulFix( axis->standard_width, scale ) < 32 + 8 );
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+    if ( axis->extra_light )
+      FT_TRACE5(( "`%s' script is extra light (at current resolution)\n"
+                  "\n",
+                  af_script_names[metrics->root.script_class->script] ));
+#endif
+
     if ( dim == AF_DIMENSION_VERT )
     {
+      FT_TRACE5(( "blue zones (script `%s')\n",
+                  af_script_names[metrics->root.script_class->script] ));
+
       /* scale the blue zones */
       for ( nn = 0; nn < axis->blue_count; nn++ )
       {
@@ -757,6 +1014,19 @@
 #endif
 
           blue->flags |= AF_LATIN_BLUE_ACTIVE;
+
+          FT_TRACE5(( "  reference %d: %d scaled to %.2f%s\n"
+                      "  overshoot %d: %d scaled to %.2f%s\n",
+                      nn,
+                      blue->ref.org,
+                      blue->ref.fit / 64.0,
+                      blue->flags & AF_LATIN_BLUE_ACTIVE ? ""
+                                                         : " (inactive)",
+                      nn,
+                      blue->shoot.org,
+                      blue->shoot.fit / 64.0,
+                      blue->flags & AF_LATIN_BLUE_ACTIVE ? ""
+                                                         : " (inactive)" ));
         }
       }
     }
@@ -1654,8 +1924,8 @@
                                AF_Edge_Flags  base_flags,
                                AF_Edge_Flags  stem_flags )
   {
-    AF_LatinMetrics  metrics  = (AF_LatinMetrics) hints->metrics;
-    AF_LatinAxis     axis     = & metrics->axis[dim];
+    AF_LatinMetrics  metrics  = (AF_LatinMetrics)hints->metrics;
+    AF_LatinAxis     axis     = &metrics->axis[dim];
     FT_Pos           dist     = width;
     FT_Int           sign     = 0;
     FT_Int           vertical = ( dim == AF_DIMENSION_VERT );
@@ -1878,8 +2148,9 @@
 #endif
 
 
-    FT_TRACE5(( "%s edge hinting\n",
-                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical" ));
+    FT_TRACE5(( "latin %s edge hinting (script `%s')\n",
+                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical",
+                af_script_names[hints->metrics->script_class->script] ));
 
     /* we begin by aligning all stems relative to the blue zone */
     /* if needed -- that's only for horizontal edges            */
@@ -2414,6 +2685,7 @@
         af_glyph_hints_align_weak_points( hints, (AF_Dimension)dim );
       }
     }
+
     af_glyph_hints_save( hints, outline );
 
   Exit:
@@ -2430,10 +2702,26 @@
   /*************************************************************************/
 
 
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_latin_writing_system_class,
+
+    AF_WRITING_SYSTEM_LATIN,
+
+    sizeof ( AF_LatinMetricsRec ),
+
+    (AF_Script_InitMetricsFunc) af_latin_metrics_init,
+    (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale,
+    (AF_Script_DoneMetricsFunc) NULL,
+
+    (AF_Script_InitHintsFunc)   af_latin_hints_init,
+    (AF_Script_ApplyHintsFunc)  af_latin_hints_apply
+  )
+
+
   /* XXX: this should probably fine tuned to differentiate better between */
   /*      scripts...                                                      */
 
-  static const AF_Script_UniRangeRec  af_latin_uniranges[] =
+  static const AF_Script_UniRangeRec  af_latn_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x0020UL,  0x007FUL ),  /* Basic Latin (no control chars) */
     AF_UNIRANGE_REC(  0x00A0UL,  0x00FFUL ),  /* Latin-1 Supplement (no control chars) */
@@ -2442,14 +2730,10 @@
     AF_UNIRANGE_REC(  0x0250UL,  0x02AFUL ),  /* IPA Extensions */
     AF_UNIRANGE_REC(  0x02B0UL,  0x02FFUL ),  /* Spacing Modifier Letters */
     AF_UNIRANGE_REC(  0x0300UL,  0x036FUL ),  /* Combining Diacritical Marks */
-    AF_UNIRANGE_REC(  0x0370UL,  0x03FFUL ),  /* Greek and Coptic */
-    AF_UNIRANGE_REC(  0x0400UL,  0x04FFUL ),  /* Cyrillic */
-    AF_UNIRANGE_REC(  0x0500UL,  0x052FUL ),  /* Cyrillic Supplement */
     AF_UNIRANGE_REC(  0x1D00UL,  0x1D7FUL ),  /* Phonetic Extensions */
     AF_UNIRANGE_REC(  0x1D80UL,  0x1DBFUL ),  /* Phonetic Extensions Supplement */
     AF_UNIRANGE_REC(  0x1DC0UL,  0x1DFFUL ),  /* Combining Diacritical Marks Supplement */
     AF_UNIRANGE_REC(  0x1E00UL,  0x1EFFUL ),  /* Latin Extended Additional */
-    AF_UNIRANGE_REC(  0x1F00UL,  0x1FFFUL ),  /* Greek Extended */
     AF_UNIRANGE_REC(  0x2000UL,  0x206FUL ),  /* General Punctuation */
     AF_UNIRANGE_REC(  0x2070UL,  0x209FUL ),  /* Superscripts and Subscripts */
     AF_UNIRANGE_REC(  0x20A0UL,  0x20CFUL ),  /* Currency Symbols */
@@ -2456,9 +2740,7 @@
     AF_UNIRANGE_REC(  0x2150UL,  0x218FUL ),  /* Number Forms */
     AF_UNIRANGE_REC(  0x2460UL,  0x24FFUL ),  /* Enclosed Alphanumerics */
     AF_UNIRANGE_REC(  0x2C60UL,  0x2C7FUL ),  /* Latin Extended-C */
-    AF_UNIRANGE_REC(  0x2DE0UL,  0x2DFFUL ),  /* Cyrillic Extended-A */
     AF_UNIRANGE_REC(  0x2E00UL,  0x2E7FUL ),  /* Supplemental Punctuation */
-    AF_UNIRANGE_REC(  0xA640UL,  0xA69FUL ),  /* Cyrillic Extended-B */
     AF_UNIRANGE_REC(  0xA720UL,  0xA7FFUL ),  /* Latin Extended-D */
     AF_UNIRANGE_REC(  0xFB00UL,  0xFB06UL ),  /* Alphab. Present. Forms (Latin Ligs) */
     AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ),  /* Mathematical Alphanumeric Symbols */
@@ -2466,21 +2748,73 @@
     AF_UNIRANGE_REC(       0UL,       0UL )
   };
 
+  static const AF_Script_UniRangeRec  af_grek_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0370UL,  0x03FFUL ),  /* Greek and Coptic */
+    AF_UNIRANGE_REC(  0x1F00UL,  0x1FFFUL ),  /* Greek Extended */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
 
-  AF_DEFINE_SCRIPT_CLASS( af_latin_script_class,
-    AF_SCRIPT_LATIN,
-    af_latin_uniranges,
-    'o',
+  static const AF_Script_UniRangeRec  af_cyrl_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0400UL,  0x04FFUL ),  /* Cyrillic */
+    AF_UNIRANGE_REC(  0x0500UL,  0x052FUL ),  /* Cyrillic Supplement */
+    AF_UNIRANGE_REC(  0x2DE0UL,  0x2DFFUL ),  /* Cyrillic Extended-A */
+    AF_UNIRANGE_REC(  0xA640UL,  0xA69FUL ),  /* Cyrillic Extended-B */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
 
-    sizeof ( AF_LatinMetricsRec ),
+  static const AF_Script_UniRangeRec  af_hebr_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0590UL,  0x05FFUL ),  /* Hebrew */
+    AF_UNIRANGE_REC(  0xFB1DUL,  0xFB4FUL ),  /* Alphab. Present. Forms (Hebrew) */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
 
-    (AF_Script_InitMetricsFunc) af_latin_metrics_init,
-    (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale,
-    (AF_Script_DoneMetricsFunc) NULL,
 
-    (AF_Script_InitHintsFunc)   af_latin_hints_init,
-    (AF_Script_ApplyHintsFunc)  af_latin_hints_apply
+  AF_DEFINE_SCRIPT_CLASS(
+    af_latn_script_class,
+
+    AF_SCRIPT_LATN,
+    AF_BLUE_STRINGSET_LATN,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_latn_uniranges,
+    'o'
   )
 
+  AF_DEFINE_SCRIPT_CLASS(
+    af_grek_script_class,
 
+    AF_SCRIPT_GREK,
+    AF_BLUE_STRINGSET_GREK,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_grek_uniranges,
+    0x3BF /* Î¿ */
+  )
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_cyrl_script_class,
+
+    AF_SCRIPT_CYRL,
+    AF_BLUE_STRINGSET_CYRL,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_cyrl_uniranges,
+    0x43E /* Ð¾ */
+  )
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_hebr_script_class,
+
+    AF_SCRIPT_HEBR,
+    AF_BLUE_STRINGSET_HEBR,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_hebr_uniranges,
+    0x5DD /* ×� */
+  )
+
+
 /* END */
Index: lib/3rdparty/freetype/src/autofit/rules.mk
===================================================================
--- lib/3rdparty/freetype/src/autofit/rules.mk	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/rules.mk	(copie de travail)
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2003, 2004, 2005, 2006, 2007, 2011 by
+# Copyright 2003-2007, 2011, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -26,6 +26,7 @@
 # AUTOF driver sources (i.e., C files)
 #
 AUTOF_DRV_SRC := $(AUTOF_DIR)/afangles.c \
+                 $(AUTOF_DIR)/afblue.c   \
                  $(AUTOF_DIR)/afcjk.c    \
                  $(AUTOF_DIR)/afdummy.c  \
                  $(AUTOF_DIR)/afglobal.c \
@@ -41,7 +42,9 @@
 #
 AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h)  \
                $(AUTOF_DIR)/aferrors.h \
-               $(AUTOF_DIR)/aftypes.h
+               $(AUTOF_DIR)/afscript.h \
+               $(AUTOF_DIR)/aftypes.h  \
+               $(AUTOF_DIR)/afwrtsys.h
 
 
 # AUTOF driver object(s)
Index: lib/3rdparty/freetype/src/autofit/aftypes.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/aftypes.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/autofit/aftypes.h	(copie de travail)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter types (specification only).                              */
 /*                                                                         */
-/*  Copyright 2003-2009, 2011-2012 by                                      */
+/*  Copyright 2003-2009, 2011-2013 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,15 +20,12 @@
    *
    *  The auto-fitter is a complete rewrite of the old auto-hinter.
    *  Its main feature is the ability to differentiate between different
-   *  scripts in order to apply language-specific rules.
+   *  writing systems in order to apply script-specific rules.
    *
    *  The code has also been compartmentized into several entities that
    *  should make algorithmic experimentation easier than with the old
    *  code.
    *
-   *  Finally, we get rid of the Catharon license, since this code is
-   *  released under the FreeType one.
-   *
    *************************************************************************/
 
 
@@ -42,7 +39,9 @@
 #include FT_INTERNAL_OBJECTS_H
 #include FT_INTERNAL_DEBUG_H
 
+#include "afblue.h"
 
+
 FT_BEGIN_HEADER
 
   /*************************************************************************/
@@ -201,56 +200,21 @@
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
-  /*****                       S C R I P T S                           *****/
+  /*****                 S C R I P T   M E T R I C S                   *****/
   /*****                                                               *****/
   /*************************************************************************/
   /*************************************************************************/
 
-  /*
-   *  The list of known scripts.  Each different script corresponds to the
-   *  following information:
-   *
-   *   - A set of Unicode ranges to test whether the face supports the
-   *     script.
-   *
-   *   - A specific global analyzer that will compute global metrics
-   *     specific to the script.
-   *
-   *   - A specific glyph analyzer that will compute segments and
-   *     edges for each glyph covered by the script.
-   *
-   *   - A specific grid-fitting algorithm that will distort the
-   *     scaled glyph outline according to the results of the glyph
-   *     analyzer.
-   *
-   *  Note that a given analyzer and/or grid-fitting algorithm can be
-   *  used by more than one script.
-   */
+  /* This is the main structure which combines writing systems and script */
+  /* data (for a given face object, see below).                           */
 
-  typedef enum  AF_Script_
-  {
-    AF_SCRIPT_DUMMY = 0,
-    AF_SCRIPT_LATIN = 1,
-    AF_SCRIPT_CJK   = 2,
-    AF_SCRIPT_INDIC = 3,
-#ifdef FT_OPTION_AUTOFIT2
-    AF_SCRIPT_LATIN2 = 4,
-#endif
+  typedef struct AF_WritingSystemClassRec_ const*  AF_WritingSystemClass;
+  typedef struct AF_ScriptClassRec_ const*         AF_ScriptClass;
+  typedef struct AF_FaceGlobalsRec_*               AF_FaceGlobals;
 
-    /* add new scripts here.  Don't forget to update the list in */
-    /* `afglobal.c'.                                             */
-
-    AF_SCRIPT_MAX   /* do not remove */
-
-  } AF_Script;
-
-
-  typedef struct AF_ScriptClassRec_ const*  AF_ScriptClass;
-  typedef struct AF_FaceGlobalsRec_*        AF_FaceGlobals;
-
   typedef struct  AF_ScriptMetricsRec_
   {
-    AF_ScriptClass  clazz;
+    AF_ScriptClass  script_class;
     AF_ScalerRec    scaler;
     FT_Bool         digits_have_same_width;
 
@@ -284,6 +248,97 @@
                                AF_ScriptMetrics  metrics );
 
 
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                W R I T I N G   S Y S T E M S                  *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   *  In FreeType, a writing system consists of multiple scripts which can
+   *  be handled similarly *in a typographical way*; the relationship is not
+   *  based on history.  For example, both the Greek and the unrelated
+   *  Armenian scripts share the same features like ascender, descender,
+   *  x-height, etc.  Essentially, a writing system is covered by a
+   *  submodule of the auto-fitter; it contains
+   *
+   *  - a specific global analyzer which computes global metrics specific to
+   *    the script (based on script-specific characters to identify ascender
+   *    height, x-height, etc.),
+   *
+   *  - a specific glyph analyzer that computes segments and edges for each
+   *    glyph covered by the script,
+   *
+   *  - a specific grid-fitting algorithm that distorts the scaled glyph
+   *    outline according to the results of the glyph analyzer.
+   */
+
+#define __AFWRTSYS_H__  /* don't load header files */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )    \
+          AF_WRITING_SYSTEM_ ## WS,
+
+  /* The list of known writing systems. */
+  typedef enum  AF_WritingSystem_
+  {
+
+#include "afwrtsys.h"
+
+    AF_WRITING_SYSTEM_MAX   /* do not remove */
+
+  } AF_WritingSystem;
+
+#undef  __AFWRTSYS_H__
+
+
+  typedef struct  AF_WritingSystemClassRec_
+  {
+    AF_WritingSystem  writing_system;
+
+    FT_Offset                   script_metrics_size;
+    AF_Script_InitMetricsFunc   script_metrics_init;
+    AF_Script_ScaleMetricsFunc  script_metrics_scale;
+    AF_Script_DoneMetricsFunc   script_metrics_done;
+
+    AF_Script_InitHintsFunc     script_hints_init;
+    AF_Script_ApplyHintsFunc    script_hints_apply;
+
+  } AF_WritingSystemClassRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                        S C R I P T S                          *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   *  Each script is associated with a set of Unicode ranges which gets used
+   *  to test whether the font face supports the script.  It also references
+   *  the writing system it belongs to.
+   *
+   *  We use four-letter script tags from the OpenType specification.
+   */
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d ) \
+          AF_SCRIPT_ ## S,
+
+  /* The list of known scripts. */
+  typedef enum  AF_Script_
+  {
+
+#include "afscript.h"
+
+    AF_SCRIPT_MAX   /* do not remove */
+
+  } AF_Script;
+
+
   typedef struct  AF_Script_UniRangeRec_
   {
     FT_UInt32  first;
@@ -293,23 +348,18 @@
 
 #define AF_UNIRANGE_REC( a, b ) { (FT_UInt32)(a), (FT_UInt32)(b) }
 
-  typedef const AF_Script_UniRangeRec  *AF_Script_UniRange;
+  typedef const AF_Script_UniRangeRec*  AF_Script_UniRange;
 
 
   typedef struct  AF_ScriptClassRec_
   {
-    AF_Script           script;
+    AF_Script          script;
+    AF_Blue_Stringset  blue_stringset;
+    AF_WritingSystem   writing_system;
+
     AF_Script_UniRange  script_uni_ranges; /* last must be { 0, 0 }        */
     FT_UInt32           standard_char;     /* for default width and height */
 
-    FT_Offset                   script_metrics_size;
-    AF_Script_InitMetricsFunc   script_metrics_init;
-    AF_Script_ScaleMetricsFunc  script_metrics_scale;
-    AF_Script_DoneMetricsFunc   script_metrics_done;
-
-    AF_Script_InitHintsFunc     script_hints_init;
-    AF_Script_ApplyHintsFunc    script_hints_apply;
-
   } AF_ScriptClassRec;
 
 
@@ -316,53 +366,106 @@
   /* Declare and define vtables for classes */
 #ifndef FT_CONFIG_OPTION_PIC
 
+#define AF_DECLARE_WRITING_SYSTEM_CLASS( writing_system_class ) \
+  FT_CALLBACK_TABLE const AF_WritingSystemClassRec              \
+  writing_system_class;
+
+#define AF_DEFINE_WRITING_SYSTEM_CLASS(                  \
+          writing_system_class,                          \
+          system,                                        \
+          m_size,                                        \
+          m_init,                                        \
+          m_scale,                                       \
+          m_done,                                        \
+          h_init,                                        \
+          h_apply )                                      \
+  FT_CALLBACK_TABLE_DEF                                  \
+  const AF_WritingSystemClassRec  writing_system_class = \
+  {                                                      \
+    system,                                              \
+                                                         \
+    m_size,                                              \
+                                                         \
+    m_init,                                              \
+    m_scale,                                             \
+    m_done,                                              \
+                                                         \
+    h_init,                                              \
+    h_apply                                              \
+  };
+
+
 #define AF_DECLARE_SCRIPT_CLASS( script_class ) \
   FT_CALLBACK_TABLE const AF_ScriptClassRec     \
   script_class;
 
-#define AF_DEFINE_SCRIPT_CLASS( script_class, script_, ranges, def_char,   \
-                                m_size,                                    \
-                                m_init, m_scale, m_done, h_init, h_apply ) \
-  FT_CALLBACK_TABLE_DEF const AF_ScriptClassRec  script_class =            \
-  {                                                                        \
-    script_,                                                               \
-    ranges,                                                                \
-    def_char,                                                              \
-                                                                           \
-    m_size,                                                                \
-                                                                           \
-    m_init,                                                                \
-    m_scale,                                                               \
-    m_done,                                                                \
-                                                                           \
-    h_init,                                                                \
-    h_apply                                                                \
+#define AF_DEFINE_SCRIPT_CLASS(           \
+          script_class,                   \
+          script_,                        \
+          blue_stringset_,                \
+          writing_system_,                \
+          ranges,                         \
+          std_char )                      \
+  FT_CALLBACK_TABLE_DEF                   \
+  const AF_ScriptClassRec  script_class = \
+  {                                       \
+    script_,                              \
+    blue_stringset_,                      \
+    writing_system_,                      \
+    ranges,                               \
+    std_char                              \
   };
 
 #else /* FT_CONFIG_OPTION_PIC */
 
+#define AF_DECLARE_WRITING_SYSTEM_CLASS( writing_system_class )            \
+  FT_LOCAL( void )                                                         \
+  FT_Init_Class_ ## writing_system_class( AF_WritingSystemClassRec*  ac );
+
+#define AF_DEFINE_WRITING_SYSTEM_CLASS(                                   \
+          writing_system_class,                                           \
+          system,                                                         \
+          m_size,                                                         \
+          m_init,                                                         \
+          m_scale,                                                        \
+          m_done,                                                         \
+          h_init,                                                         \
+          h_apply )                                                       \
+  FT_LOCAL_DEF( void )                                                    \
+  FT_Init_Class_ ## writing_system_class( AF_WritingSystemClassRec*  ac ) \
+  {                                                                       \
+    ac->writing_system       = system;                                    \
+                                                                          \
+    ac->script_metrics_size  = m_size;                                    \
+                                                                          \
+    ac->script_metrics_init  = m_init;                                    \
+    ac->script_metrics_scale = m_scale;                                   \
+    ac->script_metrics_done  = m_done;                                    \
+                                                                          \
+    ac->script_hints_init    = h_init;                                    \
+    ac->script_hints_apply   = h_apply;                                   \
+  }
+
+
 #define AF_DECLARE_SCRIPT_CLASS( script_class )             \
   FT_LOCAL( void )                                          \
   FT_Init_Class_ ## script_class( AF_ScriptClassRec*  ac );
 
-#define AF_DEFINE_SCRIPT_CLASS( script_class, script_, ranges, def_char,   \
-                                m_size,                                    \
-                                m_init, m_scale, m_done, h_init, h_apply ) \
-  FT_LOCAL_DEF( void )                                                     \
-  FT_Init_Class_ ## script_class( AF_ScriptClassRec*  ac )                 \
-  {                                                                        \
-    ac->script               = script_;                                    \
-    ac->script_uni_ranges    = ranges;                                     \
-    ac->default_char         = def_char;                                   \
-                                                                           \
-    ac->script_metrics_size  = m_size;                                     \
-                                                                           \
-    ac->script_metrics_init  = m_init;                                     \
-    ac->script_metrics_scale = m_scale;                                    \
-    ac->script_metrics_done  = m_done;                                     \
-                                                                           \
-    ac->script_hints_init    = h_init;                                     \
-    ac->script_hints_apply   = h_apply;                                    \
+#define AF_DEFINE_SCRIPT_CLASS(                            \
+          script_class,                                    \
+          script_,                                         \
+          blue_string_set_,                                \
+          writing_system_,                                 \
+          ranges,                                          \
+          std_char )                                       \
+  FT_LOCAL_DEF( void )                                     \
+  FT_Init_Class_ ## script_class( AF_ScriptClassRec*  ac ) \
+  {                                                        \
+    ac->script            = script_;                       \
+    ac->blue_stringset    = blue_stringset_;               \
+    ac->writing_system    = writing_system_;               \
+    ac->script_uni_ranges = ranges;                        \
+    ac->standard_char     = std_char;                      \
   }
 
 #endif /* FT_CONFIG_OPTION_PIC */
Index: lib/3rdparty/freetype/src/autofit/afblue.c
===================================================================
--- lib/3rdparty/freetype/src/autofit/afblue.c	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afblue.c	(rÃ©vision 62573)
@@ -0,0 +1,166 @@
+/* This file has been generated by the Perl script `afblue.pl', */
+/* using data from file `afblue.dat'.                           */
+
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.c                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (body).                            */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#include "aftypes.h"
+
+
+  FT_LOCAL_ARRAY_DEF( char )
+  af_blue_strings[] =
+  {
+    /* */
+    'T', 'H', 'E', 'Z', 'O', 'C', 'Q', 'S',  /* THEZOCQS */
+    '\0',
+    'H', 'E', 'Z', 'L', 'O', 'C', 'U', 'S',  /* HEZLOCUS */
+    '\0',
+    'f', 'i', 'j', 'k', 'd', 'b', 'h',  /* fijkdbh */
+    '\0',
+    'x', 'z', 'r', 'o', 'e', 's', 'c',  /* xzroesc */
+    '\0',
+    'p', 'q', 'g', 'j', 'y',  /* pqgjy */
+    '\0',
+    '\xCE', '\x93', '\xCE', '\x92', '\xCE', '\x95', '\xCE', '\x96', '\xCE', '\x98', '\xCE', '\x9F', '\xCE', '\xA9',  /* Î“Î’Î•Î–Î˜ÎŸÎ© */
+    '\0',
+    '\xCE', '\x92', '\xCE', '\x94', '\xCE', '\x96', '\xCE', '\x9E', '\xCE', '\x98', '\xCE', '\x9F',  /* Î’Î”Î–ÎžÎ˜ÎŸ */
+    '\0',
+    '\xCE', '\xB2', '\xCE', '\xB8', '\xCE', '\xB4', '\xCE', '\xB6', '\xCE', '\xBB', '\xCE', '\xBE',  /* Î²Î¸Î´Î¶Î»Î¾ */
+    '\0',
+    '\xCE', '\xB1', '\xCE', '\xB5', '\xCE', '\xB9', '\xCE', '\xBF', '\xCF', '\x80', '\xCF', '\x83', '\xCF', '\x84', '\xCF', '\x89',  /* Î±ÎµÎ¹Î¿Ï€ÏƒÏ„Ï‰ */
+    '\0',
+    '\xCE', '\xB2', '\xCE', '\xB3', '\xCE', '\xB7', '\xCE', '\xBC', '\xCF', '\x81', '\xCF', '\x86', '\xCF', '\x87', '\xCF', '\x88',  /* Î²Î³Î·Î¼Ï�Ï†Ï‡Ïˆ */
+    '\0',
+    '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\x9F', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD',  /* Ð‘Ð’Ð•ÐŸÐ—ÐžÐ¡Ð­ */
+    '\0',
+    '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\xA8', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD',  /* Ð‘Ð’Ð•Ð¨Ð—ÐžÐ¡Ð­ */
+    '\0',
+    '\xD1', '\x85', '\xD0', '\xBF', '\xD0', '\xBD', '\xD1', '\x88', '\xD0', '\xB5', '\xD0', '\xB7', '\xD0', '\xBE', '\xD1', '\x81',  /* Ñ…Ð¿Ð½ÑˆÐµÐ·Ð¾Ñ� */
+    '\0',
+    '\xD1', '\x80', '\xD1', '\x83', '\xD1', '\x84',  /* Ñ€ÑƒÑ„ */
+    '\0',
+    '\xD7', '\x91', '\xD7', '\x93', '\xD7', '\x94', '\xD7', '\x97', '\xD7', '\x9A', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1',  /* ×‘×“×”×—×š×›×�×¡ */
+    '\0',
+    '\xD7', '\x91', '\xD7', '\x98', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1', '\xD7', '\xA6',  /* ×‘×˜×›×�×¡×¦ */
+    '\0',
+    '\xD7', '\xA7', '\xD7', '\x9A', '\xD7', '\x9F', '\xD7', '\xA3', '\xD7', '\xA5',  /* ×§×š×Ÿ×£×¥ */
+#ifdef AF_CONFIG_OPTION_CJK
+    '\0',
+    '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0',  /* ä»–ä»¬ä½ ä¾†å€‘åˆ°å’Œåœ° */
+    '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1', '\xE5', '\xB8', '\xAD', '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x83',  /* å¯¹å°�å°±å¸­æˆ‘æ—¶æ™‚æœƒ */
+    '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\x83', '\xBD', '\xE8', '\x88', '\xB0', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99',  /* æ�¥ç‚ºèƒ½èˆ°èªªè¯´è¿™é€™ */
+    '\xE9', '\xBD', '\x8A',  /* é½Š */
+    '\0',
+    '\xE5', '\x86', '\x9B', '\xE5', '\x90', '\x8C', '\xE5', '\xB7', '\xB2', '\xE6', '\x84', '\xBF', '\xE6', '\x97', '\xA2', '\xE6', '\x98', '\x9F', '\xE6', '\x98', '\xAF', '\xE6', '\x99', '\xAF',  /* å†›å�Œå·²æ„¿æ—¢æ˜Ÿæ˜¯æ™¯ */
+    '\xE6', '\xB0', '\x91', '\xE7', '\x85', '\xA7', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\xA8', '\xE7', '\xBD', '\xAE', '\xE8', '\xA6', '\x81',  /* æ°‘ç…§çŽ°ç�¾ç�†ç”¨ç½®è¦� */
+    '\xE8', '\xBB', '\x8D', '\xE9', '\x82', '\xA3', '\xE9', '\x85', '\x8D', '\xE9', '\x87', '\x8C', '\xE9', '\x96', '\x8B', '\xE9', '\x9B', '\xB7', '\xE9', '\x9C', '\xB2', '\xE9', '\x9D', '\xA2',  /* è»�é‚£é…�é‡Œé–‹é›·éœ²é�¢ */
+    '\xE9', '\xA1', '\xBE',  /* é¡¾ */
+    '\0',
+    '\xE4', '\xB8', '\xAA', '\xE4', '\xB8', '\xBA', '\xE4', '\xBA', '\xBA', '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xA5', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86',  /* ä¸ªä¸ºäººä»–ä»¥ä»¬ä½ ä¾† */
+    '\xE5', '\x80', '\x8B', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\xA4', '\xA7', '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1',  /* å€‹å€‘åˆ°å’Œå¤§å¯¹å°�å°± */
+    '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x89', '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\xA6', '\x81', '\xE8', '\xAA', '\xAA',  /* æˆ‘æ—¶æ™‚æœ‰æ�¥ç‚ºè¦�èªª */
+    '\xE8', '\xAF', '\xB4',  /* è¯´ */
+    '\0',
+    '\xE4', '\xB8', '\xBB', '\xE4', '\xBA', '\x9B', '\xE5', '\x9B', '\xA0', '\xE5', '\xAE', '\x83', '\xE6', '\x83', '\xB3', '\xE6', '\x84', '\x8F', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\x9F',  /* ä¸»äº›å› å®ƒæƒ³æ„�ç�†ç”Ÿ */
+    '\xE7', '\x95', '\xB6', '\xE7', '\x9C', '\x8B', '\xE7', '\x9D', '\x80', '\xE7', '\xBD', '\xAE', '\xE8', '\x80', '\x85', '\xE8', '\x87', '\xAA', '\xE8', '\x91', '\x97', '\xE8', '\xA3', '\xA1',  /* ç•¶çœ‹ç�€ç½®è€…è‡ªè‘—è£¡ */
+    '\xE8', '\xBF', '\x87', '\xE8', '\xBF', '\x98', '\xE8', '\xBF', '\x9B', '\xE9', '\x80', '\xB2', '\xE9', '\x81', '\x8E', '\xE9', '\x81', '\x93', '\xE9', '\x82', '\x84', '\xE9', '\x87', '\x8C',  /* è¿‡è¿˜è¿›é€²é�Žé�“é‚„é‡Œ */
+    '\xE9', '\x9D', '\xA2',  /* é�¢ */
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    '\0',
+    '\xE4', '\xBA', '\x9B', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0',  /* äº›ä»¬ä½ ä¾†å€‘åˆ°å’Œåœ° */
+    '\xE5', '\xA5', '\xB9', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE5', '\xB0', '\xB1', '\xE5', '\xB9', '\xB4', '\xE5', '\xBE', '\x97', '\xE6', '\x83', '\x85', '\xE6', '\x9C', '\x80',  /* å¥¹å°†å°‡å°±å¹´å¾—æƒ…æœ€ */
+    '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE7', '\x90', '\x86', '\xE8', '\x83', '\xBD', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99',  /* æ ·æ¨£ç�†èƒ½èªªè¯´è¿™é€™ */
+    '\xE9', '\x80', '\x9A',  /* é€š */
+    '\0',
+    '\xE5', '\x8D', '\xB3', '\xE5', '\x90', '\x97', '\xE5', '\x90', '\xA7', '\xE5', '\x90', '\xAC', '\xE5', '\x91', '\xA2', '\xE5', '\x93', '\x81', '\xE5', '\x93', '\x8D', '\xE5', '\x97', '\x8E',  /* å�³å�—å�§å�¬å‘¢å“�å“�å—Ž */
+    '\xE5', '\xB8', '\x88', '\xE5', '\xB8', '\xAB', '\xE6', '\x94', '\xB6', '\xE6', '\x96', '\xAD', '\xE6', '\x96', '\xB7', '\xE6', '\x98', '\x8E', '\xE7', '\x9C', '\xBC', '\xE9', '\x96', '\x93',  /* å¸ˆå¸«æ”¶æ–­æ–·æ˜Žçœ¼é–“ */
+    '\xE9', '\x97', '\xB4', '\xE9', '\x99', '\x85', '\xE9', '\x99', '\x88', '\xE9', '\x99', '\x90', '\xE9', '\x99', '\xA4', '\xE9', '\x99', '\xB3', '\xE9', '\x9A', '\x8F', '\xE9', '\x9A', '\x9B',  /* é—´é™…é™ˆé™�é™¤é™³éš�éš› */
+    '\xE9', '\x9A', '\xA8',  /* éš¨ */
+    '\0',
+    '\xE4', '\xBA', '\x8B', '\xE5', '\x89', '\x8D', '\xE5', '\xAD', '\xB8', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE6', '\x83', '\x85', '\xE6', '\x83', '\xB3', '\xE6', '\x88', '\x96',  /* äº‹å‰�å­¸å°†å°‡æƒ…æƒ³æˆ– */
+    '\xE6', '\x94', '\xBF', '\xE6', '\x96', '\xAF', '\xE6', '\x96', '\xB0', '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE6', '\xB0', '\x91', '\xE6', '\xB2', '\x92', '\xE6', '\xB2', '\xA1',  /* æ”¿æ–¯æ–°æ ·æ¨£æ°‘æ²’æ²¡ */
+    '\xE7', '\x84', '\xB6', '\xE7', '\x89', '\xB9', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x83', '\xE7', '\xAC', '\xAC', '\xE7', '\xB6', '\x93', '\xE8', '\xB0', '\x81',  /* ç„¶ç‰¹çŽ°ç�¾ç�ƒç¬¬ç¶“è°� */
+    '\xE8', '\xB5', '\xB7',  /* èµ· */
+    '\0',
+    '\xE4', '\xBE', '\x8B', '\xE5', '\x88', '\xA5', '\xE5', '\x88', '\xAB', '\xE5', '\x88', '\xB6', '\xE5', '\x8A', '\xA8', '\xE5', '\x8B', '\x95', '\xE5', '\x90', '\x97', '\xE5', '\x97', '\x8E',  /* ä¾‹åˆ¥åˆ«åˆ¶åŠ¨å‹•å�—å—Ž */
+    '\xE5', '\xA2', '\x9E', '\xE6', '\x8C', '\x87', '\xE6', '\x98', '\x8E', '\xE6', '\x9C', '\x9D', '\xE6', '\x9C', '\x9F', '\xE6', '\x9E', '\x84', '\xE7', '\x89', '\xA9', '\xE7', '\xA1', '\xAE',  /* å¢žæŒ‡æ˜Žæœ�æœŸæž„ç‰©ç¡® */
+    '\xE7', '\xA7', '\x8D', '\xE8', '\xAA', '\xBF', '\xE8', '\xB0', '\x83', '\xE8', '\xB2', '\xBB', '\xE8', '\xB4', '\xB9', '\xE9', '\x82', '\xA3', '\xE9', '\x83', '\xBD', '\xE9', '\x96', '\x93',  /* ç§�èª¿è°ƒè²»è´¹é‚£éƒ½é–“ */
+    '\xE9', '\x97', '\xB4',  /* é—´ */
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+#endif /* AF_CONFIG_OPTION_CJK                */
+    '\0',
+
+  };
+
+
+  /* stringsets are specific to scripts */
+  FT_LOCAL_ARRAY_DEF( AF_Blue_StringRec )
+  af_blue_stringsets[] =
+  {
+    /* */
+    { AF_BLUE_STRING_LATIN_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM,  0                                 },
+    { AF_BLUE_STRING_LATIN_SMALL_F_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_LATIN_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_LATIN_SMALL,           0                                 },
+    { AF_BLUE_STRING_LATIN_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                   0                                 },
+    { AF_BLUE_STRING_GREEK_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM,  0                                 },
+    { AF_BLUE_STRING_GREEK_SMALL_BETA_TOP,  AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_GREEK_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_GREEK_SMALL,           0                                 },
+    { AF_BLUE_STRING_GREEK_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                   0                                 },
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM,  0                                 },
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                               AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           0                                 },
+    { AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                      0                                 },
+    { AF_BLUE_STRING_HEBREW_TOP,       AF_BLUE_PROPERTY_LATIN_TOP  |
+                                       AF_BLUE_PROPERTY_LATIN_LONG   },
+    { AF_BLUE_STRING_HEBREW_BOTTOM,    0                             },
+    { AF_BLUE_STRING_HEBREW_DESCENDER, 0                             },
+    { AF_BLUE_STRING_MAX,              0                             },
+#ifdef AF_CONFIG_OPTION_CJK
+    { AF_BLUE_STRING_CJK_TOP_FILL,      AF_BLUE_PROPERTY_CJK_TOP |
+                                        AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_TOP_UNFILL,    AF_BLUE_PROPERTY_CJK_TOP     },
+    { AF_BLUE_STRING_CJK_BOTTOM_FILL,   AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_BOTTOM_UNFILL, 0                            },
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    { AF_BLUE_STRING_CJK_LEFT_FILL,     AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_LEFT_UNFILL,   AF_BLUE_PROPERTY_CJK_HORIZ   },
+    { AF_BLUE_STRING_CJK_RIGHT_FILL,    AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT |
+                                        AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_RIGHT_UNFILL,  AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT   },
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    { AF_BLUE_STRING_MAX,               0                            },
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+  };
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afblue.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/autofit/afblue.cin
===================================================================
--- lib/3rdparty/freetype/src/autofit/afblue.cin	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afblue.cin	(rÃ©vision 62573)
@@ -0,0 +1,39 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.c                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (body).                            */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#include "aftypes.h"
+
+
+  FT_LOCAL_ARRAY_DEF( char )
+  af_blue_strings[] =
+  {
+    /* */
+@AF_BLUE_STRINGS_ARRAY@
+  };
+
+
+  /* stringsets are specific to scripts */
+  FT_LOCAL_ARRAY_DEF( AF_Blue_StringRec )
+  af_blue_stringsets[] =
+  {
+    /* */
+@AF_BLUE_STRINGSETS_ARRAY@
+  };
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afblue.cin
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/autofit/afblue.dat
===================================================================
--- lib/3rdparty/freetype/src/autofit/afblue.dat	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afblue.dat	(rÃ©vision 62573)
@@ -0,0 +1,218 @@
+//  afblue.dat
+//
+//    Auto-fitter data for blue strings.
+//
+//  Copyright 2013 by
+//  David Turner, Robert Wilhelm, and Werner Lemberg.
+//
+//  This file is part of the FreeType project, and may only be used,
+//  modified, and distributed under the terms of the FreeType project
+//  license, LICENSE.TXT.  By continuing to use, modify, or distribute
+//  this file you indicate that you have read the license and
+//  understand and accept it fully.
+
+
+// This file contains data specific to blue zones.  It gets processed by
+// a script to simulate `jagged arrays', with enumeration values holding
+// offsets into the arrays.
+//
+// The format of the file is rather simple:  A section starts with three
+// labels separated by whitespace and followed by a colon (everything in a
+// single line); the first label gives the name of the enumeration template,
+// the second the name of the array template, and the third the name of the
+// `maximum' template, holding the size of the largest array element.  The
+// script then fills the corresponding templates (indicated by `@'
+// characters around the name).
+//
+// A section contains one or more data records.  Each data record consists
+// of two or more lines.  The first line holds the enumeration name, and the
+// remaining lines the corresponding array data.
+//
+// There are two possible representations for array data.
+//
+// - A string of characters in UTF-8 encoding enclosed in double quotes,
+//   using C syntax.  There can be only one string per line, thus the
+//   starting and ending double quote must be the first and last character
+//   in the line, respectively, ignoring whitespace before and after the
+//   string.  If there are multiple strings (in multiple lines), they are
+//   concatenated to a single string.  In the output, a string gets
+//   represented as a series of singles bytes, followed by a zero byte.  The
+//   enumeration values simply hold byte offsets to the start of the
+//   corresponding strings.
+//
+// - Data blocks enclosed in balanced braces, which get copied verbatim and
+//   which can span multiple lines.  The opening brace of a block must be
+//   the first character of a line (ignoring whitespace), and the closing
+//   brace the last (ignoring whitespace also).  The script appends a comma
+//   character after each block and counts the number of blocks to set the
+//   enumeration values.
+//
+// A section can contain either strings only or data blocks only.
+//
+// A comment line starts with `//'; it gets removed.  A preprocessor
+// directive line (using the standard syntax of `cpp') starts with `#' and
+// gets copied verbatim to both the enumeration and the array.  Whitespace
+// outside of a string is insignificant.
+//
+// Preprocessor directives are ignored while the script computes maximum
+// values; this essentially means that the maximum values can easily be too
+// large.  Given that the purpose of those values is to create local
+// fixed-size arrays at compile time for further processing of the blue zone
+// data, this isn't a problem.  Note the the final zero byte of a string is
+// not counted.  Note also that the count holds the number of UTF-8 encoded
+// characters, not bytes.
+
+
+AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
+
+  AF_BLUE_STRING_LATIN_CAPITAL_TOP
+    "THEZOCQS"
+  AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM
+    "HEZLOCUS"
+  AF_BLUE_STRING_LATIN_SMALL_F_TOP
+    "fijkdbh"
+  AF_BLUE_STRING_LATIN_SMALL
+    "xzroesc"
+  AF_BLUE_STRING_LATIN_SMALL_DESCENDER
+    "pqgjy"
+
+  AF_BLUE_STRING_GREEK_CAPITAL_TOP
+    "Î“Î’Î•Î–Î˜ÎŸÎ©"
+  AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM
+    "Î’Î”Î–ÎžÎ˜ÎŸ"
+  AF_BLUE_STRING_GREEK_SMALL_BETA_TOP
+    "Î²Î¸Î´Î¶Î»Î¾"
+  AF_BLUE_STRING_GREEK_SMALL
+    "Î±ÎµÎ¹Î¿Ï€ÏƒÏ„Ï‰"
+  AF_BLUE_STRING_GREEK_SMALL_DESCENDER
+    "Î²Î³Î·Î¼Ï�Ï†Ï‡Ïˆ"
+
+  AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP
+    "Ð‘Ð’Ð•ÐŸÐ—ÐžÐ¡Ð­"
+  AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM
+    "Ð‘Ð’Ð•Ð¨Ð—ÐžÐ¡Ð­"
+  AF_BLUE_STRING_CYRILLIC_SMALL
+    "Ñ…Ð¿Ð½ÑˆÐµÐ·Ð¾Ñ�"
+  AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER
+    "Ñ€ÑƒÑ„"
+
+  AF_BLUE_STRING_HEBREW_TOP
+    "×‘×“×”×—×š×›×�×¡"
+  AF_BLUE_STRING_HEBREW_BOTTOM
+    "×‘×˜×›×�×¡×¦"
+  AF_BLUE_STRING_HEBREW_DESCENDER
+    "×§×š×Ÿ×£×¥"
+
+#ifdef AF_CONFIG_OPTION_CJK
+
+  AF_BLUE_STRING_CJK_TOP_FILL
+    "ä»–ä»¬ä½ ä¾†å€‘åˆ°å’Œåœ°"
+    "å¯¹å°�å°±å¸­æˆ‘æ—¶æ™‚æœƒ"
+    "æ�¥ç‚ºèƒ½èˆ°èªªè¯´è¿™é€™"
+    "é½Š"
+  AF_BLUE_STRING_CJK_TOP_UNFILL
+    "å†›å�Œå·²æ„¿æ—¢æ˜Ÿæ˜¯æ™¯"
+    "æ°‘ç…§çŽ°ç�¾ç�†ç”¨ç½®è¦�"
+    "è»�é‚£é…�é‡Œé–‹é›·éœ²é�¢"
+    "é¡¾"
+  AF_BLUE_STRING_CJK_BOTTOM_FILL
+    "ä¸ªä¸ºäººä»–ä»¥ä»¬ä½ ä¾†"
+    "å€‹å€‘åˆ°å’Œå¤§å¯¹å°�å°±"
+    "æˆ‘æ—¶æ™‚æœ‰æ�¥ç‚ºè¦�èªª"
+    "è¯´"
+  AF_BLUE_STRING_CJK_BOTTOM_UNFILL
+    "ä¸»äº›å› å®ƒæƒ³æ„�ç�†ç”Ÿ"
+    "ç•¶çœ‹ç�€ç½®è€…è‡ªè‘—è£¡"
+    "è¿‡è¿˜è¿›é€²é�Žé�“é‚„é‡Œ"
+    "é�¢"
+
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+
+  AF_BLUE_STRING_CJK_LEFT_FILL
+    "äº›ä»¬ä½ ä¾†å€‘åˆ°å’Œåœ°"
+    "å¥¹å°†å°‡å°±å¹´å¾—æƒ…æœ€"
+    "æ ·æ¨£ç�†èƒ½èªªè¯´è¿™é€™"
+    "é€š"
+  AF_BLUE_STRING_CJK_LEFT_UNFILL
+    "å�³å�—å�§å�¬å‘¢å“�å“�å—Ž"
+    "å¸ˆå¸«æ”¶æ–­æ–·æ˜Žçœ¼é–“"
+    "é—´é™…é™ˆé™�é™¤é™³éš�éš›"
+    "éš¨"
+  AF_BLUE_STRING_CJK_RIGHT_FILL
+    "äº‹å‰�å­¸å°†å°‡æƒ…æƒ³æˆ–"
+    "æ”¿æ–¯æ–°æ ·æ¨£æ°‘æ²’æ²¡"
+    "ç„¶ç‰¹çŽ°ç�¾ç�ƒç¬¬ç¶“è°�"
+    "èµ·"
+  AF_BLUE_STRING_CJK_RIGHT_UNFILL
+    "ä¾‹åˆ¥åˆ«åˆ¶åŠ¨å‹•å�—å—Ž"
+    "å¢žæŒ‡æ˜Žæœ�æœŸæž„ç‰©ç¡®"
+    "ç§�èª¿è°ƒè²»è´¹é‚£éƒ½é–“"
+    "é—´"
+
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN:
+
+  AF_BLUE_STRINGSET_LATN
+    { AF_BLUE_STRING_LATIN_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM,  0                                 }
+    { AF_BLUE_STRING_LATIN_SMALL_F_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_LATIN_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_LATIN_SMALL,           0                                 }
+    { AF_BLUE_STRING_LATIN_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                   0                                 }
+
+  AF_BLUE_STRINGSET_GREK
+    { AF_BLUE_STRING_GREEK_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM,  0                                 }
+    { AF_BLUE_STRING_GREEK_SMALL_BETA_TOP,  AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_GREEK_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_GREEK_SMALL,           0                                 }
+    { AF_BLUE_STRING_GREEK_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                   0                                 }
+
+  AF_BLUE_STRINGSET_CYRL
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM,  0                                 }
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                               AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           0                                 }
+    { AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                      0                                 }
+
+  AF_BLUE_STRINGSET_HEBR
+    { AF_BLUE_STRING_HEBREW_TOP,       AF_BLUE_PROPERTY_LATIN_TOP  |
+                                       AF_BLUE_PROPERTY_LATIN_LONG   }
+    { AF_BLUE_STRING_HEBREW_BOTTOM,    0                             }
+    { AF_BLUE_STRING_HEBREW_DESCENDER, 0                             }
+    { AF_BLUE_STRING_MAX,              0                             }
+
+#ifdef AF_CONFIG_OPTION_CJK
+
+  AF_BLUE_STRINGSET_HANI
+    { AF_BLUE_STRING_CJK_TOP_FILL,      AF_BLUE_PROPERTY_CJK_TOP |
+                                        AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_TOP_UNFILL,    AF_BLUE_PROPERTY_CJK_TOP     }
+    { AF_BLUE_STRING_CJK_BOTTOM_FILL,   AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_BOTTOM_UNFILL, 0                            }
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    { AF_BLUE_STRING_CJK_LEFT_FILL,     AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_LEFT_UNFILL,   AF_BLUE_PROPERTY_CJK_HORIZ   }
+    { AF_BLUE_STRING_CJK_RIGHT_FILL,    AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT |
+                                        AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_RIGHT_UNFILL,  AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT   }
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    { AF_BLUE_STRING_MAX,               0                            }
+
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+// END

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afblue.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/autofit/afblue.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afblue.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afblue.h	(rÃ©vision 62573)
@@ -0,0 +1,199 @@
+/* This file has been generated by the Perl script `afblue.pl', */
+/* using data from file `afblue.dat'.                           */
+
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.h                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (specification).                   */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __AFBLUE_H__
+#define __AFBLUE_H__
+
+
+FT_BEGIN_HEADER
+
+
+  /* an auxiliary macro to decode a UTF-8 character -- since we only use */
+  /* hard-coded, self-converted data, no error checking is performed     */
+#define GET_UTF8_CHAR( ch, p )                    \
+          ch = (unsigned char)*p++;               \
+          if ( ch >= 0x80 )                       \
+          {                                       \
+            FT_UInt  len;                         \
+                                                  \
+                                                  \
+            if ( ch < 0xE0 )                      \
+            {                                     \
+              len = 1;                            \
+              ch &= 0x1F;                         \
+            }                                     \
+            else if ( ch < 0xF0 )                 \
+            {                                     \
+              len = 2;                            \
+              ch &= 0x0F;                         \
+            }                                     \
+            else                                  \
+            {                                     \
+              len = 3;                            \
+              ch &= 0x07;                         \
+            }                                     \
+                                                  \
+            for ( ; len > 0; len-- )              \
+              ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
+          }
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                    B L U E   S T R I N G S                    *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* At the bottommost level, we define strings for finding blue zones. */
+
+
+#define AF_BLUE_STRING_MAX_LEN  25
+
+  /* The AF_Blue_String enumeration values are offsets into the */
+  /* `af_blue_strings' array.                                   */
+
+  typedef enum  AF_Blue_String_
+  {
+    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 0,
+    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 9,
+    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 18,
+    AF_BLUE_STRING_LATIN_SMALL = 26,
+    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 34,
+    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 40,
+    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 55,
+    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 68,
+    AF_BLUE_STRING_GREEK_SMALL = 81,
+    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 98,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 115,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 132,
+    AF_BLUE_STRING_CYRILLIC_SMALL = 149,
+    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 166,
+    AF_BLUE_STRING_HEBREW_TOP = 173,
+    AF_BLUE_STRING_HEBREW_BOTTOM = 190,
+    AF_BLUE_STRING_HEBREW_DESCENDER = 203,
+    af_blue_1_1 = 213,
+#ifdef AF_CONFIG_OPTION_CJK
+    AF_BLUE_STRING_CJK_TOP_FILL = af_blue_1_1 + 1,
+    AF_BLUE_STRING_CJK_TOP_UNFILL = af_blue_1_1 + 77,
+    AF_BLUE_STRING_CJK_BOTTOM_FILL = af_blue_1_1 + 153,
+    AF_BLUE_STRING_CJK_BOTTOM_UNFILL = af_blue_1_1 + 229,
+    af_blue_1_1_1 = af_blue_1_1 + 304,
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    AF_BLUE_STRING_CJK_LEFT_FILL = af_blue_1_1_1 + 1,
+    AF_BLUE_STRING_CJK_LEFT_UNFILL = af_blue_1_1_1 + 77,
+    AF_BLUE_STRING_CJK_RIGHT_FILL = af_blue_1_1_1 + 153,
+    AF_BLUE_STRING_CJK_RIGHT_UNFILL = af_blue_1_1_1 + 229,
+    af_blue_1_2_1 = af_blue_1_1_1 + 304,
+#else
+    af_blue_1_2_1 = af_blue_1_1_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    af_blue_1_2 = af_blue_1_2_1 + 0,
+#else
+    af_blue_1_2 = af_blue_1_2_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+    AF_BLUE_STRING_MAX   /* do not remove */
+
+  } AF_Blue_String;
+
+
+  FT_LOCAL_ARRAY( char )
+  af_blue_strings[];
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                 B L U E   S T R I N G S E T S                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* The next level is to group blue strings into script-specific sets. */
+
+
+  /* Properties are specific to a writing system.  We assume that a given  */
+  /* blue string can't be used in more than a single writing system, which */
+  /* is a safe bet.                                                        */
+#define AF_BLUE_PROPERTY_LATIN_TOP       ( 1 << 0 )
+#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT  ( 1 << 1 )
+#define AF_BLUE_PROPERTY_LATIN_LONG      ( 1 << 2 )
+
+#define AF_BLUE_PROPERTY_CJK_HORIZ  ( 1 << 0 )
+#define AF_BLUE_PROPERTY_CJK_TOP    ( 1 << 1 )
+#define AF_BLUE_PROPERTY_CJK_FILL   ( 1 << 2 )
+#define AF_BLUE_PROPERTY_CJK_RIGHT  AF_BLUE_PROPERTY_CJK_TOP
+
+
+#define AF_BLUE_STRINGSET_MAX_LEN  9
+
+  /* The AF_Blue_Stringset enumeration values are offsets into the */
+  /* `af_blue_stringsets' array.                                   */
+
+  typedef enum  AF_Blue_Stringset_
+  {
+    AF_BLUE_STRINGSET_LATN = 0,
+    AF_BLUE_STRINGSET_GREK = 7,
+    AF_BLUE_STRINGSET_CYRL = 14,
+    AF_BLUE_STRINGSET_HEBR = 20,
+    af_blue_2_1 = 24,
+#ifdef AF_CONFIG_OPTION_CJK
+    AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0,
+    af_blue_2_1_1 = af_blue_2_1 + 4,
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    af_blue_2_2_1 = af_blue_2_1_1 + 4,
+#else
+    af_blue_2_2_1 = af_blue_2_1_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    af_blue_2_2 = af_blue_2_2_1 + 1,
+#else
+    af_blue_2_2 = af_blue_2_2_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+    AF_BLUE_STRINGSET_MAX   /* do not remove */
+
+  } AF_Blue_Stringset;
+
+
+  typedef struct  AF_Blue_StringRec_
+  {
+    AF_Blue_String  string;
+    FT_UShort       properties;
+
+  } AF_Blue_StringRec;
+
+
+  FT_LOCAL_ARRAY( AF_Blue_StringRec )
+  af_blue_stringsets[];
+
+/* */
+
+FT_END_HEADER
+
+
+#endif /* __AFBLUE_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afblue.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/autofit/afblue.hin
===================================================================
--- lib/3rdparty/freetype/src/autofit/afblue.hin	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afblue.hin	(rÃ©vision 62573)
@@ -0,0 +1,142 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.h                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (specification).                   */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __AFBLUE_H__
+#define __AFBLUE_H__
+
+
+FT_BEGIN_HEADER
+
+
+  /* an auxiliary macro to decode a UTF-8 character -- since we only use */
+  /* hard-coded, self-converted data, no error checking is performed     */
+#define GET_UTF8_CHAR( ch, p )                    \
+          ch = (unsigned char)*p++;               \
+          if ( ch >= 0x80 )                       \
+          {                                       \
+            FT_UInt  len;                         \
+                                                  \
+                                                  \
+            if ( ch < 0xE0 )                      \
+            {                                     \
+              len = 1;                            \
+              ch &= 0x1F;                         \
+            }                                     \
+            else if ( ch < 0xF0 )                 \
+            {                                     \
+              len = 2;                            \
+              ch &= 0x0F;                         \
+            }                                     \
+            else                                  \
+            {                                     \
+              len = 3;                            \
+              ch &= 0x07;                         \
+            }                                     \
+                                                  \
+            for ( ; len > 0; len-- )              \
+              ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
+          }
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                    B L U E   S T R I N G S                    *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* At the bottommost level, we define strings for finding blue zones. */
+
+
+#define AF_BLUE_STRING_MAX_LEN  @AF_BLUE_STRING_MAX_LEN@
+
+  /* The AF_Blue_String enumeration values are offsets into the */
+  /* `af_blue_strings' array.                                   */
+
+  typedef enum  AF_Blue_String_
+  {
+@AF_BLUE_STRING_ENUM@
+
+    AF_BLUE_STRING_MAX   /* do not remove */
+
+  } AF_Blue_String;
+
+
+  FT_LOCAL_ARRAY( char )
+  af_blue_strings[];
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                 B L U E   S T R I N G S E T S                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* The next level is to group blue strings into script-specific sets. */
+
+
+  /* Properties are specific to a writing system.  We assume that a given  */
+  /* blue string can't be used in more than a single writing system, which */
+  /* is a safe bet.                                                        */
+#define AF_BLUE_PROPERTY_LATIN_TOP       ( 1 << 0 )
+#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT  ( 1 << 1 )
+#define AF_BLUE_PROPERTY_LATIN_LONG      ( 1 << 2 )
+
+#define AF_BLUE_PROPERTY_CJK_HORIZ  ( 1 << 0 )
+#define AF_BLUE_PROPERTY_CJK_TOP    ( 1 << 1 )
+#define AF_BLUE_PROPERTY_CJK_FILL   ( 1 << 2 )
+#define AF_BLUE_PROPERTY_CJK_RIGHT  AF_BLUE_PROPERTY_CJK_TOP
+
+
+#define AF_BLUE_STRINGSET_MAX_LEN  @AF_BLUE_STRINGSET_MAX_LEN@
+
+  /* The AF_Blue_Stringset enumeration values are offsets into the */
+  /* `af_blue_stringsets' array.                                   */
+
+  typedef enum  AF_Blue_Stringset_
+  {
+@AF_BLUE_STRINGSET_ENUM@
+
+    AF_BLUE_STRINGSET_MAX   /* do not remove */
+
+  } AF_Blue_Stringset;
+
+
+  typedef struct  AF_Blue_StringRec_
+  {
+    AF_Blue_String  string;
+    FT_UShort       properties;
+
+  } AF_Blue_StringRec;
+
+
+  FT_LOCAL_ARRAY( AF_Blue_StringRec )
+  af_blue_stringsets[];
+
+/* */
+
+FT_END_HEADER
+
+
+#endif /* __AFBLUE_H__ */
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afblue.hin
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/autofit/afscript.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afscript.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afscript.h	(rÃ©vision 62573)
@@ -0,0 +1,37 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afscript.h                                                             */
+/*                                                                         */
+/*    Auto-fitter scripts (specification only).                            */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /* The following part can be included multiple times. */
+  /* Define `SCRIPT' as needed.                         */
+
+
+  /* Add new scripts here. */
+
+  SCRIPT( cyrl, CYRL, "Cyrillic" )
+  SCRIPT( deva, DEVA, "Indic scripts" )
+  SCRIPT( dflt, DFLT, "no script" )
+  SCRIPT( grek, GREK, "Greek" )
+  SCRIPT( hani, HANI, "CJKV ideographs" )
+  SCRIPT( hebr, HEBR, "Hebrew" )
+  SCRIPT( latn, LATN, "Latin" )
+#ifdef FT_OPTION_AUTOFIT2
+  SCRIPT( ltn2, LTN2, "Latin 2" )
+#endif
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afscript.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/autofit/afwrtsys.h
===================================================================
--- lib/3rdparty/freetype/src/autofit/afwrtsys.h	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/autofit/afwrtsys.h	(rÃ©vision 62573)
@@ -0,0 +1,51 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afwrtsys.h                                                             */
+/*                                                                         */
+/*    Auto-fitter writing systems (specification only).                    */
+/*                                                                         */
+/*  Copyright 2013 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __AFWRTSYS_H__
+#define __AFWRTSYS_H__
+
+  /* Since preprocessor directives can't create other preprocessor */
+  /* directives, we have to include the header files manually.     */
+
+#include "afdummy.h"
+#include "aflatin.h"
+#include "afcjk.h"
+#include "afindic.h"
+#ifdef FT_OPTION_AUTOFIT2
+#include "aflatin2.h"
+#endif
+
+#endif /* __AFWRTSYS_H__ */
+
+
+  /* The following part can be included multiple times. */
+  /* Define `WRITING_SYSTEM' as needed.                 */
+
+
+  /* Add new writing systems here. */
+
+  WRITING_SYSTEM( dummy,  DUMMY  )
+  WRITING_SYSTEM( latin,  LATIN  )
+  WRITING_SYSTEM( cjk,    CJK    )
+  WRITING_SYSTEM( indic,  INDIC  )
+#ifdef FT_OPTION_AUTOFIT2
+  WRITING_SYSTEM( latin2, LATIN2 )
+#endif
+
+
+/* END */

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/autofit/afwrtsys.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/truetype/ttgload.h
===================================================================
--- lib/3rdparty/freetype/src/truetype/ttgload.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/truetype/ttgload.h	(copie de travail)
@@ -43,6 +43,7 @@
   FT_LOCAL( void )
   TT_Get_VMetrics( TT_Face     face,
                    FT_UInt     idx,
+                   FT_Pos      yMax,
                    FT_Short*   tsb,
                    FT_UShort*  ah );
 
Index: lib/3rdparty/freetype/src/truetype/ttdriver.c
===================================================================
--- lib/3rdparty/freetype/src/truetype/ttdriver.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/truetype/ttdriver.c	(copie de travail)
@@ -215,7 +215,8 @@
         FT_UShort  ah;
 
 
-        TT_Get_VMetrics( face, start + nn, &tsb, &ah );
+        /* since we don't need `tsb', we use zero for `yMax' parameter */
+        TT_Get_VMetrics( face, start + nn, 0, &tsb, &ah );
         advances[nn] = ah;
       }
     }
Index: lib/3rdparty/freetype/src/truetype/ttobjs.c
===================================================================
--- lib/3rdparty/freetype/src/truetype/ttobjs.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/truetype/ttobjs.c	(copie de travail)
@@ -150,20 +150,21 @@
   tt_check_trickyness_family( FT_String*  name )
   {
 
-#define TRICK_NAMES_MAX_CHARACTERS  16
-#define TRICK_NAMES_COUNT            8
+#define TRICK_NAMES_MAX_CHARACTERS  19
+#define TRICK_NAMES_COUNT            9
 
     static const char trick_names[TRICK_NAMES_COUNT]
                                  [TRICK_NAMES_MAX_CHARACTERS + 1] =
     {
-      "DFKaiSho-SB",     /* dfkaisb.ttf */
+      "DFKaiSho-SB",        /* dfkaisb.ttf */
       "DFKaiShu",
-      "DFKai-SB",        /* kaiu.ttf */
-      "HuaTianKaiTi?",   /* htkt2.ttf */
-      "HuaTianSongTi?",  /* htst3.ttf */
-      "MingLiU",         /* mingliu.ttf & mingliu.ttc */
-      "PMingLiU",        /* mingliu.ttc */
-      "MingLi43",        /* mingli.ttf */
+      "DFKai-SB",           /* kaiu.ttf */
+      "HuaTianKaiTi?",      /* htkt2.ttf */
+      "HuaTianSongTi?",     /* htst3.ttf */
+      "Ming(for ISO10646)", /* hkscsiic.ttf & iicore.ttf */
+      "MingLiU",            /* mingliu.ttf & mingliu.ttc */
+      "PMingLiU",           /* mingliu.ttc */
+      "MingLi43",           /* mingli.ttf */
     };
 
     int  nn;
@@ -532,6 +533,10 @@
 
     /* check that we have a valid TrueType file */
     error = sfnt->init_face( stream, face, face_index, num_params, params );
+
+    /* Stream may have changed. */
+    stream = face->root.stream;
+
     if ( error )
       goto Exit;
 
Index: lib/3rdparty/freetype/src/truetype/ttinterp.c
===================================================================
--- lib/3rdparty/freetype/src/truetype/ttinterp.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/truetype/ttinterp.c	(copie de travail)
@@ -1437,9 +1437,108 @@
 
 #undef PACK
 
-#if 1
 
+#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER
+
+#if defined( __arm__ )                                 && \
+    ( defined( __thumb2__ ) || !defined( __thumb__ ) )
+
+#define TT_MulFix14  TT_MulFix14_arm
+
   static FT_Int32
+  TT_MulFix14_arm( FT_Int32  a,
+                   FT_Int    b )
+  {
+    register FT_Int32  t, t2;
+
+
+#if defined( __CC_ARM ) || defined( __ARMCC__ )
+
+    __asm
+    {
+      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
+      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
+      add   a,  a,  #0x2000         /* a  += 0x2000 */
+      adds  t2, t2, a               /* t2 += a */
+      adc   t,  t,  #0              /* t  += carry */
+      mov   a,  t2, lsr #14         /* a   = t2 >> 14 */
+      orr   a,  a,  t,  lsl #18     /* a  |= t << 18 */
+    }
+
+#elif defined( __GNUC__ )
+
+    __asm__ __volatile__ (
+      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
+      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+#ifdef __clang__
+      "add.w  %0, %0, #0x2000\n\t"      /* %0 += 0x2000 */
+#else
+      "add    %0, %0, #0x2000\n\t"      /* %0 += 0x2000 */
+#endif
+      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
+      "adc    %2, %2, #0\n\t"           /* %2 += carry */
+      "mov    %0, %1, lsr #14\n\t"      /* %0  = %1 >> 16 */
+      "orr    %0, %0, %2, lsl #18\n\t"  /* %0 |= %2 << 16 */
+      : "=r"(a), "=&r"(t2), "=&r"(t)
+      : "r"(a), "r"(b)
+      : "cc" );
+
+#endif
+
+    return a;
+  }
+
+#endif /* __arm__ && ( __thumb2__ || !__thumb__ ) */
+
+#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+#if defined( __GNUC__ )                              && \
+    ( defined( __i386__ ) || defined( __x86_64__ ) )
+
+#define TT_MulFix14  TT_MulFix14_long_long
+
+  /* Temporarily disable the warning that C90 doesn't support `long long'. */
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic push
+#endif
+#pragma GCC diagnostic ignored "-Wlong-long"
+
+  /* This is declared `noinline' because inlining the function results */
+  /* in slower code.  The `pure' attribute indicates that the result   */
+  /* only depends on the parameters.                                   */
+  static __attribute__(( noinline ))
+         __attribute__(( pure )) FT_Int32
+  TT_MulFix14_long_long( FT_Int32  a,
+                         FT_Int    b )
+  {
+
+    long long  ret = (long long)a * b;
+
+    /* The following line assumes that right shifting of signed values */
+    /* will actually preserve the sign bit.  The exact behaviour is    */
+    /* undefined, but this is true on x86 and x86_64.                  */
+    long long  tmp = ret >> 63;
+
+
+    ret += 0x2000 + tmp;
+
+    return (FT_Int32)( ret >> 14 );
+  }
+
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic pop
+#endif
+
+#endif /* __GNUC__ && ( __i386__ || __x86_64__ ) */
+
+
+#ifndef TT_MulFix14
+
+  /* Compute (a*b)/2^14 with maximum accuracy and rounding.  */
+  /* This is optimized to be faster than calling FT_MulFix() */
+  /* for platforms where sizeof(int) == 2.                   */
+  static FT_Int32
   TT_MulFix14( FT_Int32  a,
                FT_Int    b )
   {
@@ -1470,38 +1569,51 @@
     return sign >= 0 ? (FT_Int32)mid : -(FT_Int32)mid;
   }
 
-#else
+#endif  /* !TT_MulFix14 */
 
-  /* compute (a*b)/2^14 with maximum accuracy and rounding */
-  static FT_Int32
-  TT_MulFix14( FT_Int32  a,
-               FT_Int    b )
+
+#if defined( __GNUC__ )        && \
+    ( defined( __i386__ )   ||    \
+      defined( __x86_64__ ) ||    \
+      defined( __arm__ )    )
+
+#define TT_DotFix14  TT_DotFix14_long_long
+
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic push
+#endif
+#pragma GCC diagnostic ignored "-Wlong-long"
+
+  static __attribute__(( pure )) FT_Int32
+  TT_DotFix14_long_long( FT_Int32  ax,
+                         FT_Int32  ay,
+                         FT_Int    bx,
+                         FT_Int    by )
   {
-    FT_Int32   m, s, hi;
-    FT_UInt32  l, lo;
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
 
+    long long  temp1 = (long long)ax * bx;
+    long long  temp2 = (long long)ay * by;
 
-    /* compute ax*bx as 64-bit value */
-    l  = (FT_UInt32)( ( a & 0xFFFFU ) * b );
-    m  = ( a >> 16 ) * b;
 
-    lo = l + ( (FT_UInt32)m << 16 );
-    hi = ( m >> 16 ) + ( (FT_Int32)l >> 31 ) + ( lo < l );
+    temp1 += temp2;
+    temp2  = temp1 >> 63;
+    temp1 += 0x2000 + temp2;
 
-    /* divide the result by 2^14 with rounding */
-    s   = hi >> 31;
-    l   = lo + (FT_UInt32)s;
-    hi += s + ( l < lo );
-    lo  = l;
+    return (FT_Int32)( temp1 >> 14 );
 
-    l   = lo + 0x2000U;
-    hi += l < lo;
+  }
 
-    return (FT_Int32)( ( (FT_UInt32)hi << 18 ) | ( l >> 14 ) );
-  }
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic pop
 #endif
 
+#endif /* __GNUC__ && (__arm__ || __i386__ || __x86_64__) */
 
+
+#ifndef TT_DotFix14
+
   /* compute (ax*bx+ay*by)/2^14 with maximum accuracy and rounding */
   static FT_Int32
   TT_DotFix14( FT_Int32  ax,
@@ -1543,7 +1655,9 @@
     return (FT_Int32)( ( (FT_UInt32)hi << 18 ) | ( l >> 14 ) );
   }
 
+#endif /* TT_DotFix14 */
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -3037,42 +3151,42 @@
   }
 
 
-#define DO_JROT                                                   \
-    if ( args[1] != 0 )                                           \
-    {                                                             \
-      if ( args[0] == 0 && CUR.args == 0 )                        \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.IP += args[0];                                          \
-      if ( CUR.IP < 0                                          || \
-           ( CUR.callTop > 0                                 &&   \
-             CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.step_ins = FALSE;                                       \
+#define DO_JROT                                                    \
+    if ( args[1] != 0 )                                            \
+    {                                                              \
+      if ( args[0] == 0 && CUR.args == 0 )                         \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.IP += args[0];                                           \
+      if ( CUR.IP < 0                                           || \
+           ( CUR.callTop > 0                                  &&   \
+             CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) )  \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.step_ins = FALSE;                                        \
     }
 
 
-#define DO_JMPR                                                 \
-    if ( args[0] == 0 && CUR.args == 0 )                        \
-      CUR.error = FT_THROW( Bad_Argument );                     \
-    CUR.IP += args[0];                                          \
-    if ( CUR.IP < 0                                          || \
-         ( CUR.callTop > 0                                 &&   \
-           CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
-      CUR.error = FT_THROW( Bad_Argument );                     \
+#define DO_JMPR                                                  \
+    if ( args[0] == 0 && CUR.args == 0 )                         \
+      CUR.error = FT_THROW( Bad_Argument );                      \
+    CUR.IP += args[0];                                           \
+    if ( CUR.IP < 0                                           || \
+         ( CUR.callTop > 0                                  &&   \
+           CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) )  \
+      CUR.error = FT_THROW( Bad_Argument );                      \
     CUR.step_ins = FALSE;
 
 
-#define DO_JROF                                                   \
-    if ( args[1] == 0 )                                           \
-    {                                                             \
-      if ( args[0] == 0 && CUR.args == 0 )                        \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.IP += args[0];                                          \
-      if ( CUR.IP < 0                                          || \
-           ( CUR.callTop > 0                                 &&   \
-             CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.step_ins = FALSE;                                       \
+#define DO_JROF                                                    \
+    if ( args[1] == 0 )                                            \
+    {                                                              \
+      if ( args[0] == 0 && CUR.args == 0 )                         \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.IP += args[0];                                           \
+      if ( CUR.IP < 0                                           || \
+           ( CUR.callTop > 0                                  &&   \
+             CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) )  \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.step_ins = FALSE;                                        \
     }
 
 
@@ -4788,7 +4902,7 @@
     if ( pRec->Cur_Count > 0 )
     {
       CUR.callTop++;
-      CUR.IP = pRec->Cur_Restart;
+      CUR.IP = pRec->Def->start;
     }
     else
       /* Loop through the current function */
@@ -4878,8 +4992,7 @@
     pCrec->Caller_Range = CUR.curRange;
     pCrec->Caller_IP    = CUR.IP + 1;
     pCrec->Cur_Count    = 1;
-    pCrec->Cur_Restart  = def->start;
-    pCrec->Cur_End      = def->end;
+    pCrec->Def          = def;
 
     CUR.callTop++;
 
@@ -4967,8 +5080,7 @@
       pCrec->Caller_Range = CUR.curRange;
       pCrec->Caller_IP    = CUR.IP + 1;
       pCrec->Cur_Count    = (FT_Int)args[0];
-      pCrec->Cur_Restart  = def->start;
-      pCrec->Cur_End      = def->end;
+      pCrec->Def          = def;
 
       CUR.callTop++;
 
@@ -7716,19 +7828,16 @@
       if ( ( args[0] & 32 ) != 0 && CUR.grayscale_hinting )
         K |= 1 << 12;
 
-      /********************************/
-      /* HINTING FOR SUBPIXEL         */
-      /* Selector Bit:  6             */
-      /* Return Bit(s): 13            */
-      /*                              */
-      if ( ( args[0] & 64 ) != 0        &&
-           CUR.subpixel_hinting         &&
-           CUR.rasterizer_version >= 37 )
+      if ( CUR.rasterizer_version >= 37 )
       {
-        K |= 1 << 13;
+        /********************************/
+        /* HINTING FOR SUBPIXEL         */
+        /* Selector Bit:  6             */
+        /* Return Bit(s): 13            */
+        /*                              */
+        if ( ( args[0] & 64 ) != 0 && CUR.subpixel_hinting )
+          K |= 1 << 13;
 
-        /* the stuff below is irrelevant if subpixel_hinting is not set */
-
         /********************************/
         /* COMPATIBLE WIDTHS ENABLED    */
         /* Selector Bit:  7             */
@@ -7803,8 +7912,7 @@
         call->Caller_Range = CUR.curRange;
         call->Caller_IP    = CUR.IP + 1;
         call->Cur_Count    = 1;
-        call->Cur_Restart  = def->start;
-        call->Cur_End      = def->end;
+        call->Def          = def;
 
         INS_Goto_CodeRange( def->range, def->start );
 
@@ -8860,8 +8968,7 @@
                 callrec->Caller_Range = CUR.curRange;
                 callrec->Caller_IP    = CUR.IP + 1;
                 callrec->Cur_Count    = 1;
-                callrec->Cur_Restart  = def->start;
-                callrec->Cur_End      = def->end;
+                callrec->Def          = def;
 
                 if ( INS_Goto_CodeRange( def->range, def->start ) == FAILURE )
                   goto LErrorLabel_;
Index: lib/3rdparty/freetype/src/truetype/ttinterp.h
===================================================================
--- lib/3rdparty/freetype/src/truetype/ttinterp.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/truetype/ttinterp.h	(copie de travail)
@@ -101,9 +101,9 @@
     FT_Int   Caller_Range;
     FT_Long  Caller_IP;
     FT_Long  Cur_Count;
-    FT_Long  Cur_Restart;
-    FT_Long  Cur_End;
 
+    TT_DefRecord  *Def; /* either FDEF or IDEF */
+
   } TT_CallRec, *TT_CallStack;
 
 
Index: lib/3rdparty/freetype/src/truetype/ttgload.c
===================================================================
--- lib/3rdparty/freetype/src/truetype/ttgload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/truetype/ttgload.c	(copie de travail)
@@ -85,16 +85,12 @@
   /*************************************************************************/
   /*                                                                       */
   /* Return the vertical metrics in font units for a given glyph.          */
-  /* Greg Hitchcock from Microsoft told us that if there were no `vmtx'    */
-  /* table, typoAscender/Descender from the `OS/2' table would be used     */
-  /* instead, and if there were no `OS/2' table, use ascender/descender    */
-  /* from the `hhea' table.  But that is not what Microsoft's rasterizer   */
-  /* apparently does: It uses the ppem value as the advance height, and    */
-  /* sets the top side bearing to be zero.                                 */
+  /* See macro `TT_LOADER_SET_PP' below for explanations.                  */
   /*                                                                       */
   FT_LOCAL_DEF( void )
   TT_Get_VMetrics( TT_Face     face,
                    FT_UInt     idx,
+                   FT_Pos      yMax,
                    FT_Short*   tsb,
                    FT_UShort*  ah )
   {
@@ -101,35 +97,24 @@
     if ( face->vertical_info )
       ( (SFNT_Service)face->sfnt )->get_metrics( face, 1, idx, tsb, ah );
 
-#if 1             /* Empirically determined, at variance with what MS said */
-
-    else
-    {
-      *tsb = 0;
-      *ah  = face->root.units_per_EM;
-    }
-
-#else      /* This is what MS said to do.  It isn't what they do, however. */
-
     else if ( face->os2.version != 0xFFFFU )
     {
-      *tsb = face->os2.sTypoAscender;
+      *tsb = face->os2.sTypoAscender - yMax;
       *ah  = face->os2.sTypoAscender - face->os2.sTypoDescender;
     }
+
     else
     {
-      *tsb = face->horizontal.Ascender;
+      *tsb = face->horizontal.Ascender - yMax;
       *ah  = face->horizontal.Ascender - face->horizontal.Descender;
     }
 
-#endif
-
     FT_TRACE5(( "  advance height (font units): %d\n", *ah ));
     FT_TRACE5(( "  top side bearing (font units): %d\n", *tsb ));
   }
 
 
-  static void
+  static FT_Error
   tt_get_metrics( TT_Loader  loader,
                   FT_UInt    glyph_index )
   {
@@ -138,17 +123,28 @@
     TT_Driver  driver = (TT_Driver)FT_FACE_DRIVER( face );
 #endif
 
+    FT_Error   error;
+    FT_Stream  stream = loader->stream;
+
     FT_Short   left_bearing = 0, top_bearing = 0;
     FT_UShort  advance_width = 0, advance_height = 0;
 
+    /* we must preserve the stream position          */
+    /* (which gets altered by the metrics functions) */
+    FT_ULong  pos = FT_STREAM_POS();
 
+
     TT_Get_HMetrics( face, glyph_index,
                      &left_bearing,
                      &advance_width );
     TT_Get_VMetrics( face, glyph_index,
+                     loader->bbox.yMax,
                      &top_bearing,
                      &advance_height );
 
+    if ( FT_STREAM_SEEK( pos ) )
+      return error;
+
     loader->left_bearing = left_bearing;
     loader->advance      = advance_width;
     loader->top_bearing  = top_bearing;
@@ -171,6 +167,8 @@
       loader->linear_def = 1;
       loader->linear     = advance_width;
     }
+
+    return FT_Err_Ok;
   }
 
 
@@ -350,9 +348,9 @@
     FT_GlyphLoader  gloader    = load->gloader;
     FT_Int          n_contours = load->n_contours;
     FT_Outline*     outline;
-    TT_Face         face       = (TT_Face)load->face;
     FT_UShort       n_ins;
     FT_Int          n_points;
+    FT_ULong        tmp;
 
     FT_Byte         *flag, *flag_limit;
     FT_Byte         c, count;
@@ -418,14 +416,7 @@
 
     FT_TRACE5(( "  Instructions size: %u\n", n_ins ));
 
-    if ( n_ins > face->max_profile.maxSizeOfInstructions )
-    {
-      FT_TRACE0(( "TT_Load_Simple_Glyph: too many instructions (%d)\n",
-                  n_ins ));
-      error = FT_THROW( Too_Many_Hints );
-      goto Fail;
-    }
-
+    /* check it */
     if ( ( limit - p ) < n_ins )
     {
       FT_TRACE0(( "TT_Load_Simple_Glyph: instruction count mismatch\n" ));
@@ -437,6 +428,20 @@
 
     if ( IS_HINTED( load->load_flags ) )
     {
+      /* we don't trust `maxSizeOfInstructions' in the `maxp' table */
+      /* and thus update the bytecode array size by ourselves       */
+
+      tmp   = load->exec->glyphSize;
+      error = Update_Max( load->exec->memory,
+                          &tmp,
+                          sizeof ( FT_Byte ),
+                          (void*)&load->exec->glyphIns,
+                          n_ins );
+
+      load->exec->glyphSize = (FT_UShort)tmp;
+      if ( error )
+        return error;
+
       load->glyph->control_len  = n_ins;
       load->glyph->control_data = load->exec->glyphIns;
 
@@ -745,8 +750,8 @@
 #ifdef TT_USE_BYTECODE_INTERPRETER
     if ( loader->glyph->control_len > 0xFFFFL )
     {
-      FT_TRACE1(( "TT_Hint_Glyph: too long instructions " ));
-      FT_TRACE1(( "(0x%lx byte) is truncated\n",
+      FT_TRACE1(( "TT_Hint_Glyph: too long instructions" ));
+      FT_TRACE1(( " (0x%lx byte) is truncated\n",
                  loader->glyph->control_len ));
     }
     n_ins = (FT_UInt)( loader->glyph->control_len );
@@ -783,9 +788,13 @@
     }
 #endif
 
-    /* round pp2 and pp4 */
+    /* round phantom points */
+    zone->cur[zone->n_points - 4].x =
+      FT_PIX_ROUND( zone->cur[zone->n_points - 4].x );
     zone->cur[zone->n_points - 3].x =
       FT_PIX_ROUND( zone->cur[zone->n_points - 3].x );
+    zone->cur[zone->n_points - 2].y =
+      FT_PIX_ROUND( zone->cur[zone->n_points - 2].y );
     zone->cur[zone->n_points - 1].y =
       FT_PIX_ROUND( zone->cur[zone->n_points - 1].y );
 
@@ -823,13 +832,10 @@
 #endif
 
     /* save glyph phantom points */
-    if ( !loader->preserve_pps )
-    {
-      loader->pp1 = zone->cur[zone->n_points - 4];
-      loader->pp2 = zone->cur[zone->n_points - 3];
-      loader->pp3 = zone->cur[zone->n_points - 2];
-      loader->pp4 = zone->cur[zone->n_points - 1];
-    }
+    loader->pp1 = zone->cur[zone->n_points - 4];
+    loader->pp2 = zone->cur[zone->n_points - 3];
+    loader->pp3 = zone->cur[zone->n_points - 2];
+    loader->pp4 = zone->cur[zone->n_points - 1];
 
 #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
     if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 )
@@ -1218,21 +1224,23 @@
       max_ins = ((TT_Face)loader->face)->max_profile.maxSizeOfInstructions;
       if ( n_ins > max_ins )
       {
-        /* acroread ignores this field, so we only do a rough safety check */
+        /* don't trust `maxSizeOfInstructions'; */
+        /* only do a rough safety check         */
         if ( (FT_Int)n_ins > loader->byte_len )
         {
-          FT_TRACE1(( "TT_Process_Composite_Glyph: "
-                      "too many instructions (%d) for glyph with length %d\n",
+          FT_TRACE1(( "TT_Process_Composite_Glyph:"
+                      " too many instructions (%d) for glyph with length %d\n",
                       n_ins, loader->byte_len ));
           return FT_THROW( Too_Many_Hints );
         }
 
-        tmp = loader->exec->glyphSize;
+        tmp   = loader->exec->glyphSize;
         error = Update_Max( loader->exec->memory,
                             &tmp,
                             sizeof ( FT_Byte ),
                             (void*)&loader->exec->glyphIns,
                             n_ins );
+
         loader->exec->glyphSize = (FT_UShort)tmp;
         if ( error )
           return error;
@@ -1254,7 +1262,7 @@
 
     /* Some points are likely touched during execution of  */
     /* instructions on components.  So let's untouch them. */
-    for ( i = start_point; i < loader->zone.n_points; i++ )
+    for ( i = 0; i < loader->zone.n_points; i++ )
       loader->zone.tags[i] &= ~FT_CURVE_TAG_TOUCH_BOTH;
 
     loader->zone.n_points += 4;
@@ -1263,22 +1271,132 @@
   }
 
 
-  /* Calculate the four phantom points.                     */
-  /* The first two stand for horizontal origin and advance. */
-  /* The last two stand for vertical origin and advance.    */
+  /*
+   * Calculate the phantom points
+   *
+   * Defining the right side bearing (rsb) as
+   *
+   *   rsb = aw - (lsb + xmax - xmin)
+   *
+   * (with `aw' the advance width, `lsb' the left side bearing, and `xmin'
+   * and `xmax' the glyph's minimum and maximum x value), the OpenType
+   * specification defines the initial position of horizontal phantom points
+   * as
+   *
+   *   pp1 = (round(xmin - lsb), 0)      ,
+   *   pp2 = (round(pp1 + aw), 0)        .
+   *
+   * Note that the rounding to the grid is not documented currently in the
+   * specification.
+   *
+   * However, the specification lacks the precise definition of vertical
+   * phantom points.  Greg Hitchcock provided the following explanation.
+   *
+   * - a `vmtx' table is present
+   *
+   *   For any glyph, the minimum and maximum y values (`ymin' and `ymax')
+   *   are given in the `glyf' table, the top side bearing (tsb) and advance
+   *   height (ah) are given in the `vmtx' table.  The bottom side bearing
+   *   (bsb) is then calculated as
+   *
+   *     bsb = ah - (tsb + ymax - ymin)       ,
+   *
+   *   and the initial position of vertical phantom points is
+   *
+   *     pp3 = (x, round(ymax + tsb))       ,
+   *     pp4 = (x, round(pp3 - ah))         .
+   *
+   *   See below for value `x'.
+   *
+   * - no `vmtx' table in the font
+   *
+   *   If there is an `OS/2' table, we set
+   *
+   *     DefaultAscender = sTypoAscender       ,
+   *     DefaultDescender = sTypoDescender     ,
+   *
+   *   otherwise we use data from the `hhea' table:
+   *
+   *     DefaultAscender = Ascender         ,
+   *     DefaultDescender = Descender       .
+   *
+   *   With these two variables we can now set
+   *
+   *     ah = DefaultAscender - sDefaultDescender    ,
+   *     tsb = DefaultAscender - yMax                ,
+   *
+   *   and proceed as if a `vmtx' table was present.
+   *
+   * Usually we have
+   *
+   *   x = aw / 2      ,                                                (1)
+   *
+   * but there is one compatibility case where it can be set to
+   *
+   *   x = -DefaultDescender -
+   *         ((DefaultAscender - DefaultDescender - aw) / 2)     .      (2)
+   *
+   * and another one with
+   *
+   *   x = 0     .                                                      (3)
+   *
+   * In Windows, the history of those values is quite complicated,
+   * depending on the hinting engine (that is, the graphics framework).
+   *
+   *   framework        from                 to       formula
+   *  ----------------------------------------------------------
+   *    GDI       Windows 98               current      (1)
+   *              (Windows 2000 for NT)
+   *    GDI+      Windows XP               Windows 7    (2)
+   *    GDI+      Windows 8                current      (3)
+   *    DWrite    Windows 7                current      (3)
+   *
+   * For simplicity, FreeType uses (1) for grayscale subpixel hinting and
+   * (3) for everything else.
+   *
+   */
+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
 #define TT_LOADER_SET_PP( loader )                                          \
-          do {                                                              \
+          do                                                                \
+          {                                                                 \
+            FT_Bool  subpixel_  = loader->exec                              \
+                                    ? loader->exec->subpixel_hinting        \
+                                    : 0;                                    \
+            FT_Bool  grayscale_ = loader->exec                              \
+                                    ? loader->exec->grayscale_hinting       \
+                                    : 0;                                    \
+            FT_Bool  use_aw_2_  = (FT_Bool)( subpixel_ && grayscale_ );     \
+                                                                            \
+                                                                            \
             (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \
             (loader)->pp1.y = 0;                                            \
             (loader)->pp2.x = (loader)->pp1.x + (loader)->advance;          \
             (loader)->pp2.y = 0;                                            \
+            (loader)->pp3.x = use_aw_2_ ? (loader)->advance / 2 : 0;        \
+            (loader)->pp3.y = (loader)->bbox.yMax + (loader)->top_bearing;  \
+            (loader)->pp4.x = use_aw_2_ ? (loader)->advance / 2 : 0;        \
+            (loader)->pp4.y = (loader)->pp3.y - (loader)->vadvance;         \
+          } while ( 0 )
+
+#else /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */
+
+#define TT_LOADER_SET_PP( loader )                                          \
+          do                                                                \
+          {                                                                 \
+            (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \
+            (loader)->pp1.y = 0;                                            \
+            (loader)->pp2.x = (loader)->pp1.x + (loader)->advance;          \
+            (loader)->pp2.y = 0;                                            \
             (loader)->pp3.x = 0;                                            \
-            (loader)->pp3.y = (loader)->top_bearing + (loader)->bbox.yMax;  \
+            (loader)->pp3.y = (loader)->bbox.yMax + (loader)->top_bearing;  \
             (loader)->pp4.x = 0;                                            \
             (loader)->pp4.y = (loader)->pp3.y - (loader)->vadvance;         \
           } while ( 0 )
 
+#endif /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -1341,8 +1459,6 @@
       y_scale = 0x10000L;
     }
 
-    tt_get_metrics( loader, glyph_index );
-
     /* Set `offset' to the start of the glyph relative to the start of */
     /* the `glyf' table, and `byte_len' to the length of the glyph in  */
     /* bytes.                                                          */
@@ -1402,8 +1518,18 @@
 
       /* read glyph header first */
       error = face->read_glyph_header( loader );
-      if ( error || header_only )
+      if ( error )
         goto Exit;
+
+      /* the metrics must be computed after loading the glyph header */
+      /* since we need the glyph's `yMax' value in case the vertical */
+      /* metrics must be emulated                                    */
+      error = tt_get_metrics( loader, glyph_index );
+      if ( error )
+        goto Exit;
+
+      if ( header_only )
+        goto Exit;
     }
 
     if ( loader->byte_len == 0 || loader->n_contours == 0 )
@@ -1413,6 +1539,10 @@
       loader->bbox.yMin = 0;
       loader->bbox.yMax = 0;
 
+      error = tt_get_metrics( loader, glyph_index );
+      if ( error )
+        goto Exit;
+
       if ( header_only )
         goto Exit;
 
@@ -2204,6 +2334,8 @@
 
     error = FT_Err_Ok;
 
+    FT_TRACE1(( "TT_Load_Glyph: glyph index %d\n", glyph_index ));
+
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
 
     /* try to load embedded bitmap if any              */
Index: lib/3rdparty/freetype/src/bzip2/Jamfile
===================================================================
--- lib/3rdparty/freetype/src/bzip2/Jamfile	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/bzip2/Jamfile	(copie de travail)
@@ -1,19 +0,0 @@
-# FreeType 2 src/bzip2 Jamfile
-#
-# Copyright 2010 by
-# Joel Klinghed
-#
-# Based on src/lzw/Jamfile, Copyright 2004, 2006 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) bzip2 ;
-
-Library  $(FT2_LIB) : ftbzip2.c ;
-
-# end of src/bzip2 Jamfile
Index: lib/3rdparty/freetype/src/type42/t42objs.c
===================================================================
--- lib/3rdparty/freetype/src/type42/t42objs.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/type42/t42objs.c	(copie de travail)
@@ -171,7 +171,6 @@
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
     FT_UNUSED( stream );
 
 
@@ -507,7 +506,7 @@
     FT_Face   face    = size->face;
     T42_Face  t42face = (T42_Face)face;
     FT_Size   ttsize;
-    FT_Error  error   = FT_Err_Ok;
+    FT_Error  error;
 
 
     error = FT_New_Size( t42face->ttf_face, &ttsize );
@@ -648,6 +647,8 @@
     FT_Driver_Class  ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
 
 
+    FT_TRACE1(( "T42_GlyphSlot_Load: glyph index %d\n", glyph_index ));
+
     t42_glyphslot_clear( t42slot->ttslot );
     error = ttclazz->load_glyph( t42slot->ttslot,
                                  t42size->ttsize,
Index: lib/3rdparty/freetype/src/pfr/pfrobjs.c
===================================================================
--- lib/3rdparty/freetype/src/pfr/pfrobjs.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pfr/pfrobjs.c	(copie de travail)
@@ -324,6 +324,8 @@
     FT_ULong     gps_offset;
 
 
+    FT_TRACE1(( "pfr_slot_load: glyph index %d\n", gindex ));
+
     if ( gindex > 0 )
       gindex--;
 
Index: lib/3rdparty/freetype/src/pfr/pfrcmap.c
===================================================================
--- lib/3rdparty/freetype/src/pfr/pfrcmap.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pfr/pfrcmap.c	(copie de travail)
@@ -67,14 +67,16 @@
   pfr_cmap_char_index( PFR_CMap   cmap,
                        FT_UInt32  char_code )
   {
-    FT_UInt   min = 0;
-    FT_UInt   max = cmap->num_chars;
-    FT_UInt   mid;
-    PFR_Char  gchar;
+    FT_UInt  min = 0;
+    FT_UInt  max = cmap->num_chars;
 
 
     while ( min < max )
     {
+      PFR_Char  gchar;
+      FT_UInt   mid;
+
+
       mid   = min + ( max - min ) / 2;
       gchar = cmap->chars + mid;
 
Index: lib/3rdparty/freetype/src/pfr/pfrgload.c
===================================================================
--- lib/3rdparty/freetype/src/pfr/pfrgload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pfr/pfrgload.c	(copie de travail)
@@ -763,7 +763,7 @@
         PFR_SubGlyph  subglyph;
 
 
-        FT_TRACE4(( "subglyph %d:\n", n ));
+        FT_TRACE4(( "  subglyph %d:\n", n ));
 
         subglyph   = glyph->subs + old_count + n;
         old_points = base->n_points;
Index: lib/3rdparty/freetype/src/bdf/Jamfile
===================================================================
--- lib/3rdparty/freetype/src/bdf/Jamfile	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/bdf/Jamfile	(copie de travail)
@@ -1,29 +0,0 @@
-# FreeType 2 src/bdf Jamfile
-#
-# Copyright 2002 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) bdf ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = bdfdrivr bdflib ;
-  }
-  else
-  {
-    _sources = bdf ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/bdf Jamfile
Index: lib/3rdparty/freetype/src/bdf/bdfdrivr.c
===================================================================
--- lib/3rdparty/freetype/src/bdf/bdfdrivr.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/bdf/bdfdrivr.c	(copie de travail)
@@ -351,7 +351,6 @@
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
 
 
     FT_TRACE2(( "BDF driver\n" ));
@@ -375,6 +374,19 @@
 
     /* we have a bdf font: let's construct the face object */
     face->bdffont = font;
+
+    /* BDF could not have multiple face in single font file.
+     * XXX: non-zero face_index is already invalid argument, but
+     *      Type1, Type42 driver has a convention to return
+     *      an invalid argument error when the font could be
+     *      opened by the specified driver.
+     */
+    if ( face_index > 0 ) {
+      FT_ERROR(( "BDF_Face_Init: invalid face index\n" ));
+      BDF_Face_Done( bdfface );
+      return FT_THROW( Invalid_Argument );
+    }
+ 
     {
       bdf_property_t*  prop = NULL;
 
@@ -674,6 +686,8 @@
       goto Exit;
     }
 
+    FT_TRACE1(( "BDF_Glyph_Load: glyph index %d\n", glyph_index ));
+
     /* index 0 is the undefined glyph */
     if ( glyph_index == 0 )
       glyph_index = bdf->default_glyph;
Index: lib/3rdparty/freetype/src/pshinter/pshglob.c
===================================================================
--- lib/3rdparty/freetype/src/pshinter/pshglob.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/pshinter/pshglob.c	(copie de travail)
@@ -5,7 +5,7 @@
 /*    PostScript hinter global hinting management (body).                  */
 /*    Inspired by the new auto-hinter module.                              */
 /*                                                                         */
-/*  Copyright 2001-2004, 2006, 2010, 2012 by                               */
+/*  Copyright 2001-2004, 2006, 2010, 2012, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
@@ -757,7 +757,7 @@
                          FT_Fixed     x_delta,
                          FT_Fixed     y_delta )
   {
-    PSH_Dimension  dim = &globals->dimension[0];
+    PSH_Dimension  dim;
 
 
     dim = &globals->dimension[0];
Index: lib/3rdparty/freetype/src/cff/cffobjs.h
===================================================================
--- lib/3rdparty/freetype/src/cff/cffobjs.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cffobjs.h	(copie de travail)
@@ -121,6 +121,8 @@
     FT_UInt  hinting_engine;
     FT_Bool  no_stem_darkening;
 
+    FT_Int  darken_params[8];
+
   } CFF_DriverRec;
 
 
Index: lib/3rdparty/freetype/src/cff/cf2ft.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cf2ft.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cf2ft.c	(copie de travail)
@@ -344,6 +344,15 @@
       if ( scaled && !driver->no_stem_darkening )
         font->renderingFlags |= CF2_FlagsDarkened;
 
+      font->darkenParams[0] = driver->darken_params[0];
+      font->darkenParams[1] = driver->darken_params[1];
+      font->darkenParams[2] = driver->darken_params[2];
+      font->darkenParams[3] = driver->darken_params[3];
+      font->darkenParams[4] = driver->darken_params[4];
+      font->darkenParams[5] = driver->darken_params[5];
+      font->darkenParams[6] = driver->darken_params[6];
+      font->darkenParams[7] = driver->darken_params[7];
+
       /* now get an outline for this glyph;      */
       /* also get units per em to validate scale */
       font->unitsPerEm = (CF2_Int)cf2_getUnitsPerEm( decoder );
Index: lib/3rdparty/freetype/src/cff/cf2blues.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cf2blues.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cf2blues.c	(copie de travail)
@@ -86,11 +86,13 @@
     size_t     i;
     CF2_Fixed  emBoxBottom, emBoxTop;
 
+#if 0
     CF2_Int  unitsPerEm = font->unitsPerEm;
 
 
     if ( unitsPerEm == 0 )
       unitsPerEm = 1000;
+#endif
 
     FT_ZERO( blues );
     blues->scale = font->innerTransform.d;
Index: lib/3rdparty/freetype/src/cff/cf2hints.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cf2hints.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cf2hints.c	(copie de travail)
@@ -596,22 +596,31 @@
     indexInsert = 0;
     for ( ; indexInsert < hintmap->count; indexInsert++ )
     {
-      if ( hintmap->edge[indexInsert].csCoord > firstHintEdge->csCoord )
+      if ( hintmap->edge[indexInsert].csCoord >= firstHintEdge->csCoord )
         break;
     }
 
     /*
-     * Discard any hints that overlap in character space.  Most often,
-     * this is while building the initial map, but in theory, it can also
-     * occur because of darkening.
+     * Discard any hints that overlap in character space.  Most often, this
+     * is while building the initial map, where captured hints from all
+     * zones are combined.  Define overlap to include hints that `touch'
+     * (overlap zero).  Hiragino Sans/Gothic fonts have numerous hints that
+     * touch.  Some fonts have non-ideographic glyphs that overlap our
+     * synthetic hints.
      *
+     * Overlap also occurs when darkening stem hints that are close.
+     *
      */
     if ( indexInsert < hintmap->count )
     {
-      /* we are inserting before an existing edge:              */
+      /* we are inserting before an existing edge:    */
+      /* verify that an existing edge is not the same */
+      if ( hintmap->edge[indexInsert].csCoord == firstHintEdge->csCoord )
+        return; /* ignore overlapping stem hint */
+
       /* verify that a new pair does not straddle the next edge */
-      if ( isPair                                                       &&
-           hintmap->edge[indexInsert].csCoord < secondHintEdge->csCoord )
+      if ( isPair                                                        &&
+           hintmap->edge[indexInsert].csCoord <= secondHintEdge->csCoord )
         return; /* ignore overlapping stem hint */
 
       /* verify that we are not inserting between paired edges */
@@ -645,8 +654,27 @@
                                                   firstHintEdge->csCoord );
     }
 
-    /* discard any hints that overlap in device space; this can occur */
-    /* because locked hints have been moved to align with blue zones  */
+    /*
+     * Discard any hints that overlap in device space; this can occur
+     * because locked hints have been moved to align with blue zones.
+     *
+     * TODO: Although we might correct this later during adjustment, we
+     * don't currently have a way to delete a conflicting hint once it has
+     * been inserted.  See v2.030 MinionPro-Regular, 12 ppem darkened,
+     * initial hint map for second path, glyph 945 (the perispomeni (tilde)
+     * in U+1F6E, Greek omega with psili and perispomeni).  Darkening is
+     * 25.  Pair 667,747 initially conflicts in design space with top edge
+     * 660.  This is because 667 maps to 7.87, and the top edge was
+     * captured by a zone at 8.0.  The pair is later successfully inserted
+     * in a zone without the top edge.  In this zone it is adjusted to 8.0,
+     * and no longer conflicts with the top edge in design space.  This
+     * means it can be included in yet a later zone which does have the top
+     * edge hint.  This produces a small mismatch between the first and
+     * last points of this path, even though the hint masks are the same.
+     * The density map difference is tiny (1/256).
+     *
+     */
+
     if ( indexInsert > 0 )
     {
       /* we are inserting after an existing edge */
@@ -1035,6 +1063,7 @@
 
     glyphpath->moveIsPending = TRUE;
     glyphpath->pathIsOpen    = FALSE;
+    glyphpath->pathIsClosing = FALSE;
     glyphpath->elemIsQueued  = FALSE;
   }
 
@@ -1175,13 +1204,17 @@
   /*
    * Push the cached element (glyphpath->prevElem*) to the outline
    * consumer.  When a darkening offset is used, the end point of the
-   * cached element may be adjusted to an intersection point or it may be
-   * connected by a line to the current element.  This calculation must
-   * use a HintMap that was valid at the time the element was saved.  For
-   * the first point in a subpath, that is a saved HintMap.  For most
-   * elements, it just means the caller has delayed building a HintMap
-   * from the current HintMask.
+   * cached element may be adjusted to an intersection point or we may
+   * synthesize a connecting line to the current element.  If we are
+   * closing a subpath, we may also generate a connecting line to the start
+   * point.
    *
+   * This is where Character Space (CS) is converted to Device Space (DS)
+   * using a hint map.  This calculation must use a HintMap that was valid
+   * at the time the element was saved.  For the first point in a subpath,
+   * that is a saved HintMap.  For most elements, it just means the caller
+   * has delayed building a HintMap from the current HintMask.
+   *
    * Transform each point with outerTransform and call the outline
    * callbacks.  This is a general 3x3 transform:
    *
@@ -1250,16 +1283,32 @@
       params.op = CF2_PathOpLineTo;
 
       /* note: pt2 and pt3 are unused */
-      cf2_glyphpath_hintPoint( glyphpath,
-                               hintmap,
-                               &params.pt1,
-                               glyphpath->prevElemP1.x,
-                               glyphpath->prevElemP1.y );
 
-      glyphpath->callbacks->lineTo( glyphpath->callbacks, &params );
+      if ( close )
+      {
+        /* use first hint map if closing */
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 &glyphpath->firstHintMap,
+                                 &params.pt1,
+                                 glyphpath->prevElemP1.x,
+                                 glyphpath->prevElemP1.y );
+      }
+      else
+      {
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 hintmap,
+                                 &params.pt1,
+                                 glyphpath->prevElemP1.x,
+                                 glyphpath->prevElemP1.y );
+      }
 
-      glyphpath->currentDS = params.pt1;
+      /* output only non-zero length lines */
+      if ( params.pt0.x != params.pt1.x || params.pt0.y != params.pt1.y )
+      {
+        glyphpath->callbacks->lineTo( glyphpath->callbacks, &params );
 
+        glyphpath->currentDS = params.pt1;
+      }
       break;
 
     case CF2_PathOpCubeTo:
@@ -1296,11 +1345,24 @@
       /* note: at the end of a subpath, we might do both, so use `nextP0' */
       /* before we change it, below                                       */
 
-      cf2_glyphpath_hintPoint( glyphpath,
-                               hintmap,
-                               &params.pt1,
-                               nextP0->x,
-                               nextP0->y );
+      if ( close )
+      {
+        /* if we are closing the subpath, then nextP0 is in the first     */
+        /* hint zone                                                      */
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 &glyphpath->firstHintMap,
+                                 &params.pt1,
+                                 nextP0->x,
+                                 nextP0->y );
+      }
+      else
+      {
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 hintmap,
+                                 &params.pt1,
+                                 nextP0->x,
+                                 nextP0->y );
+      }
 
       if ( params.pt1.x != glyphpath->currentDS.x ||
            params.pt1.y != glyphpath->currentDS.y )
@@ -1511,6 +1573,16 @@
   }
 
 
+  /*
+   * The functions cf2_glyphpath_{moveTo,lineTo,curveTo,closeOpenPath} are
+   * called by the interpreter with Character Space (CS) coordinates.  Each
+   * path element is placed into a queue of length one to await the
+   * calculation of the following element.  At that time, the darkening
+   * offset of the following element is known and joins can be computed,
+   * including possible modification of this element, before mapping to
+   * Device Space (DS) and passing it on to the outline consumer.
+   *
+   */
   FT_LOCAL_DEF( void )
   cf2_glyphpath_moveTo( CF2_GlyphPath  glyphpath,
                         CF2_Fixed      x,
@@ -1548,10 +1620,46 @@
   {
     CF2_Fixed  xOffset, yOffset;
     FT_Vector  P0, P1;
+    FT_Bool    newHintMap;
 
+    /*
+     * New hints will be applied after cf2_glyphpath_pushPrevElem has run.
+     * In case this is a synthesized closing line, any new hints should be
+     * delayed until this path is closed (`cf2_hintmask_isNew' will be
+     * called again before the next line or curve).
+     */
 
-    /* can't compute offset of zero length line, so ignore them */
-    if ( glyphpath->currentCS.x == x && glyphpath->currentCS.y == y )
+    /* true if new hint map not on close */
+    newHintMap = cf2_hintmask_isNew( glyphpath->hintMask ) &&
+                 !glyphpath->pathIsClosing;
+
+    /*
+     * Zero-length lines may occur in the charstring.  Because we cannot
+     * compute darkening offsets or intersections from zero-length lines,
+     * it is best to remove them and avoid artifacts.  However, zero-length
+     * lines in CS at the start of a new hint map can generate non-zero
+     * lines in DS due to hint substitution.  We detect a change in hint
+     * map here and pass those zero-length lines along.
+     */
+
+    /*
+     * Note: Find explicitly closed paths here with a conditional
+     *       breakpoint using
+     *
+     *         !gp->pathIsClosing && gp->start.x == x && gp->start.y == y
+     *
+     */
+
+    if ( glyphpath->currentCS.x == x &&
+         glyphpath->currentCS.y == y &&
+         !newHintMap                 )
+      /*
+       * Ignore zero-length lines in CS where the hint map is the same
+       * because the line in DS will also be zero length.
+       *
+       * Ignore zero-length lines when we synthesize a closing line because
+       * the close will be handled in cf2_glyphPath_pushPrevElem.
+       */
       return;
 
     cf2_glyphpath_computeOffset( glyphpath,
@@ -1597,7 +1705,7 @@
     glyphpath->prevElemP1   = P1;
 
     /* update current map */
-    if ( cf2_hintmask_isNew( glyphpath->hintMask ) )
+    if ( newHintMap )
       cf2_hintmap_build( &glyphpath->hintMap,
                          glyphpath->hStemHintArray,
                          glyphpath->vStemHintArray,
@@ -1703,29 +1811,29 @@
   {
     if ( glyphpath->pathIsOpen )
     {
-      FT_ASSERT( cf2_hintmap_isValid( &glyphpath->firstHintMap ) );
+      /*
+       * A closing line in Character Space line is always generated below
+       * with `cf2_glyphPath_lineTo'.  It may be ignored later if it turns
+       * out to be zero length in Device Space.
+       */
+      glyphpath->pathIsClosing = TRUE;
 
-      /* since we need to apply an offset to the implicit lineto, we make */
-      /* it explicit here                                                 */
       cf2_glyphpath_lineTo( glyphpath,
                             glyphpath->start.x,
                             glyphpath->start.y );
 
-      /* Draw previous element (the explicit LineTo we just created,      */
-      /* above) and connect it to the start point, but with the offset we */
-      /* saved from the first element.                                    */
-      /* Use the saved HintMap, too. */
-      FT_ASSERT( glyphpath->elemIsQueued );
+      /* empty the final element from the queue and close the path */
+      if ( glyphpath->elemIsQueued )
+        cf2_glyphpath_pushPrevElem( glyphpath,
+                                    &glyphpath->hintMap,
+                                    &glyphpath->offsetStart0,
+                                    glyphpath->offsetStart1,
+                                    TRUE );
 
-      cf2_glyphpath_pushPrevElem( glyphpath,
-                                  &glyphpath->firstHintMap,
-                                  &glyphpath->offsetStart0,
-                                  glyphpath->offsetStart1,
-                                  TRUE );
-
       /* reset state machine */
       glyphpath->moveIsPending = TRUE;
       glyphpath->pathIsOpen    = FALSE;
+      glyphpath->pathIsClosing = FALSE;
       glyphpath->elemIsQueued  = FALSE;
     }
   }
Index: lib/3rdparty/freetype/src/cff/cf2hints.h
===================================================================
--- lib/3rdparty/freetype/src/cff/cf2hints.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cf2hints.h	(copie de travail)
@@ -204,6 +204,7 @@
 #endif
 
     FT_Bool  pathIsOpen;     /* true after MoveTo                     */
+    FT_Bool  pathIsClosing;  /* true when synthesizing closepath line */
     FT_Bool  darken;         /* true if stem darkening                */
     FT_Bool  moveIsPending;  /* true between MoveTo and offset MoveTo */
 
@@ -229,7 +230,8 @@
     FT_Vector  currentCS;
     /* current point, device space */
     FT_Vector  currentDS;
-    FT_Vector  start;         /* start point of subpath */
+    /* start point of subpath, character space */
+    FT_Vector  start;
 
     /* the following members constitute the `queue' of one element */
     FT_Bool  elemIsQueued;
Index: lib/3rdparty/freetype/src/cff/cffload.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cffload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cffload.c	(copie de travail)
@@ -414,7 +414,7 @@
       cur_offset = idx->offsets[0] - 1;
 
       /* sanity check */
-      if ( cur_offset >= idx->data_size )
+      if ( cur_offset != 0 )
       {
         FT_TRACE0(( "cff_index_get_pointers:"
                     " invalid first offset value %d set to zero\n",
@@ -432,11 +432,11 @@
         FT_ULong  next_offset = idx->offsets[n] - 1;
 
 
-        /* empty slot + two sanity checks for invalid offset tables */
-        if ( next_offset == 0                                    ||
-             next_offset < cur_offset                            ||
-             ( next_offset >= idx->data_size && n < idx->count ) )
+        /* two sanity checks for invalid offset tables */
+        if ( next_offset < cur_offset )
           next_offset = cur_offset;
+        else if ( next_offset > idx->data_size )
+          next_offset = idx->data_size;
 
         if ( !pool )
           t[n] = org_bytes + next_offset;
Index: lib/3rdparty/freetype/src/cff/cf2font.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cf2font.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cf2font.c	(copie de travail)
@@ -51,10 +51,59 @@
                         CF2_Fixed   stemWidth,
                         CF2_Fixed*  darkenAmount,
                         CF2_Fixed   boldenAmount,
-                        FT_Bool     stemDarkened )
+                        FT_Bool     stemDarkened,
+                        FT_Int*     darkenParams )
   {
+    /*
+     * Total darkening amount is computed in 1000 unit character space
+     * using the modified 5 part curve as Adobe's Avalon rasterizer.
+     * The darkening amount is smaller for thicker stems.
+     * It becomes zero when the stem is thicker than 2.333 pixels.
+     *
+     * By default, we use
+     *
+     *   darkenAmount = 0.4 pixels   if scaledStem <= 0.5 pixels,
+     *   darkenAmount = 0.275 pixels if 1 <= scaledStem <= 1.667 pixels,
+     *   darkenAmount = 0 pixel      if scaledStem >= 2.333 pixels,
+     *
+     * and piecewise linear in-between:
+     *
+     *
+     *   darkening
+     *       ^
+     *       |
+     *       |      (x1,y1)
+     *       |--------+
+     *       |         \
+     *       |          \
+     *       |           \          (x3,y3)
+     *       |            +----------+
+     *       |        (x2,y2)         \
+     *       |                         \
+     *       |                          \
+     *       |                           +-----------------
+     *       |                         (x4,y4)
+     *       +--------------------------------------------->   stem
+     *                                                       thickness
+     *
+     *
+     * This corresponds to the following values for the
+     * `darkening-parameters' property:
+     *
+     *   (x1, y1) = (500, 400)
+     *   (x2, y2) = (1000, 275)
+     *   (x3, y3) = (1667, 275)
+     *   (x4, y4) = (2333, 0)
+     *
+     */
+
     /* Internal calculations are done in units per thousand for */
-    /* convenience.                                             */
+    /* convenience. The x axis is scaled stem width in          */
+    /* thousandths of a pixel. That is, 1000 is 1 pixel.        */
+    /* The y axis is darkening amount in thousandths of a pixel.*/
+    /* In the code, below, dividing by ppem and                 */
+    /* adjusting for emRatio converts darkenAmount to character */
+    /* space (font units).                                      */
     CF2_Fixed  stemWidthPer1000, scaledStem;
 
 
@@ -69,6 +118,16 @@
 
     if ( stemDarkened )
     {
+      FT_Int  x1 = darkenParams[0];
+      FT_Int  y1 = darkenParams[1];
+      FT_Int  x2 = darkenParams[2];
+      FT_Int  y2 = darkenParams[3];
+      FT_Int  x3 = darkenParams[4];
+      FT_Int  y3 = darkenParams[5];
+      FT_Int  x4 = darkenParams[6];
+      FT_Int  y4 = darkenParams[7];
+
+
       /* convert from true character space to 1000 unit character space; */
       /* add synthetic emboldening effect                                */
 
@@ -81,7 +140,7 @@
            stemWidthPer1000 <= ( stemWidth + boldenAmount ) )
       {
         stemWidthPer1000 = 0;                      /* to pacify compiler */
-        scaledStem       = cf2_intToFixed( 2333 );
+        scaledStem       = cf2_intToFixed( x4 );
       }
       else
       {
@@ -89,40 +148,71 @@
 
         if ( ppem > CF2_FIXED_ONE           &&
              scaledStem <= stemWidthPer1000 )
-          scaledStem = cf2_intToFixed( 2333 );
+          scaledStem = cf2_intToFixed( x4 );
       }
 
-      /*
-       * Total darkening amount is computed in 1000 unit character space
-       * using the modified 5 part curve as Avalon rasterizer.
-       * The darkening amount is smaller for thicker stems.
-       * It becomes zero when the stem is thicker than 2.333 pixels.
-       *
-       * In Avalon rasterizer,
-       *
-       *   darkenAmount = 0.5 pixels   if scaledStem <= 0.5 pixels,
-       *   darkenAmount = 0.333 pixels if 1 <= scaledStem <= 1.667 pixels,
-       *   darkenAmount = 0 pixel      if scaledStem >= 2.333 pixels,
-       *
-       * and piecewise linear in-between.
-       *
-       */
-      if ( scaledStem < cf2_intToFixed( 500 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 400 ), ppem );
+      /* now apply the darkening parameters */
 
-      else if ( scaledStem < cf2_intToFixed( 1000 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 525 ), ppem ) -
-                          FT_MulFix( stemWidthPer1000,
-                                     cf2_floatToFixed( .25 ) );
+      if ( scaledStem < cf2_intToFixed( x1 ) )
+        *darkenAmount = FT_DivFix( cf2_intToFixed( y1 ), ppem );
 
-      else if ( scaledStem < cf2_intToFixed( 1667 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 275 ), ppem );
+      else if ( scaledStem < cf2_intToFixed( x2 ) )
+      {
+        FT_Int  xdelta = x2 - x1;
+        FT_Int  ydelta = y2 - y1;
+        FT_Int  x      = stemWidthPer1000 -
+                           FT_DivFix( cf2_intToFixed( x1 ), ppem );
 
-      else if ( scaledStem < cf2_intToFixed( 2333 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 963 ), ppem ) -
-                          FT_MulFix( stemWidthPer1000,
-                                     cf2_floatToFixed( .413 ) );
 
+        if ( !xdelta )
+          goto Try_x3;
+
+        *darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
+                          FT_DivFix( cf2_intToFixed( y1 ), ppem );
+      }
+
+      else if ( scaledStem < cf2_intToFixed( x3 ) )
+      {
+      Try_x3:
+        {
+          FT_Int  xdelta = x3 - x2;
+          FT_Int  ydelta = y3 - y2;
+          FT_Int  x      = stemWidthPer1000 -
+                             FT_DivFix( cf2_intToFixed( x2 ), ppem );
+
+
+          if ( !xdelta )
+            goto Try_x4;
+
+          *darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
+                            FT_DivFix( cf2_intToFixed( y2 ), ppem );
+        }
+      }
+
+      else if ( scaledStem < cf2_intToFixed( x4 ) )
+      {
+      Try_x4:
+        {
+          FT_Int  xdelta = x4 - x3;
+          FT_Int  ydelta = y4 - y3;
+          FT_Int  x      = stemWidthPer1000 -
+                             FT_DivFix( cf2_intToFixed( x3 ), ppem );
+
+
+          if ( !xdelta )
+            goto Use_y4;
+
+          *darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
+                            FT_DivFix( cf2_intToFixed( y3 ), ppem );
+        }
+      }
+
+      else
+      {
+      Use_y4:
+        *darkenAmount = FT_DivFix( cf2_intToFixed( y4 ), ppem );
+      }
+
       /* use half the amount on each side and convert back to true */
       /* character space                                           */
       *darkenAmount = FT_DivFix( *darkenAmount, 2 * emRatio );
@@ -268,7 +358,8 @@
                               font->stdVW,
                               &font->darkenX,
                               boldenX,
-                              FALSE );
+                              FALSE,
+                              font->darkenParams );
       }
       else
         cf2_computeDarkening( emRatio,
@@ -276,7 +367,8 @@
                               font->stdVW,
                               &font->darkenX,
                               0,
-                              font->stemDarkened );
+                              font->stemDarkened,
+                              font->darkenParams );
 
 #if 0
       /* since hstem is measured in the y-direction, we use the `d' member */
@@ -303,7 +395,8 @@
                             font->stdHW,
                             &font->darkenY,
                             boldenY,
-                            font->stemDarkened );
+                            font->stemDarkened,
+                            font->darkenParams );
 
       if ( font->darkenX != 0 || font->darkenY != 0 )
         font->darkened = TRUE;
Index: lib/3rdparty/freetype/src/cff/cffgload.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cffgload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cffgload.c	(copie de travail)
@@ -434,7 +434,7 @@
         goto Exit;
       }
 
-      FT_TRACE3(( "glyph index %d (subfont %d):\n", glyph_index, fd_index ));
+      FT_TRACE3(( "  in subfont %d:\n", fd_index ));
 
       sub = cff->subfonts[fd_index];
 
@@ -447,10 +447,6 @@
         builder->hints_globals = (void *)internal->subfonts[fd_index];
       }
     }
-#ifdef FT_DEBUG_LEVEL_TRACE
-    else
-      FT_TRACE3(( "glyph index %d:\n", glyph_index ));
-#endif
 
     decoder->num_locals    = sub->local_subrs_index.count;
     decoder->locals        = sub->local_subrs;
Index: lib/3rdparty/freetype/src/cff/cffdrivr.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cffdrivr.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cffdrivr.c	(copie de travail)
@@ -164,6 +164,8 @@
     if ( !slot )
       return FT_THROW( Invalid_Slot_Handle );
 
+    FT_TRACE1(( "cff_glyph_load: glyph index %d\n", glyph_index ));
+
     /* check whether we want a scaled outline or bitmap */
     if ( !size )
       load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
@@ -586,8 +588,39 @@
     CFF_Driver  driver = (CFF_Driver)module;
 
 
-    if ( !ft_strcmp( property_name, "hinting-engine" ) )
+    if ( !ft_strcmp( property_name, "darkening-parameters" ) )
     {
+      FT_Int*  darken_params = (FT_Int*)value;
+
+      FT_Int  x1 = darken_params[0];
+      FT_Int  y1 = darken_params[1];
+      FT_Int  x2 = darken_params[2];
+      FT_Int  y2 = darken_params[3];
+      FT_Int  x3 = darken_params[4];
+      FT_Int  y3 = darken_params[5];
+      FT_Int  x4 = darken_params[6];
+      FT_Int  y4 = darken_params[7];
+
+
+      if ( x1 < 0   || x2 < 0   || x3 < 0   || x4 < 0   ||
+           y1 < 0   || y2 < 0   || y3 < 0   || y4 < 0   ||
+           x1 > x2  || x2 > x3  || x3 > x4              ||
+           y1 > 500 || y2 > 500 || y3 > 500 || y4 > 500 )
+        return FT_THROW( Invalid_Argument );
+
+      driver->darken_params[0] = x1;
+      driver->darken_params[1] = y1;
+      driver->darken_params[2] = x2;
+      driver->darken_params[3] = y2;
+      driver->darken_params[4] = x3;
+      driver->darken_params[5] = y3;
+      driver->darken_params[6] = x4;
+      driver->darken_params[7] = y4;
+
+      return error;
+    }
+    else if ( !ft_strcmp( property_name, "hinting-engine" ) )
+    {
       FT_UInt*  hinting_engine = (FT_UInt*)value;
 
 
@@ -624,13 +657,28 @@
     FT_Error    error  = FT_Err_Ok;
     CFF_Driver  driver = (CFF_Driver)module;
 
-    FT_UInt  hinting_engine    = driver->hinting_engine;
-    FT_Bool  no_stem_darkening = driver->no_stem_darkening;
 
+    if ( !ft_strcmp( property_name, "darkening-parameters" ) )
+    {
+      FT_Int*  darken_params = driver->darken_params;
+      FT_Int*  val           = (FT_Int*)value;
 
-    if ( !ft_strcmp( property_name, "hinting-engine" ) )
+
+      val[0] = darken_params[0];
+      val[1] = darken_params[1];
+      val[2] = darken_params[2];
+      val[3] = darken_params[3];
+      val[4] = darken_params[4];
+      val[5] = darken_params[5];
+      val[6] = darken_params[6];
+      val[7] = darken_params[7];
+
+      return error;
+    }
+    else if ( !ft_strcmp( property_name, "hinting-engine" ) )
     {
-      FT_UInt*  val = (FT_UInt*)value;
+      FT_UInt   hinting_engine    = driver->hinting_engine;
+      FT_UInt*  val               = (FT_UInt*)value;
 
 
       *val = hinting_engine;
@@ -639,7 +687,8 @@
     }
     else if ( !ft_strcmp( property_name, "no-stem-darkening" ) )
     {
-      FT_Bool*  val = (FT_Bool*)value;
+      FT_Bool   no_stem_darkening = driver->no_stem_darkening;
+      FT_Bool*  val               = (FT_Bool*)value;
 
 
       *val = no_stem_darkening;
Index: lib/3rdparty/freetype/src/cff/cf2font.h
===================================================================
--- lib/3rdparty/freetype/src/cff/cf2font.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cf2font.h	(copie de travail)
@@ -85,6 +85,8 @@
                              /* i.e. darkenX != 0 || darkenY != 0      */
     FT_Bool  stemDarkened;
 
+    FT_Int  darkenParams[8];              /* 1000 unit character space */
+
     /* variables that depend on both FontDict and Transform */
     CF2_Fixed  stdVW;     /* in character space; depends on dict entry */
     CF2_Fixed  stdHW;     /* in character space; depends on dict entry */
Index: lib/3rdparty/freetype/src/cff/cffobjs.c
===================================================================
--- lib/3rdparty/freetype/src/cff/cffobjs.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cff/cffobjs.c	(copie de travail)
@@ -1055,7 +1055,7 @@
     CFF_Driver  driver = (CFF_Driver)module;
 
 
-    /* set default property values */
+    /* set default property values, cf `ftcffdrv.h' */
 #ifdef CFF_CONFIG_OPTION_OLD_ENGINE
     driver->hinting_engine    = FT_CFF_HINTING_FREETYPE;
 #else
@@ -1063,6 +1063,15 @@
 #endif
     driver->no_stem_darkening = FALSE;
 
+    driver->darken_params[0] =  500;
+    driver->darken_params[1] =  400;
+    driver->darken_params[2] = 1000;
+    driver->darken_params[3] =  275;
+    driver->darken_params[4] = 1667;
+    driver->darken_params[5] =  275;
+    driver->darken_params[6] = 2333;
+    driver->darken_params[7] =    0;
+
     return FT_Err_Ok;
   }
 
Index: lib/3rdparty/freetype/src/gxvalid/gxvmort.c
===================================================================
--- lib/3rdparty/freetype/src/gxvalid/gxvmort.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gxvalid/gxvmort.c	(copie de travail)
@@ -123,6 +123,7 @@
   {
     FT_UNUSED( valid );
 
+#ifdef FT_DEBUG_LEVEL_TRACE
     if ( coverage & 0x8000U )
       GXV_TRACE(( " this subtable is for vertical text only\n" ));
     else
@@ -141,6 +142,7 @@
 
     if ( coverage & 0x1FF8 )
       GXV_TRACE(( " coverage has non-zero bits in reserved area\n" ));
+#endif
   }
 
 
Index: lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c
===================================================================
--- lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c	(copie de travail)
@@ -5,7 +5,7 @@
 /*    TrueTypeGX/AAT morx table validation                                 */
 /*    body for type2 (Ligature Substitution) subtable.                     */
 /*                                                                         */
-/*  Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,       */
+/*  Copyright 2005, 2013 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -317,7 +317,9 @@
 
     gxv_XStateTable_validate( p, limit, valid );
 
+#if 0
     p += valid->subtable_length;
+#endif
     gxv_morx_subtable_type2_ligatureTable_validate( table, valid );
 
     GXV_EXIT;
Index: lib/3rdparty/freetype/src/gxvalid/gxvcommn.c
===================================================================
--- lib/3rdparty/freetype/src/gxvalid/gxvcommn.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gxvalid/gxvcommn.c	(copie de travail)
@@ -1288,7 +1288,9 @@
                                valid );
     else
     {
+#if 0
       maxState = 1;     /* 0:start of text, 1:start of line are predefined */
+#endif
       maxEntry = 0;
     }
 
@@ -1621,8 +1623,10 @@
       gxv_LookupTable_validate( table + classTable,
                                 table + classTable + classTable_length,
                                 valid );
+#if 0
       if ( valid->subtable_length < classTable_length )
         classTable_length = valid->subtable_length;
+#endif
     }
     else
     {
@@ -1641,7 +1645,9 @@
                                 valid );
     else
     {
+#if 0
       maxState = 1; /* 0:start of text, 1:start of line are predefined */
+#endif
       maxEntry = 0;
     }
 
@@ -1727,6 +1733,7 @@
                                       odtect->range[j].start,
                                       odtect->range[j].length ) )
         {
+#ifdef FT_DEBUG_LEVEL_TRACE
           if ( odtect->range[i].name || odtect->range[j].name )
             GXV_TRACE(( "found overlap between range %d and range %d\n",
                         i, j ));
@@ -1734,6 +1741,7 @@
             GXV_TRACE(( "found overlap between `%s' and `%s\'\n",
                         odtect->range[i].name,
                         odtect->range[j].name ));
+#endif
           FT_INVALID_OFFSET;
         }
 
Index: lib/3rdparty/freetype/src/gxvalid/gxvcommn.h
===================================================================
--- lib/3rdparty/freetype/src/gxvalid/gxvcommn.h	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/gxvalid/gxvcommn.h	(copie de travail)
@@ -318,7 +318,7 @@
           FT_BEGIN_STMNT                  \
             {                             \
               if ( (a) & 3 )              \
-                FT_INVALID_OFFSET ;       \
+                FT_INVALID_OFFSET;        \
             }                             \
           FT_END_STMNT
 
Index: lib/3rdparty/freetype/src/cid/cidload.c
===================================================================
--- lib/3rdparty/freetype/src/cid/cidload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cid/cidload.c	(copie de travail)
@@ -150,8 +150,6 @@
   cid_parse_font_matrix( CID_Face     face,
                          CID_Parser*  parser )
   {
-    FT_Matrix*    matrix;
-    FT_Vector*    offset;
     CID_FaceDict  dict;
     FT_Face       root = (FT_Face)&face->root;
     FT_Fixed      temp[6];
@@ -160,6 +158,10 @@
 
     if ( parser->num_dict >= 0 && parser->num_dict < face->cid.num_dicts )
     {
+      FT_Matrix*  matrix;
+      FT_Vector*  offset;
+
+
       dict   = face->cid.font_dicts + parser->num_dict;
       matrix = &dict->font_matrix;
       offset = &dict->font_offset;
Index: lib/3rdparty/freetype/src/cid/cidgload.c
===================================================================
--- lib/3rdparty/freetype/src/cid/cidgload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cid/cidgload.c	(copie de travail)
@@ -58,7 +58,7 @@
 #endif
 
 
-    FT_TRACE4(( "cid_load_glyph: glyph index %d\n", glyph_index ));
+    FT_TRACE1(( "cid_load_glyph: glyph index %d\n", glyph_index ));
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
Index: lib/3rdparty/freetype/src/tools/chktrcmp.py
===================================================================
--- lib/3rdparty/freetype/src/tools/chktrcmp.py	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/tools/chktrcmp.py	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # Check trace components in FreeType 2 source.
-# Author: suzuki toshiya, 2009
+# Author: suzuki toshiya, 2009, 2013
 #
 # This code is explicitly into the public domain.
 
@@ -15,7 +15,7 @@
 KNOWN_COMPONENT = {}
 
 SRC_FILE_DIRS   = [ "src" ]
-TRACE_DEF_FILES = [ "include/freetype/internal/fttrace.h" ]
+TRACE_DEF_FILES = [ "include/internal/fttrace.h" ]
 
 
 # --------------------------------------------------------------
Index: lib/3rdparty/freetype/src/tools/docmaker/sources.py
===================================================================
--- lib/3rdparty/freetype/src/tools/docmaker/sources.py	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/tools/docmaker/sources.py	(copie de travail)
@@ -1,4 +1,4 @@
-#  Sources (c) 2002-2004, 2006-2009, 2012
+#  Sources (c) 2002-2004, 2006-2009, 2012, 2013
 #    David Turner <david@freetype.org>
 #
 #
@@ -132,7 +132,7 @@
 #
 # used to detect a cross-reference, after markup tags have been stripped
 #
-re_crossref = re.compile( r'@((?:\w|-)*)(.*)' )
+re_crossref = re.compile( r'@((?:\w|-)*)(.*)' )    #  @foo
 
 #
 # used to detect italic and bold styles in paragraph text
@@ -141,6 +141,42 @@
 re_bold   = re.compile( r"\*(\w(\w|')*)\*(.*)" )   #  *bold*
 
 #
+# this regular expression code to identify an URL has been taken from
+#
+#   http://mail.python.org/pipermail/tutor/2002-September/017228.html
+#
+# (with slight modifications)
+#
+
+urls = r'(?:https?|telnet|gopher|file|wais|ftp)'
+ltrs = r'\w'
+gunk = r'/#~:.?+=&%@!\-'
+punc = r'.:?\-'
+any  = "%(ltrs)s%(gunk)s%(punc)s" % { 'ltrs' : ltrs,
+                                      'gunk' : gunk,
+                                      'punc' : punc }
+url  = r"""
+         (
+           \b                    # start at word boundary
+           %(urls)s :            # need resource and a colon
+           [%(any)s] +?          # followed by one or more of any valid
+                                 # character, but be conservative and
+                                 # take only what you need to...
+           (?=                   # [look-ahead non-consumptive assertion]
+             [%(punc)s]*         # either 0 or more punctuation
+             (?:                 # [non-grouping parentheses]
+               [^%(any)s] | $    # followed by a non-url char
+                                 # or end of the string
+             )
+           )
+         )
+        """ % {'urls' : urls,
+               'any'  : any,
+               'punc' : punc }
+
+re_url = re.compile( url, re.VERBOSE | re.MULTILINE )
+
+#
 # used to detect the end of commented source lines
 #
 re_source_sep = re.compile( r'\s*/\*\s*\*/' )
Index: lib/3rdparty/freetype/src/tools/docmaker/docmaker.py
===================================================================
--- lib/3rdparty/freetype/src/tools/docmaker/docmaker.py	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/tools/docmaker/docmaker.py	(copie de travail)
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 #
-#  DocMaker (c) 2002, 2004, 2008 David Turner <david@freetype.org>
+#  DocMaker (c) 2002, 2004, 2008, 2013 David Turner <david@freetype.org>
 #
-# This program is a re-write of the original DocMaker took used
+# This program is a re-write of the original DocMaker tool used
 # to generate the API Reference of the FreeType font engine
 # by converting in-source comments into structured HTML.
 #
Index: lib/3rdparty/freetype/src/tools/docmaker/tohtml.py
===================================================================
--- lib/3rdparty/freetype/src/tools/docmaker/tohtml.py	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/tools/docmaker/tohtml.py	(copie de travail)
@@ -1,4 +1,4 @@
-#  ToHTML (c) 2002, 2003, 2005, 2006, 2007, 2008
+#  ToHTML (c) 2002, 2003, 2005-2008, 2013
 #    David Turner <david@freetype.org>
 
 from sources import *
@@ -175,26 +175,7 @@
     return result
 
 
-# same as 'html_quote', but ignores left and right brackets
-def  html_quote0( line ):
-    return string.replace( line, "&", "&amp;" )
 
-
-def  dump_html_code( lines, prefix = "" ):
-    # clean the last empty lines
-    l = len( self.lines )
-    while l > 0 and string.strip( self.lines[l - 1] ) == "":
-        l = l - 1
-
-    # The code footer should be directly appended to the last code
-    # line to avoid an additional blank line.
-    print prefix + code_header,
-    for line in self.lines[0 : l + 1]:
-        print '\n' + prefix + html_quote( line ),
-    print prefix + code_footer,
-
-
-
 class  HtmlFormatter( Formatter ):
 
     def  __init__( self, processor, project_title, file_prefix ):
@@ -242,16 +223,6 @@
     def  make_block_url( self, block ):
         return self.make_section_url( block.section ) + "#" + block.name
 
-    def  make_html_words( self, words ):
-        """ convert a series of simple words into some HTML text """
-        line = ""
-        if words:
-            line = html_quote( words[0] )
-            for w in words[1:]:
-                line = line + " " + html_quote( w )
-
-        return line
-
     def  make_html_word( self, word ):
         """analyze a simple word to detect cross-references and styling"""
         # look for cross-references
@@ -291,6 +262,8 @@
             line = self.make_html_word( words[0] )
             for word in words[1:]:
                 line = line + " " + self.make_html_word( word )
+            # handle hyperlinks
+            line = re_url.sub( r'<a href="\1">\1</a>', line )
             # convert `...' quotations into real left and right single quotes
             line = re.sub( r"(^|\W)`(.*?)'(\W|$)",  \
                            r'\1&lsquo;\2&rsquo;\3', \
Index: lib/3rdparty/freetype/src/tools/docmaker/content.py
===================================================================
--- lib/3rdparty/freetype/src/tools/docmaker/content.py	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/tools/docmaker/content.py	(copie de travail)
@@ -1,4 +1,4 @@
-#  Content (c) 2002, 2004, 2006-2009, 2012
+#  Content (c) 2002, 2004, 2006-2009, 2012, 2013
 #    David Turner <david@freetype.org>
 #
 #  This file contains routines used to parse the content of documentation
@@ -268,15 +268,6 @@
         except:
             return None
 
-    def  get_start( self ):
-        try:
-            result = ""
-            for word in self.fields[0].items[0].words:
-                result = result + " " + word
-            return result[1:]
-        except:
-            return "ERROR"
-
     def  dump( self, margin ):
         print " " * margin + "<" + self.tag + ">"
         for f in self.fields:
@@ -555,14 +546,6 @@
                 return m
         return None
 
-    def  get_markup_name( self, tag_name ):
-        """return the name of a given primary markup in a block"""
-        try:
-            m = self.get_markup( tag_name )
-            return m.get_name()
-        except:
-            return None
-
     def  get_markup_words( self, tag_name ):
         try:
             m = self.get_markup( tag_name )
Index: lib/3rdparty/freetype/src/tools/afblue.pl
===================================================================
--- lib/3rdparty/freetype/src/tools/afblue.pl	(rÃ©vision 0)
+++ lib/3rdparty/freetype/src/tools/afblue.pl	(rÃ©vision 62573)
@@ -0,0 +1,542 @@
+#! /usr/bin/perl -w
+# -*- Perl -*-
+#
+# afblue.pl
+#
+# Process a blue zone character data file.
+#
+# Copyright 2013 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used,
+# modified, and distributed under the terms of the FreeType project
+# license, LICENSE.TXT.  By continuing to use, modify, or distribute
+# this file you indicate that you have read the license and
+# understand and accept it fully.
+
+use strict;
+use warnings;
+use English '-no_match_vars';
+use open ':std', ':locale';
+
+
+my $prog = $PROGRAM_NAME;
+$prog =~ s| .* / ||x;      # Remove path.
+
+die "usage: $prog datafile < infile > outfile\n" if $#ARGV != 0;
+
+
+my $datafile = $ARGV[0];
+
+my %diversions;        # The extracted and massaged data from `datafile'.
+my @else_stack;        # Booleans to track else-clauses.
+my @name_stack;        # Stack of integers used for names of aux. variables.
+
+my $curr_enum;         # Name of the current enumeration.
+my $curr_array;        # Name of the current array.
+my $curr_max;          # Name of the current maximum value.
+
+my $curr_enum_element; # Name of the current enumeration element.
+my $curr_offset;       # The offset relative to current aux. variable.
+my $curr_elem_size;    # The size of the current string or block.
+
+my $have_sections = 0; # Boolean; set if start of a section has been seen.
+my $have_strings;      # Boolean; set if current section contains strings.
+my $have_blocks;       # Boolean; set if current section contains blocks.
+
+my $have_enum_element; # Boolean; set if we have an enumeration element.
+my $in_string;         # Boolean; set if a string has been parsed.
+
+my $num_sections = 0;  # Number of sections seen so far.
+
+my $last_aux;          # Name of last auxiliary variable.
+
+
+# Regular expressions.
+
+# [<ws>] <enum_name> <ws> <array_name> <ws> <max_name> [<ws>] ':' [<ws>] '\n'
+my $section_re = qr/ ^ \s* (\S+) \s+ (\S+) \s+ (\S+) \s* : \s* $ /x;
+
+# [<ws>] <enum_element_name> [<ws>] '\n'
+my $enum_element_re = qr/ ^ \s* ( [A-Za-z0-9_]+ ) \s* $ /x;
+
+# '#' <preprocessor directive> '\n'
+my $preprocessor_re = qr/ ^ \# /x;
+
+# '/' '/' <comment> '\n'
+my $comment_re = qr| ^ // |x;
+
+# empty line
+my $whitespace_only_re = qr/ ^ \s* $ /x;
+
+# [<ws>] '"' <string> '"' [<ws>] '\n'  (<string> doesn't contain newlines)
+my $string_re = qr/ ^ \s*
+                       " ( (?: [^"\\]++ | \\. )*+ ) "
+                       \s* $ /x;
+
+# [<ws>] '{' <block> '}' [<ws>] '\n'  (<block> can contain newlines)
+my $block_start_re = qr/ ^ \s* \{ /x;
+
+# We need the capturing group for `split' to make it return the separator
+# tokens (i.e., the opening and closing brace) also.
+my $brace_re = qr/ ( [{}] ) /x;
+
+
+sub Warn
+{
+  my $message = shift;
+  warn "$datafile:$INPUT_LINE_NUMBER: warning: $message\n";
+}
+
+
+sub Die
+{
+  my $message = shift;
+  die "$datafile:$INPUT_LINE_NUMBER: error: $message\n";
+}
+
+
+my $warned_before = 0;
+
+sub warn_before
+{
+  Warn("data before first section gets ignored") unless $warned_before;
+  $warned_before = 1;
+}
+
+
+sub strip_newline
+{
+  chomp;
+  s/ \x0D $ //x;
+}
+
+
+sub end_curr_string
+{
+  # Append final null byte to string.
+  if ($have_strings)
+  {
+    push @{$diversions{$curr_array}}, "    '\\0',\n" if $in_string;
+
+    $curr_offset++;
+    $in_string = 0;
+  }
+}
+
+
+sub update_max_elem_size
+{
+  if ($curr_elem_size)
+  {
+    my $max = pop @{$diversions{$curr_max}};
+    $max = $curr_elem_size if $curr_elem_size > $max;
+    push @{$diversions{$curr_max}}, $max;
+  }
+}
+
+
+sub convert_non_ascii_char
+{
+  # A UTF-8 character outside of the printable ASCII range, with possibly a
+  # leading backslash character.
+  my $s = shift;
+
+  # Here we count characters, not bytes.
+  $curr_elem_size += length $s;
+
+  utf8::encode($s);
+  $s = uc unpack 'H*', $s;
+
+  $curr_offset += $s =~ s/\G(..)/'\\x$1', /sg;
+
+  return $s;
+}
+
+
+sub convert_ascii_chars
+{
+  # A series of ASCII characters in the printable range.
+  my $s = shift;
+
+  my $count = $s =~ s/\G(.)/'$1', /g;
+  $curr_offset += $count;
+  $curr_elem_size += $count;
+
+  return $s;
+}
+
+
+sub convert_literal
+{
+  my $s = shift;
+  my $orig = $s;
+
+  # ASCII printables and space
+  my $safe_re = '\x20-\x7E';
+  # ASCII printables and space, no backslash
+  my $safe_no_backslash_re = '\x20-\x5B\x5D-\x7E';
+
+  $s =~ s{
+           (?: \\? ( [^$safe_re] )
+               | ( (?: [$safe_no_backslash_re]
+                       | \\ [$safe_re] )+ ) )
+         }
+         {
+           defined($1) ? convert_non_ascii_char($1)
+                       : convert_ascii_chars($2)
+         }egx;
+
+   # We assume that `$orig' doesn't contain `*/'
+   return $s . " /* $orig */";
+}
+
+
+sub aux_name
+{
+  return "af_blue_" . $num_sections. "_" . join('_', reverse @name_stack);
+}
+
+
+sub aux_name_next
+{
+  $name_stack[$#name_stack]++;
+  my $name = aux_name();
+  $name_stack[$#name_stack]--;
+
+  return $name;
+}
+
+
+sub enum_val_string
+{
+  # Build string which holds code to save the current offset in an
+  # enumeration element.
+  my $aux = shift;
+
+  my $add = ($last_aux eq "af_blue_" . $num_sections . "_0" )
+              ? ""
+              : "$last_aux + ";
+
+  return "    $aux = $add$curr_offset,\n";
+}
+
+
+
+# Process data file.
+
+open(DATA, $datafile) || die "$prog: can't open \`$datafile': $OS_ERROR\n";
+
+while (<DATA>)
+{
+  strip_newline();
+
+  next if /$comment_re/;
+  next if /$whitespace_only_re/;
+
+  if (/$section_re/)
+  {
+    Warn("previous section is empty") if ($have_sections
+                                          && !$have_strings
+                                          && !$have_blocks);
+
+    end_curr_string();
+    update_max_elem_size();
+
+    # Save captured groups from `section_re'.
+    $curr_enum = $1;
+    $curr_array = $2;
+    $curr_max = $3;
+
+    $curr_enum_element = "";
+    $curr_offset = 0;
+
+    Warn("overwriting already defined enumeration \`$curr_enum'")
+      if exists($diversions{$curr_enum});
+    Warn("overwriting already defined array \`$curr_array'")
+      if exists($diversions{$curr_array});
+    Warn("overwriting already defined maximum value \`$curr_max'")
+      if exists($diversions{$curr_max});
+
+    $diversions{$curr_enum} = [];
+    $diversions{$curr_array} = [];
+    $diversions{$curr_max} = [];
+
+    push @{$diversions{$curr_max}}, 0;
+
+    @name_stack = ();
+    push @name_stack, 0;
+
+    $have_sections = 1;
+    $have_strings = 0;
+    $have_blocks = 0;
+
+    $have_enum_element = 0;
+    $in_string = 0;
+
+    $num_sections++;
+    $curr_elem_size = 0;
+
+    $last_aux = aux_name();
+
+    next;
+  }
+
+  if (/$preprocessor_re/)
+  {
+    if ($have_sections)
+    {
+      # Having preprocessor conditionals complicates the computation of
+      # correct offset values.  We have to introduce auxiliary enumeration
+      # elements with the name `af_blue_<s>_<n1>_<n2>_...' which store
+      # offsets to be used in conditional clauses.  `<s>' is the number of
+      # sections seen so far, `<n1>' is the number of `#if' and `#endif'
+      # conditionals seen so far in the topmost level, `<n2>' the number of
+      # `#if' and `#endif' conditionals seen so far one level deeper, etc.
+      # As a consequence, uneven values are used within a clause, and even
+      # values after a clause, since the C standard doesn't allow the
+      # redefinition of an enumeration value.  For example, the name
+      # `af_blue_5_1_6' is used to construct enumeration values in the fifth
+      # section after the third (second-level) if-clause within the first
+      # (top-level) if-clause.  After the first top-level clause has
+      # finished, `af_blue_5_2' is used.  The current offset is then
+      # relative to the value stored in the current auxiliary element.
+
+      if (/ ^ \# \s* if /x)
+      {
+        push @else_stack, 0;
+
+        $name_stack[$#name_stack]++;
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name());
+        $last_aux = aux_name();
+
+        push @name_stack, 0;
+
+        $curr_offset = 0;
+      }
+      elsif (/ ^ \# \s* elif /x)
+      {
+        Die("unbalanced #elif") unless @else_stack;
+
+        pop @name_stack;
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next());
+        $last_aux = aux_name();
+
+        push @name_stack, 0;
+
+        $curr_offset = 0;
+      }
+      elsif (/ ^ \# \s* else /x)
+      {
+        my $prev_else = pop @else_stack;
+        Die("unbalanced #else") unless defined($prev_else);
+        Die("#else already seen") if $prev_else;
+        push @else_stack, 1;
+
+        pop @name_stack;
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next());
+        $last_aux = aux_name();
+
+        push @name_stack, 0;
+
+        $curr_offset = 0;
+      }
+      elsif (/ ^ \# \s* endif /x)
+      {
+        my $prev_else = pop @else_stack;
+        Die("unbalanced #endif") unless defined($prev_else);
+
+        pop @name_stack;
+        $name_stack[$#name_stack]++;
+
+        # If there is no else-clause for an if-clause, we add one.  This is
+        # necessary to have correct offsets.
+        if (!$prev_else)
+        {
+          push @{$diversions{$curr_enum}}, enum_val_string(aux_name())
+                                           . "#else\n";
+
+          $curr_offset = 0;
+        }
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name());
+        $last_aux = aux_name();
+
+        $curr_offset = 0;
+      }
+
+      # Handle (probably continued) preprocessor lines.
+    CONTINUED_LOOP:
+      {
+        do
+        {
+          strip_newline();
+
+          push @{$diversions{$curr_enum}}, $ARG . "\n";
+          push @{$diversions{$curr_array}}, $ARG . "\n";
+
+          last CONTINUED_LOOP unless / \\ $ /x;
+
+        } while (<DATA>);
+      }
+    }
+    else
+    {
+      warn_before();
+    }
+
+    next;
+  }
+
+  if (/$enum_element_re/)
+  {
+    end_curr_string();
+    update_max_elem_size();
+
+    $curr_enum_element = $1;
+    $have_enum_element = 1;
+    $curr_elem_size = 0;
+
+    next;
+  }
+
+  if (/$string_re/)
+  {
+    if ($have_sections)
+    {
+      Die("strings and blocks can't be mixed in a section") if $have_blocks;
+
+      # Save captured group from `string_re'.
+      my $string = $1;
+
+      if ($have_enum_element)
+      {
+        push @{$diversions{$curr_enum}}, enum_val_string($curr_enum_element);
+        $have_enum_element = 0;
+      }
+
+      $string = convert_literal($string);
+
+      push @{$diversions{$curr_array}}, "    $string\n";
+
+      $have_strings = 1;
+      $in_string = 1;
+    }
+    else
+    {
+      warn_before();
+    }
+
+    next;
+  }
+
+  if (/$block_start_re/)
+  {
+    if ($have_sections)
+    {
+      Die("strings and blocks can't be mixed in a section") if $have_strings;
+
+      my $depth = 0;
+      my $block = "";
+      my $block_end = 0;
+
+      # Count braces while getting the block.
+    BRACE_LOOP:
+      {
+        do
+        {
+          strip_newline();
+
+          foreach my $substring (split(/$brace_re/))
+          {
+            if ($block_end)
+            {
+              Die("invalid data after last matching closing brace")
+                if $substring !~ /$whitespace_only_re/;
+            }
+
+            $block .= $substring;
+
+            if ($substring eq '{')
+            {
+              $depth++;
+            }
+            elsif ($substring eq '}')
+            {
+              $depth--;
+
+              $block_end = 1 if $depth == 0;
+            }
+          }
+
+          # If we are here, we have run out of substrings, so get next line
+          # or exit.
+          last BRACE_LOOP if $block_end;
+
+          $block .= "\n";
+
+        } while (<DATA>);
+      }
+
+      if ($have_enum_element)
+      {
+        push @{$diversions{$curr_enum}}, enum_val_string($curr_enum_element);
+        $have_enum_element = 0;
+      }
+
+      push @{$diversions{$curr_array}}, $block . ",\n";
+
+      $curr_offset++;
+      $curr_elem_size++;
+
+      $have_blocks = 1;
+    }
+    else
+    {
+      warn_before();
+    }
+
+    next;
+  }
+
+  # Garbage.  We weren't able to parse the data.
+  Die("syntax error");
+}
+
+# Finalize data.
+end_curr_string();
+update_max_elem_size();
+
+
+# Filter stdin to stdout, replacing `@...@' templates.
+
+sub emit_diversion
+{
+  my $diversion_name = shift;
+  return (exists($diversions{$1})) ? "@{$diversions{$1}}"
+                                   : "@" . $diversion_name . "@";
+}
+
+
+$LIST_SEPARATOR = '';
+
+my $s1 = "This file has been generated by the Perl script \`$prog',";
+my $s1len = length $s1;
+my $s2 = "using data from file \`$datafile'.";
+my $s2len = length $s2;
+my $slen = ($s1len > $s2len) ? $s1len : $s2len;
+
+print "/* " . $s1 . " " x ($slen - $s1len) . " */\n"
+      . "/* " . $s2 . " " x ($slen - $s2len) . " */\n"
+      . "\n";
+
+while (<STDIN>)
+{
+  s/ @ ( [A-Za-z0-9_]+? ) @ / emit_diversion($1) /egx;
+  print;
+}
+
+# EOF

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/src/tools/afblue.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/freetype/src/raster/ftraster.c
===================================================================
--- lib/3rdparty/freetype/src/raster/ftraster.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/raster/ftraster.c	(copie de travail)
@@ -24,8 +24,8 @@
   /*                                                                       */
   /* - copy `src/raster/ftraster.c' (this file) to your current directory  */
   /*                                                                       */
-  /* - copy `include/freetype/ftimage.h' and `src/raster/ftmisc.h'         */
-  /*   to your current directory                                           */
+  /* - copy `include/ftimage.h' and `src/raster/ftmisc.h' to your current  */
+  /*   directory                                                           */
   /*                                                                       */
   /* - compile `ftraster' with the _STANDALONE_ macro defined, as in       */
   /*                                                                       */
Index: lib/3rdparty/freetype/src/psaux/Jamfile
===================================================================
--- lib/3rdparty/freetype/src/psaux/Jamfile	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/psaux/Jamfile	(copie de travail)
@@ -1,31 +0,0 @@
-# FreeType 2 src/psaux Jamfile
-#
-# Copyright 2001, 2002 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) psaux ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = psauxmod psobjs   t1decode t1cmap
-               psconv   afmparse
-               ;
-  }
-  else
-  {
-    _sources = psaux ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/psaux Jamfile
Index: lib/3rdparty/freetype/src/type1/t1gload.c
===================================================================
--- lib/3rdparty/freetype/src/type1/t1gload.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/type1/t1gload.c	(copie de travail)
@@ -300,6 +300,8 @@
       goto Exit;
     }
 
+    FT_TRACE1(( "T1_Load_Glyph: glyph index %d\n", glyph_index ));
+
     FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );
 
     if ( load_flags & FT_LOAD_NO_RECURSE )
Index: lib/3rdparty/freetype/src/type1/t1load.c
===================================================================
--- lib/3rdparty/freetype/src/type1/t1load.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/type1/t1load.c	(copie de travail)
@@ -2209,7 +2209,6 @@
     if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY )
     {
       FT_Int    charcode, idx, min_char, max_char;
-      FT_Byte*  char_name;
       FT_Byte*  glyph_name;
 
 
@@ -2224,6 +2223,9 @@
       charcode = 0;
       for ( ; charcode < loader.encoding_table.max_elems; charcode++ )
       {
+        FT_Byte*  char_name;
+
+
         type1->encoding.char_index[charcode] = 0;
         type1->encoding.char_name [charcode] = (char *)".notdef";
 
Index: lib/3rdparty/freetype/src/cache/Jamfile
===================================================================
--- lib/3rdparty/freetype/src/cache/Jamfile	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/cache/Jamfile	(copie de travail)
@@ -1,43 +0,0 @@
-# FreeType 2 src/cache Jamfile
-#
-# Copyright 2001, 2003, 2004 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) cache ;
-
-# The file <freetype/ftcache.h> contains some macro definitions that are
-# later used in #include statements related to the cache sub-system.  It
-# needs to be parsed through a HDRMACRO rule for macro definitions.
-#
-HDRMACRO  [ FT2_SubDir  include ftcache.h ] ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = ftcmru
-               ftcmanag
-               ftccache
-               ftcglyph
-               ftcsbits
-               ftcimage
-               ftcbasic
-               ftccmap
-               ;
-  }
-  else
-  {
-    _sources = ftcache ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/cache Jamfile
Index: lib/3rdparty/freetype/src/winfonts/winfnt.c
===================================================================
--- lib/3rdparty/freetype/src/winfonts/winfnt.c	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/src/winfonts/winfnt.c	(copie de travail)
@@ -984,6 +984,8 @@
       goto Exit;
     }
 
+    FT_TRACE1(( "FNT_Load_Glyph: glyph index %d\n", glyph_index ));
+
     if ( glyph_index > 0 )
       glyph_index--;                           /* revert to real index */
     else
@@ -1024,7 +1026,7 @@
       bitmap->rows       = font->header.pixel_height;
       bitmap->pixel_mode = FT_PIXEL_MODE_MONO;
 
-      if ( offset + pitch * bitmap->rows >= font->header.file_size )
+      if ( offset + pitch * bitmap->rows > font->header.file_size )
       {
         FT_TRACE2(( "invalid bitmap width\n" ));
         error = FT_THROW( Invalid_File_Format );
Index: lib/3rdparty/freetype/autogen.sh
===================================================================
--- lib/3rdparty/freetype/autogen.sh	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/autogen.sh	(copie de travail)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
+# Copyright 2005-2010, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -139,7 +139,7 @@
 check_tool_version $AUTOCONF   autoconf   AUTOCONF   2.62
 
 # This sets freetype_major, freetype_minor, and freetype_patch.
-eval `sed -nf version.sed include/freetype/freetype.h`
+eval `sed -nf version.sed include/freetype.h`
 
 # We set freetype-patch to an empty value if it is zero.
 if test "$freetype_patch" = ".0"; then
Index: lib/3rdparty/freetype/CMakeLists.txt
===================================================================
--- lib/3rdparty/freetype/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/CMakeLists.txt	(copie de travail)
@@ -7,24 +7,35 @@
 
 list(APPEND SOURCE
   src/autofit/autofit.c
-  src/base/ftbase.c
+  src/base/ftadvanc.c
   src/base/ftbbox.c
-  src/base/ftbdf.c
   src/base/ftbitmap.c
+  src/base/ftcalc.c
+  src/base/ftcid.c
+  src/base/ftdbgmem.c
   src/base/ftdebug.c
+  src/base/ftfstype.c
   src/base/ftgasp.c
+  src/base/ftgloadr.c
   src/base/ftglyph.c
   src/base/ftgxval.c
   src/base/ftinit.c
   src/base/ftlcdfil.c
   src/base/ftmm.c
+  src/base/ftobjs.c
   src/base/ftotval.c
+  src/base/ftoutln.c
   src/base/ftpatent.c
   src/base/ftpfr.c
+  src/base/ftrfork.c
+  src/base/ftsnames.c
+  src/base/ftstream.c
   src/base/ftstroke.c
   src/base/ftsynth.c
   src/base/ftsystem.c
+  src/base/fttrigon.c
   src/base/fttype1.c
+  src/base/ftutil.c
   src/base/ftwinfnt.c
   src/base/ftxf86.c
   src/bdf/bdf.c
@@ -32,15 +43,13 @@
   src/cache/ftcache.c
   src/cff/cff.c
   src/cid/type1cid.c
-  src/gxvalid/gxvalid.c
   src/gzip/ftgzip.c
   src/lzw/ftlzw.c
-  src/otvalid/otvalid.c
   src/pcf/pcf.c
   src/pfr/pfr.c
   src/psaux/psaux.c
   src/pshinter/pshinter.c
-  src/psnames/psnames.c
+  src/psnames/psmodule.c
   src/raster/raster.c
   src/sfnt/sfnt.c
   src/smooth/smooth.c
Index: lib/3rdparty/freetype/README
===================================================================
--- lib/3rdparty/freetype/README	(rÃ©vision 61927)
+++ lib/3rdparty/freetype/README	(copie de travail)
@@ -1,4 +1,4 @@
-  FreeType 2.5.0
+  FreeType 2.5.2
   ==============
 
   Homepage: http://www.freetype.org
@@ -24,9 +24,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.5.0.tar.bz2
-    freetype-doc-2.5.0.tar.gz
-    ftdoc250.zip
+    freetype-doc-2.5.2.tar.bz2
+    freetype-doc-2.5.2.tar.gz
+    ftdoc252.zip
 
   To view the documentation online, go to
 
Index: lib/3rdparty/freetype/objs/README
===================================================================
--- lib/3rdparty/freetype/objs/README	(rÃ©vision 0)
+++ lib/3rdparty/freetype/objs/README	(rÃ©vision 62573)
@@ -0,0 +1,2 @@
+This directory contains all the object files created when building the
+library.

Modification de propriÃ©tÃ©s sur lib/3rdparty/freetype/objs/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libsamplerate/CMakeLists.txt
===================================================================
--- lib/3rdparty/libsamplerate/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/libsamplerate/CMakeLists.txt	(copie de travail)
@@ -3,7 +3,9 @@
     samplerate.c
     src_linear.c
     src_sinc.c
-    src_zoh.c)
+    src_zoh.c
+    precomp.h)
 
 add_library(libsamplerate ${SOURCE})
 add_dependencies(libsamplerate psdk)
+add_pch(libsamplerate precomp.h SOURCE)
Index: lib/3rdparty/adns/CMakeLists.txt
===================================================================
--- lib/3rdparty/adns/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/adns/CMakeLists.txt	(copie de travail)
@@ -18,10 +18,12 @@
     src/reply.c
     src/setup.c
     src/transmit.c
-    src/types.c)
+    src/types.c
+    src/internal.h)
 
 add_library(adns ${SOURCE})
 add_dependencies(adns psdk)
+add_pch(adns src/internal.h SOURCE)
 
 if(NOT MSVC)
     add_target_compile_flags(adns "-Wno-unused-but-set-variable")
Index: lib/3rdparty/bzip2/CMakeLists.txt
===================================================================
--- lib/3rdparty/bzip2/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/bzip2/CMakeLists.txt	(copie de travail)
@@ -10,12 +10,14 @@
     decompress.c
     huffman.c
     dllmain.c
+    bzlib_private.h)
+
+add_library(bzip2 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/unbzip2.def)
 
-add_library(bzip2 SHARED ${SOURCE})
-
 set_module_type(bzip2 kernelmodedriver)
 add_importlibs(bzip2 ntoskrnl)
 target_link_libraries(bzip2 libcntpr)
-
+add_pch(bzip2 bzlib_private.h SOURCE)
 set_target_properties(bzip2 PROPERTIES OUTPUT_NAME "unbzip2")
Index: lib/3rdparty/bzip2/bzlib.c
===================================================================
--- lib/3rdparty/bzip2/bzlib.c	(rÃ©vision 61927)
+++ lib/3rdparty/bzip2/bzlib.c	(copie de travail)
@@ -32,7 +32,7 @@
 #ifndef __NTDRIVER__
   #define __NTDRIVER__
 #endif
-#include <ntddk.h>
+#include <wdm.h>
 #include <debug.h>
 #endif
 #include "bzlib_private.h"
Index: lib/3rdparty/stlport/src/dll_main.cpp
===================================================================
--- lib/3rdparty/stlport/src/dll_main.cpp	(rÃ©vision 61927)
+++ lib/3rdparty/stlport/src/dll_main.cpp	(copie de travail)
@@ -23,8 +23,6 @@
  *
  */
 
-#define _STLP_EXPOSE_GLOBALS_IMPLEMENTATION
-
 #include "stlport_prefix.h"
 
 #if !defined (_STLP_DEBUG) && ! defined (_STLP_ASSERTIONS)
Index: lib/3rdparty/stlport/CMakeLists.txt
===================================================================
--- lib/3rdparty/stlport/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/stlport/CMakeLists.txt	(copie de travail)
@@ -40,7 +40,11 @@
     src/string.cpp
     src/strstream.cpp
     src/time_facets.cpp
-    src/c_locale.c
-    src/cxa.c)
+    src/stlport_prefix.h)
 
-add_library(stlport ${SOURCE})
+add_library(stlport
+    ${SOURCE}
+    src/cxa.c
+    src/c_locale.c)
+
+add_pch(stlport src/stlport_prefix.h SOURCE)
Index: lib/3rdparty/libxml2/CMakeLists.txt
===================================================================
--- lib/3rdparty/libxml2/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/libxml2/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,7 @@
 
-include_directories(include)
+include_directories(
+    include
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/libwin-iconv)
 
 add_definitions(
     -D__MINGW32__
@@ -10,6 +12,8 @@
     -D_WINDOWS
     -DWIN32
     -DHAVE_CONFIG_H
+    -DLIBXML_ICONV_ENABLED
+    -DICONV_CONST=const
     -D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
@@ -55,10 +59,12 @@
     xmlwriter.c
     xpath.c
     xpointer.c
-    xmlstring.c)
+    xmlstring.c
+    libxml.h)
 
 add_library(libxml2 ${SOURCE})
 target_link_libraries(libxml2 oldnames)
+add_pch(libxml2 libxml.h SOURCE)
 add_dependencies(libxml2 psdk)
 
 if(NOT MSVC)
Index: lib/3rdparty/CMakeLists.txt
===================================================================
--- lib/3rdparty/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/CMakeLists.txt	(copie de travail)
@@ -7,6 +7,7 @@
 add_subdirectory(libmpg123)
 add_subdirectory(libsamplerate)
 add_subdirectory(libwine)
+add_subdirectory(libwin-iconv)
 add_subdirectory(libxml2)
 if(MSVC)
     add_subdirectory(stlport)
Index: lib/3rdparty/cardlib/CMakeLists.txt
===================================================================
--- lib/3rdparty/cardlib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/cardlib/CMakeLists.txt	(copie de travail)
@@ -12,11 +12,13 @@
     cardrgnmouse.cpp
     cardstack.cpp
     cardwindow.cpp
-    dropzone.cpp)
+    dropzone.cpp
+    cardlib.h)
 
 add_library(cardlib ${SOURCE})
 add_dependencies(cardlib psdk)
+add_pch(cardlib cardlib.h SOURCE)
 
-if(NOT MSVC)
+if(NOT MSVC AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang"))
     add_target_compile_flags(cardlib "-Wno-unused-but-set-variable")
 endif()
Index: lib/3rdparty/libmpg123/CMakeLists.txt
===================================================================
--- lib/3rdparty/libmpg123/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/libmpg123/CMakeLists.txt	(copie de travail)
@@ -13,7 +13,7 @@
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
 
-add_library(libmpg123
+list(APPEND SOURCE
     compat.c
     dct64.c
     dct64_i386.c
@@ -38,7 +38,10 @@
     synth_8bit.c
     synth_real.c
     synth_s32.c
-    tabinit.c)
+    tabinit.c
+    precomp.h)
 
+add_library(libmpg123 ${SOURCE})
 add_dependencies(libmpg123 psdk)
+add_pch(libmpg123 precomp.h SOURCE)
 allow_warnings(libmpg123)
Index: lib/3rdparty/libmpg123/precomp.h
===================================================================
--- lib/3rdparty/libmpg123/precomp.h	(rÃ©vision 0)
+++ lib/3rdparty/libmpg123/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,6 @@
+#ifndef _LIBMPG123_PCH_
+#define _LIBMPG123_PCH_
+
+#include <mpg123lib_intern.h>
+
+#endif /* _LIBMPG123_PCH_ */

Modification de propriÃ©tÃ©s sur lib/3rdparty/libmpg123/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/strmbase/CMakeLists.txt
===================================================================
--- lib/3rdparty/strmbase/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/3rdparty/strmbase/CMakeLists.txt	(copie de travail)
@@ -17,7 +17,9 @@
     seeking.c
     transform.c
     video.c
-    window.c)
+    window.c
+    strmbase_private.h)
 
 add_library(strmbase ${SOURCE})
+add_pch(strmbase strmbase_private.h SOURCE)
 add_dependencies(strmbase psdk dxsdk)
Index: lib/3rdparty/strmbase/dispatch.c
===================================================================
--- lib/3rdparty/strmbase/dispatch.c	(rÃ©vision 61927)
+++ lib/3rdparty/strmbase/dispatch.c	(copie de travail)
@@ -20,6 +20,8 @@
 
 #include "strmbase_private.h"
 
+#include <oleauto.h>
+
 HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
 {
     HRESULT hr = E_FAIL;
Index: lib/3rdparty/strmbase/outputqueue.c
===================================================================
--- lib/3rdparty/strmbase/outputqueue.c	(rÃ©vision 61927)
+++ lib/3rdparty/strmbase/outputqueue.c	(copie de travail)
@@ -20,6 +20,8 @@
 
 #include "strmbase_private.h"
 
+#include <wine/list.h>
+
 enum {SAMPLE_PACKET, EOS_PACKET};
 
 typedef struct tagQueuedEvent {
Index: lib/3rdparty/strmbase/strmbase_private.h
===================================================================
--- lib/3rdparty/strmbase/strmbase_private.h	(rÃ©vision 61927)
+++ lib/3rdparty/strmbase/strmbase_private.h	(copie de travail)
@@ -18,11 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _STRMBASE_PCH_
+#define _STRMBASE_PCH_
 
+#include <wine/config.h>
+
 #include <assert.h>
+#include <stdarg.h>
 
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #define WIN32_LEAN_AND_MEAN
 
 #define COBJMACROS
@@ -29,13 +35,15 @@
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
 #include <dshow.h>
 
-#include <wine/list.h>
+#include <wine/debug.h>
 #include <wine/strmbase.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 
 /* Quality Control */
@@ -68,3 +76,5 @@
 void QualityControlRender_DoQOS(QualityControlImpl *priv);
 void QualityControlRender_BeginRender(QualityControlImpl *This);
 void QualityControlRender_EndRender(QualityControlImpl *This);
+
+#endif /* _STRMBASE_PCH_ */
Index: lib/3rdparty/libwin-iconv/CMakeLists.txt
===================================================================
--- lib/3rdparty/libwin-iconv/CMakeLists.txt	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/CMakeLists.txt	(rÃ©vision 62573)
@@ -0,0 +1,8 @@
+
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+add_library(iconv-static win_iconv.c)
+set_target_properties(iconv-static PROPERTIES OUTPUT_NAME "iconv")
+add_dependencies(iconv-static psdk)

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/ChangeLog
===================================================================
--- lib/3rdparty/libwin-iconv/ChangeLog	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/ChangeLog	(rÃ©vision 62573)
@@ -0,0 +1,161 @@
+2014-02-05  Yukihiro Nakadaira
+
+	* win_iconv.c: Added alias.  ISO_8859-* ISO_8859_*
+	* win_iconv.c, win_iconv_test.c: Fixed for compiler warning.
+
+2013-09-15  Yukihiro Nakadaira
+
+	* iconv.h: Fixed c++ style comment. (Issue 21) (Thanks to bgilbert)
+
+2012-11-22  Yukihiro Nakadaira
+
+	* win_iconv.c: Fix warnings.
+	(Issue 19) (Thanks to yselkowitz)
+
+2012-10-21  Yukihiro Nakadaira
+
+	* win_iconv.c, win_iconv_test.c: Add //ignore and -c flag.
+
+2012-10-15  Yukihiro Nakadaira
+
+	* win_iconv.c, win_iconv_test.c: cosmetic change.
+
+2012-09-19  Yukihiro Nakadaira
+
+	* iconv.h, win_iconv.c, win_iconv_test.c: Change iconv(3) prototype.
+	"const char **inbuf" -> "char **inbuf"
+	(Issue 8)
+
+	* win_iconv.c: Change to not use TEXT macro for GetProcAddress.
+	(Issue 17) (Thanks to EPienkowskia)
+
+	* win_iconv_test.c: Fix for -DUNICODE.  Use GetModuleFileNameA.
+
+2011-10-28  Yukihiro Nakadaira
+
+	* win_iconv.c: Add UCS-2.
+	(Issue 14) (Thanks to j.g.rennison)
+
+2011-10-24  Yukihiro Nakadaira
+
+	* win_iconv.c: Add Big5-HKSCS alias.
+	(Issue 13) (Thanks to timothy.ty.lee)
+
+2011-09-06  Yukihiro Nakadaira
+
+	* Makefile: Improvement of the creation of the DLL.
+	(Issue 10) (Thanks to vincent.torri)
+
+2011-08-19  Yukihiro Nakadaira
+
+	* win_iconv.c: Fixed a bug that assumption that
+	sizeof(DWORD)==sizeof(void*) in find_imported_module_by_funcname.
+	(Issue 7) (Thanks to j.g.rennison)
+
+2011-08-13  Yukihiro Nakadaira
+
+	* win_iconv.c, win_iconv_test.c: Fixed a bug that //translit
+	flag does not work when transliterating to the default
+	character.
+	(Issue 9) (Thanks to j.g.rennison)
+
+2011-07-26  Yukihiro Nakadaira
+
+	* CMakeLists.txt: fix dll name with mingw.
+	(Issue 6) (Thanks to kalevlember)
+
+
+2011-05-19  Yukihiro Nakadaira
+
+	* win_iconv.c: Add some more UCS aliases.
+	Merge from Tor Lillqvist version.
+	(Issue 4) (Thanks to mkbosmans)
+
+2011-05-15  Yukihiro Nakadaira
+
+	* Makefile: use variable for tools in Makefile
+	(Issue 3) (Thanks to mkbosmans)
+
+2011-01-13  Yukihiro Nakadaira
+
+	* win_iconv_test.c: Removed unused variable.
+
+	* win_iconv_test.c: Added USE_ICONV_H flag to compile with -liconv.
+	(Issue 2) (Thanks to amorilia.gamebox)
+
+2010-04-14  Patrick von Reth
+
+	* added c++ support
+
+2010-03-28  Patrick Spendrin
+
+    * CMakeLists.txt, win_iconv.c: add CMake buildsystem, fix bug from issue tracker
+
+2009-07-25  Yukihiro Nakadaira
+
+	* win_iconv.c, readme.txt: doc fix
+
+2009-07-06  Yukihiro Nakadaira
+
+	* win_iconv.c, Makefile, readme.txt: doc fix
+
+2009-06-19  Yukihiro Nakadaira
+
+	* win_iconv.c: cosmetic change
+	* win_iconv.c: Change Unicode BOM behavior
+	1. Remove the BOM when "fromcode" is utf-16 or utf-32.
+	2. Add the BOM when "tocode" is utf-16 or utf-32.
+
+2009-06-18  Yukihiro Nakadaira
+
+	* win_iconv.c: Fixed a bug that invalid input may cause an
+	endless loop
+
+2009-06-18  Yukihiro Nakadaira
+
+	* win_iconv.c: Fixed a bug that libiconv_iconv_open() doesn't
+	work (Christophe Benoit)
+
+2008-04-01  Yukihiro Nakadaira
+
+	* win_iconv.c: Added //TRANSLIT option.
+	http://bugzilla.gnome.org/show_bug.cgi?id=524314
+
+2008-03-20  Yukihiro Nakadaira
+
+	* win_iconv.c: The dwFlags parameter to MultiByteToWideChars()
+	must be zero for some code pages (Tor Lillqvist)
+
+2008-03-19  Yukihiro Nakadaira
+
+	* win_iconv.c: Added support for UCS-2 and GB18030 (Tor Lillqvist)
+
+2007-12-03  Yukihiro Nakadaira
+
+	* iconv.h: #include <stddef.h> to use size_t
+
+2007-11-28  Yukihiro Nakadaira
+
+	* win_iconv.c: bug fix for two things (Tor Lillqvist)
+	1) This is probably not important: Add a function
+	   must_use_null_useddefaultchar() that checks for those
+	   codepages for which the docs for WideCharToMultiByte() say
+	   one has to use a NULL lpDefaultChar pointer. Don't know if
+	   this is actually needed, but better to be safe than sorry.
+	2) This is essential: In kernel_wctomb(), the code should first
+	   check if bufsize is zero, and return the E2BIG error in that
+	   case.
+
+2007-11-26  Yukihiro Nakadaira
+
+	* win_iconv.c: ISO-8859-1 should be CP28591, not CP1252 (Tor
+	Lillqvist)
+
+2007-11-26  Yukihiro Nakadaira
+
+	* win_iconv.c: patch from Tor Lillqvist (with alteration)
+
+2007-09-04  Yukihiro Nakadaira
+
+	* : Initial import
+ 

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/iconv.def
===================================================================
--- lib/3rdparty/libwin-iconv/iconv.def	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/iconv.def	(rÃ©vision 62573)
@@ -0,0 +1,23 @@
+EXPORTS
+  iconv
+  iconv_open
+  iconv_close
+  iconvctl
+  libiconv=iconv
+  libiconv_open=iconv_open
+  libiconv_close=iconv_close
+  libiconvctl=iconvctl
+;; libiconv-1.11.dll
+;; TODO for binary compatibility
+;  _libiconv_version @1
+;  aliases2_lookup @2
+;  aliases_lookup @3
+;  iconv_canonicalize @4
+;  libiconv @5
+;  libiconv_close @6
+;  libiconv_open @7
+;  libiconv_relocate @8
+;  libiconv_set_relocation_prefix @9
+;  libiconvctl @10
+;  libiconvlist @11
+;  locale_charset @12

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/iconv.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/iconv.h
===================================================================
--- lib/3rdparty/libwin-iconv/iconv.h	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/iconv.h	(rÃ©vision 62573)
@@ -0,0 +1,14 @@
+#ifndef _LIBICONV_H
+#define _LIBICONV_H
+#include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef void* iconv_t;
+iconv_t iconv_open(const char *tocode, const char *fromcode);
+int iconv_close(iconv_t cd);
+size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+#ifdef __cplusplus
+}
+#endif
+#endif

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/iconv.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/mlang.def
===================================================================
--- lib/3rdparty/libwin-iconv/mlang.def	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/mlang.def	(rÃ©vision 62573)
@@ -0,0 +1,11 @@
+LIBRARY MLANG.DLL
+EXPORTS
+  ConvertINetMultiByteToUnicode@24
+  ;; ConvertINetReset (not documented)
+  ConvertINetString@28
+  ConvertINetUnicodeToMultiByte@24
+  IsConvertINetStringAvailable@8
+  LcidToRfc1766A@12
+  LcidToRfc1766W@12
+  Rfc1766ToLcidA@8
+  Rfc1766ToLcidW@8

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/mlang.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/mlang.h
===================================================================
--- lib/3rdparty/libwin-iconv/mlang.h	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/mlang.h	(rÃ©vision 62573)
@@ -0,0 +1,54 @@
+HRESULT WINAPI ConvertINetString(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnSrcSize,
+    LPBYTE lpDstStr,
+    LPINT lpnDstSize
+);
+
+HRESULT WINAPI ConvertINetMultiByteToUnicode(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnMultiCharCount,
+    LPWSTR lpDstStr,
+    LPINT lpnWideCharCount
+);
+
+HRESULT WINAPI ConvertINetUnicodeToMultiByte(
+    LPDWORD lpdwMode,
+    DWORD dwEncoding,
+    LPCWSTR lpSrcStr,
+    LPINT lpnWideCharCount,
+    LPSTR lpDstStr,
+    LPINT lpnMultiCharCount
+);
+
+HRESULT WINAPI IsConvertINetStringAvailable(
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding
+);
+
+HRESULT WINAPI LcidToRfc1766A(
+    LCID Locale,
+    LPSTR pszRfc1766,
+    int nChar
+);
+
+HRESULT WINAPI LcidToRfc1766W(
+    LCID Locale,
+    LPWSTR pszRfc1766,
+    int nChar
+);
+
+HRESULT WINAPI Rfc1766ToLcidA(
+    LCID *pLocale,
+    LPSTR pszRfc1766
+);
+
+HRESULT WINAPI Rfc1766ToLcidW(
+    LCID *pLocale,
+    LPWSTR pszRfc1766
+);

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/mlang.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/readme.txt
===================================================================
--- lib/3rdparty/libwin-iconv/readme.txt	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/readme.txt	(rÃ©vision 62573)
@@ -0,0 +1,20 @@
+win_iconv is a iconv implementation using Win32 API to convert.
+
+win_iconv is placed in the public domain.
+
+ENVIRONMENT VARIABLE:
+    WINICONV_LIBICONV_DLL
+        If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
+        loading the DLL or iconv_open() failed, falls back to internal
+        conversion.  If a few DLL are specified as comma separated list,
+        the first loadable DLL is used.  The DLL should have
+        iconv_open(), iconv_close() and iconv().  Or libiconv_open(),
+        libiconv_close() and libiconv().
+        (only available when USE_LIBICONV_DLL is defined at compile time)
+
+Win32 API does not support strict encoding conversion for some codepage.
+And MLang function drop or replace invalid bytes and does not return
+useful error status as iconv.  This implementation cannot be used for
+encoding validation purpose.
+
+Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/readme.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/win_iconv.c
===================================================================
--- lib/3rdparty/libwin-iconv/win_iconv.c	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/win_iconv.c	(rÃ©vision 62573)
@@ -0,0 +1,2075 @@
+/*
+ * iconv implementation using Win32 API to convert.
+ *
+ * This file is placed in the public domain.
+ */
+
+/* for WC_NO_BEST_FIT_CHARS */
+#ifndef WINVER
+# define WINVER 0x0500
+#endif
+
+#define STRICT
+#include <windows.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef __GNUC__
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
+/* WORKAROUND: */
+#ifndef UNDER_CE
+#define GetProcAddressA GetProcAddress
+#endif
+
+#if 0
+# define MAKE_EXE
+# define MAKE_DLL
+# define USE_LIBICONV_DLL
+#endif
+
+#if !defined(DEFAULT_LIBICONV_DLL)
+# define DEFAULT_LIBICONV_DLL ""
+#endif
+
+#define MB_CHAR_MAX 16
+
+#define UNICODE_MODE_BOM_DONE   1
+#define UNICODE_MODE_SWAPPED    2
+
+#define FLAG_USE_BOM            1
+#define FLAG_TRANSLIT           2 /* //TRANSLIT */
+#define FLAG_IGNORE             4 /* //IGNORE */
+
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+
+typedef void* iconv_t;
+
+iconv_t iconv_open(const char *tocode, const char *fromcode);
+int iconv_close(iconv_t cd);
+size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+
+/* libiconv interface for vim */
+#if defined(MAKE_DLL)
+int
+iconvctl (iconv_t cd, int request, void* argument)
+{
+    /* not supported */
+    return 0;
+}
+#endif
+
+typedef struct compat_t compat_t;
+typedef struct csconv_t csconv_t;
+typedef struct rec_iconv_t rec_iconv_t;
+
+typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
+typedef int (*f_iconv_close)(iconv_t cd);
+typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+typedef int* (*f_errno)(void);
+typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
+typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
+
+#define COMPAT_IN   1
+#define COMPAT_OUT  2
+
+/* unicode mapping for compatibility with other conversion table. */
+struct compat_t {
+    uint in;
+    uint out;
+    uint flag;
+};
+
+struct csconv_t {
+    int codepage;
+    int flags;
+    f_mbtowc mbtowc;
+    f_wctomb wctomb;
+    f_mblen mblen;
+    f_flush flush;
+    DWORD mode;
+    compat_t *compat;
+};
+
+struct rec_iconv_t {
+    iconv_t cd;
+    f_iconv_close iconv_close;
+    f_iconv iconv;
+    f_errno _errno;
+    csconv_t from;
+    csconv_t to;
+#if defined(USE_LIBICONV_DLL)
+    HMODULE hlibiconv;
+#endif
+};
+
+static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
+static int win_iconv_close(iconv_t cd);
+static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+
+static int load_mlang(void);
+static int make_csconv(const char *name, csconv_t *cv);
+static int name_to_codepage(const char *name);
+static uint utf16_to_ucs4(const ushort *wbuf);
+static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
+static int mbtowc_flags(int codepage);
+static int must_use_null_useddefaultchar(int codepage);
+static char *strrstr(const char *str, const char *token);
+static char *xstrndup(const char *s, size_t n);
+static int seterror(int err);
+
+#if defined(USE_LIBICONV_DLL)
+static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
+static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
+static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
+
+static HMODULE hwiniconv;
+#endif
+
+static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+
+static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
+
+static struct {
+    int codepage;
+    const char *name;
+} codepage_alias[] = {
+    {65001, "CP65001"},
+    {65001, "UTF8"},
+    {65001, "UTF-8"},
+
+    {1200, "CP1200"},
+    {1200, "UTF16LE"},
+    {1200, "UTF-16LE"},
+    {1200, "UCS2LE"},
+    {1200, "UCS-2LE"},
+
+    {1201, "CP1201"},
+    {1201, "UTF16BE"},
+    {1201, "UTF-16BE"},
+    {1201, "UCS2BE"},
+    {1201, "UCS-2BE"},
+    {1201, "unicodeFFFE"},
+
+    {12000, "CP12000"},
+    {12000, "UTF32LE"},
+    {12000, "UTF-32LE"},
+    {12000, "UCS4LE"},
+    {12000, "UCS-4LE"},
+
+    {12001, "CP12001"},
+    {12001, "UTF32BE"},
+    {12001, "UTF-32BE"},
+    {12001, "UCS4BE"},
+    {12001, "UCS-4BE"},
+
+#ifndef GLIB_COMPILATION
+    /*
+     * Default is big endian.
+     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
+     */
+    {1201, "UTF16"},
+    {1201, "UTF-16"},
+    {1201, "UCS2"},
+    {1201, "UCS-2"},
+    {12001, "UTF32"},
+    {12001, "UTF-32"},
+    {12001, "UCS-4"},
+    {12001, "UCS4"},
+#else
+    /* Default is little endian, because the platform is */
+    {1200, "UTF16"},
+    {1200, "UTF-16"},
+    {1200, "UCS2"},
+    {1200, "UCS-2"},
+    {12000, "UTF32"},
+    {12000, "UTF-32"},
+    {12000, "UCS4"},
+    {12000, "UCS-4"},
+#endif
+
+    /* copy from libiconv `iconv -l` */
+    /* !IsValidCodePage(367) */
+    {20127, "ANSI_X3.4-1968"},
+    {20127, "ANSI_X3.4-1986"},
+    {20127, "ASCII"},
+    {20127, "CP367"},
+    {20127, "IBM367"},
+    {20127, "ISO-IR-6"},
+    {20127, "ISO646-US"},
+    {20127, "ISO_646.IRV:1991"},
+    {20127, "US"},
+    {20127, "US-ASCII"},
+    {20127, "CSASCII"},
+
+    /* !IsValidCodePage(819) */
+    {1252, "CP819"},
+    {1252, "IBM819"},
+    {28591, "ISO-8859-1"},
+    {28591, "ISO-IR-100"},
+    {28591, "ISO8859-1"},
+    {28591, "ISO_8859-1"},
+    {28591, "ISO_8859-1:1987"},
+    {28591, "L1"},
+    {28591, "LATIN1"},
+    {28591, "CSISOLATIN1"},
+
+    {1250, "CP1250"},
+    {1250, "MS-EE"},
+    {1250, "WINDOWS-1250"},
+
+    {1251, "CP1251"},
+    {1251, "MS-CYRL"},
+    {1251, "WINDOWS-1251"},
+
+    {1252, "CP1252"},
+    {1252, "MS-ANSI"},
+    {1252, "WINDOWS-1252"},
+
+    {1253, "CP1253"},
+    {1253, "MS-GREEK"},
+    {1253, "WINDOWS-1253"},
+
+    {1254, "CP1254"},
+    {1254, "MS-TURK"},
+    {1254, "WINDOWS-1254"},
+
+    {1255, "CP1255"},
+    {1255, "MS-HEBR"},
+    {1255, "WINDOWS-1255"},
+
+    {1256, "CP1256"},
+    {1256, "MS-ARAB"},
+    {1256, "WINDOWS-1256"},
+
+    {1257, "CP1257"},
+    {1257, "WINBALTRIM"},
+    {1257, "WINDOWS-1257"},
+
+    {1258, "CP1258"},
+    {1258, "WINDOWS-1258"},
+
+    {850, "850"},
+    {850, "CP850"},
+    {850, "IBM850"},
+    {850, "CSPC850MULTILINGUAL"},
+
+    /* !IsValidCodePage(862) */
+    {862, "862"},
+    {862, "CP862"},
+    {862, "IBM862"},
+    {862, "CSPC862LATINHEBREW"},
+
+    {866, "866"},
+    {866, "CP866"},
+    {866, "IBM866"},
+    {866, "CSIBM866"},
+
+    /* !IsValidCodePage(154) */
+    {154, "CP154"},
+    {154, "CYRILLIC-ASIAN"},
+    {154, "PT154"},
+    {154, "PTCP154"},
+    {154, "CSPTCP154"},
+
+    /* !IsValidCodePage(1133) */
+    {1133, "CP1133"},
+    {1133, "IBM-CP1133"},
+
+    {874, "CP874"},
+    {874, "WINDOWS-874"},
+
+    /* !IsValidCodePage(51932) */
+    {51932, "CP51932"},
+    {51932, "MS51932"},
+    {51932, "WINDOWS-51932"},
+    {51932, "EUC-JP"},
+
+    {932, "CP932"},
+    {932, "MS932"},
+    {932, "SHIFFT_JIS"},
+    {932, "SHIFFT_JIS-MS"},
+    {932, "SJIS"},
+    {932, "SJIS-MS"},
+    {932, "SJIS-OPEN"},
+    {932, "SJIS-WIN"},
+    {932, "WINDOWS-31J"},
+    {932, "WINDOWS-932"},
+    {932, "CSWINDOWS31J"},
+
+    {50221, "CP50221"},
+    {50221, "ISO-2022-JP"},
+    {50221, "ISO-2022-JP-MS"},
+    {50221, "ISO2022-JP"},
+    {50221, "ISO2022-JP-MS"},
+    {50221, "MS50221"},
+    {50221, "WINDOWS-50221"},
+
+    {936, "CP936"},
+    {936, "GBK"},
+    {936, "MS936"},
+    {936, "WINDOWS-936"},
+
+    {950, "CP950"},
+    {950, "BIG5"},
+    {950, "BIG5HKSCS"},
+    {950, "BIG5-HKSCS"},
+
+    {949, "CP949"},
+    {949, "UHC"},
+    {949, "EUC-KR"},
+
+    {1361, "CP1361"},
+    {1361, "JOHAB"},
+
+    {437, "437"},
+    {437, "CP437"},
+    {437, "IBM437"},
+    {437, "CSPC8CODEPAGE437"},
+
+    {737, "CP737"},
+
+    {775, "CP775"},
+    {775, "IBM775"},
+    {775, "CSPC775BALTIC"},
+
+    {852, "852"},
+    {852, "CP852"},
+    {852, "IBM852"},
+    {852, "CSPCP852"},
+
+    /* !IsValidCodePage(853) */
+    {853, "CP853"},
+
+    {855, "855"},
+    {855, "CP855"},
+    {855, "IBM855"},
+    {855, "CSIBM855"},
+
+    {857, "857"},
+    {857, "CP857"},
+    {857, "IBM857"},
+    {857, "CSIBM857"},
+
+    /* !IsValidCodePage(858) */
+    {858, "CP858"},
+
+    {860, "860"},
+    {860, "CP860"},
+    {860, "IBM860"},
+    {860, "CSIBM860"},
+
+    {861, "861"},
+    {861, "CP-IS"},
+    {861, "CP861"},
+    {861, "IBM861"},
+    {861, "CSIBM861"},
+
+    {863, "863"},
+    {863, "CP863"},
+    {863, "IBM863"},
+    {863, "CSIBM863"},
+
+    {864, "CP864"},
+    {864, "IBM864"},
+    {864, "CSIBM864"},
+
+    {865, "865"},
+    {865, "CP865"},
+    {865, "IBM865"},
+    {865, "CSIBM865"},
+
+    {869, "869"},
+    {869, "CP-GR"},
+    {869, "CP869"},
+    {869, "IBM869"},
+    {869, "CSIBM869"},
+
+    /* !IsValidCodePage(1152) */
+    {1125, "CP1125"},
+
+    /*
+     * Code Page Identifiers
+     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
+     */
+    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
+    {437, "IBM437"}, /* OEM United States */
+    {500, "IBM500"}, /* IBM EBCDIC International */
+    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
+    /* 709 		Arabic (ASMO-449+, BCON V4) */
+    /* 710 		Arabic - Transparent Arabic */
+    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
+    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
+    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
+    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
+    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
+    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
+    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
+    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
+    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
+    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
+    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
+    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
+    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
+    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
+    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
+    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
+    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
+    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
+    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
+    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
+    {932, "shift-jis"}, /* alternative name for it */
+    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
+    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
+    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
+    {950, "big5hkscs"}, /* ANSI/OEM Traditional Chinese (Hong Kong SAR); Chinese Traditional (Big5-HKSCS) */
+    {950, "big5-hkscs"}, /* alternative name for it */
+    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
+    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
+    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
+    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
+    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
+    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
+    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
+    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
+    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
+    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
+    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
+    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
+    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
+    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
+    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
+    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
+    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
+    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
+    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
+    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
+    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
+    {1361, "Johab"}, /* Korean (Johab) */
+    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
+    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
+    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
+    {10003, "x-mac-korean"}, /* Korean (Mac) */
+    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
+    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
+    {10006, "x-mac-greek"}, /* Greek (Mac) */
+    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
+    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
+    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
+    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
+    {10021, "x-mac-thai"}, /* Thai (Mac) */
+    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
+    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
+    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
+    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
+    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
+    {20001, "x-cp20001"}, /* TCA Taiwan */
+    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
+    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
+    {20004, "x-cp20004"}, /* TeleText Taiwan */
+    {20005, "x-cp20005"}, /* Wang Taiwan */
+    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
+    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
+    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
+    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
+    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
+    {20261, "x-cp20261"}, /* T.61 */
+    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
+    {20273, "IBM273"}, /* IBM EBCDIC Germany */
+    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
+    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
+    {20280, "IBM280"}, /* IBM EBCDIC Italy */
+    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
+    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
+    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
+    {20297, "IBM297"}, /* IBM EBCDIC France */
+    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
+    {20423, "IBM423"}, /* IBM EBCDIC Greek */
+    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
+    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
+    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
+    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
+    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
+    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
+    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
+    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
+    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
+    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
+    {20949, "x-cp20949"}, /* Korean Wansung */
+    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
+    /* 21027 		(deprecated) */
+    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
+    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
+    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
+    {28591, "iso_8859-1"},
+    {28591, "iso_8859_1"},
+    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
+    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
+    {28592, "iso_8859-2"},
+    {28592, "iso_8859_2"},
+    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
+    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
+    {28593, "iso_8859-3"},
+    {28593, "iso_8859_3"},
+    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
+    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
+    {28594, "iso_8859-4"},
+    {28594, "iso_8859_4"},
+    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
+    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
+    {28595, "iso_8859-5"},
+    {28595, "iso_8859_5"},
+    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
+    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
+    {28596, "iso_8859-6"},
+    {28596, "iso_8859_6"},
+    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
+    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
+    {28597, "iso_8859-7"},
+    {28597, "iso_8859_7"},
+    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
+    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
+    {28598, "iso_8859-8"},
+    {28598, "iso_8859_8"},
+    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
+    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
+    {28599, "iso_8859-9"},
+    {28599, "iso_8859_9"},
+    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
+    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
+    {28603, "iso_8859-13"},
+    {28603, "iso_8859_13"},
+    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
+    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
+    {28605, "iso_8859-15"},
+    {28605, "iso_8859_15"},
+    {29001, "x-Europa"}, /* Europa 3 */
+    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
+    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
+    {38598, "iso_8859-8-i"},
+    {38598, "iso_8859_8-i"},
+    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
+    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
+    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
+    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
+    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
+    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
+    /* 50229 		ISO 2022 Traditional Chinese */
+    /* 50930 		EBCDIC Japanese (Katakana) Extended */
+    /* 50931 		EBCDIC US-Canada and Japanese */
+    /* 50933 		EBCDIC Korean Extended and Korean */
+    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
+    /* 50936 		EBCDIC Simplified Chinese */
+    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
+    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
+    {51932, "euc-jp"}, /* EUC Japanese */
+    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
+    {51949, "euc-kr"}, /* EUC Korean */
+    /* 51950 		EUC Traditional Chinese */
+    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
+    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
+    {57002, "x-iscii-de"}, /* ISCII Devanagari */
+    {57003, "x-iscii-be"}, /* ISCII Bengali */
+    {57004, "x-iscii-ta"}, /* ISCII Tamil */
+    {57005, "x-iscii-te"}, /* ISCII Telugu */
+    {57006, "x-iscii-as"}, /* ISCII Assamese */
+    {57007, "x-iscii-or"}, /* ISCII Oriya */
+    {57008, "x-iscii-ka"}, /* ISCII Kannada */
+    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
+    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
+    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
+
+    {0, NULL}
+};
+
+/*
+ * SJIS SHIFTJIS table              CP932 table
+ * ---- --------------------------- --------------------------------
+ *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
+ *   7E U+203E OVERLINE             U+007E TILDE
+ * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
+ * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
+ * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
+ * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
+ * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
+ * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
+ * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
+ * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
+ *
+ * EUC-JP and ISO-2022-JP should be compatible with CP932.
+ *
+ * Kernel and MLang have different Unicode mapping table.  Make sure
+ * which API is used.
+ */
+static compat_t cp932_compat[] = {
+    {0x00A5, 0x005C, COMPAT_OUT},
+    {0x203E, 0x007E, COMPAT_OUT},
+    {0x2014, 0x2015, COMPAT_OUT},
+    {0x301C, 0xFF5E, COMPAT_OUT},
+    {0x2016, 0x2225, COMPAT_OUT},
+    {0x2212, 0xFF0D, COMPAT_OUT},
+    {0x00A2, 0xFFE0, COMPAT_OUT},
+    {0x00A3, 0xFFE1, COMPAT_OUT},
+    {0x00AC, 0xFFE2, COMPAT_OUT},
+    {0, 0, 0}
+};
+
+static compat_t cp20932_compat[] = {
+    {0x00A5, 0x005C, COMPAT_OUT},
+    {0x203E, 0x007E, COMPAT_OUT},
+    {0x2014, 0x2015, COMPAT_OUT},
+    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
+    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
+    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
+    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
+    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
+    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
+    {0, 0, 0}
+};
+
+static compat_t *cp51932_compat = cp932_compat;
+
+/* cp20932_compat for kernel.  cp932_compat for mlang. */
+static compat_t *cp5022x_compat = cp932_compat;
+
+typedef HRESULT (WINAPI *CONVERTINETSTRING)(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnSrcSize,
+    LPBYTE lpDstStr,
+    LPINT lpnDstSize
+);
+typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnMultiCharCount,
+    LPWSTR lpDstStr,
+    LPINT lpnWideCharCount
+);
+typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
+    LPDWORD lpdwMode,
+    DWORD dwEncoding,
+    LPCWSTR lpSrcStr,
+    LPINT lpnWideCharCount,
+    LPSTR lpDstStr,
+    LPINT lpnMultiCharCount
+);
+typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding
+);
+typedef HRESULT (WINAPI *LCIDTORFC1766A)(
+    LCID Locale,
+    LPSTR pszRfc1766,
+    int nChar
+);
+typedef HRESULT (WINAPI *LCIDTORFC1766W)(
+    LCID Locale,
+    LPWSTR pszRfc1766,
+    int nChar
+);
+typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
+    LCID *pLocale,
+    LPSTR pszRfc1766
+);
+typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
+    LCID *pLocale,
+    LPWSTR pszRfc1766
+);
+static CONVERTINETSTRING ConvertINetString;
+static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
+static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
+static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
+static LCIDTORFC1766A LcidToRfc1766A;
+static RFC1766TOLCIDA Rfc1766ToLcidA;
+
+static int
+load_mlang(void)
+{
+    HMODULE h;
+    if (ConvertINetString != NULL)
+        return TRUE;
+    h = LoadLibrary(TEXT("mlang.dll"));
+    if (!h)
+        return FALSE;
+    ConvertINetString = (CONVERTINETSTRING)GetProcAddressA(h, "ConvertINetString");
+    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddressA(h, "ConvertINetMultiByteToUnicode");
+    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddressA(h, "ConvertINetUnicodeToMultiByte");
+    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddressA(h, "IsConvertINetStringAvailable");
+    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddressA(h, "LcidToRfc1766A");
+    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddressA(h, "Rfc1766ToLcidA");
+    return TRUE;
+}
+
+iconv_t
+iconv_open(const char *tocode, const char *fromcode)
+{
+    rec_iconv_t *cd;
+
+    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
+    if (cd == NULL)
+        return (iconv_t)(-1);
+
+#if defined(USE_LIBICONV_DLL)
+    errno = 0;
+    if (libiconv_iconv_open(cd, tocode, fromcode))
+        return (iconv_t)cd;
+#endif
+
+    /* reset the errno to prevent reporting wrong error code.
+     * 0 for unsorted error. */
+    errno = 0;
+    if (win_iconv_open(cd, tocode, fromcode))
+        return (iconv_t)cd;
+
+    free(cd);
+
+    return (iconv_t)(-1);
+}
+
+int
+iconv_close(iconv_t _cd)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    int r = cd->iconv_close(cd->cd);
+    int e = *(cd->_errno());
+#if defined(USE_LIBICONV_DLL)
+    if (cd->hlibiconv != NULL)
+        FreeLibrary(cd->hlibiconv);
+#endif
+    free(cd);
+    errno = e;
+    return r;
+}
+
+size_t
+iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
+    errno = *(cd->_errno());
+    return r;
+}
+
+static int
+win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
+{
+    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
+        return FALSE;
+    cd->iconv_close = win_iconv_close;
+    cd->iconv = win_iconv;
+    cd->_errno = _errno;
+    cd->cd = (iconv_t)cd;
+    return TRUE;
+}
+
+static int
+win_iconv_close(iconv_t cd UNUSED)
+{
+    return 0;
+}
+
+static size_t
+win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
+    int insize;
+    int outsize;
+    int wsize;
+    DWORD frommode;
+    DWORD tomode;
+    uint wc;
+    compat_t *cp;
+    int i;
+
+    if (inbuf == NULL || *inbuf == NULL)
+    {
+        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
+        {
+            tomode = cd->to.mode;
+            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
+            if (outsize == -1)
+            {
+                if ((cd->to.flags & FLAG_IGNORE) && errno != E2BIG)
+                {
+                    outsize = 0;
+                }
+                else
+                {
+                    cd->to.mode = tomode;
+                    return (size_t)(-1);
+                }
+            }
+            *outbuf += outsize;
+            *outbytesleft -= outsize;
+        }
+        cd->from.mode = 0;
+        cd->to.mode = 0;
+        return 0;
+    }
+
+    while (*inbytesleft != 0)
+    {
+        frommode = cd->from.mode;
+        tomode = cd->to.mode;
+        wsize = MB_CHAR_MAX;
+
+        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
+        if (insize == -1)
+        {
+            if (cd->to.flags & FLAG_IGNORE)
+            {
+                cd->from.mode = frommode;
+                insize = 1;
+                wsize = 0;
+            }
+            else
+            {
+                cd->from.mode = frommode;
+                return (size_t)(-1);
+            }
+        }
+
+        if (wsize == 0)
+        {
+            *inbuf += insize;
+            *inbytesleft -= insize;
+            continue;
+        }
+
+        if (cd->from.compat != NULL)
+        {
+            wc = utf16_to_ucs4(wbuf);
+            cp = cd->from.compat;
+            for (i = 0; cp[i].in != 0; ++i)
+            {
+                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
+                {
+                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
+                    break;
+                }
+            }
+        }
+
+        if (cd->to.compat != NULL)
+        {
+            wc = utf16_to_ucs4(wbuf);
+            cp = cd->to.compat;
+            for (i = 0; cp[i].in != 0; ++i)
+            {
+                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
+                {
+                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
+                    break;
+                }
+            }
+        }
+
+        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
+        if (outsize == -1)
+        {
+            if ((cd->to.flags & FLAG_IGNORE) && errno != E2BIG)
+            {
+                cd->to.mode = tomode;
+                outsize = 0;
+            }
+            else
+            {
+                cd->from.mode = frommode;
+                cd->to.mode = tomode;
+                return (size_t)(-1);
+            }
+        }
+
+        *inbuf += insize;
+        *outbuf += outsize;
+        *inbytesleft -= insize;
+        *outbytesleft -= outsize;
+    }
+
+    return 0;
+}
+
+static int
+make_csconv(const char *_name, csconv_t *cv)
+{
+    CPINFO cpinfo;
+    int use_compat = TRUE;
+    int flag = 0;
+    char *name;
+    char *p;
+
+    name = xstrndup(_name, strlen(_name));
+    if (name == NULL)
+        return FALSE;
+
+    /* check for option "enc_name//opt1//opt2" */
+    while ((p = strrstr(name, "//")) != NULL)
+    {
+        if (_stricmp(p + 2, "nocompat") == 0)
+            use_compat = FALSE;
+        else if (_stricmp(p + 2, "translit") == 0)
+            flag |= FLAG_TRANSLIT;
+        else if (_stricmp(p + 2, "ignore") == 0)
+            flag |= FLAG_IGNORE;
+        *p = 0;
+    }
+
+    cv->mode = 0;
+    cv->flags = flag;
+    cv->mblen = NULL;
+    cv->flush = NULL;
+    cv->compat = NULL;
+    cv->codepage = name_to_codepage(name);
+    if (cv->codepage == 1200 || cv->codepage == 1201)
+    {
+        cv->mbtowc = utf16_mbtowc;
+        cv->wctomb = utf16_wctomb;
+        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0 ||
+          _stricmp(name, "UCS-2") == 0 || _stricmp(name, "UCS2") == 0)
+            cv->flags |= FLAG_USE_BOM;
+    }
+    else if (cv->codepage == 12000 || cv->codepage == 12001)
+    {
+        cv->mbtowc = utf32_mbtowc;
+        cv->wctomb = utf32_wctomb;
+        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0 ||
+          _stricmp(name, "UCS-4") == 0 || _stricmp(name, "UCS4") == 0)
+            cv->flags |= FLAG_USE_BOM;
+    }
+    else if (cv->codepage == 65001)
+    {
+        cv->mbtowc = kernel_mbtowc;
+        cv->wctomb = kernel_wctomb;
+        cv->mblen = utf8_mblen;
+    }
+    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
+    {
+        cv->mbtowc = iso2022jp_mbtowc;
+        cv->wctomb = iso2022jp_wctomb;
+        cv->flush = iso2022jp_flush;
+    }
+    else if (cv->codepage == 51932 && load_mlang())
+    {
+        cv->mbtowc = mlang_mbtowc;
+        cv->wctomb = mlang_wctomb;
+        cv->mblen = eucjp_mblen;
+    }
+    else if (IsValidCodePage(cv->codepage)
+	     && GetCPInfo(cv->codepage, &cpinfo) != 0)
+    {
+        cv->mbtowc = kernel_mbtowc;
+        cv->wctomb = kernel_wctomb;
+        if (cpinfo.MaxCharSize == 1)
+            cv->mblen = sbcs_mblen;
+        else if (cpinfo.MaxCharSize == 2)
+            cv->mblen = dbcs_mblen;
+        else
+	    cv->mblen = mbcs_mblen;
+    }
+    else
+    {
+        /* not supported */
+        free(name);
+        errno = EINVAL;
+        return FALSE;
+    }
+
+    if (use_compat)
+    {
+        switch (cv->codepage)
+        {
+        case 932: cv->compat = cp932_compat; break;
+        case 20932: cv->compat = cp20932_compat; break;
+        case 51932: cv->compat = cp51932_compat; break;
+        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
+        }
+    }
+
+    free(name);
+
+    return TRUE;
+}
+
+static int
+name_to_codepage(const char *name)
+{
+    int i;
+
+    if (*name == '\0' ||
+	strcmp(name, "char") == 0)
+        return GetACP();
+    else if (strcmp(name, "wchar_t") == 0)
+        return 1200;
+    else if (_strnicmp(name, "cp", 2) == 0)
+        return atoi(name + 2); /* CP123 */
+    else if ('0' <= name[0] && name[0] <= '9')
+        return atoi(name);     /* 123 */
+    else if (_strnicmp(name, "xx", 2) == 0)
+        return atoi(name + 2); /* XX123 for debug */
+
+    for (i = 0; codepage_alias[i].name != NULL; ++i)
+        if (_stricmp(name, codepage_alias[i].name) == 0)
+            return codepage_alias[i].codepage;
+    return -1;
+}
+
+/*
+ * http://www.faqs.org/rfcs/rfc2781.html
+ */
+static uint
+utf16_to_ucs4(const ushort *wbuf)
+{
+    uint wc = wbuf[0];
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
+    return wc;
+}
+
+static void
+ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
+{
+    if (wc < 0x10000)
+    {
+        wbuf[0] = wc;
+        *wbufsize = 1;
+    }
+    else
+    {
+        wc -= 0x10000;
+        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
+        wbuf[1] = 0xDC00 | (wc & 0x3FF);
+        *wbufsize = 2;
+    }
+}
+
+/*
+ * Check if codepage is one of those for which the dwFlags parameter
+ * to MultiByteToWideChar() must be zero. Return zero or
+ * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
+ * Server 2003 R2 claims that also codepage 65001 is one of these, but
+ * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
+ * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
+ * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
+ * from UTF-8.
+ */
+static int
+mbtowc_flags(int codepage)
+{
+    return (codepage == 50220 || codepage == 50221 ||
+	    codepage == 50222 || codepage == 50225 ||
+	    codepage == 50227 || codepage == 50229 ||
+	    codepage == 52936 || codepage == 54936 ||
+	    (codepage >= 57002 && codepage <= 57011) ||
+	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
+}
+
+/*
+ * Check if codepage is one those for which the lpUsedDefaultChar
+ * parameter to WideCharToMultiByte() must be NULL.  The docs in
+ * Platform SDK for for Windows Server 2003 R2 claims that this is the
+ * list below, while the MSDN docs for MSVS2008 claim that it is only
+ * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
+ * SDK seems to be correct, at least for XP.
+ */
+static int
+must_use_null_useddefaultchar(int codepage)
+{
+    return (codepage == 65000 || codepage == 65001 ||
+            codepage == 50220 || codepage == 50221 ||
+            codepage == 50222 || codepage == 50225 ||
+            codepage == 50227 || codepage == 50229 ||
+            codepage == 52936 || codepage == 54936 ||
+            (codepage >= 57002 && codepage <= 57011) ||
+            codepage == 42);
+}
+
+static char *
+strrstr(const char *str, const char *token)
+{
+    int len = strlen(token);
+    const char *p = str + strlen(str);
+
+    while (str <= --p)
+        if (p[0] == token[0] && strncmp(p, token, len) == 0)
+            return (char *)p;
+    return NULL;
+}
+
+static char *
+xstrndup(const char *s, size_t n)
+{
+    char *p;
+
+    p = (char *)malloc(n + 1);
+    if (p == NULL)
+        return NULL;
+    memcpy(p, s, n);
+    p[n] = '\0';
+    return p;
+}
+
+static int
+seterror(int err)
+{
+    errno = err;
+    return -1;
+}
+
+#if defined(USE_LIBICONV_DLL)
+static int
+libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
+{
+    HMODULE hlibiconv = NULL;
+    HMODULE hmsvcrt = NULL;
+    char *dllname;
+    const char *p;
+    const char *e;
+    f_iconv_open _iconv_open;
+
+    /*
+     * always try to load dll, so that we can switch dll in runtime.
+     */
+
+    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
+    p = getenv("WINICONV_LIBICONV_DLL");
+    if (p == NULL)
+        p = DEFAULT_LIBICONV_DLL;
+    /* parse comma separated value */
+    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
+    {
+        e = strchr(p, ',');
+        if (p == e)
+            continue;
+        else if (e == NULL)
+            e = p + strlen(p);
+        dllname = xstrndup(p, e - p);
+        if (dllname == NULL)
+            return FALSE;
+        hlibiconv = LoadLibraryA(dllname);
+        free(dllname);
+        if (hlibiconv != NULL)
+        {
+            if (hlibiconv == hwiniconv)
+            {
+                FreeLibrary(hlibiconv);
+                hlibiconv = NULL;
+                continue;
+            }
+            break;
+        }
+    }
+
+    if (hlibiconv == NULL)
+        goto failed;
+
+    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
+    if (hmsvcrt == NULL)
+        goto failed;
+
+    _iconv_open = (f_iconv_open)GetProcAddressA(hlibiconv, "libiconv_open");
+    if (_iconv_open == NULL)
+        _iconv_open = (f_iconv_open)GetProcAddressA(hlibiconv, "iconv_open");
+    cd->iconv_close = (f_iconv_close)GetProcAddressA(hlibiconv, "libiconv_close");
+    if (cd->iconv_close == NULL)
+        cd->iconv_close = (f_iconv_close)GetProcAddressA(hlibiconv, "iconv_close");
+    cd->iconv = (f_iconv)GetProcAddressA(hlibiconv, "libiconv");
+    if (cd->iconv == NULL)
+        cd->iconv = (f_iconv)GetProcAddressA(hlibiconv, "iconv");
+    cd->_errno = (f_errno)GetProcAddressA(hmsvcrt, "_errno");
+    if (_iconv_open == NULL || cd->iconv_close == NULL
+            || cd->iconv == NULL || cd->_errno == NULL)
+        goto failed;
+
+    cd->cd = _iconv_open(tocode, fromcode);
+    if (cd->cd == (iconv_t)(-1))
+        goto failed;
+
+    cd->hlibiconv = hlibiconv;
+    return TRUE;
+
+failed:
+    if (hlibiconv != NULL)
+        FreeLibrary(hlibiconv);
+    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
+    return FALSE;
+}
+
+/*
+ * Reference:
+ * http://forums.belution.com/ja/vc/000/234/78s.shtml
+ * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
+ *
+ * The formal way is
+ *   imagehlp.h or dbghelp.h
+ *   imagehlp.lib or dbghelp.lib
+ *   ImageDirectoryEntryToData()
+ */
+#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
+#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
+static PVOID
+MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
+{
+    /* TODO: MappedAsImage? */
+    PIMAGE_DATA_DIRECTORY p;
+    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
+    if (p->VirtualAddress == 0) {
+      *Size = 0;
+      return NULL;
+    }
+    *Size = p->Size;
+    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
+}
+
+static HMODULE
+find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
+{
+    DWORD_PTR Base;
+    ULONG Size;
+    PIMAGE_IMPORT_DESCRIPTOR Imp;
+    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
+    PIMAGE_IMPORT_BY_NAME ImpName;
+
+    Base = (DWORD_PTR)hModule;
+    Imp = (PIMAGE_IMPORT_DESCRIPTOR)MyImageDirectoryEntryToData(
+            (LPVOID)Base,
+            TRUE,
+            IMAGE_DIRECTORY_ENTRY_IMPORT,
+            &Size);
+    if (Imp == NULL)
+        return NULL;
+    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
+    {
+        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
+        for ( ; Name->u1.Ordinal != 0; ++Name)
+        {
+            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
+            {
+                ImpName = (PIMAGE_IMPORT_BY_NAME)
+                    (Base + (DWORD_PTR)Name->u1.AddressOfData);
+                if (strcmp((char *)ImpName->Name, funcname) == 0)
+                    return GetModuleHandleA((char *)(Base + Imp->Name));
+            }
+        }
+    }
+    return NULL;
+}
+#endif
+
+static int
+sbcs_mblen(csconv_t *cv UNUSED, const uchar *buf UNUSED, int bufsize UNUSED)
+{
+    return 1;
+}
+
+static int
+dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
+    if (bufsize < len)
+        return seterror(EINVAL);
+    return len;
+}
+
+static int
+mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = 0;
+
+    if (cv->codepage == 54936) {
+	if (buf[0] <= 0x7F) len = 1;
+	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
+		 bufsize >= 2 &&
+		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
+		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
+	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
+		 bufsize >= 4 &&
+		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
+	else
+	    return seterror(EINVAL);
+	return len;
+    }
+    else
+	return seterror(EINVAL);
+}
+
+static int
+utf8_mblen(csconv_t *cv UNUSED, const uchar *buf, int bufsize)
+{
+    int len = 0;
+
+    if (buf[0] < 0x80) len = 1;
+    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
+    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
+    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
+    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
+    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
+
+    if (len == 0)
+        return seterror(EILSEQ);
+    else if (bufsize < len)
+        return seterror(EINVAL);
+    return len;
+}
+
+static int
+eucjp_mblen(csconv_t *cv UNUSED, const uchar *buf, int bufsize)
+{
+    if (buf[0] < 0x80) /* ASCII */
+        return 1;
+    else if (buf[0] == 0x8E) /* JIS X 0201 */
+    {
+        if (bufsize < 2)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
+            return seterror(EILSEQ);
+        return 2;
+    }
+    else if (buf[0] == 0x8F) /* JIS X 0212 */
+    {
+        if (bufsize < 3)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
+                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
+            return seterror(EILSEQ);
+        return 3;
+    }
+    else /* JIS X 0208 */
+    {
+        if (bufsize < 2)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
+                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
+            return seterror(EILSEQ);
+        return 2;
+    }
+}
+
+static int
+kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int len;
+
+    len = cv->mblen(cv, buf, bufsize);
+    if (len == -1)
+        return -1;
+    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
+            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
+    if (*wbufsize == 0)
+        return seterror(EILSEQ);
+    return len;
+}
+
+static int
+kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    BOOL usedDefaultChar = 0;
+    BOOL *p = NULL;
+    int flags = 0;
+    int len;
+
+    if (bufsize == 0)
+        return seterror(E2BIG);
+    if (!must_use_null_useddefaultchar(cv->codepage))
+    {
+        p = &usedDefaultChar;
+#ifdef WC_NO_BEST_FIT_CHARS
+        if (!(cv->flags & FLAG_TRANSLIT))
+            flags |= WC_NO_BEST_FIT_CHARS;
+#endif
+    }
+    len = WideCharToMultiByte(cv->codepage, flags,
+            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
+    if (len == 0)
+    {
+        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+            return seterror(E2BIG);
+        return seterror(EILSEQ);
+    }
+    else if (usedDefaultChar && !(cv->flags & FLAG_TRANSLIT))
+        return seterror(EILSEQ);
+    else if (cv->mblen(cv, buf, len) != len) /* validate result */
+        return seterror(EILSEQ);
+    return len;
+}
+
+/*
+ * It seems that the mode (cv->mode) is fixnum.
+ * For example, when converting iso-2022-jp(cp50221) to unicode:
+ *      in ascii sequence: mode=0xC42C0000
+ *   in jisx0208 sequence: mode=0xC42C0001
+ * "C42C" is same for each convert session.
+ * It should be: ((codepage-1)<<16)|state
+ */
+static int
+mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int len;
+    int insize;
+    HRESULT hr;
+
+    len = cv->mblen(cv, buf, bufsize);
+    if (len == -1)
+        return -1;
+    insize = len;
+    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
+            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
+    if (hr != S_OK || insize != len)
+        return seterror(EILSEQ);
+    return len;
+}
+
+static int
+mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
+    int tmpsize = MB_CHAR_MAX;
+    int insize = wbufsize;
+    HRESULT hr;
+
+    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
+            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
+    if (hr != S_OK || insize != wbufsize)
+        return seterror(EILSEQ);
+    else if (bufsize < tmpsize)
+        return seterror(E2BIG);
+    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
+        return seterror(EILSEQ);
+    memcpy(buf, tmpbuf, tmpsize);
+    return tmpsize;
+}
+
+static int
+utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int codepage = cv->codepage;
+
+    /* swap endian: 1200 <-> 1201 */
+    if (cv->mode & UNICODE_MODE_SWAPPED)
+        codepage ^= 1;
+
+    if (bufsize < 2)
+        return seterror(EINVAL);
+    if (codepage == 1200) /* little endian */
+        wbuf[0] = (buf[1] << 8) | buf[0];
+    else if (codepage == 1201) /* big endian */
+        wbuf[0] = (buf[0] << 8) | buf[1];
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (wbuf[0] == 0xFFFE)
+        {
+            cv->mode |= UNICODE_MODE_SWAPPED;
+            *wbufsize = 0;
+            return 2;
+        }
+        else if (wbuf[0] == 0xFEFF)
+        {
+            *wbufsize = 0;
+            return 2;
+        }
+    }
+
+    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
+        return seterror(EILSEQ);
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+    {
+        if (bufsize < 4)
+            return seterror(EINVAL);
+        if (codepage == 1200) /* little endian */
+            wbuf[1] = (buf[3] << 8) | buf[2];
+        else if (codepage == 1201) /* big endian */
+            wbuf[1] = (buf[2] << 8) | buf[3];
+        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
+            return seterror(EILSEQ);
+        *wbufsize = 2;
+        return 4;
+    }
+    *wbufsize = 1;
+    return 2;
+}
+
+static int
+utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        int r;
+
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (bufsize < 2)
+            return seterror(E2BIG);
+        if (cv->codepage == 1200) /* little endian */
+            memcpy(buf, "\xFF\xFE", 2);
+        else if (cv->codepage == 1201) /* big endian */
+            memcpy(buf, "\xFE\xFF", 2);
+
+        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
+        if (r == -1)
+            return -1;
+        return r + 2;
+    }
+
+    if (bufsize < 2)
+        return seterror(E2BIG);
+    if (cv->codepage == 1200) /* little endian */
+    {
+        buf[0] = (wbuf[0] & 0x00FF);
+        buf[1] = (wbuf[0] & 0xFF00) >> 8;
+    }
+    else if (cv->codepage == 1201) /* big endian */
+    {
+        buf[0] = (wbuf[0] & 0xFF00) >> 8;
+        buf[1] = (wbuf[0] & 0x00FF);
+    }
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+    {
+        if (bufsize < 4)
+            return seterror(E2BIG);
+        if (cv->codepage == 1200) /* little endian */
+        {
+            buf[2] = (wbuf[1] & 0x00FF);
+            buf[3] = (wbuf[1] & 0xFF00) >> 8;
+        }
+        else if (cv->codepage == 1201) /* big endian */
+        {
+            buf[2] = (wbuf[1] & 0xFF00) >> 8;
+            buf[3] = (wbuf[1] & 0x00FF);
+        }
+        return 4;
+    }
+    return 2;
+}
+
+static int
+utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int codepage = cv->codepage;
+    uint wc;
+
+    /* swap endian: 12000 <-> 12001 */
+    if (cv->mode & UNICODE_MODE_SWAPPED)
+        codepage ^= 1;
+
+    if (bufsize < 4)
+        return seterror(EINVAL);
+    if (codepage == 12000) /* little endian */
+        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+    else if (codepage == 12001) /* big endian */
+        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (wc == 0xFFFE0000)
+        {
+            cv->mode |= UNICODE_MODE_SWAPPED;
+            *wbufsize = 0;
+            return 4;
+        }
+        else if (wc == 0x0000FEFF)
+        {
+            *wbufsize = 0;
+            return 4;
+        }
+    }
+
+    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
+        return seterror(EILSEQ);
+    ucs4_to_utf16(wc, wbuf, wbufsize);
+    return 4;
+}
+
+static int
+utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    uint wc;
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        int r;
+
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (bufsize < 4)
+            return seterror(E2BIG);
+        if (cv->codepage == 12000) /* little endian */
+            memcpy(buf, "\xFF\xFE\x00\x00", 4);
+        else if (cv->codepage == 12001) /* big endian */
+            memcpy(buf, "\x00\x00\xFE\xFF", 4);
+
+        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
+        if (r == -1)
+            return -1;
+        return r + 4;
+    }
+
+    if (bufsize < 4)
+        return seterror(E2BIG);
+    wc = utf16_to_ucs4(wbuf);
+    if (cv->codepage == 12000) /* little endian */
+    {
+        buf[0] = wc & 0x000000FF;
+        buf[1] = (wc & 0x0000FF00) >> 8;
+        buf[2] = (wc & 0x00FF0000) >> 16;
+        buf[3] = (wc & 0xFF000000) >> 24;
+    }
+    else if (cv->codepage == 12001) /* big endian */
+    {
+        buf[0] = (wc & 0xFF000000) >> 24;
+        buf[1] = (wc & 0x00FF0000) >> 16;
+        buf[2] = (wc & 0x0000FF00) >> 8;
+        buf[3] = wc & 0x000000FF;
+    }
+    return 4;
+}
+
+/*
+ * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
+ * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
+ *        1 byte Kana)
+ * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
+ *        Kana - SO/SI)
+ *
+ * MultiByteToWideChar() and WideCharToMultiByte() behave differently
+ * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
+ * terminate result sequence with ascii escape.  But Vista does.
+ * Use MLang instead.
+ */
+
+#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
+#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
+#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
+
+#define ISO2022_SI  0
+#define ISO2022_SO  1
+
+/* shift in */
+static const char iso2022_SI_seq[] = "\x0F";
+/* shift out */
+static const char iso2022_SO_seq[] = "\x0E";
+
+typedef struct iso2022_esc_t iso2022_esc_t;
+struct iso2022_esc_t {
+    const char *esc;
+    int esc_len;
+    int len;
+    int cs;
+};
+
+#define ISO2022JP_CS_ASCII            0
+#define ISO2022JP_CS_JISX0201_ROMAN   1
+#define ISO2022JP_CS_JISX0201_KANA    2
+#define ISO2022JP_CS_JISX0208_1978    3
+#define ISO2022JP_CS_JISX0208_1983    4
+#define ISO2022JP_CS_JISX0212         5
+
+static iso2022_esc_t iso2022jp_esc[] = {
+    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
+    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
+    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
+    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
+    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
+    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
+    {NULL, 0, 0, 0}
+};
+
+static int
+iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    char tmp[MB_CHAR_MAX];
+    int insize;
+    HRESULT hr;
+    DWORD dummy = 0;
+    int len;
+    int esc_len;
+    int cs;
+    int shift;
+    int i;
+
+    if (buf[0] == 0x1B)
+    {
+        for (i = 0; iesc[i].esc != NULL; ++i)
+        {
+            esc_len = iesc[i].esc_len;
+            if (bufsize < esc_len)
+            {
+                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
+                    return seterror(EINVAL);
+            }
+            else
+            {
+                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
+                {
+                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
+                    *wbufsize = 0;
+                    return esc_len;
+                }
+            }
+        }
+        /* not supported escape sequence */
+        return seterror(EILSEQ);
+    }
+    else if (buf[0] == iso2022_SO_seq[0])
+    {
+        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
+        *wbufsize = 0;
+        return 1;
+    }
+    else if (buf[0] == iso2022_SI_seq[0])
+    {
+        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
+        *wbufsize = 0;
+        return 1;
+    }
+
+    cs = ISO2022_MODE_CS(cv->mode);
+    shift = ISO2022_MODE_SHIFT(cv->mode);
+
+    /* reset the mode for informal sequence */
+    if (buf[0] < 0x20)
+    {
+        cs = ISO2022JP_CS_ASCII;
+        shift = ISO2022_SI;
+    }
+
+    len = iesc[cs].len;
+    if (bufsize < len)
+        return seterror(EINVAL);
+    for (i = 0; i < len; ++i)
+        if (!(buf[i] < 0x80))
+            return seterror(EILSEQ);
+    esc_len = iesc[cs].esc_len;
+    memcpy(tmp, iesc[cs].esc, esc_len);
+    if (shift == ISO2022_SO)
+    {
+        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
+        esc_len += 1;
+    }
+    memcpy(tmp + esc_len, buf, len);
+
+    if ((cv->codepage == 50220 || cv->codepage == 50221
+                || cv->codepage == 50222) && shift == ISO2022_SO)
+    {
+        /* XXX: shift-out cannot be used for mbtowc (both kernel and
+         * mlang) */
+        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
+        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
+        memcpy(tmp + esc_len, buf, len);
+    }
+
+    insize = len + esc_len;
+    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
+            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
+    if (hr != S_OK || insize != len + esc_len)
+        return seterror(EILSEQ);
+
+    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
+    /* ascii should be converted from ascii */
+    if (wbuf[0] == buf[0]
+            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
+        return seterror(EILSEQ);
+
+    /* reset the mode for informal sequence */
+    if (cv->mode != ISO2022_MODE(cs, shift))
+        cv->mode = ISO2022_MODE(cs, shift);
+
+    return len;
+}
+
+static int
+iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    char tmp[MB_CHAR_MAX];
+    int tmpsize = MB_CHAR_MAX;
+    int insize = wbufsize;
+    HRESULT hr;
+    DWORD dummy = 0;
+    int len;
+    int esc_len;
+    int cs;
+    int shift;
+    int i;
+
+    /*
+     * MultiByte = [escape sequence] + character + [escape sequence]
+     *
+     * Whether trailing escape sequence is added depends on which API is
+     * used (kernel or MLang, and its version).
+     */
+    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
+            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
+    if (hr != S_OK || insize != wbufsize)
+        return seterror(EILSEQ);
+    else if (bufsize < tmpsize)
+        return seterror(E2BIG);
+
+    if (tmpsize == 1)
+    {
+        cs = ISO2022JP_CS_ASCII;
+        esc_len = 0;
+    }
+    else
+    {
+        for (i = 1; iesc[i].esc != NULL; ++i)
+        {
+            esc_len = iesc[i].esc_len;
+            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
+            {
+                cs = iesc[i].cs;
+                break;
+            }
+        }
+        if (iesc[i].esc == NULL)
+            /* not supported escape sequence */
+            return seterror(EILSEQ);
+    }
+
+    shift = ISO2022_SI;
+    if (tmp[esc_len] == iso2022_SO_seq[0])
+    {
+        shift = ISO2022_SO;
+        esc_len += 1;
+    }
+
+    len = iesc[cs].len;
+
+    /* Check for converting error.  Assuming defaultChar is 0x3F. */
+    /* ascii should be converted from ascii */
+    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
+        return seterror(EILSEQ);
+    else if (tmpsize < esc_len + len)
+        return seterror(EILSEQ);
+
+    if (cv->mode == ISO2022_MODE(cs, shift))
+    {
+        /* remove escape sequence */
+        if (esc_len != 0)
+            memmove(tmp, tmp + esc_len, len);
+        esc_len = 0;
+    }
+    else
+    {
+        if (cs == ISO2022JP_CS_ASCII)
+        {
+            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
+            memmove(tmp + esc_len, tmp, len);
+            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
+        }
+        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
+        {
+            /* shift-in before changing to other mode */
+            memmove(tmp + 1, tmp, len + esc_len);
+            memcpy(tmp, iso2022_SI_seq, 1);
+            esc_len += 1;
+        }
+    }
+
+    if (bufsize < len + esc_len)
+        return seterror(E2BIG);
+    memcpy(buf, tmp, len + esc_len);
+    cv->mode = ISO2022_MODE(cs, shift);
+    return len + esc_len;
+}
+
+static int
+iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    int esc_len;
+
+    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
+    {
+        esc_len = 0;
+        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
+            esc_len += 1;
+        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
+            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
+        if (bufsize < esc_len)
+            return seterror(E2BIG);
+
+        esc_len = 0;
+        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
+        {
+            memcpy(buf, iso2022_SI_seq, 1);
+            esc_len += 1;
+        }
+        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
+        {
+            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
+                    iesc[ISO2022JP_CS_ASCII].esc_len);
+            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
+        }
+        return esc_len;
+    }
+    return 0;
+}
+
+#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
+BOOL WINAPI
+DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
+{
+    switch( fdwReason )
+    {
+    case DLL_PROCESS_ATTACH:
+        hwiniconv = (HMODULE)hinstDLL;
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
+#endif
+
+#if defined(MAKE_EXE)
+#include <stdio.h>
+#include <fcntl.h>
+#include <io.h>
+int
+main(int argc, char **argv)
+{
+    char *fromcode = NULL;
+    char *tocode = NULL;
+    int i;
+    char inbuf[BUFSIZ];
+    char outbuf[BUFSIZ];
+    const char *pin;
+    char *pout;
+    size_t inbytesleft;
+    size_t outbytesleft;
+    size_t rest = 0;
+    iconv_t cd;
+    size_t r;
+    FILE *in = stdin;
+    FILE *out = stdout;
+    int ignore = 0;
+    char *p;
+
+    _setmode(_fileno(stdin), _O_BINARY);
+    _setmode(_fileno(stdout), _O_BINARY);
+
+    for (i = 1; i < argc; ++i)
+    {
+        if (strcmp(argv[i], "-l") == 0)
+        {
+            for (i = 0; codepage_alias[i].name != NULL; ++i)
+                printf("%s\n", codepage_alias[i].name);
+            return 0;
+        }
+
+        if (strcmp(argv[i], "-f") == 0)
+            fromcode = argv[++i];
+        else if (strcmp(argv[i], "-t") == 0)
+            tocode = argv[++i];
+        else if (strcmp(argv[i], "-c") == 0)
+            ignore = 1;
+        else if (strcmp(argv[i], "--output") == 0)
+        {
+            out = fopen(argv[++i], "wb");
+            if(out == NULL)
+            {
+                fprintf(stderr, "cannot open %s\n", argv[i]);
+                return 1;
+            }
+        }
+        else
+        {
+            in = fopen(argv[i], "rb");
+            if (in == NULL)
+            {
+                fprintf(stderr, "cannot open %s\n", argv[i]);
+                return 1;
+            }
+            break;
+        }
+    }
+
+    if (fromcode == NULL || tocode == NULL)
+    {
+        printf("usage: %s [-c] -f from-enc -t to-enc [file]\n", argv[0]);
+        return 0;
+    }
+
+    if (ignore)
+    {
+        p = tocode;
+        tocode = (char *)malloc(strlen(p) + strlen("//IGNORE") + 1);
+        if (tocode == NULL)
+        {
+            perror("fatal error");
+            return 1;
+        }
+        strcpy(tocode, p);
+        strcat(tocode, "//IGNORE");
+    }
+
+    cd = iconv_open(tocode, fromcode);
+    if (cd == (iconv_t)(-1))
+    {
+        perror("iconv_open error");
+        return 1;
+    }
+
+    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
+            || rest != 0)
+    {
+        inbytesleft += rest;
+        pin = inbuf;
+        pout = outbuf;
+        outbytesleft = sizeof(outbuf);
+        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
+        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, out);
+        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
+        {
+            perror("conversion error");
+            return 1;
+        }
+        memmove(inbuf, pin, inbytesleft);
+        rest = inbytesleft;
+    }
+    pout = outbuf;
+    outbytesleft = sizeof(outbuf);
+    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
+    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, out);
+    if (r == (size_t)(-1))
+    {
+        perror("conversion error");
+        return 1;
+    }
+
+    iconv_close(cd);
+
+    return 0;
+}
+#endif
+

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/win_iconv.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv/win_iconv_test.c
===================================================================
--- lib/3rdparty/libwin-iconv/win_iconv_test.c	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv/win_iconv_test.c	(rÃ©vision 62573)
@@ -0,0 +1,286 @@
+
+#ifdef USE_ICONV_H
+#include <iconv.h>
+#include <windows.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#else
+#include "win_iconv.c"
+#endif
+
+#include <stdio.h>
+
+const char *
+tohex(const char *str, int size)
+{
+    static char buf[BUFSIZ];
+    char *pbuf = buf;
+    int i;
+    buf[0] = 0;
+    for (i = 0; i < size; ++i)
+        pbuf += sprintf(pbuf, "%02X", str[i] & 0xFF);
+    return buf;
+}
+
+const char *
+errstr(int errcode)
+{
+    static char buf[BUFSIZ];
+    switch (errcode)
+    {
+    case 0: return "NOERROR";
+    case EINVAL: return "EINVAL";
+    case EILSEQ: return "EILSEQ";
+    case E2BIG: return "E2BIG";
+    }
+    sprintf(buf, "%d\n", errcode);
+    return buf;
+}
+
+#ifdef USE_LIBICONV_DLL
+int use_dll;
+
+int
+setdll(const char *dllpath)
+{
+    char buf[BUFSIZ];
+    rec_iconv_t cd;
+
+    sprintf(buf, "WINICONV_LIBICONV_DLL=%s", dllpath);
+    putenv(buf);
+    if (libiconv_iconv_open(&cd, "ascii", "ascii"))
+    {
+        FreeLibrary(cd.hlibiconv);
+        use_dll = TRUE;
+        return TRUE;
+    }
+    use_dll = FALSE;
+    return FALSE;
+}
+#endif
+
+/*
+ * We can test the codepage that is installed in the system.
+ */
+int
+check_enc(const char *encname, int codepage)
+{
+    iconv_t cd;
+    int cp;
+    cd = iconv_open("utf-8", encname);
+    if (cd == (iconv_t)(-1))
+    {
+        printf("%s(%d) IS NOT SUPPORTED: SKIP THE TEST\n", encname, codepage);
+        return FALSE;
+    }
+#ifndef USE_ICONV_H
+    cp = ((rec_iconv_t *)cd)->from.codepage;
+    if (cp != codepage)
+    {
+        printf("%s(%d) ALIAS IS MAPPED TO DIFFERENT CODEPAGE (%d)\n", encname, codepage, cp);
+        exit(1);
+    }
+#endif
+    iconv_close(cd);
+    return TRUE;
+}
+
+void
+test(const char *from, const char *fromstr, int fromsize, const char *to, const char *tostr, int tosize, int errcode, int bufsize, int line)
+{
+    char outbuf[BUFSIZ];
+    const char *pin;
+    char *pout;
+    size_t inbytesleft;
+    size_t outbytesleft;
+    iconv_t cd;
+    size_t r;
+#ifdef USE_LIBICONV_DLL
+    char dllpath[_MAX_PATH];
+#endif
+
+    cd = iconv_open(to, from);
+    if (cd == (iconv_t)(-1))
+    {
+        printf("%s -> %s: NG: INVALID ENCODING NAME: line=%d\n", from, to, line);
+        exit(1);
+    }
+
+#ifdef USE_LIBICONV_DLL
+    if (((rec_iconv_t *)cd)->hlibiconv != NULL)
+        GetModuleFileNameA(((rec_iconv_t *)cd)->hlibiconv, dllpath, sizeof(dllpath));
+
+    if (use_dll && ((rec_iconv_t *)cd)->hlibiconv == NULL)
+    {
+        printf("%s: %s -> %s: NG: FAILED TO USE DLL: line=%d\n", dllpath, from, to, line);
+        exit(1);
+    }
+    else if (!use_dll && ((rec_iconv_t *)cd)->hlibiconv != NULL)
+    {
+        printf("%s: %s -> %s: NG: DLL IS LOADED UNEXPECTEDLY: line=%d\n", dllpath, from, to, line);
+        exit(1);
+    }
+#endif
+
+    errno = 0;
+
+    pin = (char *)fromstr;
+    pout = outbuf;
+    inbytesleft = fromsize;
+    outbytesleft = bufsize;
+    r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
+    if (r != (size_t)(-1))
+        r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
+    *pout = 0;
+
+#ifdef USE_LIBICONV_DLL
+    if (use_dll)
+        printf("%s: ", dllpath);
+#endif
+    printf("%s(%s) -> ", from, tohex(fromstr, fromsize));
+    printf("%s(%s%s%s): ", to, tohex(tostr, tosize),
+            errcode == 0 ? "" : ":",
+            errcode == 0 ? "" : errstr(errcode));
+    if (strcmp(outbuf, tostr) == 0 && errno == errcode)
+        printf("OK\n");
+    else
+    {
+        printf("RESULT(%s:%s): ", tohex(outbuf, sizeof(outbuf) - outbytesleft),
+                errstr(errno));
+        printf("NG: line=%d\n", line);
+        exit(1);
+    }
+}
+
+#define STATIC_STRLEN(arr) (sizeof(arr) - 1)
+
+#define success(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), 0, BUFSIZ, __LINE__)
+#define einval(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EINVAL, BUFSIZ, __LINE__)
+#define eilseq(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EILSEQ, BUFSIZ, __LINE__)
+#define e2big(from, fromstr, to, tostr, bufsize) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), E2BIG, bufsize, __LINE__)
+
+int
+main(int argc, char **argv)
+{
+#ifdef USE_LIBICONV_DLL
+    /* test use of dll if $DEFAULT_LIBICONV_DLL was defined. */
+    if (setdll(""))
+    {
+        success("ascii", "ABC", "ascii", "ABC");
+        success("ascii", "ABC", "utf-16be", "\x00\x41\x00\x42\x00\x43");
+    }
+    else
+    {
+        printf("\nDLL TEST IS SKIPPED\n\n");
+    }
+
+    setdll("none");
+#endif
+
+    if (check_enc("ascii", 20127))
+    {
+        success("ascii", "ABC", "ascii", "ABC");
+        /* MSB is dropped.  Hmm... */
+        success("ascii", "\x80\xFF", "ascii", "\x00\x7F");
+    }
+
+    /* unicode (CP1200 CP1201 CP12000 CP12001 CP65001) */
+    if (check_enc("utf-8", 65001)
+            && check_enc("utf-16be", 1201) && check_enc("utf-16le", 1200)
+            && check_enc("utf-32be", 12001) && check_enc("utf-32le", 12000)
+            )
+    {
+        /* Test the BOM behavior
+         * 1. Remove the BOM when "fromcode" is utf-16 or utf-32.
+         * 2. Add the BOM when "tocode" is utf-16 or utf-32.  */
+        success("utf-16", "\xFE\xFF\x01\x02", "utf-16be", "\x01\x02");
+        success("utf-16", "\xFF\xFE\x02\x01", "utf-16be", "\x01\x02");
+        success("utf-32", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\x01\x02");
+        success("utf-32", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\x01\x02");
+        success("utf-16", "\xFE\xFF\x00\x01", "utf-8", "\x01");
+#ifndef GLIB_COMPILATION
+        success("utf-8", "\x01", "utf-16", "\xFE\xFF\x00\x01");
+        success("utf-8", "\x01", "utf-32", "\x00\x00\xFE\xFF\x00\x00\x00\x01");
+#else
+        success("utf-8", "\x01", "utf-16", "\xFF\xFE\x01\x00");
+        success("utf-8", "\x01", "utf-32", "\xFF\xFE\x00\x00\x01\x00\x00\x00");
+#endif
+
+        success("utf-16be", "\xFE\xFF\x01\x02", "utf-16be", "\xFE\xFF\x01\x02");
+        success("utf-16le", "\xFF\xFE\x02\x01", "utf-16be", "\xFE\xFF\x01\x02");
+        success("utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
+        success("utf-32le", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
+        success("utf-16be", "\xFE\xFF\x00\x01", "utf-8", "\xEF\xBB\xBF\x01");
+        success("utf-8", "\xEF\xBB\xBF\x01", "utf-8", "\xEF\xBB\xBF\x01");
+
+        success("utf-16be", "\x01\x02", "utf-16le", "\x02\x01");
+        success("utf-16le", "\x02\x01", "utf-16be", "\x01\x02");
+        success("utf-16be", "\xFE\xFF", "utf-16le", "\xFF\xFE");
+        success("utf-16le", "\xFF\xFE", "utf-16be", "\xFE\xFF");
+        success("utf-32be", "\x00\x00\x03\x04", "utf-32le", "\x04\x03\x00\x00");
+        success("utf-32le", "\x04\x03\x00\x00", "utf-32be", "\x00\x00\x03\x04");
+        success("utf-32be", "\x00\x00\xFF\xFF", "utf-16be", "\xFF\xFF");
+        success("utf-16be", "\xFF\xFF", "utf-32be", "\x00\x00\xFF\xFF");
+        success("utf-32be", "\x00\x01\x00\x00", "utf-16be", "\xD8\x00\xDC\x00");
+        success("utf-16be", "\xD8\x00\xDC\x00", "utf-32be", "\x00\x01\x00\x00");
+        success("utf-32be", "\x00\x10\xFF\xFF", "utf-16be", "\xDB\xFF\xDF\xFF");
+        success("utf-16be", "\xDB\xFF\xDF\xFF", "utf-32be", "\x00\x10\xFF\xFF");
+        eilseq("utf-32be", "\x00\x11\x00\x00", "utf-16be", "");
+        eilseq("utf-16be", "\xDB\xFF\xE0\x00", "utf-32be", "");
+        success("utf-8", "\xE3\x81\x82", "utf-16be", "\x30\x42");
+        einval("utf-8", "\xE3", "utf-16be", "");
+    }
+
+    /* Japanese (CP932 CP20932 CP50220 CP50221 CP50222 CP51932) */
+    if (check_enc("cp932", 932)
+            && check_enc("cp20932", 20932) && check_enc("euc-jp", 51932)
+            && check_enc("cp50220", 50220) && check_enc("cp50221", 50221)
+            && check_enc("cp50222", 50222) && check_enc("iso-2022-jp", 50221))
+    {
+        /* Test the compatibility for each other Japanese codepage.
+         * And validate the escape sequence handling for iso-2022-jp. */
+        success("utf-16be", "\xFF\x5E", "cp932", "\x81\x60");
+        success("utf-16be", "\x30\x1C", "cp932", "\x81\x60");
+        success("utf-16be", "\xFF\x5E", "cp932//nocompat", "\x81\x60");
+        eilseq("utf-16be", "\x30\x1C", "cp932//nocompat", "");
+        success("euc-jp", "\xA4\xA2", "utf-16be", "\x30\x42");
+        einval("euc-jp", "\xA4\xA2\xA4", "utf-16be", "\x30\x42");
+        eilseq("euc-jp", "\xA4\xA2\xFF\xFF", "utf-16be", "\x30\x42");
+        success("cp932", "\x81\x60", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
+        success("UTF-16BE", "\xFF\x5E", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
+        eilseq("UTF-16BE", "\x30\x1C", "iso-2022-jp//nocompat", "");
+        success("UTF-16BE", "\x30\x42\x30\x44", "iso-2022-jp", "\x1B\x24\x42\x24\x22\x24\x24\x1B\x28\x42");
+        success("iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42", "UTF-16BE", "\xFF\x5E");
+    }
+
+    /*
+     * test for //translit
+     * U+FF41 (FULLWIDTH LATIN SMALL LETTER A) <-> U+0062 (LATIN SMALL LETTER A)
+     */
+    eilseq("UTF-16BE", "\xFF\x41", "iso-8859-1", "");
+    success("UTF-16BE", "\xFF\x41", "iso-8859-1//translit", "a");
+
+    /*
+     * test for //translit
+     * Some character, not in "to" encoding -> DEFAULT CHARACTER (maybe "?")
+     */
+    eilseq("UTF-16BE", "\x30\x42", "ascii", "");
+    success("UTF-16BE", "\x30\x42", "ascii//translit", "?");
+
+    /*
+     * test for //ignore
+     */
+    eilseq("UTF-8", "\xFF A \xFF B", "ascii//ignore", " A  B");
+    eilseq("UTF-8", "\xEF\xBC\xA1 A \xEF\xBC\xA2 B", "ascii//ignore", " A  B");
+    eilseq("UTF-8", "\xEF\x01 A \xEF\x02 B", "ascii//ignore", "\x01 A \x02 B");
+
+    /*
+     * TODO:
+     * Test for state after iconv() failed.
+     * Ensure iconv() error is safe and continuable.
+     */
+
+    return 0;
+}
+

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv/win_iconv_test.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/3rdparty/libwin-iconv
===================================================================
--- lib/3rdparty/libwin-iconv	(rÃ©vision 0)
+++ lib/3rdparty/libwin-iconv	(copie de travail)

Modification de propriÃ©tÃ©s sur lib/3rdparty/libwin-iconv
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+See issue #%BUGID% for more details.
\ No newline at end of property
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: lib/drivers/lwip/CMakeLists.txt
===================================================================
--- lib/drivers/lwip/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/lwip/CMakeLists.txt	(copie de travail)
@@ -54,10 +54,12 @@
     src/core/snmp/mib_structs.c
     src/core/snmp/mib2.c
     src/core/snmp/msg_in.c
-    src/core/snmp/msg_out.c)
+    src/core/snmp/msg_out.c
+    precomp.h)
 
 add_library(lwip ${SOURCE})
 add_dependencies(lwip bugcodes)
+add_pch(lwip precomp.h SOURCE)
 if(NOT MSVC)
     allow_warnings(lwip)
     if(LTCG)
Index: lib/drivers/lwip/precomp.h
===================================================================
--- lib/drivers/lwip/precomp.h	(rÃ©vision 0)
+++ lib/drivers/lwip/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,6 @@
+#ifndef _LWIP_PCH_
+#define _LWIP_PCH_
+
+#include "src/include/lwip/opt.h"
+
+#endif /* _LWIP_PCH_ */

Modification de propriÃ©tÃ©s sur lib/drivers/lwip/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/drivers/libusb/CMakeLists.txt
===================================================================
--- lib/drivers/libusb/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/libusb/CMakeLists.txt	(copie de travail)
@@ -15,7 +15,9 @@
     misc.cpp
     usb_device.cpp
     purecall.cpp
-    libusb.cpp)
+    libusb.cpp
+    libusb.h)
 
 add_library(libusb ${SOURCE})
 add_dependencies(libusb bugcodes)
+add_pch(libusb libusb.h SOURCE)
Index: lib/drivers/hidparser/parser.h
===================================================================
--- lib/drivers/hidparser/parser.h	(rÃ©vision 61927)
+++ lib/drivers/hidparser/parser.h	(copie de travail)
@@ -1,10 +1,13 @@
+#ifndef _HIDPARSER_H_
+#define _HIDPARSER_H_
 
-#pragma once
-#include <ntddk.h>
-#include <assert.h>
+#include <wdm.h>
 #include <pshpack1.h>
+#define _HIDPI_
+#define _HIDPI_NO_FUNCTION_MACROS_
+#include <hidpddi.h>
+
 #include "hidparser.h"
-#include <ntddkbd.h>
 
  /*
   * Copyright 2007, Haiku, Inc. All Rights Reserved.
@@ -391,3 +394,5 @@
 HidParser_GetReportInCollection(
     IN PVOID Context,
     IN UCHAR ReportType);
+
+#endif /* _HIDPARSER_H_ */
Index: lib/drivers/hidparser/hidparser.h
===================================================================
--- lib/drivers/hidparser/hidparser.h	(rÃ©vision 61927)
+++ lib/drivers/hidparser/hidparser.h	(copie de travail)
@@ -10,12 +10,6 @@
 
 #pragma once
 
-#define _HIDPI_
-#define _HIDPI_NO_FUNCTION_MACROS_
-#include <ntddk.h>
-#include <hidpddi.h>
-#include <hidpi.h>
-
 //
 // function prototypes
 //
Index: lib/drivers/hidparser/CMakeLists.txt
===================================================================
--- lib/drivers/hidparser/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/hidparser/CMakeLists.txt	(copie de travail)
@@ -5,8 +5,9 @@
     context.c
     hidparser.c
     parser.c
-    api.c)
+    api.c
+    parser.h)
 
 add_library(hidparser ${SOURCE})
 add_dependencies(hidparser bugcodes)
-
+add_pch(hidparser parser.h SOURCE)
Index: lib/drivers/ip/CMakeLists.txt
===================================================================
--- lib/drivers/ip/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/ip/CMakeLists.txt	(copie de travail)
@@ -30,8 +30,9 @@
     transport/tcp/event.c
     transport/tcp/if.c
     transport/tcp/tcp.c
-    transport/udp/udp.c)
+    transport/udp/udp.c
+    precomp.h)
 
 add_library(ip ${SOURCE} ${ip_asm})
-add_pch(ip precomp.h)
+add_pch(ip precomp.h SOURCE)
 add_dependencies(ip bugcodes)
Index: lib/drivers/ip/precomp.h
===================================================================
--- lib/drivers/ip/precomp.h	(rÃ©vision 61927)
+++ lib/drivers/ip/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _IP_PCH_
+#define _IP_PCH_
+
 #include <tags.h>
 #include <tcpip.h>
 #include <loopback.h>
@@ -17,3 +20,5 @@
 #include <interface.h>
 #include <ports.h>
 #include <chew/chew.h>
+
+#endif /* _IP_PCH_ */
Index: lib/drivers/sound/mmixer/sup.c
===================================================================
--- lib/drivers/sound/mmixer/sup.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/sup.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
@@ -865,4 +865,3 @@
     PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL;
     PinConnect->Priority.PrioritySubClass = 1;
 }
-
Index: lib/drivers/sound/mmixer/CMakeLists.txt
===================================================================
--- lib/drivers/sound/mmixer/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/CMakeLists.txt	(copie de travail)
@@ -12,9 +12,10 @@
     mixer.c
     sup.c
     wave.c
-    topology.c)
+    topology.c
+    precomp.h)
 
 add_library(mmixer ${SOURCE})
-add_pch(mmixer priv.h)
+add_pch(mmixer precomp.h SOURCE)
 add_dependencies(mmixer bugcodes)
 
Index: lib/drivers/sound/mmixer/topology.c
===================================================================
--- lib/drivers/sound/mmixer/topology.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/topology.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
@@ -1289,8 +1289,3 @@
     /* done */
     return MM_STATUS_SUCCESS;
 }
-
-
-
-
-
Index: lib/drivers/sound/mmixer/midi.c
===================================================================
--- lib/drivers/sound/mmixer/midi.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/midi.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
Index: lib/drivers/sound/mmixer/wave.c
===================================================================
--- lib/drivers/sound/mmixer/wave.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/wave.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
@@ -711,4 +711,3 @@
     /* done */
     return MM_STATUS_SUCCESS;
 }
-
Index: lib/drivers/sound/mmixer/controls.c
===================================================================
--- lib/drivers/sound/mmixer/controls.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/controls.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
  
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
@@ -1761,4 +1761,3 @@
     InsertTailList(&MixerInfo->EventList, &EventData->Entry);
     return MM_STATUS_SUCCESS;
 }
-
Index: lib/drivers/sound/mmixer/mixer.c
===================================================================
--- lib/drivers/sound/mmixer/mixer.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/mixer.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
Index: lib/drivers/sound/mmixer/filter.c
===================================================================
--- lib/drivers/sound/mmixer/filter.c	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/filter.c	(copie de travail)
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-#include "priv.h"
+#include "precomp.h"
 
 #define YDEBUG
 #include <debug.h>
Index: lib/drivers/sound/mmixer/priv.h
===================================================================
--- lib/drivers/sound/mmixer/priv.h	(rÃ©vision 61927)
+++ lib/drivers/sound/mmixer/priv.h	(copie de travail)
@@ -1,520 +0,0 @@
-#include <ntddk.h>
-#include <windef.h>
-#define NOBITMAP
-#include <mmreg.h>
-#include <ksmedia.h>
-#include <mmsystem.h>
-
-#include "mmixer.h"
-
-typedef struct __TOPOLOGY_NODE__
-{
-    GUID NodeType;
-    ULONG NodeIndex;
-
-    ULONG NodeConnectedToCount;
-    struct __TOPOLOGY_NODE__ ** NodeConnectedTo;
-
-    ULONG NodeConnectedFromCount;
-    struct __TOPOLOGY_NODE__ ** NodeConnectedFrom;
-    PULONG LogicalPinNodeConnectedFrom;
-
-    ULONG PinConnectedFromCount;
-    PULONG PinConnectedFrom;
-
-    ULONG PinConnectedToCount;
-    PULONG PinConnectedTo;
-
-    ULONG Visited;
-    ULONG Reserved;
-}TOPOLOGY_NODE, *PTOPOLOGY_NODE;
-
-typedef struct
-{
-    ULONG PinId;
-
-    ULONG NodesConnectedToCount;
-    PTOPOLOGY_NODE * NodesConnectedTo;
-
-    ULONG NodesConnectedFromCount;
-    PTOPOLOGY_NODE * NodesConnectedFrom;
-
-    ULONG PinConnectedFromCount;
-    PULONG PinConnectedFrom;
-
-    ULONG PinConnectedToCount;
-    PULONG PinConnectedTo;
-
-    ULONG Visited;
-    ULONG Reserved;
-}PIN, *PPIN;
-
-
-typedef struct
-{
-    ULONG TopologyPinsCount;
-    PPIN TopologyPins;
-
-    ULONG TopologyNodesCount;
-    PTOPOLOGY_NODE TopologyNodes;
-
-}TOPOLOGY, *PTOPOLOGY;
-
-typedef struct
-{
-    LIST_ENTRY    Entry;
-    MIXERCAPSW    MixCaps;
-    LIST_ENTRY    LineList;
-    ULONG         ControlId;
-    LIST_ENTRY    EventList;
-}MIXER_INFO, *LPMIXER_INFO;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    MIXERCONTROLW Control;
-    ULONG NodeID;
-    HANDLE hDevice;
-    PVOID ExtraData;
-}MIXERCONTROL_EXT, *LPMIXERCONTROL_EXT;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    ULONG PinId;
-    MIXERLINEW Line;
-    LIST_ENTRY ControlsList;
-
-}MIXERLINE_EXT, *LPMIXERLINE_EXT;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    ULONG dwControlID;
-}MIXERCONTROL_DATA, *LPMIXERCONTROL_DATA;
-
-typedef struct
-{
-    MIXERCONTROL_DATA Header;
-    LONG SignedMinimum;
-    LONG SignedMaximum;
-    LONG SteppingDelta;
-    ULONG InputSteppingDelta;
-    ULONG ValuesCount;
-    PLONG Values;
-}MIXERVOLUME_DATA, *LPMIXERVOLUME_DATA;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    ULONG DeviceId;
-    HANDLE hDevice;
-    HANDLE hDeviceInterfaceKey;
-    LPWSTR DeviceName;
-    PTOPOLOGY Topology;
-    LPMIXER_INFO MixerInfo;
-}MIXER_DATA, *LPMIXER_DATA;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    ULONG DeviceId;
-    ULONG PinId;
-    union
-    {
-        WAVEOUTCAPSW OutCaps;
-        WAVEINCAPSW  InCaps;
-    }u;
-}WAVE_INFO, *LPWAVE_INFO;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    ULONG DeviceId;
-    ULONG PinId;
-    union
-    {
-        MIDIOUTCAPSW OutCaps;
-        MIDIINCAPSW InCaps;
-    }u;
-
-}MIDI_INFO, *LPMIDI_INFO;
-
-typedef struct
-{
-    ULONG MixerListCount;
-    LIST_ENTRY MixerList;
-
-    ULONG MixerDataCount;
-    LIST_ENTRY MixerData;
-
-    ULONG WaveInListCount;
-    LIST_ENTRY WaveInList;
-
-    ULONG WaveOutListCount;
-    LIST_ENTRY WaveOutList;
-
-    ULONG MidiInListCount;
-    LIST_ENTRY MidiInList;
-
-    ULONG MidiOutListCount;
-    LIST_ENTRY MidiOutList;
-}MIXER_LIST, *PMIXER_LIST;
-
-typedef struct
-{
-    LIST_ENTRY Entry;
-    PVOID MixerEventContext;
-    PMIXER_EVENT MixerEventRoutine;
-
-}EVENT_NOTIFICATION_ENTRY, *PEVENT_NOTIFICATION_ENTRY;
-
-#define DESTINATION_LINE (0xFFFF0000)
-#define SOURCE_LINE (0x10000)
-ULONG
-MMixerGetFilterPinCount(
-    IN PMIXER_CONTEXT MixerContext,
-    IN HANDLE hMixer);
-
-LPGUID
-MMixerGetNodeType(
-    IN PKSMULTIPLE_ITEM MultipleItem,
-    IN ULONG Index);
-
-MIXER_STATUS
-MMixerGetNodeIndexes(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PKSMULTIPLE_ITEM MultipleItem,
-    IN ULONG NodeIndex,
-    IN ULONG bNode,
-    IN ULONG bFrom,
-    OUT PULONG NodeReferenceCount,
-    OUT PULONG *NodeReference);
-
-PKSTOPOLOGY_CONNECTION
-MMixerGetConnectionByIndex(
-    IN PKSMULTIPLE_ITEM MultipleItem,
-    IN ULONG Index);
-
-ULONG
-MMixerGetControlTypeFromTopologyNode(
-    IN LPGUID NodeType);
-
-LPMIXERLINE_EXT
-MMixerGetSourceMixerLineByLineId(
-    LPMIXER_INFO MixerInfo,
-    DWORD dwLineID);
-
-MIXER_STATUS
-MMixerGetFilterTopologyProperty(
-    IN PMIXER_CONTEXT MixerContext,
-    IN HANDLE hMixer,
-    IN ULONG PropertyId,
-    OUT PKSMULTIPLE_ITEM * OutMultipleItem);
-
-VOID
-MMixerFreeMixerInfo(
-    IN PMIXER_CONTEXT MixerContext,
-    IN LPMIXER_INFO MixerInfo);
-
-MIXER_STATUS
-MMixerGetPhysicalConnection(
-    IN PMIXER_CONTEXT MixerContext,
-    IN HANDLE hMixer,
-    IN ULONG PinId,
-    OUT PKSPIN_PHYSICALCONNECTION *OutConnection);
-
-MIXER_STATUS
-MMixerSetupFilter(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PMIXER_LIST MixerList,
-    IN LPMIXER_DATA MixerData,
-    IN PULONG DeviceCount);
-
-PKSPIN_CONNECT
-MMixerAllocatePinConnect(
-    IN PMIXER_CONTEXT MixerContext,
-    ULONG DataFormatSize);
-
-MIXER_STATUS
-MMixerGetAudioPinDataRanges(
-    IN PMIXER_CONTEXT MixerContext,
-    IN HANDLE hDevice,
-    IN ULONG PinId,
-    IN OUT PKSMULTIPLE_ITEM * OutMultipleItem);
-
-VOID
-MMixerInitializeMidiForFilter(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PMIXER_LIST MixerList,
-    IN LPMIXER_DATA MixerData,
-    IN PTOPOLOGY Topology);
-
-MIXER_STATUS
-MMixerVerifyContext(
-    IN PMIXER_CONTEXT MixerContext);
-
-LPMIXER_INFO
-MMixerGetMixerInfoByIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN ULONG MixerIndex);
-
-LPMIXERLINE_EXT
-MMixerGetSourceMixerLineByComponentType(
-    LPMIXER_INFO MixerInfo,
-    DWORD dwComponentType);
-
-MIXER_STATUS
-MMixerGetMixerControlById(
-    LPMIXER_INFO MixerInfo,
-    DWORD dwControlID,
-    LPMIXERLINE_EXT *MixerLine,
-    LPMIXERCONTROL_EXT *MixerControl,
-    PULONG NodeId);
-
-MIXER_STATUS
-MMixerSetGetMuteControlDetails(
-    IN PMIXER_CONTEXT MixerContext,
-    IN LPMIXER_INFO MixerInfo,
-    IN LPMIXERCONTROL_EXT MixerControl,
-    IN ULONG dwLineID,
-    IN LPMIXERCONTROLDETAILS MixerControlDetails,
-    IN ULONG bSet);
-
-MIXER_STATUS
-MMixerSetGetVolumeControlDetails(
-    IN PMIXER_CONTEXT MixerContext,
-    IN LPMIXER_INFO MixerInfo,
-    IN ULONG NodeId,
-    IN ULONG bSet,
-    LPMIXERCONTROL_EXT MixerControl,
-    IN LPMIXERCONTROLDETAILS MixerControlDetails,
-    LPMIXERLINE_EXT MixerLine);
-
-MIXER_STATUS
-MMixerSetGetMuxControlDetails(
-    IN PMIXER_CONTEXT MixerContext,
-    IN LPMIXER_INFO MixerInfo,
-    IN ULONG NodeId,
-    IN ULONG bSet,
-    IN ULONG Flags,
-    LPMIXERCONTROL_EXT MixerControl,
-    IN LPMIXERCONTROLDETAILS MixerControlDetails,
-    LPMIXERLINE_EXT MixerLine);
-
-
-MIXER_STATUS
-MMixerSetGetControlDetails(
-    IN PMIXER_CONTEXT MixerContext,
-    IN HANDLE hMixer,
-    IN ULONG NodeId,
-    IN ULONG bSet,
-    IN ULONG PropertyId,
-    IN ULONG Channel,
-    IN PLONG InputValue);
-
-LPMIXER_DATA
-MMixerGetDataByDeviceId(
-    IN PMIXER_LIST MixerList,
-    IN ULONG DeviceId);
-
-LPMIXER_DATA
-MMixerGetDataByDeviceName(
-    IN PMIXER_LIST MixerList,
-    IN LPWSTR DeviceName);
-
-MIXER_STATUS
-MMixerCreateMixerData(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PMIXER_LIST MixerList,
-    IN ULONG DeviceId,
-    IN LPWSTR DeviceName,
-    IN HANDLE hDevice,
-    IN HANDLE hKey);
-
-MIXER_STATUS
-MMixerInitializeWaveInfo(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PMIXER_LIST MixerList,
-    IN LPMIXER_DATA MixerData,
-    IN LPWSTR DeviceName,
-    IN ULONG bWaveIn,
-    IN ULONG PinCount,
-    IN PULONG Pins);
-
-MIXER_STATUS
-MMixerAddEvent(
-    IN PMIXER_CONTEXT MixerContext,
-    IN OUT LPMIXER_INFO MixerInfo,
-    IN PVOID MixerEvent,
-    IN PMIXER_EVENT MixerEventRoutine);
-
-MIXER_STATUS
-MMixerGetDeviceName(
-    IN PMIXER_CONTEXT MixerContext,
-    OUT LPWSTR DeviceName,
-    IN HANDLE hKey);
-
-VOID
-MMixerInitializePinConnect(
-    IN OUT PKSPIN_CONNECT PinConnect,
-    IN ULONG PinId);
-
-MIXER_STATUS
-MMixerGetPinDataFlowAndCommunication(
-    IN PMIXER_CONTEXT MixerContext,
-    IN HANDLE hDevice,
-    IN ULONG PinId,
-    OUT PKSPIN_DATAFLOW DataFlow,
-    OUT PKSPIN_COMMUNICATION Communication);
-
-VOID
-MMixerHandleAlternativeMixers(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PMIXER_LIST MixerList,
-    IN LPMIXER_DATA MixerData,
-    IN PTOPOLOGY Topology);
-
-MIXER_STATUS
-MMixerGetMixerByName(
-    IN PMIXER_LIST MixerList,
-    IN LPWSTR MixerName,
-    OUT LPMIXER_INFO *MixerInfo);
-
-/* topology.c */
-
-MIXER_STATUS
-MMixerCreateTopology(
-    IN PMIXER_CONTEXT MixerContext,
-    IN ULONG PinCount,
-    IN PKSMULTIPLE_ITEM NodeConnections,
-    IN PKSMULTIPLE_ITEM NodeTypes,
-    OUT PTOPOLOGY *OutTopology);
-
-VOID
-MMixerGetAllUpOrDownstreamPinsFromNodeIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    IN ULONG bUpStream,
-    OUT PULONG OutPinsCount,
-    OUT PULONG OutPins);
-
-MIXER_STATUS
-MMixerGetAllUpOrDownstreamPinsFromPinIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG PinIndex,
-    IN ULONG bUpStream,
-    OUT PULONG OutPinsCount,
-    OUT PULONG OutPins);
-
-VOID
-MMixerGetNextNodesFromPinIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG PinIndex,
-    IN ULONG bUpStream,
-    OUT PULONG OutNodesCount,
-    OUT PULONG OutNodes);
-
-MIXER_STATUS
-MMixerAllocateTopologyPinArray(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    OUT PULONG * OutPins);
-
-MIXER_STATUS
-MMixerAllocateTopologyNodeArray(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    OUT PULONG * OutPins);
-
-VOID
-MMixerGetAllUpOrDownstreamNodesFromPinIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG PinIndex,
-    IN ULONG bUpStream,
-    OUT PULONG OutNodesCount,
-    OUT PULONG OutNodes);
-
-VOID
-MMixerIsNodeTerminator(
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    OUT ULONG * bTerminator);
-
-VOID
-MMixerGetNextNodesFromNodeIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    IN ULONG bUpStream,
-    OUT PULONG OutNodesCount,
-    OUT PULONG OutNodes);
-
-LPGUID
-MMixerGetNodeTypeFromTopology(
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex);
-
-MIXER_STATUS
-MMixerGetAllUpOrDownstreamNodesFromNodeIndex(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    IN ULONG bUpStream,
-    OUT PULONG OutNodesCount,
-    OUT PULONG OutNodes);
-
-MIXER_STATUS
-MMixerIsNodeConnectedToPin(
-    IN PMIXER_CONTEXT MixerContext,
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    IN ULONG PinId,
-    IN ULONG bUpStream,
-    OUT PULONG bConnected);
-
-ULONG
-MMixerGetNodeIndexFromGuid(
-    IN PTOPOLOGY Topology,
-    IN const GUID *NodeType);
-
-VOID
-MMixerSetTopologyNodeReserved(
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex);
-
-VOID
-MMixerIsTopologyNodeReserved(
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    OUT PULONG bReserved);
-
-VOID
-MMixerSetTopologyPinReserved(
-    IN PTOPOLOGY Topology,
-    IN ULONG PinId);
-
-VOID
-MMixerIsTopologyPinReserved(
-    IN PTOPOLOGY Topology,
-    IN ULONG PinId,
-    OUT PULONG bReserved);
-
-VOID
-MMixerGetTopologyPinCount(
-    IN PTOPOLOGY Topology,
-    OUT PULONG PinCount);
-
-VOID
-MMixerGetConnectedFromLogicalTopologyPins(
-    IN PTOPOLOGY Topology,
-    IN ULONG NodeIndex,
-    OUT PULONG OutPinCount,
-    OUT PULONG OutPins);
-
-VOID
-MMixerPrintTopology();
Index: lib/drivers/sound/mmixer/precomp.h
===================================================================
--- lib/drivers/sound/mmixer/precomp.h	(rÃ©vision 0)
+++ lib/drivers/sound/mmixer/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,525 @@
+#ifndef _MMIXER_PCH_
+#define _MMIXER_PCH_
+
+#include <wdm.h>
+#include <windef.h>
+#define NOBITMAP
+#include <mmreg.h>
+#include <ksmedia.h>
+#include <mmsystem.h>
+
+#include "mmixer.h"
+
+typedef struct __TOPOLOGY_NODE__
+{
+    GUID NodeType;
+    ULONG NodeIndex;
+
+    ULONG NodeConnectedToCount;
+    struct __TOPOLOGY_NODE__ ** NodeConnectedTo;
+
+    ULONG NodeConnectedFromCount;
+    struct __TOPOLOGY_NODE__ ** NodeConnectedFrom;
+    PULONG LogicalPinNodeConnectedFrom;
+
+    ULONG PinConnectedFromCount;
+    PULONG PinConnectedFrom;
+
+    ULONG PinConnectedToCount;
+    PULONG PinConnectedTo;
+
+    ULONG Visited;
+    ULONG Reserved;
+}TOPOLOGY_NODE, *PTOPOLOGY_NODE;
+
+typedef struct
+{
+    ULONG PinId;
+
+    ULONG NodesConnectedToCount;
+    PTOPOLOGY_NODE * NodesConnectedTo;
+
+    ULONG NodesConnectedFromCount;
+    PTOPOLOGY_NODE * NodesConnectedFrom;
+
+    ULONG PinConnectedFromCount;
+    PULONG PinConnectedFrom;
+
+    ULONG PinConnectedToCount;
+    PULONG PinConnectedTo;
+
+    ULONG Visited;
+    ULONG Reserved;
+}PIN, *PPIN;
+
+
+typedef struct
+{
+    ULONG TopologyPinsCount;
+    PPIN TopologyPins;
+
+    ULONG TopologyNodesCount;
+    PTOPOLOGY_NODE TopologyNodes;
+
+}TOPOLOGY, *PTOPOLOGY;
+
+typedef struct
+{
+    LIST_ENTRY    Entry;
+    MIXERCAPSW    MixCaps;
+    LIST_ENTRY    LineList;
+    ULONG         ControlId;
+    LIST_ENTRY    EventList;
+}MIXER_INFO, *LPMIXER_INFO;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    MIXERCONTROLW Control;
+    ULONG NodeID;
+    HANDLE hDevice;
+    PVOID ExtraData;
+}MIXERCONTROL_EXT, *LPMIXERCONTROL_EXT;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    ULONG PinId;
+    MIXERLINEW Line;
+    LIST_ENTRY ControlsList;
+
+}MIXERLINE_EXT, *LPMIXERLINE_EXT;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    ULONG dwControlID;
+}MIXERCONTROL_DATA, *LPMIXERCONTROL_DATA;
+
+typedef struct
+{
+    MIXERCONTROL_DATA Header;
+    LONG SignedMinimum;
+    LONG SignedMaximum;
+    LONG SteppingDelta;
+    ULONG InputSteppingDelta;
+    ULONG ValuesCount;
+    PLONG Values;
+}MIXERVOLUME_DATA, *LPMIXERVOLUME_DATA;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    ULONG DeviceId;
+    HANDLE hDevice;
+    HANDLE hDeviceInterfaceKey;
+    LPWSTR DeviceName;
+    PTOPOLOGY Topology;
+    LPMIXER_INFO MixerInfo;
+}MIXER_DATA, *LPMIXER_DATA;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    ULONG DeviceId;
+    ULONG PinId;
+    union
+    {
+        WAVEOUTCAPSW OutCaps;
+        WAVEINCAPSW  InCaps;
+    }u;
+}WAVE_INFO, *LPWAVE_INFO;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    ULONG DeviceId;
+    ULONG PinId;
+    union
+    {
+        MIDIOUTCAPSW OutCaps;
+        MIDIINCAPSW InCaps;
+    }u;
+
+}MIDI_INFO, *LPMIDI_INFO;
+
+typedef struct
+{
+    ULONG MixerListCount;
+    LIST_ENTRY MixerList;
+
+    ULONG MixerDataCount;
+    LIST_ENTRY MixerData;
+
+    ULONG WaveInListCount;
+    LIST_ENTRY WaveInList;
+
+    ULONG WaveOutListCount;
+    LIST_ENTRY WaveOutList;
+
+    ULONG MidiInListCount;
+    LIST_ENTRY MidiInList;
+
+    ULONG MidiOutListCount;
+    LIST_ENTRY MidiOutList;
+}MIXER_LIST, *PMIXER_LIST;
+
+typedef struct
+{
+    LIST_ENTRY Entry;
+    PVOID MixerEventContext;
+    PMIXER_EVENT MixerEventRoutine;
+
+}EVENT_NOTIFICATION_ENTRY, *PEVENT_NOTIFICATION_ENTRY;
+
+#define DESTINATION_LINE (0xFFFF0000)
+#define SOURCE_LINE (0x10000)
+ULONG
+MMixerGetFilterPinCount(
+    IN PMIXER_CONTEXT MixerContext,
+    IN HANDLE hMixer);
+
+LPGUID
+MMixerGetNodeType(
+    IN PKSMULTIPLE_ITEM MultipleItem,
+    IN ULONG Index);
+
+MIXER_STATUS
+MMixerGetNodeIndexes(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PKSMULTIPLE_ITEM MultipleItem,
+    IN ULONG NodeIndex,
+    IN ULONG bNode,
+    IN ULONG bFrom,
+    OUT PULONG NodeReferenceCount,
+    OUT PULONG *NodeReference);
+
+PKSTOPOLOGY_CONNECTION
+MMixerGetConnectionByIndex(
+    IN PKSMULTIPLE_ITEM MultipleItem,
+    IN ULONG Index);
+
+ULONG
+MMixerGetControlTypeFromTopologyNode(
+    IN LPGUID NodeType);
+
+LPMIXERLINE_EXT
+MMixerGetSourceMixerLineByLineId(
+    LPMIXER_INFO MixerInfo,
+    DWORD dwLineID);
+
+MIXER_STATUS
+MMixerGetFilterTopologyProperty(
+    IN PMIXER_CONTEXT MixerContext,
+    IN HANDLE hMixer,
+    IN ULONG PropertyId,
+    OUT PKSMULTIPLE_ITEM * OutMultipleItem);
+
+VOID
+MMixerFreeMixerInfo(
+    IN PMIXER_CONTEXT MixerContext,
+    IN LPMIXER_INFO MixerInfo);
+
+MIXER_STATUS
+MMixerGetPhysicalConnection(
+    IN PMIXER_CONTEXT MixerContext,
+    IN HANDLE hMixer,
+    IN ULONG PinId,
+    OUT PKSPIN_PHYSICALCONNECTION *OutConnection);
+
+MIXER_STATUS
+MMixerSetupFilter(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PMIXER_LIST MixerList,
+    IN LPMIXER_DATA MixerData,
+    IN PULONG DeviceCount);
+
+PKSPIN_CONNECT
+MMixerAllocatePinConnect(
+    IN PMIXER_CONTEXT MixerContext,
+    ULONG DataFormatSize);
+
+MIXER_STATUS
+MMixerGetAudioPinDataRanges(
+    IN PMIXER_CONTEXT MixerContext,
+    IN HANDLE hDevice,
+    IN ULONG PinId,
+    IN OUT PKSMULTIPLE_ITEM * OutMultipleItem);
+
+VOID
+MMixerInitializeMidiForFilter(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PMIXER_LIST MixerList,
+    IN LPMIXER_DATA MixerData,
+    IN PTOPOLOGY Topology);
+
+MIXER_STATUS
+MMixerVerifyContext(
+    IN PMIXER_CONTEXT MixerContext);
+
+LPMIXER_INFO
+MMixerGetMixerInfoByIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN ULONG MixerIndex);
+
+LPMIXERLINE_EXT
+MMixerGetSourceMixerLineByComponentType(
+    LPMIXER_INFO MixerInfo,
+    DWORD dwComponentType);
+
+MIXER_STATUS
+MMixerGetMixerControlById(
+    LPMIXER_INFO MixerInfo,
+    DWORD dwControlID,
+    LPMIXERLINE_EXT *MixerLine,
+    LPMIXERCONTROL_EXT *MixerControl,
+    PULONG NodeId);
+
+MIXER_STATUS
+MMixerSetGetMuteControlDetails(
+    IN PMIXER_CONTEXT MixerContext,
+    IN LPMIXER_INFO MixerInfo,
+    IN LPMIXERCONTROL_EXT MixerControl,
+    IN ULONG dwLineID,
+    IN LPMIXERCONTROLDETAILS MixerControlDetails,
+    IN ULONG bSet);
+
+MIXER_STATUS
+MMixerSetGetVolumeControlDetails(
+    IN PMIXER_CONTEXT MixerContext,
+    IN LPMIXER_INFO MixerInfo,
+    IN ULONG NodeId,
+    IN ULONG bSet,
+    LPMIXERCONTROL_EXT MixerControl,
+    IN LPMIXERCONTROLDETAILS MixerControlDetails,
+    LPMIXERLINE_EXT MixerLine);
+
+MIXER_STATUS
+MMixerSetGetMuxControlDetails(
+    IN PMIXER_CONTEXT MixerContext,
+    IN LPMIXER_INFO MixerInfo,
+    IN ULONG NodeId,
+    IN ULONG bSet,
+    IN ULONG Flags,
+    LPMIXERCONTROL_EXT MixerControl,
+    IN LPMIXERCONTROLDETAILS MixerControlDetails,
+    LPMIXERLINE_EXT MixerLine);
+
+
+MIXER_STATUS
+MMixerSetGetControlDetails(
+    IN PMIXER_CONTEXT MixerContext,
+    IN HANDLE hMixer,
+    IN ULONG NodeId,
+    IN ULONG bSet,
+    IN ULONG PropertyId,
+    IN ULONG Channel,
+    IN PLONG InputValue);
+
+LPMIXER_DATA
+MMixerGetDataByDeviceId(
+    IN PMIXER_LIST MixerList,
+    IN ULONG DeviceId);
+
+LPMIXER_DATA
+MMixerGetDataByDeviceName(
+    IN PMIXER_LIST MixerList,
+    IN LPWSTR DeviceName);
+
+MIXER_STATUS
+MMixerCreateMixerData(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PMIXER_LIST MixerList,
+    IN ULONG DeviceId,
+    IN LPWSTR DeviceName,
+    IN HANDLE hDevice,
+    IN HANDLE hKey);
+
+MIXER_STATUS
+MMixerInitializeWaveInfo(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PMIXER_LIST MixerList,
+    IN LPMIXER_DATA MixerData,
+    IN LPWSTR DeviceName,
+    IN ULONG bWaveIn,
+    IN ULONG PinCount,
+    IN PULONG Pins);
+
+MIXER_STATUS
+MMixerAddEvent(
+    IN PMIXER_CONTEXT MixerContext,
+    IN OUT LPMIXER_INFO MixerInfo,
+    IN PVOID MixerEvent,
+    IN PMIXER_EVENT MixerEventRoutine);
+
+MIXER_STATUS
+MMixerGetDeviceName(
+    IN PMIXER_CONTEXT MixerContext,
+    OUT LPWSTR DeviceName,
+    IN HANDLE hKey);
+
+VOID
+MMixerInitializePinConnect(
+    IN OUT PKSPIN_CONNECT PinConnect,
+    IN ULONG PinId);
+
+MIXER_STATUS
+MMixerGetPinDataFlowAndCommunication(
+    IN PMIXER_CONTEXT MixerContext,
+    IN HANDLE hDevice,
+    IN ULONG PinId,
+    OUT PKSPIN_DATAFLOW DataFlow,
+    OUT PKSPIN_COMMUNICATION Communication);
+
+VOID
+MMixerHandleAlternativeMixers(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PMIXER_LIST MixerList,
+    IN LPMIXER_DATA MixerData,
+    IN PTOPOLOGY Topology);
+
+MIXER_STATUS
+MMixerGetMixerByName(
+    IN PMIXER_LIST MixerList,
+    IN LPWSTR MixerName,
+    OUT LPMIXER_INFO *MixerInfo);
+
+/* topology.c */
+
+MIXER_STATUS
+MMixerCreateTopology(
+    IN PMIXER_CONTEXT MixerContext,
+    IN ULONG PinCount,
+    IN PKSMULTIPLE_ITEM NodeConnections,
+    IN PKSMULTIPLE_ITEM NodeTypes,
+    OUT PTOPOLOGY *OutTopology);
+
+VOID
+MMixerGetAllUpOrDownstreamPinsFromNodeIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    IN ULONG bUpStream,
+    OUT PULONG OutPinsCount,
+    OUT PULONG OutPins);
+
+MIXER_STATUS
+MMixerGetAllUpOrDownstreamPinsFromPinIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG PinIndex,
+    IN ULONG bUpStream,
+    OUT PULONG OutPinsCount,
+    OUT PULONG OutPins);
+
+VOID
+MMixerGetNextNodesFromPinIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG PinIndex,
+    IN ULONG bUpStream,
+    OUT PULONG OutNodesCount,
+    OUT PULONG OutNodes);
+
+MIXER_STATUS
+MMixerAllocateTopologyPinArray(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    OUT PULONG * OutPins);
+
+MIXER_STATUS
+MMixerAllocateTopologyNodeArray(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    OUT PULONG * OutPins);
+
+VOID
+MMixerGetAllUpOrDownstreamNodesFromPinIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG PinIndex,
+    IN ULONG bUpStream,
+    OUT PULONG OutNodesCount,
+    OUT PULONG OutNodes);
+
+VOID
+MMixerIsNodeTerminator(
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    OUT ULONG * bTerminator);
+
+VOID
+MMixerGetNextNodesFromNodeIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    IN ULONG bUpStream,
+    OUT PULONG OutNodesCount,
+    OUT PULONG OutNodes);
+
+LPGUID
+MMixerGetNodeTypeFromTopology(
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex);
+
+MIXER_STATUS
+MMixerGetAllUpOrDownstreamNodesFromNodeIndex(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    IN ULONG bUpStream,
+    OUT PULONG OutNodesCount,
+    OUT PULONG OutNodes);
+
+MIXER_STATUS
+MMixerIsNodeConnectedToPin(
+    IN PMIXER_CONTEXT MixerContext,
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    IN ULONG PinId,
+    IN ULONG bUpStream,
+    OUT PULONG bConnected);
+
+ULONG
+MMixerGetNodeIndexFromGuid(
+    IN PTOPOLOGY Topology,
+    IN const GUID *NodeType);
+
+VOID
+MMixerSetTopologyNodeReserved(
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex);
+
+VOID
+MMixerIsTopologyNodeReserved(
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    OUT PULONG bReserved);
+
+VOID
+MMixerSetTopologyPinReserved(
+    IN PTOPOLOGY Topology,
+    IN ULONG PinId);
+
+VOID
+MMixerIsTopologyPinReserved(
+    IN PTOPOLOGY Topology,
+    IN ULONG PinId,
+    OUT PULONG bReserved);
+
+VOID
+MMixerGetTopologyPinCount(
+    IN PTOPOLOGY Topology,
+    OUT PULONG PinCount);
+
+VOID
+MMixerGetConnectedFromLogicalTopologyPins(
+    IN PTOPOLOGY Topology,
+    IN ULONG NodeIndex,
+    OUT PULONG OutPinCount,
+    OUT PULONG OutPins);
+
+VOID
+MMixerPrintTopology();
+
+#endif /* _MMIXER_PCH_ */

Modification de propriÃ©tÃ©s sur lib/drivers/sound/mmixer/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lib/drivers/sound/mment4/precomp.h
===================================================================
--- lib/drivers/sound/mment4/precomp.h	(rÃ©vision 61927)
+++ lib/drivers/sound/mment4/precomp.h	(copie de travail)
@@ -1,3 +1,6 @@
+#ifndef _MMENT4_PCH_
+#define _MMENT4_PCH_
+
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
@@ -7,3 +10,5 @@
 #include <sndnames.h>
 #include <sndtypes.h>
 #include <mmebuddy.h>
+
+#endif /* _MMENT4_PCH_ */
Index: lib/drivers/sound/mment4/CMakeLists.txt
===================================================================
--- lib/drivers/sound/mment4/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/sound/mment4/CMakeLists.txt	(copie de travail)
@@ -8,8 +8,9 @@
 list(APPEND SOURCE
     detect.c
     registry.c
-    control.c)
+    control.c
+    precomp.h)
 
 add_library(mment4 ${SOURCE})
-add_pch(mment4 precomp.h)
+add_pch(mment4 precomp.h SOURCE)
 add_dependencies(mment4 psdk)
Index: lib/drivers/sound/mmebuddy/precomp.h
===================================================================
--- lib/drivers/sound/mmebuddy/precomp.h	(rÃ©vision 61927)
+++ lib/drivers/sound/mmebuddy/precomp.h	(copie de travail)
@@ -1,5 +1,10 @@
+#ifndef _MMEBUDDY_PCH_
+#define _MMEBUDDY_PCH_
+
 #include <stdarg.h>
 #include <windef.h>
 #include <mmddk.h>
 #include <sndtypes.h>
 #include <mmebuddy.h>
+
+#endif /* _MMEBUDDY_PCH_ */
Index: lib/drivers/sound/mmebuddy/CMakeLists.txt
===================================================================
--- lib/drivers/sound/mmebuddy/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/drivers/sound/mmebuddy/CMakeLists.txt	(copie de travail)
@@ -23,8 +23,9 @@
     wave/wodMessage.c
     wave/format.c
     wave/header.c
-    wave/streaming.c)
+    wave/streaming.c
+    precomp.h)
 
 add_library(mmebuddy ${SOURCE})
-add_pch(mmebuddy precomp.h)
+add_pch(mmebuddy precomp.h SOURCE)
 add_dependencies(mmebuddy psdk)
Index: lib/recyclebin/recyclebin.h
===================================================================
--- lib/recyclebin/recyclebin.h	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin.h	(copie de travail)
@@ -8,6 +8,8 @@
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>
@@ -14,6 +16,7 @@
 #include <winver.h>
 #include <shellapi.h>
 #include <objbase.h>
+
 #define ANY_SIZE 1
 
 /* Structures used by the API Interface */
Index: lib/recyclebin/recyclebin_v5.c
===================================================================
--- lib/recyclebin/recyclebin_v5.c	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin_v5.c	(copie de travail)
@@ -6,11 +6,9 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
-#include "recyclebin_v5.h"
-#include <stdio.h>
+#include "recyclebin_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
+#include "sddl.h"
 
 static BOOL
 IntDeleteRecursive(
Index: lib/recyclebin/recyclebin_v5_enumerator.c
===================================================================
--- lib/recyclebin/recyclebin_v5_enumerator.c	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin_v5_enumerator.c	(copie de travail)
@@ -6,11 +6,8 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
-#include "recyclebin_v5.h"
+#include "recyclebin_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
-
 struct RecycleBin5File
 {
 	ULONG ref;
Index: lib/recyclebin/recyclebin_generic.c
===================================================================
--- lib/recyclebin/recyclebin_generic.c	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin_generic.c	(copie de travail)
@@ -6,12 +6,8 @@
  * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
-
 struct RecycleBinGeneric
 {
 	ULONG ref;
Index: lib/recyclebin/CMakeLists.txt
===================================================================
--- lib/recyclebin/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/recyclebin/CMakeLists.txt	(copie de travail)
@@ -1,12 +1,13 @@
 
 list(APPEND SOURCE
-    guid.c
     recyclebin.c
     recyclebin_generic.c
     recyclebin_generic_enumerator.c
     recyclebin_v5.c
-    recyclebin_v5_enumerator.c)
+    recyclebin_v5_enumerator.c
+    recyclebin_private.h)
 
-add_library(recyclebin ${SOURCE})
+add_library(recyclebin ${SOURCE} guid.c)
+add_pch(recyclebin recyclebin_private.h SOURCE)
 add_dependencies(recyclebin psdk)
 
Index: lib/recyclebin/recyclebin_generic_enumerator.c
===================================================================
--- lib/recyclebin/recyclebin_generic_enumerator.c	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin_generic_enumerator.c	(copie de travail)
@@ -6,12 +6,8 @@
  * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
-
 struct RecycleBinGenericEnum
 {
 	ULONG ref;
Index: lib/recyclebin/recyclebin_private.h
===================================================================
--- lib/recyclebin/recyclebin_private.h	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin_private.h	(copie de travail)
@@ -1,6 +1,15 @@
+#ifndef _RECYCLEBIN_PRIVATE_H_
+#define _RECYCLEBIN_PRIVATE_H_
+
+#include <stdio.h>
+
+#define COBJMACROS
+
 #include "recyclebin.h"
-#include "sddl.h"
+#include "recyclebin_v5.h"
+
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 /* Defines */
 
@@ -38,3 +47,5 @@
 /* recyclebin_v5.c */
 
 HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown);
+
+#endif /* _RECYCLEBIN_PRIVATE_H_ */
Index: lib/recyclebin/recyclebin_v5.h
===================================================================
--- lib/recyclebin/recyclebin_v5.h	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin_v5.h	(copie de travail)
@@ -3,8 +3,6 @@
  * Copyright (C) 2006 Hervé Poussineau <hpoussin@reactos.org>
  */
 
-#include "recyclebin_private.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
Index: lib/recyclebin/recyclebin.c
===================================================================
--- lib/recyclebin/recyclebin.c	(rÃ©vision 61927)
+++ lib/recyclebin/recyclebin.c	(copie de travail)
@@ -6,12 +6,8 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
-
 BOOL WINAPI
 CloseRecycleBinHandle(
 	IN HANDLE hDeletedFile)
Index: lib/atl/atlwin.h
===================================================================
--- lib/atl/atlwin.h	(rÃ©vision 61927)
+++ lib/atl/atlwin.h	(copie de travail)
@@ -153,21 +153,32 @@
 class CWndProcThunk
 {
 public:
-	thunkCode								m_thunk;
+	thunkCode								*m_pthunk;
 	_AtlCreateWndData						cd;
 public:
+
+    CWndProcThunk()
+    {
+        m_pthunk = (thunkCode*)VirtualAlloc(NULL, sizeof(thunkCode), MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+    }
+
+    ~CWndProcThunk()
+    {
+        VirtualFree(m_pthunk, 0, MEM_RELEASE);
+    }
+
 	BOOL Init(WNDPROC proc, void *pThis)
 	{
-		m_thunk.m_mov = 0x042444C7;
-		m_thunk.m_this = PtrToUlong(pThis);
-		m_thunk.m_jmp = 0xe9;
-		m_thunk.m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode)));
+		m_pthunk->m_mov = 0x042444C7;
+		m_pthunk->m_this = PtrToUlong(pThis);
+		m_pthunk->m_jmp = 0xe9;
+		m_pthunk->m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(m_pthunk) + sizeof(thunkCode)));
 		return TRUE;
 	}
 
 	WNDPROC GetWNDPROC()
 	{
-		return reinterpret_cast<WNDPROC>(&m_thunk);
+		return reinterpret_cast<WNDPROC>(m_pthunk);
 	}
 };
 
@@ -360,7 +371,7 @@
 	}
 };
 
-_declspec(selectany) RECT CWindow::rcDefault = { CW_USEDEFAULT, CW_USEDEFAULT, 0, 0 };
+__declspec(selectany) RECT CWindow::rcDefault = { CW_USEDEFAULT, CW_USEDEFAULT, 0, 0 };
 
 template <class TBase = CWindow, class TWinTraits = CControlWinTraits>
 class CWindowImplBaseT : public TBase, public CMessageMap
Index: lib/sdk/crt/string/scanf.h
===================================================================
--- lib/sdk/crt/string/scanf.h	(rÃ©vision 61927)
+++ lib/sdk/crt/string/scanf.h	(copie de travail)
@@ -26,7 +26,7 @@
 #ifdef WIDE_SCANF
 #define _CHAR_ wchar_t
 #define _EOF_ WEOF
-#define _EOF_RET WEOF
+#define _EOF_RET (short)WEOF
 #define _ISSPACE_(c) iswspace(c)
 #define _ISDIGIT_(c) iswdigit(c)
 #define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */
@@ -88,8 +88,11 @@
 #endif /* STRING */
 #endif /* CONSOLE */
 #endif /* WIDE_SCANF */
+
     nch = _GETC_(file);
-    if (nch == _EOF_) return _EOF_RET;
+    if (nch == _EOF_) {
+        return _EOF_RET;
+    }
 
     while (*format) {
 	/* a whitespace character in the format string causes scanf to read,
@@ -131,8 +134,14 @@
 	    /* read prefix (if any) */
 	    while (!prefix_finished) {
 		switch(*format) {
-		case 'h': h_prefix = 1; break;
-		case 'l': l_prefix = 1; break;
+		case 'h': h_prefix++; break;
+		case 'l':
+                    if(*(format+1) == 'l') {
+                        I64_prefix = 1;
+                        format++;
+                    }
+                    l_prefix = 1;
+                    break;
 		case 'w': w_prefix = 1; break;
 		case 'L': L_prefix = 1; break;
 		case 'I':
@@ -227,15 +236,15 @@
 #define _SET_NUMBER_(type) *va_arg(ap, type*) = (type)(negative ? -cur : cur)
 			if (I64_prefix) _SET_NUMBER_(LONGLONG);
 			else if (l_prefix) _SET_NUMBER_(LONG);
-			else if (h_prefix) _SET_NUMBER_(short int);
+			else if (h_prefix == 1) _SET_NUMBER_(short int);
 			else _SET_NUMBER_(int);
 		    }
                 }
                 break;
-	    case 'e':
-	    case 'E':
-	    case 'f':
-	    case 'g':
+            case 'e':
+            case 'E':
+            case 'f':
+            case 'g':
             case 'G': { /* read a float */
                     long double cur = 0;
 		    int negative = 0;
@@ -242,11 +251,12 @@
                     /* skip initial whitespace */
                     while ((nch!=_EOF_) && _ISSPACE_(nch))
                         nch = _GETC_(file);
-		    /* get sign. */
+
+                    /* get sign. */
                     if (nch == '-' || nch == '+') {
-			negative = (nch=='-');
-			if (width>0) width--;
-			if (width==0) break;
+                        negative = (nch=='-');
+                        if (width>0) width--;
+                        if (width==0) break;
                         nch = _GETC_(file);
                     }
 		    /* get first digit. */
@@ -268,12 +278,12 @@
                     if (width!=0 && nch == '.') {
                         long double dec = 1;
                         nch = _GETC_(file);
-			if (width>0) width--;
+                        if (width>0) width--;
                         while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) {
                             dec /= 10;
                             cur += dec * (nch - '0');
                             nch = _GETC_(file);
-			    if (width>0) width--;
+                            if (width>0) width--;
                         }
                     }
 		    /* handle exponent */
@@ -281,12 +291,12 @@
 			int exponent = 0, negexp = 0;
 			double expcnt, shift;
                         nch = _GETC_(file);
-			if (width>0) width--;
+                        if (width>0) width--;
 			/* possible sign on the exponent */
 			if (width!=0 && (nch=='+' || nch=='-')) {
 			    negexp = (nch=='-');
                             nch = _GETC_(file);
-			    if (width>0) width--;
+                            if (width>0) width--;
 			}
 			/* exponent digits */
 			while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) {
@@ -293,7 +303,7 @@
 			    exponent *= 10;
 			    exponent += (nch - '0');
                             nch = _GETC_(file);
-			    if (width>0) width--;
+                            if (width>0) width--;
                         }
 			/* update 'cur' with this exponent. */
 			expcnt = 10;
@@ -309,9 +319,9 @@
                     st = 1;
                     if (!suppress) {
 			if (L_prefix) _SET_NUMBER_(long double);
-			else if (l_prefix) _SET_NUMBER_(double);
-			else _SET_NUMBER_(float);
-		    }
+                        else if (l_prefix) _SET_NUMBER_(double);
+                        else _SET_NUMBER_(float);
+                    }
                 }
                 break;
 		/* According to msdn,
@@ -488,9 +498,9 @@
                     /* terminate */
                     if (!suppress) *sptr = 0;
 #ifdef _LIBCNT_
-            RtlFreeHeap(RtlGetProcessHeap(), 0, Mask);
+                    RtlFreeHeap(RtlGetProcessHeap(), 0, Mask);
 #else
-            HeapFree(GetProcessHeap(), 0, Mask);
+                    HeapFree(GetProcessHeap(), 0, Mask);
 #endif
                 }
                 break;
@@ -527,6 +537,7 @@
     if (nch!=_EOF_) {
 	_UNGETC_(nch, file);
     }
+
     TRACE("returning %d\n", rd);
     return rd;
 }
Index: lib/sdk/crt/stdio/file.c
===================================================================
--- lib/sdk/crt/stdio/file.c	(rÃ©vision 61927)
+++ lib/sdk/crt/stdio/file.c	(copie de travail)
@@ -734,10 +734,8 @@
 /* _flushall calls fflush which calls _flushall */
 int CDECL fflush(FILE* file);
 
-/*********************************************************************
- *		_flushall (MSVCRT.@)
- */
-int CDECL _flushall(void)
+/* INTERNAL: Flush all stream buffer */
+static int flush_all_buffers(int mask)
 {
   int i, num_flushed = 0;
   FILE *file;
@@ -748,8 +746,8 @@
 
     if (file->_flag)
     {
-      if(file->_flag & _IOWRT) {
-	fflush(file);
+      if(file->_flag & mask) {
+        fflush(file);
         num_flushed++;
       }
     }
@@ -761,21 +759,40 @@
 }
 
 /*********************************************************************
+ *		_flushall (MSVCRT.@)
+ */
+int CDECL _flushall(void)
+{
+    return flush_all_buffers(_IOWRT | _IOREAD);
+}
+
+/*********************************************************************
  *		fflush (MSVCRT.@)
  */
 int CDECL fflush(FILE* file)
 {
     if(!file) {
-        _flushall();
+        flush_all_buffers(_IOWRT);
     } else if(file->_flag & _IOWRT) {
         int res;
 
         _lock_file(file);
         res = flush_buffer(file);
+        /* FIXME
+        if(!res && (file->_flag & _IOCOMMIT))
+            res = _commit(file->_file) ? EOF : 0;
+        */
         _unlock_file(file);
 
         return res;
-    }
+    } else if(file->_flag & _IOREAD) {
+        _lock_file(file);
+        file->_cnt = 0;
+        file->_ptr = file->_base;
+        _unlock_file(file);
+
+        return 0;
+    }    
     return 0;
 }
 
Index: lib/epsapi/CMakeLists.txt
===================================================================
--- lib/epsapi/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/epsapi/CMakeLists.txt	(copie de travail)
@@ -1,8 +1,10 @@
 
-add_library(epsapi
+list(APPEND SOURCE
     enum/drivers.c
     enum/modules.c
-    enum/processes.c)
+    enum/processes.c
+    enum/precomp.h)
 
-add_pch(epsapi enum/precomp.h)
+add_library(epsapi ${SOURCE})
+add_pch(epsapi enum/precomp.h SOURCE)
 add_dependencies(epsapi psdk)
Index: lib/epsapi/enum/precomp.h
===================================================================
--- lib/epsapi/enum/precomp.h	(rÃ©vision 61927)
+++ lib/epsapi/enum/precomp.h	(copie de travail)
@@ -1,4 +1,9 @@
+#ifndef _EPSAPI_PCH_
+#define _EPSAPI_PCH_
+
 #define NTOS_MODE_USER
 #include <ndk/exfuncs.h>
 
 #include <epsapi/epsapi.h>
+
+#endif /* _EPSAPI_PCH_ */
Index: lib/cmlib/cmlib.h
===================================================================
--- lib/cmlib/cmlib.h	(rÃ©vision 61927)
+++ lib/cmlib/cmlib.h	(copie de travail)
@@ -5,6 +5,9 @@
  *            Copyright 2001 - 2005 Eric Kohl
  */
 
+#ifndef _CMLIB_H_
+#define _CMLIB_H_
+
 //
 // Debug support switch
 //
@@ -406,3 +409,5 @@
 ULONG CMAPI
 HvpHiveHeaderChecksum(
    PHBASE_BLOCK HiveHeader);
+
+#endif /* _CMLIB_H_ */
Index: lib/cmlib/CMakeLists.txt
===================================================================
--- lib/cmlib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/cmlib/CMakeLists.txt	(copie de travail)
@@ -11,12 +11,13 @@
     hivecell.c
     hiveinit.c
     hivesum.c
-    hivewrt.c)
+    hivewrt.c
+    cmlib.h)
 
 if(CMAKE_CROSSCOMPILING)
     add_library(cmlib ${SOURCE})
     add_dependencies(cmlib bugcodes)
-    add_pch(cmlib cmlib.h)
+    add_pch(cmlib cmlib.h SOURCE)
 else()
     add_definitions(
         -D__NO_CTYPE_INLINES
Index: lib/rossym/getraw.c
===================================================================
--- lib/rossym/getraw.c	(rÃ©vision 61927)
+++ lib/rossym/getraw.c	(copie de travail)
@@ -8,13 +8,10 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 ULONG
 RosSymGetRawDataLength(PROSSYM_INFO RosSymInfo)
 {
@@ -39,5 +36,3 @@
   memcpy((char *) RawData + RosSymHeader->StringsOffset, RosSymInfo->Strings,
          RosSymHeader->StringsLength);
 }
-
-/* EOF */
Index: lib/rossym/initkm.c
===================================================================
--- lib/rossym/initkm.c	(rÃ©vision 61927)
+++ lib/rossym/initkm.c	(copie de travail)
@@ -10,13 +10,10 @@
 #include <ntdef.h>
 #undef DECLSPEC_IMPORT
 #define DECLSPEC_IMPORT
-#include <ntddk.h>
+#include <wdm.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 #define TAG_ROSSYM 'MYSR'
 
 static PVOID
Index: lib/rossym/zwfile.c
===================================================================
--- lib/rossym/zwfile.c	(rÃ©vision 61927)
+++ lib/rossym/zwfile.c	(copie de travail)
@@ -8,13 +8,10 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <wdm.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 BOOLEAN
 RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size)
 {
@@ -48,5 +45,3 @@
 
   return NT_SUCCESS(Status);
 }
-
-/* EOF */
Index: lib/rossym/frommem.c
===================================================================
--- lib/rossym/frommem.c	(rÃ©vision 61927)
+++ lib/rossym/frommem.c	(copie de travail)
@@ -8,7 +8,7 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 #include <ntimage.h>
Index: lib/rossym/delete.c
===================================================================
--- lib/rossym/delete.c	(rÃ©vision 61927)
+++ lib/rossym/delete.c	(copie de travail)
@@ -8,17 +8,12 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 VOID
 RosSymDelete(PROSSYM_INFO RosSymInfo)
 {
   RosSymFreeMem(RosSymInfo);
 }
-
-/* EOF */
Index: lib/rossym/init.c
===================================================================
--- lib/rossym/init.c	(rÃ©vision 61927)
+++ lib/rossym/init.c	(copie de travail)
@@ -18,5 +18,3 @@
 {
   RosSymCallbacks = *Callbacks;
 }
-
-/* EOF */
Index: lib/rossym/fromfile.c
===================================================================
--- lib/rossym/fromfile.c	(rÃ©vision 61927)
+++ lib/rossym/fromfile.c	(copie de travail)
@@ -8,7 +8,7 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 #include <ntimage.h>
Index: lib/rossym/initum.c
===================================================================
--- lib/rossym/initum.c	(rÃ©vision 61927)
+++ lib/rossym/initum.c	(copie de travail)
@@ -13,9 +13,6 @@
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 static PVOID
 RosSymAllocMemUM(ULONG_PTR Size)
 {
@@ -41,5 +38,3 @@
 
   RosSymInit(&KmCallbacks);
 }
-
-/* EOF */
Index: lib/rossym/fromraw.c
===================================================================
--- lib/rossym/fromraw.c	(rÃ©vision 61927)
+++ lib/rossym/fromraw.c	(copie de travail)
@@ -8,7 +8,7 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
Index: lib/rossym/find.c
===================================================================
--- lib/rossym/find.c	(rÃ©vision 61927)
+++ lib/rossym/find.c	(copie de travail)
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  */
 
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
Index: lib/pseh/i386/pseh3.c
===================================================================
--- lib/pseh/i386/pseh3.c	(rÃ©vision 61927)
+++ lib/pseh/i386/pseh3.c	(copie de travail)
@@ -34,6 +34,8 @@
 #include <windef.h>
 #include <winnt.h>
 
+/* We need the full structure with all non-volatile */
+#define _SEH3$_FRAME_ALL_NONVOLATILES 1
 #include "pseh3.h"
 #include "pseh3_asmdef.h"
 
@@ -48,8 +50,9 @@
 C_ASSERT(SEH3_SCOPE_TABLE_Filter == FIELD_OFFSET(SEH3$_SCOPE_TABLE, Filter));
 C_ASSERT(SEH3_SCOPE_TABLE_Target == FIELD_OFFSET(SEH3$_SCOPE_TABLE, Target));
 
-static inline
-void _SEH3$_Unregister(
+void
+__attribute__((regparm(1)))
+_SEH3$_Unregister(
     volatile SEH3$_REGISTRATION_FRAME *Frame)
 {
     if (Frame->Handler)
@@ -60,8 +63,8 @@
 
 static inline
 LONG
-_SEH3$_InvokeFilter(
-    PVOID Record,
+_SEH3$_InvokeNestedFunctionFilter(
+    PSEH3$_REGISTRATION_FRAME RegistrationFrame,
     PVOID Filter)
 {
     LONG FilterResult;
@@ -75,20 +78,60 @@
         /* The result is the frame base address that we passed in (0) plus the
            offset to the registration record. */
         "negl %%eax\n\t"
-        "addl %[Record], %%eax\n\t"
+        "addl %[RegistrationFrame], %%eax\n\t"
 
         /* Second call to get the filter result */
         "mov $1, %%ecx\n\t"
         "call *%[Filter]\n\t"
         : "=a"(FilterResult)
-        : [Record] "m" (Record), [Filter] "m" (Filter)
+        : [RegistrationFrame] "m" (RegistrationFrame), [Filter] "m" (Filter)
         : "ecx", "edx");
 
     return FilterResult;
 }
 
+long
+__attribute__((regparm(1)))
+_SEH3$_InvokeEmbeddedFilter(
+    PSEH3$_REGISTRATION_FRAME RegistrationFrame);
+
+long
+__attribute__((regparm(1)))
+_SEH3$_InvokeEmbeddedFilterFromRegistration(
+    PSEH3$_REGISTRATION_FRAME RegistrationFrame);
+
 static inline
 LONG
+_SEH3$_InvokeFilter(
+    PSEH3$_REGISTRATION_FRAME RegistrationFrame,
+    PVOID Filter)
+{
+    LONG FilterResult;
+
+    if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_NESTED_HANDLER)
+    {
+        return _SEH3$_InvokeNestedFunctionFilter(RegistrationFrame, Filter);
+    }
+    else if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_CPP_HANDLER)
+    {
+        /* Call the embedded filter function */
+        return _SEH3$_InvokeEmbeddedFilter(RegistrationFrame);
+    }
+    else if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_CLANG_HANDLER)
+    {
+        return _SEH3$_InvokeEmbeddedFilterFromRegistration(RegistrationFrame);
+    }
+    else
+    {
+        /* Should not happen! Skip this handler */
+        FilterResult = EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    return FilterResult;
+}
+
+static inline
+LONG
 _SEH3$_GetFilterResult(
     PSEH3$_REGISTRATION_FRAME Record)
 {
@@ -133,45 +176,51 @@
 _SEH3$_JumpToTarget(
     PSEH3$_REGISTRATION_FRAME RegistrationFrame)
 {
-    asm volatile (
-        /* Load the registers */
-        "movl 20(%%ecx), %%esp\n"
-        "movl 24(%%ecx), %%ebp\n"
+    if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_CLANG_HANDLER)
+    {
+        asm volatile (
+            /* Load the registers */
+            "movl 20(%%ecx), %%esp\n"
+            "movl 24(%%ecx), %%ebp\n"
 
-        /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */
-        "addl $4, %%esp\n"
+            /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */
+            "addl $4, %%esp\n"
 
-        /* Jump into the exception handler */
-        "jmp *%[Target]\n"
-        : :
-        "c" (RegistrationFrame),
-        "a" (RegistrationFrame->ScopeTable),
-         [Target] "m" (RegistrationFrame->ScopeTable->Target)
-    );
+            /* Jump into the exception handler */
+            "jmp *%[Target]\n"
+            : :
+            "c" (RegistrationFrame),
+            "a" (RegistrationFrame->ScopeTable),
+             [Target] "m" (RegistrationFrame->ScopeTable->Target)
+        );
+    }
+    else
+    {
+        asm volatile (
+            /* Load the registers */
+            "movl 20(%%ecx), %%esp\n"
+            "movl 24(%%ecx), %%ebp\n"
 
+            /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */
+            "addl $4, %%esp\n"
+
+            /* Jump into the exception handler */
+            "jmp *%[Target]\n"
+            : :
+            "c" (RegistrationFrame),
+            "a" (RegistrationFrame->ScopeTable),
+             [Target] "m" (RegistrationFrame->ScopeTable->Target)
+        );
+    }
+
     __builtin_unreachable();
 }
 
-static inline
 void
+__fastcall
 _SEH3$_CallRtlUnwind(
-    PSEH3$_REGISTRATION_FRAME RegistrationFrame)
-{
-    LONG ClobberedEax;
+    PSEH3$_REGISTRATION_FRAME RegistrationFrame);
 
-    asm volatile(
-        "push %%ebp\n"
-        "push $0\n"
-        "push $0\n"
-        "push $0\n"
-        "push %[TargetFrame]\n"
-        "call _RtlUnwind@16\n"
-        "pop %%ebp\n"
-        : "=a" (ClobberedEax)
-        : [TargetFrame] "a" (RegistrationFrame)
-        : "ebx", "ecx", "edx", "esi",
-          "edi", "flags", "memory");
-}
 
 EXCEPTION_DISPOSITION
 __cdecl
@@ -189,6 +238,10 @@
     /* Clear the direction flag. */
     asm volatile ("cld\n" : : : "memory");
 
+    /* Save the exception pointers on the stack */
+    ExceptionPointers.ExceptionRecord = ExceptionRecord;
+    ExceptionPointers.ContextRecord = ContextRecord;
+
     /* Check if this is an unwind */
     if (ExceptionRecord->ExceptionFlags & EXCEPTION_UNWINDING)
     {
@@ -197,10 +250,6 @@
     }
     else
     {
-        /* Save the exception pointers on the stack */
-        ExceptionPointers.ExceptionRecord = ExceptionRecord;
-        ExceptionPointers.ContextRecord = ContextRecord;
-
         /* Loop all frames for this registration */
         CurrentFrame = EstablisherFrame->EndOfChain;
         for (;;)
Index: lib/pseh/i386/pseh3_asmdef.h
===================================================================
--- lib/pseh/i386/pseh3_asmdef.h	(rÃ©vision 61927)
+++ lib/pseh/i386/pseh3_asmdef.h	(copie de travail)
@@ -7,6 +7,10 @@
 #define SEH3_REGISTRATION_FRAME_ExceptionPointers 16
 #define SEH3_REGISTRATION_FRAME_Esp 20
 #define SEH3_REGISTRATION_FRAME_Ebp 24
+#define SEH3_REGISTRATION_FRAME_AllocaFrame 28
+#define SEH3_REGISTRATION_FRAME_Ebx 32
+#define SEH3_REGISTRATION_FRAME_Esi 36
+#define SEH3_REGISTRATION_FRAME_Edi 40
 
 #define SEH3_SCOPE_TABLE_Target 0
 #define SEH3_SCOPE_TABLE_Filter 4
Index: lib/pseh/i386/pseh3_i386.S
===================================================================
--- lib/pseh/i386/pseh3_i386.S	(rÃ©vision 61927)
+++ lib/pseh/i386/pseh3_i386.S	(copie de travail)
@@ -11,62 +11,206 @@
 
 .text
 
-
 .extern __SEH3$_except_handler
 
 /*
  *  void
- *  _SEH3$_RegisterFrame(
- *       PSEH_REGISTRATION_FRAME RegistrationRecord<ecx>,
- *       PSEH_DATA_TABLE DataTable<eax>);
+ *  __attribute__((regparm(3)))
+ *  __attribute__((returns_twice))
+ *  _SEH3$_RegisterFrame[WithNonVolatiles](
+ *       PSEH3$_REGISTRATION_FRAME RegistrationFrame<eax>,
+ *       PSEH3$_SCOPE_TABLE ScopeTable<edx>,
+ *       PVOID AllocaFrame);
  */
+.global __SEH3$_RegisterFrameWithNonVolatiles
+__SEH3$_RegisterFrameWithNonVolatiles:
+
+    /* Save non-volatiles in the registration frame */
+    mov [eax + SEH3_REGISTRATION_FRAME_Ebx], ebx
+    mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi
+    mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi
+
+.global __SEH3$_RegisterFrameWithStackLayout
+__SEH3$_RegisterFrameWithStackLayout:
+
+    /* Save the pointer to the alloca frame */
+    mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], ecx
+
 .global __SEH3$_RegisterFrame
 __SEH3$_RegisterFrame:
 
     /* Save the address of the static data table */
-    mov [ecx + SEH3_REGISTRATION_FRAME_ScopeTable], eax
+    mov [eax + SEH3_REGISTRATION_FRAME_ScopeTable], edx
 
     /* Set the handler address */
-    mov dword ptr [ecx + SEH3_REGISTRATION_FRAME_Handler], offset __SEH3$_except_handler
+    mov dword ptr [eax + SEH3_REGISTRATION_FRAME_Handler], offset __SEH3$_except_handler
 
     /* Set this as the end of the internal chain */
-    mov dword ptr [ecx + SEH3_REGISTRATION_FRAME_EndOfChain], ecx
+    mov dword ptr [eax + SEH3_REGISTRATION_FRAME_EndOfChain], eax
 
     /* Register the frame in the TEB */
-    mov eax, dword ptr fs:[0]
-    mov [ecx + SEH3_REGISTRATION_FRAME_Next], eax
-    mov dword ptr fs:[0], ecx
+    mov edx, dword ptr fs:[0]
+    mov [eax + SEH3_REGISTRATION_FRAME_Next], edx
+    mov dword ptr fs:[0], eax
 
-    /* Save the registers */
-    mov [ecx + SEH3_REGISTRATION_FRAME_Esp], esp
-    mov [ecx + SEH3_REGISTRATION_FRAME_Ebp], ebp
+    /* Save the stack registers */
+    mov [eax + SEH3_REGISTRATION_FRAME_Esp], esp
+    mov [eax + SEH3_REGISTRATION_FRAME_Ebp], ebp
 
+    /* Set eax to 0 to indicate 1st return */
+    xor eax, eax
     ret
 
 
+/*
+ *  void
+ *  __attribute__((regparm(3)))
+ *  __attribute__((returns_twice))
+ *  _SEH3$_RegisterTryLevel[WithNonVolatiles](
+ *       PSEH3$_REGISTRATION_FRAME RegistrationFrame<edx>,
+ *       PSEH3$_SCOPE_TABLE ScopeTable<eax>,
+ *       PVOID AllocaFrame);
+ */
+.global __SEH3$_RegisterTryLevelWithNonVolatiles
+__SEH3$_RegisterTryLevelWithNonVolatiles:
+
+    /* Save non-volatiles in the registration frame */
+    mov [eax + SEH3_REGISTRATION_FRAME_Ebx], ebx
+    mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi
+    mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi
+
+.global __SEH3$_RegisterTryLevelWithStackLayout
+__SEH3$_RegisterTryLevelWithStackLayout:
+
+    /* Save the pointer to the alloca frame */
+    mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], ecx
+
 .global __SEH3$_RegisterTryLevel
 __SEH3$_RegisterTryLevel:
 
     /* Save the address of the static data table */
-    mov [ecx + SEH3_REGISTRATION_FRAME_ScopeTable], eax
+    mov [eax + SEH3_REGISTRATION_FRAME_ScopeTable], edx
 
     /* Set the handler address to NULL as identification */
-    and dword ptr [ecx + SEH3_REGISTRATION_FRAME_Handler], 0
+    and dword ptr [eax + SEH3_REGISTRATION_FRAME_Handler], 0
 
     /* Get the current registered frame */
-    mov eax, dword ptr fs:[0]
+    mov edx, dword ptr fs:[0]
 
     /* Get the current end of the chain and set this as Next */
-    mov edx, [eax + SEH3_REGISTRATION_FRAME_EndOfChain]
-    mov [ecx + SEH3_REGISTRATION_FRAME_Next], edx
+    mov ecx, [edx + SEH3_REGISTRATION_FRAME_EndOfChain]
+    mov [eax + SEH3_REGISTRATION_FRAME_Next], ecx
 
     /* Set this as the end of the internal chain */
-    mov dword ptr [eax + SEH3_REGISTRATION_FRAME_EndOfChain], ecx
+    mov dword ptr [edx + SEH3_REGISTRATION_FRAME_EndOfChain], eax
 
-    /* Save the registers */
-    mov [ecx + SEH3_REGISTRATION_FRAME_Esp], esp
-    mov [ecx + SEH3_REGISTRATION_FRAME_Ebp], ebp
+    /* Save the stack registers */
+    mov [eax + SEH3_REGISTRATION_FRAME_Esp], esp
+    mov [eax + SEH3_REGISTRATION_FRAME_Ebp], ebp
 
+    /* Set eax to 0 to indicate 1st return */
+    xor eax, eax
     ret
 
 
+.global __SEH3$_InvokeEmbeddedFilterFromRegistration
+__SEH3$_InvokeEmbeddedFilterFromRegistration:
+
+    /* Safe the current non-volatiles */
+    push ebp
+    push ebx
+    push esi
+    push edi
+
+    /* Load the non-volatiles from the registration invocation */
+    mov ebx, [eax + SEH3_REGISTRATION_FRAME_Ebx]
+    mov esi, [eax + SEH3_REGISTRATION_FRAME_Esi]
+    mov edi, [eax + SEH3_REGISTRATION_FRAME_Edi]
+    mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp]
+
+    /* Get the saved stack pointer */
+    mov edx, [eax + SEH3_REGISTRATION_FRAME_Esp]
+
+    xor eax, eax
+    inc eax
+    call [edx]
+
+    /* Restore the current non-volatiles */
+    pop edi
+    pop esi
+    pop ebx
+    pop ebp
+
+    ret
+
+
+.global __SEH3$_InvokeEmbeddedFilter
+__SEH3$_InvokeEmbeddedFilter:
+
+    /* Safe the current non-volatiles */
+    push ebp
+    push ebx
+    push esi
+    push edi
+
+    /* Load ebp from the registration invocation */
+    mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp]
+
+    /* Calculate the size of the temp stack frame region */
+    mov ecx, [eax + SEH3_REGISTRATION_FRAME_AllocaFrame]
+    sub ecx, [eax + SEH3_REGISTRATION_FRAME_Esp]
+
+    /* Put the return address on the stack */
+    push offset __SEH3$_InvokeEmbeddedFilterReturn
+
+    /* Save the current stack pointer in the AllocaFrame member */
+    mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], esp
+
+    /* Allocate enough temp stack space on the stack */
+    sub esp, ecx
+
+    /* Get the scope table */
+    mov edx, [eax + SEH3_REGISTRATION_FRAME_ScopeTable]
+
+    /* Jump into the filter or finally function */
+    jmp [edx + SEH3_SCOPE_TABLE_Filter]
+
+    /* We return to this label with a cleaned up stack */
+__SEH3$_InvokeEmbeddedFilterReturn:
+
+    /* Restore the current non-volatiles */
+    pop edi
+    pop esi
+    pop ebx
+    pop ebp
+
+    ret
+
+/*
+ * void
+ * __fastcall
+ * _SEH3$_CallRtlUnwind(
+ *     PSEH3$_REGISTRATION_FRAME RegistrationFrame<ecx>)
+ */
+.global @_SEH3$_CallRtlUnwind@4
+@_SEH3$_CallRtlUnwind@4:
+
+    push ebp
+    mov ebp, esp
+
+    push edi
+    push esi
+    push ebx
+
+    push 0   /* ReturnValue */
+    push 0   /* ExceptionRecord */
+    push 0   /* TargetIp */
+    push ecx /* TargetFrame */
+    call _RtlUnwind@16
+
+    pop ebx
+    pop esi
+    pop edi
+    pop ebp
+    ret
+
Index: lib/fslib/vfatxlib/CMakeLists.txt
===================================================================
--- lib/fslib/vfatxlib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/fslib/vfatxlib/CMakeLists.txt	(copie de travail)
@@ -1,6 +1,11 @@
 
-add_library(vfatxlib fatx.c vfatxlib.c)
-add_pch(vfatxlib vfatxlib.h)
+list(APPEND SOURCE
+    fatx.c
+    vfatxlib.c
+    vfatxlib.h)
+
+add_library(vfatxlib ${SOURCE})
+add_pch(vfatxlib vfatxlib.h SOURCE)
 target_link_libraries(vfatxlib chkstk)
 
 if(NOT MSVC)
Index: lib/fslib/vfatxlib/vfatxlib.h
===================================================================
--- lib/fslib/vfatxlib/vfatxlib.h	(rÃ©vision 61927)
+++ lib/fslib/vfatxlib/vfatxlib.h	(copie de travail)
@@ -4,6 +4,9 @@
  * FILE:        vfatxlib.h
  */
 
+#ifndef _VFATXLIB_H_
+#define _VFATXLIB_H_
+
 #define NTOS_MODE_USER
 #include <ndk/umtypes.h>
 #include <ndk/pstypes.h>
@@ -45,4 +48,6 @@
 VfatxUpdateProgress (PFORMAT_CONTEXT Context,
 		     ULONG Increment);
 
+#endif /* _VFATXLIB_H_ */
+
 /* EOF */
Index: lib/fslib/vfatlib/CMakeLists.txt
===================================================================
--- lib/fslib/vfatlib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/fslib/vfatlib/CMakeLists.txt	(copie de travail)
@@ -10,7 +10,8 @@
     fat12.c
     fat16.c
     fat32.c
-    vfatlib.c)
+    vfatlib.c
+    vfatlib.h)
+
 add_library(vfatlib ${SOURCE})
-add_pch(vfatlib vfatlib.h)
-add_dependencies(vfatlib psdk)
+add_pch(vfatlib vfatlib.h SOURCE)
Index: lib/fslib/vfatlib/check/lfn.c
===================================================================
--- lib/fslib/vfatlib/check/lfn.c	(rÃ©vision 61927)
+++ lib/fslib/vfatlib/check/lfn.c	(copie de travail)
@@ -3,6 +3,7 @@
 /* Written 1998 by Roman Hodek */
 
 #include "vfatlib.h"
+#include <limits.h>
 
 #define NDEBUG
 #include <debug.h>
Index: lib/fslib/vfatlib/check/io.c
===================================================================
--- lib/fslib/vfatlib/check/io.c	(rÃ©vision 61927)
+++ lib/fslib/vfatlib/check/io.c	(copie de travail)
@@ -211,7 +211,7 @@
         const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size;
         const loff_t seekpos_aligned = pos - (pos % 512);
         const size_t seek_delta = (size_t)(pos - seekpos_aligned);
-        boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0);
+        BOOLEAN use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0);
 
         /* Aloc temp buffer if write is not aligned */
         if (use_read)
Index: lib/fslib/vfatlib/vfatlib.h
===================================================================
--- lib/fslib/vfatlib/vfatlib.h	(rÃ©vision 61927)
+++ lib/fslib/vfatlib/vfatlib.h	(copie de travail)
@@ -4,6 +4,9 @@
  * FILE:        vfatlib.h
  */
 
+#ifndef _VFATLIB_H_
+#define _VFATLIB_H_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -11,7 +14,6 @@
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
-#include <objbase.h>
 #define NTOS_MODE_USER
 #include <ndk/iofuncs.h>
 #include <ndk/kefuncs.h>
@@ -145,4 +147,6 @@
 VOID
 VfatPrint(PCHAR Format, ...);
 
+#endif /* _VFATLIB_H_ */
+
 /* EOF */
Index: lib/fslib/ext2lib/CMakeLists.txt
===================================================================
--- lib/fslib/ext2lib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/fslib/ext2lib/CMakeLists.txt	(copie de travail)
@@ -8,8 +8,10 @@
     Memory.c
     Mke2fs.c
     Super.c
-    Uuid.c)
+    Uuid.c
+    Mke2fs.h)
+
 add_library(ext2lib ${SOURCE})
-add_pch(ext2lib Mke2fs.h)
+add_pch(ext2lib Mke2fs.h SOURCE)
 add_dependencies(ext2lib psdk)
 allow_warnings(ext2lib)
Index: lib/fslib/ext2lib/Mke2fs.h
===================================================================
--- lib/fslib/ext2lib/Mke2fs.h	(rÃ©vision 61927)
+++ lib/fslib/ext2lib/Mke2fs.h	(copie de travail)
@@ -5,6 +5,9 @@
  * HOMEPAGE:         http://ext2.yeah.net
  */
 
+#ifndef _MKE2FS_H_
+#define _MKE2FS_H_
+
 /* INCLUDES **************************************************************/
 
 #define NTOS_MODE_USER
@@ -393,3 +396,5 @@
  */
 
 void uuid_generate(__u8 * uuid);
+
+#endif /* _MKE2FS_H_ */
Index: lib/rtl/CMakeLists.txt
===================================================================
--- lib/rtl/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/rtl/CMakeLists.txt	(copie de travail)
@@ -65,7 +65,8 @@
     vectoreh.c
     version.c
     wait.c
-    workitem.c)
+    workitem.c
+    rtl.h)
 
 if(ARCH STREQUAL "i386")
     list(APPEND ASM_SOURCE
@@ -108,5 +109,5 @@
 
 add_asm_files(rtl_asm ${ASM_SOURCE})
 add_library(rtl ${SOURCE} ${rtl_asm})
-add_pch(rtl rtl.h)
+add_pch(rtl rtl.h SOURCE)
 add_dependencies(rtl psdk asm)
Index: lib/inflib/inflib.h
===================================================================
--- lib/inflib/inflib.h	(rÃ©vision 61927)
+++ lib/inflib/inflib.h	(copie de travail)
@@ -4,6 +4,9 @@
  * COPYRIGHT:  Copyright 2005 Ge van Geldorp <gvg@reactos.org>
  */
 
+#ifndef _INFLIB_PCH_
+#define _INFLIB_PCH_
+
 #include <ctype.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -12,4 +15,4 @@
 #include "infcommon.h"
 #include "infpriv.h"
 
-/* EOF */
+#endif /* _INFLIB_PCH_ */
Index: lib/inflib/CMakeLists.txt
===================================================================
--- lib/inflib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/inflib/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,5 @@
 
-list(APPEND GLOBAL_FILES
+list(APPEND SOURCE
     infcore.c
     infget.c
     infput.c)
@@ -8,10 +8,11 @@
     list(APPEND SOURCE
         infrosgen.c
         infrosget.c
-        infrosput.c)
+        infrosput.c
+        inflib.h)
 
-    add_library(inflib ${GLOBAL_FILES} ${SOURCE})
-    add_pch(inflib inflib.h)
+    add_library(inflib ${SOURCE})
+    add_pch(inflib inflib.h SOURCE)
     add_dependencies(inflib psdk)
 else()
     list(APPEND SOURCE
@@ -21,7 +22,7 @@
         infhostrtl.c)
 
     add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST)
-    add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
+    add_library(inflibhost ${SOURCE})
     if(NOT MSVC)
         add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings")
     endif()
Index: lib/smlib/execpgm.c
===================================================================
--- lib/smlib/execpgm.c	(rÃ©vision 61927)
+++ lib/smlib/execpgm.c	(copie de travail)
@@ -4,6 +4,7 @@
  * FILE:            lib/smlib/execpgm.c
  * PURPOSE:         Call SM API SM_API_EXECPGM
  */
+
 #include "precomp.h"
 
 #define NDEBUG
Index: lib/smlib/compses.c
===================================================================
--- lib/smlib/compses.c	(rÃ©vision 61927)
+++ lib/smlib/compses.c	(copie de travail)
@@ -4,6 +4,7 @@
  * FILE:            lib/smlib/compses.c
  * PURPOSE:         Call SM API SM_API_COMPLETE_SESSION
  */
+
 #include "precomp.h"
 
 #define NDEBUG
Index: lib/smlib/precomp.h
===================================================================
--- lib/smlib/precomp.h	(rÃ©vision 61927)
+++ lib/smlib/precomp.h	(copie de travail)
@@ -6,9 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
-/* INCLUDES ******************************************************************/
+#ifndef _SMLIB_PCH_
+#define _SMLIB_PCH_
 
-/* SDK/DDK/NDK Headers. */
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winreg.h>
@@ -21,3 +21,4 @@
 
 #include <sm/helper.h>
 
+#endif /* _SMLIB_PCH_ */
Index: lib/smlib/CMakeLists.txt
===================================================================
--- lib/smlib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/smlib/CMakeLists.txt	(copie de travail)
@@ -6,8 +6,9 @@
     connect.c
     execpgm.c
     lookupss.c
-    smclient.c)
-    
+    smclient.c
+    precomp.h)
+
 add_library(smlib ${SOURCE})
-add_pch(smlib precomp.h)
+add_pch(smlib precomp.h SOURCE)
 add_dependencies(smlib psdk)
Index: lib/smlib/smclient.c
===================================================================
--- lib/smlib/smclient.c	(rÃ©vision 61927)
+++ lib/smlib/smclient.c	(copie de travail)
@@ -9,9 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "precomp.h"
-#include "sm/smmsg.h" // To go in precomp.h after
+#include <sm/smmsg.h> // To go in precomp.h after
+
 #define NDEBUG
-#include "debug.h"
+#include <debug.h>
 
 /* FUNCTIONS ******************************************************************/
 
Index: lib/smlib/lookupss.c
===================================================================
--- lib/smlib/lookupss.c	(rÃ©vision 61927)
+++ lib/smlib/lookupss.c	(copie de travail)
@@ -3,6 +3,7 @@
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/smlib/lookupss.c
  */
+
 #include "precomp.h"
 
 #define NDEBUG
Index: lib/lsalib/lsa.c
===================================================================
--- lib/lsalib/lsa.c	(rÃ©vision 61927)
+++ lib/lsalib/lsa.c	(copie de travail)
@@ -277,6 +277,8 @@
         return Status;
     }
 
+    *SubStatus = ApiMessage.LogonUser.Reply.SubStatus;
+
     if (!NT_SUCCESS(ApiMessage.Status))
     {
         return ApiMessage.Status;
@@ -287,7 +289,6 @@
     *LogonId = ApiMessage.LogonUser.Reply.LogonId;
     *Token = ApiMessage.LogonUser.Reply.Token;
     *Quotas = ApiMessage.LogonUser.Reply.Quotas;
-    *SubStatus = ApiMessage.LogonUser.Reply.SubStatus;
 
     return Status;
 }
Index: lib/tdilib/enum.c
===================================================================
--- lib/tdilib/enum.c	(rÃ©vision 61927)
+++ lib/tdilib/enum.c	(copie de travail)
@@ -5,7 +5,8 @@
  * PURPOSE:     TDI entity enumeration
  */
 
-#include "iphlpapi_private.h"
+#include "precomp.h"
+
 #include "tdilib.h"
 
 /* A generic thing-getting function which interacts in the right way with
Index: lib/tdilib/handle.c
===================================================================
--- lib/tdilib/handle.c	(rÃ©vision 61927)
+++ lib/tdilib/handle.c	(copie de travail)
@@ -5,7 +5,7 @@
  * PURPOSE:     TDI transport handle management
  */
 
-#include "iphlpapi_private.h"
+#include "precomp.h"
 
 const PWCHAR TcpFileName = L"\\Device\\Tcp";
 
Index: lib/tdilib/CMakeLists.txt
===================================================================
--- lib/tdilib/CMakeLists.txt	(rÃ©vision 61927)
+++ lib/tdilib/CMakeLists.txt	(copie de travail)
@@ -1,5 +1,11 @@
 
 # FIXFIX: You guys should move this header in include/reactos/libs/iphlpapi!
 include_directories(${REACTOS_SOURCE_DIR}/dll/win32/iphlpapi) 
-add_library(tdilib enum.c handle.c)
+list(APPEND SOURCE
+    enum.c
+    handle.c
+    precomp.h)
+
+add_library(tdilib ${SOURCE})
+add_pch(tdilib precomp.h SOURCE)
 add_dependencies(tdilib psdk)
Index: lib/tdilib/precomp.h
===================================================================
--- lib/tdilib/precomp.h	(rÃ©vision 0)
+++ lib/tdilib/precomp.h	(rÃ©vision 62573)
@@ -0,0 +1,6 @@
+#ifndef _TDILIB_PCH_
+#define _TDILIB_PCH_
+
+#include <iphlpapi_private.h>
+
+#endif /* _TDILIB_PCH_ */

Modification de propriÃ©tÃ©s sur lib/tdilib/precomp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(rÃ©vision 61927)
+++ CMakeLists.txt	(copie de travail)
@@ -25,7 +25,12 @@
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+set(CMAKE_SKIP_INSTALL_RULES ON)
 
+if(NOT CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")
+    set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE)
+endif()
+
 if(NOT ARCH)
     set(ARCH i386)
 endif()
@@ -129,6 +134,12 @@
         add_definitions(-D_WINKD_=1)
     endif()
 
+    if((NOT DEFINED PCH) AND (CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang"))
+        set(PCH 1)
+    else()
+        set(PCH 0)
+    endif()
+
     # Version Options
     add_definitions(-DWINVER=0x502
                     -D_WIN32_IE=0x600
Index: toolchain-clang.cmake
===================================================================
--- toolchain-clang.cmake	(rÃ©vision 0)
+++ toolchain-clang.cmake	(rÃ©vision 62573)
@@ -0,0 +1,64 @@
+
+if(NOT ARCH)
+    set(ARCH i386)
+endif()
+
+# Choose the right MinGW toolchain prefix
+if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
+    if(ARCH STREQUAL "i386")
+
+        if(CMAKE_HOST_WIN32)
+            set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
+        else()
+            if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1)
+                set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
+            else()
+                set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
+            endif()
+        endif()
+
+    elseif(ARCH STREQUAL "amd64")
+        set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix")
+    elseif(ARCH STREQUAL "arm")
+        set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix")
+    endif()
+endif()
+
+if (NOT DEFINED MINGW_TOOLCHAIN_SUFFIX)
+    set(MINGW_TOOLCHAIN_SUFFIX "" CACHE STRING "MinGW Toolchain Suffix")
+endif()
+
+if(ENABLE_CCACHE)
+    set(CCACHE "ccache" CACHE STRING "ccache")
+else()
+    set(CCACHE "" CACHE STRING "ccache")
+endif()
+
+# The name of the target operating system
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR i686)
+
+# Which tools to use
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX})
+set(CMAKE_ASM_COMPILER_ID "GNU")
+set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc)
+set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres)
+set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool)
+
+if(NOT LTCG)
+    set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+else()
+    set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
+endif()
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
+set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
+
+# Don't link with anything by default unless we say so
+set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")
+
+#MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES)
+set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries")
+
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")

Modification de propriÃ©tÃ©s sur toolchain-clang.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: .
===================================================================
--- .	(rÃ©vision 61927)
+++ .	(copie de travail)

Modification de propriÃ©tÃ©s sur .
___________________________________________________________________
Modified: svn:mergeinfo
   FusionnÃ© /trunk/reactos:r61927-62529
